edge-currency-plugins 1.1.2 → 1.1.5

package/lib/common/plugin/makeCurrencyTools.js

@@ -9,6 +9,7 @@ var _cleaners = require('cleaners');
 
 
 
+
 var _urijs = require('uri-js'); var uri = _interopRequireWildcard(_urijs);
 var _urlparse = require('url-parse'); var _urlparse2 = _interopRequireDefault(_urlparse);
 
@@ -80,6 +81,10 @@ var _utils3 = require('./utils');
       return wasCurrencyPrivateKey(privateKey)
     },
 
+    async validateMemo(memo) {
+      return _utils.validateMemo.call(void 0, memo)
+    },
+
     async derivePublicKey(walletInfo) {
       const numbWalletInfo = asCurrencyNumbWalletInfo(walletInfo)
       return numbWalletInfo.keys.publicKey

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

@@ -297,7 +297,10 @@ var _utils = require('./utils');
       let targets = []
       const ourReceiveAddresses = []
       for (const target of spendTargets) {
-        if (target.publicAddress == null || target.nativeAmount == null) {
+        if (
+          target.memo == null &&
+          (target.publicAddress == null || target.nativeAmount == null)
+        ) {
           throw new Error('Invalid spend target')
         }
 
@@ -311,19 +314,29 @@ var _utils = require('./utils');
             )
             targets.push({
               address: publicAddress,
-              value: parseInt(target.nativeAmount)
+              value:
+                target.nativeAmount == null
+                  ? undefined
+                  : parseInt(target.nativeAmount),
+              memo: target.memo
             })
           }
         } else {
-          const scriptPubkey = walletTools.addressToScriptPubkey(
-            target.publicAddress
-          )
-          if (processor.fetchAddress(scriptPubkey) != null) {
-            ourReceiveAddresses.push(target.publicAddress)
+          if (target.publicAddress != null) {
+            const scriptPubkey = walletTools.addressToScriptPubkey(
+              target.publicAddress
+            )
+            if (processor.fetchAddress(scriptPubkey) != null) {
+              ourReceiveAddresses.push(target.publicAddress)
+            }
           }
           targets.push({
             address: target.publicAddress,
-            value: parseInt(target.nativeAmount)
+            value:
+              target.nativeAmount == null
+                ? undefined
+                : parseInt(target.nativeAmount),
+            memo: target.memo
           })
         }
       }
@@ -374,7 +387,7 @@ var _utils = require('./utils');
       log.warn(`spend: Using fee rate ${feeRate} sat/B`)
       const subtractFee =
         _optionalChain([options, 'optionalAccess', _12 => _12.subtractFee]) != null ? options.subtractFee : false
