Skip to content
This repository was archived by the owner on Mar 14, 2025. It is now read-only.

Commit ce0a82a

Browse files
committed
Merge branch 'zksync-yn' of ssh://github.com/smartcontractkit/ccip into zksync-yn
2 parents 73fb6db + 6e2f5ee commit ce0a82a

File tree

1,284 files changed

+80894
-29438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,284 files changed

+80894
-29438
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"chainlink": patch
3+
---
4+
5+
Add config validation so it requires ws url when http polling disabled #bugfix

.changeset/moody-rules-agree.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"chainlink": patch
3+
---
4+
5+
- register polling subscription to avoid subscription leaking when rpc client gets closed.
6+
- add a temporary special treatment for SubscribeNewHead before we replace it with SubscribeToHeads. Add a goroutine that forwards new head from poller to caller channel.
7+
- fix a deadlock in poller, by using a new lock for subs slice in rpc client.
8+
#bugfix

.changeset/old-bees-kiss.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"ccip": patch
3+
---
4+
5+
Consolidated FinalityDepth setting #internal

.changeset/pretty-worms-smell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"chainlink": patch
3+
---
4+
5+
Added a custom client error message for Mantle to capture NonceTooLow error. #added

.changeset/silly-lies-boil.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"chainlink": minor
3+
---
4+
5+
Make websocket URL `WSURL` for `EVM.Nodes` optional, and apply logic so that:
6+
* If WS URL was not provided, SubscribeFilterLogs should fail with an explicit error
7+
* If WS URL was not provided LogBroadcaster should be disabled
8+
#nops

.changeset/tough-boats-shop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"chainlink": minor
3+
---
4+
5+
start of next release
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"chainlink": patch
3+
---
4+
5+
#bugfix Memory leak fix on promwrapper

.github/CODEOWNERS

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111

1212
# Services
1313
/core/services/directrequest @smartcontractkit/keepers
14-
/core/services/feeds @smartcontractkit/FMS
14+
/core/services/feeds @smartcontractkit/op-core @eutopian @yevshev
1515
/core/services/synchronization/telem @smartcontractkit/realtime
16+
/core/capabilities/ccip @smartcontractkit/ccip-offchain
1617

1718
# To be deprecated in Chainlink V3
1819
/core/services/fluxmonitorv2 @smartcontractkit/foundations
@@ -23,9 +24,9 @@
2324
/core/services/pg @smartcontractkit/foundations @samsondav
2425
/core/services/pipeline @smartcontractkit/foundations @smartcontractkit/bix-framework
2526
/core/services/telemetry @smartcontractkit/realtime
26-
/core/services/relay/evm/mercury @smartcontractkit/mercury-team
27+
/core/services/relay/evm/mercury @smartcontractkit/data-streams-engineers
2728
/core/services/webhook @smartcontractkit/foundations @smartcontractkit/bix-framework
28-
/core/services/llo @smartcontractkit/mercury-team
29+
/core/services/llo @smartcontractkit/data-streams-engineers
2930

3031
# VRF-related services
3132
/core/services/vrf @smartcontractkit/vrf-team
@@ -67,17 +68,16 @@ core/scripts/gateway @smartcontractkit/functions
6768

6869
/contracts/src/v0.8/functions @smartcontractkit/functions
6970
/contracts/**/*functions* @smartcontractkit/functions
70-
/contracts/**/*llo-feeds* @smartcontrackit/mercury-team
71+
/contracts/**/*llo-feeds* @smartcontractkit/data-streams-engineers
7172
/contracts/**/*vrf* @smartcontractkit/vrf-team
7273
/contracts/**/*l2ep* @smartcontractkit/bix-ship
73-
# TODO: replace with a team tag when ready
74-
/contracts/**/*keystone* @archseer @bolekk @patrick-dowell
74+
/contracts/**/*keystone* @smartcontractkit/keystone
7575

7676
/contracts/src/v0.8/automation @smartcontractkit/keepers
7777
/contracts/src/v0.8/functions @smartcontractkit/functions
7878
# TODO: interfaces folder, folder should be removed and files moved to the correct folders
7979
/contracts/src/v0.8/l2ep @chris-de-leon-cll
80-
/contracts/src/v0.8/llo-feeds @smartcontractkit/mercury-team
80+
/contracts/src/v0.8/llo-feeds @smartcontractkit/data-streams-engineers
8181
# TODO: mocks folder, folder should be removed and files moved to the correct folders
8282
/contracts/src/v0.8/operatorforwarder @smartcontractkit/data-feeds-engineers
8383
/contracts/src/v0.8/shared @RensR @matYang @RayXpub @elatoskinas
@@ -93,11 +93,18 @@ core/scripts/gateway @smartcontractkit/functions
9393

9494

9595
# Tests
96-
/integration-tests/**/*ccip* @smartcontractkit/test-tooling-team @jasonmci @smartcontractkit/ccip
96+
/integration-tests/ @smartcontractkit/test-tooling-team
97+
/integration-tests/ccip-tests @smartcontractkit/ccip-offchain
9798
/integration-tests/**/*keeper* @smartcontractkit/keepers
9899
/integration-tests/**/*automation* @smartcontractkit/keepers
99100
/integration-tests/**/*lm_* @smartcontractkit/liquidity-manager
100101

