edge-currency-plugins 1.0.0-rc.1 → 1.0.0-rc.4

package/lib/common/plugin/makeCurrencyPlugin.js

@@ -22,7 +22,7 @@ var _pluginState = require('./pluginState');
   const { io, log, pluginDisklet } = pluginOptions
   const currencyTools = _makeCurrencyTools.makeCurrencyTools.call(void 0, io, pluginInfo)
   const { defaultSettings, pluginId, currencyCode } = currencyInfo
-  const state = _pluginState.makePluginState.call(void 0, {
+  const pluginState = _pluginState.makePluginState.call(void 0, {
     io,
     currencyCode,
     pluginId,
@@ -49,7 +49,7 @@ var _pluginState = require('./pluginState');
           ...engineOptions,
           emitter
         },
-        pluginState: state
+        pluginState
       }
       const engine = await _makeUtxoEngine.makeUtxoEngine.call(void 0, engineConfig)
 
@@ -57,7 +57,7 @@ var _pluginState = require('./pluginState');
     },
 
     async makeCurrencyTools() {
-      state.load().catch(e => {
+      pluginState.load().catch(e => {
         throw e
       })
       return currencyTools

package/lib/common/plugin/makeEngineEmitter.js

@@ -95,6 +95,12 @@ var EngineEvent; (function (EngineEvent) {
 
   emitter.on(EngineEvent.TRANSACTIONS_CHANGED, callbacks.onTransactionsChanged)
   emitter.on(EngineEvent.WALLET_BALANCE_CHANGED, callbacks.onBalanceChanged)
+  emitter.on(
+    EngineEvent.BLOCK_HEIGHT_CHANGED,
+    (_uri, height) => {
+      callbacks.onBlockHeightChanged(height)
+    }
+  )
   emitter.on(EngineEvent.ADDRESSES_CHECKED, callbacks.onAddressesChecked)
   emitter.on(EngineEvent.TXIDS_CHANGED, callbacks.onTxidsChanged)
 

package/lib/common/plugin/pluginState.js

@@ -227,10 +227,10 @@ const asServerListInfo = _cleaners.asObject.call(void 0, _cleaners.asEither.call
       enableCustomServers = settings.enableCustomServers
       customServers = settings.blockbookServers
 
-      const enginesToBeStopped = []
+      const enginesToBeStarted = []
       const disconnects = []
       for (const engine of engines) {
-        enginesToBeStopped.push(engine)
+        enginesToBeStarted.push(engine)
         engine.setServerList([])
         disconnects.push(engine.stop())
       }
@@ -245,8 +245,8 @@ const asServerListInfo = _cleaners.asObject.call(void 0, _cleaners.asEither.call
       serverCacheDirty = true
       await saveServerCache()
       await refreshServers()
-      for (const engine of enginesToBeStopped) {
-        await engine.stop()
+      for (const engine of enginesToBeStarted) {
+        await engine.start()
       }
     }
   }

package/lib/common/plugin/types.js

@@ -17,7 +17,6 @@ var _cleaners = require('cleaners');
 
 
 
-
  const asCurrencyFormat = _cleaners.asValue.call(void 0, 'bip32', 'bip44', 'bip49', 'bip84'); exports.asCurrencyFormat = asCurrencyFormat
 
 // Path up to changeIndex
@@ -125,12 +124,6 @@ var _cleaners = require('cleaners');
 
 
 
-
-
-
-
-
-
 
 
 

package/lib/common/utxobased/db/Models/ProcessorTransaction.js

@@ -3,7 +3,6 @@
 
 
 
-var _defaultValidateConfirmations = require('../../engine/util/defaultValidateConfirmations');
 var _keymanager = require('../../keymanager/keymanager');
 
 
@@ -58,14 +57,10 @@ var _keymanager = require('../../keymanager/keymanager');
 
 
 
-
  const toEdgeTransaction = async (
   args
 ) => {
-  const { tx, processor, walletBlockHeight, walletTools, pluginInfo } = args
-  const { currencyInfo, engineInfo } = pluginInfo
-  const { validateConfirmations = _defaultValidateConfirmations.defaultValidateConfirmations } = engineInfo
-  const { requiredConfirmations } = currencyInfo
+  const { tx, processor, walletTools, engineInfo } = args
 
   const ourReceiveAddresses = []
   for (const out of tx.ourOuts) {
@@ -73,7 +68,7 @@ var _keymanager = require('../../keymanager/keymanager');
     const address = await processor.fetchAddress(scriptPubkey)
 
     /*
-    Hack to set replay protection tx to the correct script type through the
+    Hack to set replay protection tx to the correct script type through the 
     address format.
 
     We use a function which can determine whether the derivationLevelScriptHash
@@ -100,16 +95,9 @@ var _keymanager = require('../../keymanager/keymanager');
     }
   }
 
-  const confirmations = validateConfirmations(
-    tx,
-    walletBlockHeight,
-    requiredConfirmations
-  )
-
-  const edgeTx = {
+  return {
     currencyCode: args.currencyCode,
     txid: args.tx.txid,
-    confirmations,
     blockHeight: args.tx.blockHeight,
     date: args.tx.date,
     nativeAmount: args.tx.ourAmount,
@@ -117,6 +105,4 @@ var _keymanager = require('../../keymanager/keymanager');
     signedTx: args.tx.hex,
     ourReceiveAddresses
   }
-
-  return edgeTx
 }; exports.toEdgeTransaction = toEdgeTransaction

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

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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 _urijs = require('uri-js');
 
 var _makeEngineEmitter = require('../../plugin/makeEngineEmitter');
@@ -54,8 +54,6 @@ var _constants = require('./constants');
 
 
 
-
-
 
 
 
@@ -63,9 +61,8 @@ var _constants = require('./constants');
   const { engineEmitter, log, pluginInfo, pluginState, walletInfo } = config
   log('Making server states')
 
-  let serverStates = {}
+  const serverStatesCache = {}
   let isEngineOn = true
-  let connections = {}
   let serverList = []
   let reconnectCounter = 0
   let reconnectTimer = setTimeout(() => {
@@ -81,8 +78,7 @@ var _constants = require('./constants');
   socketEmitter.on(
     _MakeSocketEmitter.SocketEvent.CONNECTION_CLOSE,
     (uri, error) => {
-      _utils.removeItem.call(void 0, connections, uri)
-      _utils.removeItem.call(void 0, serverStates, uri)
+      _utils.removeItem.call(void 0, serverStatesCache, uri)
 
       const msg =
         error != null ? ` !! Connection ERROR !! ${error.message}` : ''
@@ -107,7 +103,7 @@ var _constants = require('./constants');
       log(
         `${uri} received received new transaction with id ${newTx.tx.txid} to address ${newTx.address}`
       )
-      const serverState = serverStates[uri]
+      const serverState = serverStatesCache[uri]
       if (serverState != null) {
         serverState.txids.add(newTx.tx.txid)
       }
@@ -117,7 +113,7 @@ var _constants = require('./constants');
     _makeEngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
     (uri, blockHeight) => {
       log(`${uri} block height changed to ${blockHeight}`)
-      serverStates[uri].blockHeight = blockHeight
+      serverStatesCache[uri].blockHeight = blockHeight
     }
   )
 
@@ -126,7 +122,8 @@ var _constants = require('./constants');
 
 
 
-  const makeServerState = () => ({
+  const makeServerStatesCacheEntry = (blockbook) => ({
+    blockbook,
     blockSubscriptionStatus: 'unsubscribed',
     txids: new Set(),
     addresses: new Set(),
@@ -144,13 +141,13 @@ var _constants = require('./constants');
     log(`stopping server states`)
     _socketQueue.removeIdFromQueue.call(void 0, walletInfo.id)
     clearTimeout(reconnectTimer)
-    for (const uri of Object.keys(connections)) {
-      const blockBook = connections[uri]
-      if (blockBook == null) continue
-      await blockBook.disconnect()
+    for (const uri of Object.keys(serverStatesCache)) {
+      const serverState = serverStatesCache[uri]
+      const { blockbook } = serverState
+      if (blockbook == null) continue
+      await blockbook.disconnect()
+      _utils.removeItem.call(void 0, serverStatesCache, uri)
     }
-    connections = {}
-    serverStates = {}
   }
 
   const reconnect = () => {
@@ -166,6 +163,7 @@ var _constants = require('./constants');
 
   const refillServers = () => {
     log(`refilling servers...`)
+    isEngineOn = true
     _socketQueue.pushUpdate.call(void 0, {
       id: walletInfo.id,
       updateFunc: () => {
@@ -181,16 +179,17 @@ var _constants = require('./constants');
     }
     log(`refillServers: Top ${_constants.NEW_CONNECTIONS} servers:`, serverList)
     let chanceToBePicked = 1.25
-    while (Object.keys(connections).length < _constants.MAX_CONNECTIONS) {
+    while (Object.keys(serverStatesCache).length < _constants.MAX_CONNECTIONS) {
       if (serverList.length === 0) break
       const uri = serverList.shift()
       if (uri == null) {
         reconnect()
         break
       }
-      if (connections[uri] != null) {
-        continue
-      }
+
+      // Skip reconnecting to an existing connection
+      if (serverStatesCache[uri] != null) continue
+
       // Validate the URI of server to make sure it is valid
       const parsed = _urijs.parse.call(void 0, uri)
       if (
@@ -200,56 +199,54 @@ var _constants = require('./constants');
       ) {
         continue
       }
+
+      // Ranomize the URI picking
       chanceToBePicked -= chanceToBePicked > 0.5 ? 0.25 : 0
       if (Math.random() > chanceToBePicked) {
         serverList.push(uri)
         continue
       }
 
-      serverStates[uri] = makeServerState()
-
-      const onQueueSpaceCB = async (
-
-
-) => {
-        const blockBook = connections[uri]
-        if (blockBook == null) {
-          return
-        }
-        const task = await pickNextTaskCB(uri)
-        if (task != null && typeof task !== 'boolean') {
-          const taskMessage = `${task.method} params: ${JSON.stringify(
-            task.params
-          )}`
-          log(`${uri} nextTask: ${taskMessage}`)
-        }
-        return task
-      }
-
-      connections[uri] = _BlockBook.makeBlockBook.call(void 0, {
+      // Make new Blockbook instance
+      const blockbook = _BlockBook.makeBlockBook.call(void 0, {
         wsAddress: uri,
         socketEmitter,
         engineEmitter,
         log,
-        onQueueSpaceCB,
+        onQueueSpaceCB: async (
+
+
+) => {
+          // Exit if the connection is no longer active
+          if (!(uri in serverStatesCache)) return
+
+          const task = await pickNextTaskCB(uri)
+          if (task != null && typeof task !== 'boolean') {
+            const taskMessage = `${task.method} params: ${JSON.stringify(
+              task.params
+            )}`
+            log(`${uri} nextTask: ${taskMessage}`)
+          }
+          return task
+        },
         walletId: walletInfo.id,
         asAddress: pluginInfo.engineInfo.asBlockbookAddress
       })
 
-      const blockBook = connections[uri]
-      if (blockBook == null) continue
+      // Make new ServerStates instance
+      serverStatesCache[uri] = makeServerStatesCacheEntry(blockbook)
 
       // Initialize blockbook connection for server
-      blockBook
+      blockbook
         .connect()
         .then(async () => {
           // Fetch block height from blockbook server
           const startTime = Date.now()
-          const { bestHeight: blockHeight } = await blockBook.fetchInfo()
+          const { bestHeight: blockHeight } = await blockbook.fetchInfo()
           log('height:', blockHeight)
 
           // Update server state
-          serverStates[uri].blockHeight = blockHeight
+          serverStatesCache[uri].blockHeight = blockHeight
 
           // Emit initial BLOCK_HEIGHT_CHANGED event
           engineEmitter.emit(_makeEngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED, uri, blockHeight)
@@ -265,33 +262,36 @@ var _constants = require('./constants');
   }
 
   const serverCanGetTx = (uri, txid) => {
-    const serverState = serverStates[uri]
+    const serverState = serverStatesCache[uri]
     if (serverState == null) return false
     if (serverState.txids.has(txid)) return true
 
-    for (const state of Object.values(serverStates)) {
+    for (const state of Object.values(serverStatesCache)) {
       if (state.txids.has(txid)) return false
     }
     return true
   }
 
   const serverCanGetAddress = (uri, address) => {
-    const serverState = serverStates[uri]
+    const serverState = serverStatesCache[uri]
     if (serverState == null) return false
     if (serverState.addresses.has(address)) return true
 
-    for (const state of Object.values(serverStates)) {
+    for (const state of Object.values(serverStatesCache)) {
       if (state.addresses.has(address)) return false
     }
     return true
   }
 
-  const serverScoreUp = (uri, score) => {
-    pluginState.serverScoreUp(uri, score)
+  const serverIsAwareOfAddress = (uri, address) => {
+    const serverState = serverStatesCache[uri]
+    if (serverState == null) return false
+    if (serverState.addresses.has(address)) return true
+    return false
   }
 
   const getServerState = (uri) => {
-    return serverStates[uri]
+    return serverStatesCache[uri]
   }
 
   const getServerList = () => {
@@ -304,10 +304,10 @@ var _constants = require('./constants');
 
   const broadcastTx = async (transaction) => {
     return await new Promise((resolve, reject) => {
-      const uris = Object.keys(connections).filter(uri => {
-        const blockBook = connections[uri]
-        if (blockBook == null) return false
-        return blockBook.isConnected
+      const uris = Object.keys(serverStatesCache).filter(uri => {
+        const { blockbook } = serverStatesCache[uri]
+        if (blockbook == null) return false
+        return blockbook.isConnected
       })
       if (uris == null || uris.length < 1) {
         reject(
@@ -317,9 +317,9 @@ var _constants = require('./constants');
       let resolved = false
       let bad = 0
       for (const uri of uris) {
-        const blockBook = connections[uri]
-        if (blockBook == null) continue
-        blockBook
+        const { blockbook } = serverStatesCache[uri]
+        if (blockbook == null) continue
+        blockbook
           .broadcastTx(transaction)
           .then(response => {
             if (!resolved) {
@@ -345,18 +345,42 @@ var _constants = require('./constants');
     addresses,
     deferredAddressSub
   ) => {
-    const blockbook = connections[uri]
-    if (blockbook == null)
+    const serverState = serverStatesCache[uri]
+    if (serverState == null)
       throw new Error(`No blockbook connection with ${uri}`)
-    blockbook.watchAddresses(addresses, deferredAddressSub)
+
+    const { blockbook } = serverState
+
+    // Add new addresses to the set of known addresses
+    for (const address of addresses) {
+      serverState.addresses.add(address)
+    }
+
+    const queryTime = Date.now()
+    const deferred = new _Deferred2.default()
+    deferred.promise
+      .then((value) => {
+        pluginState.serverScoreUp(uri, Date.now() - queryTime)
+        _optionalChain([deferredAddressSub, 'optionalAccess', _ => _.resolve, 'call', _2 => _2(value)])
+      })
+      .catch(() => {
+        // Remove new addresses to the set of known addresses
+        for (const address of addresses) {
+          serverState.addresses.delete(address)
+        }
+        pluginState.serverScoreDown(uri)
+        _optionalChain([deferredAddressSub, 'optionalAccess', _3 => _3.reject, 'call', _4 => _4()])
+      })
+    blockbook.watchAddresses(Array.from(addresses), deferred)
   }
 
   const watchBlocks = (uri) => {
-    const blockbook = connections[uri]
-    if (blockbook == null)
+    const serverState = serverStatesCache[uri]
+    if (serverState == null)
       throw new Error(`No blockbook connection with ${uri}`)
 
-    const serverState = _nullishCoalesce(serverStates[uri], () => ( makeServerState()))
+    const { blockbook } = serverState
+
     serverState.blockSubscriptionStatus = 'subscribing'
 
     const queryTime = Date.now()
@@ -364,7 +388,7 @@ var _constants = require('./constants');
     deferred.promise
       .then(() => {
         serverState.blockSubscriptionStatus = 'subscribed'
-        serverScoreUp(uri, Date.now() - queryTime)
+        pluginState.serverScoreUp(uri, Date.now() - queryTime)
       })
       .catch(() => {
         serverState.blockSubscriptionStatus = 'unsubscribed'
@@ -373,7 +397,7 @@ var _constants = require('./constants');
   }
 
   const getBlockHeight = (uri) => {
-    return serverStates[uri].blockHeight
+    return serverStatesCache[uri].blockHeight
   }
 
   return {
@@ -381,7 +405,7 @@ var _constants = require('./constants');
     stop,
     serverCanGetTx,
     serverCanGetAddress,
-    serverScoreUp,
+    serverIsAwareOfAddress,
     getServerState,
     refillServers,
     getServerList,

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

@@ -104,7 +104,7 @@ var _utils = require('./utils');
   const processor = await _makeProcessor.makeProcessor.call(void 0, {
     disklet: walletLocalDisklet
   })
-  const state = _makeUtxoEngineState.makeUtxoEngineState.call(void 0, {
+  const engineState = _makeUtxoEngineState.makeUtxoEngineState.call(void 0, {
     ...config,
     walletTools,
     walletInfo,
@@ -120,15 +120,15 @@ var _utils = require('./utils');
         metadata.balance
       )
 
-      pluginState.addEngine(state)
+      pluginState.addEngine(engineState)
       await fees.start()
-      await state.start()
+      await engineState.start()
     },
 
     async killEngine() {
-      await state.stop()
+      await engineState.stop()
       fees.stop()
-      pluginState.removeEngine(state)
+      pluginState.removeEngine(engineState)
     },
 
     getBalance(_opts) {
@@ -144,7 +144,7 @@ var _utils = require('./utils');
     },
 
     async addGapLimitAddresses(addresses) {
-      return await state.addGapLimitAddresses(addresses)
+      return await engineState.addGapLimitAddresses(addresses)
     },
 
     async broadcastTx(transaction) {
@@ -164,7 +164,7 @@ var _utils = require('./utils');
           )
         }
       }
-      const id = await state.broadcastTx(transaction)
+      const id = await engineState.broadcastTx(transaction)
       if (id !== transaction.txid) {
         throw new Error('broadcast response txid does not match original')
       }
@@ -221,7 +221,7 @@ var _utils = require('./utils');
     async getFreshAddress(
       _opts
     ) {
-      return await state.getFreshAddress()
+      return await engineState.getFreshAddress()
     },
 
     getNumTransactions(_opts) {
@@ -254,10 +254,9 @@ var _utils = require('./utils');
             await _ProcessorTransaction.toEdgeTransaction.call(void 0, {
               tx,
               currencyCode: currencyInfo.currencyCode,
-              pluginInfo,
+              walletTools,
               processor,
-              walletBlockHeight: metadata.lastSeenBlockHeight,
-              walletTools
+              engineInfo
             })
         )
       )
@@ -303,7 +302,7 @@ var _utils = require('./utils');
           const { script } = target.otherParams
           if (script.type === 'replayProtection') {
             // construct a replay protection p2sh address
-            const { publicAddress } = await state.deriveScriptAddress(
+            const { publicAddress } = await engineState.deriveScriptAddress(
               script.type
             )
             targets.push({
@@ -329,7 +328,7 @@ var _utils = require('./utils');
         throw new Error('Need to provide Spend Targets')
       }
 
-      const freshAddress = await state.getFreshAddress(1)
+      const freshAddress = await engineState.getFreshAddress(1)
       const freshChangeAddress =
         _nullishCoalesce(freshAddress.segwitAddress, () => ( freshAddress.publicAddress))
       const setRBF = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _9 => _9.setRBF]), () => ( false))
@@ -421,7 +420,6 @@ var _utils = require('./utils');
         currencyCode: currencyInfo.currencyCode,
         txid: '',
         date: _unixTime.unixTime.call(void 0, ),
-        confirmations: 'unconfirmed',
         blockHeight: 0,
         nativeAmount,
         networkFee,
@@ -454,12 +452,11 @@ var _utils = require('./utils');
     async saveTx(edgeTx) {
       const tx = _ProcessorTransaction.fromEdgeTransaction.call(void 0, edgeTx)
       await _makeUtxoEngineState.transactionChanged.call(void 0, {
-        emitter,
-        pluginInfo,
-        processor,
         tx,
-        walletBlockHeight: metadata.lastSeenBlockHeight,
-        walletTools
+        pluginInfo,
+        emitter,
+        walletTools,
+        processor
       })
       await processor.saveTransaction({
         tx,
@@ -470,7 +467,7 @@ var _utils = require('./utils');
       Get the wallet's UTXOs from the new transaction and save them to the processsor.
       */
       const utxos = await _getOwnUtxosFromTx.getOwnUtxosFromTx.call(void 0, engineInfo, processor, tx)
-      await Promise.all(utxos.map(async utxo => await processor.saveUtxo(utxo)))
+      await engineState.processUtxos(utxos)
     },
 
     async signTx(transaction) {