Revert "CCIP-4403 LBTC attestation cherry-pick (#1564)" (#1566)

Revert 
281302c
976f457
To unblock potential release

core/services/ocr2/delegate.go

@@ -1894,7 +1894,7 @@ func (d *Delegate) ccipExecGetDstProvider(ctx context.Context, jb job.Job, plugi
 
 	// PROVIDER BASED ARG CONSTRUCTION
 	// Write PluginConfig bytes to send source/dest relayer provider + info outside of top level rargs/pargs over the wire
-	dstConfigBytes, err := newExecPluginConfig(false, pluginJobSpecConfig.SourceStartBlock, pluginJobSpecConfig.DestStartBlock, pluginJobSpecConfig.USDCConfig, pluginJobSpecConfig.LBTCConfig, string(jb.ID)).Encode()
+	dstConfigBytes, err := newExecPluginConfig(false, pluginJobSpecConfig.SourceStartBlock, pluginJobSpecConfig.DestStartBlock, pluginJobSpecConfig.USDCConfig, string(jb.ID)).Encode()
 	if err != nil {
 		return nil, err
 	}
@@ -1927,7 +1927,7 @@ func (d *Delegate) ccipExecGetDstProvider(ctx context.Context, jb job.Job, plugi
 
 func (d *Delegate) ccipExecGetSrcProvider(ctx context.Context, jb job.Job, pluginJobSpecConfig ccipconfig.ExecPluginJobSpecConfig, transmitterID string, dstProvider types.CCIPExecProvider) (srcProvider types.CCIPExecProvider, srcChainID uint64, err error) {
 	spec := jb.OCR2OracleSpec
-	srcConfigBytes, err := newExecPluginConfig(true, pluginJobSpecConfig.SourceStartBlock, pluginJobSpecConfig.DestStartBlock, pluginJobSpecConfig.USDCConfig, pluginJobSpecConfig.LBTCConfig, string(jb.ID)).Encode()
+	srcConfigBytes, err := newExecPluginConfig(true, pluginJobSpecConfig.SourceStartBlock, pluginJobSpecConfig.DestStartBlock, pluginJobSpecConfig.USDCConfig, string(jb.ID)).Encode()
 	if err != nil {
 		return nil, 0, err
 	}
@@ -1976,13 +1976,12 @@ func (d *Delegate) ccipExecGetSrcProvider(ctx context.Context, jb job.Job, plugi
 	return
 }
 
-func newExecPluginConfig(isSourceProvider bool, srcStartBlock uint64, dstStartBlock uint64, usdcConfig ccipconfig.USDCConfig, lbtcConfig ccipconfig.LBTCConfig, jobID string) config.ExecPluginConfig {
+func newExecPluginConfig(isSourceProvider bool, srcStartBlock uint64, dstStartBlock uint64, usdcConfig ccipconfig.USDCConfig, jobID string) config.ExecPluginConfig {
 	return config.ExecPluginConfig{
 		IsSourceProvider: isSourceProvider,
 		SourceStartBlock: srcStartBlock,
 		DestStartBlock:   dstStartBlock,
 		USDCConfig:       usdcConfig,
-		LBTCConfig:       lbtcConfig,
 		JobID:            jobID,
 	}
 }

core/services/ocr2/plugins/ccip/ccipexec/initializers.go

@@ -121,20 +121,6 @@ func NewExecServices(ctx context.Context, lggr logger.Logger, jb job.Job, srcPro
 		}
 		tokenDataProviders[cciptypes.Address(pluginConfig.USDCConfig.SourceTokenAddress.String())] = usdcReader
 	}
-	// init lbtc token data provider
-	if pluginConfig.LBTCConfig.AttestationAPI != "" {
-		lggr.Infof("LBTC token data provider enabled")
-		err2 := pluginConfig.LBTCConfig.ValidateLBTCConfig()
-		if err2 != nil {
-			return nil, err2
-		}
-
-		lbtcReader, err2 := srcProvider.NewTokenDataReader(ctx, ccip.EvmAddrToGeneric(pluginConfig.LBTCConfig.SourceTokenAddress))
-		if err2 != nil {
-			return nil, fmt.Errorf("new lbtc reader: %w", err2)
-		}
-		tokenDataProviders[cciptypes.Address(pluginConfig.LBTCConfig.SourceTokenAddress.String())] = lbtcReader
-	}
 
 	// Prom wrappers
 	onRampReader = observability.NewObservedOnRampReader(onRampReader, srcChainID, ccip.ExecPluginLabel)

core/services/ocr2/plugins/ccip/config/config.go

@@ -108,7 +108,6 @@ func (c *DynamicPriceGetterConfig) Validate() error {
 type ExecPluginJobSpecConfig struct {
 	SourceStartBlock, DestStartBlock uint64 // Only for first time job add.
 	USDCConfig                       USDCConfig
-	LBTCConfig                       LBTCConfig
 }
 
 type USDCConfig struct {
@@ -120,19 +119,10 @@ type USDCConfig struct {
 	AttestationAPIIntervalMilliseconds int
 }
 
-type LBTCConfig struct {
-	SourceTokenAddress           common.Address
-	AttestationAPI               string
-	AttestationAPITimeoutSeconds uint
-	// AttestationAPIIntervalMilliseconds can be set to -1 to disable or 0 to use a default interval.
-	AttestationAPIIntervalMilliseconds int
-}
-
 type ExecPluginConfig struct {
 	SourceStartBlock, DestStartBlock uint64 // Only for first time job add.
 	IsSourceProvider                 bool
 	USDCConfig                       USDCConfig
-	LBTCConfig                       LBTCConfig
 	JobID                            string
 }
 
@@ -146,30 +136,17 @@ func (e ExecPluginConfig) Encode() ([]byte, error) {
 
 func (uc *USDCConfig) ValidateUSDCConfig() error {
 	if uc.AttestationAPI == "" {
-		return errors.New("USDCConfig: AttestationAPI is required")
+		return errors.New("AttestationAPI is required")
 	}
 	if uc.AttestationAPIIntervalMilliseconds < -1 {
-		return errors.New("USDCConfig: AttestationAPIIntervalMilliseconds must be -1 to disable, 0 for default or greater to define the exact interval")
+		return errors.New("AttestationAPIIntervalMilliseconds must be -1 to disable, 0 for default or greater to define the exact interval")
 	}
 	if uc.SourceTokenAddress == utils.ZeroAddress {
-		return errors.New("USDCConfig: SourceTokenAddress is required")
+		return errors.New("SourceTokenAddress is required")
 	}
 	if uc.SourceMessageTransmitterAddress == utils.ZeroAddress {
-		return errors.New("USDCConfig: SourceMessageTransmitterAddress is required")
+		return errors.New("SourceMessageTransmitterAddress is required")
 	}
 
 	return nil
 }
-
-func (lc *LBTCConfig) ValidateLBTCConfig() error {
-	if lc.AttestationAPI == "" {
-		return errors.New("LBTCConfig: AttestationAPI is required")
-	}
-	if lc.AttestationAPIIntervalMilliseconds < -1 {
-		return errors.New("LBTCConfig: AttestationAPIIntervalMilliseconds must be -1 to disable, 0 for default or greater to define the exact interval")
-	}
-	if lc.SourceTokenAddress == utils.ZeroAddress {
-		return errors.New("LBTCConfig: SourceTokenAddress is required")
-	}
-	return nil
-}

core/services/ocr2/plugins/ccip/tokendata/http/http_client.go

@@ -12,21 +12,18 @@ import (
 )
 
 type IHttpClient interface {
-	// Get issues a GET request to the given url and returns the response body and status code.
+	// Get issue a GET request to the given url and return the response body and status code.
 	Get(ctx context.Context, url string, timeout time.Duration) ([]byte, int, http.Header, error)
-
-	// Post issues a POST request to the given url with the given request data and returns the response body and status code.
-	Post(ctx context.Context, url string, requestData io.Reader, timeout time.Duration) ([]byte, int, http.Header, error)
 }
 
 type HttpClient struct {
 }
 
-func doRequest(ctx context.Context, url string, requestType string, requestBody io.Reader, timeout time.Duration) ([]byte, int, http.Header, error) {
+func (s *HttpClient) Get(ctx context.Context, url string, timeout time.Duration) ([]byte, int, http.Header, error) {
 	// Use a timeout to guard against attestation API hanging, causing observation timeout and failing to make any progress.
 	timeoutCtx, cancel := context.WithTimeoutCause(ctx, timeout, tokendata.ErrTimeout)
 	defer cancel()
-	req, err := http.NewRequestWithContext(timeoutCtx, requestType, url, requestBody)
+	req, err := http.NewRequestWithContext(timeoutCtx, http.MethodGet, url, nil)
 	if err != nil {
 		return nil, http.StatusBadRequest, nil, err
 	}
@@ -49,11 +46,3 @@ func doRequest(ctx context.Context, url string, requestType string, requestBody
 	body, err := io.ReadAll(res.Body)
 	return body, res.StatusCode, res.Header, err
 }
-
-func (s *HttpClient) Get(ctx context.Context, url string, timeout time.Duration) ([]byte, int, http.Header, error) {
-	return doRequest(ctx, url, http.MethodGet, nil, timeout)
-}
-
-func (s *HttpClient) Post(ctx context.Context, url string, requestBody io.Reader, timeout time.Duration) ([]byte, int, http.Header, error) {
-	return doRequest(ctx, url, http.MethodPost, requestBody, timeout)
-}