wallet: fix http time tx queries

lib/wallet/http.js

@@ -24,6 +24,7 @@ const KeyRing = require('../primitives/keyring');
 const Mnemonic = require('../hd/mnemonic');
 const HDPrivateKey = require('../hd/private');
 const HDPublicKey = require('../hd/public');
+const util = require('../utils/util');
 const common = require('./common');
 
 /**
@@ -769,9 +770,15 @@ class HTTP extends Server {
       const acct = valid.str('account');
       const reverse = valid.bool('reverse', false);
       const limit = valid.u32('limit', 100);
-
       const after = valid.brhash('after');
-      const time = valid.u32('time');
+      let time = valid.u32('time');
+      let date = valid.str('date');
+
+      if (date && !time) {
+        date = new Date(date);
+        enforce(date.toString() !== 'Invalid Date', 'Invalid date.');
+        time = util.time(date);
+      }
 
       enforce(limit <= this.options.maxTxs,
               `Limit above max of ${this.options.maxTxs}.`);
@@ -814,7 +821,14 @@ class HTTP extends Server {
       const reverse = valid.bool('reverse');
       const limit = valid.u32('limit');
       const after = valid.brhash('after');
-      const time = valid.u32('time');
+      let time = valid.u32('time');
+      let date = valid.str('date');
+
+      if (date && !time) {
+        date = new Date(date);
+        enforce(date.toString() !== 'Invalid Date', 'Invalid date.');
+        time = util.time(date);
+      }
 
       enforce(limit <= this.options.maxTxs,
               `Limit above max of ${this.options.maxTxs}.`);

lib/wallet/rpc.js

@@ -1280,8 +1280,7 @@ class RPC extends RPCBase {
                          `Limit above max of ${this.maxTxs}.`);
 
     const date = new Date(timestamp);
-    /* eslint eqeqeq: "off" */
-    if (date == 'Invalid Date')
+    if (date.toString() === 'Invalid Date')
       throw new RPCError(errs.INVALID_PARAMETER, 'Invalid timestamp.');
 
     const time = util.time(date);
