Skip to content

Commit

Permalink
Merge branch 'develop' into update-ccip-reader-test-to-use-mock-for-a…
Browse files Browse the repository at this point in the history
…ddrcodec
  • Loading branch information
huangzhen1997 authored Feb 27, 2025
2 parents 30dd300 + b10ee6f commit 8a0067a
Show file tree
Hide file tree
Showing 249 changed files with 9,135 additions and 6,000 deletions.
5 changes: 5 additions & 0 deletions .changeset/neat-penguins-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#added add exponential backoff retry to feeds.SyncNodeInfo()
5 changes: 5 additions & 0 deletions .changeset/stale-birds-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#changed: Add more granularity for workflow completed histogram metric around expected values
5 changes: 5 additions & 0 deletions .changeset/swift-nails-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

go.mod update in core/scripts #updated
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ core/scripts/gateway @smartcontractkit/dev-services
/core/gethwrappers/ccip @smartcontractkit/ccip-onchain
/core/gethwrappers/functions @smartcontractkit/dev-services
/core/gethwrappers/keystone @smartcontractkit/keystone
/core/gethwrappers/liquiditymanager @smartcontractkit/ccip-onchain
/core/gethwrappers/llo-feeds @smartcontractkit/data-streams-engineers
/core/gethwrappers/operatorforwarder @smartcontractkit/data-feeds-engineers
/core/gethwrappers/data-feeds @smartcontractkit/data-feeds-engineers
Expand Down
10 changes: 10 additions & 0 deletions .github/actions/goreleaser-build-sign-publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ inputs:
runs:
using: composite
steps:
# See https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
- name: Delete unused tools to free up space
shell: bash
run: |
sudo rm -rf /opt/hostedtoolcache/CodeQL
sudo rm -rf /opt/hostedtoolcache/PyPy
sudo rm -rf /opt/hostedtoolcache/Python
sudo rm -rf /opt/hostedtoolcache/Ruby
sudo rm -rf /opt/hostedtoolcache/Java_*
- # We need QEMU to test the cross architecture builds after they're built.
name: Set up QEMU
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
Expand Down
26 changes: 22 additions & 4 deletions .github/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,25 +197,43 @@ runner-test-matrix:
E2E_JD_VERSION: 0.9.0 # there is no latest tag for this repo, so we need to specify the version
GITHUB_READ_TOKEN: '{{ env.GITHUB_API_TOKEN }}' # GATI-provided token that can read from capabilities and dev-platform repos
CI: "true"
CTF_CONFIGS: "environment-ci.toml"
CTF_CONFIGS: "environment-one-don-ci.toml"
# Anvil developer key, not a secret
PRIVATE_KEY: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"

- id: system-tests/smoke/capabilities/workflow_test.go:TestKeystoneWithOCR3Workflow_TwoDons
- id: system-tests/smoke/capabilities/workflow_test.go:TestKeystoneWithOCR3Workflow_GatewayDon
path: system-tests/tests/smoke/capabilities/workflow_test.go
test_env_type: docker
runs_on: ubuntu-latest
triggers:
- PR Workflow Engine E2E Core Tests
- Nightly E2E Tests
test_cmd: cd system-tests/tests && go test github.com/smartcontractkit/chainlink/system-tests/tests/smoke/capabilities -v -run "^(TestKeystoneWithOCR3Workflow_TwoDons_LivePrice)$" -timeout 30m -count=1 -test.parallel=1 -json
test_cmd: cd system-tests/tests && go test github.com/smartcontractkit/chainlink/system-tests/tests/smoke/capabilities -v -run "^(TestKeystoneWithOCR3Workflow_GatewayDon_MockedPrice)$" -timeout 30m -count=1 -test.parallel=1 -json
pyroscope_env: ci-smoke-capabilities-evm-simulated
test_env_vars:
E2E_TEST_CHAINLINK_VERSION: '{{ env.DEFAULT_CHAINLINK_PLUGINS_VERSION }}' # This is the chainlink version that has the plugins
E2E_JD_VERSION: 0.9.0 # there is no latest tag for this repo, so we need to specify the version
GITHUB_READ_TOKEN: '{{ env.GITHUB_API_TOKEN }}' # GATI-provided token that can read from capabilities and dev-platform repos
CI: "true"
CTF_CONFIGS: "environment-multi-don-ci.toml"
CTF_CONFIGS: "environment-two-dons-ci.toml"
# Anvil developer key, not a secret
PRIVATE_KEY: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"

- id: system-tests/smoke/capabilities/workflow_test.go:TestKeystoneWithOCR3Workflow_ThreeDons
path: system-tests/tests/smoke/capabilities/workflow_test.go
test_env_type: docker
runs_on: ubuntu-latest
triggers:
- PR Workflow Engine E2E Core Tests
- Nightly E2E Tests
test_cmd: cd system-tests/tests && go test github.com/smartcontractkit/chainlink/system-tests/tests/smoke/capabilities -v -run "^(TestKeystoneWithOCR3Workflow_ThreeDons_LivePrice)$" -timeout 30m -count=1 -test.parallel=1 -json
pyroscope_env: ci-smoke-capabilities-evm-simulated
test_env_vars:
E2E_TEST_CHAINLINK_VERSION: '{{ env.DEFAULT_CHAINLINK_PLUGINS_VERSION }}' # This is the chainlink version that has the plugins
E2E_JD_VERSION: 0.9.0 # there is no latest tag for this repo, so we need to specify the version
GITHUB_READ_TOKEN: '{{ env.GITHUB_API_TOKEN }}' # GATI-provided token that can read from capabilities and dev-platform repos
CI: "true"
CTF_CONFIGS: "environment-three-dons-ci.toml"
# Anvil developer key, not a secret
PRIVATE_KEY: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-publish-develop-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ jobs:
with:
persist-credentials: false
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
# nightly builds require a full clone for goreleaser to work
fetch-depth: ${{ needs.image-tag.outputs.release-type == 'nightly' && '0' || '1' }}

