Resolve merge conflict

smartcontractkit · Sep 19, 2024 · 87e0694 · 87e0694
2 parents 36b1825 + 7ffbfbf
commit 87e0694
Show file tree

Hide file tree

Showing 1,110 changed files with 67,421 additions and 38,901 deletions.
diff --git a/.changeset/afraid-buckets-yell.md b/.changeset/afraid-buckets-yell.md
diff --git a/.changeset/afraid-plums-look.md b/.changeset/afraid-plums-look.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal updated to latest operator-ui to bring in new UI changes for supporting multiple job distributors
diff --git a/.changeset/beige-eels-teach.md b/.changeset/beige-eels-teach.md
diff --git a/.changeset/big-dots-report.md b/.changeset/big-dots-report.md
diff --git a/.changeset/big-kiwis-cross.md b/.changeset/big-kiwis-cross.md
diff --git a/.changeset/big-students-rush.md b/.changeset/big-students-rush.md
diff --git a/.changeset/blue-roses-brush.md b/.changeset/blue-roses-brush.md
diff --git a/.changeset/bright-rings-knock.md b/.changeset/bright-rings-knock.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Bump to start the next version
diff --git a/.changeset/brown-geese-boil.md b/.changeset/brown-geese-boil.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+FilteredLogs receive Expression instead of whole KeyFilter. #internal
diff --git a/.changeset/calm-badgers-jump.md b/.changeset/calm-badgers-jump.md
diff --git a/.changeset/calm-laws-begin.md b/.changeset/calm-laws-begin.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#added Implements rate limiter for capabilities dispatcher
diff --git a/.changeset/chatty-spiders-double.md b/.changeset/chatty-spiders-double.md
diff --git a/.changeset/chilly-cars-attend.md b/.changeset/chilly-cars-attend.md
diff --git a/.changeset/rich-chairs-hug.md → .changeset/clever-months-brake.md b/.changeset/rich-chairs-hug.md → .changeset/clever-months-brake.md
diff --git a/.changeset/cold-suns-hope.md b/.changeset/cold-suns-hope.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal changes required for capability api chance to sync
diff --git a/.changeset/cool-mirrors-beg.md b/.changeset/cool-mirrors-beg.md
diff --git a/.changeset/cuddly-eels-lay.md b/.changeset/cuddly-eels-lay.md
diff --git a/.changeset/curly-birds-guess.md b/.changeset/curly-birds-guess.md
diff --git a/.changeset/curly-onions-tell.md b/.changeset/curly-onions-tell.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#changed Make Mantle use default OP stack l1 gas oracle in core
diff --git a/.changeset/curvy-beans-scream.md b/.changeset/curvy-beans-scream.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#changed: Add new OCR3DataFeeds telemetry type for Mercury jobs
diff --git a/.changeset/curvy-boxes-burn.md b/.changeset/curvy-boxes-burn.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+RMNCrypto evm implementation for CCIP - RMN Integration #added
diff --git a/.changeset/curvy-months-wave.md b/.changeset/curvy-months-wave.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Use a lock to sync access to the ConfigDigest #internal
diff --git a/.changeset/curvy-points-grin.md b/.changeset/curvy-points-grin.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated refactor ccip oracle creator
diff --git a/.changeset/cyan-spies-dream.md b/.changeset/cyan-spies-dream.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal validate capability trigger event ID before executing
diff --git a/.changeset/eight-bees-speak.md b/.changeset/eight-bees-speak.md
diff --git a/.changeset/eight-radios-hear.md b/.changeset/eight-radios-hear.md
diff --git a/.changeset/eight-rocks-notice.md b/.changeset/eight-rocks-notice.md
diff --git a/.changeset/famous-plums-kiss.md b/.changeset/famous-plums-kiss.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated move latest capabilities code from ccip repo to chainlink repo [CCIP-2946]
diff --git a/.changeset/fast-insects-shout.md b/.changeset/fast-insects-shout.md
diff --git a/.changeset/five-nails-fold.md b/.changeset/five-nails-fold.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated Changed TelemetryIngress.UniConn default to false
diff --git a/.changeset/flat-emus-act.md b/.changeset/flat-emus-act.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Updated TXM Confirmer logic to resume pending task runs with failure if transaction is terminally stuck #internal
diff --git a/.changeset/flat-mirrors-confess.md b/.changeset/flat-mirrors-confess.md
diff --git a/.changeset/tall-poems-swim.md → .changeset/four-eggs-invite.md b/.changeset/tall-poems-swim.md → .changeset/four-eggs-invite.md
@@ -2,4 +2,4 @@
 "chainlink": patch
 ---
 
-#internal
+configuration updates
diff --git a/.changeset/friendly-impalas-sniff.md b/.changeset/friendly-impalas-sniff.md
diff --git a/.changeset/early-glasses-rhyme.md → .changeset/gorgeous-lobsters-argue.md b/.changeset/early-glasses-rhyme.md → .changeset/gorgeous-lobsters-argue.md
@@ -2,4 +2,4 @@
 "chainlink": minor
 ---
 
