Accept home chain selector id in commit plugin factory

commit/factory.go

@@ -2,8 +2,10 @@ package commit
 
 import (
 	"context"
+	"encoding/hex"
 	"errors"
 	"fmt"
+	"time"
 
 	"google.golang.org/grpc"
 
@@ -28,6 +30,7 @@ import (
 
 const maxReportTransmissionCheckAttempts = 5
 const maxQueryLength = 1024 * 1024 // 1MB
+const rmnEnabled = false
 
 // PluginFactoryConstructor implements common OCR3ReportingPluginClient and is used for initializing a plugin factory
 // and a validation service.
@@ -56,14 +59,15 @@ func (p PluginFactoryConstructor) NewValidationService(ctx context.Context) (cor
 
 // PluginFactory implements common ReportingPluginFactory and is used for (re-)initializing commit plugin instances.
 type PluginFactory struct {
-	lggr            logger.Logger
-	donID           plugintypes.DonID
-	ocrConfig       reader.OCR3ConfigWithMeta
-	commitCodec     cciptypes.CommitPluginCodec
-	msgHasher       cciptypes.MessageHasher
-	homeChainReader reader.HomeChain
-	contractReaders map[cciptypes.ChainSelector]types.ContractReader
-	chainWriters    map[cciptypes.ChainSelector]types.ChainWriter
+	lggr              logger.Logger
+	donID             plugintypes.DonID
+	ocrConfig         reader.OCR3ConfigWithMeta
+	commitCodec       cciptypes.CommitPluginCodec
+	msgHasher         cciptypes.MessageHasher
+	homeChainReader   reader.HomeChain
+	homeChainSelector cciptypes.ChainSelector
+	contractReaders   map[cciptypes.ChainSelector]types.ContractReader
+	chainWriters      map[cciptypes.ChainSelector]types.ChainWriter
 }
 
 func NewPluginFactory(
@@ -73,18 +77,20 @@ func NewPluginFactory(
 	commitCodec cciptypes.CommitPluginCodec,
 	msgHasher cciptypes.MessageHasher,
 	homeChainReader reader.HomeChain,
+	homeChainSelector cciptypes.ChainSelector,
 	contractReaders map[cciptypes.ChainSelector]types.ContractReader,
 	chainWriters map[cciptypes.ChainSelector]types.ChainWriter,
 ) *PluginFactory {
 	return &PluginFactory{
-		lggr:            lggr,
-		donID:           donID,
-		ocrConfig:       ocrConfig,
-		commitCodec:     commitCodec,
-		msgHasher:       msgHasher,
-		homeChainReader: homeChainReader,
-		contractReaders: contractReaders,
-		chainWriters:    chainWriters,
+		lggr:              lggr,
+		donID:             donID,
+		ocrConfig:         ocrConfig,
+		commitCodec:       commitCodec,
+		msgHasher:         msgHasher,
+		homeChainReader:   homeChainReader,
+		homeChainSelector: homeChainSelector,
+		contractReaders:   contractReaders,
+		chainWriters:      chainWriters,
 	}
 }
 
@@ -104,6 +110,32 @@ func (p *PluginFactory) NewReportingPlugin(config ocr3types.ReportingPluginConfi
 		oracleIDToP2PID[commontypes.OracleID(oracleID)] = p2pID
 	}
 
+	// Bind the RMNHome contract
+	var rmnHomeReader reader.RMNHome
+	if rmnEnabled {
+		rmnHomeAddress := p.ocrConfig.Config.RmnHomeAddress
+		rmnCr, ok := p.contractReaders[p.homeChainSelector]
+		if !ok {
+			return nil,
+				ocr3types.ReportingPluginInfo{},
+				fmt.Errorf("failed to find contract reader for home chain %d", p.homeChainSelector)
+		}
+		rmnHomeBoundContract := types.BoundContract{
+			Address: "0x" + hex.EncodeToString(rmnHomeAddress),
+			Name:    consts.ContractNameRMNHome,
+		}
+
+		if err1 := rmnCr.Bind(context.Background(), []types.BoundContract{rmnHomeBoundContract}); err1 != nil {
+			return nil, ocr3types.ReportingPluginInfo{}, fmt.Errorf("failed to bind RMNHome contract: %w", err1)
+		}
+		rmnHomeReader = reader.NewRMNHomePoller(
+			rmnCr,
+			rmnHomeBoundContract,
+			p.lggr,
+			100*time.Millisecond,
+		)
+	}
+
 	var onChainTokenPricesReader reader.PriceReader
 	// The node supports the chain that the token prices are on.
 	tokenPricesCr, ok := p.contractReaders[offchainConfig.PriceFeedChainSelector]
@@ -148,13 +180,15 @@ func (p *PluginFactory) NewReportingPlugin(config ocr3types.ReportingPluginConfi
 				NewMsgScanBatchSize:                merklemulti.MaxNumberTreeLeaves,
 				MaxReportTransmissionCheckAttempts: maxReportTransmissionCheckAttempts,
 				OffchainConfig:                     offchainConfig,
+				RMNEnabled:                         rmnEnabled,
 			},
 			ccipReader,
 			onChainTokenPricesReader,
 			p.commitCodec,
 			p.msgHasher,
 			p.lggr,
 			p.homeChainReader,
+			rmnHomeReader,
 			config,
 			rmn.Config{}, // todo
 		), ocr3types.ReportingPluginInfo{

commit/merkleroot/processor.go

@@ -19,16 +19,17 @@ import (
 // It's setup to use RMN to query which messages to include in the merkle root and ensures
 // the newly built merkle roots are the same as RMN roots.
 type Processor struct {
-	oracleID     commontypes.OracleID
-	cfg          pluginconfig.CommitPluginConfig
-	lggr         logger.Logger
-	observer     Observer
-	ccipReader   readerpkg.CCIPReader
-	reportingCfg ocr3types.ReportingPluginConfig
-	chainSupport plugincommon.ChainSupport
-	rmnClient    rmn.Controller
-	rmnCrypto    cciptypes.RMNCrypto
-	rmnConfig    rmn.Config
+	oracleID      commontypes.OracleID
+	cfg           pluginconfig.CommitPluginConfig
+	lggr          logger.Logger
+	observer      Observer
+	ccipReader    readerpkg.CCIPReader
+	reportingCfg  ocr3types.ReportingPluginConfig
+	chainSupport  plugincommon.ChainSupport
+	rmnClient     rmn.Controller
+	rmnCrypto     cciptypes.RMNCrypto
+	rmnConfig     rmn.Config
+	rmnHomeReader reader.RMNHome
 }
 
 // NewProcessor creates a new Processor
@@ -44,6 +45,7 @@ func NewProcessor(
 	rmnClient rmn.Controller,
 	rmnCrypto cciptypes.RMNCrypto,
 	rmnConfig rmn.Config,
+	rmnHomeReader reader.RMNHome,
 ) *Processor {
 	observer := ObserverImpl{
 		lggr,
@@ -54,16 +56,17 @@ func NewProcessor(
 		msgHasher,
 	}
 	return &Processor{
-		oracleID:     oracleID,
-		cfg:          cfg,
-		lggr:         lggr,
-		observer:     observer,
-		ccipReader:   ccipReader,
-		reportingCfg: reportingCfg,
-		chainSupport: chainSupport,
-		rmnClient:    rmnClient,
-		rmnCrypto:    rmnCrypto,
-		rmnConfig:    rmnConfig,
+		oracleID:      oracleID,
+		cfg:           cfg,
+		lggr:          lggr,
+		observer:      observer,
+		ccipReader:    ccipReader,
+		reportingCfg:  reportingCfg,
+		chainSupport:  chainSupport,
+		rmnClient:     rmnClient,
+		rmnCrypto:     rmnCrypto,
+		rmnConfig:     rmnConfig,
+		rmnHomeReader: rmnHomeReader,
 	}
 }
 

commit/plugin.go

@@ -40,6 +40,7 @@ type Plugin struct {
 	reportCodec         cciptypes.CommitPluginCodec
 	lggr                logger.Logger
 	homeChain           reader.HomeChain
+	rmnHomeReader       reader.RMNHome
 	reportingCfg        ocr3types.ReportingPluginConfig
 	chainSupport        plugincommon.ChainSupport
 	merkleRootProcessor plugincommon.PluginProcessor[merkleroot.Query, merkleroot.Observation, merkleroot.Outcome]
@@ -64,6 +65,7 @@ func NewPlugin(
 	msgHasher cciptypes.MessageHasher,
 	lggr logger.Logger,
 	homeChain reader.HomeChain,
+	rmnHomeReader reader.RMNHome,
 	reportingCfg ocr3types.ReportingPluginConfig,
 	rmnConfig rmn.Config,
 ) *Plugin {
@@ -93,6 +95,7 @@ func NewPlugin(
 		rmn.Controller(nil),      // todo
 		cciptypes.RMNCrypto(nil), // todo
 		rmnConfig,
+		rmnHomeReader,
 	)
 
 	tokenPriceProcessor := tokenprice.NewProcessor(
@@ -133,6 +136,7 @@ func NewPlugin(
 		tokenPricesReader:   tokenPricesReader,
 		ccipReader:          ccipReader,
 		homeChain:           homeChain,
+		rmnHomeReader:       rmnHomeReader,
 		reportCodec:         reportCodec,
 		reportingCfg:        reportingCfg,
 		chainSupport:        chainSupport,

commit/plugin_e2e_test.go

@@ -286,6 +286,7 @@ func setupNode(
 	reportCodec := mocks.NewCommitPluginJSONReportCodec()
 	msgHasher := mocks.NewMessageHasher()
 	homeChainReader := reader_mock.NewMockHomeChain(t)
+	rmnHomeReader := reader_mock.NewMockRMNHome(t)
 
 	fChain := map[ccipocr3.ChainSelector]int{}
 	supportedChainsForPeer := make(map[libocrtypes.PeerID]mapset.Set[ccipocr3.ChainSelector])
@@ -377,6 +378,7 @@ func setupNode(
 		msgHasher,
 		lggr,
 		homeChainReader,
+		rmnHomeReader,
 		reportingCfg,
 		rmn.Config{},
 	)

internal/reader/home_chain.go

@@ -355,6 +355,7 @@ type OCR3Config struct {
 	F                     uint8                   `json:"F"`
 	OffchainConfigVersion uint64                  `json:"offchainConfigVersion"`
 	OfframpAddress        []byte                  `json:"offrampAddress"`
+	RmnHomeAddress        []byte                  `json:"rmnHomeAddress"`
 	P2PIds                [][32]byte              `json:"p2pIds"`
 	Signers               [][]byte                `json:"signers"`
 	Transmitters          [][]byte                `json:"transmitters"`