edge-currency-plugins 2.2.0 → 2.3.0

package/lib/common/constants.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); const IMAGE_SERVER_URL = 'https://content.edge.app'; exports.IMAGE_SERVER_URL = IMAGE_SERVER_URL
- const INFO_SERVER_URI = 'https://info1.edgesecure.co:8444/v1'; exports.INFO_SERVER_URI = INFO_SERVER_URI
+ const INFO_SERVER_URI = 'https://info1.edge.app'; exports.INFO_SERVER_URI = INFO_SERVER_URI
 
 // Fees
  const FEES_PATH = 'fees.json'; exports.FEES_PATH = FEES_PATH

package/lib/common/fees/calcMinerFeePerByte.js

@@ -1,4 +1,4 @@
-"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; } }var _biggystring = require('biggystring'); var bs = _interopRequireWildcard(_biggystring);
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _biggystring = require('biggystring');
 
 
 
@@ -19,36 +19,48 @@
   networkFeeOption,
   customNetworkFee
 ) => {
+  const {
+    highFeeFudgeFactor = '1',
+    lowFeeFudgeFactor = '1',
+    standardFeeHighAmount,
+    standardFeeHighFudgeFactor = '1',
+    standardFeeLowAmount,
+    standardFeeLowFudgeFactor = '1'
+  } = fees
+  let { highFee, lowFee, standardFeeHigh, standardFeeLow } = fees
+
+  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)
+  standardFeeHigh = _biggystring.round.call(void 0, _biggystring.mul.call(void 0, standardFeeHigh, standardFeeHighFudgeFactor), 0)
+  standardFeeLow = _biggystring.round.call(void 0, _biggystring.mul.call(void 0, standardFeeLow, standardFeeLowFudgeFactor), 0)
+
   switch (networkFeeOption) {
     case 'low':
-      return fees.lowFee
+      return lowFee
 
     case 'standard': {
-      if (bs.gte(nativeAmount, fees.standardFeeHighAmount)) {
-        return fees.standardFeeHigh
+      if (_biggystring.gte.call(void 0, nativeAmount, standardFeeHighAmount)) {
+        return standardFeeHigh
       }
-      if (bs.lte(nativeAmount, fees.standardFeeLowAmount)) {
-        return fees.standardFeeLow
+      if (_biggystring.lte.call(void 0, nativeAmount, standardFeeLowAmount)) {
+        return standardFeeLow
       }
 
       // Scale the fee by the amount the user is sending scaled between standardFeeLowAmount and standardFeeHighAmount
-      const lowHighAmountDiff = bs.sub(
-        fees.standardFeeHighAmount,
-        fees.standardFeeLowAmount
-      )
-      const lowHighFeeDiff = bs.sub(fees.standardFeeHigh, fees.standardFeeLow)
+      const lowHighAmountDiff = _biggystring.sub.call(void 0, standardFeeHighAmount, standardFeeLowAmount)
+      const lowHighFeeDiff = _biggystring.sub.call(void 0, standardFeeHigh, standardFeeLow)
 
       // How much above the lowFeeAmount is the user sending
-      const amountDiffFromLow = bs.sub(nativeAmount, fees.standardFeeLowAmount)
+      const amountDiffFromLow = _biggystring.sub.call(void 0, nativeAmount, standardFeeLowAmount)
 
       // Add this much to the low fee = (amountDiffFromLow * lowHighFeeDiff) / lowHighAmountDiff)
-      const temp1 = bs.mul(amountDiffFromLow, lowHighFeeDiff)
-      const addFeeToLow = bs.div(temp1, lowHighAmountDiff)
-      return bs.add(fees.standardFeeLow, addFeeToLow)
+      const temp1 = _biggystring.mul.call(void 0, amountDiffFromLow, lowHighFeeDiff)
+      const addFeeToLow = _biggystring.div.call(void 0, temp1, lowHighAmountDiff)
+      return _biggystring.add.call(void 0, standardFeeLow, addFeeToLow)
     }
 
     case 'high':
-      return fees.highFee
+      return highFee
 
     case 'custom':
       if (customNetworkFee == null || customNetworkFee === '0') {

package/lib/common/fees/makeFees.js

@@ -9,6 +9,7 @@ var _cleaners = require('cleaners');
 
 var _memlet = require('memlet');
 
+var _filterUndefined = require('../../util/filterUndefined');
 var _constants = require('../constants');
 
 
@@ -57,7 +58,8 @@ var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
       ...common,
       mempoolSpaceFeeInfoServer: engineInfo.mempoolSpaceFeeInfoServer
     })
-    Object.assign(fees, _nullishCoalesce(vendorFees, () => ( {})))
+    const cleanedVendorFees = _filterUndefined.removeUndefined.call(void 0, _nullishCoalesce(vendorFees, () => ( {})))
+    Object.assign(fees, cleanedVendorFees)
     timestamp = Date.now()
 
     await cacheFees(memlet, fees)
@@ -67,7 +69,7 @@ var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
     async start() {
       const edgeFees = await fetchFees({
         ...common,
-        uri: `${_constants.INFO_SERVER_URI}/networkFees/${currencyInfo.pluginId}`,
+        uri: `${_constants.INFO_SERVER_URI}/v1/networkFees/${currencyInfo.pluginId}`,
         processor: _processInfoServerFees.processInfoServerFees
       })
       Object.assign(fees, edgeFees)

package/lib/common/fees/processInfoServerFees.js

@@ -1,18 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _cleaners = require('cleaners');
-
-
-
-const asInfoServerFees = _cleaners.asObject({
-  lowFee: _cleaners.asString,
-  standardFeeLow: _cleaners.asString,
-  standardFeeHigh: _cleaners.asString,
-  highFee: _cleaners.asString,
-
-  // 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
-})
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _types = require('../plugin/types');
 
 /**
  * Processes the fee object from Edge Info Server
@@ -23,7 +9,7 @@ const asInfoServerFees = _cleaners.asObject({
   fees
 ) => {
   try {
-    return asInfoServerFees(fees)
+    return _types.asSimpleFeeSettings.call(void 0, fees)
   } catch (e) {
     return null
   }

package/lib/common/fees/processMempoolSpaceFees.js

@@ -16,6 +16,10 @@ var _constants = require('../constants');
  * @param fees
  * @returns Partial<FeeRates>
  */
+
+const STANDARD_FEE_HIGH_MULTIPLIER = 1.3
+const HIGH_FEE_MULTIPLIER = 2
+
  const processMempoolSpaceFees = (fees) => {
   let mempoolFees
   try {
@@ -24,10 +28,14 @@ var _constants = require('../constants');
     return null
   }
 
-  const standardFeeLow = mempoolFees.hourFee.toString()
-  const lowFee = bs.div(standardFeeLow, '2')
-  const standardFeeHigh = mempoolFees.halfHourFee.toString()
-  const highFee = mempoolFees.fastestFee.toString()
+  const { fastestFee, halfHourFee } = mempoolFees
+
+  const lowFee = halfHourFee.toString()
+  const standardFeeLow = fastestFee.toString()
+  const standardFeeHigh = Math.round(
+    fastestFee * STANDARD_FEE_HIGH_MULTIPLIER
+  ).toString()
+  const highFee = Math.round(fastestFee * HIGH_FEE_MULTIPLIER).toString()
 
   return {
     lowFee: bs.max(lowFee, _constants.LOW_FEE.toString()),

package/lib/common/plugin/types.js

@@ -1,5 +1,12 @@
 "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; } }
 
+
+
+
+
+
+
+
 var _cleaners = require('cleaners');
 
 
@@ -147,6 +154,12 @@ var _cleaners = require('cleaners');
 
  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

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

@@ -44,6 +44,11 @@ const engineInfo = {
   defaultFee: 500000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '300',
     lowFee: '100',
     standardFeeLow: '150',

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

@@ -60,6 +60,11 @@ const engineInfo = {
   feeUpdateInterval: 60000,
   mempoolSpaceFeeInfoServer: 'https://mempool.space/api/v1/fees/recommended',
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '150',
     lowFee: '20',
     standardFeeLow: '50',

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

@@ -56,11 +56,16 @@ const currencyInfo = {
 
 const engineInfo = {
   formats: ['bip44', 'bip32'],
-  forks: ['bitcoinsv'],
+  forks: [], // 'bitcoinsv' is currently disabled, so not included in the forks
   gapLimit: 10,
   defaultFee: 10000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '20',
     lowFee: '3',
     standardFeeLow: '5',

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

@@ -46,6 +46,11 @@ const engineInfo = {
   defaultFee: 10000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '20',
     lowFee: '3',
     standardFeeLow: '5',

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

@@ -52,6 +52,11 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '200',
     lowFee: '10',
     standardFeeLow: '15',

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

@@ -38,6 +38,11 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '200',
     lowFee: '10',
     standardFeeLow: '15',

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

@@ -58,6 +58,11 @@ const engineInfo = {
   defaultFee: 10000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '20',
     lowFee: '3',
     standardFeeLow: '5',

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

@@ -54,6 +54,11 @@ var _commonInfo = require('./commonInfo');
   feeUpdateInterval: 60000,
   mempoolSpaceFeeInfoServer: 'https://mempool.space/api/v1/fees/recommended',
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '150',
     lowFee: '20',
     standardFeeLow: '50',

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

@@ -53,6 +53,11 @@ const engineInfo = {
   defaultFee: 10000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '300',
     lowFee: '100',
     standardFeeLow: '150',

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

@@ -45,6 +45,11 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '150',
     lowFee: '20',
     standardFeeLow: '50',

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

@@ -49,6 +49,11 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 10000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '526316',
     lowFee: '526316',
     standardFeeLow: '526316',

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

@@ -44,6 +44,11 @@ const engineInfo = {
   defaultFee: 500000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '300',
     lowFee: '100',
     standardFeeLow: '150',

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

@@ -49,6 +49,11 @@ var _commonInfo = require('./commonInfo');
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '1200',
     lowFee: '400',
     standardFeeLow: '600',

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

@@ -50,6 +50,11 @@ const engineInfo = {
   defaultFee: 100000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '150',
     lowFee: '20',
     standardFeeLow: '50',

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

@@ -56,6 +56,11 @@ var _commonInfo = require('./commonInfo');
   defaultFee: 50000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '300',
     lowFee: '100',
     standardFeeLow: '150',

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

@@ -41,6 +41,11 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '1000',
     lowFee: '400',
     standardFeeLow: '450',

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

@@ -41,6 +41,11 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '150',
     lowFee: '20',
     standardFeeLow: '50',

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

@@ -47,6 +47,11 @@ const engineInfo = {
   defaultFee: 100000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '1500',
     lowFee: '200',
     standardFeeLow: '500',

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

@@ -44,6 +44,11 @@ const engineInfo = {
   defaultFee: 50000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '2250',
     lowFee: '1000',
     standardFeeLow: '1100',

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

@@ -51,6 +51,11 @@ const engineInfo = {
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '150',
     lowFee: '20',
     standardFeeLow: '50',

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

@@ -50,6 +50,11 @@ var _commonInfo = require('./commonInfo');
   defaultFee: 1000,
   feeUpdateInterval: 60000,
   simpleFeeSettings: {
+    lowFeeFudgeFactor: undefined,
+    standardFeeLowFudgeFactor: undefined,
+    standardFeeHighFudgeFactor: undefined,
+    highFeeFudgeFactor: undefined,
+
     highFee: '150',
     lowFee: '20',
     standardFeeLow: '50',

package/lib/src/common/constants.d.ts

@@ -1,5 +1,5 @@
 export declare const IMAGE_SERVER_URL = "https://content.edge.app";
-export declare const INFO_SERVER_URI = "https://info1.edgesecure.co:8444/v1";
+export declare const INFO_SERVER_URI = "https://info1.edge.app";
 export declare const FEES_PATH = "fees.json";
 export declare const MAX_FEE = 999999999;
 export declare const LOW_FEE = 2;

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

@@ -4,10 +4,4 @@ export declare const asMempoolSpaceFees: import("cleaners").ObjectCleaner<{
     halfHourFee: number;
     hourFee: number;
 }>;
-/**
- * Calculates the FeeRates object from MempoolSpace
- * Sets the minimum of LOW_FEE on all fee levels
- * @param fees
- * @returns Partial<FeeRates>
- */
 export declare const processMempoolSpaceFees: (fees: unknown) => FeeRates | null;

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

@@ -110,6 +110,10 @@ export declare const asFeeRates: import("cleaners").ObjectCleaner<{
 }>;
 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;
     standardFeeLowAmount: string;
     standardFeeHighAmount: string;
     lowFee: string;

package/lib/src/util/filterUndefined.d.ts

@@ -1 +1,2 @@
 export declare const filterUndefined: <T>(values: (T | undefined)[]) => T[];
+export declare const removeUndefined: <T extends Record<string, any>>(obj: T) => Partial<T>;

package/lib/util/filterUndefined.js

@@ -2,3 +2,18 @@
  const filterUndefined = (values) => {
   return values.filter(value => value !== undefined) 
 }; exports.filterUndefined = filterUndefined
+
+ const removeUndefined = (
+  obj
+) => {
+  const result = {}
+
+  for (const key in obj) {
+    if (obj[key] !== undefined) {
+      // We need to assure TypeScript that the key indeed exists on T
+      result[key ] = obj[key]
+    }
+  }
+
+  return result
+}; exports.removeUndefined = removeUndefined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "altcoin-js": "^1.0.0",
     "async-mutex": "^0.2.6",
     "baselet": "^0.2.4",
-    "biggystring": "^4.0.0",
+    "biggystring": "^4.1.3",
     "bip32": "^2.0.5",
     "bip32grs": "^2.0.5",
     "bip39": "^3.0.2",
@@ -107,4 +107,4 @@
     "typescript": "^4.1.2",
     "wif": "^2.0.6"
   }
-}
+}