update plugin with new report structure

smartcontractkit · Aug 27, 2024 · 250f707 · 250f707
1 parent ab74ad2
commit 250f707
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 21 deletions.
diff --git a/contracts/src/v0.8/ccip/test/offRamp/OffRamp.t.sol b/contracts/src/v0.8/ccip/test/offRamp/OffRamp.t.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.24;
 import {IFeeQuoter} from "../../interfaces/IFeeQuoter.sol";
 import {IMessageInterceptor} from "../../interfaces/IMessageInterceptor.sol";
 import {IPriceRegistry} from "../../interfaces/IPriceRegistry.sol";
-import {IRMN} from "../../interfaces/IRMN.sol"; // TODO - remove
 import {IRMNRemote, MerkleRoot} from "../../interfaces/IRMNRemote.sol";
 import {IRouter} from "../../interfaces/IRouter.sol";
 import {ITokenAdminRegistry} from "../../interfaces/ITokenAdminRegistry.sol";

diff --git a/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go b/core/capabilities/ccip/ccip_integration_tests/ccipreader/ccipreader_test.go
@@ -85,14 +85,12 @@ func TestCCIPReader_CommitReportsGTETimestamp(t *testing.T) {
 					},
 				},
 			},
-			MerkleRoots: []ccip_reader_tester.OffRampMerkleRoot{
+			MerkleRoots: []ccip_reader_tester.MerkleRoot{
 				{
 					SourceChainSelector: uint64(chainS1),
-					Interval: ccip_reader_tester.OffRampInterval{
-						Min: 10,
-						Max: 20,
-					},
-					MerkleRoot: [32]byte{i + 1},
+					MinSeqNr:            10,
+					MaxSeqNr:            20,
+					MerkleRoot:          [32]byte{i + 1},
 				},
 			},
 		})

diff --git a/core/capabilities/ccip/ccip_integration_tests/helpers.go b/core/capabilities/ccip/ccip_integration_tests/helpers.go
@@ -221,7 +221,7 @@ func createUniverses(
 			backend,
 			offramp.OffRampStaticConfig{
 				ChainSelector:      getSelector(chainID),
-				RmnProxy:           rmnProxy.Address(),
+				RmnRemote:          rmnProxy.Address(), // TODO - Ryan
 				TokenAdminRegistry: tokenAdminRegistry.Address(),
 				NonceManager:       nonceManager.Address(),
 			},

diff --git a/core/capabilities/ccip/ccipevm/commitcodec.go b/core/capabilities/ccip/ccipevm/commitcodec.go
@@ -32,15 +32,13 @@ func NewCommitPluginCodecV1() *CommitPluginCodecV1 {
 }
 
 func (c *CommitPluginCodecV1) Encode(ctx context.Context, report cciptypes.CommitPluginReport) ([]byte, error) {
-	merkleRoots := make([]offramp.OffRampMerkleRoot, 0, len(report.MerkleRoots))
+	merkleRoots := make([]offramp.MerkleRoot, 0, len(report.MerkleRoots))
 	for _, root := range report.MerkleRoots {
-		merkleRoots = append(merkleRoots, offramp.OffRampMerkleRoot{
+		merkleRoots = append(merkleRoots, offramp.MerkleRoot{
 			SourceChainSelector: uint64(root.ChainSel),
-			Interval: offramp.OffRampInterval{
-				Min: uint64(root.SeqNumsRange.Start()),
-				Max: uint64(root.SeqNumsRange.End()),
-			},
-			MerkleRoot: root.MerkleRoot,
+			MinSeqNr:            uint64(root.SeqNumsRange.Start()),
+			MaxSeqNr:            uint64(root.SeqNumsRange.End()),
+			MerkleRoot:          root.MerkleRoot,
 		})
 	}
 
@@ -102,8 +100,8 @@ func (c *CommitPluginCodecV1) Decode(ctx context.Context, bytes []byte) (cciptyp
 		merkleRoots = append(merkleRoots, cciptypes.MerkleRootChain{
 			ChainSel: cciptypes.ChainSelector(root.SourceChainSelector),
 			SeqNumsRange: cciptypes.NewSeqNumRange(
-				cciptypes.SeqNum(root.Interval.Min),
-				cciptypes.SeqNum(root.Interval.Max),
+				cciptypes.SeqNum(root.MinSeqNr),
+				cciptypes.SeqNum(root.MaxSeqNr),
 			),
 			MerkleRoot: root.MerkleRoot,
 		})

diff --git a/core/capabilities/ccip/configs/evm/contract_reader.go b/core/capabilities/ccip/configs/evm/contract_reader.go
@@ -68,10 +68,6 @@ var DestReaderConfig = evmrelaytypes.ChainReaderConfig{
 					ChainSpecificName: mustGetMethodName("getMerkleRoot", offrampABI),
 					ReadType:          evmrelaytypes.Method,
 				},
-				consts.MethodNameIsBlessed: {
-					ChainSpecificName: mustGetMethodName("isBlessed", offrampABI),
-					ReadType:          evmrelaytypes.Method,
-				},
 				consts.MethodNameGetLatestPriceSequenceNumber: {
 					ChainSpecificName: mustGetMethodName("getLatestPriceSequenceNumber", offrampABI),
 					ReadType:          evmrelaytypes.Method,