@subwallet/extension-base 1.1.40-1 → 1.1.42-0

package/utils/eth.js

@@ -1,11 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { GAS_PRICE_RATIO, NETWORK_MULTI_GAS_FEE } from '@subwallet/extension-base/constants';
 import BigN from 'bignumber.js';
 import { ethers } from 'ethers';
 import { hexStripPrefix, numberToHex } from '@polkadot/util';
-import { BN_ZERO } from "./number.js";
 const hexToNumberString = s => {
   const temp = parseInt(s, 16);
   if (isNaN(temp)) {
@@ -60,103 +58,4 @@ export const signatureToHex = sig => {
   const hexS = s.length % 2 === 1 ? `0${s}` : s;
   const hexV = hexStripPrefix(numberToHex(v));
   return hexR + hexS + hexV;
-};
-export const recalculateGasPrice = (_price, chain) => {
-  const needMulti = NETWORK_MULTI_GAS_FEE.includes(chain) || NETWORK_MULTI_GAS_FEE.includes('*');
-  return needMulti ? new BigN(_price).multipliedBy(GAS_PRICE_RATIO).toFixed(0) : _price;
-};
-export const calculateGasFeeParams = async (web3, networkKey) => {
-  try {
-    const numBlock = 20;
-    const rewardPercent = [];
-    for (let i = 0; i <= 100; i = i + 5) {
-      rewardPercent.push(i);
-    }
-    const history = await web3.api.eth.getFeeHistory(numBlock, 'latest', rewardPercent);
-    const baseGasFee = new BigN(history.baseFeePerGas[history.baseFeePerGas.length - 1]); // Last element is latest
-
-    const blocksBusy = history.reward.reduce((previous, rewards, currentIndex) => {
-      const [firstPriority] = rewards;
-      const base = history.baseFeePerGas[currentIndex];
-      const priorityBN = new BigN(firstPriority);
-      const baseBN = new BigN(base);
-
-      /*
-      * True if priority >= 0.3 * base
-      *  */
-      const blockIsBusy = baseBN.gt(BN_ZERO) ? priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0 : 0; // Special for bsc, base fee = 0
-
-      return previous + blockIsBusy;
-    }, 0);
-    const busyNetwork = blocksBusy >= numBlock / 2; // True, if half of block is busy
-
-    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
-      let firstBN = BN_ZERO;
-      let firstIndex = 0;
-
-      /* Get first priority which greater than 0 */
-      for (let i = 0; i < rewards.length; i++) {
-        firstIndex = i;
-        const current = rewards[i];
-        const currentBN = new BigN(current);
-        if (currentBN.gt(BN_ZERO)) {
-          firstBN = currentBN;
-          break;
-        }
-      }
-      let secondBN = firstBN;
-
-      /* Get second priority which greater than first priority */
-      for (let i = firstIndex; i < rewards.length; i++) {
-        const current = rewards[i];
-        const currentBN = new BigN(current);
-        if (currentBN.gt(firstBN)) {
-          secondBN = currentBN;
-          break;
-        }
-      }
-      let current;
-      if (busyNetwork) {
-        current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
-      } else {
-        current = firstBN;
-      }
-      if (busyNetwork) {
-        /* Get max value */
-        return current.gte(previous) ? current : previous; // get max priority
-      } else {
-        /* Get min value which greater than 0 */
-        if (previous.eq(BN_ZERO)) {
-          return current; // get min priority
-        } else if (current.eq(BN_ZERO)) {
-          return previous;
-        }
-        return current.lte(previous) ? current : previous; // get min priority
-      }
-    }, BN_ZERO);
-    if (maxPriorityFeePerGas.eq(BN_ZERO)) {
-      const _price = await web3.api.eth.getGasPrice();
-      const gasPrice = recalculateGasPrice(_price, networkKey);
-      return {
-        gasPrice,
-        busyNetwork: false
-      };
-    }
-
-    /* Max gas = (base + priority) * 1.5 (if not busy or 2 when busy); */
-    const maxFeePerGas = baseGasFee.plus(maxPriorityFeePerGas).multipliedBy(busyNetwork ? 2 : 1.5).decimalPlaces(0);
-    return {
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      baseGasFee,
-      busyNetwork
-    };
-  } catch (e) {
-    const _price = await web3.api.eth.getGasPrice();
-    const gasPrice = recalculateGasPrice(_price, networkKey);
-    return {
-      gasPrice,
-      busyNetwork: false
-    };
-  }
 };

package/utils/index.d.ts

@@ -43,6 +43,7 @@ export declare function wait(milliseconds: number): Promise<void>;
 export * from './account';
 export * from './array';
 export * from './environment';
+export * from './eth';
 export * from './number';
 export * from './lazy';
 export * from './promise';

package/utils/index.js

@@ -345,6 +345,7 @@ export function wait(milliseconds) {
 export * from "./account.js";
 export * from "./array.js";
 export * from "./environment.js";
+export * from "./eth.js";
 export * from "./number.js";
 export * from "./lazy.js";
 export * from "./promise.js";

package/utils/reportError.d.ts

@@ -0,0 +1 @@
+export declare const reportError: (e: Error, pathName: string) => Promise<void>;

package/utils/reportError.js

@@ -0,0 +1,23 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { TARGET_ENV } from '@subwallet/extension-base/utils/environment';
+import fetch from 'cross-fetch';
+const EXTENSION_REPORT_ERROR_URL = 'https://extension-feedback.subwallet.app/gelf';
+const WEBAPP_REPORT_ERROR_URL = 'https://web-feedback.subwallet.app/gelf';
+export const reportError = async (e, pathName) => {
+  const errorContent = JSON.stringify(e.stack);
+  const errorShortMessage = e.message;
+  const body = {
+    content: errorContent,
+    short_message: errorShortMessage,
+    platform: TARGET_ENV,
+    device_version: '',
+    app_version: JSON.stringify(process.env.PKG_VERSION),
+    current_routes: pathName
+  };
+  await fetch(TARGET_ENV === 'extension' ? EXTENSION_REPORT_ERROR_URL : WEBAPP_REPORT_ERROR_URL, {
+    method: 'POST',
+    body: JSON.stringify(body)
+  });
+};