edge-currency-plugins 3.8.4 → 3.8.5

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

@@ -541,6 +541,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
       )
       const txOptions = _nullishCoalesce(spendInfoOtherParams.txOptions, () => ( {}))
       const {
+        memoIndex,
         outputSort,
         utxoSourceAddress,
         forceChangeAddress
@@ -669,6 +670,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
         freshChangeAddress,
         subtractFee,
         log,
+        memoIndex,
         outputSort
       })
       if (tx.changeUsed) {

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

@@ -6,6 +6,7 @@
 
 
 
+
 var _cleaners = require('cleaners');
 
 
@@ -53,6 +54,7 @@ const asOutputSort = _cleaners.asValue.call(void 0, 'bip69', 'targets')
   /** @deprecated use `EdgeSpendInfo['enableRbf']` */
   enableRbf: _cleaners.asOptional.call(void 0, _cleaners.asBoolean),
   forceChangeAddress: _cleaners.asOptional.call(void 0, _cleaners.asString),
+  memoIndex: _cleaners.asOptional.call(void 0, _cleaners.asNumber),
   outputSort: _cleaners.asOptional.call(void 0, asOutputSort, 'bip69'),
   txOptions: _cleaners.asOptional.call(void 0, _types3.asTxOptions),
   utxoSourceAddress: _cleaners.asOptional.call(void 0, _cleaners.asString)

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

@@ -272,6 +272,7 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
+
 
 
  function bip43PurposeNumberToTypeEnum(
@@ -949,7 +950,7 @@ const wifToPrivateKeyEncodingInternal = (
 } exports.signMessageBase64 = signMessageBase64;
 
  function makeTx(args) {
-  const { log, outputSort, memos } = args
+  const { log, outputSort, memos, memoIndex } = args
   let sequence = 0xffffffff
   if (args.enableRbf) {
     sequence -= 2
@@ -1102,6 +1103,16 @@ const wifToPrivateKeyEncodingInternal = (
     }
   })()
 
+  if (memoIndex != null) {
+    const currentMemoIndex = sortedOutputs.findIndex(
+      output => output.value === 0
+    )
+    if (currentMemoIndex !== -1) {
+      const memoOutput = sortedOutputs.splice(currentMemoIndex, 1)
+      sortedOutputs.splice(memoIndex, 0, memoOutput[0])
+    }
+  }
+
   const psbt = new (0, _altcoinjs.Psbt)()
   try {
     psbt.addInputs(sortedInputs)

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

@@ -28,6 +28,7 @@ export declare type UtxoSpendInfoOtherParams = ReturnType<typeof asUtxoSpendInfo
 export declare const asUtxoSpendInfoOtherParams: import("cleaners").ObjectCleaner<{
     enableRbf: boolean | undefined;
     forceChangeAddress: string | undefined;
+    memoIndex: number | undefined;
     outputSort: "targets" | "bip69";
     txOptions: import("../../plugin/types").TxOptions | undefined;
     utxoSourceAddress: string | undefined;

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

@@ -145,6 +145,7 @@ export interface MakeTxArgs {
     subtractFee?: boolean;
     log?: EdgeLog;
     outputSort: 'bip69' | 'targets';
+    memoIndex?: number;
 }
 export interface MakeTxTarget {
     address?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "3.8.4",
+  "version": "3.8.5",
   "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",