Merge upstream 27 sep 2024

.github/actions/golangci-lint/action.yml

@@ -58,7 +58,7 @@ runs:
         skip-pkg-cache: true
         skip-build-cache: true
         # only-new-issues is only applicable to PRs, otherwise it is always set to false
-        only-new-issues: false # disabled for PRs due to unreliability
+        only-new-issues: true
         args: --out-format colored-line-number,checkstyle:golangci-lint-report.xml
         working-directory: ${{ inputs.go-directory }}
     - name: Print lint report artifact

.gitignore

@@ -72,11 +72,13 @@ ztarrepo.tar.gz
 **/test-ledger/*
 __debug_bin*
 .test_summary/
+db_dumps/
 .run.id
 integration-tests/**/traces/
 benchmark_report.csv
 benchmark_summary.json
-integration-tests/citool/output.csv
+secrets.toml
+tmp_laneconfig/
 
 # goreleaser builds
 cosign.*
@@ -97,6 +99,7 @@ core/scripts/ccip/csv/node-wallets
 *report.xml
 *report.json
 *.out
+dot_graphs/
 
 contracts/yarn.lock
 
@@ -119,7 +122,7 @@ tools/flakeytests/coverage.txt
 # Runtime test configuration that might contain secrets
 override*.toml
 
-# Pythin venv
+# Python venv
 .venv/
 
 ocr_soak_report.csv

.golangci.yml

@@ -71,9 +71,10 @@ linters-settings:
       - name: error-return
       - name: error-strings
       - name: error-naming
+#      - name: exported
       - name: if-return
       - name: increment-decrement
-      # - name: var-naming
+#      - name: var-naming
       - name: var-declaration
       - name: package-comments
       - name: range
@@ -92,7 +93,7 @@ linters-settings:
       - name: struct-tag
       # - name: string-format
       - name: string-of-int
-      # - name: range-val-address
+#      - name: range-val-address
       - name: range-val-in-closure
       - name: modifies-value-receiver
       - name: modifies-parameter

.goreleaser.develop.yaml

@@ -1,9 +1,12 @@
-## goreleaser <1.14.0
 project_name: chainlink
 
+version: 2
+
 env:
   - ZIG_EXEC={{ if index .Env "ZIG_EXEC"  }}{{ .Env.ZIG_EXEC }}{{ else }}zig{{ end }}
   - IMAGE_PREFIX={{ if index .Env "IMAGE_PREFIX"  }}{{ .Env.IMAGE_PREFIX }}{{ else }}localhost:5001{{ end }}
+  - IMAGE_NAME={{ if index .Env "IMAGE_NAME" }}{{ .Env.IMAGE_NAME }}{{ else }}chainlink{{ end }}
+  - IMAGE_TAG={{ if index .Env "IMAGE_TAG" }}{{ .Env.IMAGE_TAG }}{{ else }}develop{{ end }}
   - IMAGE_LABEL_DESCRIPTION="node of the decentralized oracle network, bridging on and off-chain computation"
   - IMAGE_LABEL_LICENSES="MIT"
   - IMAGE_LABEL_SOURCE="https://github.com/smartcontractkit/{{ .ProjectName }}"
@@ -56,18 +59,18 @@ builds:
 
 # See https://goreleaser.com/customization/docker/
 dockers:
-  - id: root-linux-amd64
+  - id: linux-amd64
     dockerfile: core/chainlink.goreleaser.Dockerfile
     use: buildx
     goos: linux
     goarch: amd64
     extra_files:
       - tmp/linux_amd64/libs
-      - tmp/linux_amd64/plugins
       - tools/bin/ldd_fix
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--pull"
+      - "--build-arg=CHAINLINK_USER=chainlink"
       - "--build-arg=COMMIT_SHA={{ .FullCommit }}"
       - "--label=org.opencontainers.image.created={{ .Date }}"
       - "--label=org.opencontainers.image.description={{ .Env.IMAGE_LABEL_DESCRIPTION }}"
@@ -78,20 +81,21 @@ dockers:
       - "--label=org.opencontainers.image.version={{ .Env.CHAINLINK_VERSION }}"
       - "--label=org.opencontainers.image.url={{ .Env.IMAGE_LABEL_SOURCE }}"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-root-amd64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-root-amd64"
-  - id: root-linux-arm64
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-amd64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-amd64"
+  - id: linux-arm64
     dockerfile: core/chainlink.goreleaser.Dockerfile
     use: buildx
     goos: linux
     goarch: arm64
     extra_files:
       - tmp/linux_arm64/libs
-      - tmp/linux_arm64/plugins
       - tools/bin/ldd_fix
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--pull"
+      - "--build-arg=CHAINLINK_USER=chainlink"
       - "--build-arg=COMMIT_SHA={{ .FullCommit }}"
       - "--label=org.opencontainers.image.created={{ .Date }}"
       - "--label=org.opencontainers.image.description={{ .Env.IMAGE_LABEL_DESCRIPTION }}"
@@ -102,9 +106,9 @@ dockers:
       - "--label=org.opencontainers.image.version={{ .Env.CHAINLINK_VERSION }}"
       - "--label=org.opencontainers.image.url={{ .Env.IMAGE_LABEL_SOURCE }}"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-root-arm64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-root-arm64"
