Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/smartcontractkit/chainlink
Browse files Browse the repository at this point in the history
… into BCFR-1069-fix-multinode-issues
  • Loading branch information
DylanTinianov committed Nov 14, 2024
2 parents 8a5d75c + b805b82 commit ced19c2
Show file tree
Hide file tree
Showing 673 changed files with 29,475 additions and 19,434 deletions.
5 changes: 5 additions & 0 deletions .changeset/brave-frogs-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

update plugin and evm chainwriter to remove evmConfig dependency #updated
5 changes: 5 additions & 0 deletions .changeset/forty-foxes-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Updated Solana TXM's in-memory storage to track statuses across the Solana transaction lifecycle. Added a method to translate Solana transaction statuses into states expected by the ChainWriter interface. Made the duration transactions are retained in storage after finality or error configurable using `TxRetentionTimeout`. #added
5 changes: 5 additions & 0 deletions .changeset/good-roses-smash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#internal Fix Contract Reader data word index calculation and change ccip contract reader config for more optimal querying.
5 changes: 5 additions & 0 deletions .changeset/great-spiders-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Fixed outdated headtracker config doc. #internal
5 changes: 5 additions & 0 deletions .changeset/healthy-shirts-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

#removed Remove unused deprecated key interfaces.
5 changes: 5 additions & 0 deletions .changeset/many-carrots-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#internal Update ccip contract reader cfg for ccip message sent to use output codec wrapper modifier
5 changes: 5 additions & 0 deletions .changeset/neat-singers-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Added multiple blocks history estimator feature and config for Solana TXM. #added
5 changes: 5 additions & 0 deletions .changeset/nine-stingrays-march.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Add don_id to Mercury Enhanced EA telemetry #added
5 changes: 5 additions & 0 deletions .changeset/purple-shrimps-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Upgrade go-ethereum to v1.14.11 #internal
5 changes: 5 additions & 0 deletions .changeset/silent-goats-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Fix HeadTracker tests caused by simulated client update #internal
5 changes: 5 additions & 0 deletions .changeset/six-wombats-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

CCIP token transfer integration tests #internal
5 changes: 5 additions & 0 deletions .changeset/small-gifts-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#updated Operator UI to support StreamSpec job definition
5 changes: 5 additions & 0 deletions .changeset/strange-radios-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Merge raw configs correctly #bugfix
5 changes: 5 additions & 0 deletions .changeset/swift-fireants-compare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Add CSA authentication support to Beholder #added
5 changes: 5 additions & 0 deletions .changeset/tender-colts-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#updated celo alfajores config
5 changes: 5 additions & 0 deletions .changeset/thick-chefs-deliver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Enable AutoPurge feature on all affected chains #nops
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
/core/services/ccip @smartcontractkit/ccip
/core/services/ocr2/plugins/ccip @smartcontractkit/ccip

# CCIP
/core/services/ccip @smartcontractkit/ccip
/core/services/ocr2/plugins/ccip @smartcontractkit/ccip

# VRF-related services
/core/services/vrf @smartcontractkit/dev-services @smartcontractkit/core
/core/services/blockhashstore @smartcontractkit/dev-services @smartcontractkit/core
Expand Down
17 changes: 10 additions & 7 deletions .github/actions/golangci-lint/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: CI lint for Golang
description: Runs CI lint for Golang
inputs:
# general inputs
name:
description: Name of the lint action
required: true
go-directory:
description: Go directory to run commands from
default: "."
Expand All @@ -25,10 +21,17 @@ inputs:
runs:
using: composite
steps:
- uses: actions/checkout@v4.2.1
- name: Checkout repo (full)
uses: actions/checkout@v4.2.1
# Only do a full checkout on merge_groups
if: github.event_name == 'merge_group'
with:
# We only need a full clone on merge_group events for golangci-lint.
fetch-depth: ${{ github.event_name == 'merge_group' && '0' || '1' }}"
fetch-depth: 0
- name: Checkout repo
uses: actions/checkout@v4.2.1
if: github.event_name != 'merge_group'
with:
fetch-depth: 1
- name: Setup Go
uses: ./.github/actions/setup-go
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-go/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ runs:
- uses: actions/cache/restore@v4.1.1
name: Cache Go Build Outputs (restore)
# For certain events, we don't necessarily want to create a build cache, but we will benefit from restoring from one.
if: ${{ inputs.only-modules == 'false' && (github.event == 'merge_group' || inputs.restore-build-cache-only == 'true') }}
if: ${{ inputs.only-modules == 'false' && (github.event_name == 'merge_group' || inputs.restore-build-cache-only == 'true') }}
with:
path: |
${{ steps.go-cache-dir.outputs.gobuildcache }}
Expand All @@ -98,7 +98,7 @@ runs:
- uses: actions/cache@v4.1.1
# don't save cache on merge queue events
if: ${{ inputs.only-modules == 'false' && (github.event != 'merge_group' && inputs.restore-build-cache-only == 'false') }}
if: ${{ inputs.only-modules == 'false' && (github.event_name != 'merge_group' && inputs.restore-build-cache-only == 'false') }}
name: Cache Go Build Outputs
with:
path: |
Expand Down
16 changes: 15 additions & 1 deletion .github/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,20 @@ runner-test-matrix:
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.4.0

