merging

.changeset/clever-knives-tap.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added Sei config and error mapping

.changeset/cold-coats-battle.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal minor rename of various gethwrappers

.changeset/tall-falcons-yawn.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added the ability to define a fallback.toml override config using CL_CHAIN_DEFAULTS env var

.github/CODEOWNERS

@@ -89,14 +89,11 @@ core/scripts/gateway @smartcontractkit/dev-services
 /contracts/src/v0.8/automation @smartcontractkit/dev-services
 /contracts/src/v0.8/ccip @smartcontractkit/ccip-onchain
 /contracts/src/v0.8/functions @smartcontractkit/dev-services
-# TODO: interfaces folder, folder should be removed and files moved to the correct folders
 /contracts/src/v0.8/l2ep @smartcontractkit/bix-build
 /contracts/src/v0.8/llo-feeds @smartcontractkit/data-streams-engineers
 # TODO: mocks folder, folder should be removed and files moved to the correct folders
 /contracts/src/v0.8/operatorforwarder @smartcontractkit/data-feeds-engineers
 /contracts/src/v0.8/shared @smartcontractkit/core-solidity
-# TODO: tests folder, folder should be removed and files moved to the correct folders
-# TODO: transmission folder, owner should be found
 /contracts/src/v0.8/vrf @smartcontractkit/dev-services
 /contracts/src/v0.8/keystone @smartcontractkit/keystone
 /contracts/src/v0.8/workflow @smartcontractkit/dev-services

.github/actions/detect-solidity-readonly-file-changes/action.yml

@@ -16,9 +16,13 @@ runs:
         filters: |
           read_only_sol:
             - 'contracts/src/v0.8/interfaces/**/*'
+            - 'contracts/src/v0.8/automation/interfaces/**/*'
+            - 'contracts/src/v0.8/automation/upkeeps/**/*'
             - 'contracts/src/v0.8/automation/v1_2/**/*'
             - 'contracts/src/v0.8/automation/v1_3/**/*'
             - 'contracts/src/v0.8/automation/v2_0/**/*'
+            - 'contracts/src/v0.8/automation/v2_1/**/*'
+            - 'contracts/src/v0.8/automation/v2_2/**/*'
 
     - name: Fail if read-only files have changed
       if: ${{ steps.changed_files.outputs.read_only_sol == 'true' }}

.github/workflows/ci-flakeguard.yml

@@ -41,7 +41,7 @@ jobs:
         findByTestFilesDiff: true
         findByAffectedPackages: false
         slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications
-        extraArgs: '{ "skipped_tests": "TestChainComponents", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "omit_test_outputs_on_success": "true" }'
+        extraArgs: '{ "skipped_tests": "", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "omit_test_outputs_on_success": "true" }'
       secrets:
         SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/flakeguard-nightly.yml

@@ -16,7 +16,7 @@ jobs:
       projectPath: '.'
       maxPassRatio: '1.0'
       runAllTests: true
-      extraArgs: '{ "skipped_tests": "TestChainComponents", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
+      extraArgs: '{ "skipped_tests": "", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
       slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications
     secrets:
       SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}

.github/workflows/flakeguard-on-demand.yml

@@ -48,7 +48,7 @@ on:
       extraArgs:
         required: false
         type: string
-        default: '{ "skipped_tests": "TestChainComponents", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
+        default: '{ "skipped_tests": "", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
         description: 'JSON of extra arguments for the workflow.'    
 
 jobs:

.github/workflows/solidity-foundry-artifacts.yml

@@ -69,7 +69,6 @@ jobs:
               - '!contracts/src/v0.8/**/*.t.sol'
               - '!contracts/src/v0.8/*.t.sol'
               - '!contracts/src/v0.8/**/testhelpers/**'
-              - '!contracts/src/v0.8/testhelpers/**'
               - '!contracts/src/v0.8/vendor/**'
             other_shared:
               - modified|added: 'contracts/src/v0.8/(interfaces/**/*.sol|*.sol)'

.golangci.yml

@@ -8,7 +8,6 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - fatcontext
     - ginkgolinter
     - gocritic