-  - id: linux-amd64
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-arm64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-arm64"
+  - id: linux-amd64-plugins
     dockerfile: core/chainlink.goreleaser.Dockerfile
     use: buildx
     goos: linux
@@ -118,6 +122,10 @@ dockers:
       - "--pull"
       - "--build-arg=CHAINLINK_USER=chainlink"
       - "--build-arg=COMMIT_SHA={{ .FullCommit }}"
+      - "--build-arg=CL_MEDIAN_CMD=chainlink-feeds"
+      - "--build-arg=CL_MERCURY_CMD=chainlink-mercury"
+      - "--build-arg=CL_SOLANA_CMD=chainlink-solana"
+      - "--build-arg=CL_STARKNET_CMD=chainlink-starknet"
       - "--label=org.opencontainers.image.created={{ .Date }}"
       - "--label=org.opencontainers.image.description={{ .Env.IMAGE_LABEL_DESCRIPTION }}"
       - "--label=org.opencontainers.image.licenses={{ .Env.IMAGE_LABEL_LICENSES }}"
@@ -127,9 +135,10 @@ dockers:
       - "--label=org.opencontainers.image.version={{ .Env.CHAINLINK_VERSION }}"
       - "--label=org.opencontainers.image.url={{ .Env.IMAGE_LABEL_SOURCE }}"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-amd64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-amd64"
-  - id: linux-arm64
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-plugins"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-plugins-amd64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-plugins-amd64"
+  - id: linux-arm64-plugins
     dockerfile: core/chainlink.goreleaser.Dockerfile
     use: buildx
     goos: linux
@@ -143,6 +152,10 @@ dockers:
       - "--pull"
       - "--build-arg=CHAINLINK_USER=chainlink"
       - "--build-arg=COMMIT_SHA={{ .FullCommit }}"
+      - "--build-arg=CL_MEDIAN_CMD=chainlink-feeds"
+      - "--build-arg=CL_MERCURY_CMD=chainlink-mercury"
+      - "--build-arg=CL_SOLANA_CMD=chainlink-solana"
+      - "--build-arg=CL_STARKNET_CMD=chainlink-starknet"
       - "--label=org.opencontainers.image.created={{ .Date }}"
       - "--label=org.opencontainers.image.description={{ .Env.IMAGE_LABEL_DESCRIPTION }}"
       - "--label=org.opencontainers.image.licenses={{ .Env.IMAGE_LABEL_LICENSES }}"
@@ -152,38 +165,50 @@ dockers:
       - "--label=org.opencontainers.image.version={{ .Env.CHAINLINK_VERSION }}"
       - "--label=org.opencontainers.image.url={{ .Env.IMAGE_LABEL_SOURCE }}"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-arm64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-arm64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-plugins-arm64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-plugins-arm64"
 
 # See https://goreleaser.com/customization/docker_manifest/
 docker_manifests:
-  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-root"
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-root-amd64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-root-arm64"
-  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-root"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-amd64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-arm64"
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-root-amd64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-root-arm64"
-  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-amd64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-arm64"
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-plugins"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-amd64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:develop-arm64"
-  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-plugins"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-plugins-amd64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:{{ .Env.IMAGE_TAG }}-plugins-arm64"
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-plugins"
     image_templates:
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-amd64"
-      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}-develop:sha-{{ .ShortCommit }}-arm64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-plugins-amd64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .Env.IMAGE_NAME }}:sha-{{ .ShortCommit }}-plugins-arm64"
 
 # See https://goreleaser.com/customization/docker_sign/
 docker_signs:
   - artifacts: all
-    stdin: "{{ .Env.COSIGN_PASSWORD }}"
+    args:
+      - "sign"
+      - "${artifact}"
+      - "--yes"
 
 checksum:
   name_template: "checksums.txt"
 
 snapshot:
-  name_template: "{{ .Env.CHAINLINK_VERSION }}-{{ .ShortCommit }}"
+  version_template: "{{ .Env.CHAINLINK_VERSION }}-{{ .ShortCommit }}"
+
+partial:
+  by: target
+
+# See https://goreleaser.com/customization/release/
+release:
+  disable: true
 
 changelog:
   sort: asc

.goreleaser.devspace.yaml

@@ -1,6 +1,8 @@
 ## goreleaser <1.14.0
 project_name: ccip
 
+version: 2
+
 env:
   - ZIG_EXEC={{ if index .Env "ZIG_EXEC"  }}{{ .Env.ZIG_EXEC }}{{ else }}zig{{ end }}
   - IMAGE_LABEL_DESCRIPTION="node of the decentralized oracle network, bridging on and off-chain computation"
@@ -75,7 +77,7 @@ checksum:
   name_template: "checksums.txt"
 
 snapshot:
-  name_template: '{{ .Env.CHAINLINK_VERSION }}-{{ .Runtime.Goarch }}-{{ .Now.Format "2006-01-02-15-04-05Z" }}'
+  version_template: '{{ .Env.CHAINLINK_VERSION }}-{{ .Runtime.Goarch }}-{{ .Now.Format "2006-01-02-15-04-05Z" }}'
 
 changelog:
   sort: asc