-      const tx = await _keymanager.makeTx.call(void 0, {
+      const tx = _keymanager.makeTx.call(void 0, {
         utxos,
         forceUseUtxo: maxUtxo != null ? [maxUtxo] : [],
         targets,
@@ -383,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

@@ -1244,25 +1244,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/engine/utils.js

@@ -35,6 +35,19 @@ var _keymanager = require('../keymanager/keymanager');
   }
 }; exports.getCurrencyFormatFromPurposeType = getCurrencyFormatFromPurposeType
 
+// Expect memo to be a hex string
+ const validateMemo = (memo) => {
+  const result = {
+    passed: true,
+    tooLarge: false
+  }
+  if (Math.ceil(memo.length / 2) > 80) {
+    result.passed = false
+    result.tooLarge = true
+  }
+  return result
+}; exports.validateMemo = validateMemo
+
  const getAddressTypeFromKeys = (
   privateKey
 ) => {

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

@@ -10,6 +10,7 @@ var _indexAtProtected = require('../../../util/indexAtProtected');
 var _undefinedIfEmptyString = require('../../../util/undefinedIfEmptyString');
 
 
+var _utils = require('../engine/utils');
 
 var _bip69 = require('./bip69');
 
@@ -229,6 +230,8 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
+
+
 
 
 
@@ -825,7 +828,8 @@ const wifToPrivateKeyInternal = (
     .toString('base64')
 } exports.signMessageBase64 = signMessageBase64;
 
- async function makeTx(args) {
+ function makeTx(args) {
+  const { log } = args
   let sequence = 0xffffffff
   if (args.setRBF) {
     sequence -= 2
@@ -903,16 +907,36 @@ const wifToPrivateKeyInternal = (
     if (!forceUsage) mappedUtxos.push(input)
   }
 
-  const targets = args.targets.map(target => {
-    const script = exports.addressToScriptPubkey.call(void 0, {
-      address: target.address,
-      coin: coin.name
-    })
-    return {
-      script,
-      value: target.value
+  const targets = []
+  for (const target of args.targets) {
+    if (target.address != null && target.value != null) {
+      const script = exports.addressToScriptPubkey.call(void 0, {
+        address: target.address,
+        coin: coin.name
+      })
+      targets.push({
+        script,
+        value: target.value
+      })
     }
-  })
+
+    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)
+      if (!validatedMemo.passed) {
+        throw new Error('Memo size exceeds 80 bytes')
+      }
+      const script = bitcoin.script
+        .compile([bitcoin.opcodes.OP_RETURN, Buffer.from(target.memo, 'utf8')])
+        .toString('hex')
+      targets.push({
+        script,
+        value: 0
+      })
+    }
+  }
+
   const changeScript = exports.addressToScriptPubkey.call(void 0, {
     address: args.freshChangeAddress,
     coin: coin.name
@@ -941,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,
@@ -950,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/engine/utils.d.ts

@@ -1,11 +1,12 @@
 import { Disklet } from 'disklet';
-import { EdgeParsedUri } from 'edge-core-js/types';
+import { EdgeMemoRules, EdgeParsedUri } from 'edge-core-js/types';
 import { CurrencyFormat } from '../../plugin/types';
 import { IUTXO } from '../db/types';
 import { ScriptTemplates } from '../info/scriptTemplates/types';
 import { PrivateKey } from '../keymanager/cleaners';
 import { AddressTypeEnum, BIP43PurposeTypeEnum, ScriptTypeEnum } from '../keymanager/keymanager';
 export declare const getCurrencyFormatFromPurposeType: (purpose: BIP43PurposeTypeEnum) => CurrencyFormat;
+export declare const validateMemo: (memo: string) => EdgeMemoRules;
 export declare const getAddressTypeFromKeys: (privateKey: PrivateKey) => AddressTypeEnum;
 export declare const getAddressTypeFromPurposeType: (purpose: BIP43PurposeTypeEnum) => AddressTypeEnum;
 export declare const getScriptTypeFromPurposeType: (purpose: BIP43PurposeTypeEnum, redeemScript?: string | undefined, scriptTemplates?: ScriptTemplates | undefined) => ScriptTypeEnum;

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,10 +132,12 @@ export interface MakeTxArgs {
     currencyCode: string;
     freshChangeAddress: string;
     subtractFee?: boolean;
+    log?: EdgeLog;
 }
 export interface MakeTxTarget {
-    address: string;
-    value: number;
+    address?: string;
+    value?: number;
+    memo?: string | null;
 }
 interface MakeTxReturn extends Required<utxopicker.UtxoPickerResult> {
     hex: string;
@@ -194,6 +197,6 @@ export declare function privateKeyToWIF(args: PrivateKeyToWIFArgs): string;
 export declare const wifToPrivateKey: (args: WIFToPrivateKeyArgs) => string;
 export declare function privateKeyToPubkey(privateKey: string): string;
 export declare function signMessageBase64(message: string, privateKey: string): string;
-export declare function makeTx(args: MakeTxArgs): Promise<MakeTxReturn>;
+export declare function makeTx(args: MakeTxArgs): MakeTxReturn;
 export declare function signTx(args: SignTxArgs): Promise<SignTxReturn>;
 export {};

package/package.json

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