Merge chainlink into ccip-develop (#1215)

smartcontractkit · Jul 25, 2024 · 4363b3d · 4363b3d
2 parents 52cdc60 + 8ecc7f0
commit 4363b3d
Show file tree

Hide file tree

Showing 805 changed files with 88,058 additions and 37,135 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -34,8 +34,6 @@
 /core/services/pipeline/task.vrf.go @smartcontractkit/vrf-team
 /core/services/pipeline/task.vrfv2.go @smartcontractkit/vrf-team
 /core/services/pipeline/task.vrfv2plus.go @smartcontractkit/vrf-team
-/core/services/ocr2/plugins/dkg @smartcontractkit/vrf-team
-/core/services/ocr2/plugins/ocr2vrf @smartcontractkit/vrf-team
 
 # Keeper/Automation-related services
 /core/services/keeper @smartcontractkit/keepers

diff --git a/.github/actions/build-chainlink-image/action.yml b/.github/actions/build-chainlink-image/action.yml
@@ -29,15 +29,15 @@ runs:
     - name: Check if image exists
       if: ${{ inputs.dep_evm_sha != '' || inputs.check_image_exists == 'true'}}
       id: check-image
-      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
       with:
         repository: chainlink
         tag: ${{ inputs.git_commit_sha }}${{ inputs.tag_suffix }}
         AWS_REGION: ${{ inputs.AWS_REGION }}
         AWS_ROLE_TO_ASSUME: ${{ inputs.AWS_ROLE_TO_ASSUME }}
     - name: Build Image
       if: steps.check-image.outputs.exists != 'true'
-      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
       with:
         cl_repo: smartcontractkit/ccip
         cl_ref: ${{ inputs.git_commit_sha }}

diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml
@@ -71,15 +71,15 @@ runs:
     - name: Check if test base image exists
       if: steps.version.outputs.is_semantic == 'false'
       id: check-base-image
-      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
       with:
         repository: test-base-image
         tag: ${{ steps.long_sha.outputs.long_sha }}
         AWS_REGION: ${{ inputs.QA_AWS_REGION }}
         AWS_ROLE_TO_ASSUME: ${{ inputs.QA_AWS_ROLE_TO_ASSUME }}
     - name: Build Base Image
       if: steps.version.outputs.is_semantic == 'false' && steps.check-base-image.outputs.exists == 'false'
-      uses: smartcontractkit/chainlink-github-actions/docker/build-push@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+      uses: smartcontractkit/chainlink-github-actions/docker/build-push@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
       env:
         BASE_IMAGE_NAME: ${{ inputs.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ inputs.QA_AWS_REGION }}.amazonaws.com/test-base-image:${{ steps.long_sha.outputs.long_sha }}
       with:
@@ -92,15 +92,15 @@ runs:
     # Test Runner Logic
     - name: Check if image exists
       id: check-image
-      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+      uses: smartcontractkit/chainlink-github-actions/docker/image-exists@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
       with:
         repository: ${{ inputs.repository }}
         tag: ${{ inputs.tag }}
         AWS_REGION: ${{ inputs.QA_AWS_REGION }}
         AWS_ROLE_TO_ASSUME: ${{ inputs.QA_AWS_ROLE_TO_ASSUME }}
     - name: Build and Publish Test Runner
       if: steps.check-image.outputs.exists == 'false'
-      uses: smartcontractkit/chainlink-github-actions/docker/build-push@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+      uses: smartcontractkit/chainlink-github-actions/docker/build-push@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
       with:
         tags: |
           ${{ inputs.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ inputs.QA_AWS_REGION }}.amazonaws.com/${{ inputs.repository }}:${{ inputs.tag }}

diff --git a/.github/actions/setup-create-base64-config/action.yml b/.github/actions/setup-create-base64-config/action.yml
diff --git a/.github/actions/setup-merge-base64-config/action.yml b/.github/actions/setup-merge-base64-config/action.yml
@@ -24,22 +24,20 @@ runs:
         echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
 
         decoded_toml=$(echo $BASE64_CONFIG_OVERRIDE | base64 -d)
-        CHAINLINK_IMAGE=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.image')
+        CHAINLINK_IMAGE=$(echo "$decoded_toml" | { dasel -r toml 'ChainlinkImage.image' 2>/dev/null || echo ''; })
         echo ::add-mask::$CHAINLINK_IMAGE
-        CHAINLINK_VERSION=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.version')
+        CHAINLINK_VERSION=$(echo "$decoded_toml" | { dasel -r toml 'ChainlinkImage.version' 2>/dev/null || echo ''; })
         NETWORKS=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*selected_networks[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
 
         if [ -n "$CHAINLINK_IMAGE" ]; then
           echo "CHAINLINK_IMAGE=$CHAINLINK_IMAGE" >> $GITHUB_ENV
         else
-          echo "No Chainlink Image found in base64-ed config. Exiting"
-          exit 1
+          echo "No Chainlink Image found in base64-ed config"
         fi
         if [ -n "$CHAINLINK_VERSION" ]; then
           echo "CHAINLINK_VERSION=$CHAINLINK_VERSION" >> $GITHUB_ENV
         else
-          echo "No Chainlink Version found in base64-ed config. Exiting"
-          exit 1
+          echo "No Chainlink Version found in base64-ed config"
         fi
         if [ -n "$NETWORKS" ]; then
           echo "NETWORKS=$NETWORKS" >> $GITHUB_ENV

diff --git a/.github/actions/setup-nodejs/action.yaml b/.github/actions/setup-nodejs/action.yaml
@@ -3,6 +3,10 @@ inputs:
   prod:
     default: "false"
     description: Set to 'true' to do a prod only install
+  base-path:
+    description: Path to the base of the repo
+    required: false
+    default: .
 description: Setup pnpm for contracts
 runs:
   using: composite
@@ -15,16 +19,16 @@ runs:
       with:
         node-version: "20"
         cache: "pnpm"
-        cache-dependency-path: "contracts/pnpm-lock.yaml"
+        cache-dependency-path: "${{ inputs.base-path }}/contracts/pnpm-lock.yaml"
 
     - if: ${{ inputs.prod == 'false' }}
       name: Install dependencies
       shell: bash
       run: pnpm i
-      working-directory: contracts
+      working-directory: ${{ inputs.base-path }}/contracts
 
     - if: ${{ inputs.prod == 'true' }}
       name: Install prod dependencies
       shell: bash
       run: pnpm i --prod
-      working-directory: contracts
+      working-directory: ${{ inputs.base-path }}/contracts
diff --git a/.github/actions/setup-parse-base64-config/action.yml b/.github/actions/setup-parse-base64-config/action.yml
@@ -20,23 +20,21 @@ runs:
       shell: bash
       run: |
         decoded_toml=$(echo $BASE64_CONFIG_OVERRIDE | base64 -d)
-        CHAINLINK_IMAGE=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.image')
+        CHAINLINK_IMAGE=$(echo "$decoded_toml" | { dasel -r toml 'ChainlinkImage.image' 2>/dev/null || echo ''; })
         echo ::add-mask::$CHAINLINK_IMAGE
-        CHAINLINK_VERSION=$(echo "$decoded_toml" | dasel -r toml 'ChainlinkImage.version')
+        CHAINLINK_VERSION=$(echo "$decoded_toml" | { dasel -r toml 'ChainlinkImage.version' 2>/dev/null || echo ''; })
         NETWORKS=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*selected_networks[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
         ETH2_EL_CLIENT=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*execution_layer[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
 
         if [ -n "$CHAINLINK_IMAGE" ]; then
           echo "CHAINLINK_IMAGE=$CHAINLINK_IMAGE" >> $GITHUB_ENV
         else
-          echo "No Chainlink Image found in base64-ed config. Exiting"
-          exit 1
+          echo "No Chainlink Image found in base64-ed config"
         fi
         if [ -n "$CHAINLINK_VERSION" ]; then
           echo "CHAINLINK_VERSION=$CHAINLINK_VERSION" >> $GITHUB_ENV
         else
           echo "No Chainlink Version found in base64-ed config. Exiting"
-          exit 1
         fi
         if [ -n "$NETWORKS" ]; then
           echo "NETWORKS=$NETWORKS" >> $GITHUB_ENV

diff --git a/.github/actions/setup-postgres/action.yml b/.github/actions/setup-postgres/action.yml
@@ -1,13 +1,18 @@
 name: Setup Postgresql
 description: Setup postgres docker container via docker-compose, allowing usage of a custom command, see https://github.com/orgs/community/discussions/26688
+inputs:
+  base-path:
+    description: Path to the base of the repo
+    required: false
+    default: .
 runs:
   using: composite
   steps:
     - name: Start postgres service
       run: docker compose up -d
       shell: bash
-      working-directory: ./.github/actions/setup-postgres
+      working-directory: ${{ inputs.base-path }}/.github/actions/setup-postgres
     - name: Wait for postgres service to be healthy
       run: ./wait-for-healthy-postgres.sh
       shell: bash
-      working-directory: ./.github/actions/setup-postgres
+      working-directory: ${{ inputs.base-path }}/.github/actions/setup-postgres
diff --git a/.github/actions/setup-solana/action.yml b/.github/actions/setup-solana/action.yml
@@ -1,5 +1,10 @@
 name: Setup Solana CLI
 description: Setup solana CLI
+inputs:
+  base-path:
+    description: Path to the base of the repo
+    required: false
+    default: .
 runs:
   using: composite
   steps:
@@ -9,11 +14,12 @@ runs:
         with:
           path: |
             ~/.local/share/solana/install/active_release/bin
-          key: ${{ runner.os }}-solana-cli-${{ hashFiles('./tools/ci/install_solana') }}
+          key: ${{ runner.os }}-solana-cli-${{ hashFiles('${{ inputs.base-path }}tools/ci/install_solana') }}
 
       - if: ${{ steps.cache.outputs.cache-hit != 'true' }}
         name: Install solana cli
         shell: bash
+        working-directory: ${{ inputs.base-path }}
         run: ./tools/ci/install_solana
 
       - name: Export solana path to env

diff --git a/.github/actions/setup-wasmd/action.yml b/.github/actions/setup-wasmd/action.yml
@@ -1,5 +1,10 @@
 name: Setup Cosmos wasmd
 description: Setup Cosmos wasmd, used for integration tests
+inputs:
+  base-path:
+    description: Path to the base of the repo
+    required: false
+    default: .
 runs:
   using: composite
   steps:
@@ -10,11 +15,12 @@ runs:
           path: ~/wasmd-build
           # this caching works without cloning the repo because the install_wasmd contains
           # the commit hash.
-          key: ${{ runner.os }}-wasmd-cli-${{ hashFiles('./tools/ci/install_wasmd') }}
+          key: ${{ runner.os }}-wasmd-cli-${{ hashFiles('${{ inputs.base-path }}/tools/ci/install_wasmd') }}
 
       - if: ${{ steps.cache.outputs.cache-hit != 'true' }}
         name: Install wasmd
         shell: bash
+        working-directory: ${{ inputs.base-path }}
         run: ./tools/ci/install_wasmd
 
       - name: Export wasmd path to env

diff --git a/.github/actions/version-file-bump/action.yml b/.github/actions/version-file-bump/action.yml
@@ -31,7 +31,7 @@ runs:
         current_version=$(jq -r '.version' ./package.json)
         echo "current_version=${current_version}" | tee -a "$GITHUB_OUTPUT"
     - name: Compare semantic versions
-      uses: smartcontractkit/chainlink-github-actions/semver-compare@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
+      uses: smartcontractkit/chainlink-github-actions/semver-compare@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25
       id: compare
       with:
         version1: ${{ steps.get-current-version.outputs.current_version }}