Merge branch 'ccip-develop' into CCIP-2379/ccip-capability-job

.changeset/afraid-cups-scream.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added zkSync L1 GasPrice calculation

.changeset/chilled-papayas-chew.md

@@ -0,0 +1,5 @@
+---
+"ccip": patch
+---
+
+#updated Add TokenPricesReader implementation

.changeset/clever-hotels-call.md

@@ -0,0 +1,5 @@
+---
+"ccip": patch
+---
+
+use chainlink-common for hash and merklemulti in ocr3 #internal

.changeset/early-readers-work.md

@@ -0,0 +1,6 @@
+---
+"ccip": patch
+---
+
+New function on NetworkSelector to get ChainID #added
+Align logs and include chainID #changed

.changeset/quick-kangaroos-tell.md

@@ -0,0 +1,5 @@
+---
+"ccip": minor
+---
+
+#removed nops and weights logic from multi onramp

.changeset/smooth-apricots-rest.md

@@ -0,0 +1,5 @@
+---
+"ccip": minor
+---
+
+#updated chainselector and metis toml

.changeset/smooth-starfishes-dress.md

@@ -0,0 +1,5 @@
+---
+"ccip": minor
+---
+
+Move price observations from Commit plugin into a standalone job

.changeset/tasty-pianos-attend.md

@@ -0,0 +1,5 @@
+---
+"ccip": patch
+---
+
+add offchainConfig value to know after what time the offchain code should stop attempting a tx

.changeset/violet-poems-hug.md

@@ -0,0 +1,5 @@
+---
+"ccip": patch
+---
+
+#internal ocr3 execute work

.changeset/wild-gifts-refuse.md

@@ -0,0 +1,5 @@
+---
+"ccip": patch
+---
+
+Increased gas limit for LM transmitter to 5e6 #changed

.github/workflows/ccip-chaos-tests.yml

@@ -177,7 +177,8 @@ jobs:
       pull-requests: write
       id-token: write
       contents: read
-    name: ccip-load-with-chaos-tests
+    name: CCIP Load With Chaos Tests
+    if: false # Disabled until CCIP-2555 is resolved
     runs-on: ubuntu-latest
     needs: [ build-chainlink, build-test-image ]
     env:

.github/workflows/ccip-offchain-upgrade-tests.yml

@@ -94,22 +94,22 @@ jobs:
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 
-  build-test-image-current-sha:
+  build-test-image:
     if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
     needs: [ changes ]
     environment: integration
     permissions:
       id-token: write
       contents: read
-    name: Build Test Image with Current Sha
+    name: Build Test Image
     runs-on: ubuntu-latest
     steps:
       - name: Collect Metrics
         if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: ccip-offchain-upgrade-compatibility-tests-build-test-image-current-sha
+          id: ccip-offchain-upgrade-compatibility-tests-build-test-image
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -125,19 +125,19 @@ jobs:
         uses: ./.github/actions/build-test-image
         with:
           # we just want to build the load tests
-          suites: ccip-tests/load
+          suites: ccip-tests/load ccip-tests/smoke
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ACCOUNT_NUMBER: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
 
-  build-test-image-for-last-release:
+  last-release-info:
     if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
     needs: [ changes ]
     environment: integration
     permissions:
       id-token: write
       contents: read
-    name: Build Test Image for Last Release
+    name: Fetch Info for Last Release
     runs-on: ubuntu-latest
     outputs:
       release_name: ${{ steps.fetch_last_release.outputs.release_name }}
