Skip to content

Commit 1c561ba

Browse files
mateusz-sekaramateusz-sekara
authored
Merge pull request #18604 from smartcontractkit/ccip-hotfix-cherry-pick
release/2.26 - CCIP roleDON hotfix cherry pick
2 parents 124393c + 6c68fe7 commit 1c561ba

16 files changed

Lines changed: 24 additions & 25 deletions

File tree

‎.github/workflows/build-publish.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ jobs:
115115
docker-manifest-sign: true
116116
docker-registry-url-override: public.ecr.aws/chainlink
117117
docker-image-tag-strip-prefix: v # strip out the "v" prefix from the git tag for the image tag.
118-
docker-tag-custom-suffix: "-ccip"
119118
git-sha: ${{ github.sha }}
120119
github-event-name: ${{ github.event_name }}
121120
github-ref-name: ${{ github.ref_name }}

‎core/scripts/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/shopspring/decimal v1.4.0
4040
github.com/smartcontractkit/chain-selectors v1.0.62
4141
github.com/smartcontractkit/chainlink-automation v0.8.1
42-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097
42+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c
4343
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4
4444
github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250626141212-e50b2e7ffe2d
4545
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250604171706-a98fa6515eae

‎core/scripts/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,8 +1507,8 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a h
15071507
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a/go.mod h1:+LMKso9gI5B78xdk3uP69/WrsJTcalbKFO63amJexsE=
15081508
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
15091509
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1510-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097 h1:LjXBMpQP79C8fX2mSbsgzEW0kbu6e+M0Qk25U5NbgdE=
1511-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
1510+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c h1:OtonWIXttF5fSnIVOxJxAQrQzrRv0nyqk7IThiFRaqY=
1511+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
15121512
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed h1:rjtXQLTCLa/+AmMwMTP5WwJUdPBeBAF3Ivwc1GXetBw=
15131513
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
15141514
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4 h1:xUgmcXVrt6FQoKhlIt/X9jPmJoLvYUxv+WYC3LYohpU=

‎deployment/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/smartcontractkit/ccip-owner-contracts v0.1.0
3333
github.com/smartcontractkit/chain-selectors v1.0.62
3434
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a
35-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097
35+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c
3636
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed
3737
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4
3838
github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250626141212-e50b2e7ffe2d

‎deployment/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,8 +1261,8 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a h
12611261
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a/go.mod h1:+LMKso9gI5B78xdk3uP69/WrsJTcalbKFO63amJexsE=
12621262
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
12631263
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1264-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097 h1:LjXBMpQP79C8fX2mSbsgzEW0kbu6e+M0Qk25U5NbgdE=
1265-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
1264+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c h1:OtonWIXttF5fSnIVOxJxAQrQzrRv0nyqk7IThiFRaqY=
1265+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
12661266
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed h1:rjtXQLTCLa/+AmMwMTP5WwJUdPBeBAF3Ivwc1GXetBw=
12671267
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
12681268
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4 h1:xUgmcXVrt6FQoKhlIt/X9jPmJoLvYUxv+WYC3LYohpU=

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ require (
7878
github.com/smartcontractkit/chain-selectors v1.0.62
7979
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a
8080
github.com/smartcontractkit/chainlink-automation v0.8.1
81-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097
81+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c
8282
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed
8383
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4
8484
github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250626141212-e50b2e7ffe2d

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,8 +1084,8 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a h
10841084
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a/go.mod h1:+LMKso9gI5B78xdk3uP69/WrsJTcalbKFO63amJexsE=
10851085
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
10861086
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1087-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097 h1:LjXBMpQP79C8fX2mSbsgzEW0kbu6e+M0Qk25U5NbgdE=
1088-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
1087+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c h1:OtonWIXttF5fSnIVOxJxAQrQzrRv0nyqk7IThiFRaqY=
1088+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
10891089
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed h1:rjtXQLTCLa/+AmMwMTP5WwJUdPBeBAF3Ivwc1GXetBw=
10901090
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
10911091
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4 h1:xUgmcXVrt6FQoKhlIt/X9jPmJoLvYUxv+WYC3LYohpU=

‎integration-tests/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/slack-go/slack v0.15.0
4646
github.com/smartcontractkit/chain-selectors v1.0.62
4747
github.com/smartcontractkit/chainlink-automation v0.8.1
48-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097
48+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c
4949
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed
5050
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4
5151
github.com/smartcontractkit/chainlink-deployments-framework v0.15.1

‎integration-tests/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,8 +1484,8 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a h
14841484
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250626122206-319db248496a/go.mod h1:+LMKso9gI5B78xdk3uP69/WrsJTcalbKFO63amJexsE=
14851485
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
14861486
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1487-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097 h1:LjXBMpQP79C8fX2mSbsgzEW0kbu6e+M0Qk25U5NbgdE=
1488-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
1487+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c h1:OtonWIXttF5fSnIVOxJxAQrQzrRv0nyqk7IThiFRaqY=
1488+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250714110257-eefc88cc322c/go.mod h1:Yw7X+vtR7A9MBI+q5b0k/H2PlKy6cQOa7vAp4cshz2s=
14891489
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed h1:rjtXQLTCLa/+AmMwMTP5WwJUdPBeBAF3Ivwc1GXetBw=
14901490
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250609091505-5c8cd74b92ed/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
14911491
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250702115140-93959a95eba4 h1:xUgmcXVrt6FQoKhlIt/X9jPmJoLvYUxv+WYC3LYohpU=

‎integration-tests/load/functions/gateway.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func UploadS4Secrets(rc *resty.Client, s4Cfg *S4SecretsCfg) (uint8, uint64, erro
9898
return 0, 0, err
9999
}
100100
codec := api.JsonRPCCodec{}
101-
rawMsg, err := codec.EncodeRequest(msg)
101+
rawMsg, err := codec.EncodeLegacyRequest(msg)
102102
if err != nil {
103103
return 0, 0, err
104104
}
@@ -147,11 +147,11 @@ func ListS4Secrets(rc *resty.Client, s4Cfg *S4SecretsCfg) error {
147147
return err
148148
}
149149
codec := api.JsonRPCCodec{}
150-
rawMsg, err := codec.EncodeRequest(msg)
150+
rawMsg, err := codec.EncodeLegacyRequest(msg)
151151
if err != nil {
152152
return err
153153
}
154-
msgdec, err := codec.DecodeRequest(rawMsg)
154+
msgdec, err := codec.DecodeLegacyResponse(rawMsg)
155155
if err != nil {
156156
return err
157157
}

0 commit comments

Comments
 (0)