From 00cc18d285e6feb7fb4a66a800e9af5fcb148c4a Mon Sep 17 00:00:00 2001
From: "Simon B.Robert" <simrob7000@gmail.com>
Date: Wed, 11 Dec 2024 18:28:00 -0500
Subject: [PATCH] Add common rmn config struct (#15597)

* Add common rmn config struct

* Move to RMN changeset

* Add test using RMNConfig
---
 .../ccip/changeset/cs_update_rmn_config.go    | 30 ++++++++++++
 .../changeset/cs_update_rmn_config_test.go    | 47 +++++++++++++++----
 2 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/deployment/ccip/changeset/cs_update_rmn_config.go b/deployment/ccip/changeset/cs_update_rmn_config.go
index b10991c977c..25ae8308eb5 100644
--- a/deployment/ccip/changeset/cs_update_rmn_config.go
+++ b/deployment/ccip/changeset/cs_update_rmn_config.go
@@ -16,8 +16,38 @@ import (
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_home"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_remote"
+	"github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey"
 )
 
+type RMNNopConfig struct {
+	NodeIndex           uint64
+	OffchainPublicKey   [32]byte
+	EVMOnChainPublicKey common.Address
+	PeerId              p2pkey.PeerID
+}
+
+func (c RMNNopConfig) ToRMNHomeNode() rmn_home.RMNHomeNode {
+	return rmn_home.RMNHomeNode{
+		PeerId:            c.PeerId,
+		OffchainPublicKey: c.OffchainPublicKey,
+	}
+}
+
+func (c RMNNopConfig) ToRMNRemoteSigner() rmn_remote.RMNRemoteSigner {
+	return rmn_remote.RMNRemoteSigner{
+		OnchainPublicKey: c.EVMOnChainPublicKey,
+		NodeIndex:        c.NodeIndex,
+	}
+}
+
+func (c RMNNopConfig) SetBit(bitmap *big.Int, value bool) {
+	if value {
+		bitmap.SetBit(bitmap, int(c.NodeIndex), 1)
+	} else {
+		bitmap.SetBit(bitmap, int(c.NodeIndex), 0)
+	}
+}
+
 func getDeployer(e deployment.Environment, chain uint64, mcmConfig *MCMSConfig) *bind.TransactOpts {
 	if mcmConfig == nil {
 		return e.Chains[chain].DeployerKey
diff --git a/deployment/ccip/changeset/cs_update_rmn_config_test.go b/deployment/ccip/changeset/cs_update_rmn_config_test.go
index e22b85cdf81..3ec309182aa 100644
--- a/deployment/ccip/changeset/cs_update_rmn_config_test.go
+++ b/deployment/ccip/changeset/cs_update_rmn_config_test.go
@@ -12,9 +12,31 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/rmn_remote"
 )
 
+var (
+	rmn_staging_1 = RMNNopConfig{
+		NodeIndex:           0,
+		PeerId:              deployment.MustPeerIDFromString("p2p_12D3KooWRXxZq3pd4a3ZGkKj7Nt1SQQrnB8CuvbPnnV9KVeMeWqg"),
+		OffchainPublicKey:   [32]byte(common.FromHex("0xb34944857a42444d1b285d7940d6e06682309e0781e43a69676ee9f85c73c2d1")),
+		EVMOnChainPublicKey: common.HexToAddress("0x5af8ee32316a6427f169a45fdc1b3a91a85ac459e3c1cb91c69e1c51f0c1fc21"),
+	}
+	rmn_staging_2 = RMNNopConfig{
+		NodeIndex:           1,
+		PeerId:              deployment.MustPeerIDFromString("p2p_12D3KooWEmdxYQFsRbD9aFczF32zA3CcUwuSiWCk2CrmACo4v9RL"),
+		OffchainPublicKey:   [32]byte(common.FromHex("0x68d9f3f274e3985528a923a9bace3d39c55dd778b187b4120b384cc48c892859")),
+		EVMOnChainPublicKey: common.HexToAddress("0x858589216956f482a0f68b282a7050af4cd48ed2"),
+	}
+	rmn_staging_3 = RMNNopConfig{
+		NodeIndex:           2,
+		PeerId:              deployment.MustPeerIDFromString("p2p_12D3KooWJS42cNXKJvj6DeZnxEX7aGxhEuap6uNFrz554AbUDw6Q"),
+		OffchainPublicKey:   [32]byte(common.FromHex("0x5af8ee32316a6427f169a45fdc1b3a91a85ac459e3c1cb91c69e1c51f0c1fc21")),
+		EVMOnChainPublicKey: common.HexToAddress("0x7c5e94162c6fabbdeb3bfe83ae532846e337bfae"),
+	}
+)
+
 type updateRMNConfigTestCase struct {
 	useMCMS bool
 	name    string
+	nops    []RMNNopConfig
 }
 
 func TestUpdateRMNConfig(t *testing.T) {
@@ -23,10 +45,12 @@ func TestUpdateRMNConfig(t *testing.T) {
 		{
 			useMCMS: true,
 			name:    "with MCMS",
+			nops:    []RMNNopConfig{rmn_staging_1, rmn_staging_2, rmn_staging_3},
 		},
 		{
 			useMCMS: false,
 			name:    "without MCMS",
+			nops:    []RMNNopConfig{rmn_staging_1, rmn_staging_2, rmn_staging_3},
 		},
 	}
 
@@ -80,10 +104,15 @@ func updateRMNConfig(t *testing.T, tc updateRMNConfigTestCase) {
 		}
 	}
 
+	nodes := make([]rmn_home.RMNHomeNode, 0, len(tc.nops))
+	for _, nop := range tc.nops {
+		nodes = append(nodes, nop.ToRMNHomeNode())
+	}
+
 	setRMNHomeCandidateConfig := SetRMNHomeCandidateConfig{
 		HomeChainSelector: e.HomeChainSel,
 		RMNStaticConfig: rmn_home.RMNHomeStaticConfig{
-			Nodes:          []rmn_home.RMNHomeNode{},
+			Nodes:          nodes,
 			OffchainConfig: []byte(""),
 		},
 		RMNDynamicConfig: rmn_home.RMNHomeDynamicConfig{
@@ -132,16 +161,16 @@ func updateRMNConfig(t *testing.T, tc updateRMNConfigTestCase) {
 	require.NoError(t, err)
 	require.NotEqual(t, previousActiveDigest, currentActiveDigest)
 
+	signers := make([]rmn_remote.RMNRemoteSigner, 0, len(tc.nops))
+	for _, nop := range tc.nops {
+		signers = append(signers, nop.ToRMNRemoteSigner())
+	}
+
 	setRemoteConfig := SetRMNRemoteConfig{
 		HomeChainSelector: e.HomeChainSel,
-		Signers: []rmn_remote.RMNRemoteSigner{
-			{
-				OnchainPublicKey: common.Address{},
-				NodeIndex:        0,
-			},
-		},
-		F:          0,
-		MCMSConfig: mcmsConfig,
+		Signers:           signers,
+		F:                 0,
+		MCMSConfig:        mcmsConfig,
 	}
 
 	_, err = commonchangeset.ApplyChangesets(t, e.Env, timelocksPerChain, []commonchangeset.ChangesetApplication{