Hook to TransactionMetadata OnRejected to capture conflicting reason …

…correctly
iotaledger · Nov 8, 2023 · 02fb2f7 · 02fb2f7
1 parent e01553a
commit 02fb2f7
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/pkg/retainer/retainer/retainer.go b/pkg/retainer/retainer/retainer.go
@@ -87,14 +87,6 @@ func NewProvider() module.Provider[*engine.Engine, retainer.Retainer] {
 			r.RetainBlockFailure(b.ID(), apimodels.BlockFailureDroppedDueToCongestion)
 		})
 
-		e.Events.SpendDAG.SpendRejected.Hook(func(spendID iotago.TransactionID) {
-			txMetadata, exist := e.Ledger.MemPool().TransactionMetadata(spendID)
-			if !exist {
-				return
-			}
-			r.RetainTransactionFailure(txMetadata.EarliestIncludedAttachment(), iotago.ErrTxConflicting)
-		}, asyncOpt)
-
 		e.HookInitialized(func() {
 			e.Ledger.MemPool().OnSignedTransactionAttached(func(signedTransactionMetadata mempool.SignedTransactionMetadata) {
 				attachment := signedTransactionMetadata.Attachments()[0]
@@ -116,6 +108,10 @@ func NewProvider() module.Provider[*engine.Engine, retainer.Retainer] {
 						r.RetainTransactionFailure(attachment, err)
 					})
 
+					transactionMetadata.OnRejected(func() {
+						r.RetainTransactionFailure(attachment, iotago.ErrTxConflicting)
+					})
+
 					transactionMetadata.OnAccepted(func() {
 						attachmentID := transactionMetadata.EarliestIncludedAttachment()
 						if slot := attachmentID.Slot(); slot > 0 {