From 18a4355c4fdfa926d9ffabe9aff14dd141406b26 Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 5 Jan 2024 10:22:29 -0500 Subject: [PATCH] improve deepCopy methods --- common/txmgr/inmemory_store.go | 67 +++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/common/txmgr/inmemory_store.go b/common/txmgr/inmemory_store.go index 64c7868ade6..fc83c8a5a2e 100644 --- a/common/txmgr/inmemory_store.go +++ b/common/txmgr/inmemory_store.go @@ -1608,11 +1608,66 @@ func (ms *InMemoryStore[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) MarkO return errs } -func (ms *InMemoryStore[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) deepCopyTx(tx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]) *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE] { - // TODO: COMPLETE DEEP COPY WORK - etx := *tx - etx.TxAttempts = make([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], len(tx.TxAttempts)) - copy(etx.TxAttempts, tx.TxAttempts) +func (ms *InMemoryStore[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) deepCopyTx( + tx *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], +) *txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE] { + copyTx := txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]{ + ID: tx.ID, + IdempotencyKey: tx.IdempotencyKey, + Sequence: tx.Sequence, + FromAddress: tx.FromAddress, + ToAddress: tx.ToAddress, + EncodedPayload: make([]byte, len(tx.EncodedPayload)), + Value: *new(big.Int).Set(&tx.Value), + FeeLimit: tx.FeeLimit, + Error: tx.Error, + BroadcastAt: tx.BroadcastAt, + InitialBroadcastAt: tx.InitialBroadcastAt, + CreatedAt: tx.CreatedAt, + State: tx.State, + TxAttempts: make([]txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], len(tx.TxAttempts)), + Meta: tx.Meta, + Subject: tx.Subject, + ChainID: tx.ChainID, + PipelineTaskRunID: tx.PipelineTaskRunID, + MinConfirmations: tx.MinConfirmations, + TransmitChecker: tx.TransmitChecker, + SignalCallback: tx.SignalCallback, + CallbackCompleted: tx.CallbackCompleted, + } + + // Copy the EncodedPayload + copy(copyTx.EncodedPayload, tx.EncodedPayload) + + // Copy the TxAttempts + for i, attempt := range tx.TxAttempts { + copyTx.TxAttempts[i] = ms.deepCopyTxAttempt(copyTx, attempt) + } + + return ©Tx +} - return &etx +func (ms *InMemoryStore[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, R, SEQ, FEE]) deepCopyTxAttempt( + tx txmgrtypes.Tx[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], + attempt txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE], +) txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE] { + copyAttempt := txmgrtypes.TxAttempt[CHAIN_ID, ADDR, TX_HASH, BLOCK_HASH, SEQ, FEE]{ + ID: attempt.ID, + TxID: attempt.TxID, + Tx: tx, + TxFee: attempt.TxFee, + ChainSpecificFeeLimit: attempt.ChainSpecificFeeLimit, + SignedRawTx: make([]byte, len(attempt.SignedRawTx)), + Hash: attempt.Hash, + CreatedAt: attempt.CreatedAt, + BroadcastBeforeBlockNum: attempt.BroadcastBeforeBlockNum, + State: attempt.State, + Receipts: make([]txmgrtypes.ChainReceipt[TX_HASH, BLOCK_HASH], len(attempt.Receipts)), + TxType: attempt.TxType, + } + + copy(copyAttempt.SignedRawTx, attempt.SignedRawTx) + copy(copyAttempt.Receipts, attempt.Receipts) + + return copyAttempt }