edge-currency-plugins 3.3.1 → 3.3.2

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

@@ -128,9 +128,14 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
     emitter,
     log
   })
+
   const dataLayer = await _DataLayer.makeDataLayer.call(void 0, {
     disklet: walletLocalDisklet
   })
+  // This is a temporary data layer used only once (i.e. nonce) for sweeping
+  // private keys.
+  let nonceDataLayer
+
   const engineProcessor = _UtxoEngineProcessor.makeUtxoEngineProcessor.call(void 0, {
     ...config,
     walletTools,
@@ -509,6 +514,10 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
     },
 
     async makeSpend(edgeSpendInfo) {
+      // Define which DatLayer is used for the spend:
+      const makeSpendDataLayer = _nullishCoalesce(nonceDataLayer, () => ( dataLayer))
+      if (nonceDataLayer != null) nonceDataLayer = undefined
+
       edgeSpendInfo = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfo, currencyInfo)
       const { memos = [], spendTargets } = edgeSpendInfo
       const spendInfoOtherParams = _types7.asUtxoSpendInfoOtherParams.call(void 0, 
@@ -537,7 +546,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
       const utxos =
         await _asyncNullishCoalesce(txOptions.utxos, async () => (
         _filterUndefined.filterUndefined.call(void 0, 
-          (await dataLayer.fetchUtxos({
+          (await makeSpendDataLayer.fetchUtxos({
             scriptPubkey: utxoScriptPubkey,
             utxoIds: []
           })) 
@@ -578,7 +587,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
             const scriptPubkey = walletTools.addressToScriptPubkey(
               target.publicAddress
             )
-            if ((await dataLayer.fetchAddress(scriptPubkey)) != null) {
+            if ((await makeSpendDataLayer.fetchAddress(scriptPubkey)) != null) {
               ourReceiveAddresses.push(target.publicAddress)
             }
           }
@@ -606,13 +615,15 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
 
       let maxUtxo
       if (txOptions.CPFP != null) {
-        const [childTx] = await dataLayer.fetchTransactions({
+        const [childTx] = await makeSpendDataLayer.fetchTransactions({
           txId: txOptions.CPFP
         })
         if (childTx == null) throw new Error('transaction not found')
         const utxos = []
         for (const txid of childTx.ourOuts) {
-          const [output] = await dataLayer.fetchUtxos({ utxoIds: [txid] })
+          const [output] = await makeSpendDataLayer.fetchUtxos({
+            utxoIds: [txid]
+          })
           if (output != null) utxos.push(output)
         }
         maxUtxo = utxos.reduce((a, b) => (bs.gt(a.value, b.value) ? a : b))
@@ -654,7 +665,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
       )
       for (const output of tx.outputs) {
         const scriptPubkey = output.scriptPubkey.toString('hex')
-        const own = await dataLayer.fetchAddress(scriptPubkey)
+        const own = await makeSpendDataLayer.fetchAddress(scriptPubkey)
         if (own == null) {
           // Not our output
           nativeAmount = bs.sub(nativeAmount, output.value.toString())
@@ -896,16 +907,6 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
     },
 
     async sweepPrivateKeys(spendInfo) {
-      // Create the promise to return
-      let success
-
-
-      let failure
-      const end = new Promise((resolve, reject) => {
-        success = resolve
-        failure = reject
-      })
-
       // The temporary wallet info should include all formats for the currency
       const allFormats = engineInfo.formats
 
@@ -940,37 +941,47 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
         publicKey: tmpWalletInfo.keys.publicKey
       })
 
-      // Max spend after imported wallet finishes sync
-      tmpEmitter.on(_EngineEmitter.EngineEvent.ADDRESSES_CHECKED, async (ratio) => {
-        if (ratio === 1) {
-          try {
-            await tmpState.stop()
-
-            const tmpUtxos = (await tmpDataLayer.fetchUtxos({
-              utxoIds: []
-            })) 
-            if (tmpUtxos === null || tmpUtxos.length < 1) {
-              throw new Error('Private key has no funds')
-            }
-            const destAddress = await this.getFreshAddress({ tokenId: null })
-            const nativeAmount = tmpMetadata.state.balance
-            const txOptions = { utxos: tmpUtxos, subtractFee: true }
-            spendInfo.spendTargets = [
-              { publicAddress: destAddress.publicAddress, nativeAmount }
-            ]
-            spendInfo.otherParams = {
-              ...spendInfo.otherParams,
-              txOptions
+      // Wait for the imported wallet to finish syncing then create an
+      // EdgeTransaction using the imported wallet's balance.
+      const sweepTxPromise = new Promise((resolve, reject) => {
+        // Max spend after imported wallet finishes sync
+        tmpEmitter.on(_EngineEmitter.EngineEvent.ADDRESSES_CHECKED, async (ratio) => {
+          if (ratio === 1) {
+            try {
+              await tmpEngineProcessor.stop()
+
+              const tmpUtxos = (await tmpDataLayer.fetchUtxos({
+                utxoIds: []
+              })) 
+              if (tmpUtxos === null || tmpUtxos.length < 1) {
+                throw new Error('Private key has no funds')
+              }
+              const destAddress = await this.getFreshAddress({
+                tokenId: null
+              })
+              const nativeAmount = tmpMetadata.state.balance
+              const txOptions = {
+                utxos: tmpUtxos,
+                subtractFee: true
+              }
+              spendInfo.spendTargets = [
+                { publicAddress: destAddress.publicAddress, nativeAmount }
+              ]
+              spendInfo.otherParams = {
+                ...spendInfo.otherParams,
+                txOptions
+              }
+              nonceDataLayer = tmpDataLayer
+              const tx = await engine.makeSpend(spendInfo)
+              resolve(tx)
+            } catch (e) {
+              reject(e)
             }
-            const tx = await this.makeSpend(spendInfo)
-            success(tx)
-          } catch (e) {
-            failure(e)
           }
-        }
+        })
       })
 
-      const tmpState = _UtxoEngineProcessor.makeUtxoEngineProcessor.call(void 0, {
+      const tmpEngineProcessor = _UtxoEngineProcessor.makeUtxoEngineProcessor.call(void 0, {
         ...config,
         options: {
           ...config.options,
@@ -990,10 +1001,10 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
         walletTools: tmpWalletTools,
         walletInfo: tmpWalletInfo
       })
-      await tmpState.loadWifs(privateKeys)
-      await tmpState.start()
+      await tmpEngineProcessor.loadWifs(privateKeys)
+      await tmpEngineProcessor.start()
 
-      return await end
+      return await sweepTxPromise
     },
 
     otherMethods: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "homepage": "https://edge.app/",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",