102+
# Deployment tooling
103+
# Initially the common structures owned by CCIP
104+
/integration-tests/deployment @smartcontractkit/ccip
105+
/integration-tests/deployment/ccip @smartcontractkit/ccip
106+
# TODO: As more products add their deployment logic here, add the team as an owner
107+
101108
# CI/CD
102109
/.github/** @smartcontractkit/releng @smartcontractkit/test-tooling-team @jasonmci @smartcontractkit/ccip
103110
/.github/workflows/integration-tests.yml @smartcontractkit/test-tooling-team @jasonmci

.github/E2E_TESTS_ON_GITHUB_CI.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# E2E Tests on GitHub CI
2+
3+
E2E tests are executed on GitHub CI using the [E2E Tests Reusable Workflow](#about-the-reusable-workflow) or dedicated workflows.
4+
5+
## Automatic workflows
6+
7+
These workflows are designed to run automatically at crucial stages of the software development process, such as on every commit in a PR, nightly or before release.
8+
9+
### PR E2E Tests
10+
11+
Run on every commit in a PR to ensure changes do not introduce regressions.
12+
13+
[Link](https://github.com/smartcontractkit/chainlink/blob/develop/.github/workflows/integration-tests.yml)
14+
15+
### Nightly E2E Tests
16+
17+
Conducted nightly to catch issues that may develop over time or with accumulated changes.
18+
19+
[Link](https://github.com/smartcontractkit/chainlink/blob/develop/.github/workflows/run-nightly-e2e-tests.yml)
20+
21+
### Release E2E Tests
22+
23+
This section contains automatic workflows triggering E2E tests at release.
24+
25+
#### Client Compatibility Tests
26+
27+
[Link](https://github.com/smartcontractkit/chainlink/actions/workflows/client-compatibility-tests.yml)
28+
29+
## On-Demand Workflows
30+
31+
Triggered manually by QA for specific testing needs.
32+
33+
**Examples:**
34+
35+
- [On-Demand Automation Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/automation-ondemand-tests.yml)
36+
- [CCIP Chaos Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/ccip-chaos-tests.yml)
37+
- [OCR Soak Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/on-demand-ocr-soak-test.yml)
38+
- [VRFv2Plus Smoke Tests](https://github.com/smartcontractkit/chainlink/actions/workflows/on-demand-vrfv2plus-smoke-tests.yml)
39+
40+
## Test Configs
41+
42+
E2E tests utilize TOML files to define their parameters. Each test is equipped with a default TOML config, which can be overridden by specifying an alternative TOML config. This allows for running tests with varied parameters, such as on a non-default blockchain network. For tests executed on GitHub CI, both the default configs and any override configs must reside within the git repository. The `test_config_override_path` workflow input is used to provide a path to an override config.
43+
44+
Config overrides should be stored in `testconfig/*/overrides/*.toml`. Placing files here will not trigger a rebuild of the test runner image.
45+
46+
**Important Note:** The use of `base64Config` input is deprecated in favor of `test_config_override_path`. For more details, refer to [the decision log](https://smartcontract-it.atlassian.net/wiki/spaces/TT/pages/927596563/Storing+All+Test+Configs+In+Git).
47+
48+
To learn more about test configs see [CTF Test Config](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md).
49+
50+
## Test Secrets
51+
52+
For security reasons, test secrets and sensitive information are not stored directly within the test config TOML files. Instead, these secrets are securely injected into tests using environment variables. For a detailed explanation on managing test secrets, refer to our [Test Secrets documentation](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#test-secrets).
53+
54+
If you need to run a GitHub workflow using custom secrets, please refer to the [guide on running GitHub workflows with your test secrets](https://github.com/smartcontractkit/chainlink-testing-framework/blob/main/lib/config/README.md#run-github-workflow-with-your-test-secrets).
55+
56+
## About the E2E Test Reusable Workflow
57+
58+
For information on the E2E Test Reusable Workflow, visit the documentation in the [smartcontractkit/.github repository](https://github.com/smartcontractkit/.github/blob/main/.github/workflows/README.md).

.github/actions/build-chainlink-image/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
AWS_ROLE_TO_ASSUME: ${{ inputs.AWS_ROLE_TO_ASSUME }}
3838
- name: Build Image
3939
if: steps.check-image.outputs.exists != 'true'
40-
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
40+
uses: smartcontractkit/.github/actions/ctf-build-image@1a26fe378d7ebdc34ab1fe31ec4a6d1c376199f8 # ctf-build-image@0.0.0
4141
with:
4242
cl_repo: smartcontractkit/ccip
4343
cl_ref: ${{ inputs.git_commit_sha }}
@@ -51,4 +51,4 @@ runs:
5151
shell: sh
5252
run: |
5353
echo "### Chainlink node image tag used for this test run :link:" >>$GITHUB_STEP_SUMMARY
54-
echo "\`${GITHUB_SHA}\`" >>$GITHUB_STEP_SUMMARY
54+
echo "\`${{inputs.git_commit_sha}}\`" >>$GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)