rpc: update node rpc validateaddress

This PR updates the node rpc validateaddress to
better seperate the wallet and the node. The rpc
was returning ismine and iswatch only. These values
were moved to the wallet rpc method getaddressinfo.
This corresponds to a change in bitcoind and bcoin.

The updated validateaddress rpc returns the values:

- isvalid
- address
- ismine
- iswatchonly
- isscript
- isspendable
- witness_version
- witness_program

See PR in bcoin: bcoin-org/bcoin#731
See PR in bitcoind: bitcoin/bitcoin#10583

Author: Mark Tyneway

lib/node/rpc.js

@@ -2094,8 +2094,10 @@ class RPC extends RPCBase {
     return {
       isvalid: true,
       address: addr.toString(this.network),
-      ismine: false,
-      iswatchonly: false
+      isscript: addr.isScripthash(),
+      isspendable: !addr.isUnspendable(),
+      witness_version: addr.version,
+      witness_program: addr.hash.toString('hex')
     };
   }
 

test/http-test.js

@@ -8,6 +8,7 @@ const consensus = require('../lib/protocol/consensus');
 const Address = require('../lib/primitives/address');
 const Outpoint = require('../lib/primitives/outpoint');
 const MTX = require('../lib/primitives/mtx');
+const Script = require('../lib/script/script');
 const FullNode = require('../lib/node/fullnode');
 const pkg = require('../lib/pkg');
 const Network = require('../lib/protocol/network');
@@ -250,9 +251,62 @@ describe('HTTP', function() {
     ]);
     assert.deepStrictEqual(json, {
       isvalid: true,
+      isscript: false,
+      isspendable: true,
       address: addr.toString(node.network),
-      ismine: false,
-      iswatchonly: false
+      witness_program: addr.hash.toString('hex'),
+      witness_version: addr.version
+    });
+  });
+
+  it('should not validate invalid address', async () => {
+    const json = await nclient.execute('validateaddress', [
+      addr.toString('main')
+    ]);
+    assert.deepStrictEqual(json, {
+      isvalid: false
+    });
+  });
+
+  it('should validate a p2wsh address', async () => {
+    const pubkeys = [];
+    for (let i = 0; i < 2; i++) {
+      const result = await wallet.createAddress('default');
+      pubkeys.push(Buffer.from(result.publicKey, 'hex'));
+    }
+
+    const script = Script.fromMultisig(2, 2, pubkeys);
+    const address = Address.fromScript(script);
+
+    const json = await nclient.execute('validateaddress', [
+      address.toString(node.network)
+    ]);
+
+    assert.deepStrictEqual(json, {
+      address: address.toString(node.network),
+      isscript: true,
+      isspendable: true,
+      isvalid: true,
+      witness_version: address.version,
+      witness_program: address.hash.toString('hex')
+    });
+  });
+
+  it('should validate a null address', async () => {
+    const data = Buffer.from('foobar', 'ascii');
+    const nullAddr = Address.fromNulldata(data);
+
+    const json = await nclient.execute('validateaddress', [
+      nullAddr.toString(node.network)
+    ]);
+
+    assert.deepStrictEqual(json, {
+      address: nullAddr.toString(node.network),
+      isscript: false,
+      isspendable: false,
+      isvalid: true,
+      witness_version: nullAddr.version,
+      witness_program: nullAddr.hash.toString('hex')
     });
   });
 

test/node-test.js

@@ -511,10 +511,12 @@ describe('Node', function() {
     }, {});
 
     assert.deepStrictEqual(json.result, {
-      isvalid: true,
       address: addr.toString(node.network),
-      ismine: false,
-      iswatchonly: false
+      isvalid: true,
+      isscript: false,
+      isspendable: true,
+      witness_version: addr.version,
+      witness_program: addr.hash.toString('hex')
     });
   });