edge-currency-plugins 2.4.0 → 2.4.1

package/lib/common/fees/makeFees.js

@@ -65,7 +65,7 @@ var _processMempoolSpaceFees = require('./processMempoolSpaceFees');
       const edgeFees = await fetchFees({
         ...common,
         uri: `${_constants.INFO_SERVER_URI}/v1/networkFees/${currencyInfo.pluginId}`,
-        cleaner: _cleaners.asMaybe.call(void 0, _types3.asFeeInfo, null)
+        cleaner: _cleaners.asMaybe.call(void 0, _types3.asFeeInfo.call(void 0, feeInfo), null)
       })
       Object.assign(feeInfo, edgeFees)
       await updateVendorFees()
@@ -122,7 +122,7 @@ const fetchCachedFees = async (
   fallback
 ) => {
   const data = await memlet.getJson(_constants.FEES_PATH).catch(() => undefined)
-  const feeSettings = _cleaners.asMaybe.call(void 0, _types3.asFeeInfo, fallback)(data)
+  const feeSettings = _cleaners.asMaybe.call(void 0, _types3.asFeeInfo.call(void 0, fallback), fallback)(data)
   return feeSettings
 }
 

package/lib/common/plugin/types.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; } }
+"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; }
 
 
 
@@ -161,21 +161,28 @@ var _cleaners = require('cleaners');
 
 
 
- const asFeeInfo = _cleaners.asObject({
-  ...exports.asFeeRates.shape,
+ const asFeeInfo = (fallback) =>
+  _cleaners.asObject({
+    ...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),
+    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)
-}); exports.asFeeInfo = asFeeInfo
+    // 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/src/common/plugin/types.d.ts

@@ -117,7 +117,7 @@ export declare type FeeInfo = FeeRates & {
     standardFeeHighAmount: string;
     maximumFeeRate?: string;
 };
-export declare const asFeeInfo: import("cleaners").ObjectCleaner<FeeInfo>;
+export declare const asFeeInfo: (fallback?: FeeInfo | undefined) => Cleaner<FeeInfo>;
 export interface EngineConfig {
     walletInfo: EdgeWalletInfo;
     pluginInfo: PluginInfo;

package/package.json

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