edge-currency-plugins 2.5.3 → 2.6.0

package/lib/bch.js

@@ -1,10 +1,10 @@
 "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 _makeCurrencyPlugin = require('./common/plugin/makeCurrencyPlugin');
+var _CurrencyPlugin = require('./common/plugin/CurrencyPlugin');
 var _bitcoincash = require('./common/utxobased/info/bitcoincash');
 
 const plugin = (options) =>
-  _makeCurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _bitcoincash.info)
+  _CurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _bitcoincash.info)
 
 if (typeof window !== 'undefined') {
   _optionalChain([window, 'access', _ => _.addEdgeCorePlugins, 'optionalCall', _2 => _2({

package/lib/bsv.js

@@ -1,10 +1,10 @@
 "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 _makeCurrencyPlugin = require('./common/plugin/makeCurrencyPlugin');
+var _CurrencyPlugin = require('./common/plugin/CurrencyPlugin');
 var _bitcoinsv = require('./common/utxobased/info/bitcoinsv');
 
 const plugin = (options) =>
-  _makeCurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _bitcoinsv.info)
+  _CurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _bitcoinsv.info)
 
 if (typeof window !== 'undefined') {
   _optionalChain([window, 'access', _ => _.addEdgeCorePlugins, 'optionalCall', _2 => _2({

package/lib/btc.js

@@ -1,10 +1,10 @@
 "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 _makeCurrencyPlugin = require('./common/plugin/makeCurrencyPlugin');
+var _CurrencyPlugin = require('./common/plugin/CurrencyPlugin');
 var _bitcoin = require('./common/utxobased/info/bitcoin');
 
 const plugin = (options) =>
-  _makeCurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _bitcoin.info)
+  _CurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _bitcoin.info)
 
 if (typeof window !== 'undefined') {
   _optionalChain([window, 'access', _ => _.addEdgeCorePlugins, 'optionalCall', _2 => _2({

package/lib/common/plugin/{makeCurrencyPlugin.js → CurrencyPlugin.js}

@@ -7,11 +7,14 @@
 
 
 
-var _makeUtxoEngine = require('../utxobased/engine/makeUtxoEngine');
+
+
+
 var _types3 = require('../utxobased/engine/types');
-var _makeCurrencyTools = require('./makeCurrencyTools');
-var _makeEngineEmitter = require('./makeEngineEmitter');
-var _pluginState = require('./pluginState');
+var _UtxoEngine = require('../utxobased/engine/UtxoEngine');
+var _CurrencyTools = require('./CurrencyTools');
+var _EngineEmitter = require('./EngineEmitter');
+var _PluginState = require('./PluginState');
 
 
  function makeCurrencyPlugin(
@@ -19,10 +22,10 @@ var _pluginState = require('./pluginState');
   pluginInfo
 ) {
   const { currencyInfo } = pluginInfo
-  const { io, log, pluginDisklet } = pluginOptions
-  const currencyTools = _makeCurrencyTools.makeCurrencyTools.call(void 0, io, pluginInfo)
+  const { io, log, pluginDisklet, initOptions } = pluginOptions
+  const currencyTools = _CurrencyTools.makeCurrencyTools.call(void 0, io, pluginInfo)
   const { defaultSettings, pluginId, currencyCode } = currencyInfo
-  const pluginState = _pluginState.makePluginState.call(void 0, {
+  const pluginState = _PluginState.makePluginState.call(void 0, {
     io,
     currencyCode,
     pluginId,
@@ -37,12 +40,13 @@ var _pluginState = require('./pluginState');
       walletInfo,
       engineOptions
     ) {
-      const emitter = _makeEngineEmitter.makeEngineEmitter.call(void 0, engineOptions.callbacks)
+      const emitter = _EngineEmitter.makeEngineEmitter.call(void 0, engineOptions.callbacks)
       const engineConfig = {
         walletInfo,
         pluginInfo,
         pluginDisklet,
         currencyTools,
+        initOptions: _types3.asUtxoInitOptions.call(void 0, initOptions),
         io,
         options: {
           ...pluginOptions,
@@ -51,7 +55,7 @@ var _pluginState = require('./pluginState');
         },
         pluginState
       }
-      const engine = await _makeUtxoEngine.makeUtxoEngine.call(void 0, engineConfig)
+      const engine = await _UtxoEngine.makeUtxoEngine.call(void 0, engineConfig)
 
       return engine
     },

package/lib/common/plugin/{makeMetadata.js → Metadata.js}

@@ -4,7 +4,7 @@
 var _memlet = require('memlet');
 
 var _awaitlock = require('../utxobased/engine/await-lock'); var _awaitlock2 = _interopRequireDefault(_awaitlock);
-var _makeEngineEmitter = require('./makeEngineEmitter');
+var _EngineEmitter = require('./EngineEmitter');
 var _types3 = require('./types');
 var _utils = require('./utils');
 
@@ -47,14 +47,14 @@ const metadataPath = `metadata.json`
     cache.balance = cumulativeBalance
     await setMetadata(cache)
     emitter.emit(
-      _makeEngineEmitter.EngineEvent.WALLET_BALANCE_CHANGED,
+      _EngineEmitter.EngineEvent.WALLET_BALANCE_CHANGED,
       currencyCode,
       cumulativeBalance
     )
   }
 
   emitter.on(
-    _makeEngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
+    _EngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
     async (
       currencyCode,
       addressBalanceChanges
@@ -79,7 +79,7 @@ const metadataPath = `metadata.json`
   )
 
   emitter.on(
-    _makeEngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
+    _EngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
     async (_uri, height) => {
       if (height > cache.lastSeenBlockHeight) {
         cache.lastSeenBlockHeight = height

package/lib/common/plugin/{pluginState.js → PluginState.js}

@@ -12,12 +12,12 @@ var _memlet = require('memlet');
 
 
 
-var _serverScores = require('./serverScores');
+var _ServerScores = require('./ServerScores');
 
 // Info server endpoint to getting ServerListInfo data
-const serverListInfoUrl = 'https://info1.edge.app/v1/blockBook/'
-// The filename for ServerInfoCache data (see serverScores.ts)
-// Perhaps this should be in serverScores.ts file, but that'll take some refactoring
+const serverListInfoUrl = 'https://info1.edge.app/v1/blockbook/'
+// The filename for ServerInfoCache data (see ServerScores.ts)
+// Perhaps this should be in ServerScores.ts file, but that'll take some refactoring
 const SERVER_CACHE_FILE = 'serverCache.json'
 
 // ServerListInfo data structure from info server and saved to disk
@@ -108,7 +108,7 @@ const asServerListInfo = _cleaners.asObject.call(void 0, _cleaners.asEither.call
     }
   }
 
-  const serverScores = new (0, _serverScores.ServerScores)({
+  const serverScores = new (0, _ServerScores.ServerScores)({
     log,
     onDirtyServer
   })
@@ -179,7 +179,7 @@ const asServerListInfo = _cleaners.asObject.call(void 0, _cleaners.asEither.call
 
     async load() {
       try {
-        serverCache = _serverScores.asServerCache.call(void 0, await memlet.getJson(SERVER_CACHE_FILE))
+        serverCache = _ServerScores.asServerCache.call(void 0, await memlet.getJson(SERVER_CACHE_FILE))
       } catch (e) {
         log(`${pluginId}: Failed to load server cache: ${JSON.stringify(e)}`)
       }

package/lib/common/plugin/{serverScores.js → ServerScores.js}

@@ -236,7 +236,14 @@ const RE_ADDED_SERVER_SCORE = -10
       const filter = (server) => {
         for (const pattern of includePatterns) {
           // make sure that the server URL starts with the required pattern
-          if (server.serverUrl.indexOf(pattern) === 0) return true
+          if (
+            typeof pattern === 'string' &&
+            server.serverUrl.indexOf(pattern) === 0
+          )
+            return true
+          // Or make sure that the server URL matches regex
+          if (pattern instanceof RegExp && pattern.test(server.serverUrl))
+            return true
         }
         return false
       }

package/lib/common/plugin/types.js

@@ -29,6 +29,7 @@ var _types3 = require('../utxobased/db/types');
 
 
 
+
  const asCurrencyFormat = _cleaners.asValue.call(void 0, 'bip32', 'bip44', 'bip49', 'bip84'); exports.asCurrencyFormat = asCurrencyFormat
 
 // Path up to changeIndex
@@ -144,6 +145,12 @@ var _types3 = require('../utxobased/db/types');
 
 
 
+
+
+
+
+
+
 
 
 
@@ -205,6 +212,7 @@ var _types3 = require('../utxobased/db/types');
 
 
 
+
  const asLocalWalletMetadata = _cleaners.asObject.call(void 0, {
   balance: _cleaners.asString,
   // scriptPubkey -> balance

package/lib/common/utxobased/db/{makeProcessor.js → Processor.js}

@@ -6,7 +6,7 @@ var _memlet = require('memlet');
 
 var _unixTime = require('../../../util/unixTime');
 
-var _makeBaselets = require('./makeBaselets');
+var _Baselets = require('./Baselets');
 var _baselet3 = require('./Models/baselet');
 
 
@@ -113,7 +113,7 @@ const BASELET_DIR = 'tables'
 ) {
   const disklet = _disklet.navigateDisklet.call(void 0, config.disklet, BASELET_DIR)
   let memlet = _memlet.makeMemlet.call(void 0, disklet)
-  let baselets = await _makeBaselets.makeBaselets.call(void 0, { storage: memlet }).catch(async error => {
+  let baselets = await _Baselets.makeBaselets.call(void 0, { storage: memlet }).catch(async error => {
     await memlet.delete('.')
     throw error
   })
@@ -153,7 +153,7 @@ const BASELET_DIR = 'tables'
       await _baselet.clearMemletCache.call(void 0, )
       await disklet.delete('.')
       memlet = _memlet.makeMemlet.call(void 0, disklet)
-      baselets = await _makeBaselets.makeBaselets.call(void 0, { storage: memlet })
+      baselets = await _Baselets.makeBaselets.call(void 0, { storage: memlet })
     },
 
     async dumpData() {

package/lib/common/utxobased/engine/{makeServerStates.js → ServerStates.js}

@@ -1,16 +1,20 @@
 "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');
+var _EngineEmitter = require('../../plugin/EngineEmitter');
 
 
 var _utils = require('../../plugin/utils');
 
-var _BlockBook = require('../network/BlockBook');
+var _Blockbook = require('../network/Blockbook');
 
+
+
+
+var _blockbookApi = require('../network/blockbookApi');
 var _Deferred = require('../network/Deferred'); var _Deferred2 = _interopRequireDefault(_Deferred);
-var _MakeSocketEmitter = require('../network/MakeSocketEmitter');
 
+var _SocketEmitter = require('../network/SocketEmitter');
 var _socketQueue = require('../network/socketQueue');
 var _constants = require('./constants');
 
@@ -53,12 +57,24 @@ var _constants = require('./constants');
 
 
 
+
+
+
 
 
 
 
  function makeServerStates(config) {
-  const { engineEmitter, log, pluginInfo, pluginState, walletInfo } = config
+  const {
+    engineEmitter,
+    initOptions,
+    io,
+    log,
+    pluginInfo,
+    pluginState,
+    walletInfo
+  } = config
+  const { serverConfigs = [] } = pluginInfo.engineInfo
   log('Making server states')
 
   const serverStatesCache = {}
@@ -68,15 +84,15 @@ var _constants = require('./constants');
   let reconnectTimer = setTimeout(() => {
     return
   }, 0)
-  const socketEmitter = new (0, _MakeSocketEmitter.SocketEmitter)()
+  const socketEmitter = new (0, _SocketEmitter.SocketEmitter)()
 
   // set server specific event emitters
-  socketEmitter.on(_MakeSocketEmitter.SocketEvent.CONNECTION_OPEN, (uri) => {
+  socketEmitter.on(_SocketEmitter.SocketEvent.CONNECTION_OPEN, (uri) => {
     reconnectCounter = 0
     log(`${uri} ** Connected **`)
   })
   socketEmitter.on(
-    _MakeSocketEmitter.SocketEvent.CONNECTION_CLOSE,
+    _SocketEmitter.SocketEvent.CONNECTION_CLOSE,
     (uri, error) => {
       _utils.removeItem.call(void 0, serverStatesCache, uri)
 
@@ -90,7 +106,7 @@ var _constants = require('./constants');
     }
   )
   socketEmitter.on(
-    _MakeSocketEmitter.SocketEvent.CONNECTION_TIMER,
+    _SocketEmitter.SocketEvent.CONNECTION_TIMER,
     (uri, queryDate) => {
       const queryTime = Date.now() - queryDate
       log(`${uri} returned healthCheck in ${queryTime}ms`)
@@ -98,7 +114,7 @@ var _constants = require('./constants');
     }
   )
   engineEmitter.on(
-    _makeEngineEmitter.EngineEvent.NEW_ADDRESS_TRANSACTION,
+    _EngineEmitter.EngineEvent.NEW_ADDRESS_TRANSACTION,
     (uri, newTx) => {
       log(
         `${uri} received received new transaction with id ${newTx.tx.txid} to address ${newTx.address}`
@@ -110,7 +126,7 @@ var _constants = require('./constants');
     }
   )
   engineEmitter.on(
-    _makeEngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
+    _EngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
     (uri, blockHeight) => {
       log(`${uri} block height changed to ${blockHeight}`)
       serverStatesCache[uri].blockHeight = blockHeight
@@ -208,9 +224,9 @@ var _constants = require('./constants');
       }
 
       // Make new Blockbook instance
-      const blockbook = _BlockBook.makeBlockBook.call(void 0, {
-        wsAddress: uri,
-        socketEmitter,
+      const blockbook = _Blockbook.makeBlockbook.call(void 0, {
+        asAddress: pluginInfo.engineInfo.asBlockbookAddress,
+        connectionUri: uri,
         engineEmitter,
         log,
         onQueueSpaceCB: async (
@@ -229,8 +245,8 @@ var _constants = require('./constants');
           }
           return task
         },
-        walletId: walletInfo.id,
-        asAddress: pluginInfo.engineInfo.asBlockbookAddress
+        socketEmitter,
+        walletId: walletInfo.id
       })
 
       // Make new ServerStates instance
@@ -249,7 +265,7 @@ var _constants = require('./constants');
           serverStatesCache[uri].blockHeight = blockHeight
 
           // Emit initial BLOCK_HEIGHT_CHANGED event
-          engineEmitter.emit(_makeEngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED, uri, blockHeight)
+          engineEmitter.emit(_EngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED, uri, blockHeight)
 
           // Increment server score using response time
           const responseTime = Date.now() - startTime
@@ -304,38 +320,117 @@ var _constants = require('./constants');
 
   const broadcastTx = async (transaction) => {
     return await new Promise((resolve, reject) => {
-      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(
-          new Error('No available connections\nCheck your internet signal')
-        )
-      }
       let resolved = false
       let bad = 0
-      for (const uri of uris) {
-        const { blockbook } = serverStatesCache[uri]
-        if (blockbook == null) continue
-        blockbook
-          .broadcastTx(transaction)
-          .then(response => {
-            if (!resolved) {
-              resolved = true
-              resolve(response.result)
-            }
-          })
-          .catch((e) => {
-            if (++bad === uris.length) {
-              const msg = e != null ? `With error ${e.message}` : ''
-              log.error(
-                `broadcastTx fail: ${JSON.stringify(transaction)}\n${msg}`
-              )
-              reject(e)
-            }
+
+      const wsUris = Object.keys(serverStatesCache).filter(
+        uri => serverStatesCache[uri].blockbook != null
+      )
+
+      // If there are no blockbook instances, reject the promise
+      if (wsUris.length < 1) {
+        reject(new Error('Unexpected error. Missing WebSocket connections.'))
+        // Exit early if there are blockbook instances
+        return
+      }
+
+      // Determine if there are any connected blockbook instances
+      const isAnyBlockbookConnected = wsUris.some(
+        uri => serverStatesCache[uri].blockbook.isConnected
+      )
+
+      if (isAnyBlockbookConnected) {
+        for (const uri of wsUris) {
+          const { blockbook } = serverStatesCache[uri]
+          if (blockbook == null) continue
+          blockbook
+            .broadcastTx(transaction)
+            .then(response => {
+              if (!resolved) {
+                resolved = true
+                resolve(response.result)
+              }
+            })
+            .catch((e) => {
+              if (++bad === wsUris.length) {
+                const msg = e != null ? `With error ${e.message}` : ''
+                log.error(
+                  `broadcastTx fail: ${JSON.stringify(transaction)}\n${msg}`
+                )
+                reject(e)
+              }
+            })
+        }
+      }
+
+      // Broadcast through any HTTP URI that may be configured, only if no
+      // blockbook instances are connected.
+      if (!isAnyBlockbookConnected) {
+        // This is for the future when we want to HTTP servers from the user
+        // settings:
+        // const httpUris = pluginState.getLocalServers(Infinity, [
+        //   /^http(?:s)?:/i
+        // ])
+
+        const { nowNodeApiKey } = initOptions
+        const nowNodeUris = serverConfigs
+          .filter(config => config.type === 'blockbook-nownode')
+          .map(config => config.uris)
+          .flat(1)
+
+        // If there are no HTTP servers, reject the promise
+        if (nowNodeUris.length < 1) {
+          // If no HTTP servers are available, and we had no connected blockbook
+          // instances, reject the promise with a message indicating no
+          // available connections. It's clear we have some connection instances
+          // if we gotten to this point, but we just don't have any of those
+          // instances connected at this time.
+          reject(
+            new Error('No available connections. Check your internet signal.')
+          )
+          return
+        }
+
+        // If there is no key for the NowNode servers:
+        if (nowNodeApiKey == null) {
+          reject(new Error('Missing connection key for fallback servers.'))
+          return
+        }
+
+        for (const uri of nowNodeUris) {
+          // HTTP Fallback
+          io.fetchCors(`${uri}/api/v2/sendtx/`, {
+            method: 'POST',
+            headers: {
+              'api-key': nowNodeApiKey
+            },
+            body: transaction.signedTx
           })
+            .then(async response => {
+              if (!response.ok) {
+                throw new Error(
+                  `Failed to broadcast transaction via Blockbook: HTTP ${response.status}`
+                )
+              }
+              const json = await response.json()
+              return _blockbookApi.asBlockbookResponse.call(void 0, (0, _blockbookApi.asBroadcastTxResponse))(json)
+            })
+            .then(response => {
+              if (!resolved) {
+                resolved = true
+                resolve(response.result)
+              }
+            })
+            .catch((e) => {
+              if (++bad === nowNodeUris.length) {
+                const msg = e != null ? `With error ${e.message}` : ''
+                log.error(
+                  `broadcastTx fail: ${JSON.stringify(transaction)}\n${msg}`
+                )
+                reject(e)
+              }
+            })
+        }
       }
     })
   }

package/lib/common/utxobased/engine/{makeUtxoEngine.js → UtxoEngine.js}

@@ -21,15 +21,15 @@ var _edgecorejs = require('edge-core-js');
 var _filterUndefined = require('../../../util/filterUndefined');
 var _unixTime = require('../../../util/unixTime');
 var _makeFees = require('../../fees/makeFees');
-var _makeEngineEmitter = require('../../plugin/makeEngineEmitter');
-var _makeMetadata = require('../../plugin/makeMetadata');
+var _EngineEmitter = require('../../plugin/EngineEmitter');
+var _Metadata = require('../../plugin/Metadata');
 
 var _upgradeMemos = require('../../upgradeMemos');
-var _makeProcessor = require('../db/makeProcessor');
 
 
 
 var _ProcessorTransaction = require('../db/Models/ProcessorTransaction');
+var _Processor = require('../db/Processor');
 
 var _utxo = require('../db/util/utxo');
 
@@ -47,8 +47,6 @@ var _cleaners3 = require('../keymanager/cleaners');
 var _keymanager = require('../keymanager/keymanager');
 var _types5 = require('../keymanager/types');
 var _utils = require('../keymanager/utxopicker/utils');
-var _makeUtxoEngineState = require('./makeUtxoEngineState');
-var _makeUtxoWalletTools = require('./makeUtxoWalletTools');
 var _paymentRequest = require('./paymentRequest');
 
 
@@ -63,6 +61,8 @@ var _getOwnUtxosFromTx = require('./util/getOwnUtxosFromTx');
 
 
 var _utils3 = require('./utils');
+var _UtxoEngineState = require('./UtxoEngineState');
+var _UtxoWalletTools = require('./UtxoWalletTools');
 
  async function makeUtxoEngine(
   config
@@ -111,7 +111,7 @@ var _utils3 = require('./utils');
     throw new Error(message)
   }
 
-  const walletTools = _makeUtxoWalletTools.makeUtxoWalletTools.call(void 0, {
+  const walletTools = _UtxoWalletTools.makeUtxoWalletTools.call(void 0, {
     pluginInfo,
     publicKey
   })
@@ -123,15 +123,15 @@ var _utils3 = require('./utils');
     log: config.options.log
   })
 
-  const metadata = await _makeMetadata.makeMetadata.call(void 0, {
+  const metadata = await _Metadata.makeMetadata.call(void 0, {
     disklet: walletLocalDisklet,
     emitter,
     log
   })
-  const processor = await _makeProcessor.makeProcessor.call(void 0, {
+  const processor = await _Processor.makeProcessor.call(void 0, {
     disklet: walletLocalDisklet
   })
-  const engineState = _makeUtxoEngineState.makeUtxoEngineState.call(void 0, {
+  const engineState = _UtxoEngineState.makeUtxoEngineState.call(void 0, {
     ...config,
     walletTools,
     walletInfo,
@@ -144,8 +144,9 @@ var _utils3 = require('./utils');
       const { canReplaceByFee = false } = currencyInfo
       if (!canReplaceByFee) return null
 
-      // Accelerate for legacy Airbitz wallets is not supported
-      if (privateKeyFormat === 'bip32') return null
+      // Accelerate for non-segwit wallets is not supported
+      if (privateKeyFormat === 'bip32' || privateKeyFormat === 'bip44')
+        return null
 
       // Get the replaced transaction from the processor:
       const replacedTxid = edgeTx.txid
@@ -350,7 +351,7 @@ var _utils3 = require('./utils');
 
     async startEngine() {
       emitter.emit(
-        _makeEngineEmitter.EngineEvent.WALLET_BALANCE_CHANGED,
+        _EngineEmitter.EngineEvent.WALLET_BALANCE_CHANGED,
         currencyInfo.currencyCode,
         metadata.state.balance
       )
@@ -717,7 +718,7 @@ var _utils3 = require('./utils');
         })
         if (rbfTx != null) {
           rbfTx.blockHeight = -1
-          await _makeUtxoEngineState.transactionChanged.call(void 0, {
+          await _UtxoEngineState.transactionChanged.call(void 0, {
             walletId: walletInfo.id,
             tx: rbfTx,
             pluginInfo,
@@ -729,7 +730,7 @@ var _utils3 = require('./utils');
       }
 
       const tx = _ProcessorTransaction.fromEdgeTransaction.call(void 0, edgeTx)
-      await _makeUtxoEngineState.transactionChanged.call(void 0, {
+      await _UtxoEngineState.transactionChanged.call(void 0, {
         walletId: walletInfo.id,
         tx,
         pluginInfo,
@@ -922,21 +923,21 @@ var _utils3 = require('./utils');
       // Make temporary wallet disklet
       const tmpDisklet = _disklet.makeMemoryDisklet.call(void 0, )
       const tmpEncryptedDisklet = _disklet.makeMemoryDisklet.call(void 0, )
-      const tmpEmitter = new (0, _makeEngineEmitter.EngineEmitter)()
+      const tmpEmitter = new (0, _EngineEmitter.EngineEmitter)()
       const tmpConfig = {
         disklet: tmpDisklet,
         emitter: tmpEmitter,
         log
       }
-      const tmpMetadata = await _makeMetadata.makeMetadata.call(void 0, tmpConfig)
-      const tmpProcessor = await _makeProcessor.makeProcessor.call(void 0, tmpConfig)
-      const tmpWalletTools = _makeUtxoWalletTools.makeUtxoWalletTools.call(void 0, {
+      const tmpMetadata = await _Metadata.makeMetadata.call(void 0, tmpConfig)
+      const tmpProcessor = await _Processor.makeProcessor.call(void 0, tmpConfig)
+      const tmpWalletTools = _UtxoWalletTools.makeUtxoWalletTools.call(void 0, {
         pluginInfo,
         publicKey: tmpWalletInfo.keys.publicKey
       })
 
       // Max spend after imported wallet finishes sync
-      tmpEmitter.on(_makeEngineEmitter.EngineEvent.ADDRESSES_CHECKED, async (ratio) => {
+      tmpEmitter.on(_EngineEmitter.EngineEvent.ADDRESSES_CHECKED, async (ratio) => {
         if (ratio === 1) {
           try {
             await tmpState.stop()
@@ -965,7 +966,7 @@ var _utils3 = require('./utils');
         }
       })
 
-      const tmpState = _makeUtxoEngineState.makeUtxoEngineState.call(void 0, {
+      const tmpState = _UtxoEngineState.makeUtxoEngineState.call(void 0, {
         ...config,
         options: {
           ...config.options,