edge-currency-plugins 1.2.3 → 1.3.0

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');
@@ -227,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) {
@@ -260,6 +262,7 @@ var _utils = require('./utils');
         txs.map(
           async (tx) =>
             await _ProcessorTransaction.toEdgeTransaction.call(void 0, {
+              walletId: walletInfo.id,
               tx,
               walletTools,
               processor,
@@ -281,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')
@@ -293,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)}`) ||
@@ -353,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
@@ -443,6 +460,7 @@ var _utils = require('./utils');
       }
 
       const transaction = {
+        walletId: walletInfo.id,
         ourReceiveAddresses,
         otherParams,
         currencyCode: currencyInfo.currencyCode,
@@ -480,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,
@@ -568,6 +587,7 @@ var _utils = require('./utils');
           transaction.signedTx,
           transaction.currencyCode
         )
+        if (transaction.otherParams == null) transaction.otherParams = {}
         Object.assign(transaction.otherParams, {
           paymentProtocolInfo: {
             ...paymentProtocolInfo,

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

@@ -84,6 +84,9 @@ var _utils3 = require('./utils');
 
 
 
+
+
+
 
 
 
@@ -332,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
@@ -363,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
         }
@@ -674,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,
@@ -930,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) => {
@@ -950,6 +990,7 @@ const updateTransactionsSpecific = (
       })
 
       await exports.transactionChanged.call(void 0, {
+        walletId: walletInfo.id,
         emitter,
         walletTools,
         processor,
@@ -977,6 +1018,7 @@ const updateTransactions = (
   args
 ) => {
   const {
+    walletInfo,
     emitter,
     walletTools,
     txId,
@@ -1012,6 +1054,7 @@ const updateTransactions = (
       })
 
       await exports.transactionChanged.call(void 0, {
+        walletId: walletInfo.id,
         emitter,
         walletTools,
         processor,
@@ -1098,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,
@@ -1117,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
+  }
 }
 
 
@@ -1140,6 +1209,7 @@ const processAddressTransactions = async (
   args
 ) => {
   const {
+    walletInfo,
     address,
     addressTransactionState,
     emitter,
@@ -1184,6 +1254,7 @@ const processAddressTransactions = async (
           scriptPubkeys: [scriptPubkey]
         })
         await exports.transactionChanged.call(void 0, {
+          walletId: walletInfo.id,
           emitter,
           walletTools,
           processor,

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.3",
+  "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",