edge-currency-plugins 2.5.4 → 2.6.1

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>;

package/lib/src/common/utxobased/engine/{makeServerStates.d.ts → ServerStates.d.ts}

@@ -1,13 +1,14 @@
-import { EdgeLog, EdgeTransaction } from 'edge-core-js/types';
-import { EngineEmitter } from '../../plugin/makeEngineEmitter';
-import { PluginState } from '../../plugin/pluginState';
+import { EdgeIo, EdgeLog, EdgeTransaction } from 'edge-core-js/types';
+import { EngineEmitter } from '../../plugin/EngineEmitter';
+import { PluginState } from '../../plugin/PluginState';
 import { PluginInfo } from '../../plugin/types';
 import { SafeWalletInfo } from '../keymanager/cleaners';
-import { BlockBook } from '../network/BlockBook';
+import { Blockbook } from '../network/Blockbook';
 import Deferred from '../network/Deferred';
 import { WsTask } from '../network/Socket';
+import { UtxoInitOptions } from './types';
 interface ServerState {
-    blockbook: BlockBook;
+    blockbook: Blockbook;
     blockSubscriptionStatus: 'unsubscribed' | 'subscribing' | 'subscribed';
     blockHeight: number;
     txids: Set<string>;
@@ -15,6 +16,8 @@ interface ServerState {
 }
 interface ServerStateConfig {
     engineEmitter: EngineEmitter;
+    initOptions: UtxoInitOptions;
+    io: EdgeIo;
     log: EdgeLog;
     pluginInfo: PluginInfo;
     pluginState: PluginState;

package/lib/src/common/utxobased/engine/{makeUtxoEngineState.d.ts → UtxoEngineState.d.ts}

@@ -1,15 +1,15 @@
 import { EdgeFreshAddress, EdgeIo, EdgeLog, EdgeTransaction } from 'edge-core-js/types';
-import { EngineEmitter } from '../../plugin/makeEngineEmitter';
-import { PluginState } from '../../plugin/pluginState';
+import { EngineEmitter } from '../../plugin/EngineEmitter';
+import { PluginState } from '../../plugin/PluginState';
 import { ChangePath, CurrencyFormat, EngineConfig, PluginInfo } from '../../plugin/types';
-import { Processor } from '../db/makeProcessor';
+import { Processor } from '../db/Processor';
 import { IAddress, IProcessorTransaction, IUTXO } from '../db/types';
 import { SafeWalletInfo } from '../keymanager/cleaners';
-import { BlockbookAccountUtxo } from '../network/BlockBookAPI';
+import { BlockbookAccountUtxo } from '../network/blockbookApi';
 import { WsTask } from '../network/Socket';
 import AwaitLock from './await-lock';
-import { ServerStates } from './makeServerStates';
-import { UTXOPluginWalletTools } from './makeUtxoWalletTools';
+import { ServerStates } from './ServerStates';
+import { UtxoWalletTools } from './UtxoWalletTools';
 export interface UtxoEngineState {
     processedPercent: number;
     start: () => Promise<void>;
@@ -28,7 +28,7 @@ export interface UtxoEngineState {
     processUtxos: (utxos: IUTXO[]) => Promise<void>;
 }
 export interface UtxoEngineStateConfig extends EngineConfig {
-    walletTools: UTXOPluginWalletTools;
+    walletTools: UtxoWalletTools;
     walletInfo: SafeWalletInfo;
     processor: Processor;
 }
@@ -36,7 +36,7 @@ export declare function makeUtxoEngineState(config: UtxoEngineStateConfig): Utxo
 interface CommonArgs {
     pluginInfo: PluginInfo;
     walletInfo: SafeWalletInfo;
-    walletTools: UTXOPluginWalletTools;
+    walletTools: UtxoWalletTools;
     processor: Processor;
     emitter: EngineEmitter;
     taskCache: TaskCache;
@@ -109,7 +109,7 @@ interface TransactionChangedArgs {
     walletId: string;
     tx: IProcessorTransaction;
     emitter: EngineEmitter;
-    walletTools: UTXOPluginWalletTools;
+    walletTools: UtxoWalletTools;
     pluginInfo: PluginInfo;
     processor: Processor;
 }

package/lib/src/common/utxobased/engine/{makeUtxoWalletTools.d.ts → UtxoWalletTools.d.ts}

@@ -7,7 +7,7 @@ export interface WalletToolsConfig {
     pluginInfo: PluginInfo;
     publicKey: PublicKey;
 }
-export interface UTXOPluginWalletTools {
+export interface UtxoWalletTools {
     getPubkey: (args: AddressPath) => string;
     getScriptPubkey: (args: AddressPath) => ScriptPubkeyReturn;
     getScriptPubkeyFromWif: (wif: string, format: CurrencyFormat) => ScriptPubkeyReturn;
@@ -49,5 +49,5 @@ interface SignMessageArgs {
     message: string;
     xprivKeys: CurrencyFormatKeys;
 }
-export declare function makeUtxoWalletTools(config: WalletToolsConfig): UTXOPluginWalletTools;
+export declare function makeUtxoWalletTools(config: WalletToolsConfig): UtxoWalletTools;
 export {};

package/lib/src/common/utxobased/engine/types.d.ts

@@ -1,5 +1,9 @@
 import { EdgeSpendInfo } from 'edge-core-js/types';
 import { Input, Output } from '../keymanager/utxopicker/types';
+export declare type UtxoInitOptions = ReturnType<typeof asUtxoInitOptions>;
+export declare const asUtxoInitOptions: import("cleaners").ObjectCleaner<{
+    nowNodeApiKey: string | undefined;
+}>;
 export declare const asUtxoUserSettings: import("cleaners").ObjectCleaner<{
     blockbookServers: string[];
     enableCustomServers: boolean;

package/lib/src/common/utxobased/engine/util/getOwnUtxosFromTx.d.ts

@@ -1,4 +1,4 @@
 import { EngineInfo } from '../../../plugin/types';
-import { Processor } from '../../db/makeProcessor';
+import { Processor } from '../../db/Processor';
 import { IProcessorTransaction, IUTXO } from '../../db/types';
 export declare const getOwnUtxosFromTx: (engineInfo: EngineInfo, processor: Processor, tx: IProcessorTransaction) => Promise<IUTXO[]>;

package/lib/src/common/utxobased/network/{BlockBook.d.ts → Blockbook.d.ts}

@@ -1,13 +1,13 @@
 import { Cleaner } from 'cleaners';
 import { EdgeLog, EdgeTransaction } from 'edge-core-js/types';
-import { EngineEmitter } from '../../plugin/makeEngineEmitter';
-import { AddressResponse, AddresssMessageParams, AddressUtxosResponse, BroadcastTxResponse, InfoResponse, SubscribeAddressResponse, TransactionResponse } from './BlockBookAPI';
+import { EngineEmitter } from '../../plugin/EngineEmitter';
+import { AddressResponse, AddresssMessageParams, AddressUtxosResponse, BroadcastTxResponse, InfoResponse, SubscribeAddressResponse, TransactionResponse } from './blockbookApi';
 import Deferred from './Deferred';
-import { SocketEmitter } from './MakeSocketEmitter';
 import { OnQueueSpaceCB } from './Socket';
+import { SocketEmitter } from './SocketEmitter';
 export declare type WatchAddressesCB = (response: SubscribeAddressResponse) => void | Promise<void>;
 export declare type WatchBlocksCB = () => void | Promise<void>;
-export interface BlockBook {
+export interface Blockbook {
     isConnected: boolean;
     connect: () => Promise<void>;
     disconnect: () => Promise<void>;
@@ -20,14 +20,14 @@ export interface BlockBook {
     fetchTransaction: (hash: string) => Promise<TransactionResponse>;
     broadcastTx: (transaction: EdgeTransaction) => Promise<BroadcastTxResponse>;
 }
-interface BlockBookConfig {
-    socketEmitter: SocketEmitter;
+interface BlockbookConfig {
+    asAddress?: Cleaner<string>;
+    connectionUri: string;
     engineEmitter: EngineEmitter;
-    wsAddress: string;
     log: EdgeLog;
-    walletId: string;
     onQueueSpaceCB: OnQueueSpaceCB;
-    asAddress?: Cleaner<string>;
+    socketEmitter: SocketEmitter;
+    walletId: string;
 }
-export declare function makeBlockBook(config: BlockBookConfig): BlockBook;
+export declare function makeBlockbook(config: BlockbookConfig): Blockbook;
 export {};

package/lib/src/common/utxobased/network/Socket.d.ts

@@ -1,7 +1,7 @@
 import { Cleaner } from 'cleaners';
 import { EdgeLog } from 'edge-core-js/types';
 import Deferred from './Deferred';
-import { SocketEmitter } from './MakeSocketEmitter';
+import { SocketEmitter } from './SocketEmitter';
 import { ReadyState } from './types';
 export declare type OnFailHandler = (error: Error) => void;
 export interface WsTask<T> {

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "2.5.4",
+  "version": "2.6.1",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
     "altcoin-js": "^1.0.0",
     "async-mutex": "^0.2.6",
-    "baselet": "^0.2.4",
+    "baselet": "^0.3.0",
     "biggystring": "^4.1.3",
     "bip32": "^2.0.5",
     "bip32grs": "^2.0.5",
@@ -107,4 +107,4 @@
     "typescript": "^4.1.2",
     "wif": "^2.0.6"
   }
-}
+}