Merge branch 'develop' into feat/BurnToZeroAddressPool

.changeset/eleven-cheetahs-care.md

@@ -0,0 +1,7 @@
+---
+"chainlink": patch
+---
+
+Add panic recovery to wsrpc mercury client
+
+- Should help to make nodes running wsrpc v0.8.2 more stable #bugfix

.changeset/friendly-tigers-argue.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal change gethwrapper to allow for foundry based gethwrapper generation

.github/workflows/build-publish-develop-pr.yml

@@ -89,13 +89,28 @@ jobs:
             goarch: arm64
             dist_name: linux_arm64_v8.0
     steps:
-      - name: Checkout repository
+      - name: Checkout chainlink repository
         uses: actions/[email protected]
         with:
           persist-credentials: false
           ref: ${{ env.CHECKOUT_REF }}
           fetch-depth: 0
 
+      - name: Setup Github Token
+        id: token
+        uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # [email protected]
+        with:
+          aws-role-arn: ${{ secrets.AWS_OIDC_GLOBAL_READ_ONLY_TOKEN_ISSUER_ROLE_ARN }}
+          aws-lambda-url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Checkout capabilities repository
+        uses: actions/[email protected]
+        with:
+          repository: smartcontractkit/capabilities
+          token: ${{ steps.token.outputs.access-token }}
+          path: capabilities
+
       - name: Configure aws credentials
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:

.github/workflows/ci-core-partial.yml

@@ -68,6 +68,9 @@ jobs:
         with:
           prod: "true"
 
+      - name: Install Foundry
+        uses: ./.github/actions/install-solidity-foundry
+
       - name: Setup Go
         uses: ./.github/actions/setup-go
         with:

.github/workflows/ci-core.yml

@@ -212,6 +212,9 @@ jobs:
         with:
           prod: "true"
 
+      - name: Install Foundry
+        uses: ./.github/actions/install-solidity-foundry
+
       - name: Setup Go
         if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
         uses: ./.github/actions/setup-go
@@ -480,6 +483,8 @@ jobs:
         run: curl https://github.com/smartcontractkit/wsrpc/raw/main/cmd/protoc-gen-go-wsrpc/protoc-gen-go-wsrpc --output $HOME/go/bin/protoc-gen-go-wsrpc && chmod +x $HOME/go/bin/protoc-gen-go-wsrpc
       - name: Setup NodeJS
         uses: ./.github/actions/setup-nodejs
+      - name: Install Foundry
+        uses: ./.github/actions/install-solidity-foundry
       - name: make generate
         run: |
           make rm-mocked

.github/workflows/solidity-foundry-artifacts.yml

@@ -134,11 +134,8 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Extract Foundry version
-        id: extract-foundry-version
-        uses: ./.github/actions/detect-solidity-foundry-version
-        with:
-          working-directory: contracts
+      - name: Install Foundry
+        uses: ./.github/actions/install-solidity-foundry
 
       - name: Should skip code coverage report
         id: skip-code-coverage

.github/workflows/solidity-foundry.yml

@@ -21,7 +21,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.define-matrix.outputs.matrix }}
-      foundry-version: ${{ steps.extract-foundry-version.outputs.foundry-version }}
     steps:
       - name: Define test matrix
         id: define-matrix
@@ -51,12 +50,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Extract Foundry version
-        id: extract-foundry-version
-        uses: ./.github/actions/detect-solidity-foundry-version
-        with:
-          working-directory: contracts
-
   changes:
     name: Detect changes
     runs-on: ubuntu-latest
@@ -178,9 +171,7 @@ jobs:
           ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name)
           || contains(fromJson(needs.changes.outputs.all_changes), 'shared')
           || needs.changes.outputs.non_src_changes == 'true' }}
-        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
-        with:
-          version: ${{ needs.define-matrix.outputs.foundry-version }}
+        uses: ./.github/actions/install-solidity-foundry
 
       # If Solc version is not set in foundry.toml, then what `forge build` does is that it lazily-installs required solc versions
       # using SVM. This is done in parallel, but SVM has a bug and is not thread-safe, which sometimes leads to `Text file busy` error.
@@ -347,9 +338,7 @@ jobs:
         uses: ./.github/actions/setup-nodejs
 
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
-        with:
-          version: ${{ needs.define-matrix.outputs.foundry-version }}
+        uses: ./.github/actions/install-solidity-foundry
 
       - name: Set up Python
         uses: actions/[email protected]
@@ -626,9 +615,7 @@ jobs:
 
       - name: Install Foundry
         if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) || needs.changes.outputs.non_src_changes == 'true') && matrix.product.setup.run-forge-fmt }}
-        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
-        with:
-          version: ${{ needs.define-matrix.outputs.foundry-version }}
+        uses: ./.github/actions/install-solidity-foundry
 
       - name: Run Forge fmt
         if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) || needs.changes.outputs.non_src_changes == 'true') && matrix.product.setup.run-forge-fmt }}

.github/workflows/solidity-wrappers.yml

@@ -54,6 +54,9 @@ jobs:
         with:
           prod: "true"
 
+      - name: Install Foundry
+        uses: ./.github/actions/install-solidity-foundry
+
       - name: Run native compile and generate wrappers
         run: make wrappers-all
         working-directory: ./contracts

.github/workflows/solidity.yml

@@ -110,6 +110,11 @@ jobs:
         with:
           go-version-file: "chainlink/go.mod"
 
+      - name: Install Foundry
+        uses: ./chainlink/.github/actions/install-solidity-foundry
+        with:
+          working-directory: chainlink/contracts
+
       - name: Run native compile and generate wrappers
         working-directory: ./chainlink/contracts
         run: make wrappers-all

.gitignore

@@ -115,3 +115,4 @@ vendor/*
 
 *.wasm
 contracts/lcov.info
+/cache

.mockery.yaml

@@ -127,7 +127,7 @@ packages:
       FlagsInterface:
         config:
           mockname: Flags
-  github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/aggregator_v3_interface:
+  github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/aggregator_v3_interface:
     config:
       dir: core/services/vrf/mocks
       filename: aggregator_v3_interface.go

GNUmakefile

@@ -146,7 +146,7 @@ gomodslocalupdate: gomods ## Run gomod-local-update
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.
-	go install github.com/vektra/mockery/v2@v2.46.3
+	go install github.com/vektra/mockery/v2@v2.50.0
 
 .PHONY: codecgen
 codecgen: $(codecgen) ## Install codecgen