Skip to content

Commit b1c65be

Browse files
committed
fix: resolve merge conflicts and add main-only additions
- Add GetLaneVersionForRemoteChain helper to laneversionresolver - Add UpdateMCMSConfig method to v1_6_0 EVMAdapter - Add AdditionalFeeQuoterConfig and related fields to FeeQuoterUpdateInput - Remove unused fmt import in devenv/cldf.go - Update go.mod/go.sum after dependency reconciliation
1 parent f2c446d commit b1c65be

File tree

22 files changed

+630
-463
lines changed

22 files changed

+630
-463
lines changed

ccv/chains/evm/deployment/go.mod

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ replace github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment => ../.
1313

1414
require (
1515
github.com/Masterminds/semver/v3 v3.4.0
16-
github.com/ethereum/go-ethereum v1.17.0
16+
github.com/ethereum/go-ethereum v1.17.1
1717
github.com/smartcontractkit/chain-selectors v1.0.97
1818
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260312161144-d895b42081a0
1919
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260312161144-d895b42081a0
2020
github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260312161144-d895b42081a0
2121
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260312161144-d895b42081a0
22-
github.com/smartcontractkit/chainlink-common v0.9.6-0.20260114142648-bd9e1b483e96
22+
github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310151336-c98a9c147ac0
2323
github.com/smartcontractkit/chainlink-deployments-framework v0.80.2
2424
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
2525
github.com/smartcontractkit/mcms v0.36.0
2626
github.com/stretchr/testify v1.11.1
27-
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc
27+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
2828
)
2929

3030
require (
@@ -80,7 +80,7 @@ require (
8080
github.com/creachadair/mds v0.13.4 // indirect
8181
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8282
github.com/dchest/siphash v1.2.3 // indirect
83-
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
83+
github.com/deckarep/golang-set/v2 v2.8.0 // indirect
8484
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
8585
github.com/distribution/reference v0.6.0 // indirect
8686
github.com/docker/docker v28.5.1+incompatible // indirect
@@ -89,7 +89,7 @@ require (
8989
github.com/ebitengine/purego v0.9.0 // indirect
9090
github.com/emicklei/dot v1.6.2 // indirect
9191
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
92-
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
92+
github.com/ethereum/c-kzg-4844/v2 v2.1.6 // indirect
9393
github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect
9494
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
9595
github.com/fatih/color v1.18.0 // indirect
@@ -226,9 +226,10 @@ require (
226226
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5 // indirect
227227
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect
228228
github.com/smartcontractkit/chainlink-evm v0.3.3 // indirect
229-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251124151448-0448aefdaab9 // indirect
229+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260226130359-963f935e0396 // indirect
230230
github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0 // indirect
231231
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect
232+
github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260205130626-db2a2aab956b // indirect
232233
github.com/smartcontractkit/chainlink-sui v0.0.0-20260205175622-33e65031f9a9 // indirect
233234
github.com/smartcontractkit/chainlink-testing-framework/framework v0.14.0 // indirect
234235
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2 // indirect
@@ -244,7 +245,7 @@ require (
244245
github.com/stephenlacy/go-ethereum-hdwallet v0.0.0-20230913225845-a4fa94429863 // indirect
245246
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
246247
github.com/stretchr/objx v0.5.2 // indirect
247-
github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe // indirect
248+
github.com/supranational/blst v0.3.16 // indirect
248249
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
249250
github.com/testcontainers/testcontainers-go v0.39.0 // indirect
250251
github.com/tidwall/gjson v1.18.0 // indirect
@@ -265,7 +266,7 @@ require (
265266
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
266267
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
267268
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
268-
go.opentelemetry.io/otel v1.39.0 // indirect
269+
go.opentelemetry.io/otel v1.41.0 // indirect
269270
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2 // indirect
270271
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2 // indirect
271272
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 // indirect
@@ -276,12 +277,12 @@ require (
276277
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.13.0 // indirect
277278
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 // indirect
278279
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0 // indirect
279-
go.opentelemetry.io/otel/log v0.13.0 // indirect
280-
go.opentelemetry.io/otel/metric v1.39.0 // indirect
281-
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
282-
go.opentelemetry.io/otel/sdk/log v0.13.0 // indirect
283-
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
284-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
280+
go.opentelemetry.io/otel/log v0.15.0 // indirect
281+
go.opentelemetry.io/otel/metric v1.41.0 // indirect
282+
go.opentelemetry.io/otel/sdk v1.41.0 // indirect
283+
go.opentelemetry.io/otel/sdk/log v0.15.0 // indirect
284+
go.opentelemetry.io/otel/sdk/metric v1.41.0 // indirect
285+
go.opentelemetry.io/otel/trace v1.41.0 // indirect
285286
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
286287
go.uber.org/multierr v1.11.0 // indirect
287288
go.uber.org/ratelimit v0.3.1 // indirect
@@ -293,11 +294,11 @@ require (
293294
golang.org/x/sys v0.41.0 // indirect
294295
golang.org/x/term v0.40.0 // indirect
295296
golang.org/x/text v0.34.0 // indirect
296-
golang.org/x/time v0.12.0 // indirect
297+
golang.org/x/time v0.14.0 // indirect
297298
golang.org/x/tools v0.41.0 // indirect
298299
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 // indirect
299300
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
300-
google.golang.org/grpc v1.77.0 // indirect
301+
google.golang.org/grpc v1.78.0 // indirect
301302
google.golang.org/protobuf v1.36.11 // indirect
302303
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
303304
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)