@subwallet/extension-base 1.1.37-0 → 1.1.38-1

package/cjs/koni/api/tokens/evm/transfer.js

@@ -63,8 +63,7 @@ async function getEVMTransactionObject(chainInfo, from, to, value, transferAll,
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (priority.baseGasFee) {
-    const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-    const maxFee = priority.maxFeePerGas.gte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+    const maxFee = priority.maxFeePerGas;
     estimateFee = maxFee.multipliedBy(gasLimit);
   } else {
     estimateFee = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit);

package/cjs/koni/background/handlers/Extension.js

@@ -1941,8 +1941,7 @@ class KoniExtension {
             const gasLimit = await web3.api.eth.estimateGas(transaction);
             const priority = await (0, _eth.calculateGasFeeParams)(web3, networkKey);
             if (priority.baseGasFee) {
-              const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-              const maxFee = priority.maxFeePerGas.gte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+              const maxFee = priority.maxFeePerGas;
               estimatedFee = maxFee.multipliedBy(gasLimit).toFixed(0);
             } else {
               estimatedFee = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);

package/cjs/koni/background/handlers/State.js

@@ -1262,16 +1262,25 @@ class KoniState {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
-    const priority = await (0, _eth.calculateGasFeeParams)(evmApi, networkKey);
     let estimateGas;
-    if (priority.baseGasFee) {
-      transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
-      transaction.maxFeePerGas = priority.maxFeePerGas.toString();
-      const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-      const maxFee = priority.maxFeePerGas.lte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+
+    // TODO: Review, If not override, transaction maybe fail because fee too low
+    if (transactionParams.maxPriorityFeePerGas && transactionParams.maxFeePerGas) {
+      const maxFee = new _bignumber.default(transactionParams.maxFeePerGas);
       estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
+    } else if (transactionParams.gasPrice) {
+      estimateGas = new _bignumber.default(transactionParams.gasPrice).multipliedBy(transaction.gas).toFixed(0);
     } else {
-      estimateGas = new _bignumber.default(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+      const priority = await (0, _eth.calculateGasFeeParams)(evmApi, networkKey);
+      if (priority.baseGasFee) {
+        transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
+        transaction.maxFeePerGas = priority.maxFeePerGas.toString();
+        const maxFee = priority.maxFeePerGas;
+        estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
+      } else {
+        transaction.gasPrice = priority.gasPrice;
+        estimateGas = new _bignumber.default(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+      }
     }
 
     // Address is validated in before step

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.37-0'
+  version: '1.1.38-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/transaction-service/index.js

@@ -126,8 +126,8 @@ class TransactionService {
               const gasLimit = await web3.api.eth.estimateGas(transaction);
               const priority = await (0, _eth.calculateGasFeeParams)(web3, chainInfo.slug);
               if (priority.baseGasFee) {
-                const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-                const maxFee = priority.maxFeePerGas.lte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+                const maxFee = priority.maxFeePerGas; // TODO: Need review
+
                 estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
               } else {
                 estimateFee.value = new _bignumber.default(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);

package/cjs/utils/eth.js

@@ -80,44 +80,83 @@ exports.recalculateGasPrice = recalculateGasPrice;
 const calculateGasFeeParams = async (web3, networkKey) => {
   try {
     const numBlock = 20;
-    const history = await web3.api.eth.getFeeHistory(numBlock, 'latest', [0, 25, 50, 75, 100]);
+    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 _bignumber.default(history.baseFeePerGas[history.baseFeePerGas.length - 1]); // Last element is latest
 
     const blocksBusy = history.reward.reduce((previous, rewards, currentIndex) => {
-      const [priority] = rewards;
+      const [firstPriority] = rewards;
       const base = history.baseFeePerGas[currentIndex];
-      const priorityBN = new _bignumber.default(priority);
+      const priorityBN = new _bignumber.default(firstPriority);
       const baseBN = new _bignumber.default(base);
-      const blockIsBusy = priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0; // True if priority >= 0.5 * base
+
+      /*
+      * True if priority >= 0.3 * base
+      *  */
+      const blockIsBusy = baseBN.gt(_number.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 busyNetwork = blocksBusy >= numBlock / 2; // True, if half of block is busy
 
-    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards, currentIndex) => {
-      const [first, second] = rewards;
-      const base = history.baseFeePerGas[currentIndex];
-      const firstBN = new _bignumber.default(first);
-      const secondBN = new _bignumber.default(second);
-      const baseBN = new _bignumber.default(base);
+    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
+      let firstBN = _number.BN_ZERO;
+      let firstIndex = 0;
 
-      // Special for bsc, base and first always 0
-      if (baseBN.eq(_number.BN_ZERO) && firstBN.eq(_number.BN_ZERO)) {
-        const current = secondBN;
-        return current.gte(previous) ? current : previous; // get min priority
+      /* Get first priority which greater than 0 */
+      for (let i = 0; i < rewards.length; i++) {
+        firstIndex = i;
+        const current = rewards[i];
+        const currentBN = new _bignumber.default(current);
+        if (currentBN.gt(_number.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 _bignumber.default(current);
+        if (currentBN.gt(firstBN)) {
+          secondBN = currentBN;
+          break;
+        }
+      }
+      let current;
       if (busyNetwork) {
-        const current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
-
+        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 {
-        const current = firstBN;
+        /* Get min value which greater than 0 */
+        if (previous.eq(_number.BN_ZERO)) {
+          return current; // get min priority
+        } else if (current.eq(_number.BN_ZERO)) {
+          return previous;
+        }
         return current.lte(previous) ? current : previous; // get min priority
       }
     }, _number.BN_ZERO);
-    const maxFeePerGas = baseGasFee.plus(maxPriorityFeePerGas).multipliedBy(busyNetwork ? 2 : 1.5).decimalPlaces(0); // Max gas =(base + priority) * 1.5(if not busy or 2 when busy);
+    if (maxPriorityFeePerGas.eq(_number.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,

package/koni/api/tokens/evm/transfer.js

@@ -51,8 +51,7 @@ export async function getEVMTransactionObject(chainInfo, from, to, value, transf
   transactionObject.gas = gasLimit;
   let estimateFee;
   if (priority.baseGasFee) {
-    const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-    const maxFee = priority.maxFeePerGas.gte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+    const maxFee = priority.maxFeePerGas;
     estimateFee = maxFee.multipliedBy(gasLimit);
   } else {
     estimateFee = new BigN(priority.gasPrice).multipliedBy(gasLimit);

package/koni/background/handlers/Extension.js

@@ -1883,8 +1883,7 @@ export default class KoniExtension {
             const gasLimit = await web3.api.eth.estimateGas(transaction);
             const priority = await calculateGasFeeParams(web3, networkKey);
             if (priority.baseGasFee) {
-              const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-              const maxFee = priority.maxFeePerGas.gte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+              const maxFee = priority.maxFeePerGas;
               estimatedFee = maxFee.multipliedBy(gasLimit).toFixed(0);
             } else {
               estimatedFee = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);

package/koni/background/handlers/State.js

@@ -1240,16 +1240,25 @@ export default class KoniState {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, e === null || e === void 0 ? void 0 : e.message);
     }
-    const priority = await calculateGasFeeParams(evmApi, networkKey);
     let estimateGas;
-    if (priority.baseGasFee) {
-      transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
-      transaction.maxFeePerGas = priority.maxFeePerGas.toString();
-      const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-      const maxFee = priority.maxFeePerGas.lte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+
+    // TODO: Review, If not override, transaction maybe fail because fee too low
+    if (transactionParams.maxPriorityFeePerGas && transactionParams.maxFeePerGas) {
+      const maxFee = new BigN(transactionParams.maxFeePerGas);
       estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
+    } else if (transactionParams.gasPrice) {
+      estimateGas = new BigN(transactionParams.gasPrice).multipliedBy(transaction.gas).toFixed(0);
     } else {
-      estimateGas = new BigN(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+      const priority = await calculateGasFeeParams(evmApi, networkKey);
+      if (priority.baseGasFee) {
+        transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
+        transaction.maxFeePerGas = priority.maxFeePerGas.toString();
+        const maxFee = priority.maxFeePerGas;
+        estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
+      } else {
+        transaction.gasPrice = priority.gasPrice;
+        estimateGas = new BigN(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+      }
     }
 
     // Address is validated in before step

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.37-0",
+  "version": "1.1.38-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1736,11 +1736,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.40",
-    "@subwallet/extension-base": "^1.1.37-0",
-    "@subwallet/extension-chains": "^1.1.37-0",
-    "@subwallet/extension-dapp": "^1.1.37-0",
-    "@subwallet/extension-inject": "^1.1.37-0",
+    "@subwallet/chain-list": "0.2.41",
+    "@subwallet/extension-base": "^1.1.38-1",
+    "@subwallet/extension-chains": "^1.1.38-1",
+    "@subwallet/extension-dapp": "^1.1.38-1",
+    "@subwallet/extension-inject": "^1.1.38-1",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.37-0'
+  version: '1.1.38-1'
 };

package/services/transaction-service/index.js

@@ -119,8 +119,8 @@ export default class TransactionService {
               const gasLimit = await web3.api.eth.estimateGas(transaction);
               const priority = await calculateGasFeeParams(web3, chainInfo.slug);
               if (priority.baseGasFee) {
-                const priorityFee = priority.baseGasFee.plus(priority.maxPriorityFeePerGas);
-                const maxFee = priority.maxFeePerGas.lte(priorityFee) ? priority.maxFeePerGas : priorityFee;
+                const maxFee = priority.maxFeePerGas; // TODO: Need review
+
                 estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
               } else {
                 estimateFee.value = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);

package/utils/eth.d.ts

@@ -18,15 +18,15 @@ export declare const createTransactionFromRLP: (rlp: string) => Transaction | nu
 export declare const signatureToHex: (sig: SignedTransaction) => string;
 export declare const recalculateGasPrice: (_price: string, chain: string) => string;
 export declare const calculateGasFeeParams: (web3: _EvmApi, networkKey: string) => Promise<{
-    maxFeePerGas: BigN;
-    maxPriorityFeePerGas: BigN;
-    baseGasFee: BigN;
-    busyNetwork: boolean;
-    gasPrice?: undefined;
-} | {
     gasPrice: string;
     busyNetwork: boolean;
     maxFeePerGas?: undefined;
     maxPriorityFeePerGas?: undefined;
     baseGasFee?: undefined;
+} | {
+    maxFeePerGas: BigN;
+    maxPriorityFeePerGas: BigN;
+    baseGasFee: BigN;
+    busyNetwork: boolean;
+    gasPrice?: undefined;
 }>;

package/utils/eth.js

@@ -68,44 +68,83 @@ export const recalculateGasPrice = (_price, chain) => {
 export const calculateGasFeeParams = async (web3, networkKey) => {
   try {
     const numBlock = 20;
-    const history = await web3.api.eth.getFeeHistory(numBlock, 'latest', [0, 25, 50, 75, 100]);
+    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 [priority] = rewards;
+      const [firstPriority] = rewards;
       const base = history.baseFeePerGas[currentIndex];
-      const priorityBN = new BigN(priority);
+      const priorityBN = new BigN(firstPriority);
       const baseBN = new BigN(base);
-      const blockIsBusy = priorityBN.dividedBy(baseBN).gte(0.3) ? 1 : 0; // True if priority >= 0.5 * 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 busyNetwork = blocksBusy >= numBlock / 2; // True, if half of block is busy
 
-    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards, currentIndex) => {
-      const [first, second] = rewards;
-      const base = history.baseFeePerGas[currentIndex];
-      const firstBN = new BigN(first);
-      const secondBN = new BigN(second);
-      const baseBN = new BigN(base);
+    const maxPriorityFeePerGas = history.reward.reduce((previous, rewards) => {
+      let firstBN = BN_ZERO;
+      let firstIndex = 0;
 
-      // Special for bsc, base and first always 0
-      if (baseBN.eq(BN_ZERO) && firstBN.eq(BN_ZERO)) {
-        const current = secondBN;
-        return current.gte(previous) ? current : previous; // get min priority
+      /* 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) {
-        const current = secondBN.dividedBy(2).gte(firstBN) ? firstBN : secondBN; // second too larger than first (> 2 times), use first else use second
-
+        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 {
-        const current = firstBN;
+        /* 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);
-    const maxFeePerGas = baseGasFee.plus(maxPriorityFeePerGas).multipliedBy(busyNetwork ? 2 : 1.5).decimalPlaces(0); // Max gas =(base + priority) * 1.5(if not busy or 2 when busy);
+    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,