feat: add idempotency key support to prevent duplicate CCV verification processing

carte7000 · carte7000 · commit fa9f4fe64303 · 2025-10-30T14:30:26.000-04:00
Updates aggregator database schema, API validation, and storage layer to use idempotency_key for deduplication instead of verification_timestamp. Modifies verifier pipeline to generate and propagate idempotency keys through the CCVDataWithIdempotencyKey paired struct from source readers to storage operations.
diff --git a/aggregator/migrations/postgres/00001_create_all_tables.sql b/aggregator/migrations/postgres/00001_create_all_tables.sql
@@ -16,8 +16,9 @@ CREATE TABLE IF NOT EXISTS commit_verification_records (
     signature_s BYTEA NOT NULL DEFAULT '',
     ccv_node_data BYTEA NOT NULL,
     verification_timestamp BIGINT NOT NULL,
+    idempotency_key TEXT NOT NULL,
     created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    CONSTRAINT unique_verification UNIQUE (message_id, committee_id, signer_address, verification_timestamp)
+    CONSTRAINT unique_verification UNIQUE (message_id, committee_id, signer_address, idempotency_key)
 );
 
 CREATE TABLE IF NOT EXISTS commit_aggregated_reports (
diff --git a/aggregator/pkg/handlers/validations.go b/aggregator/pkg/handlers/validations.go
@@ -12,7 +12,8 @@ import (
 func validateWriteRequest(req *pb.WriteCommitCCVNodeDataRequest) error {
 	err := validation.ValidateStruct(
 		req,
-		validation.Field(&req.CcvNodeData, validation.Required))
+		validation.Field(&req.CcvNodeData, validation.Required),
+		validation.Field(&req.IdempotencyKey, validation.Required, validation.Length(1, 255)))
 	if err != nil {
 		return err
 	}
diff --git a/aggregator/pkg/handlers/write_commit_ccv_data.go b/aggregator/pkg/handlers/write_commit_ccv_data.go
@@ -71,6 +71,7 @@ func (h *WriteCommitCCVNodeDataHandler) Handle(ctx context.Context, req *pb.Writ
 			MessageWithCCVNodeData: *req.GetCcvNodeData(),
 			IdentifierSigner:       signer,
 			CommitteeID:            signer.CommitteeID,
+			IdempotencyKey:         req.GetIdempotencyKey(),
 		}
 		err := h.storage.SaveCommitVerification(signerCtx, &record)
 		if err != nil {
diff --git a/aggregator/pkg/model/commit_verification_record.go b/aggregator/pkg/model/commit_verification_record.go
@@ -26,7 +26,8 @@ func (c CommitVerificationRecordIdentifier) ToIdentifier() string {
 type CommitVerificationRecord struct {
 	IdentifierSigner *IdentifierSigner
 	pb.MessageWithCCVNodeData
-	CommitteeID CommitteeID
+	CommitteeID    CommitteeID
+	IdempotencyKey string
 }
 
 // GetID retrieves the unique identifier for the commit verification record.
diff --git a/aggregator/pkg/storage/postgres/database_storage.go b/aggregator/pkg/storage/postgres/database_storage.go
@@ -142,9 +142,9 @@ func (d *DatabaseStorage) SaveCommitVerification(ctx context.Context, record *mo
 
 	stmt := `INSERT INTO commit_verification_records 
 		(message_id, committee_id, participant_id, signer_address, source_chain_selector, dest_chain_selector, 
-		 onramp_address, offramp_address, signature_r, signature_s, ccv_node_data, verification_timestamp) 
-		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
-		ON CONFLICT (message_id, committee_id, signer_address, verification_timestamp) 
+		 onramp_address, offramp_address, signature_r, signature_s, ccv_node_data, verification_timestamp, idempotency_key) 
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
+		ON CONFLICT (message_id, committee_id, signer_address, idempotency_key) 
 		DO NOTHING`
 
 	ccvNodeData, err := proto.Marshal(&record.MessageWithCCVNodeData)
@@ -174,6 +174,7 @@ func (d *DatabaseStorage) SaveCommitVerification(ctx context.Context, record *mo
 		record.IdentifierSigner.SignatureS[:],
 		ccvNodeData,
 		record.Timestamp,
+		record.IdempotencyKey,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to save commit verification record: %w", err)
diff --git a/aggregator/pkg/storage/postgres/database_storage_test.go b/aggregator/pkg/storage/postgres/database_storage_test.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/google/uuid"
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
@@ -181,7 +182,8 @@ func createTestCommitVerificationRecord(msgWithCCV *pb.MessageWithCCVNodeData, s
 			SignatureS:  s32,
 			CommitteeID: committeeID,
 		},
-		CommitteeID: committeeID,
+		CommitteeID:    committeeID,
+		IdempotencyKey: uuid.NewString(), // Generate unique idempotency key for each record
 	}
 }
 
diff --git a/aggregator/tests/commit_verification_api_test.go b/aggregator/tests/commit_verification_api_test.go
diff --git a/aggregator/tests/fixture.go b/aggregator/tests/fixture.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-ccv/aggregator/pkg/model"
@@ -179,3 +180,19 @@ func NewMessageWithCCVNodeData(t *testing.T, message *protocol.Message, sourceVe
 	}
 	return ccvNodeData
 }
+
+// NewWriteCommitCCVNodeDataRequest creates a new WriteCommitCCVNodeDataRequest with a generated idempotency key.
+func NewWriteCommitCCVNodeDataRequest(ccvNodeData *pb.MessageWithCCVNodeData) *pb.WriteCommitCCVNodeDataRequest {
+	return &pb.WriteCommitCCVNodeDataRequest{
+		CcvNodeData:    ccvNodeData,
+		IdempotencyKey: uuid.New().String(),
+	}
+}
+
+// NewWriteCommitCCVNodeDataRequestWithKey creates a new WriteCommitCCVNodeDataRequest with a specific idempotency key.
+func NewWriteCommitCCVNodeDataRequestWithKey(ccvNodeData *pb.MessageWithCCVNodeData, idempotencyKey string) *pb.WriteCommitCCVNodeDataRequest {
+	return &pb.WriteCommitCCVNodeDataRequest{
+		CcvNodeData:    ccvNodeData,
+		IdempotencyKey: idempotencyKey,
+	}
+}
diff --git a/build/devenv/go.mod b/build/devenv/go.mod
@@ -32,7 +32,7 @@ require (
 require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/smartcontractkit/chainlink-ccv v0.0.0-00010101000000-000000000000
-	github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251028171604-3c9144b4db13
+	github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251030133409-21ff07fff5e9
 	github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.1
 	google.golang.org/grpc v1.76.0
 )
diff --git a/build/devenv/go.sum b/build/devenv/go.sum
@@ -1024,8 +1024,8 @@ github.com/smartcontractkit/chainlink-deployments-framework v0.56.0 h1:VkzslEC/a
 github.com/smartcontractkit/chainlink-deployments-framework v0.56.0/go.mod h1:ObH5HJ4yXzTmQLc6Af+ufrTVcQ+ocasHJ0YBZjw5ZCM=
 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250826201006-c81344a26fc3 h1:mJP6yJq2woOZchX0KvhLiKxDPaS0Vy4vTDFH4nnFkXs=
 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250826201006-c81344a26fc3/go.mod h1:3Lsp38qxen9PABVF+O5eocveQev+hyo9HLAgRodBD4Q=
-github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251028171604-3c9144b4db13 h1:kbOA8/t8Eq+T70d4jCbuPjDCQAulnaOBnymtm6eR1ts=
-github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251028171604-3c9144b4db13/go.mod h1:KJkb85Mfxr/2vjPvAWWpq0/QJMAP1Bts1wMWWhRn4/E=
+github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251030133409-21ff07fff5e9 h1:vyj6oNj3cifQzg7jI/UCC59h8q3yPUzxnq3/lwrBMtc=
+github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251030133409-21ff07fff5e9/go.mod h1:KJkb85Mfxr/2vjPvAWWpq0/QJMAP1Bts1wMWWhRn4/E=
 github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8=
 github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
 github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
diff --git a/go.mod b/go.mod
@@ -40,7 +40,7 @@ require (
 	github.com/smartcontractkit/chainlink-deployments-framework v0.56.0
 	github.com/smartcontractkit/chainlink-evm v0.3.3
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20250826201006-c81344a26fc3
-	github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251028171604-3c9144b4db13
+	github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251030133409-21ff07fff5e9
 	github.com/smartcontractkit/chainlink-testing-framework/framework v0.10.33
 	github.com/stretchr/testify v1.11.1
 	github.com/testcontainers/testcontainers-go v0.39.0
diff --git a/go.sum b/go.sum
@@ -750,8 +750,8 @@ github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-23
 github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
 github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d h1:pTYIcsWHTMG5fAcbRUA8Qk5yscXKdSpopQ0DUEOjPik=
 github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d/go.mod h1:2JTBNp3FlRdO/nHc4dsc9bfxxMClMO1Qt8sLJgtreBY=
-github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251028171604-3c9144b4db13 h1:kbOA8/t8Eq+T70d4jCbuPjDCQAulnaOBnymtm6eR1ts=
-github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251028171604-3c9144b4db13/go.mod h1:KJkb85Mfxr/2vjPvAWWpq0/QJMAP1Bts1wMWWhRn4/E=
+github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251030133409-21ff07fff5e9 h1:vyj6oNj3cifQzg7jI/UCC59h8q3yPUzxnq3/lwrBMtc=
+github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251030133409-21ff07fff5e9/go.mod h1:KJkb85Mfxr/2vjPvAWWpq0/QJMAP1Bts1wMWWhRn4/E=
 github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2 h1:1/KdO5AbUr3CmpLjMPuJXPo2wHMbfB8mldKLsg7D4M8=
 github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2/go.mod h1:jUC52kZzEnWF9tddHh85zolKybmLpbQ1oNA4FjOHt1Q=
 github.com/smartcontractkit/chainlink-protos/job-distributor v0.13.1 h1:PWwLGimBt37eDzpbfZ9V/ZkW4oCjcwKjKiAwKlSfPc0=
diff --git a/integration/pkg/sourcereader/evm_source_reader.go b/integration/pkg/sourcereader/evm_source_reader.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/google/uuid"
 
 	"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/onramp"
 	"github.com/smartcontractkit/chainlink-ccv/protocol"
@@ -305,9 +306,10 @@ func (r *EVMSourceReader) VerificationTasks(ctx context.Context, fromBlock, toBl
 
 		// Create verification task
 		results = append(results, verifiertypes.VerificationTask{
-			Message:      *decodedMsg,
-			ReceiptBlobs: receiptBlobs,
-			BlockNumber:  log.BlockNumber,
+			Message:        *decodedMsg,
+			ReceiptBlobs:   receiptBlobs,
+			BlockNumber:    log.BlockNumber,
+			IdempotencyKey: uuid.NewString(),
 		})
 	}
 	return results, nil
diff --git a/integration/storageaccess/aggregator_adapter.go b/integration/storageaccess/aggregator_adapter.go
@@ -46,7 +46,7 @@ func mapReceiptBlobs(receiptBlobs []protocol.ReceiptWithBlob) ([]*pb.ReceiptBlob
 	return result, nil
 }
 
-func mapCCVDataToCCVNodeDataProto(ccvData protocol.CCVData) (*pb.WriteCommitCCVNodeDataRequest, error) {
+func mapCCVDataToCCVNodeDataProto(ccvData protocol.CCVData, idempotencyKey string) (*pb.WriteCommitCCVNodeDataRequest, error) {
 	receiptBlobs, err := mapReceiptBlobs(ccvData.ReceiptBlobs)
 	if err != nil {
 		return nil, err
@@ -81,14 +81,19 @@ func mapCCVDataToCCVNodeDataProto(ccvData protocol.CCVData) (*pb.WriteCommitCCVN
 			},
 			ReceiptBlobs: receiptBlobs,
 		},
+		IdempotencyKey: idempotencyKey, // Use provided idempotency key
 	}, nil
 }
 
 // WriteCCVNodeData writes CCV data to the aggregator via gRPC.
-func (a *AggregatorWriter) WriteCCVNodeData(ctx context.Context, ccvDataList []protocol.CCVData) error {
+func (a *AggregatorWriter) WriteCCVNodeData(ctx context.Context, ccvDataList []protocol.CCVData, idempotencyKeys []string) error {
+	if len(ccvDataList) != len(idempotencyKeys) {
+		return fmt.Errorf("ccvDataList and idempotencyKeys must have the same length: got %d and %d", len(ccvDataList), len(idempotencyKeys))
+	}
+
 	a.lggr.Info("Storing CCV data using aggregator ", "count", len(ccvDataList))
-	for _, ccvData := range ccvDataList {
-		req, err := mapCCVDataToCCVNodeDataProto(ccvData)
+	for i, ccvData := range ccvDataList {
+		req, err := mapCCVDataToCCVNodeDataProto(ccvData, idempotencyKeys[i])
 		if err != nil {
 			return err
 		}
diff --git a/protocol/message_types.go b/protocol/message_types.go
@@ -397,7 +397,8 @@ type QueryResponse struct {
 // CCVNodeDataWriter defines the interface for verifiers to store CCV node data.
 type CCVNodeDataWriter interface {
 	// WriteCCVNodeData stores multiple CCV node data entries in the offchain storage
-	WriteCCVNodeData(ctx context.Context, ccvDataList []CCVData) error
+	// idempotencyKeys should have the same length as ccvDataList, with each key corresponding to the CCVData at the same index
+	WriteCCVNodeData(ctx context.Context, ccvDataList []CCVData, idempotencyKeys []string) error
 }
 
 // OffchainStorageWriter defines the interface for verifiers to store CCV data.
diff --git a/verifier/commit/verifier.go b/verifier/commit/verifier.go
@@ -77,7 +77,7 @@ func (cv *Verifier) ValidateMessage(message protocol.Message) error {
 // VerifyMessages verifies a batch of messages using the new chain-agnostic format.
 // It processes tasks concurrently and adds results directly to the batcher.
 // Returns a BatchResult containing any verification errors that occurred.
-func (cv *Verifier) VerifyMessages(ctx context.Context, tasks []verifier.VerificationTask, ccvDataBatcher *batcher.Batcher[protocol.CCVData]) batcher.BatchResult[verifier.VerificationError] {
+func (cv *Verifier) VerifyMessages(ctx context.Context, tasks []verifier.VerificationTask, ccvDataBatcher *batcher.Batcher[verifier.CCVDataWithIdempotencyKey]) batcher.BatchResult[verifier.VerificationError] {
 	if len(tasks) == 0 {
 		return batcher.BatchResult[verifier.VerificationError]{Items: nil, Error: nil}
 	}
@@ -117,7 +117,7 @@ func (cv *Verifier) VerifyMessages(ctx context.Context, tasks []verifier.Verific
 
 // verifyMessage verifies a single message (internal helper)
 // Returns an error if verification fails, nil if successful.
-func (cv *Verifier) verifyMessage(ctx context.Context, verificationTask verifier.VerificationTask, ccvDataBatcher *batcher.Batcher[protocol.CCVData]) error {
+func (cv *Verifier) verifyMessage(ctx context.Context, verificationTask verifier.VerificationTask, ccvDataBatcher *batcher.Batcher[verifier.CCVDataWithIdempotencyKey]) error {
 	start := time.Now()
 	message := verificationTask.Message
 
@@ -182,8 +182,12 @@ func (cv *Verifier) verifyMessage(ctx context.Context, verificationTask verifier
 		return fmt.Errorf("failed to create CCV data for message 0x%x: %w", messageID, err)
 	}
 
-	// Add CCVData directly to batcher
-	if err := ccvDataBatcher.Add(*ccvData); err != nil {
+	// Add CCVData with idempotency key to batcher
+	ccvDataWithKey := verifier.CCVDataWithIdempotencyKey{
+		CCVData:        *ccvData,
+		IdempotencyKey: verificationTask.IdempotencyKey,
+	}
+	if err := ccvDataBatcher.Add(ccvDataWithKey); err != nil {
 		return fmt.Errorf("failed to add CCV data to batcher for message 0x%x (nonce: %d, source chain: %d): %w", messageID, message.Nonce, message.SourceChainSelector, err)
 	}
 
diff --git a/verifier/interfaces.go b/verifier/interfaces.go
@@ -27,7 +27,7 @@ type MessageSigner interface {
 type Verifier interface {
 	// VerifyMessages performs verification of a batch of messages, adding successful results to the batcher.
 	// Returns a BatchResult containing any verification errors that occurred.
-	VerifyMessages(ctx context.Context, tasks []VerificationTask, ccvDataBatcher *batcher.Batcher[protocol.CCVData]) batcher.BatchResult[VerificationError]
+	VerifyMessages(ctx context.Context, tasks []VerificationTask, ccvDataBatcher *batcher.Batcher[CCVDataWithIdempotencyKey]) batcher.BatchResult[VerificationError]
 }
 
 // SourceReader defines the interface for reading CCIP messages from source chains.
diff --git a/verifier/pkg/common/inmemory_storage.go b/verifier/pkg/common/inmemory_storage.go
@@ -104,7 +104,7 @@ func (s *InMemoryOffchainStorage) WaitForStore(ctx context.Context) error {
 }
 
 // WriteCCVNodeData stores multiple CCV data entries in the offchain storage.
-func (s *InMemoryOffchainStorage) WriteCCVNodeData(ctx context.Context, ccvDataList []protocol.CCVData) error {
+func (s *InMemoryOffchainStorage) WriteCCVNodeData(ctx context.Context, ccvDataList []protocol.CCVData, idempotencyKeys []string) error {
 	if len(ccvDataList) == 0 {
 		return nil
 	}
@@ -385,5 +385,7 @@ type WriterOnlyView struct {
 }
 
 func (w *WriterOnlyView) WriteCCVData(ctx context.Context, ccvDataList []protocol.CCVData) error {
-	return w.storage.WriteCCVNodeData(ctx, ccvDataList)
+	// Generate empty idempotency keys for in-memory storage (they are not used)
+	idempotencyKeys := make([]string, len(ccvDataList))
+	return w.storage.WriteCCVNodeData(ctx, ccvDataList, idempotencyKeys)
 }
diff --git a/verifier/pkg/common/inmemory_storage_test.go b/verifier/pkg/common/inmemory_storage_test.go
@@ -2,6 +2,7 @@ package common
 
 import (
 	"context"
+	"fmt"
 	"sort"
 	"testing"
 	"time"
@@ -12,6 +13,15 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 )
 
+// generateIdempotencyKeys creates test idempotency keys for a given number of items.
+func generateIdempotencyKeys(count int, prefix string) []string {
+	keys := make([]string, count)
+	for i := range keys {
+		keys[i] = fmt.Sprintf("%s-key-%d", prefix, i)
+	}
+	return keys
+}
+
 func createTestMessage(t *testing.T, nonce protocol.Nonce, sourceChainSelector, destChainSelector protocol.ChainSelector) protocol.Message {
 	// Create empty token transfer
 	tokenTransfer := protocol.NewEmptyTokenTransfer()
@@ -92,7 +102,7 @@ func TestInMemoryOffchainStorage_WriteCCVNodeData(t *testing.T) {
 	}
 
 	// Write data
-	err := storage.WriteCCVNodeData(ctx, testData)
+	err := storage.WriteCCVNodeData(ctx, testData, generateIdempotencyKeys(len(testData), "test"))
 	require.NoError(t, err)
 
 	// Retrieve and verify
@@ -142,7 +152,7 @@ func TestInMemoryOffchainStorage_GetCCVDataByTimestamp(t *testing.T) {
 		}
 
 		// Store first data at baseTime
-		err := storage.WriteCCVNodeData(ctx, testData1)
+		err := storage.WriteCCVNodeData(ctx, testData1, generateIdempotencyKeys(len(testData1), "test1"))
 		require.NoError(t, err)
 
 		// Update time provider for second batch
@@ -162,7 +172,7 @@ func TestInMemoryOffchainStorage_GetCCVDataByTimestamp(t *testing.T) {
 			},
 		}
 
-		err = storage.WriteCCVNodeData(ctx, testData2)
+		err = storage.WriteCCVNodeData(ctx, testData2, generateIdempotencyKeys(len(testData2), "test2"))
 		require.NoError(t, err)
 
 		// Update time provider for third batch
@@ -182,7 +192,7 @@ func TestInMemoryOffchainStorage_GetCCVDataByTimestamp(t *testing.T) {
 			},
 		}
 
-		err = storage.WriteCCVNodeData(ctx, testData3)
+		err = storage.WriteCCVNodeData(ctx, testData3, generateIdempotencyKeys(len(testData3), "test3"))
 		require.NoError(t, err)
 
 		return storage
@@ -308,7 +318,7 @@ func TestInMemoryOffchainStorage_GetCCVDataByMessageID(t *testing.T) {
 	}
 
 	// Store data
-	err := storage.WriteCCVNodeData(ctx, testData)
+	err := storage.WriteCCVNodeData(ctx, testData, generateIdempotencyKeys(len(testData), "test"))
 	require.NoError(t, err)
 
 	// Test finding existing message
@@ -362,10 +372,10 @@ func TestInMemoryOffchainStorage_MultipleVerifiers(t *testing.T) {
 	}
 
 	// Write data for both verifiers
-	err := storage.WriteCCVNodeData(ctx, data1)
+	err := storage.WriteCCVNodeData(ctx, data1, generateIdempotencyKeys(len(data1), "test1"))
 	require.NoError(t, err)
 
-	err = storage.WriteCCVNodeData(ctx, data2)
+	err = storage.WriteCCVNodeData(ctx, data2, generateIdempotencyKeys(len(data2), "test2"))
 	require.NoError(t, err)
 
 	// Verify verifier1 data
@@ -401,7 +411,7 @@ func TestInMemoryOffchainStorage_Clear(t *testing.T) {
 		},
 	}
 
-	err := storage.WriteCCVNodeData(ctx, testData)
+	err := storage.WriteCCVNodeData(ctx, testData, generateIdempotencyKeys(len(testData), "test"))
 	require.NoError(t, err)
 
 	// Verify data exists
@@ -431,7 +441,7 @@ func TestInMemoryOffchainStorage_EmptyData(t *testing.T) {
 	ctx := context.Background()
 
 	// Write empty data should not error
-	err := storage.WriteCCVNodeData(ctx, []protocol.CCVData{})
+	err := storage.WriteCCVNodeData(ctx, []protocol.CCVData{}, []string{})
 	require.NoError(t, err)
 
 	// Get data for non-existent verifier
@@ -462,7 +472,7 @@ func TestInMemoryOffchainStorage_TimestampHandling(t *testing.T) {
 		},
 	}
 
-	err := storage.WriteCCVNodeData(ctx, testData)
+	err := storage.WriteCCVNodeData(ctx, testData, generateIdempotencyKeys(len(testData), "test"))
 	require.NoError(t, err)
 
 	// Verify data was stored - timestamp is managed internally by storage entries
@@ -552,7 +562,7 @@ func setupReaderWithMessagesfunc(t *testing.T, baseTime int64, numMessages int,
 		}
 
 		// Store first data at baseTime
-		err := storage.WriteCCVNodeData(t.Context(), testData1)
+		err := storage.WriteCCVNodeData(t.Context(), testData1, generateIdempotencyKeys(len(testData1), "test1"))
 		require.NoError(t, err)
 	}
 
@@ -654,7 +664,7 @@ func TestEmptyReadsAndReadAfterEmpty(t *testing.T) {
 				Message:               createTestMessage(t, 100, 1, 2),
 			},
 		}
-		err := storage.WriteCCVNodeData(t.Context(), testData1)
+		err := storage.WriteCCVNodeData(t.Context(), testData1, generateIdempotencyKeys(len(testData1), "test1"))
 		require.NoError(t, err)
 
 		// Next read should return the new message
diff --git a/verifier/types.go b/verifier/types.go
diff --git a/verifier/verification_coordinator.go b/verifier/verification_coordinator.go
diff --git a/verifier/verification_coordinator_finality_test.go b/verifier/verification_coordinator_finality_test.go

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ func (h WriteCommitCCVNodeDataHandler) Handle(ctx context.Context, req pb.Writ`
`71`	`71`	`MessageWithCCVNodeData: *req.GetCcvNodeData(),`
`72`	`72`	`IdentifierSigner: signer,`
`73`	`73`	`CommitteeID: signer.CommitteeID,`
	`74`	`+ IdempotencyKey: req.GetIdempotencyKey(),`
`74`	`75`	`}`
`75`	`76`	`err := h.storage.SaveCommitVerification(signerCtx, &record)`
`76`	`77`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ func (c CommitVerificationRecordIdentifier) ToIdentifier() string {`
`26`	`26`	`type CommitVerificationRecord struct {`
`27`	`27`	`IdentifierSigner *IdentifierSigner`
`28`	`28`	`pb.MessageWithCCVNodeData`
`29`		`- CommitteeID CommitteeID`
	`29`	`+ CommitteeID CommitteeID`
	`30`	`+ IdempotencyKey string`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`// GetID retrieves the unique identifier for the commit verification record.`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ require (`
`32`	`32`	`require (`
`33`	`33`	`github.com/gorilla/websocket v1.5.3`
`34`	`34`	`github.com/smartcontractkit/chainlink-ccv v0.0.0-00010101000000-000000000000`
`35`		`- github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251028171604-3c9144b4db13`
	`35`	`+ github.com/smartcontractkit/chainlink-protos/chainlink-ccv/go v0.0.0-20251030133409-21ff07fff5e9`
`36`	`36`	`github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.1`
`37`	`37`	`google.golang.org/grpc v1.76.0`
`38`	`38`	`)`