Skip to content

Commit

Permalink
Merge branch 'develop' into additions-to-cr-solana-cfg
Browse files Browse the repository at this point in the history
  • Loading branch information
amit-momin committed Feb 25, 2025
2 parents 9cd9c2c + f638d60 commit 15498e0
Show file tree
Hide file tree
Showing 491 changed files with 26,222 additions and 11,742 deletions.
5 changes: 5 additions & 0 deletions .changeset/forty-taxis-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

address codec implementation #added
5 changes: 5 additions & 0 deletions .changeset/itchy-cameras-scream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated Move BoxOutput util function to the only place it is called.
5 changes: 5 additions & 0 deletions .changeset/late-goats-exercise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated Removed unnecessary dependendies from json_normalization_test.go.
5 changes: 5 additions & 0 deletions .changeset/olive-comics-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated Fix abigen compilation on Mac.
5 changes: 5 additions & 0 deletions .changeset/pink-bears-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated Moved Mailboxes.md to docs.
5 changes: 5 additions & 0 deletions .changeset/shaggy-brooms-rush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#added support importing eth and p2p keys on startup
5 changes: 5 additions & 0 deletions .changeset/weak-terms-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#updated ccip-owner-contracts in CLD to latest
5 changes: 5 additions & 0 deletions .changeset/young-poems-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

fix(chainlink/deployment): loads unlabeled contracts from address book by default
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ core/scripts/gateway @smartcontractkit/dev-services
/deployment/ccip @smartcontractkit/ccip-tooling @smartcontractkit/ccip-offchain @smartcontractkit/core @smartcontractkit/deployment-automation
/deployment/keystone @smartcontractkit/keystone @smartcontractkit/core @smartcontractkit/deployment-automation
/deployment/ccip/changeset/solana @smartcontractkit/solana-tooling @smartcontractkit/core @smartcontractkit/deployment-automation
/deployment/data-feeds @smartcontractkit/data-feeds-engineers @smartcontractkit/core @smartcontractkit/deployment-automation
# TODO: As more products add their deployment logic here, add the team as an owner

# CI/CD
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/golangci-lint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ runs:
- name: Golangci-lint
uses: golangci/golangci-lint-action@38e1018663fa5173f3968ea0777460d3de38f256 # v5.3.0
with:
version: v1.62.2
version: v1.64.5
only-new-issues: true
args: --out-format colored-line-number,checkstyle:golangci-lint-report.xml
working-directory: ${{ steps.set-working-directory.outputs.golangci-lint-working-directory }}
Expand Down
16 changes: 6 additions & 10 deletions .github/actions/goreleaser-build-sign-publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inputs:
required: false
# goreleaser inputs
goreleaser-release-type:
description: The goreleaser release type, it can be either "nightly", "merge", "snapshot", "release"
description: The goreleaser release type, it can be either "nightly", "merge", "snapshot", "release"
default: "snapshot"
required: false
goreleaser-config:
Expand All @@ -33,22 +33,18 @@ inputs:
buildkit debug information, and goreleaser debug, etc.
required: false
default: "${{ runner.debug == '1' }}"

runs:
using: composite
steps:
- # We need QEMU to test the cross architecture builds after they're built.
name: Set up QEMU
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
- # We need QEMU to test the cross architecture builds after they're built.
name: Set up QEMU
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0

- name: Setup docker buildx
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.0
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
with:
buildkitd-flags: ${{ inputs.enable-debug == 'true' && '--debug' || '' }}
# v0.16.0 until grpc fix is released
# see: https://github.com/docker/buildx/issues/2789#issuecomment-2487981922
driver-opts: |
image=moby/buildkit:v0.16.0

- name: Set up Go
uses: ./.github/actions/setup-go
Expand Down
84 changes: 22 additions & 62 deletions .github/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,18 +183,18 @@ runner-test-matrix:
E2E_TEST_CHAINLINK_VERSION: '{{ env.DEFAULT_CHAINLINK_PLUGINS_VERSION }}' # This is the chainlink version that has the plugins
ENABLE_OTEL_TRACES: true

