Exec v1 jobs in LOOPP mode

GNUmakefile

@@ -68,6 +68,10 @@ install-medianpoc: ## Build & install the chainlink-medianpoc binary.
 install-ocr3-capability: ## Build & install the chainlink-ocr3-capability binary.
  go install $(GOFLAGS) ./plugins/cmd/chainlink-ocr3-capability
 
+.PHONY: install-ccip-exec
+install-ccip-exec:
+ go install $(GOFLAGS) ./plugins/cmd/chainlink-ccip-exec
+
 .PHONY: docker ## Build the chainlink docker image
 docker:
  docker buildx build \

core/config/env/env.go

@@ -28,6 +28,7 @@ var (
  MercuryPlugin = NewPlugin("mercury")
  SolanaPlugin = NewPlugin("solana")
  StarknetPlugin = NewPlugin("starknet")
+ CCIPExecPlugin = NewPlugin("ccip-exec")
  // PrometheusDiscoveryHostName is the externally accessible hostname
  // published by the node in the `/discovery` endpoint. Generally, it is expected to match
  // the public hostname of node.

core/scripts/go.mod

@@ -24,7 +24,7 @@ require (
  github.com/shopspring/decimal v1.4.0
  github.com/smartcontractkit/chain-selectors v1.0.23
  github.com/smartcontractkit/chainlink-automation v1.0.4
- github.com/smartcontractkit/chainlink-common v0.2.2-0.20240723123524-e407ecd120b1
+ github.com/smartcontractkit/chainlink-common v0.2.2-0.20240925011859-eac77b0c392b
  github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
  github.com/smartcontractkit/libocr v0.0.0-20240717100443-f6226e09bee7
  github.com/spf13/cobra v1.8.0

core/scripts/go.sum

@@ -1074,8 +1074,8 @@ github.com/smartcontractkit/chain-selectors v1.0.23 h1:D2Eaex4Cw/O7Lg3tX6WklOqnj
 github.com/smartcontractkit/chain-selectors v1.0.23/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE=
 github.com/smartcontractkit/chainlink-automation v1.0.4 h1:iyW181JjKHLNMnDleI8umfIfVVlwC7+n5izbLSFgjw8=
 github.com/smartcontractkit/chainlink-automation v1.0.4/go.mod h1:u4NbPZKJ5XiayfKHD/v3z3iflQWqvtdhj13jVZXj/cM=
-github.com/smartcontractkit/chainlink-common v0.2.2-0.20240723123524-e407ecd120b1 h1:pdEpjgbZ5w/Sd5lzg/XiuC5gVyrmSovOo+3nUD46SP8=
-github.com/smartcontractkit/chainlink-common v0.2.2-0.20240723123524-e407ecd120b1/go.mod h1:Jg1sCTsbxg76YByI8ifpFby3FvVqISStHT8ypy9ocmY=
+github.com/smartcontractkit/chainlink-common v0.2.2-0.20240925011859-eac77b0c392b h1:Dak5bYlqcDh3kUbmNZaV5ib+MykYuzAgPkWmtqkPj7U=
+github.com/smartcontractkit/chainlink-common v0.2.2-0.20240925011859-eac77b0c392b/go.mod h1:Jg1sCTsbxg76YByI8ifpFby3FvVqISStHT8ypy9ocmY=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45 h1:NBQLtqk8zsyY4qTJs+NElI3aDFTcAo83JHvqD04EvB0=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240710121324-3ed288aa9b45/go.mod h1:LV0h7QBQUpoC2UUi6TcUvcIFm1xjP/DtEcqV8+qeLUs=
 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240718160222-2dc0c8136bfa h1:g75H8oh2ws52s8BekwvGQ9XvBVu3E7WM1rfiA0PN0zk=

core/services/ocr2/delegate.go

@@ -11,19 +11,19 @@ import (
 
  "gopkg.in/guregu/null.v4"
 
- cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
- "github.com/smartcontractkit/chainlink-common/pkg/types/core"
- "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
-
  "github.com/ethereum/go-ethereum/common"
  "github.com/pkg/errors"
  "github.com/prometheus/client_golang/prometheus"
+ "google.golang.org/grpc"
+
  chainselectors "github.com/smartcontractkit/chain-selectors"
+ cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
+ "github.com/smartcontractkit/chainlink-common/pkg/types/core"
+ "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
  "github.com/smartcontractkit/libocr/commontypes"
  libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus"
  "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
  ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
- "google.golang.org/grpc"
 
  ocr2keepers20 "github.com/smartcontractkit/chainlink-automation/pkg/v2"
  ocr2keepers20config "github.com/smartcontractkit/chainlink-automation/pkg/v2/config"
@@ -41,7 +41,6 @@ import (
  llotypes "github.com/smartcontractkit/chainlink-common/pkg/types/llo"
  "github.com/smartcontractkit/chainlink-common/pkg/utils/mailbox"
  datastreamsllo "github.com/smartcontractkit/chainlink-data-streams/llo"
-
  "github.com/smartcontractkit/chainlink/v2/core/bridges"
  "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
  coreconfig "github.com/smartcontractkit/chainlink/v2/core/config"
@@ -52,8 +51,10 @@ import (
  "github.com/smartcontractkit/chainlink/v2/core/services/keystore/chaintype"
  "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ocr2key"
  "github.com/smartcontractkit/chainlink/v2/core/services/llo"
+ "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/ccipcommit"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/ccipexec"
+ ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/functions"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/generic"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/liquiditymanager"
@@ -63,7 +64,6 @@ import (
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/median"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/mercury"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper"
-
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/autotelemetry21"
  ocr2keeper21core "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/core"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/validate"
@@ -79,8 +79,6 @@ import (
  "github.com/smartcontractkit/chainlink/v2/core/services/synchronization"
  "github.com/smartcontractkit/chainlink/v2/core/services/telemetry"
  "github.com/smartcontractkit/chainlink/v2/plugins"
-
- ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"
 )
 
 type ErrJobSpecNoRelayer struct {
@@ -1730,12 +1728,29 @@ func (d *Delegate) ccipCommitGetSrcProvider(ctx context.Context, jb job.Job, plu
 }
 
 func (d *Delegate) newServicesCCIPExecution(ctx context.Context, lggr logger.SugaredLogger, jb job.Job, bootstrapPeers []commontypes.BootstrapperLocator, kb ocr2key.KeyBundle, ocrDB *db, lc ocrtypes.LocalConfig, transmitterID string) ([]job.ServiceCtx, error) {
+ if jb.OCR2OracleSpec == nil {
+ return nil, fmt.Errorf("spec is nil")
+ }
  spec := jb.OCR2OracleSpec
  if spec.Relay != relay.NetworkEVM {
  return nil, fmt.Errorf("non evm chains are not supported for CCIP execution")
  }
- dstRid, err := spec.RelayID()
+ var pluginJobSpecConfig ccipconfig.ExecPluginJobSpecConfig
+ err := json.Unmarshal(spec.PluginConfig.Bytes(), &pluginJobSpecConfig)
+ if err != nil {
+ return nil, err
+ }
 
+ if pluginJobSpecConfig.USDCConfig.AttestationAPI != "" {
+ err = pluginJobSpecConfig.USDCConfig.ValidateUSDCConfig()
+ }
+ if err != nil {
+ return nil, err
+ }
+
+ sourceTokenAddress := ccip.EvmAddrToGeneric(pluginJobSpecConfig.USDCConfig.SourceTokenAddress)
+
+ dstRid, err := spec.RelayID()
  if err != nil {
  return nil, ErrJobSpecNoRelayer{Err: err, PluginName: string(spec.PluginType)}
  }
@@ -1746,12 +1761,6 @@ func (d *Delegate) newServicesCCIPExecution(ctx context.Context, lggr logger.Sug
 
  // PROVIDER BASED ARG CONSTRUCTION
  // Write PluginConfig bytes to send source/dest relayer provider + info outside of top level rargs/pargs over the wire
- var pluginJobSpecConfig ccipconfig.ExecPluginJobSpecConfig
- err = json.Unmarshal(spec.PluginConfig.Bytes(), &pluginJobSpecConfig)
- if err != nil {
- return nil, err
- }
-
  dstChainID, err := strconv.ParseInt(dstRid.ChainID, 10, 64)
  if err != nil {
  return nil, err
@@ -1786,7 +1795,7 @@ func (d *Delegate) newServicesCCIPExecution(ctx context.Context, lggr logger.Sug
  MetricsRegisterer: prometheus.WrapRegistererWith(map[string]string{"job_name": jb.Name.ValueOrZero()}, prometheus.DefaultRegisterer),
  }
 
- return ccipexec.NewExecServices(ctx, lggr, jb, srcProvider, dstProvider, int64(srcChainID), dstChainID, d.isNewlyCreatedJob, oracleArgsNoPlugin2, logError)
+ return ccipexec.NewExecServices(ctx, lggr, d.cfg, jb, string(sourceTokenAddress), srcProvider, dstProvider, int64(srcChainID), dstChainID, d.isNewlyCreatedJob, oracleArgsNoPlugin2, logError)
 }
 
 func (d *Delegate) ccipExecGetDstProvider(ctx context.Context, jb job.Job, pluginJobSpecConfig ccipconfig.ExecPluginJobSpecConfig, transmitterID string) (types.CCIPExecProvider, error) {

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

@@ -8,17 +8,20 @@ import (
  "strings"
  "time"
 
+ "github.com/Masterminds/semver/v3"
+
+ commonlogger "github.com/smartcontractkit/chainlink-common/pkg/logger"
+ "github.com/smartcontractkit/chainlink/v2/core/logger"
+
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/pricegetter"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib"
 
- "github.com/Masterminds/semver/v3"
  "github.com/ethereum/go-ethereum/common"
  libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus"
  "go.uber.org/multierr"
 
  "github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 
- commonlogger "github.com/smartcontractkit/chainlink-common/pkg/logger"
  commontypes "github.com/smartcontractkit/chainlink-common/pkg/types"
 
  cciporm "github.com/smartcontractkit/chainlink/v2/core/services/ccip"
@@ -28,7 +31,6 @@ import (
 
  "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
  "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm"
- "github.com/smartcontractkit/chainlink/v2/core/logger"
  "github.com/smartcontractkit/chainlink/v2/core/services/job"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
  ccipconfig "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/config"

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

@@ -15,7 +15,7 @@ import (
  "github.com/smartcontractkit/chainlink-common/pkg/types"
  cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
 
- "github.com/smartcontractkit/chainlink/v2/core/logger"
+ "github.com/smartcontractkit/chainlink-common/pkg/logger"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/abihelpers"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
@@ -34,7 +34,7 @@ type BatchContext struct {
  report commitReportWithSendRequests
  inflight []InflightInternalExecutionReport
  inflightAggregateValue *big.Int
- lggr logger.Logger
+ lggr logger.SugaredLogger
  availableDataLen int
  availableGas uint64
  expectedNonces map[cciptypes.Address]uint64

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

@@ -4,6 +4,7 @@ import (
  "bytes"
  "context"
  "encoding/binary"
+
  "math"
  "math/big"
  "reflect"
@@ -14,10 +15,10 @@ import (
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/mock"
 
+ commonlogger "github.com/smartcontractkit/chainlink-common/pkg/logger"
  "github.com/smartcontractkit/chainlink-common/pkg/types"
  cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip"
  "github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
- "github.com/smartcontractkit/chainlink/v2/core/logger"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcalc"
  "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices"
@@ -802,7 +803,7 @@ func runBatchingStrategyTests(t *testing.T, strategy BatchingStrategy, available
  for _, tc := range testCases {
  tc := tc
  t.Run(tc.name, func(t *testing.T) {
- lggr := logger.TestLogger(t)
+ lggr := commonlogger.TestSugared(t)
 
  gasPriceEstimator := prices.NewMockGasPriceEstimatorExec(t)
  if !tc.skipGasPriceEstimator {