core/capabilities/ccip: resolve issues from develop branch refactors

Author: cfal

core/capabilities/ccip/ccipaptos/extradatadecoder.go

@@ -15,7 +15,7 @@ import (
 // Compatible with ccip::fee_quoter version 1.6.0
 type ExtraDataDecoder struct{}
 
-var _ ccipcommon.ExtraDataDecoder = (*ExtraDataDecoder)(nil)
+var _ ccipcommon.SourceChainExtraDataCodec = ExtraDataDecoder{}
 
 const (
 	aptosDestExecDataKey = "destGasAmount"

core/capabilities/ccip/ccipaptos/pluginconfig.go

@@ -7,8 +7,8 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
-// InitializePluginConfig returns a PluginConfig for EVM chains.
-func InitializePluginConfig(lggr logger.Logger, extraDataCodec ccipcommon.ExtraDataCodec) ccipcommon.PluginConfig {
+// initializePluginConfig returns a PluginConfig for Aptos chains.
+func initializePluginConfig(lggr logger.Logger, extraDataCodec ccipcommon.ExtraDataCodec) ccipcommon.PluginConfig {
 	return ccipcommon.PluginConfig{
 		CommitPluginCodec:          NewCommitPluginCodecV1(),
 		ExecutePluginCodec:         NewExecutePluginCodecV1(extraDataCodec),
@@ -17,5 +17,13 @@ func InitializePluginConfig(lggr logger.Logger, extraDataCodec ccipcommon.ExtraD
 		GasEstimateProvider:        NewGasEstimateProvider(),
 		RMNCrypto:                  nil,
 		ContractTransmitterFactory: ocrimpls.NewAptosContractTransmitterFactory(extraDataCodec),
+		ChainRW:                    ChainCWProvider{},
+		ExtraDataCodec:             ExtraDataDecoder{},
+		AddressCodec:               AddressCodec{},
 	}
 }
+
+func init() {
+	// Register the Aptos plugin config factory
+	ccipcommon.RegisterPluginConfig(chainsel.FamilyAptos, initializePluginConfig)
+}

core/capabilities/ccip/ocrimpls/aptos_contract_transmitter_factory.go

@@ -7,9 +7,6 @@ import (
 	"github.com/smartcontractkit/chainlink-ccip/pkg/consts"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccipaptos"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccipevm"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccipsolana"
 	ccipcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
@@ -28,7 +25,15 @@ type AptosExecCallArgs struct {
 }
 
 // AptosContractTransmitterFactory implements the transmitter factory for Aptos chains.
-type AptosContractTransmitterFactory struct{}
+type AptosContractTransmitterFactory struct {
+	extraDataCodec ccipcommon.ExtraDataCodec
+}
+
+func NewAptosContractTransmitterFactory(extraDataCodec ccipcommon.ExtraDataCodec) *AptosContractTransmitterFactory {
+	return &AptosContractTransmitterFactory{
+		extraDataCodec: extraDataCodec,
+	}
+}
 
 // NewAptosCommitCalldataFunc returns a ToCalldataFunc for Aptos commits that omits any Info object.
 func NewAptosCommitCalldataFunc(commitMethod string) ToEd25519CalldataFunc {
@@ -94,8 +99,6 @@ func (f *AptosContractTransmitterFactory) NewExecTransmitter(
 		fromAccount:         fromAccount,
 		offrampAddress:      offrampAddress,
 		toEd25519CalldataFn: AptosExecCallDataFunc,
-		extraDataCodec: ccipcommon.NewExtraDataCodec(
-			ccipcommon.NewExtraDataCodecParams(ccipevm.ExtraDataDecoder{}, ccipsolana.ExtraDataDecoder{}, ccipaptos.ExtraDataDecoder{}),
-		),
+		extraDataCodec:      f.extraDataCodec,
 	}
 }

core/capabilities/ccip/oraclecreator/plugin.go

@@ -18,7 +18,6 @@ import (
 
 	ccipcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
 
-	aptosloop "github.com/smartcontractkit/chainlink-aptos/relayer/chainreader/loop"
 	commitocr3 "github.com/smartcontractkit/chainlink-ccip/commit"
 	"github.com/smartcontractkit/chainlink-ccip/commit/merkleroot/rmn"
 	execocr3 "github.com/smartcontractkit/chainlink-ccip/execute"
@@ -398,10 +397,6 @@ func (i *pluginOracleCreator) createReadersAndWriters(
 			return nil, nil, err1
 		}
 
-		if relayChainFamily == relay.NetworkAptos {
-			cr = aptosloop.NewLoopChainReader(i.lggr, cr)
-		}
-
 		if chainID == destChainID && destChainFamily == relayChainFamily {
 			offrampAddress := destAddrStr
 			err2 := cr.Bind(ctx, []types.BoundContract{