Skip to content

Commit

Permalink
Merge branch 'develop' into fix/renamefObserve_rmn
Browse files Browse the repository at this point in the history
  • Loading branch information
jhweintraub committed Jan 8, 2025
2 parents 05a4e90 + 9bcb3db commit d99e573
Show file tree
Hide file tree
Showing 410 changed files with 4,022 additions and 2,848 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-knives-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#added Sei config and error mapping
7 changes: 7 additions & 0 deletions .changeset/eleven-cheetahs-care.md
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions .changeset/friendly-tigers-argue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#internal change gethwrapper to allow for foundry based gethwrapper generation
5 changes: 5 additions & 0 deletions .changeset/tall-falcons-yawn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#added the ability to define a fallback.toml override config using CL_CHAIN_DEFAULTS env var
26 changes: 0 additions & 26 deletions .github/actions/detect-solidity-foundry-version/action.yml

This file was deleted.

17 changes: 16 additions & 1 deletion .github/workflows/build-publish-develop-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,28 @@ jobs:
goarch: arm64
dist_name: linux_arm64_v8.0
steps:
- name: Checkout repository
- name: Checkout chainlink repository
uses: actions/checkout@v4.2.1
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 # setup-github-token@0.2.1
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/checkout@v4.2.1
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:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-core-partial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-flakeguard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
findByTestFilesDiff: true
findByAffectedPackages: false
slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications
extraArgs: '{ "skipped_tests": "TestChainComponents", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "omit_test_outputs_on_success": "true" }'
extraArgs: '{ "skipped_tests": "", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "omit_test_outputs_on_success": "true" }'
secrets:
SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flakeguard-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
projectPath: '.'
maxPassRatio: '1.0'
runAllTests: true
extraArgs: '{ "skipped_tests": "TestChainComponents", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
extraArgs: '{ "skipped_tests": "", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications
secrets:
SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flakeguard-on-demand.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ on:
extraArgs:
required: false
type: string
default: '{ "skipped_tests": "TestChainComponents", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
default: '{ "skipped_tests": "", "test_repeat_count": "5", "all_tests_runner": "ubuntu22.04-32cores-128GB", "all_tests_runner_count": "3", "run_with_race": "false" }'
description: 'JSON of extra arguments for the workflow.'

jobs:
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/solidity-foundry-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 3 additions & 16 deletions .github/workflows/solidity-foundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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/setup-python@v5.2.0
Expand Down Expand Up @@ -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 }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/solidity-wrappers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/solidity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,4 @@ vendor/*

*.wasm
contracts/lcov.info
/cache
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ linters:
- errname
- errorlint
- exhaustive
- exportloopref
- fatcontext
- ginkgolinter
- gocritic
Expand Down
2 changes: 1 addition & 1 deletion .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions ccip/config/evm/Sei_Testnet_Atlantic.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ChainID = '1328'
ChainType = 'sei'
# finality_depth: instant
FinalityDepth = 10
# block_time: ~0.4s, adding 1 second buffer
LogPollInterval = '2s'
# finality_depth * block_time / 60 secs = ~0.8 min (finality time)
NoNewFinalizedHeadsThreshold = '5m'
# "RPC node returned multiple missing blocks on query for block numbers [31592085 31592084] even though the WS subscription already sent us these blocks. It might help to increase EVM.RPCBlockQueryDelay (currently 1)"
RPCBlockQueryDelay = 5

[GasEstimator]
EIP1559DynamicFees = false
Mode = 'BlockHistory'
PriceMax = '3000 gwei' # recommended by ds&a

[GasEstimator.BlockHistory]
BlockHistorySize = 200
8 changes: 4 additions & 4 deletions common/client/mock_head_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions common/client/mock_node_selector_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d99e573

Please sign in to comment.