edge-currency-plugins 2.3.0 → 2.4.1

package/lib/common/fees/calcMinerFeePerByte.js

@@ -8,14 +8,14 @@
 /**
  * Calculate the sat/byte mining fee given an amount to spend and a SimpleFeeSettings object
  * @param nativeAmount
- * @param fees
+ * @param feeInfo
  * @param networkFeeOption
  * @param customNetworkFee
  * @returns {string}
  */
  const calcMinerFeePerByte = (
   nativeAmount,
-  fees,
+  feeInfo,
   networkFeeOption,
   customNetworkFee
 ) => {
@@ -26,8 +26,8 @@
     standardFeeHighFudgeFactor = '1',
     standardFeeLowAmount,
     standardFeeLowFudgeFactor = '1'
-  } = fees
-  let { highFee, lowFee, standardFeeHigh, standardFeeLow } = fees
+  } = feeInfo
+  let { highFee, lowFee, standardFeeHigh, standardFeeLow } = feeInfo
 
   highFee = _biggystring.round.call(void 0, _biggystring.mul.call(void 0, highFee, highFeeFudgeFactor), 0)
   lowFee = _biggystring.round.call(void 0, _biggystring.mul.call(void 0, lowFee, lowFeeFudgeFactor), 0)

package/lib/common/fees/makeFees.js

@@ -11,13 +11,8 @@ var _memlet = require('memlet');
 
 var _filterUndefined = require('../../util/filterUndefined');
 var _constants = require('../constants');
-
-
-
-
 var _types3 = require('../plugin/types');
 var _calcMinerFeePerByte = require('./calcMinerFeePerByte');
-var _processInfoServerFees = require('./processInfoServerFees');
 var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
 
 
@@ -43,9 +38,9 @@ var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
   const { currencyInfo, engineInfo } = pluginInfo
 
   const memlet = _memlet.makeMemlet.call(void 0, disklet)
-  const fees = await fetchCachedFees(
+  const feeInfo = await fetchCachedFees(
     memlet,
-    engineInfo.simpleFeeSettings
+    engineInfo.defaultFeeInfo
   )
   // The last time the fees were updated
   let timestamp = 0
@@ -59,10 +54,10 @@ var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
       mempoolSpaceFeeInfoServer: engineInfo.mempoolSpaceFeeInfoServer
     })
     const cleanedVendorFees = _filterUndefined.removeUndefined.call(void 0, _nullishCoalesce(vendorFees, () => ( {})))
-    Object.assign(fees, cleanedVendorFees)
+    Object.assign(feeInfo, cleanedVendorFees)
     timestamp = Date.now()
 
-    await cacheFees(memlet, fees)
+    await cacheFees(memlet, feeInfo)
   }
 
   return {
@@ -70,9 +65,9 @@ var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
       const edgeFees = await fetchFees({
         ...common,
         uri: `${_constants.INFO_SERVER_URI}/v1/networkFees/${currencyInfo.pluginId}`,
-        processor: _processInfoServerFees.processInfoServerFees
+        cleaner: _cleaners.asMaybe.call(void 0, _types3.asFeeInfo.call(void 0, feeInfo), null)
       })
-      Object.assign(fees, edgeFees)
+      Object.assign(feeInfo, edgeFees)
       await updateVendorFees()
       vendorIntervalId = setInterval(
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
@@ -109,15 +104,15 @@ var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
 
       const rate = _calcMinerFeePerByte.calcMinerFeePerByte.call(void 0, 
         sumSpendTargets(spendTargets),
-        fees,
+        feeInfo,
         networkFeeOption,
         customNetworkFee[customFeeTemplate.key]
       )
       return rate
     },
 
-    get fees() {
-      return fees
+    get feeInfo() {
+      return feeInfo
     }
   }
 }; exports.makeFees = makeFees
@@ -127,14 +122,12 @@ const fetchCachedFees = async (
   fallback
 ) => {
   const data = await memlet.getJson(_constants.FEES_PATH).catch(() => undefined)
-  const feeSettings = _cleaners.asMaybe.call(void 0, _types3.asSimpleFeeSettings, fallback)(data)
+  const feeSettings = _cleaners.asMaybe.call(void 0, _types3.asFeeInfo.call(void 0, fallback), fallback)(data)
   return feeSettings
 }
 
