scanInputBlock passing only id now, tests fixed

Author: kushti

src/main/scala/org/ergoplatform/nodeView/ErgoNodeViewHolder.scala

@@ -378,7 +378,7 @@ abstract class ErgoNodeViewHolder[State <: ErgoState[State]](settings: ErgoSetti
             val updMp = memoryPool().removeWithDoubleSpends(txs)
             updateNodeView(updatedMempool = Some(updMp))
 
-            val newVault = vault().scanInputBlock(id, txs)
+            val newVault = vault().scanInputBlock(id)
             updateNodeView(updatedVault = Some(newVault))
           case None =>
         }

src/main/scala/org/ergoplatform/nodeView/wallet/ErgoWallet.scala

@@ -46,8 +46,8 @@ class ErgoWallet(historyReader: ErgoHistoryReader, settings: ErgoSettings, param
     this
   }
 
-  def scanInputBlock(inputBlockId: ModifierId, txs: Seq[ErgoTransaction]): ErgoWallet = {
-    walletActor ! ScanInputBlock(inputBlockId, txs)
+  def scanInputBlock(inputBlockId: ModifierId): ErgoWallet = {
+    walletActor ! ScanInputBlock(inputBlockId)
     this
   }
 

src/main/scala/org/ergoplatform/nodeView/wallet/ErgoWalletActor.scala

@@ -236,36 +236,41 @@ class ErgoWalletActor(settings: ErgoSettings,
       val newState = state.copy(offChainRegistry = newOffChainRegistry)
       context.become(loadedWallet(newState))
 
-    case ScanInputBlock(inputBlockId, txs) =>
+    case ScanInputBlock(inputBlockId) =>
       if (state.inputBlockIds.contains(inputBlockId)) {
         log.warn(s"Ignoring duplicate ScanInputBlock for $inputBlockId")
       } else {
-        val dustLimit = settings.walletSettings.dustLimit
-
-        // Process all transactions atomically and record the net diff for rollback support
-        val (finalRegistry, allAdded, allRemovedOffChain, allRemovedOnChain) =
-          txs.foldLeft(
-            (state.offChainRegistry, Seq.empty[TrackedBox], Seq.empty[TrackedBox], Seq.empty[Balance])
-          ) { case ((registry, addedAcc, removedOffAcc, removedOnAcc), tx) =>
-            val newWalletBoxes = WalletScanLogic.extractWalletOutputs(tx, None, state.walletVars, dustLimit)
-            val inputs = WalletScanLogic.extractInputBoxes(tx)
-            val (newRegistry, removedOff, removedOn) =
-              registry.updateOnTransactionWithDiff(newWalletBoxes, inputs, state.walletVars.externalScans)
-            (newRegistry, addedAcc ++ newWalletBoxes, removedOffAcc ++ removedOff, removedOnAcc ++ removedOn)
-          }
+        historyReader.getInputBlockTransactions(inputBlockId) match {
+          case Some(txs) =>
+            val dustLimit = settings.walletSettings.dustLimit
+
+            // Process all transactions atomically and record the net diff for rollback support
+            val (finalRegistry, allAdded, allRemovedOffChain, allRemovedOnChain) =
+              txs.foldLeft(
+                (state.offChainRegistry, Seq.empty[TrackedBox], Seq.empty[TrackedBox], Seq.empty[Balance])
+              ) { case ((registry, addedAcc, removedOffAcc, removedOnAcc), tx) =>
+                val newWalletBoxes = WalletScanLogic.extractWalletOutputs(tx, None, state.walletVars, dustLimit)
+                val inputs = WalletScanLogic.extractInputBoxes(tx)
+                val (newRegistry, removedOff, removedOn) =
+                  registry.updateOnTransactionWithDiff(newWalletBoxes, inputs, state.walletVars.externalScans)
+                (newRegistry, addedAcc ++ newWalletBoxes, removedOffAcc ++ removedOff, removedOnAcc ++ removedOn)
+              }
 
-        val diff = InputBlockDiff(allAdded, allRemovedOffChain, allRemovedOnChain)
-        val registryWithDiff = finalRegistry.copy(
-          inputBlockDiffs = finalRegistry.inputBlockDiffs + (inputBlockId -> diff)
-        )
-
-        val newInputBlockIds = state.inputBlockIds :+ inputBlockId
-        val baseState = state.copy(
-          offChainRegistry = registryWithDiff,
-          inputBlockIds = newInputBlockIds
-        )
-        val newState = ergoWalletService.updateUtxoState(baseState, historyReader)
-        context.become(loadedWallet(newState))
+            val diff = InputBlockDiff(allAdded, allRemovedOffChain, allRemovedOnChain)
+            val registryWithDiff = finalRegistry.copy(
+              inputBlockDiffs = finalRegistry.inputBlockDiffs + (inputBlockId -> diff)
+            )
+
+            val newInputBlockIds = state.inputBlockIds :+ inputBlockId
+            val baseState = state.copy(
+              offChainRegistry = registryWithDiff,
+              inputBlockIds = newInputBlockIds
+            )
+            val newState = ergoWalletService.updateUtxoState(baseState, historyReader)
+            context.become(loadedWallet(newState))
+          case None =>
+            log.warn(s"No transactions found for input block $inputBlockId")
+        }
       }
 
     case RollbackInputBlock(inputBlockId) =>
@@ -274,11 +279,12 @@ class ErgoWalletActor(settings: ErgoSettings,
       // we must rollback the target block AND all blocks that were added after it.
       val keepIndex = state.inputBlockIds.indexOf(inputBlockId)
       val (newInputBlockIds, newRegistry) = if (keepIndex >= 0) {
-        val blocksToRollback = state.inputBlockIds.drop(keepIndex)
+        val rolledBackIds = state.inputBlockIds.drop(keepIndex)
         // Rollback in reverse chronological order (last block first) to maintain consistency
-        val rolledBackRegistry = blocksToRollback.reverse.foldLeft(state.offChainRegistry) { (reg, blockId) =>
+        val rolledBackRegistry = rolledBackIds.reverse.foldLeft(state.offChainRegistry) { (reg, blockId) =>
           reg.rollbackInputBlock(blockId)
         }
+        log.info(s"Rolled back input blocks: ${rolledBackIds.mkString(", ")}")
         (state.inputBlockIds.take(keepIndex), rolledBackRegistry)
       } else {
         // Block not found, nothing to rollback

src/main/scala/org/ergoplatform/nodeView/wallet/ErgoWalletActorMessages.scala

@@ -44,7 +44,7 @@ object ErgoWalletActorMessages {
    */
   final case class ScanOffChain(tx: ErgoTransaction)
 
-  final case class ScanInputBlock(inputBlockId: ModifierId, txs: Seq[ErgoTransaction])
+  final case class ScanInputBlock(inputBlockId: ModifierId)
 
   /**
     * Rollback changes from a specific input block

src/main/scala/org/ergoplatform/nodeView/wallet/persistence/OffChainRegistry.scala

@@ -39,11 +39,10 @@ object InputBlockDiff {
   * Unlike regular mempool transactions, input blocks are explicitly tracked with
   * reversible diffs to support rollback without rebuilding the entire offchain state.
   *
-  * When input block transactions are confirmed on-chain (via `ScanOnChain`), the wallet:
-  *
-  *   - Removes the confirmed transactions from `inputBlockTxs` (see `ErgoWalletActor`)
-  *   - The on-chain scan process naturally updates `onChainBalances` via `updateOnBlock`
-  *   - Off-chain boxes that became on-chain are cleaned from `offChainBoxes`
+   * When input block transactions are confirmed on-chain (via `ScanOnChain`), the wallet:
+   *
+   *   - The on-chain scan process naturally updates `onChainBalances` via `updateOnBlock`
+   *   - Off-chain boxes that became on-chain are cleaned from `offChainBoxes`
   *
   * The wallet digest (balance) is computed as:
   *   `sum(offChainBoxes) + sum(onChainBalances)`