Merge branch 'develop' into feat/DEPLOY-295-l2ep-refactoring

smartcontractkit · Feb 7, 2024 · 2a47a86 · 2a47a86
2 parents b89490e + 7eb5600
commit 2a47a86
Show file tree

Hide file tree

Showing 274 changed files with 10,425 additions and 5,314 deletions.
diff --git a/.github/actions/build-sign-publish-chainlink/action.yml b/.github/actions/build-sign-publish-chainlink/action.yml
@@ -113,7 +113,7 @@ runs:
 
     - if: inputs.publish == 'true'
       name: Login to ECR
-      uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+      uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
       with:
         registry: ${{ inputs.ecr-hostname }}
 
@@ -166,7 +166,7 @@ runs:
 
     - name: Generate docker metadata for non-root image
       id: meta-nonroot
-      uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176 # v4.5.0
+      uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c # v5.5.0
       env:
         DOCKER_METADATA_PR_HEAD_SHA: "true"
       with:

diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
@@ -58,7 +58,7 @@ runs:
         working-directory: ${{ inputs.go-directory }}
     - name: Store lint report artifact
       if: always()
-      uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+      uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
       with:
         name: golangci-lint-report
         path: ${{ inputs.go-directory }}/golangci-lint-report.xml

diff --git a/.github/actions/goreleaser-build-sign-publish/action.yml b/.github/actions/goreleaser-build-sign-publish/action.yml
@@ -67,19 +67,19 @@ runs:
     - name: Setup docker buildx
       uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
     - name: Set up qemu
-      uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
+      uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
     - name: Setup go
-      uses: actions/setup-go@c4a742cab115ed795e34d4513e2cf7d472deb55f # v3.3.1
+      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version-file: "go.mod"
     - name: Setup goreleaser
-      uses: goreleaser/goreleaser-action@b508e2e3ef3b19d4e4146d4f8fb3ba9db644a757 # v3.2.0
+      uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
       with:
         distribution: goreleaser
         install-only: true
         version: ${{ inputs.goreleaser-version }}
     - name: Setup zig
-      uses: goto-bus-stop/setup-zig@869a4299cf8ac7db4ebffaec36ad82a682f88acb # v2.0.1
+      uses: goto-bus-stop/setup-zig@7ab2955eb728f5440978d5824358023be3a2802d # v2.2.0
       with:
         version: ${{ inputs.zig-version }}
     - name: Setup cosign
@@ -89,7 +89,7 @@ runs:
         cosign-release: ${{ inputs.cosign-version }}
     - name: Login to docker registry
       if: inputs.enable-docker-publish == 'true'
-      uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
+      uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
       with:
         registry: ${{ inputs.docker-registry }}
     - name: Goreleaser release

diff --git a/.github/actions/setup-create-base64-config-live-testnets/action.yml b/.github/actions/setup-create-base64-config-live-testnets/action.yml
@@ -14,7 +14,7 @@ inputs:
     description: The git commit sha to use for the image tag
   pyroscopeServer:
     description: URL of Pyroscope server
-  pyroscopeEnvironment: 
+  pyroscopeEnvironment:
     description: Name of Pyroscope environment
   pyroscopeKey:
     description: Pyroscope server key
@@ -47,9 +47,9 @@ runs:
       id: base64-config-override
       env:
         RUN_ID: ${{ inputs.runId }}
-        PYROSCOPE_SERVER: ${{ inputs.pyroscopeServer }} 
-        PYROSCOPE_ENVIRONMENT: ${{ inputs.pyroscopeEnvironment }} 
-        PYROSCOPE_KEY: ${{ inputs.pyroscopeKey }} 
+        PYROSCOPE_SERVER: ${{ inputs.pyroscopeServer }}
+        PYROSCOPE_ENVIRONMENT: ${{ inputs.pyroscopeEnvironment }}
+        PYROSCOPE_KEY: ${{ inputs.pyroscopeKey }}
         CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
         CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
         LOKI_ENDPOINT: ${{ inputs.lokiEndpoint }}