-const cacheFees = async (
-  memlet,
-  fees
-) => await memlet.setJson(_constants.FEES_PATH, fees)
+const cacheFees = async (memlet, feeInfo) =>
+  await memlet.setJson(_constants.FEES_PATH, feeInfo)
 
 const sumSpendTargets = (spendTargets) =>
   spendTargets.reduce((amount, { nativeAmount }) => {
@@ -148,14 +141,14 @@ const sumSpendTargets = (spendTargets) =>
 
 
 const fetchFees = async ( args) => {
-  const { uri, processor, io, log } = args
+  const { uri, cleaner, io, log } = args
 
   try {
     const response = await io.fetch(uri)
     if (!response.ok) throw new Error(`Error fetching fees from ${uri}`)
 
     const fees = await response.json()
-    return processor(fees)
+    return cleaner(fees)
   } catch (err) {
     log(err.message)
     return null
@@ -173,7 +166,7 @@ const fetchFeesFromVendor = async (
     const mempoolFees = await fetchFees({
       ...args,
       uri: args.mempoolSpaceFeeInfoServer,
-      processor: _processMempoolSpaceFees.processMempoolSpaceFees
+      cleaner: _processMempoolSpaceFees.processMempoolSpaceFees
     })
     if (mempoolFees != null) {
       return mempoolFees

package/lib/common/plugin/types.js

@@ -1,4 +1,5 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } 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; }
+
 
 
 
@@ -152,17 +153,36 @@ var _cleaners = require('cleaners');
 }); exports.asFeeRates = asFeeRates
 
 
- const asSimpleFeeSettings = _cleaners.asObject.call(void 0, {
-  ...exports.asFeeRates.shape,
 
-  lowFeeFudgeFactor: _cleaners.asMaybe.call(void 0, _cleaners.asString),
-  standardFeeLowFudgeFactor: _cleaners.asMaybe.call(void 0, _cleaners.asString),
-  standardFeeHighFudgeFactor: _cleaners.asMaybe.call(void 0, _cleaners.asString),
-  highFeeFudgeFactor: _cleaners.asMaybe.call(void 0, _cleaners.asString),
 
-  standardFeeLowAmount: _cleaners.asString,
-  standardFeeHighAmount: _cleaners.asString
-}); exports.asSimpleFeeSettings = asSimpleFeeSettings
+
+
+
+
+
+
+ const asFeeInfo = (fallback) =>
+  _cleaners.asObject({
+    ...exports.asFeeRates.shape,
+
+    lowFeeFudgeFactor: _cleaners.asMaybe.call(void 0, _cleaners.asString, _optionalChain([fallback, 'optionalAccess', _ => _.lowFeeFudgeFactor])),
+    standardFeeLowFudgeFactor: _cleaners.asMaybe.call(void 0, 
+      _cleaners.asString,
+      _optionalChain([fallback, 'optionalAccess', _2 => _2.standardFeeLowFudgeFactor])
+    ),
+    standardFeeHighFudgeFactor: _cleaners.asMaybe.call(void 0, 
+      _cleaners.asString,
+      _optionalChain([fallback, 'optionalAccess', _3 => _3.standardFeeHighFudgeFactor])
+    ),
+    highFeeFudgeFactor: _cleaners.asMaybe.call(void 0, _cleaners.asString, _optionalChain([fallback, 'optionalAccess', _4 => _4.highFeeFudgeFactor])),
+
+    // The amount of satoshis which will be charged the standardFeeLow
+    standardFeeLowAmount: _cleaners.asString,
+    // The amount of satoshis which will be charged the standardFeeHigh
+    standardFeeHighAmount: _cleaners.asString,
+    // A safe-guard for any potential software bugs:
+    maximumFeeRate: _cleaners.asOptional.call(void 0, _cleaners.asString, _optionalChain([fallback, 'optionalAccess', _5 => _5.maximumFeeRate]))
+  }).withRest; exports.asFeeInfo = asFeeInfo
 
 
 

package/lib/common/plugin/util/maximumFeeRateCalculator.js

@@ -0,0 +1,23 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _biggystring = require('biggystring');
+
+
+/**
+ * Calculates a maximum fee rate of 1 USD per vByte given a USD exchange rate
+ * (usdPrice).
+ */
+ const maximumFeeRateCalculator = (
+  currencyInfo,
+  usdPrice
+) => {
+  const { currencyCode, denominations } = currencyInfo
+  const primaryDenomination = denominations.find(
+    denom => denom.name === currencyCode
+  )
+  if (primaryDenomination == null)
+    throw new Error(`Missing primary currency denomination for ${currencyCode}`)
+
+  return _biggystring.round.call(void 0, 
+    _biggystring.mul.call(void 0, _biggystring.div.call(void 0, '1', String(usdPrice), 16), primaryDenomination.multiplier),
+    0
+  )
+}; exports.maximumFeeRateCalculator = maximumFeeRateCalculator

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

@@ -625,9 +625,10 @@ var _utils = require('./utils');
         }
       })()
       const signedTx = await _keymanager.signTx.call(void 0, {
-        psbtBase64: psbt.base64,
         coin: coinInfo.name,
-        privateKeyEncodings: privateKeyEncodings
+        feeInfo: fees.feeInfo,
+        privateKeyEncodings: privateKeyEncodings,
+        psbtBase64: psbt.base64
       })
       transaction.txid = signedTx.id
       transaction.signedTx = signedTx.hex