@@ -1370,8 +1369,7 @@ class RPC extends RPCBase {
       throw new RPCError(errs.INVALID_PARAMETER, 'Limit above max of 100.');
 
     const date = new Date(timestamp);
-    /* eslint eqeqeq: "off" */
-    if (date == 'Invalid Date')
+    if (date.toString() === 'Invalid Date')
       throw new RPCError(errs.INVALID_PARAMETER, 'Invalid timestamp.');
 
     const time = util.time(date);

lib/wallet/txdb.js

@@ -1846,24 +1846,40 @@ class TXDB {
 
     let max = null;
     let min = null;
+    let parse = null;
 
-    if (options.reverse) {
-      min = layout.G.min();
-      max = layout.G.max(acct, options.time);
+    if (acct !== -1) {
+      if (options.reverse) {
+        min = layout.G.min();
+        max = layout.G.max(acct, options.time);
+      } else {
+        min = layout.G.min(acct, options.time);
+        max = layout.G.max();
+      }
+      parse = (key) => {
+        const [,,hash] = layout.G.decode(key);
+        return hash;
+      }
     } else {
-      min = layout.G.min(acct, options.time);
-      max = layout.G.max();
+      if (options.reverse) {
+        min = layout.g.min();
+        max = layout.g.max(options.time);
+      } else {
+        min = layout.g.min(options.time);
+        max = layout.g.max();
+      }
+      parse = (key) => {
+        const [,hash] = layout.g.decode(key);
+        return hash;
+      }
     }
 
     const keys = await this.bucket.keys({
       gte: min,
       lte: max,
       limit: 1,
       reverse: options.reverse,
-      parse: (key) => {
-        const [,,hash] = layout.G.decode(key);
-        return hash;
-      }
+      parse: parse
     });
 
     const txid = keys.length > 0 ? keys[0] : null;
@@ -2049,24 +2065,40 @@ class TXDB {
 
     let max = null;
     let min = null;
+    let parse = null;
 
-    if (options.reverse) {
-      min = layout.W.min();
-      max = layout.W.max(acct, options.time);
+    if (acct !== -1) {
+      if (options.reverse) {
+        min = layout.W.min();
+        max = layout.W.max(acct, options.time);
+      } else {
+        min = layout.W.min(acct, options.time);
+        max = layout.W.max();
+      }
+      parse = (key) => {
+        const [,,hash] = layout.W.decode(key);
+        return hash;
+      }
     } else {
-      min = layout.W.min(acct, options.time);
-      max = layout.W.max();
+      if (options.reverse) {
+        min = layout.w.min();
+        max = layout.w.max(options.time);
+      } else {
+        min = layout.w.min(options.time);
+        max = layout.w.max();
+      }
+      parse = (key) => {
+        const [,hash] = layout.w.decode(key);
+        return hash;
+      }
     }
 
     const keys = await this.bucket.keys({
       gte: min,
       lte: max,
       limit: 1,
       reverse: options.reverse,
-      parse: (key) => {
-        const [,,hash] = layout.W.decode(key);
-        return hash;
-      }
+      parse: parse
     });
 
     const txid = keys.length > 0 ? keys[0] : null;

test/wallet-http-test.js

@@ -20,6 +20,7 @@ const {
 const testPrefix = '/tmp/bcoin-fullnode';
 const spvTestPrefix = '/tmp/bcoin-spvnode';
 const genesisTime = 1534965859;
+const genesisDate = new Date(genesisTime * 1000);
 
 const ports = {
   full: {
@@ -40,6 +41,8 @@ describe('Wallet TX HTTP Pagination', function() {
   let node, spvnode, wallet = null;
   let nclient, wclient, spvwclient = null;
   let coinbase = null;
+  let unconfirmedTime = null;
+  let unconfirmedDate = null;
 
   before(async () => {
     await rimraf(testPrefix);
@@ -77,11 +80,14 @@ describe('Wallet TX HTTP Pagination', function() {
       blocks: 125
     });
 
+    // Generate unconfirmed transactions for the
+    // fullnode and spv wallet
+    unconfirmedTime = Math.floor(Date.now() / 1000);
+    unconfirmedDate = new Date(unconfirmedTime * 1000);
+
     // TODO remove this
     await sleep(5000);
 
-    // Generate unconfirmed transactions for the
-    // fullnode and spv wallet
     await generateTxs({
       wclient,
       spvwclient,
@@ -174,6 +180,26 @@ describe('Wallet TX HTTP Pagination', function() {
         assert.strictEqual(two[49].confirmations, 125);
         assert.notStrictEqual(two[0].hash, one[99].hash);
       });
+
+      it('with datetime (MTP in ISO 8601)', async () => {
+        const history = await wclient.get('/wallet/test/tx/history', {
+          limit: 100,
+          date: new Date(),
+          reverse: true
+        });
+        assert.strictEqual(history.length, 100);
+        assert(history[0].confirmations < history[99].confirmations);
+      });
+
+      it('with datetime (MTP in epoch seconds)', async () => {
+        const history = await wclient.get('/wallet/test/tx/history', {
+          limit: 100,
+          time: Math.ceil(Date.now() / 1000),
+          reverse: true
+        });
+        assert.strictEqual(history.length, 100);
+        assert(history[0].confirmations < history[99].confirmations);
+      });
     });
 
     describe('confirmed txs (asc)', function() {
@@ -211,6 +237,26 @@ describe('Wallet TX HTTP Pagination', function() {
         assert.strictEqual(two[11].confirmations, 102);
         assert.notStrictEqual(two[0].hash, one[11].hash);
       });
+
+      it('with datetime (MTP in ISO 8601)', async () => {
+        const history = await wclient.get('/wallet/test/tx/history', {
+          limit: 100,
+          date: genesisDate.toString(),
+          reverse: false
+        });
+        assert.strictEqual(history.length, 100);
+        assert(history[0].confirmations > history[99].confirmations);
+      });
+
+      it('with datetime (MTP in epoch seconds)', async () => {
+        const history = await wclient.get('/wallet/test/tx/history', {
+          limit: 100,
+          time: genesisTime,
+          reverse: false
+        });
+        assert.strictEqual(history.length, 100);
+        assert(history[0].confirmations > history[99].confirmations);
+      });
     });
 
     describe('unconfirmed txs (dsc)', function() {
@@ -254,6 +300,26 @@ describe('Wallet TX HTTP Pagination', function() {
 
         assert.notStrictEqual(two[0].hash, one[3].hash);
       });
+
+      it('with datetime (MTP in ISO 8601)', async () => {
+        const history = await wclient.get('/wallet/test/tx/unconfirmed', {
+          limit: 100,
+          date: new Date(Date.now() + 2000),
+          reverse: true
+        });
+        assert.strictEqual(history.length, 19);
+        assert(history[0].mtime > history[18].mtime);
+      });
+
+      it('with datetime (MTP in epoch seconds)', async () => {
+        const history = await wclient.get('/wallet/test/tx/unconfirmed', {
+          limit: 100,
+          time: Math.ceil((Date.now() + 2000) / 1000),
+          reverse: true
+        });
+        assert.strictEqual(history.length, 19);
+        assert(history[0].mtime > history[18].mtime);
+      });
     });
 
     describe('unconfirmed txs (asc)', function() {
@@ -307,6 +373,28 @@ describe('Wallet TX HTTP Pagination', function() {
 
         assert.notStrictEqual(two[0].hash, one[3].hash);
       });
+
+      it('with datetime (MTP in ISO 8601)', async () => {
+        const history = await wclient.get('/wallet/test/tx/unconfirmed', {
+          limit: 100,
+          date: unconfirmedDate.toString(),
+          reverse: false
+        });
+        // TODO
+        //assert.strictEqual(history.length, 19);
+        assert(history[0].mtime < history[10].mtime);
+      });
+
+      it('with datetime (MTP in epoch seconds)', async () => {
+        const history = await wclient.get('/wallet/test/tx/unconfirmed', {
+          limit: 100,
+          time: unconfirmedTime,
+          reverse: false
+        });
+        // TODO
+        // assert.strictEqual(history.length, 19);
+        assert(history[0].mtime < history[10].mtime);
+      });
     });
   });