edge-currency-plugins 2.5.4 → 2.6.0

package/lib/common/utxobased/engine/{makeUtxoEngineState.js → UtxoEngineState.js}

@@ -7,7 +7,7 @@ var _cleaners = require('cleaners');
 
 
 
-var _makeEngineEmitter = require('../../plugin/makeEngineEmitter');
+var _EngineEmitter = require('../../plugin/EngineEmitter');
 
 
 
@@ -18,13 +18,13 @@ var _makeEngineEmitter = require('../../plugin/makeEngineEmitter');
 
 
 var _utils = require('../../plugin/utils');
-
 var _ProcessorTransaction = require('../db/Models/ProcessorTransaction');
 
 
 
 
 
+
 var _types5 = require('../db/types');
 var _cleaners3 = require('../keymanager/cleaners');
 
@@ -42,13 +42,12 @@ var _keymanager = require('../keymanager/keymanager');
 
 
 
-var _BlockBookAPI = require('../network/BlockBookAPI');
+var _blockbookApi = require('../network/blockbookApi');
 var _Deferred = require('../network/Deferred'); var _Deferred2 = _interopRequireDefault(_Deferred);
 
 var _awaitlock = require('./await-lock'); var _awaitlock2 = _interopRequireDefault(_awaitlock);
 var _constants = require('./constants');
-var _makeServerStates = require('./makeServerStates');
-
+var _ServerStates = require('./ServerStates');
 
 
 
@@ -89,19 +88,23 @@ var _utils3 = require('./utils');
 
 
 
+
 
 
  function makeUtxoEngineState(
   config
 ) {
   const {
+    initOptions,
+    io,
+    options,
+    pluginState,
     pluginInfo,
-    walletInfo,
-    walletTools,
-    options: { emitter, log },
     processor,
-    pluginState
+    walletInfo,
+    walletTools
   } = config
+  const { emitter, log } = options
 
   const { walletFormats } = walletInfo.keys
 
@@ -170,14 +173,16 @@ var _utils3 = require('./utils');
         `processed changed, percent: ${percent}, processedCount: ${processedCount}, totalCount: ${expectedProccessCount}`
       )
       processedPercent = percent
-      emitter.emit(_makeEngineEmitter.EngineEvent.ADDRESSES_CHECKED, percent)
+      emitter.emit(_EngineEmitter.EngineEvent.ADDRESSES_CHECKED, percent)
     }
   }
 
   const lock = new (0, _awaitlock2.default)()
 