package/lib/common/utxobased/info/badcoin.js

@@ -43,7 +43,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 500000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,

package/lib/common/utxobased/info/bitcoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -59,7 +60,7 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   mempoolSpaceFeeInfoServer: 'https://mempool.space/api/v1/fees/recommended',
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -70,7 +71,8 @@ const engineInfo = {
     standardFeeLow: '50',
     standardFeeHigh: '100',
     standardFeeLowAmount: '173200',
-    standardFeeHighAmount: '8670000'
+    standardFeeHighAmount: '8670000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 27460.65)
   }
 }
 

package/lib/common/utxobased/info/bitcoincash.js

@@ -4,6 +4,7 @@ var _cleaners = require('cleaners');
 
 var _constants = require('../../constants');
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 var _bitcoincashScriptTemplates = require('./scriptTemplates/bitcoincashScriptTemplates');
 
@@ -60,7 +61,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 10000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -71,7 +72,8 @@ const engineInfo = {
     standardFeeLow: '5',
     standardFeeHigh: '10',
     standardFeeLowAmount: '1000000',
-    standardFeeHighAmount: '65000000'
+    standardFeeHighAmount: '65000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 212.86)
   },
   scriptTemplates: _bitcoincashScriptTemplates.scriptTemplates,
   asBlockbookAddress: _cleaners.asCodec.call(void 0, 

package/lib/common/utxobased/info/bitcoincashtestnet.js

@@ -45,7 +45,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 10000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,

package/lib/common/utxobased/info/bitcoingold.js

@@ -2,6 +2,7 @@
 
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -51,7 +52,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -62,7 +63,8 @@ const engineInfo = {
     standardFeeLow: '15',
     standardFeeHigh: '140',
     standardFeeLowAmount: '17320',
-    standardFeeHighAmount: '86700000'
+    standardFeeHighAmount: '86700000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 12.62)
   }
 }
 

package/lib/common/utxobased/info/bitcoingoldtestnet.js

@@ -37,7 +37,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,

package/lib/common/utxobased/info/bitcoinsv.js

