Merge pull request #1175 from chaotixkilla/fix-btc-wallet-creation

Fix BTC wallet creation

lib/blockchain/common.js

@@ -23,8 +23,6 @@ module.exports = {
 
 const BINARIES = {
   BTC: {
-    defaultUrl: 'https://bitcoincore.org/bin/bitcoin-core-0.20.1/bitcoin-0.20.1-x86_64-linux-gnu.tar.gz',
-    defaultDir: 'bitcoin-0.20.1/bin',
     url: 'https://bitcoincore.org/bin/bitcoin-core-22.0/bitcoin-22.0-x86_64-linux-gnu.tar.gz',
     dir: 'bitcoin-22.0/bin'
   },
@@ -56,7 +54,7 @@ const BINARIES = {
   }
 }
 
-const coinsUpdateDependent = ['BTC']
+const coinsUpdateDependent = []
 
 function firewall (ports) {
   if (!ports || ports.length === 0) throw new Error('No ports supplied')

lib/plugins/common/json-rpc.js

@@ -41,11 +41,11 @@ function fetch (account = {}, method, params) {
       return r.data.result
     })
     .catch(err => {
-      throw new Error(_.join(' ', [
+      throw new Error(JSON.stringify({
-        'json-rpc::axios error:',
+        responseMessage: _.get('message', err),
-        JSON.stringify(_.get('message', err, '')),
+        message: _.get('response.data.error.message', err),
-        JSON.stringify(_.get('response.data.error', err, ''))
+        code: _.get('response.data.error.code', err)
-      ]))
+      }))
     })
 }
 

lib/plugins/wallet/bitcoincashd/bitcoincashd.js

@@ -14,6 +14,16 @@ function fetch (method, params) {
   return jsonRpc.fetch(rpcConfig, method, params)
 }
 
+function errorHandle (e) {
+  const err = JSON.parse(e.message)
+  switch (err.code) {
+    case -6:
+      throw new E.InsufficientFundsError()
+    default:
+      throw e
+  }
+}
+
 function checkCryptoCode (cryptoCode) {
   if (cryptoCode !== 'BCH') return Promise.reject(new Error('Unsupported crypto: ' + cryptoCode))
   return Promise.resolve()
@@ -50,10 +60,7 @@ function sendCoins (account, tx, settings, operatorId) {
         txid: pickedObj.txid
       }
     })
-    .catch(err => {
+    .catch(errorHandle)
-      if (err.code === -6) throw new E.InsufficientFundsError()
-      throw err
-    })
 }
 
 function newAddress (account, info, tx, settings, operatorId) {

lib/plugins/wallet/bitcoind/bitcoind.js

@@ -17,21 +17,55 @@ function fetch (method, params) {
   return jsonRpc.fetch(rpcConfig, method, params)
 }
 
+function errorHandle (e) {
+  const err = JSON.parse(e.message)
+  switch (err.code) {
+    case -4:
+      return loadWallet()
+    case -5:
+      return logger.error(`${err}`)
+    case -6:
+      throw new E.InsufficientFundsError()
+    case -18:
+      return createWallet()
+    case -35:
+      // Wallet is already loaded, just return
+      return
+    default:
+      throw e
+  }
+}
+
 function checkCryptoCode (cryptoCode) {
   if (cryptoCode !== 'BTC') return Promise.reject(new Error('Unsupported crypto: ' + cryptoCode))
-  return Promise.resolve()
+  return Promise.resolve().then(loadWallet)
+}
+
+function createWallet () {
+  return fetch('createwallet', ['wallet'])
+    .then(loadWallet)
+}
+
+function loadWallet () {
+  return fetch('loadwallet', ['wallet', true])
+    // Catching the error here to suppress error code -35
+    // This improves UX on the initial wallet load and serves as error sink
+    // for wallet creation/loading related issues before actual business logic runs
+    .catch(errorHandle)
 }
 
 function accountBalance (cryptoCode) {
   return checkCryptoCode(cryptoCode)
     .then(() => fetch('getwalletinfo'))
     .then(({ balance }) => new BN(balance).shiftedBy(unitScale).decimalPlaces(0))
+    .catch(errorHandle)
 }
 
 function accountUnconfirmedBalance (cryptoCode) {
   return checkCryptoCode(cryptoCode)
     .then(() => fetch('getwalletinfo'))
     .then(({ unconfirmed_balance: balance }) => new BN(balance).shiftedBy(unitScale).decimalPlaces(0))
+    .catch(errorHandle)
 }
 
 // We want a balance that includes all spends (0 conf) but only deposits that
@@ -75,10 +109,7 @@ function sendCoins (account, tx, settings, operatorId, feeMultiplier) {
         txid: pickedObj.txid
       }
     })
