Merge branch 'develop' into ks/cap-cs-refactor

smartcontractkit · Dec 10, 2024 · 4e368e6 · 4e368e6
2 parents dbedc94 + 9d8d9f4
commit 4e368e6
Show file tree

Hide file tree

Showing 116 changed files with 2,324 additions and 1,339 deletions.
diff --git a/.changeset/six-coins-mix.md b/.changeset/six-coins-mix.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#bugfix fix: duplicate chain id in chain config dialog
diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
@@ -947,6 +947,7 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_token_price_updates_test.go:*
     path: integration-tests/smoke/ccip/ccip_token_price_updates_test.go
@@ -960,6 +961,7 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_gas_price_updates_test.go:*
     path: integration-tests/smoke/ccip/ccip_gas_price_updates_test.go
@@ -973,6 +975,7 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -988,6 +991,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1003,6 +1007,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1018,6 +1023,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentSigners$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1033,6 +1039,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1048,6 +1055,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1063,6 +1071,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOneSourceChainCursed$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1078,6 +1087,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_GlobalCurseTwoMessagesOnTwoLanes$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1093,6 +1103,7 @@ runner-test-matrix:
       E2E_JD_VERSION: 0.6.0
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+      CCIP_V16_TEST_ENV: docker
 
   # END: CCIPv1.6 tests
 

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -466,6 +466,7 @@ jobs:
       extraArgs: '{ "skipped_tests": "TestChainComponents", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "min_pass_ratio": "0.01" }'
     secrets:
       SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   trigger-flaky-test-detection-for-deployment-project:
     name: Flakeguard Deployment Project
@@ -484,6 +485,7 @@ jobs:
       extraArgs: '{ "skipped_tests": "TestAddLane", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "min_pass_ratio": "0.01" }'
     secrets:
       SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   clean:
     name: Clean Go Tidy & Generate

diff --git a/.github/workflows/flakeguard-nightly.yml b/.github/workflows/flakeguard-nightly.yml
@@ -20,3 +20,5 @@ jobs:
       slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications
     secrets:
       SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.github/workflows/flakeguard-on-demand.yml b/.github/workflows/flakeguard-on-demand.yml
@@ -69,4 +69,5 @@ jobs:
       extraArgs: ${{ inputs.extraArgs }}
     secrets:
       SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}