ccip/config/evm/Astar_Mainnet.toml

@@ -1,9 +1,15 @@
 ChainID = '592'
+ChainType = 'astar'
 FinalityTagEnabled = true
 FinalityDepth = 100
 LogPollInterval = '6s'
 
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/Astar_Shibuya.toml

@@ -6,4 +6,9 @@ LogPollInterval = '6s'
 [GasEstimator]
 EIP1559DynamicFees = false
 PriceMax = '100000 gwei'
-LimitDefault = 8000000
+LimitDefault = 8000000
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/Avalanche_ANZ_testnet.toml

@@ -19,4 +19,6 @@ PriceMin = '25 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
-PersistenceEnabled = false
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/Avalanche_Fuji.toml

@@ -17,5 +17,6 @@ PriceDefault = '1 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
-PersistenceEnabled = false

ccip/config/evm/Avalanche_Mainnet.toml

@@ -18,4 +18,6 @@ PriceDefault = '1 gwei'
 BlockHistorySize = 24
 
 [HeadTracker]
-PersistenceEnabled = false
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/BOB_Mainnet.toml

@@ -0,0 +1,28 @@
+ChainID = '60808'
+# OP stack https://docs.gobob.xyz/learn/introduction/stack-overview#rollup-layer
+ChainType = 'optimismBedrock'
+# FinalityDepth in mainnet showed more than 3k
+FinalityDepth = 3150
+# block_time was:  2s, adding 1 second buffer 
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~105  min (finality time)
+NoNewFinalizedHeadsThreshold = '110m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/BOB_Testnet.toml

@@ -0,0 +1,28 @@
+ChainID = '808813'
+# OP stack https://docs.gobob.xyz/learn/introduction/stack-overview#rollup-layer
+ChainType = 'optimismBedrock'
+# FinalityDepth in mainnet showed more than 3k
+FinalityDepth = 3150
+# block_time was:  2s, adding 1 second buffer
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~105  min (finality time)
+NoNewFinalizedHeadsThreshold = '110m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/BSC_Mainnet.toml

@@ -13,6 +13,8 @@ NoNewFinalizedHeadsThreshold = '45s'
 
 [GasEstimator]
 PriceDefault = '5 gwei'
+# Set to the BSC node's default Eth.Miner.GasPrice config
+PriceMin = '3 gwei'
 # 15s delay since feeds update every minute in volatile situations
 BumpThreshold = 5
 
@@ -26,3 +28,8 @@ ObservationGracePeriod = '500ms'
 
 [NodePool]
 SyncThreshold = 10
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/BSC_Testnet.toml

@@ -22,8 +22,9 @@ BlockHistorySize = 24
 [HeadTracker]
 HistoryDepth = 100
 SamplingInterval = '1s'
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
-PersistenceEnabled = false
 
 [OCR]
 DatabaseTimeout = '2s'

ccip/config/evm/Base_Mainnet.toml

@@ -20,6 +20,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

ccip/config/evm/Base_Sepolia.toml

@@ -21,6 +21,9 @@ ResendAfterThreshold = '30s'
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 SyncThreshold = 10

ccip/config/evm/Berachain_Testnet.toml

@@ -0,0 +1,24 @@
+ChainID = '80084'
+# finality_depth: instant
+FinalityDepth = 10 
+# block_time: 5s, adding 1 second buffer 
+LogPollInterval = '6s' 
+
+# finality_depth * block_time / 60 secs = ~0.8  min (finality time)
+NoNewFinalizedHeadsThreshold = '5m'
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 5s, per recommendation skip 1-2 blocks
+CacheTimeout = '10s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/Bitlayer_Mainnet.toml