- id: smoke/ccip_messaging_test.go:*
path: integration-tests/smoke/ccip_messaging_test.go
test_env_type: docker
runs_on: ubuntu-latest
triggers:
- PR E2E Core Tests
- Merge Queue E2E Core Tests
- Nightly E2E Tests
test_cmd: cd integration-tests/ && go test smoke/ccip_messaging_test.go -timeout 12m -test.parallel=1 -count=1 -json
pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
test_env_vars:
E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
E2E_JD_VERSION: 0.4.0

# END: CCIPv1.6 tests

Expand Down Expand Up @@ -1178,4 +1192,4 @@ runner-test-matrix:
TEST_LOG_LEVEL: debug
E2E_TEST_GRAFANA_DASHBOARD_URL: /d/6vjVx-1V8/ccip-long-running-tests

# END: CCIP tests
# END: CCIP tests
27 changes: 13 additions & 14 deletions .github/workflows/build-publish-develop-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ on:
default: "false"

env:
GIT_REF: ${{ github.event.inputs.git_ref || github.ref }}
# Use github.sha here otherwise a race condition exists if
# a commit is pushed to develop before merge is run.
CHECKOUT_REF: ${{ github.event.inputs.git_ref || github.sha }}


jobs:
merge:
Expand All @@ -38,7 +41,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4.2.1
with:
ref: ${{ env.GIT_REF }}
ref: ${{ env.CHECKOUT_REF }}

- name: Configure aws credentials
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
Expand All @@ -48,23 +51,21 @@ jobs:
mask-aws-account-id: true
role-session-name: "merge"

- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v4.1.1
with:
path: dist/linux_amd64_v1
key: chainlink-amd64-${{ github.sha }}
fail-on-cache-miss: true

- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v4.1.1
with:
path: dist/linux_arm64
path: dist/linux_arm64_v8.0
key: chainlink-arm64-${{ github.sha }}
fail-on-cache-miss: true

- name: Merge images for both architectures
uses: ./.github/actions/goreleaser-build-sign-publish
with:
# Temporary pin to working version as 2.4.2+ is breaking arm64 builds
goreleaser-version: "v2.3.2"
docker-registry: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
docker-image-tag: ${{ needs.image-tag.outputs.image-tag }}
goreleaser-release-type: "merge"
Expand All @@ -88,12 +89,12 @@ jobs:

- runner: ubuntu-24.04-4cores-16GB-ARM
goarch: arm64
dist_name: linux_arm64
dist_name: linux_arm64_v8.0
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.1
with:
ref: ${{ env.GIT_REF }}
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0

- name: Configure aws credentials
Expand All @@ -105,7 +106,7 @@ jobs:
role-session-name: "split-${{ matrix.goarch }}"

- id: cache
uses: actions/cache@v4
uses: actions/cache@v4.1.1
with:
path: dist/${{ matrix.dist_name }}
key: chainlink-${{ matrix.goarch }}-${{ github.sha }}
Expand All @@ -114,8 +115,6 @@ jobs:
uses: ./.github/actions/goreleaser-build-sign-publish
if: steps.cache.outputs.cache-hit != 'true'
with:
# Temporary pin to working version as 2.4.2+ is breaking arm64 builds
goreleaser-version: "v2.3.2"
docker-registry: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
docker-image-tag: ${{ needs.image-tag.outputs.image-tag }}
goreleaser-release-type: ${{ needs.image-tag.outputs.release-type }}
Expand All @@ -129,9 +128,9 @@ jobs:
release-type: ${{ steps.get-image-tag.outputs.release-type }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v4.2.1
with:
ref: ${{ env.GIT_REF }}
ref: ${{ env.CHECKOUT_REF }}

- name: Get image tag
id: get-image-tag
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/build-publish-goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,14 @@ jobs:

- uses: actions/cache/restore@v4
with:
path: dist/linux_arm64
path: dist/linux_arm64_v8.0
key: chainlink-arm64-${{ github.sha }}-${{ github.ref_name }}
fail-on-cache-miss: true

- name: Merge images for both architectures
id: goreleaser-build-sign-publish
uses: ./.github/actions/goreleaser-build-sign-publish
with:
# Temporary pin to working version as 2.4.2+ is breaking arm64 builds
goreleaser-version: "v2.3.2"
docker-registry: ${{ env.ECR_HOSTNAME }}
docker-image-tag: ${{ github.ref_name }}
goreleaser-config: .goreleaser.production.yaml
Expand All @@ -89,7 +87,7 @@ jobs:

- runner: ubuntu-24.04-4cores-16GB-ARM
goarch: arm64
dist_name: linux_arm64
dist_name: linux_arm64_v8.0
environment: build-publish
permissions:
id-token: write
Expand Down Expand Up @@ -121,8 +119,6 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
uses: ./.github/actions/goreleaser-build-sign-publish
with:
# Temporary pin to working version as 2.4.2+ is breaking arm64 builds
goreleaser-version: "v2.3.2"
docker-registry: ${{ env.ECR_HOSTNAME }}
docker-image-tag: ${{ github.ref_name }}
goreleaser-release-type: release
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/changeset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.1
with:
fetch-depth: 0

- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
id: files-changed
Expand Down
Loading

0 comments on commit ced19c2

Please sign in to comment.