From 426495344be1370f15025c744fb0253a014f5958 Mon Sep 17 00:00:00 2001
From: FelixFan1992 <fankejin@gmail.com>
Date: Tue, 28 May 2024 18:28:10 -0400
Subject: [PATCH] update

---
 core/services/ocrcommon/transmitter.go |  5 -----
 core/services/relay/evm/ocr2keeper.go  | 13 -------------
 2 files changed, 18 deletions(-)

diff --git a/core/services/ocrcommon/transmitter.go b/core/services/ocrcommon/transmitter.go
index c89e9ea204d..3fc648e6409 100644
--- a/core/services/ocrcommon/transmitter.go
+++ b/core/services/ocrcommon/transmitter.go
@@ -124,12 +124,7 @@ func (t *transmitter) CreateEthTransaction(ctx context.Context, toAddress common
 		return errors.Wrap(err, "skipped OCR transmission, error getting round-robin address")
 	}
 
-	var key *string
-	if txMeta.UpkeepID != nil {
-		key = txMeta.UpkeepID
-	}
 	_, err = t.txm.CreateTransaction(ctx, txmgr.TxRequest{
-		IdempotencyKey:   key,
 		FromAddress:      roundRobinFromAddress,
 		ToAddress:        toAddress,
 		EncodedPayload:   payload,
diff --git a/core/services/relay/evm/ocr2keeper.go b/core/services/relay/evm/ocr2keeper.go
index a2eac46cc8d..c016529120b 100644
--- a/core/services/relay/evm/ocr2keeper.go
+++ b/core/services/relay/evm/ocr2keeper.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/google/uuid"
 	"github.com/pkg/errors"
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil"
@@ -179,18 +178,6 @@ func (t *ocr3keeperProviderContractTransmitter) Transmit(
 	reportWithInfo ocr3types.ReportWithInfo[plugin.AutomationReportInfo],
 	aoss []ocrtypes.AttributedOnchainSignature,
 ) error {
-
-	// for zk chains, the batch size should be set to 1 in order to figure out which upkeep is responsible for a possible
-	// overflown tx
-	if len(reportWithInfo.Info.UpkeepIDs) == 1 {
-		id := uuid.New()
-		uid := reportWithInfo.Info.UpkeepIDs[0]
-		err := t.txStatusStore.SaveTxInfo(id, uid)
-		if err != nil {
-			t.lggr.Errorf("failed to save tx info into tx status key %s for upkeep ID %s due to %s", id.String(), uid, err.Error())
-		}
-	}
-
 	return t.contractTransmitter.Transmit(
 		ctx,
 		ocrtypes.ReportContext{