Merge branch 'master' into 5-electrum-tx-data

package.json

@@ -17,7 +17,7 @@
     "test": "npm run lint && npm run test-v3",
     "lint": "standard --env mocha --fix",
     "test-v3": "export NETWORK=mainnet && nyc --reporter=text mocha --timeout 60000 test/v3/",
-    "test:temp": "export NETWORK=mainnet && mocha --timeout 25000 test/v3/a01-electrumx.js",
+    "test:temp": "export NETWORK=mainnet && mocha --timeout 25000 test/v3/util.js",
     "test:integration": "mocha test/v3/integration",
     "test:integration:slpdb": "mocha --timeout 25000 test/v3/integration/slp*.js",
     "coverage": "nyc report --reporter=text-lcov | coveralls",

src/routes/v3/electrumx.js

@@ -1076,7 +1076,9 @@ class Electrum {
       const address = _this.bitcore.Address.fromString(addrStr)
       // console.log(`address: ${address}`)
 
-      const script = _this.bitcore.Script.buildPublicKeyHashOut(address)
+      const script = address.isPayToPublicKeyHash()
+        ? _this.bitcore.Script.buildPublicKeyHashOut(address)
+        : _this.bitcore.Script.buildScriptHashOut(address)
       // console.log(`script: ${script}`)
 
       const scripthash = _this.bitcore.crypto.Hash.sha256(script.toBuffer())

test/v3/a01-electrumx.js

@@ -117,7 +117,7 @@ describe('#ElectrumX Router', () => {
   })
 
   describe('#addressToScripthash', () => {
-    it('should accurately return a scripthash', () => {
+    it('should accurately return a scripthash for a P2PKH address', () => {
       const addr = 'bitcoincash:qpr270a5sxphltdmggtj07v4nskn9gmg9yx4m5h7s4'
 
       const scripthash = electrumxRoute.addressToScripthash(addr)
@@ -127,6 +127,17 @@ describe('#ElectrumX Router', () => {
 
       assert.equal(scripthash, expectedOutput)
     })
+
+    it('should accurately return a scripthash for a P2SH address', () => {
+      const addr = 'bitcoincash:pz0z7u9p96h2p6hfychxdrmwgdlzpk5luc5yks2wxq'
+
+      const scripthash = electrumxRoute.addressToScripthash(addr)
+
+      const expectedOutput =
+        '8bc2235c8e7d5634d9ec429fc0171f2c58e728d4f1e2fb7e440e313133cfa4f0'
+
+      assert.equal(scripthash, expectedOutput)
+    })
   })
 
   describe('#_utxosFromElectrumx', () => {

test/v3/util.js

@@ -135,11 +135,12 @@ describe('#Util', () => {
       // Mock the RPC call for unit tests.
       if (process.env.TEST === 'unit') {
         nock(`${process.env.RPC_BASEURL}`)
-          .post(uri => uri.includes('/'))
+          .post((uri) => uri.includes('/'))
           .reply(200, { result: mockData.mockAddress })
       }
 
-      req.params.address = 'bitcoincash:qpujxqra3jmdlzzapwmmt7uspr7q0c9ff5hzljcrnd'
+      req.params.address =
+        'bitcoincash:qpujxqra3jmdlzzapwmmt7uspr7q0c9ff5hzljcrnd'
 
       const result = await validateAddress(req, res)
       // console.log(`result: ${util.inspect(result)}`)
@@ -255,7 +256,7 @@ describe('#Util', () => {
       // Mock the RPC call for unit tests.
       if (process.env.TEST === 'unit') {
         nock(`${process.env.RPC_BASEURL}`)
-          .post(uri => uri.includes('/'))
+          .post((uri) => uri.includes('/'))
           .reply(200, { result: mockData.mockAddress })
       }
 
@@ -281,7 +282,7 @@ describe('#Util', () => {
       // Mock the RPC call for unit tests.
       if (process.env.TEST === 'unit') {
         nock(`${process.env.RPC_BASEURL}`)
-          .post(uri => uri.includes('/'))
+          .post((uri) => uri.includes('/'))
           .times(2)
           .reply(200, { result: mockData.mockAddress })
       }
@@ -356,17 +357,11 @@ describe('#Util', () => {
         // Mock the RPC call for unit tests.
 
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'balanceFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'balanceFromBlockbook')
           .resolves(mockData.mockBalance)
 
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'utxosFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'utxosFromBlockbook')
           .resolves(mockData.mockUtxos)
 
         sandbox
@@ -389,51 +384,41 @@ describe('#Util', () => {
 
         assert.equal(result, 'test-txid')
       })
-    }
 
-    it('should return balance if balance-only is true', async () => {
-      // Mock the RPC call for unit tests.
-      if (process.env.TEST === 'unit') {
+      it('should return balance if balance-only is true', async () => {
+        // Mock the RPC call for unit tests.
+
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'balanceFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'balanceFromBlockbook')
           .resolves(mockData.mockBalance)
-      }
 
-      // Mock sendRawTransaction() so that the hex does not actually get broadcast
-      // to the network.
-      sandbox
-        .stub(utilRouteInst.bchjs.RawTransactions, 'sendRawTransaction')
-        .resolves('test-txid')
+        // Mock sendRawTransaction() so that the hex does not actually get broadcast
+        // to the network.
+        sandbox
+          .stub(utilRouteInst.bchjs.RawTransactions, 'sendRawTransaction')
+          .resolves('test-txid')
 
-      req.body = {
-        wif: 'L5GEFg1tETLWBugmhSo9Zc4ms968qVmfmTroDxsJ982AiudAQGyt',
-        balanceOnly: true
-      }
+        req.body = {
+          wif: 'L5GEFg1tETLWBugmhSo9Zc4ms968qVmfmTroDxsJ982AiudAQGyt',
+          balanceOnly: true
+        }
 
-      const result = await utilRouteInst.sweepWif(req, res)
-      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+        const result = await utilRouteInst.sweepWif(req, res)
+        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
 
-      assert.isNumber(result)
-    })
+        assert.isNumber(result)
+      })
+    }
 
     // Unit tests only
     if (process.env.TEST === 'unit') {
       it('should generate transaction for valid BCH-only sweep', async () => {
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'balanceFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'balanceFromBlockbook')
           .resolves(mockData.mockBalance)
 
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'utxosFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'utxosFromBlockbook')
           .resolves(mockData.mockUtxos)
 
         // Force token utxo to appear as regular BCH utxo.
@@ -460,17 +445,11 @@ describe('#Util', () => {
 
       it('should throw 422 error if no non-token UTXOs', async () => {
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'balanceFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'balanceFromBlockbook')
           .resolves(mockData.mockBalance)
 
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'utxosFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'utxosFromBlockbook')
           .resolves(mockData.mockUtxos)
 
         // Force token utxo to appear as regular BCH utxo.
@@ -502,17 +481,11 @@ describe('#Util', () => {
 
       it('should detect and throw error for multiple token classes', async () => {
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'balanceFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'balanceFromBlockbook')
           .resolves(mockData.mockBalance)
 
         sandbox
-          .stub(
-            utilRouteInst.blockbook,
-            'utxosFromBlockbook'
-          )
+          .stub(utilRouteInst.blockbook, 'utxosFromBlockbook')
           .resolves(mockData.mockThreeUtxos)
 
         // Force token utxo to appear as regular BCH utxo.