From 920e9a8e001f07226475da1ff4addaa22099854a Mon Sep 17 00:00:00 2001
From: nogo <0xnogo@gmail.com>
Date: Fri, 28 Jun 2024 11:54:16 +0200
Subject: [PATCH] passing along txManager

---
 .../services/ocr2/plugins/ccip/ccipexec/factory.go |  3 ++-
 core/services/relay/evm/evm.go                     | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/services/ocr2/plugins/ccip/ccipexec/factory.go b/core/services/ocr2/plugins/ccip/ccipexec/factory.go
index 18cf3d22a1..282e59f76a 100644
--- a/core/services/ocr2/plugins/ccip/ccipexec/factory.go
+++ b/core/services/ocr2/plugins/ccip/ccipexec/factory.go
@@ -13,6 +13,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata"
+	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/statuschecker"
 )
 
 type ExecutionReportingPluginFactory struct {
@@ -120,7 +121,7 @@ func (rf *ExecutionReportingPluginFactory) NewReportingPluginFn(config types.Rep
 			batchingStrategy = &BestEffortBatchingStrategy{}
 		case 1:
 			batchingStrategy = &ZKOverflowBatchingStrategy{
-				// statuschecker: statuschecker.NewTransactionStatusChecker(rf.config.txManager), // TODO: uncomment after TXM changes merged + chainlink merged
+				statuschecker: statuschecker.NewTxmStatusChecker(rf.config.txManager),
 			}
 		default:
 			batchingStrategy = &BestEffortBatchingStrategy{} // Default strategy
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index 7203c142f2..22099b0de7 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -16,6 +16,7 @@ import (
 	"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"
+	cciptransmitter "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/transmitter"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
@@ -53,6 +54,7 @@ import (
 	reportcodecv2 "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v2/reportcodec"
 	reportcodecv3 "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/v3/reportcodec"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/wsrpc"
+	statuschecker "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/statuschecker"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types"
 )
 
@@ -804,6 +806,18 @@ func newOnChainContractTransmitter(ctx context.Context, lggr logger.Logger, rarg
 			configWatcher.chain.ID(),
 			ethKeystore,
 		)
+	case commontypes.CCIPExecution:
+		transmitter, err = cciptransmitter.NewTransmitterWithStatusChecker(
+			configWatcher.chain.TxManager(),
+			fromAddresses,
+			gasLimit,
+			effectiveTransmitterAddress,
+			strategy,
+			checker,
+			configWatcher.chain.ID(),
+			ethKeystore,
+			statuschecker.NewTxmStatusChecker(configWatcher.chain.TxManager()),
+		)
 	default:
 		transmitter, err = ocrcommon.NewTransmitter(
 			configWatcher.chain.TxManager(),