From ed1929ecd0515be9d456dfb5e835a94f2304b60a Mon Sep 17 00:00:00 2001 From: dimitris Date: Thu, 17 Oct 2024 18:47:43 +0300 Subject: [PATCH] upgrade cl-ccip (#14832) --- core/capabilities/ccip/ccipevm/rmncrypto.go | 4 +--- core/capabilities/ccip/ccipevm/rmncrypto_test.go | 3 ++- core/scripts/go.mod | 4 ++-- core/scripts/go.sum | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- integration-tests/go.mod | 4 ++-- integration-tests/go.sum | 8 ++++---- integration-tests/load/go.mod | 4 ++-- integration-tests/load/go.sum | 8 ++++---- 10 files changed, 27 insertions(+), 28 deletions(-) diff --git a/core/capabilities/ccip/ccipevm/rmncrypto.go b/core/capabilities/ccip/ccipevm/rmncrypto.go index f92f9c7ebcb..ce21a6a8edd 100644 --- a/core/capabilities/ccip/ccipevm/rmncrypto.go +++ b/core/capabilities/ccip/ccipevm/rmncrypto.go @@ -86,8 +86,6 @@ func (r *EVMRMNCrypto) VerifyReportSignatures( return fmt.Errorf("no lane updates provided") } - rmnVersionHash := crypto.Keccak256Hash([]byte(report.ReportVersion)) - evmLaneUpdates := make([]evmInternalMerkleRoot, len(report.LaneUpdates)) for i, lu := range report.LaneUpdates { onRampAddress := common.BytesToAddress(lu.OnRampAddress) @@ -113,7 +111,7 @@ func (r *EVMRMNCrypto) VerifyReportSignatures( DestLaneUpdates: evmLaneUpdates, } - abiEnc, err := encodingUtilsABI.Methods["_rmnReport"].Inputs.Pack(rmnVersionHash, evmReport) + abiEnc, err := encodingUtilsABI.Methods["_rmnReport"].Inputs.Pack(report.ReportVersionDigest, evmReport) if err != nil { return fmt.Errorf("failed to ABI encode args: %w", err) } diff --git a/core/capabilities/ccip/ccipevm/rmncrypto_test.go b/core/capabilities/ccip/ccipevm/rmncrypto_test.go index 82a546a66d5..7e33a88bc52 100644 --- a/core/capabilities/ccip/ccipevm/rmncrypto_test.go +++ b/core/capabilities/ccip/ccipevm/rmncrypto_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/crypto" cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3" "github.com/smartcontractkit/chainlink-common/pkg/utils/tests" @@ -34,7 +35,7 @@ func Test_VerifyRmnReportSignatures(t *testing.T) { destChainEvmID := int64(4083663998511321420) reportData := cciptypes.RMNReport{ - ReportVersion: "RMN_V1_6_ANY2EVM_REPORT", + ReportVersionDigest: cciptypes.Bytes32(crypto.Keccak256Hash([]byte("RMN_V1_6_ANY2EVM_REPORT"))), DestChainID: cciptypes.NewBigIntFromInt64(destChainEvmID), DestChainSelector: 5266174733271469989, RmnRemoteContractAddress: common.HexToAddress("0x3d015cec4411357eff4ea5f009a581cc519f75d3").Bytes(), diff --git a/core/scripts/go.mod b/core/scripts/go.mod index bc52202dd22..c20f40ee0f3 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -24,7 +24,7 @@ require ( github.com/prometheus/client_golang v1.20.0 github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chainlink-automation v0.8.0 - github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 + github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12 @@ -287,7 +287,7 @@ require ( github.com/shirou/gopsutil/v3 v3.24.3 // indirect github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240926212305-a6deabdfce86 // indirect github.com/smartcontractkit/chain-selectors v1.0.27 // indirect - github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 // indirect + github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c // indirect github.com/smartcontractkit/chainlink-cosmos v0.5.1 // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.0 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.1 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index bc48f8e3f8d..3275bf51ab4 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1072,10 +1072,10 @@ github.com/smartcontractkit/chain-selectors v1.0.27 h1:VE/ftX9Aae4gnw67yR1raKi+3 github.com/smartcontractkit/chain-selectors v1.0.27/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8JdjKTWpDOr0XJ6xL9oELDoUg= github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 h1:Zmw+l1u4Vsv8EEV00CxR4HXis6at0/DlpyEg0Syy7TA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46/go.mod h1:lnuRhxDI2l8JxmoesWBRwhk2Fx1T6I571VZmGncNbW0= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 h1:ED19n1RKvH+3SCV/uH9v97U9q4eOosgDG+yOv1XNDi4= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c h1:BvzX0A659a9fShyW69P/jV3iVlA4/wlGbZ/4XXE3pxI= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 h1:SHwvqXq1gdXOG/f1sQGupOH6ICZRuzMy5QkD3Um/k+8= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY= github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU= github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk= diff --git a/go.mod b/go.mod index f4f47675dcc..b5ea84fdf1d 100644 --- a/go.mod +++ b/go.mod @@ -75,8 +75,8 @@ require ( github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chain-selectors v1.0.27 github.com/smartcontractkit/chainlink-automation v0.8.0 - github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 - github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 + github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c + github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 github.com/smartcontractkit/chainlink-cosmos v0.5.1 github.com/smartcontractkit/chainlink-data-streams v0.1.0 github.com/smartcontractkit/chainlink-feeds v0.1.1 diff --git a/go.sum b/go.sum index 72bc3f2fc96..ac048a40e3f 100644 --- a/go.sum +++ b/go.sum @@ -1055,10 +1055,10 @@ github.com/smartcontractkit/chain-selectors v1.0.27 h1:VE/ftX9Aae4gnw67yR1raKi+3 github.com/smartcontractkit/chain-selectors v1.0.27/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8JdjKTWpDOr0XJ6xL9oELDoUg= github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 h1:Zmw+l1u4Vsv8EEV00CxR4HXis6at0/DlpyEg0Syy7TA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46/go.mod h1:lnuRhxDI2l8JxmoesWBRwhk2Fx1T6I571VZmGncNbW0= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 h1:ED19n1RKvH+3SCV/uH9v97U9q4eOosgDG+yOv1XNDi4= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c h1:BvzX0A659a9fShyW69P/jV3iVlA4/wlGbZ/4XXE3pxI= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 h1:SHwvqXq1gdXOG/f1sQGupOH6ICZRuzMy5QkD3Um/k+8= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY= github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU= github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index be985541dc5..e3091d372ee 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -39,8 +39,8 @@ require ( github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240926212305-a6deabdfce86 github.com/smartcontractkit/chain-selectors v1.0.27 github.com/smartcontractkit/chainlink-automation v0.8.0 - github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 - github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 + github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c + github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.0 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4 github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index f395f391b37..240cf248fc8 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1402,10 +1402,10 @@ github.com/smartcontractkit/chain-selectors v1.0.27 h1:VE/ftX9Aae4gnw67yR1raKi+3 github.com/smartcontractkit/chain-selectors v1.0.27/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8JdjKTWpDOr0XJ6xL9oELDoUg= github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 h1:Zmw+l1u4Vsv8EEV00CxR4HXis6at0/DlpyEg0Syy7TA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46/go.mod h1:lnuRhxDI2l8JxmoesWBRwhk2Fx1T6I571VZmGncNbW0= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 h1:ED19n1RKvH+3SCV/uH9v97U9q4eOosgDG+yOv1XNDi4= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c h1:BvzX0A659a9fShyW69P/jV3iVlA4/wlGbZ/4XXE3pxI= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 h1:SHwvqXq1gdXOG/f1sQGupOH6ICZRuzMy5QkD3Um/k+8= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY= github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU= github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 36c4d311245..de2fe3f86eb 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -15,7 +15,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.12.2 - github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 + github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.11-0.20241011153842-b2804aed25b4 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.1 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.0 @@ -406,7 +406,7 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/chain-selectors v1.0.27 // indirect github.com/smartcontractkit/chainlink-automation v0.8.0 // indirect - github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 // indirect + github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c // indirect github.com/smartcontractkit/chainlink-data-streams v0.1.0 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.1 // indirect github.com/smartcontractkit/chainlink-protos/orchestrator v0.3.0 // indirect diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 2df2af73806..b23c317b784 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1379,10 +1379,10 @@ github.com/smartcontractkit/chain-selectors v1.0.27 h1:VE/ftX9Aae4gnw67yR1raKi+3 github.com/smartcontractkit/chain-selectors v1.0.27/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v0.8.0 h1:hFz2EHU06bkEfhcqhK8JdjKTWpDOr0XJ6xL9oELDoUg= github.com/smartcontractkit/chainlink-automation v0.8.0/go.mod h1:ObdjDfgGIaiE48Bb3yYcx1CeGBm392WlEw92U83LlUA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46 h1:Zmw+l1u4Vsv8EEV00CxR4HXis6at0/DlpyEg0Syy7TA= -github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017110648-5b5f448e5c46/go.mod h1:lnuRhxDI2l8JxmoesWBRwhk2Fx1T6I571VZmGncNbW0= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7 h1:ED19n1RKvH+3SCV/uH9v97U9q4eOosgDG+yOv1XNDi4= -github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017101609-02a8c3d034c7/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c h1:BvzX0A659a9fShyW69P/jV3iVlA4/wlGbZ/4XXE3pxI= +github.com/smartcontractkit/chainlink-ccip v0.0.0-20241017140434-6757be193e1c/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6 h1:SHwvqXq1gdXOG/f1sQGupOH6ICZRuzMy5QkD3Um/k+8= +github.com/smartcontractkit/chainlink-common v0.3.1-0.20241017135127-b283b1e14fa6/go.mod h1:tsGgeEJc5SUSlfVGSX0wR0EkRU3pM58D6SKF97V68ko= github.com/smartcontractkit/chainlink-cosmos v0.5.1 h1:2xeZWh+4/w7xalTdAu8jqgFuxZ291aYTEwZhlQEv/BY= github.com/smartcontractkit/chainlink-cosmos v0.5.1/go.mod h1:c1wUtVxXUqW4PzuCQhuHaBDZFv9XAQjhKTqam7GLGIU= github.com/smartcontractkit/chainlink-data-streams v0.1.0 h1:wcRJRm7eqfbgN+Na+GjAe0/IUn6XwmSagFHqIWHHBGk=