edge-currency-plugins 1.0.0-rc.2 → 1.0.0-rc.5

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

@@ -104,7 +104,7 @@ var _utils = require('./utils');
   const processor = await _makeProcessor.makeProcessor.call(void 0, {
     disklet: walletLocalDisklet
   })
-  const state = _makeUtxoEngineState.makeUtxoEngineState.call(void 0, {
+  const engineState = _makeUtxoEngineState.makeUtxoEngineState.call(void 0, {
     ...config,
     walletTools,
     walletInfo,
@@ -120,15 +120,15 @@ var _utils = require('./utils');
         metadata.balance
       )
 
-      pluginState.addEngine(state)
+      pluginState.addEngine(engineState)
       await fees.start()
-      await state.start()
+      await engineState.start()
     },
 
     async killEngine() {
-      await state.stop()
+      await engineState.stop()
       fees.stop()
-      pluginState.removeEngine(state)
+      pluginState.removeEngine(engineState)
     },
 
     getBalance(_opts) {
@@ -144,7 +144,7 @@ var _utils = require('./utils');
     },
 
     async addGapLimitAddresses(addresses) {
-      return await state.addGapLimitAddresses(addresses)
+      return await engineState.addGapLimitAddresses(addresses)
     },
 
     async broadcastTx(transaction) {
@@ -164,7 +164,7 @@ var _utils = require('./utils');
           )
         }
       }
-      const id = await state.broadcastTx(transaction)
+      const id = await engineState.broadcastTx(transaction)
       if (id !== transaction.txid) {
         throw new Error('broadcast response txid does not match original')
       }
@@ -221,7 +221,7 @@ var _utils = require('./utils');
     async getFreshAddress(
       _opts
     ) {
-      return await state.getFreshAddress()
+      return await engineState.getFreshAddress()
     },
 
     getNumTransactions(_opts) {
@@ -286,7 +286,10 @@ var _utils = require('./utils');
         await _asyncNullishCoalesce(await _asyncOptionalChain([options, 'optionalAccess', async _6 => _6.utxos]), async () => (
         ((await processor.fetchUtxos({ utxoIds: [] })) )))
 
-      if (bs.gt(totalAmountToSend, `${_utils.sumUtxos.call(void 0, utxos)}`)) {
+      if (
+        bs.gt(totalAmountToSend, `${_utils.sumUtxos.call(void 0, utxos)}`) ||
+        utxos.length === 0
+      ) {
         throw new (0, _types.InsufficientFundsError)(currencyInfo.currencyCode)
       }
 
@@ -302,7 +305,7 @@ var _utils = require('./utils');
           const { script } = target.otherParams
           if (script.type === 'replayProtection') {
             // construct a replay protection p2sh address
-            const { publicAddress } = await state.deriveScriptAddress(
+            const { publicAddress } = await engineState.deriveScriptAddress(
               script.type
             )
             targets.push({
@@ -328,7 +331,7 @@ var _utils = require('./utils');
         throw new Error('Need to provide Spend Targets')
       }
 
-      const freshAddress = await state.getFreshAddress(1)
+      const freshAddress = await engineState.getFreshAddress(1)
       const freshChangeAddress =
         _nullishCoalesce(freshAddress.segwitAddress, () => ( freshAddress.publicAddress))
       const setRBF = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _9 => _9.setRBF]), () => ( false))
@@ -467,7 +470,7 @@ var _utils = require('./utils');
       Get the wallet's UTXOs from the new transaction and save them to the processsor.
       */
       const utxos = await _getOwnUtxosFromTx.getOwnUtxosFromTx.call(void 0, engineInfo, processor, tx)
-      await Promise.all(utxos.map(async utxo => await processor.saveUtxo(utxo)))
+      await engineState.processUtxos(utxos)
     },
 
     async signTx(transaction) {

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

@@ -82,6 +82,8 @@ var _utils3 = require('./utils');
 
 
 
+
+
 
 
 
@@ -138,8 +140,11 @@ var _utils3 = require('./utils');
    **/
   const processesPerAddress = 2
   let processedCount = 0
-  let processedPercent = 0
+  let processedPercent = 0 // last sync ratio emitted
   const updateProgressRatio = async () => {
+    // Avoid re-sending sync ratios / sending ratios larger than 1
+    if (processedPercent >= 1) return
+
     // We expect the total number of progress updates to equal the number of
     // addresses multiplied the number of processes per address.
     const expectedProccessCount =
@@ -440,6 +445,22 @@ var _utils3 = require('./utils');
           }
         }
       }
+    },
+    async processUtxos(utxos) {
+      const utxoMap = new Map()
+      for (const utxo of utxos) {
+        const utxoSet = _nullishCoalesce(utxoMap.get(utxo.scriptPubkey), () => ( new Set()))
+        if (utxoMap.has(utxo.scriptPubkey) == null)
+          utxoMap.set(utxo.scriptPubkey, utxoSet)
+        utxoSet.add(utxo)
+      }
+      for (const [scriptPubkey, utxos] of utxoMap.entries()) {
+        await processProcessorUtxos({
+          ...commonArgs,
+          scriptPubkey,
+          utxos
+        })
+      }
     }
   }
 } exports.makeUtxoEngineState = makeUtxoEngineState;
@@ -681,8 +702,7 @@ const addToAddressTransactionCache = async (
         await processProcessorUtxos({
           ...args,
           scriptPubkey,
-          utxos: state.utxos,
-          path: state.path
+          utxos: state.utxos
         })
         _utils.removeItem.call(void 0, processorUtxoCache, scriptPubkey)
         return true
@@ -1196,7 +1216,6 @@ const processAddressUtxos = async (
 
 
 
-
 const processProcessorUtxos = async (
   args
 ) => {

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

@@ -21,6 +21,7 @@ export interface UtxoEngineState {
     getServerList: () => string[];
     setServerList: (serverList: string[]) => void;
     loadWifs: (wifs: string[]) => Promise<void>;
+    processUtxos: (utxos: IUTXO[]) => Promise<void>;
 }
 export interface UtxoEngineStateConfig extends EngineConfig {
     walletTools: UTXOPluginWalletTools;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.5",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",