test: getblockpeer

lib/wallet/walletdb.js

@@ -72,6 +72,7 @@ class WalletDB extends EventEmitter {
     this.depth = 0;
     this.rescanning = false;
     this.filterSent = false;
+    this.isWitness = false;
 
     // Wallet read lock.
     this.readLock = new MapLock();
@@ -212,6 +213,9 @@ class WalletDB extends EventEmitter {
       id: 'primary'
     });
 
+    const account = await wallet.getAccount(wallet.wid);
+    this.isWitness = account.witness;
+
     const addr = await wallet.receiveAddress();
 
     this.logger.info(
@@ -591,7 +595,12 @@ class WalletDB extends EventEmitter {
     await piter.each(async (key) => {
       const [data] = layout.p.decode(key);
       if (data.length === 20) {
-        const address = Address.fromWitnessPubkeyhash(data);
+        let address = null;
+        if (this.isWitness)
+          address = Address.fromWitnessPubkeyhash(data);
+        else
+          address = Address.fromPubkeyhash(data);
+
         const script = Script.fromAddress(address);
         const match = filter.match(gcsKey, script.raw);
         if (match) {

test/wallet-neutrino-test.js

@@ -157,4 +157,12 @@ describe('wallet-neutrino', function() {
         assert(gcs.match(key, script.raw));
       }
     });
+
+    it('should getblockfrompeer', async () => {
+      for (let i = 21; i <= node2.chain.height; i++) {
+        const hash = await node2.chain.getHash(i);
+        const block = await node2.chain.getBlock(hash);
+        assert(block);
+      }
+    });
 });