Skip to content

Commit 381285e

Browse files
0xAustinWangogtownsend
0xAustinWang
and
ogtownsend
authored
bump chainlink-ccip version to include defaults for async price observer (#18121)
* Update chainlink-ccip version for CAL changes (#18048) * bump chainlink-ccip to include default ocr vars * downgrade core scripts to match versions --------- Co-authored-by: Oliver Townsend <[email protected]>
1 parent 0d0b81f commit 381285e

File tree

16 files changed

+31
-28
lines changed

16 files changed

+31
-28
lines changed

‎core/scripts/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/shopspring/decimal v1.4.0
3636
github.com/smartcontractkit/chain-selectors v1.0.60
3737
github.com/smartcontractkit/chainlink-automation v0.8.1
38-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb
38+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a
3939
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86
4040
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250604171706-a98fa6515eae
4141
github.com/smartcontractkit/chainlink-deployments-framework v0.9.1
@@ -399,7 +399,7 @@ require (
399399
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250522110034-65c54665034a // indirect
400400
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65c54665034a // indirect
401401
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a // indirect
402-
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250516160234-c2e27f791437 // indirect
402+
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250604191313-8f161cf29ad5 // indirect
403403
github.com/smartcontractkit/chainlink-protos/job-distributor v0.11.0 // indirect
404404
github.com/smartcontractkit/chainlink-protos/orchestrator v0.7.0 // indirect
405405
github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect

‎core/scripts/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,8 +1273,8 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250604171518-c6a8d7f44447 h
12731273
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250604171518-c6a8d7f44447/go.mod h1:jPS9p770KnuAZLI2EPKQQMo6iiY8YNo/DtjD8Tn7CpI=
12741274
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
12751275
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1276-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb h1:mE7i4vt+vCeuqdXyPf+vWzngN5IyW404wuFEcIHgCqg=
1277-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
1276+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a h1:Kmwnke40wlyyVLZWbdOtSRma52lYj9g/cAUE2KQt8DM=
1277+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
12781278
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a h1:BVhdDkwltth3sw9MeFS3ItQlyPat8M4NUwp86QX2j9U=
12791279
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
12801280
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86 h1:tXXegjGJJDewy1PJniL0PKb8cQBlLJZ2HboG88eusSw=
@@ -1295,8 +1295,8 @@ github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65
12951295
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250522110034-65c54665034a/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
12961296
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a h1:O28vgyHM7QF1YLg1BwkQSIbOYA+t0RiH9+b+k90GPG8=
12971297
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a/go.mod h1:zYqPBBRUXUQ/L+aD4Q7phnYsfVeC5rDBXtPt1VYwtws=
1298-
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250516160234-c2e27f791437 h1:Vd1kN9ks1JeGvVkzOaJnZjLlhL+biDupDdJEx5HVbx0=
1299-
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250516160234-c2e27f791437/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
1298+
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250604191313-8f161cf29ad5 h1:Qrz1cG/myK+EUEz4aLfz1pS4cODit7v61BuXq3MDifk=
1299+
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250604191313-8f161cf29ad5/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
13001300
github.com/smartcontractkit/chainlink-protos/job-distributor v0.11.0 h1:SLZPcmsyYibaUKkpvDKGGu6OSeF9HJOwef6Acs+9Peo=
13011301
github.com/smartcontractkit/chainlink-protos/job-distributor v0.11.0/go.mod h1:/dVVLXrsp+V0AbcYGJo3XMzKg3CkELsweA/TTopCsKE=
13021302
github.com/smartcontractkit/chainlink-protos/orchestrator v0.7.0 h1:d9vSTpkrWaYYurS9iZj3YBWBalBhK9HpVWm0pZPIhew=

‎core/services/relay/evm/read/event.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/ethereum/go-ethereum/common"
1414
"github.com/ethereum/go-ethereum/crypto"
1515
"github.com/google/uuid"
16+
"github.com/smartcontractkit/chainlink-ccip/pkg/chainaccessor"
1617

1718
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/offramp"
1819
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/onramp"
@@ -27,6 +28,7 @@ import (
2728

2829
"github.com/smartcontractkit/chainlink-evm/pkg/logpoller"
2930
evmtypes "github.com/smartcontractkit/chainlink-evm/pkg/types"
31+
3032
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/codec"
3133
"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
3234
)
@@ -820,7 +822,7 @@ func isTypeHardcoded(t any) bool {
820822
switch t.(type) {
821823
case *reader.CommitReportAcceptedEvent:
822824
return true
823-
case *reader.SendRequestedEvent:
825+
case *chainaccessor.SendRequestedEvent:
824826
return true
825827
case *reader.ExecutionStateChangedEvent:
826828
return true
@@ -841,7 +843,7 @@ func decodeHardcodedType(out any, log *logpoller.Log) error {
841843
populateCommitReportAcceptFromEvent(out, internalEvent)
842844

843845
return nil
844-
case *reader.SendRequestedEvent:
846+
case *chainaccessor.SendRequestedEvent:
845847
var internalEvent onramp.OnRampCCIPMessageSent
846848
err := unpackLog(&internalEvent, ccipMessageSentEvent, log, onrampABI)
847849
if err != nil {
@@ -909,7 +911,7 @@ func populateExecutionStateChangedFromEvent(out *reader.ExecutionStateChangedEve
909911
out.GasUsed = *internalEvent.GasUsed
910912
}
911913

912-
func populateSendRequestFromEvent(out *reader.SendRequestedEvent, internalEvent onramp.OnRampCCIPMessageSent) {
914+
func populateSendRequestFromEvent(out *chainaccessor.SendRequestedEvent, internalEvent onramp.OnRampCCIPMessageSent) {
913915
out.DestChainSelector = ccipocr3.ChainSelector(internalEvent.DestChainSelector)
914916
out.SequenceNumber = ccipocr3.SeqNum(internalEvent.SequenceNumber)
915917

‎core/services/relay/evm/read/event_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/ethereum/go-ethereum/common"
1111
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/offramp"
1212
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/onramp"
13+
"github.com/smartcontractkit/chainlink-ccip/pkg/chainaccessor"
1314
"github.com/smartcontractkit/chainlink-ccip/pkg/reader"
1415
"github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
1516
"github.com/smartcontractkit/chainlink-evm/pkg/logpoller"
@@ -40,7 +41,7 @@ func Test_DecodeHardcodedType(t *testing.T) {
4041
log, err := generateOnRampLog(fixtLog)
4142
require.NoError(t, err)
4243

43-
var out reader.SendRequestedEvent
44+
var out chainaccessor.SendRequestedEvent
4445
err = decodeHardcodedType(&out, log)
4546
require.NoError(t, err)
4647

‎deployment/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/smartcontractkit/ccip-owner-contracts v0.1.0
3434
github.com/smartcontractkit/chain-selectors v1.0.60
3535
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250604171518-c6a8d7f44447
36-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb
36+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a
3737
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a
3838
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86
3939
github.com/smartcontractkit/chainlink-deployments-framework v0.9.1

‎deployment/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,8 +1249,8 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250604171518-c6a8d7f44447 h
12491249
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250604171518-c6a8d7f44447/go.mod h1:jPS9p770KnuAZLI2EPKQQMo6iiY8YNo/DtjD8Tn7CpI=
12501250
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
12511251
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1252-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb h1:mE7i4vt+vCeuqdXyPf+vWzngN5IyW404wuFEcIHgCqg=
1253-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
1252+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a h1:Kmwnke40wlyyVLZWbdOtSRma52lYj9g/cAUE2KQt8DM=
1253+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
12541254
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a h1:BVhdDkwltth3sw9MeFS3ItQlyPat8M4NUwp86QX2j9U=
12551255
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
12561256
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86 h1:tXXegjGJJDewy1PJniL0PKb8cQBlLJZ2HboG88eusSw=

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ require (
7575
github.com/shopspring/decimal v1.4.0
7676
github.com/smartcontractkit/chain-selectors v1.0.60
7777
github.com/smartcontractkit/chainlink-automation v0.8.1
78-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb
78+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610073243-5c425bf3b50f
7979
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a
8080
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86
8181
github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20250604171706-a98fa6515eae

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,8 +1053,8 @@ github.com/smartcontractkit/chain-selectors v1.0.60 h1:X/5CcVB5izIaMrGRdl0hc6sSb
10531053
github.com/smartcontractkit/chain-selectors v1.0.60/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
10541054
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
10551055
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1056-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb h1:mE7i4vt+vCeuqdXyPf+vWzngN5IyW404wuFEcIHgCqg=
1057-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
1056+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610073243-5c425bf3b50f h1:CixsxQACoR1SgQ/62N2JwfG3f94kIZ0CrYdYI0C4s/0=
1057+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610073243-5c425bf3b50f/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
10581058
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a h1:BVhdDkwltth3sw9MeFS3ItQlyPat8M4NUwp86QX2j9U=
10591059
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
10601060
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86 h1:tXXegjGJJDewy1PJniL0PKb8cQBlLJZ2HboG88eusSw=

‎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.60
4747
github.com/smartcontractkit/chainlink-automation v0.8.1
48-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb
48+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a
4949
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a
5050
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86
5151
github.com/smartcontractkit/chainlink-deployments-framework v0.9.1

‎integration-tests/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,8 +1480,8 @@ github.com/smartcontractkit/chainlink-aptos v0.0.0-20250604171518-c6a8d7f44447 h
14801480
github.com/smartcontractkit/chainlink-aptos v0.0.0-20250604171518-c6a8d7f44447/go.mod h1:jPS9p770KnuAZLI2EPKQQMo6iiY8YNo/DtjD8Tn7CpI=
14811481
github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
14821482
github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
1483-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb h1:mE7i4vt+vCeuqdXyPf+vWzngN5IyW404wuFEcIHgCqg=
1484-
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250604161327-989d6ac39ddb/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
1483+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a h1:Kmwnke40wlyyVLZWbdOtSRma52lYj9g/cAUE2KQt8DM=
1484+
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250610112507-2a6e86a83c4a/go.mod h1:uhUQUnJA5DkBtJ/0SuBJwD+DuwiK+kRBTyz9IlSY1k0=
14851485
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a h1:BVhdDkwltth3sw9MeFS3ItQlyPat8M4NUwp86QX2j9U=
14861486
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250520123946-6aaf88e0848a/go.mod h1:k3/Z6AvwurPUlfuDFEonRbkkiTSgNSrtVNhJEWNlUZA=
14871487
github.com/smartcontractkit/chainlink-common v0.7.1-0.20250603190644-0dcaa6d2cc86 h1:tXXegjGJJDewy1PJniL0PKb8cQBlLJZ2HboG88eusSw=

0 commit comments

Comments
 (0)