Skip to content

Commit 85adeec

Browse files
ogtownsendogtownsend
committed
Bump cl-common import
1 parent e6a9d88 commit 85adeec

File tree

12 files changed

+36
-31
lines changed

12 files changed

+36
-31
lines changed

‎deployment/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/rs/zerolog v1.33.0
1515
github.com/smartcontractkit/chain-selectors v1.0.67
1616
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad
17-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3
17+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37
1818
github.com/smartcontractkit/chainlink-deployments-framework v0.42.0
1919
github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.23
2020
github.com/smartcontractkit/chainlink-ton v0.0.0-20250904183752-4ea5c19ee886
@@ -175,7 +175,7 @@ require (
175175
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a // indirect
176176
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a // indirect
177177
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 // indirect
178-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1 // indirect
178+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 // indirect
179179
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 // indirect
180180
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-75499abc4335 // indirect
181181
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e // indirect

‎deployment/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -619,14 +619,14 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7
619619
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
620620
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a h1:38dAlTPRUQHZus5dCnBnQyf/V4oYn0p2svWlbPgHDQ4=
621621
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
622-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3 h1:dMvSvJ7nRAQViYSjdfj/vRGLULY7mJ3X4UgsPMmXgOI=
623-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3/go.mod h1:1diMLMwfIACeqJFt7ySGaBrJIeUwHTLhVVYlb41EyKk=
622+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37 h1:SZPmMGoR6suwvH54pGG+PKAhNQYfV3E4u+xQhkllFio=
623+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37/go.mod h1:EKFUYgf8IsArVMF8lzXNyIhdH6lM8mhyvztCSouZ+G8=
624624
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
625625
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
626626
github.com/smartcontractkit/chainlink-deployments-framework v0.42.0 h1:48m4KU+gj9BzehxqKw+GOAwNDh0JxdOx9x3Zmummppo=
627627
github.com/smartcontractkit/chainlink-deployments-framework v0.42.0/go.mod h1:pbj+mMphYAKdgQ+oSy0FZN3236wxJnAxCnbgUXJZR8s=
628-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1 h1:HZt/80mhcNw6/MlYBIRracxfHWNqFF0iZ5nZEVZBUgo=
629-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
628+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8=
629+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
630630
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
631631
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
632632
github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.23 h1:+L8R3Nn4ZadjGUDUr7HKVMt9I1vv5IS/IzUfQzyNvDw=

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/pelletier/go-toml/v2 v2.2.4
1313
github.com/smartcontractkit/chain-selectors v1.0.67
1414
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad
15-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3
15+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37
1616
github.com/smartcontractkit/libocr v0.0.0-20250905115425-2785a5cee79d
1717
github.com/stretchr/testify v1.10.0
1818
github.com/xssnick/tonutils-go v1.14.1
@@ -94,7 +94,7 @@ require (
9494
github.com/shopspring/decimal v1.4.0 // indirect
9595
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 // indirect
9696
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 // indirect
97-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1 // indirect
97+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 // indirect
9898
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e // indirect
9999
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
100100
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,12 @@ github.com/smartcontractkit/chain-selectors v1.0.67 h1:gxTqP/JC40KDe3DE1SIsIKSTK
306306
github.com/smartcontractkit/chain-selectors v1.0.67/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
307307
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad h1:d5i6DP5kHf4fg/YLuwxwVQ2U10UON88B51dnYD5ClX0=
308308
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad/go.mod h1:4djmYiCYf9BfpNcuhANzh/umrMKfhOQRGfnk1ZnL5Io=
309-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3 h1:dMvSvJ7nRAQViYSjdfj/vRGLULY7mJ3X4UgsPMmXgOI=
310-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3/go.mod h1:1diMLMwfIACeqJFt7ySGaBrJIeUwHTLhVVYlb41EyKk=
309+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37 h1:SZPmMGoR6suwvH54pGG+PKAhNQYfV3E4u+xQhkllFio=
310+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37/go.mod h1:EKFUYgf8IsArVMF8lzXNyIhdH6lM8mhyvztCSouZ+G8=
311311
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
312312
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
313-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1 h1:HZt/80mhcNw6/MlYBIRracxfHWNqFF0iZ5nZEVZBUgo=
314-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250905211734-167560f092c1/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
313+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8=
314+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
315315
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e h1:Hv9Mww35LrufCdM9wtS9yVi/rEWGI1UnjHbcKKU0nVY=
316316
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e/go.mod h1:T4zH9R8R8lVWKfU7tUvYz2o2jMv1OpGCdpY2j2QZXzU=
317317
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=

‎integration-tests/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.24.6
77
require (
88
github.com/smartcontractkit/chain-selectors v1.0.67
99
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20250910210251-724af8ee41ad
10-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3
10+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37
1111
github.com/smartcontractkit/chainlink-deployments-framework v0.44.0
1212
github.com/smartcontractkit/chainlink-ton v0.0.0-20250904183752-4ea5c19ee886
1313
github.com/smartcontractkit/chainlink-ton/deployment v0.0.0-20250904183752-4ea5c19ee886
@@ -374,7 +374,7 @@ require (
374374
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2 // indirect
375375
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d // indirect
376376
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976 // indirect
377-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379 // indirect
377+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 // indirect
378378
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 // indirect
379379
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 // indirect
380380
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect

‎integration-tests/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,8 +1260,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8
12601260
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250908144012-8184001834b5/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
12611261
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5 h1:QhcYGEhRLInr1/qh/3RJiVdvJ0nxBHKhPe65WLbSBnU=
12621262
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250908144012-8184001834b5/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
1263-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3 h1:dMvSvJ7nRAQViYSjdfj/vRGLULY7mJ3X4UgsPMmXgOI=
1264-
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250910201107-cb4c31b624d3/go.mod h1:1diMLMwfIACeqJFt7ySGaBrJIeUwHTLhVVYlb41EyKk=
1263+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37 h1:SZPmMGoR6suwvH54pGG+PKAhNQYfV3E4u+xQhkllFio=
1264+
github.com/smartcontractkit/chainlink-common v0.9.5-0.20250919011014-06d4446b8a37/go.mod h1:EKFUYgf8IsArVMF8lzXNyIhdH6lM8mhyvztCSouZ+G8=
12651265
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
12661266
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
12671267
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
@@ -1286,8 +1286,8 @@ github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-
12861286
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d/go.mod h1:2JTBNp3FlRdO/nHc4dsc9bfxxMClMO1Qt8sLJgtreBY=
12871287
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976 h1:mF3FiDUoV0QbJcks9R2y7ydqntNL1Z0VCPBJgx/Ms+0=
12881288
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
1289-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379 h1:AeXgr3/rGqQr3XxA0oxdWlTFR1xbpmEkc6sa9Dh4p+w=
1290-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250908151016-bf310cf85379/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
1289+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8=
1290+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
12911291
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
12921292
github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
12931293
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 h1:0eroOyBwmdoGUwUdvMI0/J7m5wuzNnJDMglSOK1sfNY=

‎pkg/ccip/chainaccessor/ton_accessor.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,7 @@ func (a *TONAccessor) GetFeedPricesUSD(
717717

718718
func (a *TONAccessor) GetFeeQuoterTokenUpdates(
719719
ctx context.Context,
720-
tokens []ccipocr3.UnknownEncodedAddress,
721-
chain ccipocr3.ChainSelector,
720+
tokens []ccipocr3.UnknownAddress,
722721
) (map[ccipocr3.UnknownEncodedAddress]ccipocr3.TimestampedUnixBig, error) {
723722
addr, err := a.getBinding(consts.ContractNameFeeQuoter)
724723
if err != nil {
@@ -733,7 +732,11 @@ func (a *TONAccessor) GetFeeQuoterTokenUpdates(
733732

734733
encodedTokens := make([]any, 0, len(tokens))
735734
for _, token := range tokens {
736-
encodedTokens = append(encodedTokens, token)
735+
et, err := a.addrCodec.AddressBytesToString(token)
736+
if err != nil {
737+
return nil, fmt.Errorf("failed to AddressBytesToString: %w", err)
738+
}
739+
encodedTokens = append(encodedTokens, et)
737740
}
738741
result, err := a.client.RunGetMethod(ctx, block, addr, "tokenPrices", encodedTokens...)
739742
// result is a list of TimestampedPrice
@@ -767,7 +770,7 @@ func (a *TONAccessor) GetFeeQuoterTokenUpdates(
767770
default:
768771
return nil, fmt.Errorf("expected either cell or nil, received %T", priceResult)
769772
}
770-
prices[token] = price
773+
prices[ccipocr3.UnknownEncodedAddress(token)] = price
771774
}
772775
return prices, nil
773776
}

‎pkg/ccip/codec/executecodec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
// - "OffRamp 1.6.0-dev"
2424
type executePluginCodecV1 struct {
2525
addressCodec ccipocr3.ChainSpecificAddressCodec
26-
extraDataCodec ccipocr3.ExtraDataCodec
26+
extraDataCodec ccipocr3.ExtraDataCodecBundle
2727
}
2828

2929
var _ ccipocr3.ExecutePluginCodec = &executePluginCodecV1{}
3030

31-
func NewExecutePluginCodecV1(extraDataCodec ccipocr3.ExtraDataCodec) ccipocr3.ExecutePluginCodec {
31+
func NewExecutePluginCodecV1(extraDataCodec ccipocr3.ExtraDataCodecBundle) ccipocr3.ExecutePluginCodec {
3232
return &executePluginCodecV1{
3333
addressCodec: NewAddressCodec(),
3434
extraDataCodec: extraDataCodec,

‎pkg/ccip/codec/executecodec_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func randomTONExecuteReport(t *testing.T, sourceChainSelector uint64) ccipocr3.E
7878
func TestExecutePluginCodecV1_TON(t *testing.T) {
7979
ctx := context.Background()
8080
mockExtraDataCodec := new(mocks.SourceChainExtraDataCodec)
81-
edc := ccipocr3.ExtraDataCodec(map[string]ccipocr3.SourceChainExtraDataCodec{
81+
edc := ccipocr3.ExtraDataCodecMap(map[string]ccipocr3.SourceChainExtraDataCodec{
8282
chainsel.FamilyEVM: mockExtraDataCodec,
8383
chainsel.FamilySolana: mockExtraDataCodec,
8484
chainsel.FamilyTon: mockExtraDataCodec,

‎pkg/ccip/codec/msghasher.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ var LeafDomainSeparator [32]byte
2121
type messageHasherV1 struct {
2222
lggr logger.Logger
2323
addrCodec addressCodec
24-
extraDataCodec ccipocr3.ExtraDataCodec
24+
extraDataCodec ccipocr3.ExtraDataCodecBundle
2525
}
2626

27-
func NewMessageHasherV1(lg logger.Logger, extraDataCodec ccipocr3.ExtraDataCodec) ccipocr3.MessageHasher {
27+
func NewMessageHasherV1(lg logger.Logger, extraDataCodec ccipocr3.ExtraDataCodecBundle) ccipocr3.MessageHasher {
2828
return messageHasherV1{
2929
lggr: lg,
3030
extraDataCodec: extraDataCodec,

0 commit comments

Comments
 (0)