Skip to content

Merge main into develop #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RensR merged 44 commits into from
Mar 13, 2026
Merged

Merge main into develop #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
640a2a9
bump go deps (#1734)
RensR Feb 24, 2026
cb23ec3
Solana contracts/v1.6.1 candidate (#1565)
agusaldasoro Feb 24, 2026
6a56814
token expansion e2e fixes (#1732)
tt-cll Feb 25, 2026
b5cd1dc
Fix 1.6.1 commit (#1738)
toblich Feb 25, 2026
a4824ec
Implement disable lane (#1741)
matYang Feb 26, 2026
bd9b4e6
disable ton in devenv (#1751)
tt-cll Feb 26, 2026
3d808eb
condense remotes into top level (#1747)
tt-cll Feb 26, 2026
f21cb2f
Revert "Implement disable lane (#1741)" (#1752)
chris-de-leon-cll Feb 27, 2026
db986ff
Add various read ops (#1753)
kylesmartin Feb 27, 2026
b1e525d
Add Changeset to Update MCMSConfig (#1748)
ma33r Feb 27, 2026
96c2394
add interface (#1760)
ma33r Feb 27, 2026
bd41646
More Token Expansion Improvements (#1758)
chris-de-leon-cll Mar 2, 2026
6caf8c4
pkg: remove feeQuoter GetStaticConfig calls (#1770)
makramkd Mar 3, 2026
2209fe3
Add docs for ccip tooling api (#1774)
agusaldasoro Mar 3, 2026
36b2c9b
deploy 1.6.3 fq as part of 1.6 deployment (#1776)
tt-cll Mar 3, 2026
b1a0d27
Reapply "Implement disable lane (#1741)" (#1752) (#1764)
tt-cll Mar 3, 2026
47af98c
Revert "add interface (#1760)" (#1763)
tt-cll Mar 3, 2026
beb7b2b
TON testadapter (#1615)
archseer Mar 4, 2026
41ad0df
Add missing check to fChain lookup. (#1692)
winder Mar 4, 2026
5d24cbb
bump ton in devenv (#1789)
tt-cll Mar 4, 2026
7a28a86
support malformed protobuf messages (#1784)
0xAustinWang Mar 4, 2026
c436547
Create 1.6.1 changesets for solana (#1761)
toblich Mar 4, 2026
4b3d3be
Add fq v2 ops to main (#1790)
RensR Mar 5, 2026
4374eb0
support FQ 2.0 upgrade on main (#1799)
tt-cll Mar 5, 2026
0e21a8f
Aw/defensive proto (#1800)
0xAustinWang Mar 5, 2026
55094be
Bump go deps (#1797)
RensR Mar 6, 2026
bbf4ace
Laneversion check before importing config from Feequoter 1.6 and OnRa…
AnieeG Mar 9, 2026
f0cd9bd
If GasPriceStalenessThreshold is zero for allowed chain family , set …
AnieeG Mar 9, 2026
002bcc3
transfer fq2 to timelock (#1809)
tt-cll Mar 9, 2026
e898027
fix price update bug (#1814)
AnieeG Mar 10, 2026
8d0f0e3
Fix usdc config validation. (#1817)
winder Mar 10, 2026
ae27433
feat: infer solana token metadata for manual registration (#1808)
chris-de-leon-cll Mar 10, 2026
b39a695
fix: skip EVM TPRL proposal if we do not own the pool (#1812)
chris-de-leon-cll Mar 10, 2026
28f9aff
fix token fetching (#1818)
AnieeG Mar 10, 2026
8d69901
Allow weirdly formatted addresses for Solana. (#1820)
winder Mar 11, 2026
c5c8baa
Fetch Tokens with multiple go routines to speed up config fetching (#…
AnieeG Mar 11, 2026
5cbfc93
Disallow whitespace only inputs. (#1821)
winder Mar 11, 2026
48d184a
make USDCCCTPObserverConfig Validate log more descriptive (#1826)
0xsuryansh Mar 12, 2026
48c0e2b
Always refer to supported versions while populating feequoter config …
AnieeG Mar 12, 2026
f588f8d
feat: infer registry address (#1833)
chris-de-leon-cll Mar 12, 2026
f2c446d
Merge branch 'main' into merge-main-into-develop
RensR Mar 13, 2026
b1c65be
fix: resolve merge conflicts and add main-only additions
RensR Mar 13, 2026
ca5497b
Merge branch 'develop' into merge-main-into-develop
RensR Mar 13, 2026
1d9b0b2
Merge branch 'develop' into merge-main-into-develop
RensR Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions ccv/chains/evm/deployment/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ replace github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment => ../.

require (
github.com/Masterminds/semver/v3 v3.4.0
github.com/ethereum/go-ethereum v1.17.0
github.com/ethereum/go-ethereum v1.17.1
github.com/smartcontractkit/chain-selectors v1.0.97
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260312182032-b2b38700f19b
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260312182032-b2b38700f19b
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260312182032-b2b38700f19b
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260312182032-b2b38700f19b
github.com/smartcontractkit/chainlink-common v0.9.6-0.20260114142648-bd9e1b483e96
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310151336-c98a9c147ac0
github.com/smartcontractkit/chainlink-deployments-framework v0.80.2
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
github.com/smartcontractkit/mcms v0.36.0
github.com/stretchr/testify v1.11.1
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
)

require (
Expand Down Expand Up @@ -82,7 +82,7 @@ require (
github.com/creachadair/mds v0.13.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dchest/siphash v1.2.3 // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/deckarep/golang-set/v2 v2.8.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v28.5.1+incompatible // indirect
Expand All @@ -91,7 +91,7 @@ require (
github.com/ebitengine/purego v0.9.0 // indirect
github.com/emicklei/dot v1.6.2 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
github.com/ethereum/c-kzg-4844/v2 v2.1.6 // indirect
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fatih/color v1.18.0 // indirect
Expand Down Expand Up @@ -228,9 +228,10 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5 // indirect
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect
github.com/smartcontractkit/chainlink-evm v0.3.3 // indirect
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251124151448-0448aefdaab9 // indirect
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260226130359-963f935e0396 // indirect
github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0 // indirect
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect
github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260205130626-db2a2aab956b // indirect
github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 // indirect
github.com/smartcontractkit/chainlink-testing-framework/framework v0.14.0 // indirect
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2 // indirect
Expand All @@ -246,7 +247,7 @@ require (
github.com/stephenlacy/go-ethereum-hdwallet v0.0.0-20230913225845-a4fa94429863 // indirect
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe // indirect
github.com/supranational/blst v0.3.16 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/testcontainers/testcontainers-go v0.39.0 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
Expand All @@ -267,7 +268,7 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel v1.41.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 // indirect
Expand All @@ -278,12 +279,12 @@ require (
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.13.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0 // indirect
go.opentelemetry.io/otel/log v0.13.0 // indirect
go.opentelemetry.io/otel/metric v1.39.0 // indirect
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.13.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.opentelemetry.io/otel/log v0.15.0 // indirect
go.opentelemetry.io/otel/metric v1.41.0 // indirect
go.opentelemetry.io/otel/sdk v1.41.0 // indirect
go.opentelemetry.io/otel/sdk/log v0.15.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.41.0 // indirect
go.opentelemetry.io/otel/trace v1.41.0 // indirect
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/ratelimit v0.3.1 // indirect
Expand All @@ -295,11 +296,11 @@ require (
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.41.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
google.golang.org/grpc v1.77.0 // indirect
google.golang.org/grpc v1.78.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
Loading
Loading