Migrate to the most recent RMN version (#15004)

* update rmn config * update rmn config
smartcontractkit · Oct 30, 2024 · e2cf137 · e2cf137
1 parent a30e10e
commit e2cf137
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/deployment/ccip/test_helpers.go b/deployment/ccip/test_helpers.go
@@ -11,9 +11,11 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/pkg/errors"
-	cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
+
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 
+	cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 

diff --git a/deployment/environment/devenv/rmn_config.go b/deployment/environment/devenv/rmn_config.go
@@ -43,18 +43,24 @@ type Stability struct {
 	HardConfirmations int    `toml:"hard_confirmations"`
 }
 
-type RemoteChain struct {
-	Name             string    `toml:"name"`
-	Stability        Stability `toml:"stability"`
-	StartBlockNumber int       `toml:"start_block_number"`
-	OffRamp          string    `toml:"off_ramp"`
-	RMNRemote        string    `toml:"rmn_remote"`
+type ChainParam struct {
+	Name      string    `toml:"name"`
+	Stability Stability `toml:"stability"`
+}
+
+type RemoteChains struct {
+	Name                   string `toml:"name"`
+	OnRampStartBlockNumber int    `toml:"on_ramp_start_block_number"`
+	OffRamp                string `toml:"off_ramp"`
+	OnRamp                 string `toml:"on_ramp"`
+	RMNRemote              string `toml:"rmn_remote"`
 }
 
 type SharedConfig struct {
 	Networking   SharedConfigNetworking `toml:"networking"`
 	HomeChain    HomeChain              `toml:"home_chain"`
-	RemoteChains []RemoteChain          `toml:"remote_chains"`
+	ChainParams  []ChainParam           `toml:"chain_params"`
+	RemoteChains []RemoteChains         `toml:"remote_chains"`
 }
 
 func (s SharedConfig) afn2ProxySharedConfigFile() (string, error) {

diff --git a/integration-tests/ccip-tests/testsetups/test_helpers.go b/integration-tests/ccip-tests/testsetups/test_helpers.go
@@ -180,21 +180,27 @@ func GenerateTestRMNConfig(t *testing.T, nRMNNodes int, tenv ccipdeployment.Depl
 	// Just set all RMN nodes to support all chains.
 	state, err := ccipdeployment.LoadOnchainState(tenv.Env, tenv.Ab)
 	require.NoError(t, err)
-	var remoteChains []devenv.RemoteChain
+	var chainParams []devenv.ChainParam
+	var remoteChains []devenv.RemoteChains
+
 	var rpcs []devenv.Chain
 	for chainSel, chain := range state.Chains {
 		c, _ := chainsel.ChainBySelector(chainSel)
 		rmnName := MustCCIPNameToRMNName(c.Name)
-		remoteChains = append(remoteChains, devenv.RemoteChain{
+		chainParams = append(chainParams, devenv.ChainParam{
 			Name: rmnName,
 			Stability: devenv.Stability{
 				Type:              "ConfirmationDepth",
 				SoftConfirmations: 0,
 				HardConfirmations: 0,
 			},
-			StartBlockNumber: 0,
-			OffRamp:          chain.OffRamp.Address().String(),
-			RMNRemote:        chain.RMNRemote.Address().String(),
+		})
+		remoteChains = append(remoteChains, devenv.RemoteChains{
+			Name:                   rmnName,
+			OnRampStartBlockNumber: 0,
+			OffRamp:                chain.OffRamp.Address().String(),
+			OnRamp:                 chain.OnRamp.Address().String(),
+			RMNRemote:              chain.RMNRemote.Address().String(),
 		})
 		rpcs = append(rpcs, devenv.Chain{
 			Name: rmnName,
@@ -213,6 +219,7 @@ func GenerateTestRMNConfig(t *testing.T, nRMNNodes int, tenv ccipdeployment.Depl
 			RMNHome:              state.Chains[tenv.HomeChainSel].RMNHome.Address().String(),
 		},
 		RemoteChains: remoteChains,
+		ChainParams:  chainParams,
 	}
 
 	rmnConfig := make(map[string]devenv.RMNConfig)