@@ -81,15 +81,15 @@ runs:
         else
           pyroscope_enabled=false
         fi
-        
+
         cat << EOF > config.toml
         [Common]
-        chainlink_node_funding=0.5        
-        
+        chainlink_node_funding=0.5
+
         [ChainlinkImage]
         image="$CHAINLINK_IMAGE"
         version="$CHAINLINK_VERSION"
-        
+
         [Pyroscope]
         enabled=$pyroscope_enabled
         server_url="$PYROSCOPE_SERVER"
@@ -109,7 +109,7 @@ runs:
 
         [Logging.Grafana]
         base_url="$GRAFANA_URL"
-        dasboard_url="$GRAFANA_DASHBOARD_URL"
+        dashboard_url="$GRAFANA_DASHBOARD_URL"
 
         [Network]
         selected_networks=["$NETWORK"]
@@ -123,7 +123,7 @@ runs:
         [Network.WalletKeys]
         "$NETWORK" = $(convert_to_toml_array "$FUNDING_KEYS")
         EOF
-        
+
         BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)
         echo ::add-mask::$BASE64_CONFIG_OVERRIDE
         echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV

diff --git a/.github/actions/setup-create-base64-config/action.yml b/.github/actions/setup-create-base64-config/action.yml
@@ -8,15 +8,15 @@ inputs:
     description: Whether to always collect logs, even for passing tests
     default: "false"
   selectedNetworks:
-    description: The networks to run tests against 
+    description: The networks to run tests against
   chainlinkImage:
     description: The chainlink image to use
     default: "public.ecr.aws/chainlink/chainlink"
   chainlinkVersion:
     description: The git commit sha to use for the image tag
   pyroscopeServer:
     description: URL of Pyroscope server
-  pyroscopeEnvironment: 
+  pyroscopeEnvironment:
     description: Name of Pyroscope environment
   pyroscopeKey:
     description: Pyroscope server key
@@ -43,9 +43,9 @@ runs:
         RUN_ID: ${{ inputs.runId }}
         TEST_LOG_COLLECT: ${{ inputs.testLogCollect }}
         SELECTED_NETWORKS: ${{ inputs.selectedNetworks }}
-        PYROSCOPE_SERVER: ${{ inputs.pyroscopeServer }} 
-        PYROSCOPE_ENVIRONMENT: ${{ inputs.pyroscopeEnvironment }} 
-        PYROSCOPE_KEY: ${{ inputs.pyroscopeKey }} 
+        PYROSCOPE_SERVER: ${{ inputs.pyroscopeServer }}
+        PYROSCOPE_ENVIRONMENT: ${{ inputs.pyroscopeEnvironment }}
+        PYROSCOPE_KEY: ${{ inputs.pyroscopeKey }}
         CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
         CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
         LOKI_ENDPOINT: ${{ inputs.lokiEndpoint }}
@@ -55,7 +55,7 @@ runs:
         GRAFANA_URL: ${{ inputs.grafanaUrl }}
         GRAFANA_DASHBOARD_URL: ${{ inputs.grafanaDashboardUrl }}
       run: |
-        echo ::add-mask::$CHAINLINK_IMAGE        
+        echo ::add-mask::$CHAINLINK_IMAGE
         function convert_to_toml_array() {
           local IFS=','
           local input_array=($1)
@@ -68,10 +68,10 @@ runs:
           toml_array_format="${toml_array_format%,}]"
           echo "$toml_array_format"
         }
-        
-        selected_networks=$(convert_to_toml_array "$SELECTED_NETWORKS")      
+
+        selected_networks=$(convert_to_toml_array "$SELECTED_NETWORKS")
         log_targets=$(convert_to_toml_array "$LOGSTREAM_LOG_TARGETS")
