Merge pull request #512 from pinheadmz/finalize2

txdb: fix lockedUnconfirmed if FINALIZE is inserted with block
handshake-org · Nov 22, 2020 · dd2cf3c · dd2cf3c
2 parents 25173cf + 0e7865c
commit dd2cf3c
Show file tree

Hide file tree

Showing 2 changed files with 255 additions and 85 deletions.
diff --git a/lib/wallet/txdb.js b/lib/wallet/txdb.js
@@ -960,10 +960,14 @@ class TXDB {
 
         // FINALIZE is a special case: locked coins _leave_ the wallet.
         if (tx.output(i) && tx.covenant(i).isFinalize()) {
-          if (!block)
+          if (!block) {
             state.ulocked(path, -tx.outputs[i].value);
-          else
+          } else {
             state.clocked(path, -tx.outputs[i].value);
+            // This is the first time we've seen this tx and it is in a block
+            // (probably from a rescan). Update unconfirmed locked balance also.
+            state.ulocked(path, -tx.outputs[i].value);
+          }
         }
 
         if (!block) {