edge-currency-plugins 3.2.1 → 3.3.0

package/lib/common/utxobased/engine/types.js

@@ -13,8 +13,10 @@ var _types3 = require('../../plugin/types');
 
 
 
- const asUtxoInitOptions = _cleaners.asObject.call(void 0, {
-  nowNodeApiKey: _cleaners.asOptional.call(void 0, _cleaners.asString)
+
+
+ const asUtxoInitOptions = _cleaners.asObject({
+  nowNodesApiKey: _cleaners.asOptional.call(void 0, _cleaners.asString)
 }); exports.asUtxoInitOptions = asUtxoInitOptions
 
  const asUtxoUserSettings = _cleaners.asObject.call(void 0, {

package/lib/common/utxobased/engine/util/getOwnUtxosFromTx.js

@@ -6,7 +6,7 @@ var _utils = require('../utils');
 
  const getOwnUtxosFromTx = async (
   engineInfo,
-  processor,
+  dataLayer,
   tx
 ) => {
   const ownUtxos = []
@@ -18,12 +18,12 @@ var _utils = require('../utils');
   const inputUtxoIds = tx.inputs.map(
     input => `${input.txId}_${input.outputIndex}`
   )
-  const inputUtxos = await processor.fetchUtxos({
+  const inputUtxos = await dataLayer.fetchUtxos({
     utxoIds: inputUtxoIds
   })
   for (const utxo of inputUtxos) {
     if (utxo == null) continue
-    // Must create a new IUTXO object when mutating processor objects because
+    // Must create a new UtxoData object when mutating DataLayer objects because
     // memlet may keep a reference in memory.
     ownUtxos.push({ ...utxo, spent: true })
   }
@@ -34,7 +34,7 @@ var _utils = require('../utils');
 
   for (const output of tx.outputs) {
     const scriptPubkey = output.scriptPubkey
-    const address = await processor.fetchAddress(scriptPubkey)
+    const address = await dataLayer.fetchAddress(scriptPubkey)
     if (address != null) {
       const id = `${tx.txid}_${output.n}`
       const path = address.path

package/lib/common/utxobased/info/bitcoin.js

@@ -38,7 +38,8 @@ const currencyInfo = {
       'wss://btc2.trezor.io',
       'wss://btc3.trezor.io',
       'wss://btc4.trezor.io',
-      'wss://btc5.trezor.io'
+      'wss://btc5.trezor.io',
+      'wss://btcbook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
   },

package/lib/common/utxobased/info/bitcoincash.js

@@ -40,7 +40,8 @@ const currencyInfo = {
       'wss://bch2.trezor.io',
       'wss://bch3.trezor.io',
       'wss://bch4.trezor.io',
-      'wss://bch5.trezor.io'
+      'wss://bch5.trezor.io',
+      'wss://bchbook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
   },

package/lib/common/utxobased/info/dash.js

@@ -38,7 +38,8 @@ const currencyInfo = {
       'wss://dash2.trezor.io',
       'wss://dash3.trezor.io',
       'wss://dash4.trezor.io',
-      'wss://dash5.trezor.io'
+      'wss://dash5.trezor.io',
+      'wss://dashbook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
   },

package/lib/common/utxobased/info/digibyte.js

@@ -30,7 +30,11 @@ const currencyInfo = {
   ..._commonInfo.legacyMemoInfo,
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
-    blockbookServers: ['wss://dgb1.trezor.io', 'wss://dgb2.trezor.io'],
+    blockbookServers: [
+      'wss://dgb1.trezor.io',
+      'wss://dgb2.trezor.io',
+      'wss://dgbbook.nownodes.io/wss/%{nowNodesApiKey}'
+    ],
     enableCustomServers: false
   },
   metaTokens: []

package/lib/common/utxobased/info/dogecoin.js

@@ -34,7 +34,8 @@ const currencyInfo = {
       'wss://doge2.trezor.io',
       'wss://doge3.trezor.io',
       'wss://doge4.trezor.io',
-      'wss://doge5.trezor.io'
+      'wss://doge5.trezor.io',
+      'wss://dogebook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
   },

package/lib/common/utxobased/info/groestlcoin.js

@@ -36,7 +36,10 @@ const currencyInfo = {
   ..._commonInfo.legacyMemoInfo,
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
-    blockbookServers: ['wss://blockbook.groestlcoin.org'],
+    blockbookServers: [
+      'wss://blockbook.groestlcoin.org',
+      'wss://grsbook.nownodes.io/wss/%{nowNodesApiKey}'
+    ],
     enableCustomServers: false
   },
   metaTokens: []

package/lib/common/utxobased/info/litecoin.js

@@ -36,7 +36,8 @@ var _commonInfo = require('./commonInfo');
       'wss://ltc2.trezor.io',
       'wss://ltc3.trezor.io',
       'wss://ltc4.trezor.io',
-      'wss://ltc5.trezor.io'
+      'wss://ltc5.trezor.io',
+      'wss://ltcbook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
   },

package/lib/common/utxobased/info/zcoin.js

@@ -30,7 +30,10 @@ var _commonInfo = require('./commonInfo');
   ..._commonInfo.legacyMemoInfo,
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
-    blockbookServers: ['wss://blockbook.firo.org'],
+    blockbookServers: [
+      'wss://blockbook.firo.org',
+      'wss://firobook.nownodes.io/wss/%{nowNodesApiKey}'
+    ],
     enableCustomServers: false
   },
   metaTokens: []

package/lib/common/utxobased/network/Blockbook.js

@@ -22,19 +22,17 @@ var _constants = require('../engine/constants');
 
 
 
+
 
 var _blockbookApi = require('./blockbookApi');
 var _Deferred = require('./Deferred'); var _Deferred2 = _interopRequireDefault(_Deferred);
-var _Socket = require('./Socket');
-
-
-
 
 
 
 
 
 
+var _Socket = require('./Socket');
 
 
 
@@ -116,7 +114,7 @@ var _Socket = require('./Socket');
     connectionUri,
     engineEmitter,
     log,
-    onQueueSpaceCB,
+    taskGeneratorFn,
     socketEmitter,
     walletId
   } = config
@@ -172,13 +170,24 @@ var _Socket = require('./Socket');
       return await instance.promisifyWsMessage(_blockbookApi.transactionMessage.call(void 0, hash))
     },
 
-    onQueueSpace(cb) {
-      socket.onQueueSpace(cb)
-    },
-
     async promisifyWsMessage(message) {
       const deferred = new _Deferred2.default()
-      socket.submitTask({ ...message, deferred })
+      const taskGeneratorFn = async function* ()
+
+
+
+ {
+        const value = yield { ...message }
+        deferred.resolve(value)
+        return false
+      }
+      const generator = taskGeneratorFn()
+      const result = await generator.next()
+      // Assertion mask the type checker
+      if (result.done !== true) {
+        const task = result.value
+        socket.submitTask(task, generator)
+      }
       return await deferred.promise
     },
 
@@ -223,39 +232,32 @@ var _Socket = require('./Socket');
     // Task Methods:
     //
 
-    addressQueryTask(address, params, deferred) {
-      return {
+    addressQueryTask: function* (address, params) {
+      return yield {
         ..._blockbookApi.addressMessage.call(void 0, address, params.asBlockbookAddress, {
           details: 'txs',
           from: params.lastQueriedBlockHeight,
           pageSize: _constants.BLOCKBOOK_TXS_PER_PAGE,
           page: params.page
-        }),
-        deferred
+        })
       }
     },
 
-    transactionQueryTask(txId, deferred) {
-      return {
-        ..._blockbookApi.transactionMessage.call(void 0, txId),
-        deferred
+    transactionQueryTask: function* (txId) {
+      return yield {
+        ..._blockbookApi.transactionMessage.call(void 0, txId)
       }
     },
 
-    transactionSpecialQueryTask(
-      txId,
-      deferred
-    ) {
-      return {
-        ..._blockbookApi.transactionMessageSpecific.call(void 0, txId),
-        deferred
+    transactionSpecialQueryTask: function* (txId) {
+      return yield {
+        ..._blockbookApi.transactionMessageSpecific.call(void 0, txId)
       }
     },
 
-    utxoListQueryTask(address, params, deferred) {
-      return {
-        ..._blockbookApi.addressUtxosMessage.call(void 0, address, params.asBlockbookAddress),
-        deferred
+    utxoListQueryTask: function* (address, params) {
+      return yield {
+        ..._blockbookApi.addressUtxosMessage.call(void 0, address, params.asBlockbookAddress)
       }
     }
   }
@@ -263,7 +265,8 @@ var _Socket = require('./Socket');
   const socket = _Socket.makeSocket.call(void 0, connectionUri, {
     asResponse,
     healthCheck: _nullishCoalesce(config.ping, () => ( ping)),
-    onQueueSpaceCB,
+    initOptions: config.initOptions,
+    taskGeneratorFn,
     log,
     emitter: socketEmitter,
     walletId

package/lib/common/utxobased/network/BlockbookElectrum.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _altcoinjs = require('altcoin-js');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var _altcoinjs = require('altcoin-js');
 
 
 
@@ -12,10 +12,10 @@ var _cleaners = require('cleaners');
 
 
 
+
 var _keymanager = require('../keymanager/keymanager');
 var _Blockbook = require('./Blockbook');
 
-var _Deferred = require('./Deferred'); var _Deferred2 = _interopRequireDefault(_Deferred);
 
 
 
@@ -37,6 +37,12 @@ var _electrumApi = require('./electrumApi');
 
 
 
+
+
+
+
+
+
 
 
 
@@ -78,8 +84,9 @@ const asResponse = (raw) => {
     asAddress,
     connectionUri,
     engineEmitter,
+    initOptions,
     log,
-    onQueueSpaceCB,
+    taskGeneratorFn,
     pluginInfo,
     socketEmitter,
     walletId
@@ -101,86 +108,81 @@ const asResponse = (raw) => {
     asResponse,
     connectionUri,
     engineEmitter,
+    initOptions,
     log,
-    onQueueSpaceCB: async (
+    taskGeneratorFn: async function* (
       uri
-    ) => {
-      const task = await onQueueSpaceCB(uri)
-      if (task == null || typeof task === 'boolean') return task
-
-      // Translate getAccountUtxo to blockchain.scripthash.listunspent:
-      if (task.method === 'getAccountUtxo') {
-        const params = task.params 
-        const address =
-          asAddress != null ? asAddress(params.descriptor) : params.descriptor
-        const scriptHash = addressToScriptHash(address)
-
-        const deferred = new _Deferred2.default()
-        deferred.promise
-          .then((electrumUtxos) => {
-            const blockbookUtxos = electrumUtxos.map(
-              utxo => ({
-                txid: utxo.tx_hash,
-                vout: utxo.tx_pos,
-                value: utxo.value.toString(),
-                height: utxo.height
-              })
-            )
-            task.deferred.resolve(blockbookUtxos)
-          })
-          .catch((e) => {
-            task.deferred.reject(e)
-          })
-
-        const translatedTask = {
-          ..._electrumApi.listUnspentMessage.call(void 0, scriptHash),
-          deferred
+    ) {
+      const generator = taskGeneratorFn(uri)
+      let nextValue
+
+      while (true) {
+        const result = await generator.next(nextValue)
+        const task = result.value
+
+        // If the generator result is not a WsTask we will return it:
+        if (_optionalChain([result, 'optionalAccess', _ => _.done]) === true) return result.value
+        if (typeof task === 'boolean') return task
+
+        // Translate getAccountUtxo to blockchain.scripthash.listunspent:
+        if (task.method === 'getAccountUtxo') {
+          const params = task.params 
+          const address =
+            asAddress != null ? asAddress(params.descriptor) : params.descriptor
+          const scriptHash = addressToScriptHash(address)
+
+          // Safe because yielding WsTask<ListUnspentResponse> should get
+          // ListUnspentResponse next.
+          const electrumUtxos = (yield {
+            ..._electrumApi.listUnspentMessage.call(void 0, scriptHash)
+          }) 
+
+          const blockbookUtxos = electrumUtxos.map(
+            utxo => ({
+              txid: utxo.tx_hash,
+              vout: utxo.tx_pos,
+              value: utxo.value.toString(),
+              height: utxo.height
+            })
+          )
+          nextValue = blockbookUtxos
+          continue
         }
-        return translatedTask
-      }
 
-      // Get Address Transactions:
-      if (task.method === 'getAccountInfo') {
-        const params = task.params 
-        const address =
-          asAddress != null ? asAddress(params.descriptor) : params.descriptor
-        const scriptHash = addressToScriptHash(address)
-
-        const deferred = new _Deferred2.default()
-        deferred.promise
-          .then((electrumUtxos) => {
-            const blockbookUtxos = {
-              address, // unused
-              balance: '0', // unused
-              totalReceived: '0', // unused
-              totalSent: '0', // unused
-              txs: electrumUtxos.length,
-              unconfirmedBalance: '0', // unused
-              unconfirmedTxs: electrumUtxos.reduce(
-                (sum, tx) => (sum + tx.height >= 0 ? 1 : 0),
-                0
-              ),
-              txids: [], // unused
-              transactions: [], // TODO: this requires an extra query per txid
-              page: 0, // unused
-              totalPages: 1,
-              itemsOnPage: 0 // unused
-            }
-            task.deferred.resolve(blockbookUtxos)
-          })
-          .catch((e) => {
-            task.deferred.reject(e)
-          })
-
-        const translatedTask = {
-          ..._electrumApi.addressTransactionsMessage.call(void 0, scriptHash),
-          deferred
+        // Get Address Transactions:
+        if (task.method === 'getAccountInfo') {
+          const params = task.params 
+          const address =
+            asAddress != null ? asAddress(params.descriptor) : params.descriptor
+          const scriptHash = addressToScriptHash(address)
+
+          // Safe because yielding WsTask<AddressTransactionsResponse> should get
+          // AddressTransactionsResponse next.
+          const electrumUtxos = (yield {
+            ..._electrumApi.addressTransactionsMessage.call(void 0, scriptHash)
+          }) 
+
+          const blockbookUtxos = {
+            address, // unused
+            balance: '0', // unused
+            totalReceived: '0', // unused
+            totalSent: '0', // unused
+            txs: electrumUtxos.length,
+            unconfirmedBalance: '0', // unused
+            unconfirmedTxs: electrumUtxos.reduce(
+              (sum, tx) => (sum + tx.height >= 0 ? 1 : 0),
+              0
+            ),
+            txids: [], // unused
+            transactions: [], // TODO: this requires an extra query per txid
+            page: 0, // unused
+            totalPages: 1,
+            itemsOnPage: 0 // unused
+          }
+          nextValue = blockbookUtxos
+          continue
         }
-        return translatedTask
       }
-
-      // Skip unsupported task and continue with the next one:
-      return true
     },
     ping: async () => {
       return await instance.promisifyWsMessage(_electrumApi.pingMessage.call(void 0, ))