-        
+
         if [ -n "$PYROSCOPE_SERVER" ]; then
           pyroscope_enabled=true
         else
@@ -82,16 +82,16 @@ runs:
           test_log_collect=true
         else
           test_log_collect=false
-        fi              
+        fi
 
         cat << EOF > config.toml
         [Network]
         selected_networks=$selected_networks
-        
+
         [ChainlinkImage]
         image="$CHAINLINK_IMAGE"
         version="$CHAINLINK_VERSION"
-        
+
         [Pyroscope]
         enabled=$pyroscope_enabled
         server_url="$PYROSCOPE_SERVER"
@@ -109,14 +109,12 @@ runs:
         tenant_id="$LOKI_TENANT_ID"
         endpoint="$LOKI_ENDPOINT"
         basic_auth="$LOKI_BASIC_AUTH"
-        # legacy, you only need this to access the cloud version
-        # bearer_token="bearer_token"
 
         [Logging.Grafana]
         base_url="$GRAFANA_URL"
-        dasboard_url="$GRAFANA_DASHBOARD_URL"
+        dashboard_url="$GRAFANA_DASHBOARD_URL"
         EOF
-        
+
         BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)
         echo ::add-mask::$BASE64_CONFIG_OVERRIDE
         echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
diff --git a/...-create-base64-upgrade-config /action.yml → ...p-create-base64-upgrade-config/action.yml b/...-create-base64-upgrade-config /action.yml → ...p-create-base64-upgrade-config/action.yml
@@ -3,7 +3,7 @@ description: A composite action that creates a base64-encoded config to be used
 
 inputs:
   selectedNetworks:
-    description: The networks to run tests against 
+    description: The networks to run tests against
   chainlinkImage:
     description: The chainlink image to upgrade from
     default: "public.ecr.aws/chainlink/chainlink"
@@ -40,13 +40,13 @@ runs:
           toml_array_format="${toml_array_format%,}]"
           echo "$toml_array_format"
         }
-        
-        selected_networks=$(convert_to_toml_array "$SELECTED_NETWORKS")      
+
+        selected_networks=$(convert_to_toml_array "$SELECTED_NETWORKS")
 
         cat << EOF > config.toml
         [Network]
         selected_networks=$selected_networks
-        
+
         [ChainlinkImage]
         image="$CHAINLINK_IMAGE"
         version="$CHAINLINK_VERSION"
@@ -55,7 +55,7 @@ runs:
         image="$UPGRADE_IMAGE"
         version="$UPGRADE_VERSION"
         EOF
-        
+
         BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)
         echo ::add-mask::$BASE64_CONFIG_OVERRIDE
         echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml
@@ -18,7 +18,7 @@ runs:
   using: composite
   steps:
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version-file: ${{ inputs.go-version-file }}
         cache: false

diff --git a/.github/actions/setup-merge-base64-config/action.yml b/.github/actions/setup-merge-base64-config/action.yml
@@ -6,7 +6,7 @@ inputs:
     description: Base64-encoded config to decode
 
 runs:
-  using: composite  
+  using: composite
   steps:
     - name: Add masks and export base64 config
       shell: bash
