Merge develop

smartcontractkit · Jan 21, 2025 · 605db00 · 605db00
2 parents 1a0ef3c + 7ba8f9a
commit 605db00
Show file tree

Hide file tree

Showing 393 changed files with 21,767 additions and 10,286 deletions.
diff --git a/.changeset/hot-cats-enjoy.md b/.changeset/hot-cats-enjoy.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#added beholder metric to monitor TXMv2 transactions.
diff --git a/.changeset/many-nails-explode.md b/.changeset/many-nails-explode.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added core configs
diff --git a/.changeset/polite-spiders-tan.md b/.changeset/polite-spiders-tan.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated Move chainlink/common to chainlink-framework/chains.
diff --git a/.changeset/poor-adults-tie.md b/.changeset/poor-adults-tie.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated Explicitly use protoc installed in the makefile.
diff --git a/.changeset/thin-emus-wait.md b/.changeset/thin-emus-wait.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+fix solana client calls and update solana ref. #internal
diff --git a/.github/actions/build-sign-publish-chainlink/action.yml b/.github/actions/build-sign-publish-chainlink/action.yml
@@ -45,6 +45,10 @@ inputs:
   aws-region:
     description: The AWS region the ECR repository is located in, should only be needed for public ECR repositories, used in configuring docker/login-action
     required: false
+  git-tag-type:
+    description: The type of git tag (core or ccip)
+    default: core
+    required: false
 
   # Inputs for signing
   sign-images:
@@ -70,6 +74,9 @@ runs:
     - name: Set shared variables
       shell: bash
       # See https://docs.github.com/en/actions/learn-github-actions/workflow-commands-for-github-actions#multiline-strings
+      env:
+        GIT_COMMIT_SHA: ${{ inputs.git-commit-sha }}
+        GIT_TAG_TYPE: ${{ inputs.git-tag-type }}
       run: |
         SHARED_IMAGES=${{ inputs.ecr-hostname }}/${{ inputs.ecr-image-name }}
         OIDC_ISSUER=https://token.actions.githubusercontent.com
@@ -82,10 +89,18 @@ runs:
         EOF
         )
 
-        SHARED_BUILD_ARGS=$(cat << EOF
-        COMMIT_SHA=${{ inputs.git-commit-sha }}
+        if [[ "${GIT_TAG_TYPE}" = "ccip" ]]; then
+          SHARED_BUILD_ARGS=$(cat << EOF
+        COMMIT_SHA=${GIT_COMMIT_SHA}
+        CL_CHAIN_DEFAULTS=/chainlink/ccip-config
         EOF
         )
+        else
+          SHARED_BUILD_ARGS=$(cat << EOF
+        COMMIT_SHA=${GIT_COMMIT_SHA}
+        EOF
+        )
+        fi
 
         echo "shared-images<<EOF" >> $GITHUB_ENV
         echo "$SHARED_IMAGES" >> $GITHUB_ENV

diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
@@ -21,7 +21,7 @@ inputs:
 outputs:
   golang-report-artifact-url:
     description: The URL to the uploaded artifact
-    value: ${{ steps.upload-artifact.outputs.artifact_url }}
+    value: ${{ steps.upload-artifact.outputs.artifact-url }}
 
 runs:
   using: composite

diff --git a/.github/integration-in-memory-tests.yml b/.github/integration-in-memory-tests.yml
@@ -95,4 +95,21 @@ runner-test-matrix:
       - PR Integration CCIP Tests
     test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_token_transfer_test.go -timeout 16m -test.parallel=1 -count=1 -json
 
+  - id: smoke/ccip/ccip_cs_update_rmn_config_test.go:*
+    path: integration-tests/smoke/ccip/ccip_cs_update_rmn_config_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_cs_update_rmn_config_test.go -timeout 20m -test.parallel=1 -count=1 -json
+
+  - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:*
+    path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go -timeout 10m -test.parallel=1 -count=1 -json
+
+
   # END: CCIP tests
diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
@@ -91,6 +91,7 @@ jobs:
           dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }}
           sign-images: true
           verify-signature: true
+          git-tag-type: ${{ needs.checks.outputs.git-tag-type }}
 
       - name: Attest Docker image
         uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2