@@ -0,0 +1,16 @@
+ChainID = '200901'
+FinalityTagEnabled = false
+FinalityDepth = 21         # confirmed with Bitlayer team and recommended by docs: https://docs.bitlayer.org/docs/Learn/BitlayerNetwork/AboutFinality/#about-finality-at-stage-bitlayer-pos-bitlayer-mainnet-v1
+
+[GasEstimator]
+Mode = 'FeeHistory'
+EIP1559DynamicFees = false
+PriceMax = '1 gwei'        # DS&A recommended value
+PriceMin = '40 mwei'       # During testing, we saw minimum gas prices ~50 mwei
+PriceDefault = '1 gwei'    # As we set PriceMax to '1 gwei' and PriceDefault must be less than or equal to PriceMax
+FeeCapDefault = '1 gwei'   # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/Bitlayer_Testnet.toml

@@ -0,0 +1,16 @@
+ChainID = '200810'
+FinalityTagEnabled = false
+FinalityDepth = 21 # confirmed with Bitlayer team and recommended by docs: https://docs.bitlayer.org/docs/Learn/BitlayerNetwork/AboutFinality/#about-finality-at-stage-bitlayer-pos-bitlayer-mainnet-v1
+
+[GasEstimator]
+Mode='FeeHistory'
+EIP1559DynamicFees = false
+PriceMax = '1 gwei' # DS&A recommended value
+PriceMin = '40 mwei' # During testing, we saw minimum gas prices ~50 mwei
+PriceDefault = '1 gwei' # As we set PriceMax to '1 gwei' and PriceDefault must be less than or equal to PriceMax
+FeeCapDefault = '1 gwei' # As we set PriceMax to '1 gwei' and FeeCapDefault must be less than or equal to PriceMax
+
+[HeadTracker]
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false

ccip/config/evm/Blast_Mainnet.toml

@@ -26,9 +26,12 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
 PollFailureThreshold = 4
 # polls every 4sec to check if there is a block produced, since blockRate is ~3sec
-PollInterval = '4s'
+PollInterval = '4s'

ccip/config/evm/Blast_Sepolia.toml

@@ -26,9 +26,12 @@ EIP1559FeeCapBufferBlocks = 0
 
 [HeadTracker]
 HistoryDepth = 300
+# FinalityDepth < 1k => FinalityTagBypass = false
+# https://smartcontract-it.atlassian.net/browse/SHIP-4078
+FinalityTagBypass = false
 
 [NodePool]
 # 4 block sync time between nodes to ensure they aren't labelled unreachable too soon
 PollFailureThreshold = 4
 # polls every 4sec to check if there is a block produced, since blockRate is ~3sec
-PollInterval = '4s'
+PollInterval = '4s'

ccip/config/evm/Bsquared_Mainnet.toml

@@ -0,0 +1,23 @@
+ChainID = '223'
+# OP stack from questionnaire https://docs.google.com/spreadsheets/d/1l8dx1GzxEnjgwH5x3vB60FUr5iFALzPcs6W_wOAiuDs/edit?gid=625078687#gid=625078687
+ChainType = 'optimismBedrock'
+# finality_depth was: ~1900
+FinalityDepth = 2000
+# block_time:  ~2s, adding 1 second buffer 
+LogPollInterval = '3s' 
+
+# finality_depth * block_time / 60 secs = ~66  min (finality time)
+NoNewFinalizedHeadsThreshold = '70m' 
+
+FinalityTagEnabled = true 
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100

ccip/config/evm/Bsquared_Testnet.toml

@@ -0,0 +1,23 @@
+ChainID = '1123'
+# OP stack from questionnaire https://docs.google.com/spreadsheets/d/1l8dx1GzxEnjgwH5x3vB60FUr5iFALzPcs6W_wOAiuDs/edit?gid=625078687#gid=625078687
+ChainType = 'optimismBedrock'
+# finality_depth was: ~1900
+FinalityDepth = 2000
+# block_time:  ~2s, adding 1 second buffer  
+LogPollInterval = '3s'
+
+# finality_depth * block_time / 60 secs = ~66  min (finality time)
+NoNewFinalizedHeadsThreshold = '70m'
+
+FinalityTagEnabled = true
+
+[GasEstimator]
+EIP1559DynamicFees = true
+Mode = 'FeeHistory'
+
+[GasEstimator.FeeHistory]
+# block_time was: 2s, per recommendation skip 1-2 blocks
+CacheTimeout = '4s'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 100