-use FilteredLogs in EventBinding GetLatestValue instead of manual filtering. #internal
+#changed Connect to multiple feeds managers on app start instead of just one (default to first)
diff --git a/.changeset/great-timers-agree.md b/.changeset/great-timers-agree.md
diff --git a/.changeset/green-eagles-deliver.md b/.changeset/green-eagles-deliver.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Handle zkEVM node level OOC error as TerminallyStuck #internal
diff --git a/.changeset/happy-adults-wash.md b/.changeset/happy-adults-wash.md
diff --git a/.changeset/hip-crabs-agree.md b/.changeset/hip-crabs-agree.md
diff --git a/.changeset/hot-laws-deny.md b/.changeset/hot-laws-deny.md
diff --git a/.changeset/hot-roses-add.md b/.changeset/hot-roses-add.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Update to latest UI - PeerId field is introduced for OCR2 bootstrap node in chain config page
diff --git a/.changeset/itchy-bugs-clean.md b/.changeset/itchy-bugs-clean.md
diff --git a/.changeset/kind-houses-smile.md b/.changeset/kind-houses-smile.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal index don ID in ConfigSet event
diff --git a/.changeset/kind-numbers-melt.md b/.changeset/kind-numbers-melt.md
@@ -0,0 +1,13 @@
+---
+"chainlink": minor
+---
+
+Adding feature flag for `LogBroadcaster` called `LogBroadcasterEnabled`, which is `true` by default to support backwards compatibility.
+Adding `LogBroadcasterEnabled` allows certain chains to completely disable the `LogBroadcaster` feature, which is an old feature (getting replaced by logPoller) that only few products are using it:
+* OCR1 Median
+* *OCR2 Median when ChainReader is disabled
+* *pre-OCR2 Keeper 
+* Flux Monitor 
+* Direct RequestOCR1 Median
+
+#added
diff --git a/.changeset/late-stingrays-promise.md b/.changeset/late-stingrays-promise.md
diff --git a/.changeset/loud-months-act.md b/.changeset/loud-months-act.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Added ChainWriter to ChainReader tests
diff --git a/.changeset/loud-windows-call.md b/.changeset/loud-windows-call.md
@@ -2,4 +2,4 @@
 "chainlink": minor
 ---
 
-Added gas limit estimation feature to EVM gas estimators #added
+Added gas limit estimation feature to EVM gas estimators. Introduced a new config `EVM.GasEstimator.EstimateLimit` to toggle this feature. #added
diff --git a/.changeset/lucky-boats-run.md b/.changeset/lucky-boats-run.md
diff --git a/.changeset/lucky-zebras-reflect.md b/.changeset/lucky-zebras-reflect.md
@@ -0,0 +1,7 @@
+---
+"chainlink": minor
+---
+
+#internal Implement EVM ChainReader ValueComparator filtering by non-indexed event data. Right now only simple non indexed data where byte offsets don't exist is supported.
+
+BCFR-203
diff --git a/.changeset/many-knives-play.md b/.changeset/many-knives-play.md
diff --git a/.changeset/mean-brooms-agree.md b/.changeset/mean-brooms-agree.md
diff --git a/.changeset/mighty-points-switch.md b/.changeset/mighty-points-switch.md
diff --git a/.changeset/moody-turkeys-provide.md b/.changeset/moody-turkeys-provide.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#changed Allow registration of more than 1 feeds manager on CreateFeedsManager
diff --git a/.changeset/neat-yaks-switch.md b/.changeset/neat-yaks-switch.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Remove bid/ask fields for Mercury v4 schema #internal
diff --git a/.changeset/new-eagles-marry.md b/.changeset/new-eagles-marry.md
diff --git a/.changeset/nice-turtles-begin.md b/.changeset/nice-turtles-begin.md
diff --git a/.changeset/ninety-cougars-tease.md b/.changeset/ninety-cougars-tease.md
diff --git a/.changeset/ninety-ways-run.md b/.changeset/ninety-ways-run.md
diff --git a/.changeset/odd-eagles-shave.md b/.changeset/odd-eagles-shave.md
diff --git a/.changeset/odd-hats-repeat.md b/.changeset/odd-hats-repeat.md
diff --git a/.changeset/pink-fans-sparkle.md b/.changeset/pink-fans-sparkle.md
diff --git a/.changeset/plenty-glasses-rest.md b/.changeset/plenty-glasses-rest.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal merge ccip contracts
diff --git a/.changeset/polite-crabs-pretend.md b/.changeset/polite-crabs-pretend.md
diff --git a/.changeset/polite-numbers-exercise.md b/.changeset/polite-numbers-exercise.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Implement LatestHead for ChainService
diff --git a/.changeset/poor-pumas-occur.md b/.changeset/poor-pumas-occur.md