- id: smoke/capabilities/workflow_test.go:*
path: integration-tests/smoke/capabilities/workflow_test.go
- id: system-tests/smoke/capabilities/workflow_test.go:TestKeystoneWithOCR3Workflow_SingleDon
path: system-tests/tests/smoke/capabilities/workflow_test.go
test_env_type: docker
runs_on: ubuntu-latest
triggers:
- PR Workflow Engine E2E Core Tests
- Nightly E2E Tests
test_cmd: cd integration-tests && go test github.com/smartcontractkit/chainlink/integration-tests/smoke/capabilities -v -run "^(TestKeystoneWithOCR3Workflow)$" -timeout 30m -count=1 -test.parallel=1 -json
test_cmd: cd system-tests/tests && go test github.com/smartcontractkit/chainlink/system-tests/tests/smoke/capabilities -v -run "^(TestKeystoneWithOCR3Workflow_SingleDon_MockedPrice)$" -timeout 30m -count=1 -test.parallel=1 -json
pyroscope_env: ci-smoke-capabilities-evm-simulated
test_env_vars:
E2E_TEST_CHAINLINK_VERSION: '{{ env.DEFAULT_CHAINLINK_PLUGINS_VERSION }}' # This is the chainlink version that has the plugins
E2E_JD_VERSION: 0.6.0 # there is no latest tag for this repo, so we need to specify the version
E2E_JD_VERSION: 0.9.0 # there is no latest tag for this repo, so we need to specify the version
GITHUB_READ_TOKEN: '{{ env.GITHUB_API_TOKEN }}' # GATI-provided token that can read from capabilities and dev-platform repos
CI: "true"
CTF_CONFIGS: "environment-ci.toml"
Expand Down Expand Up @@ -966,7 +966,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
CCIP_V16_TEST_ENV: docker

- id: smoke/ccip/ccip_gas_price_updates_test.go:*
Expand All @@ -980,7 +980,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
CCIP_V16_TEST_ENV: docker

- id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
Expand All @@ -994,7 +994,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand All @@ -1010,7 +1010,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand All @@ -1026,7 +1026,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand All @@ -1042,7 +1042,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand All @@ -1058,7 +1058,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand All @@ -1074,7 +1074,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand All @@ -1090,7 +1090,7 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand All @@ -1106,39 +1106,39 @@ runner-test-matrix:
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker

- id: smoke/ccip/ccip_rmn_test.go:^TestRMN_IncorrectSig$
path: integration-tests/smoke/ccip/ccip_rmn_test.go
path: integration-tests/smoke/ccip/ccip_rmn_test.go
test_env_type: docker
runs_on: ubuntu20.04-8cores-32GB
triggers:
- PR E2E Core Tests
- PR E2E Core Tests
- Nightly E2E Tests
test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_IncorrectSig$ -timeout 20m -test.parallel=1 -count=1 -json
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker

- id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatchingWithTemporaryPause$
path: integration-tests/smoke/ccip/ccip_rmn_test.go
path: integration-tests/smoke/ccip/ccip_rmn_test.go
test_env_type: docker
runs_on: ubuntu20.04-8cores-32GB
triggers:
- PR E2E Core Tests
- PR E2E Core Tests
- Nightly E2E Tests
test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_TwoMessagesOnTwoLanesIncludingBatchingWithTemporaryPause$ -timeout 12m -test.parallel=1 -count=1 -json
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.6.0
E2E_JD_VERSION: 0.9.0
E2E_RMN_RAGEPROXY_VERSION: 678509b
E2E_RMN_AFN2PROXY_VERSION: 678509b
CCIP_V16_TEST_ENV: docker
Expand Down Expand Up @@ -1227,6 +1227,7 @@ runner-test-matrix:
test_cmd: cd integration-tests/ccip-tests/smoke && go test -test.run ^TestSmokeCCIPForBidirectionalLane$ -timeout 30m -count=1 -test.parallel=1 -json
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
CHAINLINK_USER_TEAM: CCIP
test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/leader-lane.toml

- id: ccip-tests/smoke/ccip_test.go:^TestSmokeCCIPTokenPoolRateLimits$
Expand Down Expand Up @@ -1345,34 +1346,6 @@ runner-test-matrix:
CHAINLINK_USER_TEAM: CCIP
test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/ccip-reorg.toml

- id: integration-tests/ccip-tests/load/ccip_test.go:TestLoadCCIPStableRPS
path: integration-tests/ccip-tests/load/ccip_test.go
test_env_type: k8s-remote-runner
runs_on: ubuntu-latest
test_cmd: cd integration-tests/ccip-tests/load && DETACH_RUNNER=false go test -test.run ^TestLoadCCIPStableRPS$ -timeout 70m -count=1 -test.parallel=1 -json
test_env_vars:
TEST_SUITE: ccip-load
E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
triggers:
- E2E CCIP Load Tests
test_artifacts_on_failure:
- ./integration-tests/load/logs/payload_ccip.json

