@subwallet/extension-base 1.3.18-1 → 1.3.20-0

package/cjs/core/logic-validation/request.js

@@ -353,7 +353,7 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
       try {
         const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
         const id = (0, _getId.getId)();
-        const feeInfo = await koni.feeService.subscribeChainFee(id, transaction.chain || '', 'evm');
+        const feeInfo = await koni.feeService.subscribeChainFee(id, networkKey, 'evm');
         const feeCombine = (0, _utils.combineEthFee)(feeInfo);
         if (transaction.maxFeePerGas) {
           estimateGas = new _bignumber.default(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
@@ -364,8 +364,11 @@ async function validationEvmDataTransactionMiddleware(koni, url, payload) {
             const maxFee = new _bignumber.default(feeCombine.maxFeePerGas); // TODO: Need review
 
             estimateGas = maxFee.multipliedBy(gasLimit).toFixed(0);
+            transaction.maxFeePerGas = feeCombine.maxFeePerGas;
+            transaction.maxPriorityFeePerGas = feeCombine.maxPriorityFeePerGas;
           } else if (feeCombine.gasPrice) {
             estimateGas = new _bignumber.default(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
+            transaction.maxPriorityFeePerGas = feeCombine.gasPrice;
           }
         }
       } catch (e) {

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

@@ -1484,25 +1484,29 @@ class KoniExtension {
       return tokensCanPayFee;
     }
     await Promise.all(tokenInfos.map(async tokenInfo => {
-      const tokenSlug = tokenInfo.slug;
-      const reserve = await (0, _utils6.getReserveForPool)(substrateApi.api, nativeTokenInfo, tokenInfo);
-      if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
-        return;
-      }
-      const rate = new _bignumber.default(reserve[1]).div(reserve[0]).toFixed();
-      const tokenCanPayFee = {
-        slug: tokenSlug,
-        free: tokensHasBalanceInfoMap[tokenSlug].free,
-        rate
-      };
-      if (feeAmount === undefined) {
-        tokensCanPayFee.push(tokenCanPayFee);
-      } else {
-        const amount = (0, _utils6.estimateTokensForPool)(feeAmount, reserve);
-        const liquidityError = (0, _utils6.checkLiquidityForPool)(amount, reserve[0], reserve[1]);
-        if (!liquidityError) {
+      try {
+        const tokenSlug = tokenInfo.slug;
+        const reserve = await (0, _utils6.getReserveForPool)(substrateApi.api, nativeTokenInfo, tokenInfo);
+        if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
+          return;
+        }
+        const rate = new _bignumber.default(reserve[1]).div(reserve[0]).toFixed();
+        const tokenCanPayFee = {
+          slug: tokenSlug,
+          free: tokensHasBalanceInfoMap[tokenSlug].free,
+          rate
+        };
+        if (feeAmount === undefined) {
           tokensCanPayFee.push(tokenCanPayFee);
+        } else {
+          const amount = (0, _utils6.estimateTokensForPool)(feeAmount, reserve);
+          const liquidityError = (0, _utils6.checkLiquidityForPool)(amount, reserve[0], reserve[1]);
+          if (!liquidityError) {
+            tokensCanPayFee.push(tokenCanPayFee);
+          }
         }
+      } catch (e) {
+        console.error('error when fetching pool with token', tokenInfo.slug, e);
       }
     }));
     return tokensCanPayFee;

package/cjs/packageInfo.js

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

package/cjs/services/chain-service/constants.js

@@ -272,7 +272,7 @@ const _TRANSFER_CHAIN_GROUP = {
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot'],
   centrifuge: ['centrifuge'],
-  disable_transfer: ['invarch', 'crab', 'pangolin']
+  disable_transfer: ['crab', 'pangolin']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {

package/cjs/services/fee-service/service.js

@@ -107,7 +107,9 @@ class FeeService {
             clearInterval(interval);
           } else {
             const api = this.state.getEvmApi(chain);
-            if (api) {
+
+            // TODO: Handle case type === evm and not have api
+            if (type === 'evm' && api) {
               (0, _utils2.calculateGasFeeParams)(api, chain).then(info => {
                 observer.next(info);
               }).catch(e => {

package/core/logic-validation/request.js

@@ -334,7 +334,7 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
       try {
         const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
         const id = getId();
-        const feeInfo = await koni.feeService.subscribeChainFee(id, transaction.chain || '', 'evm');
+        const feeInfo = await koni.feeService.subscribeChainFee(id, networkKey, 'evm');
         const feeCombine = combineEthFee(feeInfo);
         if (transaction.maxFeePerGas) {
           estimateGas = new BigN(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
@@ -345,8 +345,11 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
             const maxFee = new BigN(feeCombine.maxFeePerGas); // TODO: Need review
 
             estimateGas = maxFee.multipliedBy(gasLimit).toFixed(0);
+            transaction.maxFeePerGas = feeCombine.maxFeePerGas;
+            transaction.maxPriorityFeePerGas = feeCombine.maxPriorityFeePerGas;
           } else if (feeCombine.gasPrice) {
             estimateGas = new BigN(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
+            transaction.maxPriorityFeePerGas = feeCombine.gasPrice;
           }
         }
       } catch (e) {

package/koni/background/handlers/Extension.js

@@ -1444,25 +1444,29 @@ export default class KoniExtension {
       return tokensCanPayFee;
     }
     await Promise.all(tokenInfos.map(async tokenInfo => {
-      const tokenSlug = tokenInfo.slug;
-      const reserve = await getReserveForPool(substrateApi.api, nativeTokenInfo, tokenInfo);
-      if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
-        return;
-      }
-      const rate = new BigN(reserve[1]).div(reserve[0]).toFixed();
-      const tokenCanPayFee = {
-        slug: tokenSlug,
-        free: tokensHasBalanceInfoMap[tokenSlug].free,
-        rate
-      };
-      if (feeAmount === undefined) {
-        tokensCanPayFee.push(tokenCanPayFee);
-      } else {
-        const amount = estimateTokensForPool(feeAmount, reserve);
-        const liquidityError = checkLiquidityForPool(amount, reserve[0], reserve[1]);
-        if (!liquidityError) {
+      try {
+        const tokenSlug = tokenInfo.slug;
+        const reserve = await getReserveForPool(substrateApi.api, nativeTokenInfo, tokenInfo);
+        if (!reserve || !reserve[0] || !reserve[1] || reserve[0] === '0' || reserve[1] === '0') {
+          return;
+        }
+        const rate = new BigN(reserve[1]).div(reserve[0]).toFixed();
+        const tokenCanPayFee = {
+          slug: tokenSlug,
+          free: tokensHasBalanceInfoMap[tokenSlug].free,
+          rate
+        };
+        if (feeAmount === undefined) {
           tokensCanPayFee.push(tokenCanPayFee);
+        } else {
+          const amount = estimateTokensForPool(feeAmount, reserve);
+          const liquidityError = checkLiquidityForPool(amount, reserve[0], reserve[1]);
+          if (!liquidityError) {
+            tokensCanPayFee.push(tokenCanPayFee);
+          }
         }
+      } catch (e) {
+        console.error('error when fetching pool with token', tokenInfo.slug, e);
       }
     }));
     return tokensCanPayFee;

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.18-1",
+  "version": "1.3.20-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2564,10 +2564,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.99-beta.14",
-    "@subwallet/extension-base": "^1.3.18-1",
-    "@subwallet/extension-chains": "^1.3.18-1",
-    "@subwallet/extension-dapp": "^1.3.18-1",
-    "@subwallet/extension-inject": "^1.3.18-1",
+    "@subwallet/extension-base": "^1.3.20-0",
+    "@subwallet/extension-chains": "^1.3.20-0",
+    "@subwallet/extension-dapp": "^1.3.20-0",
+    "@subwallet/extension-inject": "^1.3.20-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

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.3.18-1'
+  version: '1.3.20-0'
 };

package/services/chain-service/constants.js

@@ -254,7 +254,7 @@ export const _TRANSFER_CHAIN_GROUP = {
   avail: ['kate', 'goldberg_testnet'],
   pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot'],
   centrifuge: ['centrifuge'],
-  disable_transfer: ['invarch', 'crab', 'pangolin']
+  disable_transfer: ['crab', 'pangolin']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']

package/services/fee-service/service.js

@@ -101,7 +101,9 @@ export default class FeeService {
             clearInterval(interval);
           } else {
             const api = this.state.getEvmApi(chain);
-            if (api) {
+
+            // TODO: Handle case type === evm and not have api
+            if (type === 'evm' && api) {
               calculateGasFeeParams(api, chain).then(info => {
                 observer.next(info);
               }).catch(e => {