Merge branch 'develop' into NONEVM-934/add-solana-chainwriter-config

.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/cold-pillows-sleep.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Extract EVM MultiNode to chainlink-framework. #internal

.changeset/cuddly-turtles-arrive.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal adding solana devnet to ccip deployment

.changeset/eleven-cheetahs-care.md

@@ -0,0 +1,7 @@
+---
+"chainlink": patch
+---
+
+Add panic recovery to wsrpc mercury client
+
+- Should help to make nodes running wsrpc v0.8.2 more stable #bugfix

.changeset/rotten-books-cross.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Support multiple streamIDs in stream specs #added

.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

.changeset/wise-buttons-fry.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Add TRON integration #added

.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/build-publish-develop-pr.yml

@@ -83,19 +83,34 @@ jobs:
         include:
           - runner: ubuntu-latest
             goarch: amd64
-            dist_name: linux_amd64_v1
+            dist_name: linux_amd64
 
           - runner: ubuntu-24.04-4cores-16GB-ARM
             goarch: arm64
-            dist_name: linux_arm64_v8.0
+            dist_name: linux_arm64
     steps:
-      - name: Checkout repository
+      - name: Checkout chainlink repository
         uses: actions/checkout@v4.2.1
         with:
           persist-credentials: false
           ref: ${{ env.CHECKOUT_REF }}
           fetch-depth: 0
 
+      - name: Setup Github Token
+        id: token
+        uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # setup-github-token@0.2.1
+        with:
+          aws-role-arn: ${{ secrets.AWS_OIDC_GLOBAL_READ_ONLY_TOKEN_ISSUER_ROLE_ARN }}
+          aws-lambda-url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Checkout capabilities repository
+        uses: actions/checkout@v4.2.1
+        with:
+          repository: smartcontractkit/capabilities
+          token: ${{ steps.token.outputs.access-token }}
+          path: capabilities
+
       - name: Configure aws credentials
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
@@ -107,7 +122,7 @@ jobs:
       - id: cache
         uses: actions/cache@v4
         with:
-          path: dist/${{ matrix.dist_name }}
+          path: ./dist/${{ matrix.dist_name }}
           key: chainlink-${{ matrix.goarch }}-${{ github.sha }}
 
       - name: Build images for ${{ matrix.goarch }}
@@ -144,13 +159,13 @@ jobs:
 
       - uses: actions/cache/restore@v4
         with:
-          path: dist/linux_amd64_v1
+          path: ./dist/linux_amd64
           key: chainlink-amd64-${{ github.sha }}
           fail-on-cache-miss: true
 
       - uses: actions/cache/restore@v4
         with:
-          path: dist/linux_arm64_v8.0
+          path: ./dist/linux_arm64
           key: chainlink-arm64-${{ github.sha }}
           fail-on-cache-miss: 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

.mockery.yaml

@@ -3,20 +3,6 @@ mockname: "{{ .InterfaceName }}"
 outpkg: mocks
 filename: "{{ .InterfaceName | snakecase }}.go"
 packages:
-  github.com/smartcontractkit/chainlink/v2/common/client:
-    config:
-      dir: "{{ .InterfaceDir }}"
-      filename: "mock_{{ .InterfaceName | snakecase }}_test.go"
-      inpackage: true
-      mockname: "mock{{ .InterfaceName | camelcase }}"
-    interfaces:
-      Node:
-      NodeSelector:
-      sendOnlyClient:
-      SendOnlyNode:
-      RPCClient:
-      Head:
-      PoolChainInfoProvider:
   github.com/smartcontractkit/chainlink/v2/common/headtracker:
     interfaces:
       HeadTrackable:
@@ -35,9 +21,11 @@ packages:
       TxStrategy:
       TxAttemptBuilder:
       TxStore:
-  github.com/smartcontractkit/chainlink/v2/common/types:
+  github.com/smartcontractkit/chainlink-framework/multinode:
+    config:
+      dir: common/types/mocks
+      outpkg: mocks
     interfaces:
-      Head:
       Subscription:
   github.com/smartcontractkit/chainlink/v2/core/bridges:
     interfaces:
@@ -233,6 +221,7 @@ packages:
       StarkNet:
         config:
           filename: starknet.go
+      Tron:
       VRF:
       Workflow:
   github.com/smartcontractkit/chainlink/v2/core/services/ocr:
@@ -591,4 +580,4 @@ packages:
           dir: "{{ .InterfaceDir }}"
   github.com/smartcontractkit/chainlink/v2/core/capabilities/targets:
     interfaces:
-      ContractValueGetter:
+      ContractValueGetter:

GNUmakefile

@@ -146,7 +146,7 @@ gomodslocalupdate: gomods ## Run gomod-local-update
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.
-	go install github.com/vektra/mockery/v2@v2.46.3
+	go install github.com/vektra/mockery/v2@v2.50.0
 
 .PHONY: codecgen
 codecgen: $(codecgen) ## Install codecgen

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