.mockery.yaml

@@ -261,10 +261,14 @@ packages:
       ORM:
       Runner:
       PipelineParamUnmarshaler:
-  github.com/smartcontractkit/chainlink/v2/core/services/promreporter:
+  github.com/smartcontractkit/chainlink/v2/core/services/headreporter:
     config:
-      dir: core/internal/mocks
+      dir: "{{ .InterfaceDir }}"
+      filename: "{{ .InterfaceName | snakecase }}_mock.go"
+      inpackage: true
+      mockname: "Mock{{ .InterfaceName | camelcase }}"
     interfaces:
+      HeadReporter:
       PrometheusBackend:
   github.com/smartcontractkit/libocr/commontypes:
     config:
@@ -341,14 +345,14 @@ packages:
       filename: evm2_evm_on_ramp_interface.go
       outpkg: mock_contracts
     interfaces:
-      EVM2EVMOnRampInterface: 
+      EVM2EVMOnRampInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_offramp:
       config:
         dir: core/gethwrappers/ccip/mocks/
         filename: evm2_evm_off_ramp_interface.go
         outpkg: mock_contracts
       interfaces:
-        EVM2EVMOffRampInterface: 
+        EVM2EVMOffRampInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_offramp_1_2_0:
     config:
       dir: core/gethwrappers/ccip/mocks/v1_2_0/
@@ -377,34 +381,41 @@ packages:
       outpkg: mock_contracts
     interfaces:
       FeeQuoterInterface:
+  github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/price_registry:
+    config:
+      dir: core/gethwrappers/ccip/mocks/
+      filename: price_registry_interface.go
+      outpkg: mock_contracts
+    interfaces:
+      PriceRegistryInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/link_token_interface:
     config:
       dir: core/gethwrappers/ccip/mocks/
       filename: link_token_interface.go
       outpkg: mock_contracts
     interfaces:
-      LinkTokenInterface: 
+      LinkTokenInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/arbitrum_l1_bridge_adapter:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_arbitrum_l1_bridge_adapter/
       filename: arbitrum_l1_bridge_adapter_interface.go
       outpkg: mock_arbitrum_l1_bridge_adapter
     interfaces:
-      ArbitrumL1BridgeAdapterInterface: 
+      ArbitrumL1BridgeAdapterInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/arbitrum_l2_bridge_adapter:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_arbitrum_l2_bridge_adapter/
       filename: arbitrum_l2_bridge_adapter_interface.go
       outpkg: mock_arbitrum_l2_bridge_adapter
     interfaces:
-      ArbitrumL2BridgeAdapterInterface: 
+      ArbitrumL2BridgeAdapterInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/arbitrum_gateway_router:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_arbitrum_gateway_router/
       filename: arbitrum_gateway_router_interface.go
       outpkg: mock_arbitrum_gateway_router
     interfaces:
-      ArbitrumGatewayRouterInterface: 
+      ArbitrumGatewayRouterInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/arbitrum_inbox:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_arbitrum_inbox/
@@ -418,7 +429,7 @@ packages:
       filename: l2_arbitrum_gateway_interface.go
       outpkg: mock_l2_arbitrum_gateway
     interfaces:
-      L2ArbitrumGatewayInterface: 
+      L2ArbitrumGatewayInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/arbsys:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_arbsys/
@@ -432,7 +443,7 @@ packages:
       filename: node_interface_interface.go
       outpkg: mock_node_interface
     interfaces:
-      NodeInterfaceInterface: 
+      NodeInterfaceInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/l2_arbitrum_messenger:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_l2_arbitrum_messenger/
@@ -446,7 +457,7 @@ packages:
       filename: arb_rollup_core_interface.go
       outpkg: mock_arbitrum_rollup_core
     interfaces:
-      ArbRollupCoreInterface: 
+      ArbRollupCoreInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/optimism_portal:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_optimism_portal/
@@ -460,7 +471,7 @@ packages:
       filename: optimism_l2_output_oracle_interface.go
       outpkg: mock_optimism_l2_output_oracle
     interfaces:
-      OptimismL2OutputOracleInterface: 
+      OptimismL2OutputOracleInterface:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/liquiditymanager/generated/optimism_portal_2:
     config:
       dir: core/gethwrappers/liquiditymanager/mocks/mock_optimism_portal_2/
@@ -474,7 +485,7 @@ packages:
       filename: optimism_dispute_game_factory_interface.go
       outpkg: mock_optimism_dispute_game_factory
     interfaces:
-      OptimismDisputeGameFactoryInterface: 
+      OptimismDisputeGameFactoryInterface:
   github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache:
     config:
       filename: chain_health_mock.go
@@ -612,4 +623,7 @@ packages:
       dir: "{{ .InterfaceDir }}/../mocks"
       filename: rebalancer_mock.go
     interfaces:
-      RebalancingAlgo:
+      RebalancingAlgo:
+  github.com/smartcontractkit/chainlink/v2/core/services/registrysyncer:
+    interfaces:
+      ORM: