SPV Updates

lib/blockchain/chain.js

@@ -475,11 +475,6 @@ class Chain extends AsyncEmitter {
         100);
     }
 
-    // Skip all blocks in spv mode once
-    // we've verified the network target.
-    if (this.options.spv)
-      return this.state;
-
     // Ensure the timestamp is correct.
     const mtp = await this.getMedianTime(prev);
 
@@ -501,6 +496,11 @@ class Chain extends AsyncEmitter {
         true);
     }
 
+    // Skip all blocks in spv mode once
+    // we've verified the network target.
+    if (this.options.spv)
+      return this.state;
+
     // Calculate height of current block.
     const height = prev.height + 1;
 
@@ -1567,7 +1567,7 @@ class Chain extends AsyncEmitter {
       competitor.height
     );
 
-    await this.emitAsync('reorganize', tip, competitor);
+    await this.emitAsync('reorganize', tip, competitor, fork);
 
     return fork;
   }
@@ -1622,7 +1622,7 @@ class Chain extends AsyncEmitter {
     );
 
     // Treat as a reorganize event.
-    await this.emitAsync('reorganize', tip, last);
+    await this.emitAsync('reorganize', tip, last, fork);
   }
 
   /**
@@ -1652,7 +1652,7 @@ class Chain extends AsyncEmitter {
     // to the fork block, causing
     // us to redownload the blocks
     // on the new main chain.
-    await this._reset(fork.hash, true);
+    await this._reset(fork.hash);
 
     // Emit disconnection events now that
     // the chain has successfully reset.
@@ -1674,7 +1674,7 @@ class Chain extends AsyncEmitter {
       'Chain replay from height %d necessary.',
       fork.height);
 
-    return this.emitAsync('reorganize', tip, competitor);
+    return this.emitAsync('reorganize', tip, competitor, fork);
   }
 
   /**

lib/blockchain/chaindb.js

@@ -890,6 +890,8 @@ class ChainDB {
    */
 
   async prune() {
+    assert(!this.options.spv, 'Cannot prune chain in SPV mode.');
+
     const options = this.options;
     const keepBlocks = this.network.block.keepBlocks;
     const pruneAfter = this.network.block.pruneAfterHeight;
@@ -1831,7 +1833,8 @@ class ChainDB {
       this.del(layout.h.encode(tip.hash));
       this.del(layout.e.encode(tip.hash));
 
-      this.blocksBatch.pruneBlock(tip.hash);
+      if (this.blocks)
+        this.blocksBatch.pruneBlock(tip.hash);
 
       // Queue up hash to be removed
       // on successful write.

lib/node/fullnode.js

@@ -236,13 +236,13 @@ class FullNode extends Node {
       this.emit('disconnect', entry, block);
     });
 
-    this.chain.on('reorganize', async (tip, competitor) => {
+    this.chain.on('reorganize', async (tip, competitor, fork) => {
       try {
         await this.mempool._handleReorg();
       } catch (e) {
         this.error(e);
       }
-      this.emit('reorganize', tip, competitor);
+      this.emit('reorganize', tip, competitor, fork);
     });
 
     this.chain.on('reset', async (tip) => {

lib/node/spvnode.js

@@ -151,8 +151,8 @@ class SPVNode extends Node {
       this.emit('disconnect', entry, block);
     });
 
-    this.chain.on('reorganize', (tip, competitor) => {
-      this.emit('reorganize', tip, competitor);
+    this.chain.on('reorganize', (tip, competitor, fork) => {
+      this.emit('reorganize', tip, competitor, fork);
     });
 
     this.chain.on('reset', (tip) => {