edge-currency-plugins 1.1.3 → 1.1.6

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

@@ -396,7 +396,8 @@ var _utils = require('./utils');
         currencyCode: currencyInfo.currencyCode,
         setRBF,
         freshChangeAddress,
-        subtractFee
+        subtractFee,
+        log
       })
       if (tx.changeUsed) {
         ourReceiveAddresses.push(freshChangeAddress)

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

@@ -1,4 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } 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 _biggystring = require('biggystring');
+var _cleaners = require('cleaners');
 
 
 
@@ -1109,6 +1110,42 @@ const processTransactionResponse = (
     txResponse,
     pluginInfo: { coinInfo }
   } = args
+  const inputs = txResponse.vin.map(vin => {
+    const scriptPubkey =
+      // Note: Blockbook has empirically not sent a hex value as the
+      // scriptPubkey for vins. If we discover this to be changed for some
+      // cases, we may want to use the `hex` field as an optimization.
+      _cleaners.asMaybe.call(void 0, 
+        raw => _utils3.validScriptPubkeyFromAddress.call(void 0, raw),
+        'unknown'
+      )({
+        address: vin.addresses[0],
+        coin: coinInfo.name
+      })
+    return {
+      txId: vin.txid,
+      outputIndex: vin.vout, // case for tx `fefac8c22ba1178df5d7c90b78cc1c203d1a9f5f5506f7b8f6f469fa821c2674` no `vout` for input
+      n: vin.n,
+      scriptPubkey,
+      amount: vin.value
+    }
+  })
+  const outputs = txResponse.vout.map(vout => {
+    const scriptPubkey =
+      _nullishCoalesce(vout.hex, () => (
+      _cleaners.asMaybe.call(void 0, 
+        raw => _utils3.validScriptPubkeyFromAddress.call(void 0, raw),
+        'unknown'
+      )({
+        address: vout.addresses[0],
+        coin: coinInfo.name
+      })))
+    return {
+      n: vout.n,
+      scriptPubkey,
+      amount: vout.value
+    }
+  })
   return {
     txid: txResponse.txid,
     hex: txResponse.hex,
@@ -1116,26 +1153,8 @@ const processTransactionResponse = (
     blockHeight: txResponse.blockHeight > 0 ? txResponse.blockHeight : 0,
     date: txResponse.blockTime,
     fees: txResponse.fees,
-    inputs: txResponse.vin.map(input => ({
-      txId: input.txid,
-      outputIndex: input.vout, // case for tx `fefac8c22ba1178df5d7c90b78cc1c203d1a9f5f5506f7b8f6f469fa821c2674` no `vout` for input
-      n: input.n,
-      scriptPubkey: _utils3.validScriptPubkeyFromAddress.call(void 0, {
-        address: input.addresses[0],
-        coin: coinInfo.name
-      }),
-      amount: input.value
-    })),
-    outputs: txResponse.vout.map(output => ({
-      n: output.n,
-      scriptPubkey:
-        _nullishCoalesce(output.hex, () => (
-        _utils3.validScriptPubkeyFromAddress.call(void 0, {
-          address: output.addresses[0],
-          coin: coinInfo.name
-        }))),
-      amount: output.value
-    })),
+    inputs,
+    outputs,
     ourIns: [],
     ourOuts: [],
     ourAmount: '0'
@@ -1244,25 +1263,10 @@ const processProcessorUtxos = async (
       oldBalance = _biggystring.add.call(void 0, utxo.value, oldBalance)
     }
 
-    // If the UTXO isn't present in the update UTXO set, then it is spent.
+    // If the UTXO isn't present in the update UTXO set, then it is spent or dropped.
+    // Remove it from the database if so
     if (updatedUtxos[utxo.id] == null) {
-      if (utxo.blockHeight > 0) {
-        // Delete the UTXO from the database if it's spent and confirmed
-        utxoIdsToRemove.push(utxo.id)
-      } else {
-        // Otherwise just mark it as spent.
-        updatedUtxos[utxo.id] = { ...utxo, spent: true }
-      }
-    } else {
-      /*
-      If the UTXO is present in the updated UTXO set, enforce that the UTXO 
-      remains spent in the new UTXO set. This means, we will never mark a UTXO 
-      as unspent again. UTXOs only become unspent again if the tx is dropped
-      which shall be affected by another routine.
-      */
-      // TODO: To fix this logic for dropped-tx, add a condition which uses the
-      // network's block-height to determine whether to set it back as unspend
-      updatedUtxos[utxo.id].spent = utxo.spent || updatedUtxos[utxo.id].spent
+      utxoIdsToRemove.push(utxo.id)
     }
   }
 

package/lib/common/utxobased/keymanager/keymanager.js

@@ -232,6 +232,7 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
+
 
 
  function bip43PurposeNumberToTypeEnum(
@@ -828,6 +829,7 @@ const wifToPrivateKeyInternal = (
 } exports.signMessageBase64 = signMessageBase64;
 
  function makeTx(args) {
+  const { log } = args
   let sequence = 0xffffffff
   if (args.setRBF) {
     sequence -= 2
@@ -918,7 +920,7 @@ const wifToPrivateKeyInternal = (
       })
     }
 
-    if (target.memo != null) {
+    if (target.memo != null && target.memo !== '') {
       const memoHex = Buffer.from(target.memo, 'utf8').toString('hex')
       // check if hex string is within 80 bytes
       const validatedMemo = _utils.validateMemo.call(void 0, memoHex)
@@ -963,8 +965,13 @@ const wifToPrivateKeyInternal = (
   const sortedOutputs = _bip69.sortOutputs.call(void 0, result.outputs)
 
   const psbt = new bitcoin.Psbt()
-  psbt.addInputs(sortedInputs)
-  psbt.addOutputs(sortedOutputs)
+  try {
+    psbt.addInputs(sortedInputs)
+    psbt.addOutputs(sortedOutputs)
+  } catch (error) {
+    _optionalChain([log, 'optionalAccess', _16 => _16.error, 'call', _17 => _17(`Failed makeTx: ${String(error)}`)])
+    throw error
+  }
 
   return {
     inputs: sortedInputs,
@@ -972,7 +979,7 @@ const wifToPrivateKeyInternal = (
     changeUsed: result.changeUsed,
     fee: result.fee,
     psbtBase64: psbt.toBase64(),
-    hex: _optionalChain([psbt, 'access', _16 => _16.data, 'optionalAccess', _17 => _17.globalMap, 'optionalAccess', _18 => _18.unsignedTx, 'optionalAccess', _19 => _19.toBuffer, 'call', _20 => _20(), 'optionalAccess', _21 => _21.toString, 'call', _22 => _22('hex')])
+    hex: _optionalChain([psbt, 'access', _18 => _18.data, 'optionalAccess', _19 => _19.globalMap, 'optionalAccess', _20 => _20.unsignedTx, 'optionalAccess', _21 => _21.toBuffer, 'call', _22 => _22(), 'optionalAccess', _23 => _23.toString, 'call', _24 => _24('hex')])
   }
 } exports.makeTx = makeTx;
 

package/lib/src/common/utxobased/keymanager/keymanager.d.ts

@@ -1,3 +1,4 @@
+import { EdgeLog } from 'edge-core-js/types';
 import { AddressPath } from '../../plugin/types';
 import { IUTXO } from '../db/types';
 import { ScriptTemplate } from '../info/scriptTemplates/types';
@@ -131,6 +132,7 @@ export interface MakeTxArgs {
     currencyCode: string;
     freshChangeAddress: string;
     subtractFee?: boolean;
+    log?: EdgeLog;
 }
 export interface MakeTxTarget {
     address?: string;

package/package.json

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