Commit plugin uses ChainAccessorWrapper

Author: rstout

commit/factory.go

@@ -146,6 +146,12 @@ func (p *PluginFactory) NewReportingPlugin(ctx context.Context, config ocr3types
 		readerFacades[chain] = cr
 	}
 
+	// Wrap chainAccessors to clear TxHash
+	wrappedAccessors := make(map[cciptypes.ChainSelector]cciptypes.ChainAccessor)
+	for chainSel, accessor := range p.chainAccessors {
+		wrappedAccessors[chainSel] = readerpkg.NewChainAccessorWrapper(accessor, offchainConfig.PopulateTxHashEnabled)
+	}
+
 	// Bind the RMNHome contract
 	var rmnHomeReader readerpkg.RMNHome
 	if offchainConfig.RMNEnabled {
@@ -181,7 +187,7 @@ func (p *PluginFactory) NewReportingPlugin(ctx context.Context, config ocr3types
 	ccipReader, err := readerpkg.NewCCIPChainReader(
 		ctx,
 		logutil.WithComponent(lggr, "CCIPReader"),
-		p.chainAccessors,
+		wrappedAccessors,
 		readerFacades,
 		p.chainWriters,
 		p.ocrConfig.Config.ChainSelector,
@@ -193,7 +199,7 @@ func (p *PluginFactory) NewReportingPlugin(ctx context.Context, config ocr3types
 	}
 
 	// The node supports the chain that the token prices are on.
-	_, ok := p.chainAccessors[offchainConfig.PriceFeedChainSelector]
+	_, ok := wrappedAccessors[offchainConfig.PriceFeedChainSelector]
 	if ok {
 		// Bind all token aggregate contracts
 		for _, info := range offchainConfig.TokenInfo {
@@ -203,7 +209,7 @@ func (p *PluginFactory) NewReportingPlugin(ctx context.Context, config ocr3types
 					fmt.Errorf("failed to create unknown address from aggregator address %s: %w",
 						info.AggregatorAddress, err)
 			}
-			err = p.chainAccessors[offchainConfig.PriceFeedChainSelector].
+			err = wrappedAccessors[offchainConfig.PriceFeedChainSelector].
 				Sync(ctx, consts.ContractNamePriceAggregator, priceAggAddress)
 			if err != nil {
 				return nil, ocr3types.ReportingPluginInfo{},
@@ -215,7 +221,7 @@ func (p *PluginFactory) NewReportingPlugin(ctx context.Context, config ocr3types
 
 	onChainTokenPricesReader := readerpkg.NewPriceReader(
 		logutil.WithComponent(lggr, "PriceReader"),
-		p.chainAccessors,
+		wrappedAccessors,
 		offchainConfig.TokenInfo,
 		ccipReader,
 		offchainConfig.PriceFeedChainSelector,

execute/factory.go

@@ -145,7 +145,7 @@ func (p PluginFactory) NewReportingPlugin(
 	// Wrap chainAccessors to control TxHash population based on config
 	wrappedAccessors := make(map[cciptypes.ChainSelector]cciptypes.ChainAccessor)
 	for chainSel, accessor := range p.chainAccessors {
-		wrappedAccessors[chainSel] = NewChainAccessorWrapper(accessor, offchainConfig.PopulateTxHashEnabled)
+		wrappedAccessors[chainSel] = readerpkg.NewChainAccessorWrapper(accessor, offchainConfig.PopulateTxHashEnabled)
 	}
 
 	ccipReader, err := readerpkg.NewCCIPChainReader(

execute/chainaccessor_wrapper.go renamed to pkg/reader/chainaccessor_wrapper.go

@@ -1,4 +1,4 @@
-package execute
+package reader
 
 import (
 	"context"

execute/chainaccessor_wrapper_test.go renamed to pkg/reader/chainaccessor_wrapper_test.go

@@ -1,13 +1,14 @@
-package execute
+package reader
 
 import (
 	"context"
 	"testing"
 
-	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
+
 	ccipocr3mocks "github.com/smartcontractkit/chainlink-ccip/mocks/chainlink_common/ccipocr3"
 )
 

pluginconfig/commit.go

@@ -146,6 +146,10 @@ type CommitOffchainConfig struct {
 	// in order to avoid delays when there are reports from multiple sources.
 	// NOTE: this can only be used if RMNEnabled == false.
 	MultipleReportsEnabled bool `json:"multipleReports"`
+
+	// PopulateTxHashEnabled enables populating the TxHash field in message headers.
+	// When disabled, TxHash will be omitted from messages for backwards compatibility.
+	PopulateTxHashEnabled bool `json:"populateTxHashEnabled"`
 }
 
 const (