diff --git a/.mockery.yaml b/.mockery.yaml
@@ -3,15 +3,24 @@ mockname: "{{ .InterfaceName }}"
 outpkg: mocks
 filename: "{{ .InterfaceName | snakecase }}.go"
 packages:
-  github.com/smartcontractkit/chainlink/v2/common/headtracker:
+  github.com/smartcontractkit/chainlink-framework/chains/headtracker:
+    config:
+      dir: common/headtracker/mocks
+      outpkg: mocks
     interfaces:
       HeadTrackable:
       HeadTracker:
       HeadBroadcaster:
-  github.com/smartcontractkit/chainlink/v2/common/txmgr:
+  github.com/smartcontractkit/chainlink-framework/chains/txmgr:
+    config:
+      dir: common/txmgr/mocks
+      outpkg: mocks
     interfaces:
       TxManager:
-  github.com/smartcontractkit/chainlink/v2/common/txmgr/types:
+  github.com/smartcontractkit/chainlink-framework/chains/txmgr/types:
+    config:
+      dir: common/txmgr/types/mocks
+      outpkg: mocks
     interfaces:
       ReaperChainConfig:
         config:

diff --git a/GNUmakefile b/GNUmakefile
@@ -108,7 +108,8 @@ abigen: ## Build & install abigen.
 
 .PHONY: generate
 generate: abigen codecgen mockery protoc gomods ## Execute all go:generate commands.
-	gomods -w go generate -x ./...
+	## Updating PATH makes sure that go:generate uses the version of protoc installed by the protoc make command.
+	export PATH=$(HOME)/.local/bin:$(PATH); gomods -w go generate -x ./...
 	find . -type f -name .mockery.yaml -execdir mockery \; ## Execute mockery for all .mockery.yaml files
 
 .PHONY: rm-mocked
@@ -147,7 +148,7 @@ testdb-user-only: ## Prepares the test database with user only.
 
 .PHONY: gomods
 gomods: ## Install gomods
-	go install github.com/jmank88/[email protected].4
+	go install github.com/jmank88/[email protected].5
 
 .PHONY: gomodslocalupdate
 gomodslocalupdate: gomods ## Run gomod-local-update

diff --git a/ccip/config/evm/Astar_Shibuya.toml b/ccip/config/evm/Astar_Shibuya.toml
diff --git a/ccip/config/evm/Avalanche_ANZ_testnet.toml b/ccip/config/evm/Avalanche_ANZ_testnet.toml
@@ -17,8 +17,3 @@ PriceMin = '25 gwei'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 24
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_Fuji.toml b/ccip/config/evm/Avalanche_Fuji.toml
@@ -15,8 +15,3 @@ PriceDefault = '1 gwei'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 24
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Avalanche_Mainnet.toml b/ccip/config/evm/Avalanche_Mainnet.toml
@@ -16,8 +16,3 @@ PriceDefault = '1 gwei'
 [GasEstimator.BlockHistory]
 # Average block time of 2s
 BlockHistorySize = 24
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/BOB_Mainnet.toml b/ccip/config/evm/BOB_Mainnet.toml
@@ -21,8 +21,3 @@ CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/BOB_Testnet.toml b/ccip/config/evm/BOB_Testnet.toml
@@ -21,8 +21,3 @@ CacheTimeout = '4s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Mainnet.toml b/ccip/config/evm/BSC_Mainnet.toml
@@ -28,8 +28,3 @@ ObservationGracePeriod = '500ms'
 
 [NodePool]
 SyncThreshold = 10
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/BSC_Testnet.toml b/ccip/config/evm/BSC_Testnet.toml
@@ -22,8 +22,6 @@ BlockHistorySize = 24
 [HeadTracker]
 HistoryDepth = 100
 SamplingInterval = '1s'
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
 FinalityTagBypass = false
 
 [OCR]

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

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

diff --git a/ccip/config/evm/Berachain_Testnet.toml b/ccip/config/evm/Berachain_Testnet.toml
@@ -17,8 +17,3 @@ CacheTimeout = '10s'
 
 [GasEstimator.BlockHistory]
 BlockHistorySize = 100
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Blast_Mainnet.toml b/ccip/config/evm/Blast_Mainnet.toml
@@ -1,37 +1,11 @@
 ChainID = '81457'
