Skip to content

Commit

Permalink
Merge branch 'develop' into CRE-44-restricted-config
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-cordenier committed Jan 20, 2025
2 parents a5a1fba + 4e28497 commit 2bdf86b
Show file tree
Hide file tree
Showing 110 changed files with 7,930 additions and 271 deletions.
5 changes: 5 additions & 0 deletions .changeset/soft-rivers-care.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

interface change for plugin to support extra args codec, right now noop #added
6 changes: 6 additions & 0 deletions .github/actions/golangci-lint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ inputs:
description: Set where the go module file is located at
default: "go.sum"

outputs:
golang-report-artifact-url:
description: The URL to the uploaded artifact
value: ${{ steps.upload-artifact.outputs.artifact_url }}

runs:
using: composite
steps:
Expand Down Expand Up @@ -100,6 +105,7 @@ runs:
- name: Store Golangci-lint report artifact
if: always()
id: upload-artifact
uses: actions/[email protected]
with:
# Use a unique suffix for each lint report artifact to avoid duplication errors
Expand Down
8 changes: 8 additions & 0 deletions .github/integration-in-memory-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ runner-test-matrix:
triggers:
- PR Integration CCIP Tests
test_cmd: cd integration-tests/smoke/ccip && go test ccip_batching_test.go -timeout 12m -test.parallel=2 -count=1 -json

- id: smoke/ccip/ccip_add_chain_test.go:*
path: integration-tests/smoke/ccip/ccip_add_chain_test.go
test_env_type: in-memory
runs_on: ubuntu-latest
triggers:
- PR Integration CCIP Tests
test_cmd: cd integration-tests/smoke/ccip && go test ccip_add_chain_test.go -timeout 15m -test.parallel=1 -count=1 -json

- id: smoke/ccip/ccip_reader_test.go:*
path: integration-tests/smoke/ccip/ccip_reader_test.go
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/ci-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,17 @@ jobs:
- name: Resolve affected files to affected modules
id: resolved-modules
shell: bash
env:
GH_EVENT_NAME: ${{ github.event_name }}
run: |
# Ensure the step uses `with.list-files: json` to get the list of files in JSON format
bash ./.github/scripts/map-affected-files-to-modules.sh '${{ steps.match-every.outputs.all_files }}'
# if scheduled, run for all modules. Otherwise, run for only affected modules.
if [[ "$GH_EVENT_NAME" == "schedule" ]]; then
json_array=$(find . -name 'go.mod' -exec dirname {} \; | sed 's|^./||' | uniq | jq -R -s -c 'split("\n") | map(select(length > 0))')
echo "module_names=$json_array" >> "$GITHUB_OUTPUT"
else
# Ensure the step uses `with.list-files: json` to get the list of files in JSON format
bash ./.github/scripts/map-affected-files-to-modules.sh '${{ steps.match-every.outputs.all_files }}'
fi
golangci:
name: GolangCI Lint
Expand All @@ -138,6 +146,7 @@ jobs:
with:
persist-credentials: false
- name: Golang Lint (${{ matrix.modules }})
id: golang-lint
uses: ./.github/actions/golangci-lint
with:
go-directory: ${{ matrix.modules }}
Expand All @@ -148,7 +157,10 @@ jobs:
SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
with:
channel-id: "#team-core"
slack-message: "golangci-lint failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
slack-message: |
"golangci-lint failed (${{ matrix.modules }})
- Run: ${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}"
- Report: ${{ steps.golang-lint.outputs.golang-report-artifact-url }}"
# Fails if any golangci-lint matrix jobs fails and silently succeeds otherwise
# Consolidates golangci-lint matrix job results under one required `lint` check
Expand Down Expand Up @@ -255,19 +267,7 @@ jobs:

- name: Install LOOP Plugins
if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
run: |
pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds)
go install ./cmd/chainlink-feeds
popd
pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-data-streams)
go install ./mercury/cmd/chainlink-mercury
popd
pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-solana)
go install ./pkg/solana/cmd/chainlink-solana
popd
pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-starknet/relayer)
go install ./pkg/chainlink/cmd/chainlink-starknet
popd
run: make install-plugins

- name: Increase Timeouts for Fuzz/Race
# Increase timeouts for scheduled runs only
Expand Down
6 changes: 6 additions & 0 deletions .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ packages:
BalanceMonitor:
config:
dir: "{{ .InterfaceDir }}/../mocks"
github.com/smartcontractkit/chainlink/v2/core/chains/evm/txm:
interfaces:
Client:
TxStore:
AttemptBuilder:
Keystore:
github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr:
interfaces:
ChainConfig:
Expand Down
11 changes: 11 additions & 0 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ install-medianpoc: ## Build & install the chainlink-medianpoc binary.
install-ocr3-capability: ## Build & install the chainlink-ocr3-capability binary.
go install $(GOFLAGS) ./plugins/cmd/chainlink-ocr3-capability

.PHONY: install-plugins
install-plugins: ## Build & install LOOPP binaries for products and chains.
cd $(shell go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds) && \
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-solana) && \
go install ./pkg/solana/cmd/chainlink-solana
cd $(shell go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-starknet/relayer) && \
go install ./pkg/chainlink/cmd/chainlink-starknet

.PHONY: docker ## Build the chainlink docker image
docker:
docker buildx build \
Expand Down
10 changes: 10 additions & 0 deletions contracts/.changeset/clean-horses-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@chainlink/contracts': minor
---

Update FeeQuoter to support Solana chain families #feature


PR issue: CCIP-4687

Solidity Review issue: CCIP-3966
Loading

0 comments on commit 2bdf86b

Please sign in to comment.