Skip to content

Commit 6eb6b84

Browse files
RensRRensR
authored
Bump chainlink-ccip & fix flakes (#22036)
* bump chainlink-ccip * rm dup cctp msg transmitter deploy * Fix allowed callers update mechanism Prevent adding address(0) entries * fix flake
1 parent bdff6a5 commit 6eb6b84

16 files changed

Lines changed: 112 additions & 125 deletions

File tree

‎core/scripts/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/shopspring/decimal v1.4.0
4646
github.com/smartcontractkit/chain-selectors v1.0.98
4747
github.com/smartcontractkit/chainlink-automation v0.8.1
48-
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415083356-4351077c2bc6
48+
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415165642-49f23e4d76cc
4949
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260413191736-29c0bf1edbbc
5050
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
5151
github.com/smartcontractkit/chainlink-data-streams v0.1.13
@@ -485,11 +485,11 @@ require (
485485
github.com/smartcontractkit/ccip-contract-examples/chains/evm v0.0.0-20260129135848-c86808ba5cb9 // indirect
486486
github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect
487487
github.com/smartcontractkit/chainlink-aptos v0.0.0-20260407161350-a86b1969da65 // indirect
488-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260415083356-4351077c2bc6 // indirect
488+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260415165642-49f23e4d76cc // indirect
489489
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260406180811-0ec22f0243a4 // indirect
490-
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260310183131-8d0f0e383288 // indirect
491-
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288 // indirect
492-
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415083356-4351077c2bc6 // indirect
490+
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc // indirect
491+
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc // indirect
492+
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415165642-49f23e4d76cc // indirect
493493
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563 // indirect
494494
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 // indirect
495495
github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect

‎core/scripts/go.sum‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deployment/ccip/changeset/v1_6_2/cs_configure_cctp_message_transmitter_proxy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ func configureCCTPMessageTransmitterProxyContractLogic(env cldf.Environment, c C
144144
chainSelector, err)
145145
}
146146

147-
allowedCallerInputs := make([]cmtp.CCTPMessageTransmitterProxyAllowedCallerConfigArgs, len(proxyConfig.AllowedCallerUpdates))
147+
allowedCallerInputs := make([]cmtp.CCTPMessageTransmitterProxyAllowedCallerConfigArgs, 0, len(proxyConfig.AllowedCallerUpdates))
148148
for _, allowedCallerUpdate := range proxyConfig.AllowedCallerUpdates {
149149
allowedCallerInputs = append(allowedCallerInputs, cmtp.CCTPMessageTransmitterProxyAllowedCallerConfigArgs{
150-
Allowed: true,
151150
Caller: allowedCallerUpdate.AllowedCaller,
151+
Allowed: allowedCallerUpdate.Enabled,
152152
})
153153
}
154154

‎deployment/ccip/changeset/v1_6_2/cs_configure_cctp_message_transmitter_proxy_test.go‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,13 @@ func TestValidateConfigureCCTPMessageTransmitterProxyInput(t *testing.T) {
179179
for _, test := range tests {
180180
t.Run(test.Msg, func(t *testing.T) {
181181
err := test.Input.Validate(t.Context(), chain, state.Chains[chain.Selector])
182+
require.Error(t, err)
182183
require.Contains(t, err.Error(), test.ErrStr)
183184
})
184185
}
185186
}
186187

187188
func TestConfigureCCTPMessageTransmitterProxy(t *testing.T) {
188-
t.Skip("broken")
189-
190189
rt := setupCCTPMsgTransmitterProxyEnvironmentForConfigure(t, true)
191190
evmChainsBySel := rt.Environment().BlockChains.EVMChains()
192191
chainSelectors := slices.Sorted(maps.Keys(evmChainsBySel))
@@ -202,17 +201,6 @@ func TestConfigureCCTPMessageTransmitterProxy(t *testing.T) {
202201
addrBook,
203202
)
204203

205-
err := rt.Exec(
206-
runtime.ChangesetTask(v1_6_2.DeployCCTPMessageTransmitterProxyNew, v1_6_2.DeployCCTPMessageTransmitterProxyContractConfig{
207-
USDCProxies: map[uint64]v1_6_2.DeployCCTPMessageTransmitterProxyInput{
208-
chain.Selector: {
209-
TokenMessenger: tokenMessenger.Address,
210-
},
211-
},
212-
}),
213-
)
214-
require.NoError(t, err)
215-
216204
newUSDCMsgProxies[chain.Selector] = v1_6_2.DeployCCTPMessageTransmitterProxyInput{
217205
TokenMessenger: tokenMessenger.Address,
218206
}
@@ -240,22 +228,22 @@ func TestConfigureCCTPMessageTransmitterProxy(t *testing.T) {
240228

241229
newUSDCProxyCnfgs := make(map[uint64]v1_6_2.ConfigureCCTPMessageTransmitterProxyInput, len(evmChainsBySel))
242230
for _, sel := range chainSelectors {
243-
chain := evmChainsBySel[sel]
244-
pools := startState.Chains[chain.Selector].USDCTokenPoolsV1_6
245-
input := make([]v1_6_2.AllowedCallerUpdate, len(pools))
246-
231+
pools := startState.Chains[sel].USDCTokenPoolsV1_6
247232
poolsSlice := slices.AppendSeq([]*usdc_token_pool.USDCTokenPool{}, maps.Values(pools))
248233
slices.SortFunc(poolsSlice, func(a, b *usdc_token_pool.USDCTokenPool) int {
249234
return cmp.Compare(a.Address().Hex(), b.Address().Hex())
250235
})
236+
require.NotEmpty(t, poolsSlice, "expected a 1.6 USDC token pool on chain %d before Configure", sel)
237+
238+
input := make([]v1_6_2.AllowedCallerUpdate, len(poolsSlice))
251239
for i, pool := range poolsSlice {
252240
input[i] = v1_6_2.AllowedCallerUpdate{
253241
AllowedCaller: pool.Address(),
254242
Enabled: true,
255243
}
256244
}
257245

258-
newUSDCProxyCnfgs[chain.Selector] = v1_6_2.ConfigureCCTPMessageTransmitterProxyInput{
246+
newUSDCProxyCnfgs[sel] = v1_6_2.ConfigureCCTPMessageTransmitterProxyInput{
259247
AllowedCallerUpdates: input,
260248
}
261249
}
@@ -270,9 +258,8 @@ func TestConfigureCCTPMessageTransmitterProxy(t *testing.T) {
270258
finalState, err := stateview.LoadOnchainState(rt.Environment())
271259
require.NoError(t, err)
272260
for _, sel := range chainSelectors {
273-
chain := evmChainsBySel[sel]
274-
proxies := finalState.Chains[chain.Selector].CCTPMessageTransmitterProxies
275-
updates := newUSDCProxyCnfgs[chain.Selector].AllowedCallerUpdates
261+
proxies := finalState.Chains[sel].CCTPMessageTransmitterProxies
262+
updates := newUSDCProxyCnfgs[sel].AllowedCallerUpdates
276263
require.Len(t, proxies, 1)
277264

278265
expectedCallers := make([]common.Address, len(updates))

‎deployment/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ require (
3838
github.com/smartcontractkit/ccip-owner-contracts v0.1.0
3939
github.com/smartcontractkit/chain-selectors v1.0.98
4040
github.com/smartcontractkit/chainlink-aptos v0.0.0-20260407161350-a86b1969da65
41-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260415083356-4351077c2bc6
42-
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415083356-4351077c2bc6
43-
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260224214816-cb23ec38649f
44-
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288
45-
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415083356-4351077c2bc6
41+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260415165642-49f23e4d76cc
42+
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415165642-49f23e4d76cc
43+
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
44+
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc
45+
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415165642-49f23e4d76cc
4646
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260413191736-29c0bf1edbbc
4747
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
4848
github.com/smartcontractkit/chainlink-deployments-framework v0.95.0

‎deployment/go.sum‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ require (
8181
github.com/smartcontractkit/chain-selectors v1.0.98
8282
github.com/smartcontractkit/chainlink-aptos v0.0.0-20260407161350-a86b1969da65
8383
github.com/smartcontractkit/chainlink-automation v0.8.1
84-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260415083356-4351077c2bc6
85-
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415083356-4351077c2bc6
86-
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260224214816-cb23ec38649f
87-
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5
84+
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260415165642-49f23e4d76cc
85+
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415165642-49f23e4d76cc
86+
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
87+
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc
8888
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563
8989
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260413191736-29c0bf1edbbc
9090
github.com/smartcontractkit/chainlink-common/keystore v1.0.2

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)