-FinalityDepth = 200
-FinalityTagEnabled = true
-ChainType = 'optimismBedrock'
-# block rate is ~2sec, so this ensures blocks are polled correctly
-LogPollInterval = '2s'
-
-[GasEstimator]
-EIP1559DynamicFees = true
-BumpThreshold = 60
-BumpPercent = 20
-BumpMin = '100 wei'
-PriceMax = '120 gwei'
-LimitDefault = 8000000
-FeeCapDefault = '120 gwei'
 
 [GasEstimator.BlockHistory]
 # Default is 24, which leads to bumpy gas prices. In CCIP
 # we want to smooth out the gas prices, so we increase the sample size.
 BlockHistorySize = 200
 # The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
 # where tipcap is managed by the block history estimators. In the context of CCIP,
-# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# the gas price is relayed to other chains for quotes so we want accurate/avg not pessimistic values.
 # So we set this to zero so FeeCap = baseFee + tipcap.
 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'
diff --git a/ccip/config/evm/Blast_Sepolia.toml b/ccip/config/evm/Blast_Sepolia.toml
@@ -1,18 +1,4 @@
 ChainID = '168587773'
-FinalityDepth = 200
-FinalityTagEnabled = true
-ChainType = 'optimismBedrock'
-# block rate is ~2sec, so this ensures blocks are polled correctly
-LogPollInterval = '2s'
-
-[GasEstimator]
-EIP1559DynamicFees = true
-BumpThreshold = 60
-BumpPercent = 20
-BumpMin = '100 wei'
-PriceMax = '120 gwei'
-LimitDefault = 8000000
-FeeCapDefault = '120 gwei'
 
 [GasEstimator.BlockHistory]
 # Default is 24, which leads to bumpy gas prices. In CCIP
@@ -23,15 +9,3 @@ BlockHistorySize = 200
 # the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
 # So we set this to zero so FeeCap = baseFee + tipcap.
 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'
diff --git a/ccip/config/evm/Celo_Mainnet.toml b/ccip/config/evm/Celo_Mainnet.toml
@@ -22,6 +22,3 @@ BlockHistorySize = 12
 
 [HeadTracker]
 HistoryDepth = 50
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Ethereum_Holesky.toml b/ccip/config/evm/Ethereum_Holesky.toml
@@ -0,0 +1,11 @@
+ChainID = '17000'
+
+[GasEstimator.BlockHistory]
+# Default is 4!?, which leads to bumpy gas prices. In CCIP
+# we want to smooth out the gas prices, so we increase the sample size.
+BlockHistorySize = 200
+# The formula for FeeCap is (current block base fee * (1.125 ^ EIP1559FeeCapBufferBlocks) + tipcap)
+# where tipcap is managed by the block history estimators. In the context of CCIP,
+# the gas price is relayed to other changes for quotes so we want accurate/avg not pessimistic values.
+# So we set this to zero so FeeCap = baseFee + tipcap.
+EIP1559FeeCapBufferBlocks = 0
diff --git a/ccip/config/evm/Ethereum_Mainnet.toml b/ccip/config/evm/Ethereum_Mainnet.toml
@@ -15,8 +15,3 @@ TransactionPercentile = 50
 
 [OCR2.Automation]
 GasLimit = 10500000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Ethereum_Sepolia.toml b/ccip/config/evm/Ethereum_Sepolia.toml
@@ -12,8 +12,3 @@ TransactionPercentile = 50
 
 [OCR2.Automation]
 GasLimit = 10500000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Fantom_Mainnet.toml b/ccip/config/evm/Fantom_Mainnet.toml
@@ -10,8 +10,3 @@ Mode = 'SuggestedPrice'
 
 [OCR2.Automation]
 GasLimit = 3800000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false
diff --git a/ccip/config/evm/Fantom_Testnet.toml b/ccip/config/evm/Fantom_Testnet.toml
@@ -10,8 +10,3 @@ Mode = 'SuggestedPrice'
 
 [OCR2.Automation]
 GasLimit = 3800000
-
-[HeadTracker]
-# FinalityDepth < 1k => FinalityTagBypass = false
-# https://smartcontract-it.atlassian.net/browse/SHIP-4078
-FinalityTagBypass = false