- name: Setup Github Token
id: token
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/solidity-foundry-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
- "functions"
- "keystone"
- "l2ep"
- "liquiditymanager"
- "llo-feeds"
- "operatorforwarder"
- "shared"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/solidity-foundry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
{ "name": "functions", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": true, "run-forge-fmt": false }},
{ "name": "keystone", "setup": { "run-coverage": true, "min-coverage": 72.8, "run-gas-snapshot": false, "run-forge-fmt": false }},
{ "name": "l2ep", "setup": { "run-coverage": true, "min-coverage": 65.0, "run-gas-snapshot": true, "run-forge-fmt": false }},
{ "name": "liquiditymanager", "setup": { "run-coverage": true, "min-coverage": 40, "run-gas-snapshot": true, "run-forge-fmt": false }},
{ "name": "llo-feeds", "setup": { "run-coverage": true, "min-coverage": 49.3, "run-gas-snapshot": true, "run-forge-fmt": false }},
{ "name": "operatorforwarder", "setup": { "run-coverage": true, "min-coverage": 55.7, "run-gas-snapshot": true, "run-forge-fmt": false }},
{ "name": "shared", "setup": { "run-coverage": true, "extra-coverage-params": "--no-match-path='*CallWithExactGas*' --ir-minimum", "min-coverage": 32.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
Expand Down Expand Up @@ -96,8 +95,6 @@ jobs:
- 'contracts/src/v0.8/keystone/**/*.sol'
l2ep:
- 'contracts/src/v0.8/l2ep/**/*.sol'
liquiditymanager:
- 'contracts/src/v0.8/liquiditymanager/**/*.sol'
llo-feeds:
- 'contracts/src/v0.8/llo-feeds/**/*.sol'
operatorforwarder:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/solidity-hardhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
with:
filters: |
src:
- 'contracts/src/!(v0.8/(ccip|functions|keystone|l2ep|liquiditymanager|llo-feeds|vrf|workflow)/**)/**/*'
- 'contracts/src/!(v0.8/(ccip|functions|keystone|l2ep|llo-feeds|vrf|workflow)/**)/**/*'
- 'contracts/test/**/*'
- 'contracts/package.json'
- 'contracts/pnpm-lock.yaml'
Expand Down
10 changes: 10 additions & 0 deletions contracts/.changeset/brave-goats-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@chainlink/contracts': patch
---

remote liquiditymanager onchain code


PR issue: CCIP-5335

Solidity Review issue: CCIP-3966
1 change: 0 additions & 1 deletion contracts/.solhintignore-test
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
./src/v0.8/shared/
./src/v0.8/operatorforwarder/
./src/v0.8/functions/
./src/v0.8/liquiditymanager/
./src/v0.8/keystone/
./src/v0.8/llo-feeds/
./src/v0.8/data-feeds/test/helpers/DataFeedsLegacyAggregatorProxy.sol
Expand Down
2 changes: 1 addition & 1 deletion contracts/GNUmakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ALL_FOUNDRY_PRODUCTS contains a list of all products that have a foundry
# profile defined and use the Foundry snapshots.
ALL_FOUNDRY_PRODUCTS = ccip functions keystone l2ep liquiditymanager llo-feeds operatorforwarder shared workflow data-feeds
ALL_FOUNDRY_PRODUCTS = ccip functions keystone l2ep llo-feeds operatorforwarder shared workflow data-feeds

# To make a snapshot for a specific product, either set the `FOUNDRY_PROFILE` env var
# or call the target with `FOUNDRY_PROFILE=product`
Expand Down
7 changes: 0 additions & 7 deletions contracts/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@ src = 'src/v0.8/llo-feeds'
test = 'src/v0.8/llo-feeds/test'
solc_version = '0.8.19'

[profile.liquiditymanager]
optimizer_runs = 1000000
src = 'src/v0.8/liquiditymanager'
test = 'src/v0.8/liquiditymanager/test'
solc_version = '0.8.24'
evm_version = 'paris'

[profile.keystone]
optimizer_runs = 1_000_000
solc_version = '0.8.24'
Expand Down
34 changes: 0 additions & 34 deletions contracts/gas-snapshots/liquiditymanager.gas-snapshot

This file was deleted.

1 change: 0 additions & 1 deletion contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
},
"dependencies": {
"@arbitrum/nitro-contracts": "1.1.1",
"@arbitrum/token-bridge-contracts": "1.1.2",
"@changesets/cli": "~2.27.12",
"@changesets/get-github-info": "^0.6.0",
"@eth-optimism/contracts": "0.6.0",
Expand Down
Loading

0 comments on commit 8a0067a

Please sign in to comment.