Skip to content

Commit

Permalink
Merge branch 'solana-offchain-plugin' into NONEVM-1163/implement-extr…
Browse files Browse the repository at this point in the history
…a-args-codec
  • Loading branch information
huangzhen1997 authored Jan 23, 2025
2 parents c49c04b + 0e53261 commit 7204973
Show file tree
Hide file tree
Showing 694 changed files with 11,734 additions and 8,359 deletions.
5 changes: 5 additions & 0 deletions .changeset/chilled-papayas-jump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#added Implements rate limiter for workflow executions by workflow engine
5 changes: 5 additions & 0 deletions .changeset/few-vans-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated move TxMessage proto files to chainlink-protos.
5 changes: 5 additions & 0 deletions .changeset/honest-knives-reflect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Bump chainlink-solana and chainlink-framework dependencies, and add NewHeadsPollInterval to MultiNode and documentation. #internal #added
5 changes: 5 additions & 0 deletions .changeset/mean-pianos-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#nops change chainType from metis to optimismBedrock
5 changes: 5 additions & 0 deletions .changeset/polite-spiders-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#updated Move chainlink/common to chainlink-framework/chains.
5 changes: 5 additions & 0 deletions .changeset/three-meals-promise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#added Monad Testnet Config
5 changes: 3 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# Chains
/common @smartcontractkit/bix-framework @smartcontractkit/core
/core/chains/ @smartcontractkit/bix-framework @smartcontractkit/core
/evm @jmank88 @pavel-raykov @DylanTinianov

# Services
/core/services/directrequest @smartcontractkit/foundations
Expand Down Expand Up @@ -159,8 +160,8 @@ contracts/scripts/requirements.txt @smartcontractkit/core
.nvmrc @smartcontractkit/core
contracts/package.json @smartcontractkit/foundations @smartcontractkit/core
contracts/pnpm.lock @smartcontractkit/core
go.mod @smartcontractkit/core @smartcontractkit/releng @smartcontractkit/foundations
go.sum @smartcontractkit/core @smartcontractkit/releng @smartcontractkit/foundations
go.mod @smartcontractkit/core @smartcontractkit/foundations
go.sum @smartcontractkit/core @smartcontractkit/foundations
integration-tests/go.mod @smartcontractkit/core @smartcontractkit/test-tooling-team @smartcontractkit/foundations
integration-tests/go.sum @smartcontractkit/core @smartcontractkit/test-tooling-team @smartcontractkit/foundations
flake.nix @smartcontractkit/core
Expand Down
73 changes: 73 additions & 0 deletions .github/actions/setup-solana/build-contracts/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Solana build contracts
description: Build Solana contracts