-    .catch(err => {
+    .catch(errorHandle)
-      if (err.code === -6) throw new E.InsufficientFundsError()
-      throw err
-    })
 }
 
 function sendCoinsBatch (account, txs, cryptoCode, feeMultiplier) {
@@ -98,20 +129,19 @@ function sendCoinsBatch (account, txs, cryptoCode, feeMultiplier) {
       fee: new BN(pickedObj.fee).abs().shiftedBy(unitScale).decimalPlaces(0),
       txid: pickedObj.txid
     }))
-    .catch(err => {
+    .catch(errorHandle)
-      if (err.code === -6) throw new E.InsufficientFundsError()
-      throw err
-    })
 }
 
 function newAddress (account, info, tx, settings, operatorId) {
   return checkCryptoCode(info.cryptoCode)
     .then(() => fetch('getnewaddress'))
+    .catch(errorHandle)
 }
 
 function addressBalance (address, confs) {
   return fetch('getreceivedbyaddress', [address, confs])
     .then(r => new BN(r).shiftedBy(unitScale).decimalPlaces(0))
+    .catch(errorHandle)
 }
 
 function confirmedBalance (address, cryptoCode) {
@@ -156,6 +186,7 @@ function newFunding (account, cryptoCode, settings, operatorId) {
       fundingConfirmedBalance,
       fundingAddress
     }))
+    .catch(errorHandle)
 }
 
 function cryptoNetwork (account, cryptoCode, settings, operatorId) {
@@ -169,7 +200,7 @@ function fetchRBF (txId) {
       return [txId, res['bip125-replaceable']]
     })
     .catch(err => {
-      if (err.code === -5) logger.error(`${err.message}`)
+      errorHandle(err)
       return [txId, true]
     })
 }

lib/plugins/wallet/dashd/dashd.js

@@ -15,6 +15,16 @@ function fetch (method, params) {
   return jsonRpc.fetch(rpcConfig, method, params)
 }
 
+function errorHandle (e) {
+  const err = JSON.parse(e.message)
+  switch (err.code) {
+    case -6:
+      throw new E.InsufficientFundsError()
+    default:
+      throw e
+  }
+}
+
 function checkCryptoCode (cryptoCode) {
   if (cryptoCode !== 'DASH') return Promise.reject(new Error('Unsupported crypto: ' + cryptoCode))
   return Promise.resolve()
@@ -52,10 +62,7 @@ function sendCoins (account, tx, settings, operatorId) {
         txid: pickedObj.txid
       }
     })
-    .catch(err => {
+    .catch(errorHandle)
-      if (err.code === -6) throw new E.InsufficientFundsError()
-      throw err
-    })
 }
 
 function newAddress (account, info, tx, settings, operatorId) {

lib/plugins/wallet/litecoind/litecoind.js

@@ -15,6 +15,16 @@ function fetch (method, params) {
   return jsonRpc.fetch(rpcConfig, method, params)
 }
 
+function errorHandle (e) {
+  const err = JSON.parse(e.message)
+  switch (err.code) {
+    case -6:
+      throw new E.InsufficientFundsError()
+    default:
+      throw e
+  }
+}
+
 function checkCryptoCode (cryptoCode) {
   if (cryptoCode !== 'LTC') return Promise.reject(new Error('Unsupported crypto: ' + cryptoCode))
   return Promise.resolve()
@@ -52,10 +62,7 @@ function sendCoins (account, tx, settings, operatorId) {
         txid: pickedObj.txid
       }
     })
-    .catch(err => {
+    .catch(errorHandle)
-      if (err.code === -6) throw new E.InsufficientFundsError()
-      throw err
-    })
 }
 
 function newAddress (account, info, tx, settings, operatorId) {

lib/plugins/wallet/zcashd/zcashd.js

@@ -16,6 +16,16 @@ function fetch (method, params) {
   return jsonRpc.fetch(rpcConfig, method, params)
 }
 
+function errorHandle (e) {
+  const err = JSON.parse(e.message)
+  switch (err.code) {
+    case -6:
+      throw new E.InsufficientFundsError()
+    default:
+      throw e
+  }
+}
+
 function checkCryptoCode (cryptoCode) {
   if (cryptoCode !== 'ZEC') return Promise.reject(new Error('Unsupported crypto: ' + cryptoCode))
   return Promise.resolve()
@@ -78,10 +88,7 @@ function sendCoins (account, tx, settings, operatorId) {
         txid: pickedObj.txid
       }
     })
-    .catch(err => {
+    .catch(errorHandle)
-      if (err.code === -6) throw new E.InsufficientFundsError()
-      throw err
-    })
 }
 
 function newAddress (account, info, tx, settings, operatorId) {