wallet: switch zap to new indexes.

lib/wallet/txdb.js

@@ -4127,7 +4127,6 @@ class TXDB {
 
   /**
    * Zap pending transactions older than `age`.
-   * @deprecated - Update
    * @param {Number} acct
    * @param {Number} age - Age delta.
    * @returns {Promise<Hash[]>} - zapped tx hashes.
@@ -4137,26 +4136,27 @@ class TXDB {
     assert((age >>> 0) === age);
 
     const now = this.nowFn();
+    const options = {
+      time: now - age,
+      limit: Math.min(100, this.maxTxs),
+      reverse: true
+    };
 
-    const txs = await this.getRange(acct, {
-      start: 0,
-      end: now - age
-    });
+    let txs = await this.listUnconfirmedByTime(acct, options);
 
     const hashes = [];
 
-    for (const wtx of txs) {
-      if (wtx.height !== -1)
-        continue;
-
-      assert(now - wtx.mtime >= age);
+    while (txs.length) {
+      for (const wtx of txs) {
+        this.logger.debug('Zapping TX: %h (%d)',
+                          wtx.hash, this.wid);
 
-      this.logger.debug('Zapping TX: %x (%d)',
-        wtx.tx.hash(), this.wid);
+        await this.remove(wtx.hash);
 
-      await this.remove(wtx.hash);
+        hashes.push(wtx.hash);
+      }
 
-      hashes.push(wtx.hash);
+      txs = await this.listUnconfirmedByTime(acct, options);
     }
 
     return hashes;

test/wallet-test.js

@@ -3680,7 +3680,7 @@ describe('Wallet', function() {
     });
   });
 
-  describe('Zap Wallet', function () {
+  describe('Wallet Zap', function () {
     const DEFAULT = 'default';
     const ALT = 'alt';