@@ -18,7 +18,7 @@ runs:
         decoded_toml=$(echo $BASE64_CONFIG_OVERRIDE | base64 -d)
         CHAINLINK_IMAGE=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*image[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
         echo ::add-mask::$CHAINLINK_IMAGE
-        CHAINLINK_VERSION=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*version[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)          
+        CHAINLINK_VERSION=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*version[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
         NETWORKS=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*selected_networks[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
 
         if [ -n "$CHAINLINK_IMAGE" ]; then
@@ -31,11 +31,11 @@ runs:
           echo "CHAINLINK_VERSION=$CHAINLINK_VERSION" >> $GITHUB_ENV
         else
           echo "No Chainlink Version found in base64-ed config. Exiting"
-          exit 1            
-        fi   
+          exit 1
+        fi
         if [ -n "$NETWORKS" ]; then
-          echo "NETWORKS=$NETWORKS" >> $GITHUB_ENV           
-        fi    
+          echo "NETWORKS=$NETWORKS" >> $GITHUB_ENV
+        fi
 
         # use Loki config from GH secrets and merge it with base64 input
         cat << EOF > config.toml

diff --git a/.github/actions/setup-parse-base64-config/action.yml b/.github/actions/setup-parse-base64-config/action.yml
@@ -6,17 +6,17 @@ inputs:
     description: Base64-encoded config to decode
 
 runs:
-  using: composite  
+  using: composite
   steps:
     - name: Add masks and export base64 config
       shell: bash
       run: |
         decoded_toml=$(echo $BASE64_CONFIG_OVERRIDE | base64 -d)
         CHAINLINK_IMAGE=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*image[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
         echo ::add-mask::$CHAINLINK_IMAGE
-        CHAINLINK_VERSION=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*version[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)          
+        CHAINLINK_VERSION=$(echo "$decoded_toml" | awk -F'=' '/^[[:space:]]*version[[:space:]]*=/ {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2); print $2}' 2>/dev/null)
         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)          
+        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
@@ -28,11 +28,11 @@ runs:
           echo "CHAINLINK_VERSION=$CHAINLINK_VERSION" >> $GITHUB_ENV
         else
           echo "No Chainlink Version found in base64-ed config. Exiting"
-          exit 1            
-        fi   
+          exit 1
+        fi
         if [ -n "$NETWORKS" ]; then
-          echo "NETWORKS=$NETWORKS" >> $GITHUB_ENV           
-        fi      
+          echo "NETWORKS=$NETWORKS" >> $GITHUB_ENV
+        fi
         if [ -n "$ETH2_EL_CLIENT" ]; then
-          echo "ETH2_EL_CLIENT=$ETH2_EL_CLIENT" >> $GITHUB_ENV           
+          echo "ETH2_EL_CLIENT=$ETH2_EL_CLIENT" >> $GITHUB_ENV
         fi
diff --git a/.github/workflows/automation-benchmark-tests.yml b/.github/workflows/automation-benchmark-tests.yml
@@ -89,10 +89,10 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
         with:
-          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           this-job-name: Automation Benchmark Test
-          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true
diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml
@@ -41,6 +41,26 @@ jobs:
           BASE64_CONFIG_OVERRIDE=$(jq -r '.inputs.base64Config' $GITHUB_EVENT_PATH)
           echo ::add-mask::$BASE64_CONFIG_OVERRIDE
           echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
+      - name: Merge Pyrsoscope config
+        env:
+          PYROSCOPE_SERVER: ${{ secrets.QA_PYROSCOPE_INSTANCE }}
+          PYROSCOPE_ENVIRONMENT: "automation-load-test"
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+        run: |
+          decoded_toml=$(echo $BASE64_CONFIG_OVERRIDE | base64 -d)
+
+          # use Pyroscope config from GH secrets and merge it with base64 input
+          cat << EOF > config.toml
+          server_url="$PYROSCOPE_SERVER"
+          environment="$PYROSCOPE_ENVIRONMENT"
+          key="$PYROSCOPE_KEY"
+          EOF
+
+          echo "$decoded_toml" >> final_config.toml
+          cat config.toml >> final_config.toml
+          BASE64_CONFIG_OVERRIDE=$(cat final_config.toml | base64 -w 0)
+          echo ::add-mask::$BASE64_CONFIG_OVERRIDE
+          echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
       - name: Parse base64 config
         uses: ./.github/actions/setup-parse-base64-config
         with:
@@ -87,10 +107,10 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@d1618b772a97fd87e6505de97b872ee0b1f1729a # v2.0.2
+        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
         with:
-          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           this-job-name: Automation Load Test
-          test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true