edge-currency-plugins 1.2.2 → 1.3.0

package/lib/common/plugin/makeMetadata.js

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _biggystring = require('biggystring'); var bs = _interopRequireWildcard(_biggystring);
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }var _biggystring = require('biggystring');
 
 
 var _memlet = require('memlet');
@@ -6,6 +6,7 @@ var _memlet = require('memlet');
 var _awaitlock = require('../utxobased/engine/await-lock'); var _awaitlock2 = _interopRequireDefault(_awaitlock);
 var _makeEngineEmitter = require('./makeEngineEmitter');
 var _types3 = require('./types');
+var _utils = require('./utils');
 
 const metadataPath = `metadata.json`
 
@@ -19,6 +20,7 @@ const metadataPath = `metadata.json`
 
 
 
+
  const makeMetadata = async (
   config
 ) => {
@@ -27,11 +29,8 @@ const metadataPath = `metadata.json`
   const lock = new (0, _awaitlock2.default)()
 
   const instance = {
-    get balance() {
-      return cache.balance
-    },
-    get lastSeenBlockHeight() {
-      return cache.lastSeenBlockHeight
+    get state() {
+      return cache
     },
     clear: async () => {
       await memlet.delete(metadataPath)
@@ -40,18 +39,37 @@ const metadataPath = `metadata.json`
     }
   }
 
+  const updateWalletBalance = async (currencyCode) => {
+    const cumulativeBalance = Object.values(cache.addressBalances).reduce(
+      (sum, addressBalance) => _biggystring.add.call(void 0, sum, addressBalance),
+      '0'
+    )
+    cache.balance = cumulativeBalance
+    await setMetadata(cache)
+    emitter.emit(
+      _makeEngineEmitter.EngineEvent.WALLET_BALANCE_CHANGED,
+      currencyCode,
+      cumulativeBalance
+    )
+  }
+
   emitter.on(
     _makeEngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
-    async (currencyCode, balanceDiff) => {
+    async (
+      currencyCode,
+      addressBalanceChanges
+    ) => {
       await lock.acquireAsync()
       try {
-        cache.balance = bs.add(cache.balance, balanceDiff)
-        emitter.emit(
-          _makeEngineEmitter.EngineEvent.WALLET_BALANCE_CHANGED,
-          currencyCode,
-          cache.balance
-        )
-        await setMetadata(cache)
+        addressBalanceChanges.forEach(({ scriptPubkey, balance }) => {
+          if (balance === '0') {
+            _utils.removeItem.call(void 0, cache.addressBalances, scriptPubkey)
+          } else {
+            cache.addressBalances[scriptPubkey] = balance
+          }
+        })
+
+        await updateWalletBalance(currencyCode)
       } catch (err) {
         log.error(err)
       } finally {
@@ -83,6 +101,7 @@ const metadataPath = `metadata.json`
   const resetMetadata = async () => {
     const data = {
       balance: '0',
+      addressBalances: {},
       lastSeenBlockHeight: 0
     }
     await memlet.setJson(metadataPath, data)

package/lib/common/plugin/types.js

@@ -167,5 +167,7 @@ var _cleaners = require('cleaners');
 
  const asLocalWalletMetadata = _cleaners.asObject.call(void 0, {
   balance: _cleaners.asString,
+  // scriptPubkey -> balance
+  addressBalances: _cleaners.asObject.call(void 0, _cleaners.asString),
   lastSeenBlockHeight: _cleaners.asNumber
 }); exports.asLocalWalletMetadata = asLocalWalletMetadata

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

@@ -58,10 +58,11 @@ var _keymanager = require('../../keymanager/keymanager');
 
 
 
+
  const toEdgeTransaction = async (
   args
 ) => {
-  const { tx, processor, walletTools, pluginInfo } = args
+  const { tx, processor, walletTools, pluginInfo, walletId } = args
   const { engineInfo, currencyInfo } = pluginInfo
   const ourReceiveAddresses = []
   for (const out of tx.ourOuts) {
@@ -69,7 +70,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
@@ -114,6 +115,7 @@ var _keymanager = require('../../keymanager/keymanager');
   } catch (e) {}
 
   return {
+    walletId,
     currencyCode: currencyInfo.currencyCode,
     txid: tx.txid,
     blockHeight: tx.blockHeight,

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

@@ -13,6 +13,7 @@ var _disklet = require('disklet');
 
 
 
+
 var _types = require('edge-core-js/types');
 
 var _filterUndefined = require('../../../util/filterUndefined');
@@ -124,7 +125,7 @@ var _utils = require('./utils');
       emitter.emit(
         _makeEngineEmitter.EngineEvent.WALLET_BALANCE_CHANGED,
         currencyInfo.currencyCode,
-        metadata.balance
+        metadata.state.balance
       )
 
       pluginState.addEngine(engineState)
@@ -139,11 +140,11 @@ var _utils = require('./utils');
     },
 
     getBalance(_opts) {
-      return metadata.balance
+      return metadata.state.balance
     },
 
     getBlockHeight() {
-      return metadata.lastSeenBlockHeight
+      return metadata.state.lastSeenBlockHeight
     },
 
     async addCustomToken(_token) {
@@ -196,6 +197,7 @@ var _utils = require('./utils');
             primaryFormat,
             walletFormats
           },
+          metadataState: metadata.state,
           processorState: await processor.dumpData(),
           pluginState: pluginState.dumpData()
         }
@@ -226,9 +228,10 @@ var _utils = require('./utils');
     },
 
     async getFreshAddress(
-      _opts
+      opts
     ) {
-      return await engineState.getFreshAddress()
+      const { forceIndex } = opts
+      return await engineState.getFreshAddress({ forceIndex })
     },
 
     getNumTransactions(_opts) {
@@ -259,6 +262,7 @@ var _utils = require('./utils');
         txs.map(
           async (tx) =>
             await _ProcessorTransaction.toEdgeTransaction.call(void 0, {
+              walletId: walletInfo.id,
               tx,
               walletTools,
               processor,
@@ -280,7 +284,13 @@ var _utils = require('./utils');
       options
     ) {
       const { spendTargets } = edgeSpendInfo
-      const { outputSort = 'bip69' } = _nullishCoalesce(edgeSpendInfo.otherParams, () => ( {}))
+      const { outputSort = 'bip69', utxoSourceAddress, forceChangeAddress } =
+        _nullishCoalesce(edgeSpendInfo.otherParams, () => ( {}))
+
+      let utxoScriptPubkey
+      if (utxoSourceAddress != null) {
+        utxoScriptPubkey = walletTools.addressToScriptPubkey(utxoSourceAddress)
+      }
 
       if (_optionalChain([options, 'optionalAccess', _5 => _5.CPFP]) == null && spendTargets.length < 1) {
         throw new Error('Need to provide Spend Targets')
@@ -292,7 +302,12 @@ var _utils = require('./utils');
       )
       const utxos =
         await _asyncNullishCoalesce(await _asyncOptionalChain([options, 'optionalAccess', async _6 => _6.utxos]), async () => (
-        ((await processor.fetchUtxos({ utxoIds: [] })) )))
+        _filterUndefined.filterUndefined.call(void 0, 
+          (await processor.fetchUtxos({
+            scriptPubkey: utxoScriptPubkey,
+            utxoIds: []
+          })) 
+        )))
 
       if (
         bs.gt(totalAmountToSend, `${_utils.sumUtxos.call(void 0, utxos)}`) ||
@@ -352,9 +367,12 @@ var _utils = require('./utils');
         throw new Error('Need to provide Spend Targets')
       }
 
-      const freshAddress = await engineState.getFreshAddress(1)
+      const freshAddress = await engineState.getFreshAddress({ branch: 1 })
       const freshChangeAddress =
-        _nullishCoalesce(freshAddress.segwitAddress, () => ( freshAddress.publicAddress))
+        _nullishCoalesce(_nullishCoalesce(forceChangeAddress, () => (
+        freshAddress.segwitAddress)), () => (
+        freshAddress.publicAddress))
+
       const setRBF = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _9 => _9.setRBF]), () => ( false))
       const rbfTxid = edgeSpendInfo.rbfTxid
       let maxUtxo
@@ -442,6 +460,7 @@ var _utils = require('./utils');
       }
 
       const transaction = {
+        walletId: walletInfo.id,
         ourReceiveAddresses,
         otherParams,
         currencyCode: currencyInfo.currencyCode,
@@ -479,6 +498,7 @@ var _utils = require('./utils');
     async saveTx(edgeTx) {
       const tx = _ProcessorTransaction.fromEdgeTransaction.call(void 0, edgeTx)
       await _makeUtxoEngineState.transactionChanged.call(void 0, {
+        walletId: walletInfo.id,
         tx,
         pluginInfo,
         emitter,
@@ -567,6 +587,7 @@ var _utils = require('./utils');
           transaction.signedTx,
           transaction.currencyCode
         )
+        if (transaction.otherParams == null) transaction.otherParams = {}
         Object.assign(transaction.otherParams, {
           paymentProtocolInfo: {
             ...paymentProtocolInfo,
@@ -644,7 +665,7 @@ var _utils = require('./utils');
               throw new Error('Private key has no funds')
             }
             const destAddress = await this.getFreshAddress({})
-            const nativeAmount = tmpMetadata.balance
+            const nativeAmount = tmpMetadata.state.balance
             const options = { utxos: tmpUtxos, subtractFee: true }
             spendInfo.spendTargets = [
               { publicAddress: destAddress.publicAddress, nativeAmount }

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

@@ -84,6 +84,9 @@ var _utils3 = require('./utils');
 
 
 
+
+
+
 
 
 
@@ -258,6 +261,11 @@ var _utils3 = require('./utils');
   // processed by the processor. This happens only once before any call to
   // setLookAhead.
   const initializeAddressSubscriptions = async () => {
+    const addressBalanceChanges
+
+
+ = []
+
     for (const format of walletFormats) {
       const branches = _utils3.getFormatSupportedBranches.call(void 0, format)
       for (const branch of branches) {
@@ -289,6 +297,10 @@ var _utils3 = require('./utils');
             format
           })
           addressesToSubscribe.add(address)
+          addressBalanceChanges.push({
+            scriptPubkey: processorAddress.scriptPubkey,
+            balance: processorAddress.balance
+          })
         }
         addToAddressSubscribeCache(commonArgs.taskCache, addressesToSubscribe, {
           format,
@@ -296,6 +308,15 @@ var _utils3 = require('./utils');
         })
       }
     }
+
+    // Only emit address balance events after processing all initial addresses
+    // because we want to only propagate the wallet balance change event after
+    // initialization is complete.
+    emitter.emit(
+      _makeEngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
+      pluginInfo.currencyInfo.currencyCode,
+      addressBalanceChanges
+    )
   }
 
   return {
@@ -314,28 +335,48 @@ var _utils3 = require('./utils');
       running = false
     },
 
-    async getFreshAddress(branch = 0) {
+    async getFreshAddress({
+      branch = 0,
+      forceIndex
+    }) {
       const walletPurpose = _utils3.currencyFormatToPurposeType.call(void 0, 
         walletInfo.keys.primaryFormat
       )
       if (walletPurpose === _keymanager.BIP43PurposeTypeEnum.Segwit) {
-        const { address: publicAddress } = await internalGetFreshAddress({
+        const {
+          address: publicAddress,
+          nativeBalance = '0',
+          legacyAddress
+        } = await internalGetFreshAddress({
           ...commonArgs,
           format: _utils3.getCurrencyFormatFromPurposeType.call(void 0, 
             _keymanager.BIP43PurposeTypeEnum.WrappedSegwit
           ),
+          forceIndex,
           changeIndex: branch
         })
 
-        const { address: segwitAddress } = await internalGetFreshAddress({
+        const {
+          address: segwitAddress,
+          nativeBalance: segwitNativeBalance = '0'
+        } = await internalGetFreshAddress({
           ...commonArgs,
           format: _utils3.getCurrencyFormatFromPurposeType.call(void 0, _keymanager.BIP43PurposeTypeEnum.Segwit),
+          forceIndex,
           changeIndex: branch
         })
 
         return {
+          nativeBalance,
           publicAddress,
-          segwitAddress
+          legacyNativeBalance:
+            legacyAddress !== publicAddress ? nativeBalance : undefined,
+          // Legacy address is just a different encoding of the standard public address
+          // and therefore would have the same balance
+          legacyAddress:
+            legacyAddress !== publicAddress ? legacyAddress : undefined,
+          segwitAddress,
+          segwitNativeBalance
         }
       } else {
         // Airbitz wallets only use branch 0
@@ -345,15 +386,22 @@ var _utils3 = require('./utils');
 
         const {
           address: publicAddress,
+          nativeBalance = '0',
           legacyAddress
         } = await internalGetFreshAddress({
           ...commonArgs,
           format: _utils3.getCurrencyFormatFromPurposeType.call(void 0, walletPurpose),
+          forceIndex,
           changeIndex: branch
         })
 
         return {
+          nativeBalance,
           publicAddress,
+          legacyNativeBalance:
+            legacyAddress !== publicAddress ? nativeBalance : undefined,
+          // Legacy address is just a different encoding of the standard public address
+          // and therefore would have the same balance
           legacyAddress:
             legacyAddress !== publicAddress ? legacyAddress : undefined
         }
@@ -656,12 +704,14 @@ const addToAddressTransactionCache = async (
 
 
 
+
  const transactionChanged = async (
   args
 ) => {
-  const { emitter, walletTools, processor, pluginInfo, tx } = args
+  const { emitter, walletTools, processor, pluginInfo, tx, walletId } = args
   emitter.emit(_makeEngineEmitter.EngineEvent.TRANSACTIONS_CHANGED, [
     await _ProcessorTransaction.toEdgeTransaction.call(void 0, {
+      walletId,
       tx,
       walletTools,
       processor,
@@ -912,7 +962,15 @@ const addToAddressTransactionCache = async (
 const updateTransactionsSpecific = (
   args
 ) => {
-  const { emitter, walletTools, txId, pluginInfo, processor, taskCache } = args
+  const {
+    walletInfo,
+    emitter,
+    walletTools,
+    txId,
+    pluginInfo,
+    processor,
+    taskCache
+  } = args
   const deferred = new _Deferred2.default()
   deferred.promise
     .then(async (txResponse) => {
@@ -932,6 +990,7 @@ const updateTransactionsSpecific = (
       })
 
       await exports.transactionChanged.call(void 0, {
+        walletId: walletInfo.id,
         emitter,
         walletTools,
         processor,
@@ -959,6 +1018,7 @@ const updateTransactions = (
   args
 ) => {
   const {
+    walletInfo,
     emitter,
     walletTools,
     txId,
@@ -994,6 +1054,7 @@ const updateTransactions = (
       })
 
       await exports.transactionChanged.call(void 0, {
+        walletId: walletInfo.id,
         emitter,
         walletTools,
         processor,
@@ -1080,10 +1141,19 @@ const internalDeriveScriptAddress = async ({
 
 
 
+
+
+
 const internalGetFreshAddress = async (
   args
 ) => {
-  const { format, changeIndex: branch, walletTools, processor } = args
+  const {
+    format,
+    changeIndex: branch,
+    walletTools,
+    processor,
+    forceIndex
+  } = args
 
   const numAddresses = processor.numAddressesByFormatPath({
     format,
@@ -1099,16 +1169,33 @@ const internalGetFreshAddress = async (
       0
     )
   }
-  const { scriptPubkey } =
-    await _asyncNullishCoalesce((await processor.fetchAddress(path)), async () => (
-    (await walletTools.getScriptPubkey(path))))
+  if (forceIndex != null) {
+    path.addressIndex = forceIndex
+  }
+
+  let nativeBalance = '0'
+  let scriptPubkey
+  const iAddress = await processor.fetchAddress(path)
+  if (iAddress != null) {
+    nativeBalance = iAddress.balance
+    scriptPubkey = iAddress.scriptPubkey
+  } else {
+    const scriptPubKeyRet = await walletTools.getScriptPubkey(path)
+    scriptPubkey = scriptPubKeyRet.scriptPubkey
+  }
+
   if (scriptPubkey == null) {
     throw new Error('Unknown address path')
   }
-  return walletTools.scriptPubkeyToAddress({
+  const address = walletTools.scriptPubkeyToAddress({
     scriptPubkey,
     format
   })
+
+  return {
+    ...address,
+    nativeBalance
+  }
 }
 
 
@@ -1122,6 +1209,7 @@ const processAddressTransactions = async (
   args
 ) => {
   const {
+    walletInfo,
     address,
     addressTransactionState,
     emitter,
@@ -1166,6 +1254,7 @@ const processAddressTransactions = async (
           scriptPubkeys: [scriptPubkey]
         })
         await exports.transactionChanged.call(void 0, {
+          walletId: walletInfo.id,
           emitter,
           walletTools,
           processor,
@@ -1416,13 +1505,17 @@ const processProcessorUtxos = async (
   //
 
   // Address balance and emit address balance change event
-  const diff = _biggystring.sub.call(void 0, newBalance, oldBalance)
-  if (diff !== '0') {
-    log('balance changed:', { scriptPubkey, diff })
+  if (newBalance !== oldBalance) {
+    log('address balance changed:', { scriptPubkey, oldBalance, newBalance })
     emitter.emit(
       _makeEngineEmitter.EngineEvent.ADDRESS_BALANCE_CHANGED,
       currencyInfo.currencyCode,
-      diff
+      [
+        {
+          scriptPubkey,
+          balance: newBalance
+        }
+      ]
     )
 
     // Update balances for address that have this scriptPubkey

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

@@ -3,8 +3,14 @@ import { EdgeCurrencyEngineCallbacks, EdgeTransaction, EdgeTxidMap } from 'edge-
 import { EventEmitter } from 'events';
 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, nativeDiff: string) => boolean) & ((event: EngineEvent.WALLET_BALANCE_CHANGED, currencyCode: string, nativeBalance: string) => boolean) & ((event: EngineEvent.BLOCK_HEIGHT_CHANGED, uri: string, blockHeight: number) => boolean) & ((event: EngineEvent.NEW_ADDRESS_TRANSACTION, uri: string, newTx: SubscribeAddressResponse) => boolean) & ((event: EngineEvent.ADDRESSES_CHECKED, progressRatio: number) => boolean) & ((event: EngineEvent.TXIDS_CHANGED, txids: EdgeTxidMap) => boolean);
-    on: ((event: EngineEvent.TRANSACTIONS_CHANGED, listener: (transactions: EdgeTransaction[]) => Promise<void> | void) => this) & ((event: EngineEvent.ADDRESS_BALANCE_CHANGED, listener: (currencyCode: string, nativeDiff: string) => Promise<void> | void) => this) & ((event: EngineEvent.WALLET_BALANCE_CHANGED, listener: (currencyCode: string, nativeBalance: string) => Promise<void> | void) => this) & ((event: EngineEvent.BLOCK_HEIGHT_CHANGED, listener: (uri: string, blockHeight: number) => Promise<void> | void) => this) & ((event: EngineEvent.NEW_ADDRESS_TRANSACTION, listener: (uri: string, newTx: SubscribeAddressResponse) => Promise<void> | void) => this) & ((event: EngineEvent.ADDRESSES_CHECKED, listener: (progressRatio: number) => Promise<void> | void) => this) & ((event: EngineEvent.TXIDS_CHANGED, listener: (txids: EdgeTxidMap) => Promise<void> | void) => this);
+    emit: ((event: EngineEvent.TRANSACTIONS_CHANGED, transactions: EdgeTransaction[]) => boolean) & ((event: EngineEvent.ADDRESS_BALANCE_CHANGED, currencyCode: string, addressBalanceChanges: Array<{
+        scriptPubkey: string;
+        balance: string;
+    }>) => boolean) & ((event: EngineEvent.WALLET_BALANCE_CHANGED, currencyCode: string, nativeBalance: string) => boolean) & ((event: EngineEvent.BLOCK_HEIGHT_CHANGED, uri: string, blockHeight: number) => boolean) & ((event: EngineEvent.NEW_ADDRESS_TRANSACTION, uri: string, newTx: SubscribeAddressResponse) => boolean) & ((event: EngineEvent.ADDRESSES_CHECKED, progressRatio: number) => boolean) & ((event: EngineEvent.TXIDS_CHANGED, txids: EdgeTxidMap) => boolean);
+    on: ((event: EngineEvent.TRANSACTIONS_CHANGED, listener: (transactions: EdgeTransaction[]) => Promise<void> | void) => this) & ((event: EngineEvent.ADDRESS_BALANCE_CHANGED, listener: (currencyCode: string, addressBalanceChanges: Array<{
+        scriptPubkey: string;
+        balance: string;
+    }>) => Promise<void> | void) => this) & ((event: EngineEvent.WALLET_BALANCE_CHANGED, listener: (currencyCode: string, nativeBalance: string) => Promise<void> | void) => this) & ((event: EngineEvent.BLOCK_HEIGHT_CHANGED, listener: (uri: string, blockHeight: number) => Promise<void> | void) => this) & ((event: EngineEvent.NEW_ADDRESS_TRANSACTION, listener: (uri: string, newTx: SubscribeAddressResponse) => Promise<void> | void) => this) & ((event: EngineEvent.ADDRESSES_CHECKED, listener: (progressRatio: number) => Promise<void> | void) => this) & ((event: EngineEvent.TXIDS_CHANGED, listener: (txids: EdgeTxidMap) => Promise<void> | void) => this);
 }
 export declare class EngineEmitter extends EventEmitter {
 }

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

@@ -7,7 +7,8 @@ interface MetadataConfig {
     emitter: EngineEmitter;
     log: EdgeLog;
 }
-export interface Metadata extends LocalWalletMetadata {
+export interface Metadata {
+    state: LocalWalletMetadata;
     clear: () => Promise<void>;
 }
 export declare const makeMetadata: (config: MetadataConfig) => Promise<Metadata>;

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

@@ -130,6 +130,9 @@ export interface EngineOptions extends EdgeCurrencyEngineOptions {
 export declare type LocalWalletMetadata = ReturnType<typeof asLocalWalletMetadata>;
 export declare const asLocalWalletMetadata: import("cleaners").ObjectCleaner<{
     balance: string;
+    addressBalances: {
+        [keys: string]: string;
+    };
     lastSeenBlockHeight: number;
 }>;
 export {};

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

@@ -5,6 +5,7 @@ import { Processor } from '../makeProcessor';
 import { IProcessorTransaction } from '../types';
 export declare const fromEdgeTransaction: (tx: EdgeTransaction) => IProcessorTransaction;
 interface ToEdgeTransactionArgs {
+    walletId: string;
     tx: IProcessorTransaction;
     walletTools: UTXOPluginWalletTools;
     processor: Processor;

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

@@ -14,7 +14,10 @@ export interface UtxoEngineState {
     start: () => Promise<void>;
     stop: () => Promise<void>;
     deriveScriptAddress: (script: string) => Promise<EdgeFreshAddress>;
-    getFreshAddress: (branch?: number) => Promise<EdgeFreshAddress>;
+    getFreshAddress: (params: {
+        branch?: number;
+        forceIndex?: number;
+    }) => Promise<EdgeFreshAddress>;
     addGapLimitAddresses: (addresses: string[]) => Promise<void>;
     broadcastTx: (transaction: EdgeTransaction) => Promise<string>;
     refillServers: () => void;
@@ -101,6 +104,7 @@ interface AddressTransactionCache {
     };
 }
 interface TransactionChangedArgs {
+    walletId: string;
     tx: IProcessorTransaction;
     emitter: EngineEmitter;
     walletTools: UTXOPluginWalletTools;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",
@@ -48,7 +48,7 @@
     "bs58smartcheck": "^2.0.4",
     "cleaners": "^0.3.12",
     "disklet": "^0.4.5",
-    "edge-core-js": "^0.19.20",
+    "edge-core-js": "^0.19.33",
     "edge-sync-client": "^0.2.7",
     "memlet": "^0.1.6",
     "uri-js": "^4.4.0",