Merge pull request #2469 from iotaledger/fix/block-chaining

Fix the block chaining if the tx was published on L1
iotaledger · May 12, 2023 · 621eafe · 621eafe
2 parents e1e3dbb + 0fc4e96
commit 621eafe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/nodeconn/nodeconn.go b/packages/nodeconn/nodeconn.go
@@ -555,7 +555,7 @@ func (nc *nodeConnection) checkReceivedTxPendingAndCancelPoW(block *iotago.Block
 			// check if the block was already referenced
 			if metadata.ReferencedByMilestoneIndex != 0 {
 				// block with the tracked tx already got referenced, we can abort attachment of the tx
-				pendingTx.SetPublished()
+				pendingTx.SetPublished(blockID)
 				break
 			}
 
@@ -568,7 +568,7 @@ func (nc *nodeConnection) checkReceivedTxPendingAndCancelPoW(block *iotago.Block
 
 			// block is solid and the quality of the tips seem fine
 			// => abort our own attachment
-			pendingTx.SetPublished()
+			pendingTx.SetPublished(blockID)
 			break
 		}
 	}()

diff --git a/packages/nodeconn/pending_tx.go b/packages/nodeconn/pending_tx.go
@@ -146,7 +146,11 @@ func (tx *pendingTransaction) propagateReattach() {
 	}
 }
 
-func (tx *pendingTransaction) SetPublished() {
+func (tx *pendingTransaction) SetPublished(blockID iotago.BlockID) {
+	// we can set the blockID of the pendingTransaction here, so the chaining will use the block that was published on L1.
+	// we can even overwrite this blockID several times if there are multiple blocks published with the same pendingTransaction on L1,
+	// since it doesn't matter where we attach our next Tx, as long as the chain structure is valid.
+	tx.SetBlockID(blockID)
 	tx.cancelCtxPublished()
 }