runs:
using: composite
steps:
- name: Checkout chainlink-ccip
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
repository: smartcontractkit/chainlink-ccip
path: chainlink-ccip
fetch-depth: 0
- name: Checkout branch based on CCIP Revision
id: get_checkout_ccip_chains_solana_revision
shell: bash
run: |
# get the short revision of the chainlink-ccip solana contracts dependency from the go.mod file
short_revision=$(grep "github.com/smartcontractkit/chainlink-ccip/chains/solana" deployment/go.mod | awk '{print $2}' | cut -d'-' -f3)
# since the github action checkout action doesn't support short revisions, we have to do it manually
cd chainlink-ccip
git checkout $short_revision
echo "CHAINLINK_CCIP_COMMIT_SHORT=${short_revision}" >> $GITHUB_ENV
- name: Get Anchor Version
id: get_anchor_version
shell: bash
run: |
cd chainlink-ccip/chains/solana
anchor=$(make anchor_version)
echo "ANCHOR_VERSION=${anchor}" >> $GITHUB_ENV
- name: cache docker build image
id: cache-image
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
lookup-only: true
path: chains/solana/contracts/docker-build.tar
key: ${{ runner.os }}-solana-build-${{ env.ANCHOR_VERSION }}-${{ hashFiles('**/Cargo.lock') }}
- name: Cache cargo target dir
id: cache-target
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
lookup-only: true
path: chains/solana/contracts/target
key: ${{ runner.os }}-solana-contract-artifacts-${{ hashFiles('**/Cargo.lock') }}
- name: build & save image
if: steps.cache-image.outputs.cache-hit != 'true'
shell: bash
run: |
cd chainlink-ccip/chains/solana/contracts
docker buildx build . -t ccip-solana:build --build-arg ANCHOR_CLI=${{ env.ANCHOR_VERSION }}
docker save -o docker-build.tar ccip-solana
- name: build & save contract compilation artifacts
if: steps.cache-target.outputs.cache-hit != 'true'
shell: bash
run: |
cd chainlink-ccip/chains/solana
docker run -v "$(pwd)/contracts":/solana/contracts ccip-solana:build bash -c "\
set -eoux pipefail &&\
RUSTUP_HOME=\"/root/.rustup\" &&\
FORCE_COLOR=1 &&\
cd /solana/contracts &&\
anchor build &&\
chmod -R 755 ./target"
- name: move built contracts to test folder
shell: bash
run: |
# copy the built contracts so they can be used in the chainlink tests
mkdir -p /home/runner/work/chainlink/chainlink/deployment/ccip/changeset/internal/solana_contracts
cp chainlink-ccip/chains/solana/contracts/target/deploy/*.so /home/runner/work/chainlink/chainlink/deployment/ccip/changeset/internal/solana_contracts
# save the revision of the built chainlink-ccip solana contracts
echo ${{ env.CHAINLINK_CCIP_COMMIT_SHORT }} > /home/runner/work/chainlink/chainlink/deployment/ccip/changeset/internal/solana_contracts/.solana_contracts_rev
9 changes: 9 additions & 0 deletions .github/workflows/ci-core-partial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ jobs:
- name: Setup Solana
uses: ./.github/actions/setup-solana

- name: Build Solana artifacts
uses: ./.github/actions/setup-solana/build-contracts

- name: Setup wasmd
uses: ./.github/actions/setup-wasmd

Expand Down Expand Up @@ -210,6 +213,9 @@ jobs:
- name: Setup Solana
uses: ./.github/actions/setup-solana

- name: Build Solana artifacts
uses: ./.github/actions/setup-solana/build-contracts

- name: Setup wasmd
uses: ./.github/actions/setup-wasmd

Expand Down Expand Up @@ -256,6 +262,9 @@ jobs:
- name: Setup Solana
uses: ./.github/actions/setup-solana

- name: Build Solana artifacts
uses: ./.github/actions/setup-solana/build-contracts

- name: Setup wasmd
uses: ./.github/actions/setup-wasmd

Expand Down
15 changes: 14 additions & 1 deletion .github/workflows/ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ jobs:
permissions:
id-token: write
contents: read
actions: read
steps:
- name: Checkout the repo
uses: actions/checkout@v4.2.1
Expand Down Expand Up @@ -239,6 +240,10 @@ jobs:
if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
uses: ./.github/actions/setup-solana

- name: Build Solana artifacts
if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
uses: ./.github/actions/setup-solana/build-contracts

- name: Setup wasmd
if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
uses: ./.github/actions/setup-wasmd
Expand Down Expand Up @@ -288,7 +293,14 @@ jobs:
- name: Print Races
id: print-races
if: ${{ failure() && matrix.type.cmd == 'go_core_race_tests' && needs.filter.outputs.should-run-ci-core == 'true' }}
env:
GH_REPO: ${{ github.repository }}
GH_RUN_ID: ${{ github.run_id }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
run_url=$(gh run --repo "$GH_REPO" view "$GH_RUN_ID" --json jobs --jq '.jobs[] | select(.name | contains("${{ matrix.type.cmd }}")) | .url')
echo "run_url=$run_url" >> $GITHUB_OUTPUT
find race.* | xargs cat > race.txt
if [[ -s race.txt ]]; then
cat race.txt
Expand Down Expand Up @@ -329,7 +341,8 @@ jobs:
SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
with:
channel-id: "#topic-data-races"
slack-message: "Race tests failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
slack-message: |
Race Tests Failed: ${{ steps.print-races.outputs.run_url }}
core-scripts-tests:
name: test-scripts
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/flakeguard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ jobs:
restore-build-cache-only: "true"
- name: Setup Solana
uses: ./.github/actions/setup-solana
- name: Build Solana artifacts
uses: ./.github/actions/setup-solana/build-contracts
- name: Setup wasmd
uses: ./.github/actions/setup-wasmd
- name: Setup Postgres
Expand Down
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,5 @@ issues:
text: "^G404:"
linters:
- gosec
exclude-files:
- evm/ # need to move files here for evm extraction that have outstanding issues
15 changes: 12 additions & 3 deletions .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,24 @@ mockname: "{{ .InterfaceName }}"
outpkg: mocks
filename: "{{ .InterfaceName | snakecase }}.go"
packages:
github.com/smartcontractkit/chainlink/v2/common/headtracker:
github.com/smartcontractkit/chainlink-framework/chains/headtracker:
config:
dir: common/headtracker/mocks
outpkg: mocks
interfaces:
HeadTrackable:
HeadTracker:
HeadBroadcaster:
github.com/smartcontractkit/chainlink/v2/common/txmgr:
github.com/smartcontractkit/chainlink-framework/chains/txmgr:
config:
dir: common/txmgr/mocks
outpkg: mocks
interfaces:
TxManager:
github.com/smartcontractkit/chainlink/v2/common/txmgr/types:
github.com/smartcontractkit/chainlink-framework/chains/txmgr/types:
config:
dir: common/txmgr/types/mocks
outpkg: mocks
interfaces:
ReaperChainConfig:
config:
Expand Down
2 changes: 2 additions & 0 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ install-plugins: ## Build & install LOOPP binaries for products and chains.
go install ./cmd/chainlink-feeds
cd $(shell go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-data-streams) && \
go install ./mercury/cmd/chainlink-mercury
cd $(shell go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-cosmos) && \
go install ./pkg/cosmos/cmd/chainlink-cosmos
cd $(shell go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana) && \
go install ./pkg/solana/cmd/chainlink-solana
cd $(shell go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-starknet/relayer) && \
Expand Down
1 change: 0 additions & 1 deletion ccip/config/evm/Metis_Mainnet.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Metis is an L2 chain based on Optimism.
ChainID = '1088'
ChainType = 'optimismBedrock'
# Sequencer offers absolute finality
# High variation on finality depth triggered a commitee to investigate
# and set 500 as a secure finality depth.
Expand Down
1 change: 0 additions & 1 deletion ccip/config/evm/Metis_Sepolia.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ChainID = '59902'
ChainType = 'optimismBedrock'
# FT and FD are both present here because the dev effort rely only on FinalityTagEnabled are still in progress.
# We expect to be able to rely only on FinalityTagEnabled=true in the short future.
# https://chainlink-core.slack.com/archives/C05CS33N08N/p1715102940763339?thread_ts=1715102478.537529&cid=C05CS33N08N
Expand Down
119 changes: 0 additions & 119 deletions common/fees/fees.go

This file was deleted.

Loading

0 comments on commit 7204973

Please sign in to comment.