Cleaned up code and reverted updates for LOOP testing

Author: amit-momin

.github/workflows/docker-build.yml

@@ -172,6 +172,7 @@ jobs:
         COMMIT_SHA=${{ github.sha }}
         CL_INSTALL_PRIVATE_PLUGINS=true
         CL_CHAIN_DEFAULTS=/ccip-config
+        CL_SOLANA_CMD=
       docker-manifest-sign: true
       git-sha: ${{ inputs.git-ref || github.sha }}
       github-event-name: ${{ github.event_name }}

core/capabilities/ccip/ccipsolana/pluginconfig.go

@@ -26,7 +26,6 @@ func InitializePluginConfig(lggr logger.Logger, extraDataCodec ccipocr3.ExtraDat
 		ChainRW:                    ChainRWProvider{},
 		ExtraDataCodec:             ExtraDataDecoder{},
 		PriceOnlyCommitFn:          consts.MethodCommitPriceOnly,
-		CCIPProviderSupported:      true,
 	}
 }
 

core/capabilities/ccip/oraclecreator/plugin.go

@@ -134,6 +134,22 @@ func (i *pluginOracleCreator) Create(ctx context.Context, donID uint32, config c
 		return nil, fmt.Errorf("failed to initialize plugin config: %w", err)
 	}
 
+	// Create CCIP providers - this is the preferred way for plugins to access CCIP data
+	ccipProviders, err := i.createCCIPProviders(
+		ctx,
+		pluginServices,
+		config,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create CCIPProviders: %w", err)
+	}
+
+	// Populate extraDataCodecRegistry with codecs from CCIPProviders
+	err = i.populateCodecRegistriesWithProviderCodecs(ccipProviders)
+	if err != nil {
+		return nil, fmt.Errorf("failed to populate extraDataCodecRegistry with codecs from CCIPProviders: %w", err)
+	}
+
 	destChainID, err := chainsel.GetChainIDFromSelector(chainSelector)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get chain ID from selector %d: %w", chainSelector, err)
@@ -189,18 +205,6 @@ func (i *pluginOracleCreator) Create(ctx context.Context, donID uint32, config c
 		return nil, fmt.Errorf("failed to create readers and writers: %w", err)
 	}
 
-	// Create CCIP providers - this is the preferred way for plugins to access CCIP data
-	ccipProviders, err := i.createCCIPProviders(
-		ctx,
-		pluginServices,
-		cctypes.PluginType(config.Config.PluginType),
-		offrampAddrStr,
-		config,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create CCIPProviders: %w", err)
-	}
-
 	// Create chain accessors and contract transmitters for relayers that supported them
 	chainAccessors, contractTransmitters, err := i.getChainAccessorsAndContractTransmittersFromProviders(
 		ccipProviders,
@@ -212,12 +216,6 @@ func (i *pluginOracleCreator) Create(ctx context.Context, donID uint32, config c
 		return nil, fmt.Errorf("failed to create chain accessors: %w", err)
 	}
 
-	// Populate extraDataCodecRegistry with codecs from CCIPProviders
-	err = i.populateCodecRegistriesWithProviderCodecs(ccipProviders)
-	if err != nil {
-		return nil, fmt.Errorf("failed to populate extraDataCodecRegistry with codecs from CCIPProviders: %w", err)
-	}
-
 	// build the onchain keyring. it will be the signing key for the destination chain family.
 	keybundle, ok := i.ocrKeyBundles[destChainFamily]
 	if !ok {
@@ -496,8 +494,6 @@ func (i *pluginOracleCreator) createFactoryAndTransmitter(
 func (i *pluginOracleCreator) createCCIPProviders(
 	ctx context.Context,
 	pluginServices ccipcommon.PluginServices,
-	pluginType cctypes.PluginType,
-	offrampAddrStr string,
 	config cctypes.OCR3ConfigWithMeta,
 ) (map[cciptypes.ChainSelector]types.CCIPProvider, error) {
 	ccipProviders := make(map[cciptypes.ChainSelector]types.CCIPProvider)