@@ -149,7 +149,7 @@ jobs:
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
-          id: ccip-offchain-upgrade-compatibility-tests-build-test-image-for-last-release
+          id: ccip-offchain-upgrade-compatibility-tests-last-release-info
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -165,20 +165,6 @@ jobs:
           echo "release_name=${release_name}" >> $GITHUB_OUTPUT
           sha_ref=$(curl -s --header "Authorization: token ${{ secrets.GITHUB_TOKEN }}" --request GET https://api.github.com/repos/${{ github.repository }}/git/refs/tags/${release_name} | jq -r '.object.sha' | sort -V | tail -n 1)
           echo "sha_ref=${sha_ref}" >> $GITHUB_OUTPUT
-      - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          repository: smartcontractkit/ccip
-          ref: ${{ steps.fetch_last_release.outputs.sha_ref }}
-      - name: Build Test Image
-        if: needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch'
-        uses: ./.github/actions/build-test-image
-        with:
-          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
-          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
-          QA_AWS_ACCOUNT_NUMBER: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-          tag: ${{ steps.fetch_last_release.outputs.sha_ref }}
-          other_tags: ${{ steps.fetch_last_release.outputs.release_name }}
   # End Build Test Dependencies
 
   # run test with previous image
@@ -190,7 +176,7 @@ jobs:
       pull-requests: write
       id-token: write
       contents: read
-    needs: [ changes, build-test-image-for-last-release ]
+    needs: [ changes, last-release-info, build-test-image ]
     outputs:
       existing_namespace: ${{ steps.fetch_namespace.outputs.existing_namespace }}
       triggered_by: ${{ steps.fetch_namespace.outputs.triggered_by }}
@@ -203,11 +189,11 @@ jobs:
             run: ^TestSmokeCCIPForBidirectionalLane$
             config_path: ./integration-tests/ccip-tests/testconfig/tomls/node-pre-upgrade-compatibility.toml
     runs-on: ubuntu-latest
-    name: CCIP Deployment with ${{ needs.build-test-image-for-last-release.outputs.release_tag }} - ${{ matrix.product.name }}
+    name: CCIP Deployment with ${{ needs.last-release-info.outputs.release_tag }} - ${{ matrix.product.name }}
     env:
-      RELEASE_TAG: ${{ needs.build-test-image-for-last-release.outputs.release_tag }}
-      RELEASE_SHA: ${{ needs.build-test-image-for-last-release.outputs.release_sha }}
-      RELEASE_NAME: ${{ needs.build-test-image-for-last-release.outputs.release_name }}
+      RELEASE_TAG: ${{ needs.last-release-info.outputs.release_tag }}
+      RELEASE_SHA: ${{ needs.last-release-info.outputs.release_sha }}
+      RELEASE_NAME: ${{ needs.last-release-info.outputs.release_name }}
       TEST_TRIGGERED_BY: ${{ matrix.product.name }}-${{ github.run_id }}
     steps:
       - name: Collect Metrics
@@ -219,7 +205,7 @@ jobs:
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: CCIP Deployment with ${{ needs.build-test-image-for-last-release.outputs.release_tag }} - ${{ matrix.product.name }}
+          this-job-name: CCIP Deployment with ${{ needs.last-release-info.outputs.release_tag }} - ${{ matrix.product.name }}
           test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -253,11 +239,7 @@ jobs:
         env:
           BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
           TEST_BASE64_CCIP_CONFIG_OVERRIDE: ${{ steps.set_override_config.outputs.base_64_override }}
-          # uncomment this later for next release
-          # ENV_JOB_IMAGE: ${{ env.ENV_JOB_IMAGE_BASE }}:${{ env.RELEASE_SHA }}
-          # for now we run test with a specific test image pertaining to previous release with some added fixes
-          # this image use 1.2 ramps instead of incompatible 1.5-dev ramps from offchain v2.10.0-ccip1.4-release
-          ENV_JOB_IMAGE: ${{ env.ENV_JOB_IMAGE_BASE }}:release-v2.10.0-ccip1.4
+          ENV_JOB_IMAGE: ${{ env.ENV_JOB_IMAGE_BASE }}:${{ github.sha }}
           TEST_SUITE: smoke
           TEST_ARGS: -test.timeout 30m
           TEST_LOG_LEVEL: info
@@ -317,7 +299,7 @@ jobs:
       pull-requests: write
       id-token: write
       contents: read
-    needs: [ build-chainlink, changes, build-test-image-current-sha, run-test-with-last-release ]
+    needs: [ build-chainlink, changes, build-test-image, run-test-with-last-release ]
     strategy:
       fail-fast: false
       matrix:

.github/workflows/changeset.yml

@@ -4,7 +4,7 @@
 #
 name: Changeset
 
-on: pull_request
+on: 
 
 jobs:
   changeset:

.github/workflows/integration-tests.yml

@@ -285,6 +285,13 @@ jobs:
             file: ccip
             dir: ccip-tests/smoke
             run: -run ^TestSmokeCCIPForBidirectionalLane$
+          - name: ccip-smoke-1.4-pools
+            nodes: 1
+            os: ubuntu-latest
+            file: ccip
+            dir: ccip-tests/smoke
+            run: -run ^TestSmokeCCIPForBidirectionalLane$
+            config_path: ./integration-tests/ccip-tests/testconfig/tomls/contract-version1.4.toml
           - name: ccip-smoke-usdc
             nodes: 1
             os: ubuntu-latest
@@ -714,7 +721,7 @@ jobs:
       SELECTED_NETWORKS: SIMULATED,SIMULATED_1,SIMULATED_2
       CHAINLINK_COMMIT_SHA: ${{ inputs.evm-ref || github.sha }}
       CHAINLINK_ENV_USER: ${{ github.actor }}
-      CHAINLINK_IMAGE: public.ecr.aws/chainlink/chainlink
+      CHAINLINK_IMAGE: public.ecr.aws/w0i8p0z9/chainlink-ccip
       UPGRADE_VERSION: ${{ inputs.evm-ref || github.sha }}
       UPGRADE_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink
       TEST_LOG_LEVEL: debug

.github/workflows/solidity-wrappers.yml

@@ -58,7 +58,7 @@ jobs:
         uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # [email protected]
         id: get-gh-token
         with:
-          aws-role-arn:  ${{ secrets.AWS_OIDC_CHAINLINK_CI_AUTO_PR_TOKEN_ISSUER_ROLE_ARN }}
+          aws-role-arn:  ${{ secrets.AWS_OIDC_CCIP_CI_AUTO_PR_TOKEN_ISSUER_ROLE_ARN }}
           aws-lambda-url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
           aws-region: ${{ secrets.AWS_REGION }}
 

CODEOWNERS

@@ -139,9 +139,14 @@ flake.lock @smartcontractkit/prodsec-public
 /core/ @smartcontractkit/ccip
 /contracts/ @smartcontractkit/ccip-onchain @makramkd @elatoskinas @RayXpub
 
+# leave snapshots & changeset as ownerless
+/contracts/gas-snapshots/
+/contracts/.changeset/
+
 # CCIP LM
-/core/services/ocr2/plugins/liquiditymanager/ @smartcontractkit/liquidity-manager
+/core/**/liquiditymanager/ @smartcontractkit/liquidity-manager
 /core/services/relay/evm/liquidity_manager.go @smartcontractkit/liquidity-manager
+/contracts/**/liquiditymanager/ @smartcontractkit/liquidity-manager
 
 # CCIP ARM
 /contracts/src/v0.8/ccip/RMN.sol @smartcontractkit/rmn

contracts/.changeset/flat-bikes-greet.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts-ccip': patch
+---
+
+add LM event to receive() function

contracts/.changeset/gentle-spoons-vanish.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts-ccip': minor
+---
+
+#changed MultiOffRamp contract size optimizations

contracts/.changeset/tall-toys-attack.md

@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts-ccip": minor
+---
+
+remove nops and weights logic from multi onramp