-  const serverStates = _makeServerStates.makeServerStates.call(void 0, {
+  const serverStates = _ServerStates.makeServerStates.call(void 0, {
     engineEmitter: emitter,
+    initOptions,
+    io,
     log,
     pluginInfo,
     pluginState,
@@ -191,7 +196,7 @@ var _utils3 = require('./utils');
     emitter,
     taskCache,
     updateProgressRatio,
-    io: config.io,
+    io,
     log,
     serverStates,
     pluginState,
@@ -218,7 +223,7 @@ var _utils3 = require('./utils');
   }
 
   emitter.on(
-    _makeEngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
+    _EngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
     async (_uri, _blockHeight) => {
       const txs = await processor.fetchTransactions({
         blockHeight: 0
@@ -231,7 +236,7 @@ var _utils3 = require('./utils');
   )
 
   emitter.on(
-    _makeEngineEmitter.EngineEvent.NEW_ADDRESS_TRANSACTION,
+    _EngineEmitter.EngineEvent.NEW_ADDRESS_TRANSACTION,
     async (_uri, response) => {
       const state = taskCache.addressSubscribeCache[response.address]
       if (state != null) {
@@ -317,7 +322,7 @@ var _utils3 = require('./utils');
     // because we want to only propagate the wallet balance change event after
     // initialization is complete.
     emitter.emit(
-      _makeEngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
+      _EngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
       pluginInfo.currencyInfo.currencyCode,
       addressBalanceChanges
     )
@@ -695,7 +700,7 @@ const addToAddressTransactionCache = async (
   args
 ) => {
   const { emitter, walletTools, processor, pluginInfo, tx, walletId } = args
-  emitter.emit(_makeEngineEmitter.EngineEvent.TRANSACTIONS_CHANGED, [
+  emitter.emit(_EngineEmitter.EngineEvent.TRANSACTIONS_CHANGED, [
     await _ProcessorTransaction.toEdgeTransaction.call(void 0, {
       walletId,
       tx,
@@ -1002,7 +1007,7 @@ const updateTransactionsSpecific = (
       taskCache.updateTransactionSpecificCache[txId] = { processing: false }
     })
   return {
-    ..._BlockBookAPI.transactionMessageSpecific.call(void 0, txId),
+    ..._blockbookApi.transactionMessageSpecific.call(void 0, txId),
     deferred
   }
 }
@@ -1073,7 +1078,7 @@ const updateTransactions = (
       taskCache.updateTransactionCache[txId] = { processing: false }
     })
   return {
-    ..._BlockBookAPI.transactionMessage.call(void 0, txId),
+    ..._blockbookApi.transactionMessage.call(void 0, txId),
     deferred
   }
 }
@@ -1293,7 +1298,7 @@ const processAddressTransactions = async (
     })
 
   return {
-    ..._BlockBookAPI.addressMessage.call(void 0, address, asBlockbookAddress, {
+    ..._blockbookApi.addressMessage.call(void 0, address, asBlockbookAddress, {
       details: 'txs',
       from: addressData.lastQueriedBlockHeight,
       pageSize: _constants.BLOCKBOOK_TXS_PER_PAGE,
@@ -1426,7 +1431,7 @@ const processAddressUtxos = async (
     })
 
   return {
-    ..._BlockBookAPI.addressUtxosMessage.call(void 0, address, asBlockbookAddress),
+    ..._blockbookApi.addressUtxosMessage.call(void 0, address, asBlockbookAddress),
     deferred
   }
 }
@@ -1501,7 +1506,7 @@ const processProcessorUtxos = async (
   if (newBalance !== oldBalance) {
     log('address balance changed:', { scriptPubkey, oldBalance, newBalance })
     emitter.emit(
-      _makeEngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
+      _EngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
       currencyInfo.currencyCode,
       [
         {
@@ -1630,7 +1635,7 @@ const processRawUtxo = async (
               }
             })
           return {
-            ..._BlockBookAPI.transactionMessage.call(void 0, utxo.txid),
+            ..._blockbookApi.transactionMessage.call(void 0, utxo.txid),
             deferred
           }
         } else {

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

@@ -12,6 +12,11 @@ var _cleaners = require('cleaners');
 var _types3 = require('../../plugin/types');
 
 
+
+ const asUtxoInitOptions = _cleaners.asObject.call(void 0, {
+  nowNodeApiKey: _cleaners.asOptional.call(void 0, _cleaners.asString)
+}); exports.asUtxoInitOptions = asUtxoInitOptions
+
  const asUtxoUserSettings = _cleaners.asObject.call(void 0, {
   blockbookServers: _cleaners.asMaybe.call(void 0, _cleaners.asArray.call(void 0, _cleaners.asString), []),
   enableCustomServers: _cleaners.asMaybe.call(void 0, _cleaners.asBoolean, false)

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

@@ -54,6 +54,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['btcbook.nownodes.io']
+    }
+  ],
   formats: ['bip49', 'bip84', 'bip44', 'bip32'],
   forks: ['bitcoincash', 'bitcoingold'],
   gapLimit: 25,

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

@@ -56,6 +56,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['bchbook.nownodes.io']
+    }
+  ],
   formats: ['bip44', 'bip32'],
   forks: [], // 'bitcoinsv' is currently disabled, so not included in the forks
   gapLimit: 10,

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

@@ -49,6 +49,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['dashbook.nownodes.io']
+    }
+  ],
   formats: ['bip44', 'bip32'],
   gapLimit: 10,
   defaultFee: 10000,

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

@@ -40,6 +40,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['dgbbook.nownodes.io']
+    }
+  ],
   formats: ['bip49', 'bip84', 'bip44', 'bip32'],
   forks: [],
   gapLimit: 10,

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

@@ -45,6 +45,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['https://dogebook.nownodes.io']
+    }
+  ],
   formats: ['bip44', 'bip32'],
   gapLimit: 10,
   defaultFee: 1000,

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

@@ -46,6 +46,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['grsbook.nownodes.io']
+    }
+  ],
   formats: ['bip49', 'bip84', 'bip44', 'bip32'],
   gapLimit: 10,
   defaultFee: 100000,

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

@@ -52,6 +52,12 @@ var _commonInfo = require('./commonInfo');
 }; exports.currencyInfo = currencyInfo
 
  const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['ltcbook.nownodes.io']
+    }
+  ],
   formats: ['bip49', 'bip84', 'bip44', 'bip32'],
   gapLimit: 10,
   defaultFee: 50000,

package/lib/common/utxobased/network/{BlockBook.js → Blockbook.js}

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 
-var _makeEngineEmitter = require('../../plugin/makeEngineEmitter');
+var _EngineEmitter = require('../../plugin/EngineEmitter');
 
 
 
@@ -20,9 +20,8 @@ var _makeEngineEmitter = require('../../plugin/makeEngineEmitter');
 
 
 
-var _BlockBookAPI = require('./BlockBookAPI');
+var _blockbookApi = require('./blockbookApi');
 var _Deferred = require('./Deferred'); var _Deferred2 = _interopRequireDefault(_Deferred);
-
 var _Socket = require('./Socket');
 
 
@@ -70,17 +69,18 @@ var _Socket = require('./Socket');
 
 
 
- function makeBlockBook(config) {
+
+ function makeBlockbook(config) {
   const {
-    wsAddress,
-    socketEmitter,
+    asAddress,
+    connectionUri,
     engineEmitter,
     log,
     onQueueSpaceCB,
-    walletId,
-    asAddress
+    socketEmitter,
+    walletId
   } = config
-  log(`makeBlockBook with uri ${wsAddress}`)
+  log(`makeBlockbook with uri ${connectionUri}`)
 
   const instance = {
     isConnected: false,
@@ -96,7 +96,7 @@ var _Socket = require('./Socket');
     broadcastTx
   }
 
-  const socket = _Socket.makeSocket.call(void 0, wsAddress, {
+  const socket = _Socket.makeSocket.call(void 0, connectionUri, {
     healthCheck: ping,
     onQueueSpaceCB,
     log,
@@ -105,7 +105,7 @@ var _Socket = require('./Socket');
   })
 
   async function connect() {
-    log(`connecting to blockbook socket with uri ${wsAddress}`)
+    log(`connecting to blockbook socket with uri ${connectionUri}`)
     if (instance.isConnected) return
 
     await socket.connect()
@@ -114,7 +114,7 @@ var _Socket = require('./Socket');
 
   async function disconnect() {
     log(
-      `disconnecting from blockbook socket with uri ${wsAddress}, currently connected: ${instance.isConnected}`
+      `disconnecting from blockbook socket with uri ${connectionUri}, currently connected: ${instance.isConnected}`
     )
     if (!instance.isConnected) return
 
@@ -133,28 +133,28 @@ var _Socket = require('./Socket');
   }
 
   async function ping() {
-    await promisifyWsMessage(_BlockBookAPI.pingMessage.call(void 0, ))
+    await promisifyWsMessage(_blockbookApi.pingMessage.call(void 0, ))
   }
 
   async function fetchInfo() {
-    return await promisifyWsMessage(_BlockBookAPI.infoMessage.call(void 0, ))
+    return await promisifyWsMessage(_blockbookApi.infoMessage.call(void 0, ))
   }
 
   async function fetchAddressUtxos(
     account
   ) {
-    return await promisifyWsMessage(_BlockBookAPI.addressUtxosMessage.call(void 0, account))
+    return await promisifyWsMessage(_blockbookApi.addressUtxosMessage.call(void 0, account))
   }
 
   async function fetchTransaction(hash) {
-    return await promisifyWsMessage(_BlockBookAPI.transactionMessage.call(void 0, hash))
+    return await promisifyWsMessage(_blockbookApi.transactionMessage.call(void 0, hash))
   }
 
   async function fetchAddress(
     address,
     params = {}
   ) {
-    return await promisifyWsMessage(_BlockBookAPI.addressMessage.call(void 0, address, asAddress, params))
+    return await promisifyWsMessage(_blockbookApi.addressMessage.call(void 0, address, asAddress, params))
   }
 
   async function watchBlocks(
@@ -162,13 +162,13 @@ var _Socket = require('./Socket');
   ) {
     const socketCb = async (res) => {
       engineEmitter.emit(
-        _makeEngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
-        wsAddress,
+        _EngineEmitter.EngineEvent.BLOCK_HEIGHT_CHANGED,
+        connectionUri,
         res.height
       )
     }
     socket.subscribe({
-      ..._BlockBookAPI.subscribeNewBlockMessage.call(void 0, ),
+      ..._blockbookApi.subscribeNewBlockMessage.call(void 0, ),
       cb: socketCb,
       deferred: deferredBlockSub,
       subscribed: false
@@ -180,10 +180,14 @@ var _Socket = require('./Socket');
     deferredAddressSub
   ) {
     const socketCb = async (res) => {
-      engineEmitter.emit(_makeEngineEmitter.EngineEvent.NEW_ADDRESS_TRANSACTION, wsAddress, res)
+      engineEmitter.emit(
+        _EngineEmitter.EngineEvent.NEW_ADDRESS_TRANSACTION,
+        connectionUri,
+        res
+      )
     }
     socket.subscribe({
-      ..._BlockBookAPI.subscribeAddressesMessage.call(void 0, addresses, asAddress),
+      ..._blockbookApi.subscribeAddressesMessage.call(void 0, addresses, asAddress),
       cb: socketCb,
       deferred: deferredAddressSub,
       subscribed: false
@@ -193,8 +197,8 @@ var _Socket = require('./Socket');
   async function broadcastTx(
     transaction
   ) {
-    return await promisifyWsMessage(_BlockBookAPI.broadcastTxMessage.call(void 0, transaction))
+    return await promisifyWsMessage(_blockbookApi.broadcastTxMessage.call(void 0, transaction))
   }
 
   return instance
-} exports.makeBlockBook = makeBlockBook;
+} exports.makeBlockbook = makeBlockbook;

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

@@ -3,8 +3,8 @@
 
 var _utils = require('../../plugin/utils');
 
-var _MakeSocketEmitter = require('./MakeSocketEmitter');
 var _nodejsWS = require('./nodejsWS');
+var _SocketEmitter = require('./SocketEmitter');
 var _socketQueue = require('./socketQueue');
 var _types3 = require('./types');
 var _windowWS = require('./windowWS');
@@ -120,7 +120,7 @@ const WAKE_UP_MS = 5000 // interval at which we wakeUp and potentially onQueueSp
     }
     pendingMessages = {}
     try {
-      emitter.emit(_MakeSocketEmitter.SocketEvent.CONNECTION_CLOSE, uri, err)
+      emitter.emit(_SocketEmitter.SocketEvent.CONNECTION_CLOSE, uri, err)
     } catch (e) {
       log.error(e.message)
     }
@@ -135,7 +135,7 @@ const WAKE_UP_MS = 5000 // interval at which we wakeUp and potentially onQueueSp
     connected = true
     lastKeepAlive = Date.now()
     try {
-      emitter.emit(_MakeSocketEmitter.SocketEvent.CONNECTION_OPEN, uri)
+      emitter.emit(_SocketEmitter.SocketEvent.CONNECTION_OPEN, uri)
     } catch (e) {
       handleError(e)
     }
@@ -224,7 +224,7 @@ const WAKE_UP_MS = 5000 // interval at which we wakeUp and potentially onQueueSp
       config
         .healthCheck()
         .then(() => {
-          emitter.emit(_MakeSocketEmitter.SocketEvent.CONNECTION_TIMER, uri, now)
+          emitter.emit(_SocketEmitter.SocketEvent.CONNECTION_TIMER, uri, now)
         })
         .catch((e) => handleError(e))
     }

package/lib/firo.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 _zcoin = require('./common/utxobased/info/zcoin');
 
 const plugin = (options) =>
-  _makeCurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _zcoin.info)
+  _CurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _zcoin.info)
 
 if (typeof window !== 'undefined') {
   _optionalChain([window, 'access', _ => _.addEdgeCorePlugins, 'optionalCall', _2 => _2({

package/lib/ftc.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 _feathercoin = require('./common/utxobased/info/feathercoin');
 
 const plugin = (options) =>
-  _makeCurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _feathercoin.info)
+  _CurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _feathercoin.info)
 
 if (typeof window !== 'undefined') {
   _optionalChain([window, 'access', _ => _.addEdgeCorePlugins, 'optionalCall', _2 => _2({

package/lib/index.js

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _createNamedExportFrom(obj, localName, importedName) { Object.defineProperty(exports, localName, {enumerable: true, get: () => obj[importedName]}); } 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 _all = require('./common/utxobased/info/all');
 
 const plugins = {}
 
 for (const info of _all.all) {
   plugins[info.currencyInfo.pluginId] = (options) =>
-    _makeCurrencyPlugin.makeCurrencyPlugin.call(void 0, options, info)
+    _CurrencyPlugin.makeCurrencyPlugin.call(void 0, options, info)
 }
 
 if (typeof window !== 'undefined') {

package/lib/ltc.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 _litecoin = require('./common/utxobased/info/litecoin');
 
 const plugin = (options) =>
-  _makeCurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _litecoin.info)
+  _CurrencyPlugin.makeCurrencyPlugin.call(void 0, options, _litecoin.info)
 
 if (typeof window !== 'undefined') {
   _optionalChain([window, 'access', _ => _.addEdgeCorePlugins, 'optionalCall', _2 => _2({

package/lib/src/common/plugin/{makeEngineEmitter.d.ts → EngineEmitter.d.ts}

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { EdgeCurrencyEngineCallbacks, EdgeTransaction, EdgeTxidMap } from 'edge-core-js/types';
 import { EventEmitter } from 'events';
-import { SubscribeAddressResponse } from '../utxobased/network/BlockBookAPI';
+import { SubscribeAddressResponse } from '../utxobased/network/blockbookApi';
 export declare interface EngineEmitter {
     emit: ((event: EngineEvent.TRANSACTIONS_CHANGED, transactions: EdgeTransaction[]) => boolean) & ((event: EngineEvent.ADDRESS_BALANCE_CHANGED, currencyCode: string, addressBalanceChanges: Array<{
         scriptPubkey: string;

package/lib/src/common/plugin/{makeMetadata.d.ts → Metadata.d.ts}

@@ -1,6 +1,6 @@
 import { Disklet } from 'disklet';
 import { EdgeLog } from 'edge-core-js/types';
-import { EngineEmitter } from './makeEngineEmitter';
+import { EngineEmitter } from './EngineEmitter';
 import { LocalWalletMetadata } from './types';
 interface MetadataConfig {
     disklet: Disklet;

package/lib/src/common/plugin/{pluginState.d.ts → PluginState.d.ts}

@@ -1,7 +1,7 @@
 import { Disklet } from 'disklet';
 import { EdgeIo, EdgeLog } from 'edge-core-js/types';
-import { UtxoEngineState } from '../utxobased/engine/makeUtxoEngineState';
 import { UtxoUserSettings } from '../utxobased/engine/types';
+import { UtxoEngineState } from '../utxobased/engine/UtxoEngineState';
 /** A JSON object (as opposed to an array or primitive). */
 interface JsonObject {
     [name: string]: unknown;
@@ -26,7 +26,7 @@ export interface PluginState {
     serverScoreDown: (uri: string) => void;
     serverScoreUp: (uri: string, score: number) => void;
     clearCache: () => Promise<void>;
-    getLocalServers: (numServersWanted: number, includePatterns: string[]) => string[];
+    getLocalServers: (numServersWanted: number, includePatterns?: Array<string | RegExp>) => string[];
     refreshServers: () => Promise<void>;
     updateServers: (settings: UtxoUserSettings) => Promise<void>;
 }

package/lib/src/common/plugin/{serverScores.d.ts → ServerScores.d.ts}

@@ -56,6 +56,6 @@ export declare class ServerScores {
     serverScoreUp(servers: ServerList, serverUrl: string, responseTimeMilliseconds: number, changeScore?: number): void;
     serverScoreDown(servers: ServerList, serverUrl: string, changeScore?: number): void;
     setResponseTime(servers: ServerList, serverUrl: string, responseTimeMilliseconds: number): void;
-    getServers(servers: ServerList, numServersWanted: number, includePatterns?: string[]): string[];
+    getServers(servers: ServerList, numServersWanted: number, includePatterns?: Array<string | RegExp>): string[];
 }
 export {};

package/lib/src/common/plugin/types.d.ts

@@ -6,10 +6,11 @@ import { Disklet } from 'disklet';
 import { EdgeCurrencyEngineOptions, EdgeCurrencyInfo, EdgeCurrencyTools, EdgeIo, EdgeParsedUri, EdgeWalletInfo } from 'edge-core-js/types';
 import * as wif from 'wif';
 import { IProcessorTransaction, IUTXO } from '../utxobased/db/types';
+import { UtxoInitOptions } from '../utxobased/engine/types';
 import { ScriptTemplates } from '../utxobased/info/scriptTemplates/types';
 import { UtxoPicker } from '../utxobased/keymanager/utxopicker';
-import { EngineEmitter } from './makeEngineEmitter';
-import { PluginState } from './pluginState';
+import { EngineEmitter } from './EngineEmitter';
+import { PluginState } from './PluginState';
 export declare type CurrencyFormat = ReturnType<typeof asCurrencyFormat>;
 export declare const asCurrencyFormat: Cleaner<"bip32" | "bip44" | "bip49" | "bip84">;
 export interface ChangePath {
@@ -42,9 +43,14 @@ export interface EngineInfo {
     mempoolSpaceFeeInfoServer?: string;
     defaultFeeInfo: FeeInfo;
     scriptTemplates?: ScriptTemplates;
+    serverConfigs?: ServerConfig[];
     asBlockbookAddress?: Cleaner<string>;
     txSpecificHandling?: (tx: IProcessorTransaction, specialTx: unknown) => IProcessorTransaction;
 }
+export interface ServerConfig {
+    type: 'blockbook-nownode';
+    uris: string[];
+}
 /**
  * Coin Info
  */
@@ -124,6 +130,7 @@ export interface EngineConfig {
     pluginDisklet: Disklet;
     currencyTools: EdgeCurrencyTools;
     options: EngineOptions;
+    initOptions: UtxoInitOptions;
     io: EdgeIo;
     pluginState: PluginState;
 }

package/lib/src/common/utxobased/db/Models/ProcessorTransaction.d.ts

@@ -1,13 +1,13 @@
 import { EdgeTransaction } from 'edge-core-js/types';
 import { PluginInfo } from '../../../plugin/types';
-import { UTXOPluginWalletTools } from '../../engine/makeUtxoWalletTools';
-import { Processor } from '../makeProcessor';
+import { UtxoWalletTools } from '../../engine/UtxoWalletTools';
+import { Processor } from '../Processor';
 import { IProcessorTransaction } from '../types';
 export declare const fromEdgeTransaction: (tx: EdgeTransaction) => IProcessorTransaction;
 interface ToEdgeTransactionArgs {
     walletId: string;
     tx: IProcessorTransaction;
-    walletTools: UTXOPluginWalletTools;
+    walletTools: UtxoWalletTools;
     processor: Processor;
     pluginInfo: PluginInfo;
 }

package/lib/src/common/utxobased/db/util/utxo.d.ts

@@ -1,3 +1,3 @@
-import { Processor } from '../makeProcessor';
+import { Processor } from '../Processor';
 import { IProcessorTransaction, IUTXO } from '../types';
 export declare const utxoFromProcessorTransactionInput: (processor: Processor, processorTransaction: IProcessorTransaction, inputIndex: number) => Promise<IUTXO>;