# Enable when CCIP-2277 is resolved
#
# - id: integration-tests/ccip-tests/load/ccip_test.go:TestLoadCCIPStableRPSAfterARMCurseAndUncurse
# path: integration-tests/ccip-tests/load/ccip_test.go
# test_env_type: k8s-remote-runner
# runs_on: ubuntu-latest
# test_cmd: cd integration-tests/ccip-tests/load && DETACH_RUNNER=false go test -test.run $TestLoadCCIPStableRPSAfterARMCurseAndUncurse$ -timeout 70m -count=1 -test.parallel=1 -json
# test_config_override_path: integration-tests/ccip-tests/testconfig/tomls/load-with-arm-curse-uncurse.toml
# test_env_vars:
# E2E_TEST_GRAFANA_DASHBOARD_URL: "/d/6vjVx-1V8/ccip-long-running-tests"
# triggers:
# - E2E CCIP Load Tests
# test_artifacts_on_failure:
# - ./integration-tests/load/logs/payload_ccip.json

- id: ccip-tests/chaos/ccip_test.go
path: integration-tests/ccip-tests/chaos/ccip_test.go
test_env_type: k8s-remote-runner
Expand All @@ -1384,19 +1357,6 @@ runner-test-matrix:
TEST_SUITE: chaos
TEST_TRIGGERED_BY: ccip-cron-chaos-eth
TEST_LOG_LEVEL: debug

- id: ccip-tests/load/ccip_test.go:^TestLoadCCIPStableWithPodChaosDiffCommitAndExec
path: integration-tests/ccip-tests/load/ccip_test.go
test_env_type: k8s-remote-runner
runs_on: ubuntu-latest
triggers:
# Disabled until CCIP-2555 is resolved
# - E2E CCIP Chaos Tests
test_cmd: cd integration-tests/ccip-tests/load && DETACH_RUNNER=false go test -run '^TestLoadCCIPStableWithPodChaosDiffCommitAndExec' -v -test.parallel=4 -timeout 120m -count=1 -json
test_env_vars:
TEST_SUITE: chaos
TEST_TRIGGERED_BY: ccip-cron-chaos-eth
TEST_LOG_LEVEL: debug
E2E_TEST_GRAFANA_DASHBOARD_URL: /d/6vjVx-1V8/ccip-long-running-tests
CHAINLINK_USER_TEAM: CCIP

# END: CCIP tests
2 changes: 1 addition & 1 deletion .github/integration-in-memory-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ runner-test-matrix:
runs_on: ubuntu-latest
triggers:
- PR Integration CCIP Tests
test_cmd: cd integration-tests/smoke/ccip && go test ccip_fees_test.go -timeout 12m -test.parallel=2 -count=1 -json
test_cmd: cd integration-tests/smoke/ccip && go test ccip_fees_test.go -timeout 20m -test.parallel=2 -count=1 -json

- id: smoke/ccip/ccip_messaging_test.go:*
path: integration-tests/smoke/ccip/ccip_messaging_test.go
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automation-benchmark-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
jobs:
run-e2e-tests-workflow:
name: Run E2E Tests
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@70a84a2a8546ea6dd8778217df16558e9a5afba3
with:
test_path: .github/e2e-tests.yml
test_ids: '${{ inputs.testType }}/automation_test.go:TestAutomationBenchmark'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automation-load-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
jobs:
run-e2e-tests-workflow:
name: Run E2E Tests
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@70a84a2a8546ea6dd8778217df16558e9a5afba3
with:
test_path: .github/e2e-tests.yml
test_ids: 'load/automationv2_1/automationv2_1_test.go:TestLogTrigger'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automation-nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
run-e2e-tests-workflow:
name: Run E2E Tests
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@70a84a2a8546ea6dd8778217df16558e9a5afba3
with:
test_path: .github/e2e-tests.yml
test_trigger: Automation Nightly Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automation-ondemand-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
call-run-e2e-tests-workflow:
name: Run E2E Tests
needs: set-tests-to-run
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5
uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@70a84a2a8546ea6dd8778217df16558e9a5afba3
with:
test_path: .github/e2e-tests.yml
test_list: ${{ needs.set-tests-to-run.outputs.test_list }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-publish-develop-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ on:
required: false
default: "false"

concurrency:
group: "build-publish-${{ github.ref_name }}-${{ github.sha }}"
cancel-in-progress: true

env:
# Use github.sha here otherwise a race condition exists if
# a commit is pushed to develop before merge is run.
Expand Down
Loading

0 comments on commit 15498e0

Please sign in to comment.