edge-currency-plugins 1.1.6 → 1.2.0

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

@@ -275,6 +275,8 @@ var _utils = require('./utils');
       options
     ) {
       const { spendTargets } = edgeSpendInfo
+      const { outputSort = 'bip69' } = _nullishCoalesce(edgeSpendInfo.otherParams, () => ( {}))
+
       if (_optionalChain([options, 'optionalAccess', _5 => _5.CPFP]) == null && spendTargets.length < 1) {
         throw new Error('Need to provide Spend Targets')
       }
@@ -397,7 +399,8 @@ var _utils = require('./utils');
         setRBF,
         freshChangeAddress,
         subtractFee,
-        log
+        log,
+        outputSort
       })
       if (tx.changeUsed) {
         ourReceiveAddresses.push(freshChangeAddress)

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

@@ -233,6 +233,7 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
+
 
 
  function bip43PurposeNumberToTypeEnum(
@@ -829,7 +830,7 @@ const wifToPrivateKeyInternal = (
 } exports.signMessageBase64 = signMessageBase64;
 
  function makeTx(args) {
-  const { log } = args
+  const { log, outputSort } = args
   let sequence = 0xffffffff
   if (args.setRBF) {
     sequence -= 2
@@ -962,7 +963,14 @@ const wifToPrivateKeyInternal = (
   }
 
   const sortedInputs = _bip69.sortInputs.call(void 0, result.inputs)
-  const sortedOutputs = _bip69.sortOutputs.call(void 0, result.outputs)
+  const sortedOutputs = (() => {
+    switch (outputSort) {
+      case 'bip69':
+        return _bip69.sortOutputs.call(void 0, result.outputs)
+      case 'targets':
+        return result.outputs
+    }
+  })()
 
   const psbt = new bitcoin.Psbt()
   try {

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

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

package/package.json

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