@@ -4,6 +4,7 @@ var _cleaners = require('cleaners');
 
 var _constants = require('../../constants');
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 
 
 
@@ -57,7 +58,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 10000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -68,7 +69,8 @@ const engineInfo = {
     standardFeeLow: '5',
     standardFeeHigh: '10',
     standardFeeLowAmount: '1000000',
-    standardFeeHighAmount: '65000000'
+    standardFeeHighAmount: '65000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 33.61)
   },
   /*
   This is to support cashaddr and 1-addresses coming from the network.

package/lib/common/utxobased/info/bitcointestnet.js

@@ -53,7 +53,7 @@ var _commonInfo = require('./commonInfo');
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   mempoolSpaceFeeInfoServer: 'https://mempool.space/api/v1/fees/recommended',
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,

package/lib/common/utxobased/info/dash.js

@@ -2,6 +2,7 @@
 
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 
 var _commonInfo = require('./commonInfo');
 
@@ -52,7 +53,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 10000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -63,7 +64,8 @@ const engineInfo = {
     standardFeeLow: '150',
     standardFeeHigh: '200',
     standardFeeLowAmount: '20000000',
-    standardFeeHighAmount: '981000000'
+    standardFeeHighAmount: '981000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 25.8)
   },
   txSpecificHandling: (
     tx,

package/lib/common/utxobased/info/digibyte.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -44,7 +45,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -55,7 +56,8 @@ const engineInfo = {
     standardFeeLow: '50',
     standardFeeHigh: '100',
     standardFeeLowAmount: '173200',
-    standardFeeHighAmount: '8670000'
+    standardFeeHighAmount: '8670000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.006176)
   }
 }
 

package/lib/common/utxobased/info/dogecoin.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 var _dogeUtxoPicker = require('./utxoPickers/dogeUtxoPicker');
 
@@ -48,7 +49,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 10000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -59,7 +60,8 @@ const engineInfo = {
     standardFeeLow: '526316',
     standardFeeHigh: '526316',
     standardFeeLowAmount: '2000000000',
-    standardFeeHighAmount: '98100000000'
+    standardFeeHighAmount: '98100000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.05938)
   }
 }
 

package/lib/common/utxobased/info/eboost.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -43,7 +44,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 500000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -54,7 +55,8 @@ const engineInfo = {
     standardFeeLow: '150',
     standardFeeHigh: '200',
     standardFeeLowAmount: '20000000',
-    standardFeeHighAmount: '981000000'
+    standardFeeHighAmount: '981000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.0033)
   }
 }
 

package/lib/common/utxobased/info/feathercoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
  const currencyInfo = {
@@ -48,7 +49,7 @@ var _commonInfo = require('./commonInfo');
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -59,7 +60,8 @@ var _commonInfo = require('./commonInfo');
     standardFeeLow: '600',
     standardFeeHigh: '800',
     standardFeeLowAmount: '2000000000',
-    standardFeeHighAmount: '98100000000'
+    standardFeeHighAmount: '98100000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, exports.currencyInfo, 0.002275)
   }
 }; exports.engineInfo = engineInfo
 

package/lib/common/utxobased/info/groestlcoin.js

@@ -5,6 +5,7 @@ var _bs58grscheck = require('bs58grscheck'); var base58grs = _interopRequireWild
 var _wifgrs = require('wifgrs'); var wifgrs = _interopRequireWildcard(_wifgrs);
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -49,7 +50,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 100000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -60,7 +61,8 @@ const engineInfo = {
     standardFeeLow: '50',
     standardFeeHigh: '100',
     standardFeeLowAmount: '173200',
-    standardFeeHighAmount: '8670000'
+    standardFeeHighAmount: '8670000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.4705)
   }
 }
 

package/lib/common/utxobased/info/litecoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
  const currencyInfo = {
@@ -55,7 +56,7 @@ var _commonInfo = require('./commonInfo');
   gapLimit: 10,
   defaultFee: 50000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -66,7 +67,8 @@ var _commonInfo = require('./commonInfo');
     standardFeeLow: '150',
     standardFeeHigh: '200',
     standardFeeLowAmount: '20000000',
-    standardFeeHighAmount: '981000000'
+    standardFeeHighAmount: '981000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, exports.currencyInfo, 63.64)
   }
 }; exports.engineInfo = engineInfo
 

package/lib/common/utxobased/info/qtum.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -40,7 +41,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -51,7 +52,8 @@ const engineInfo = {
     standardFeeLow: '450',
     standardFeeHigh: '700',
     standardFeeLowAmount: '20000000',
-    standardFeeHighAmount: '981000000'
+    standardFeeHighAmount: '981000000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 2.13)
   }
 }
 

package/lib/common/utxobased/info/ravencoin.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -40,7 +41,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -51,7 +52,8 @@ const engineInfo = {
     standardFeeLow: '50',
     standardFeeHigh: '100',
     standardFeeLowAmount: '173200',
-    standardFeeHighAmount: '8670000'
+    standardFeeHighAmount: '8670000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.01419)
   }
 }
 

package/lib/common/utxobased/info/smartcash.js

@@ -4,6 +4,7 @@ var _bs58smartcheck = require('bs58smartcheck'); var base58smart = _interopRequi
 var _wifsmart = require('wif-smart'); var wifsmart = _interopRequireWildcard(_wifsmart);
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -46,7 +47,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 100000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -57,7 +58,8 @@ const engineInfo = {
     standardFeeLow: '500',
     standardFeeHigh: '1000',
     standardFeeLowAmount: '1732000',
-    standardFeeHighAmount: '86700000'
+    standardFeeHighAmount: '86700000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.0002171)
   }
 }
 

package/lib/common/utxobased/info/ufo.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -43,7 +44,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 50000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -54,7 +55,8 @@ const engineInfo = {
     standardFeeLow: '1100',
     standardFeeHigh: '2000',
     standardFeeLowAmount: '51282051282051',
-    standardFeeHighAmount: '5128205128205100'
+    standardFeeHighAmount: '5128205128205100',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.000137)
   }
 }
 

package/lib/common/utxobased/info/vertcoin.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
@@ -50,7 +51,7 @@ const engineInfo = {
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -61,7 +62,8 @@ const engineInfo = {
     standardFeeLow: '50',
     standardFeeHigh: '100',
     standardFeeLowAmount: '173200',
-    standardFeeHighAmount: '8670000'
+    standardFeeHighAmount: '8670000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, currencyInfo, 0.04662)
   }
 }
 

package/lib/common/utxobased/info/zcoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _maximumFeeRateCalculator = require('../../plugin/util/maximumFeeRateCalculator');
 var _commonInfo = require('./commonInfo');
 
  const currencyInfo = {
@@ -49,7 +50,7 @@ var _commonInfo = require('./commonInfo');
   gapLimit: 10,
   defaultFee: 1000,
   feeUpdateInterval: 60000,
-  simpleFeeSettings: {
+  defaultFeeInfo: {
     lowFeeFudgeFactor: undefined,
     standardFeeLowFudgeFactor: undefined,
     standardFeeHighFudgeFactor: undefined,
@@ -60,7 +61,8 @@ var _commonInfo = require('./commonInfo');
     standardFeeLow: '50',
     standardFeeHigh: '100',
     standardFeeLowAmount: '173200',
-    standardFeeHighAmount: '8670000'
+    standardFeeHighAmount: '8670000',
+    maximumFeeRate: _maximumFeeRateCalculator.maximumFeeRateCalculator.call(void 0, exports.currencyInfo, 1.39)
   }
 }; exports.engineInfo = engineInfo
 

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

@@ -256,6 +256,7 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
+
 
 
  function bip43PurposeNumberToTypeEnum(
@@ -1084,7 +1085,10 @@ const wifToPrivateKeyEncodingInternal = (
 } exports.makeTx = makeTx;
 
  async function signTx(args) {
-  const psbt = _altcoinjs.Psbt.fromBase64(args.psbtBase64)
+  const { maximumFeeRate } = args.feeInfo
+  const opts =
+    maximumFeeRate != null ? { maximumFeeRate: parseInt(maximumFeeRate) } : {}
+  const psbt = _altcoinjs.Psbt.fromBase64(args.psbtBase64, opts)
   const coin = _coinmapper.getCoinFromString.call(void 0, args.coin)
 
   const validator = (
@@ -1107,7 +1111,7 @@ const wifToPrivateKeyEncodingInternal = (
     psbt.validateSignaturesOfInput(i, validator)
     psbt.finalizeInput(i)
   }
-  const tx = psbt.extractTransaction(true)
+  const tx = psbt.extractTransaction()
   return {
     id: tx.getId(coin.txHashFunction),
     hex: tx.toHex()

package/lib/src/common/fees/calcMinerFeePerByte.d.ts

@@ -1,13 +1,13 @@
 import { EdgeSpendInfo } from 'edge-core-js/types';
-import { SimpleFeeSettings } from '../plugin/types';
+import { FeeInfo } from '../plugin/types';
 declare type NetworkFeeOption = EdgeSpendInfo['networkFeeOption'];
 /**
  * Calculate the sat/byte mining fee given an amount to spend and a SimpleFeeSettings object
  * @param nativeAmount
- * @param fees
+ * @param feeInfo
  * @param networkFeeOption
  * @param customNetworkFee
  * @returns {string}
  */
