refactor plugin to use init factory registration pattern (#17706)

* refactor plugin to use init factory registration pattern

* register chain families

* fix make

* fix make

* fix

* combine plugin config

* rm redundant return

* revert

* change

* refactor

* register extra data codec

* add comment back

* rm extradatacodec map

* fix make errors

* gofmt

* fix

* Jade comments

* fix typo

* step 1 Will comments

* fix make

* rm unused

* fix bug

* rename

* rename

Author: huangzhen1997

core/capabilities/ccip/ccipevm/executecodec_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
+	chainsel "github.com/smartcontractkit/chain-selectors"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/message_hasher"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/offramp"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/report_codec"
@@ -179,10 +180,15 @@ func TestExecutePluginCodecV1(t *testing.T) {
 	simulatedBackend.Commit()
 	contract, err := report_codec.NewReportCodec(address, simulatedBackend)
 	require.NoError(t, err)
+	registeredMockExtraDataCodecMap := map[string]ccipcommon.SourceChainExtraDataCodec{
+		chainsel.FamilyEVM:    mockExtraDataCodec,
+		chainsel.FamilySolana: mockExtraDataCodec,
+	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			codec := NewExecutePluginCodecV1(ccipcommon.NewExtraDataCodec(mockExtraDataCodec, mockExtraDataCodec))
+			edc := ccipcommon.ExtraDataCodec(registeredMockExtraDataCodecMap)
+			codec := NewExecutePluginCodecV1(edc)
 			report := tc.report(randomExecuteReport(t, d, tc.chainSelector, tc.gasLimit, tc.destGasAmount))
 			bytes, err := codec.Encode(ctx, report)
 			if tc.expErr {

core/capabilities/ccip/ccipevm/extradatacodec.go

@@ -14,11 +14,11 @@ const (
 	evmDestExecDataKey    = "destGasAmount"
 )
 
-// ExtraDataCodec is a concrete implementation of SourceChainExtraDataCodec
-type ExtraDataCodec struct{}
+// ExtraDataDecoder is a concrete implementation of SourceChainExtraDataCodec
+type ExtraDataDecoder struct{}
 
 // DecodeDestExecDataToMap reformats bytes into a chain agnostic map[string]interface{} representation for dest exec data
-func (d ExtraDataCodec) DecodeDestExecDataToMap(destExecData cciptypes.Bytes) (map[string]interface{}, error) {
+func (d ExtraDataDecoder) DecodeDestExecDataToMap(destExecData cciptypes.Bytes) (map[string]interface{}, error) {
 	destGasAmount, err := abiDecodeUint32(destExecData)
 	if err != nil {
 		return nil, fmt.Errorf("decode dest gas amount: %w", err)
@@ -30,7 +30,7 @@ func (d ExtraDataCodec) DecodeDestExecDataToMap(destExecData cciptypes.Bytes) (m
 }
 
 // DecodeExtraArgsToMap reformats bytes into a chain agnostic map[string]any representation for extra args
-func (d ExtraDataCodec) DecodeExtraArgsToMap(extraArgs cciptypes.Bytes) (map[string]any, error) {
+func (d ExtraDataDecoder) DecodeExtraArgsToMap(extraArgs cciptypes.Bytes) (map[string]any, error) {
 	if len(extraArgs) < 4 {
 		return nil, fmt.Errorf("extra args too short: %d, should be at least 4 (i.e the extraArgs tag)", len(extraArgs))
 	}
@@ -85,5 +85,5 @@ func (d ExtraDataCodec) DecodeExtraArgsToMap(extraArgs cciptypes.Bytes) (map[str
 	return output, nil
 }
 
-// Ensure ExtraDataCodec implements the SourceChainExtraDataCodec interface
-var _ ccipcommon.SourceChainExtraDataCodec = &ExtraDataCodec{}
+// Ensure ExtraDataDecoder implements the SourceChainExtraDataCodec interface
+var _ ccipcommon.SourceChainExtraDataCodec = &ExtraDataDecoder{}

core/capabilities/ccip/ccipevm/extradatacodec_test.go

@@ -15,7 +15,7 @@ import (
 func Test_decodeExtraData(t *testing.T) {
 	d := testSetup(t)
 	gasLimit := big.NewInt(rand.Int63())
-	extraDataDecoder := &ExtraDataCodec{}
+	extraDataDecoder := &ExtraDataDecoder{}
 
 	t.Run("decode extra args into map evm v1", func(t *testing.T) {
 		encoded, err := d.contract.EncodeEVMExtraArgsV1(nil, message_hasher.ClientEVMExtraArgsV1{
@@ -68,7 +68,7 @@ func Test_decodeExtraData(t *testing.T) {
 
 func TestExtraDataDecoder_DecodeExtraArgsToMap_SVMDestination(t *testing.T) {
 	d := testSetup(t)
-	extraDataDecoder := &ExtraDataCodec{}
+	extraDataDecoder := &ExtraDataDecoder{}
 
 	t.Run("decode extra args into map svm", func(t *testing.T) {
 		key, err := solana.NewRandomPrivateKey()

core/capabilities/ccip/ccipevm/gas_helpers_test.go

@@ -80,7 +80,7 @@ func Test_calculateMessageMaxGas(t *testing.T) {
 			}
 			// Set the source chain selector to be EVM for now
 			msg.Header.SourceChainSelector = ccipocr3.ChainSelector(chainsel.ETHEREUM_TESTNET_SEPOLIA.Selector)
-			ep := EstimateProvider{extraDataCodec: extraDataCodec}
+			ep := EstimateProvider{extraDataCodec}
 			got := ep.CalculateMessageMaxGas(msg)
 			t.Log(got)
 			assert.Equalf(t, tt.want, got, "calculateMessageMaxGas(%v, %v)", tt.args.dataLen, tt.args.numTokens)

core/capabilities/ccip/ccipevm/helpers_test.go

@@ -13,7 +13,7 @@ import (
 func Test_decodeExtraArgs(t *testing.T) {
 	d := testSetup(t)
 	gasLimit := big.NewInt(rand.Int63())
-	extraDataDecoder := &ExtraDataCodec{}
+	extraDataDecoder := &ExtraDataDecoder{}
 
 	t.Run("decode extra args into map evm v1", func(t *testing.T) {
 		encoded, err := d.contract.EncodeEVMExtraArgsV1(nil, message_hasher.ClientEVMExtraArgsV1{

core/capabilities/ccip/ccipevm/msghasher_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	agbinary "github.com/gagliardetto/binary"
 	solanago "github.com/gagliardetto/solana-go"
+	chainsel "github.com/smartcontractkit/chain-selectors"
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/message_hasher"
 	"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/fee_quoter"
 	cciptypes "github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
@@ -34,7 +35,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var extraDataCodec = ccipcommon.NewExtraDataCodec(ExtraDataCodec{}, ccipsolana.ExtraDataCodec{})
+var extraDataCodec = ccipcommon.ExtraDataCodec(map[string]ccipcommon.SourceChainExtraDataCodec{
+	chainsel.FamilyEVM:    ExtraDataDecoder{},
+	chainsel.FamilySolana: ccipsolana.ExtraDataDecoder{},
+})
 
 // NOTE: these test cases are only EVM <-> EVM.
 // Update these cases once we have non-EVM examples.

core/capabilities/ccip/ccipevm/pluginconfig.go

@@ -19,5 +19,13 @@ func InitializePluginConfig(lggr logger.Logger, extraDataCodec ccipcommon.ExtraD
 		GasEstimateProvider:        NewGasEstimateProvider(extraDataCodec),
 		RMNCrypto:                  NewEVMRMNCrypto(lggr.Named(chainsel.FamilyEVM).Named("RMNCrypto")),
 		ContractTransmitterFactory: ocrimpls.NewEVMContractTransmitterFactory(extraDataCodec),
+		ChainRW:                    ChainCWProvider{},
+		ExtraDataCodec:             ExtraDataDecoder{},
+		AddressCodec:               AddressCodec{},
 	}
 }
+
+func init() {
+	// Register the EVM plugin config factory
+	ccipcommon.RegisterPluginConfig(chainsel.FamilyEVM, InitializePluginConfig)
+}

core/capabilities/ccip/ccipsolana/executecodec_test.go

@@ -9,6 +9,7 @@ import (
 
 	agbinary "github.com/gagliardetto/binary"
 	solanago "github.com/gagliardetto/solana-go"
+	chainsel "github.com/smartcontractkit/chain-selectors"
 	"github.com/stretchr/testify/mock"
 
 	ccipcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
@@ -179,7 +180,13 @@ func TestExecutePluginCodecV1(t *testing.T) {
 		"accountIsWritableBitmap": uint64(2),
 		"TokenReceiver":           [32]byte(solanago.MustPublicKeyFromBase58("42Gia5bGsh8R2S44e37t9fsucap1qsgjr6GjBmWotgdF").Bytes()),
 	}, nil).Maybe()
-	cd := NewExecutePluginCodecV1(ccipcommon.NewExtraDataCodec(mockExtraDataCodec, mockExtraDataCodec))
+	registeredMockExtraDataCodecMap := map[string]ccipcommon.SourceChainExtraDataCodec{
+		chainsel.FamilyEVM:    mockExtraDataCodec,
+		chainsel.FamilySolana: mockExtraDataCodec,
+	}
+
+	edc := ccipcommon.ExtraDataCodec(registeredMockExtraDataCodecMap)
+	cd := NewExecutePluginCodecV1(edc)
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -219,6 +226,11 @@ func Test_DecodingExecuteReport(t *testing.T) {
 		"ComputeUnits":            uint32(1000),
 		"accountIsWritableBitmap": uint64(2),
 	}, nil)
+	registeredMockExtraDataCodecMap := map[string]ccipcommon.SourceChainExtraDataCodec{
+		chainsel.FamilyEVM:    mockExtraDataCodec,
+		chainsel.FamilySolana: mockExtraDataCodec,
+	}
+
 	t.Run("decode on-chain execute report", func(t *testing.T) {
 		chainSel := cciptypes.ChainSelector(rand.Uint64())
 
@@ -257,7 +269,8 @@ func Test_DecodingExecuteReport(t *testing.T) {
 		err = onChainReport.MarshalWithEncoder(encoder)
 		require.NoError(t, err)
 
-		executeCodec := NewExecutePluginCodecV1(ccipcommon.NewExtraDataCodec(mockExtraDataCodec, mockExtraDataCodec))
+		edc := ccipcommon.ExtraDataCodec(registeredMockExtraDataCodecMap)
+		executeCodec := NewExecutePluginCodecV1(edc)
 		decode, err := executeCodec.Decode(testutils.Context(t), buf.Bytes())
 		require.NoError(t, err)
 
@@ -273,7 +286,8 @@ func Test_DecodingExecuteReport(t *testing.T) {
 
 	t.Run("decode Borsh encoded execute report", func(t *testing.T) {
 		ocrReport := randomExecuteReport(t, 124615329519749607)
-		cd := NewExecutePluginCodecV1(ccipcommon.NewExtraDataCodec(mockExtraDataCodec, mockExtraDataCodec))
+		edc := ccipcommon.ExtraDataCodec(registeredMockExtraDataCodecMap)
+		cd := NewExecutePluginCodecV1(edc)
 		encodedReport, err := cd.Encode(testutils.Context(t), ocrReport)
 		require.NoError(t, err)
 

core/capabilities/ccip/ccipsolana/extradatacodec.go

@@ -29,11 +29,11 @@ var (
 	evmExtraArgsV2Tag = hexutil.MustDecode("0x181dcf10")
 )
 
-// ExtraDataCodec is a helper struct for decoding extra data
-type ExtraDataCodec struct{}
+// ExtraDataDecoder is a helper struct for decoding extra data
+type ExtraDataDecoder struct{}
 
 // DecodeExtraArgsToMap is a helper function for converting Borsh encoded extra args bytes into map[string]any
-func (d ExtraDataCodec) DecodeExtraArgsToMap(extraArgs cciptypes.Bytes) (map[string]any, error) {
+func (d ExtraDataDecoder) DecodeExtraArgsToMap(extraArgs cciptypes.Bytes) (map[string]any, error) {
 	if len(extraArgs) < 4 {
 		return nil, fmt.Errorf("extra args too short: %d, should be at least 4 (i.e the extraArgs tag)", len(extraArgs))
 	}
@@ -74,11 +74,11 @@ func (d ExtraDataCodec) DecodeExtraArgsToMap(extraArgs cciptypes.Bytes) (map[str
 }
 
 // DecodeDestExecDataToMap is a helper function for converting dest exec data bytes into map[string]any
-func (d ExtraDataCodec) DecodeDestExecDataToMap(destExecData cciptypes.Bytes) (map[string]any, error) {
+func (d ExtraDataDecoder) DecodeDestExecDataToMap(destExecData cciptypes.Bytes) (map[string]any, error) {
 	return map[string]any{
 		svmDestExecDataKey: binary.BigEndian.Uint32(destExecData),
 	}, nil
 }
 
-// Ensure ExtraDataCodec implements the SourceChainExtraDataCodec interface
-var _ ccipcommon.SourceChainExtraDataCodec = &ExtraDataCodec{}
+// Ensure ExtraDataDecoder implements the SourceChainExtraDataCodec interface
+var _ ccipcommon.SourceChainExtraDataCodec = &ExtraDataDecoder{}

core/capabilities/ccip/ccipsolana/extradatacodec_test.go

@@ -15,7 +15,7 @@ import (
 )
 
 func Test_decodeExtraArgs(t *testing.T) {
-	extraDataDecoder := &ExtraDataCodec{}
+	extraDataDecoder := &ExtraDataDecoder{}
 	t.Run("decode dest exec data into map svm", func(t *testing.T) {
 		destGasAmount := uint32(10000)
 		encoded := make([]byte, 4)