-export declare const calcMinerFeePerByte: (nativeAmount: string, fees: SimpleFeeSettings, networkFeeOption?: NetworkFeeOption, customNetworkFee?: string | undefined) => string;
+export declare const calcMinerFeePerByte: (nativeAmount: string, feeInfo: FeeInfo, networkFeeOption?: NetworkFeeOption, customNetworkFee?: string | undefined) => string;
 export {};

package/lib/src/common/fees/makeFees.d.ts

@@ -1,6 +1,6 @@
 import { Disklet } from 'disklet';
 import { EdgeIo, EdgeLog, EdgeSpendInfo } from 'edge-core-js/types';
-import { PluginInfo, SimpleFeeSettings } from '../plugin/types';
+import { FeeInfo, PluginInfo } from '../plugin/types';
 interface MakeFeesConfig extends Common {
     disklet: Disklet;
     pluginInfo: PluginInfo;
@@ -14,7 +14,7 @@ export interface Fees {
     stop: () => void;
     clearCache: () => Promise<void>;
     getRate: (edgeSpendInfo: EdgeSpendInfo) => Promise<string>;
-    fees: SimpleFeeSettings;
+    feeInfo: FeeInfo;
 }
 export declare const makeFees: (config: MakeFeesConfig) => Promise<Fees>;
 export {};

package/lib/src/common/plugin/types.d.ts

@@ -40,7 +40,7 @@ export interface EngineInfo {
     defaultFee: number;
     feeUpdateInterval: number;
     mempoolSpaceFeeInfoServer?: string;
-    simpleFeeSettings: SimpleFeeSettings;
+    defaultFeeInfo: FeeInfo;
     scriptTemplates?: ScriptTemplates;
     asBlockbookAddress?: Cleaner<string>;
     txSpecificHandling?: (tx: IProcessorTransaction, specialTx: unknown) => IProcessorTransaction;
@@ -108,19 +108,16 @@ export declare const asFeeRates: import("cleaners").ObjectCleaner<{
     standardFeeHigh: string;
     highFee: string;
 }>;
-export declare type SimpleFeeSettings = ReturnType<typeof asSimpleFeeSettings>;
-export declare const asSimpleFeeSettings: import("cleaners").ObjectCleaner<{
-    lowFeeFudgeFactor: string | undefined;
-    standardFeeLowFudgeFactor: string | undefined;
-    standardFeeHighFudgeFactor: string | undefined;
-    highFeeFudgeFactor: string | undefined;
+export declare type FeeInfo = FeeRates & {
+    lowFeeFudgeFactor?: string;
+    standardFeeLowFudgeFactor?: string;
+    standardFeeHighFudgeFactor?: string;
+    highFeeFudgeFactor?: string;
     standardFeeLowAmount: string;
     standardFeeHighAmount: string;
-    lowFee: string;
-    standardFeeLow: string;
-    standardFeeHigh: string;
-    highFee: string;
-}>;
+    maximumFeeRate?: string;
+};
+export declare const asFeeInfo: (fallback?: FeeInfo | undefined) => Cleaner<FeeInfo>;
 export interface EngineConfig {
     walletInfo: EdgeWalletInfo;
     pluginInfo: PluginInfo;

package/lib/src/common/plugin/util/maximumFeeRateCalculator.d.ts

@@ -0,0 +1,6 @@
+import { EdgeCurrencyInfo } from 'edge-core-js/types';
+/**
+ * Calculates a maximum fee rate of 1 USD per vByte given a USD exchange rate
+ * (usdPrice).
+ */
+export declare const maximumFeeRateCalculator: (currencyInfo: EdgeCurrencyInfo, usdPrice: number) => string | undefined;

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

@@ -1,5 +1,5 @@
 import { EdgeLog, EdgeMemo } from 'edge-core-js/types';
-import { ChangePath } from '../../plugin/types';
+import { ChangePath, FeeInfo } from '../../plugin/types';
 import { IUTXO } from '../db/types';
 import { ScriptTemplate, ScriptTemplates } from '../info/scriptTemplates/types';
 import * as utxopicker from './utxopicker';
@@ -153,9 +153,10 @@ interface MakeTxReturn extends Required<utxopicker.UtxoPickerResult> {
     psbtBase64: string;
 }
 export interface SignTxArgs {
-    privateKeyEncodings: PrivateKeyEncoding[];
-    psbtBase64: string;
     coin: string;
+    feeInfo: FeeInfo;
+    psbtBase64: string;
+    privateKeyEncodings: PrivateKeyEncoding[];
 }
 interface SignTxReturn {
     id: string;

package/package.json

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

package/lib/common/fees/processInfoServerFees.js

@@ -1,16 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _types = require('../plugin/types');
-
-/**
- * Processes the fee object from Edge Info Server
- * @param fees
- * @returns {SimpleFeeSettings}
- */
- const processInfoServerFees = (
-  fees
-) => {
-  try {
-    return _types.asSimpleFeeSettings.call(void 0, fees)
-  } catch (e) {
-    return null
-  }
-}; exports.processInfoServerFees = processInfoServerFees

package/lib/src/common/fees/processInfoServerFees.d.ts

@@ -1,7 +0,0 @@
-import { SimpleFeeSettings } from '../plugin/types';
-/**
- * Processes the fee object from Edge Info Server
- * @param fees
- * @returns {SimpleFeeSettings}
- */
-export declare const processInfoServerFees: (fees: unknown) => SimpleFeeSettings | null;