@subwallet/extension-base 1.1.48-0 → 1.1.49-0

package/cjs/constants/index.js

@@ -113,7 +113,7 @@ const IGNORE_QR_SIGNER = [];
 exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
 const XCM_MIN_AMOUNT_RATIO = 1.2;
 exports.XCM_MIN_AMOUNT_RATIO = XCM_MIN_AMOUNT_RATIO;
-const XCM_FEE_RATIO = 1.2;
+const XCM_FEE_RATIO = 2;
 exports.XCM_FEE_RATIO = XCM_FEE_RATIO;
 const GAS_PRICE_RATIO = 1 + 2 / 100;
 exports.GAS_PRICE_RATIO = GAS_PRICE_RATIO;

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

@@ -1944,7 +1944,7 @@ class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            maxTransferable = maxTransferable.minus(new _bignumber.default(tokenInfo.minAmount || '0').multipliedBy(_constants.XCM_FEE_RATIO));
+            maxTransferable = maxTransferable.minus(new _bignumber.default(tokenInfo.minAmount || '0').multipliedBy(_constants.XCM_MIN_AMOUNT_RATIO));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
             const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils2._isChainEvmCompatible)(desChainInfo) && !(0, _utils2._isChainEvmCompatible)(orgChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;
@@ -2001,10 +2001,10 @@ class KoniExtension {
         estimatedFee = '0';
         console.warn('Unable to estimate fee', e);
       }
-      maxTransferable = maxTransferable.minus(new _bignumber.default(estimatedFee));
+      maxTransferable = maxTransferable.minus(new _bignumber.default(estimatedFee).multipliedBy(isXcmTransfer ? _constants.XCM_FEE_RATIO : 1));
       return {
         ...freeBalance,
-        value: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed() || '0' : '0'
+        value: maxTransferable.gt(_utils4.BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0'
       };
     }
   }

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.48-0'
+  version: '1.1.49-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -284,22 +284,19 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
       // Get Token Balance
       return await api.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {
         const items = balances.map((balance, index) => {
-          // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
-          const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
+          const bdata = balance === null || balance === void 0 ? void 0 : balance.toPrimitive();
           let frozen = _util.BN_ZERO;
           let total = _util.BN_ZERO;
           if (bdata) {
             // @ts-ignore
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
             const addressBalance = new _util.BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
 
             // @ts-ignore
-            if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
+            if (bdata !== null && bdata !== void 0 && bdata.isFrozen || ['Blocked', 'Frozen'].includes(bdata === null || bdata === void 0 ? void 0 : bdata.status)) {
+              // Status 'Frozen' and 'Blocked' are for frozen balance
               frozen = addressBalance;
-            } else {
-              total = addressBalance;
             }
+            total = addressBalance;
           }
           const free = total.sub(frozen);
           return {

package/constants/index.d.ts

@@ -23,7 +23,7 @@ export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
 export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
-export declare const XCM_FEE_RATIO = 1.2;
+export declare const XCM_FEE_RATIO = 2;
 export declare const GAS_PRICE_RATIO: number;
 export declare const NETWORK_MULTI_GAS_FEE: string[];
 export declare const ORDINAL_COLLECTION = "__Ordinal__";

package/constants/index.js

@@ -26,7 +26,7 @@ export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
 export const XCM_MIN_AMOUNT_RATIO = 1.2;
-export const XCM_FEE_RATIO = 1.2;
+export const XCM_FEE_RATIO = 2;
 export const GAS_PRICE_RATIO = 1 + 2 / 100;
 export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';

package/koni/background/handlers/Extension.js

@@ -1886,7 +1886,7 @@ export default class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            maxTransferable = maxTransferable.minus(new BigN(tokenInfo.minAmount || '0').multipliedBy(XCM_FEE_RATIO));
+            maxTransferable = maxTransferable.minus(new BigN(tokenInfo.minAmount || '0').multipliedBy(XCM_MIN_AMOUNT_RATIO));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
             const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(desChainInfo) && !_isChainEvmCompatible(orgChainInfo) ? u8aToHex(addressToEvm(address)) : address;
@@ -1943,10 +1943,10 @@ export default class KoniExtension {
         estimatedFee = '0';
         console.warn('Unable to estimate fee', e);
       }
-      maxTransferable = maxTransferable.minus(new BigN(estimatedFee));
+      maxTransferable = maxTransferable.minus(new BigN(estimatedFee).multipliedBy(isXcmTransfer ? XCM_FEE_RATIO : 1));
       return {
         ...freeBalance,
-        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed() || '0' : '0'
+        value: maxTransferable.gt(BN_ZERO) ? maxTransferable.toFixed(0) || '0' : '0'
       };
     }
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.48-0",
+  "version": "1.1.49-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1797,10 +1797,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "0.2.52",
-    "@subwallet/extension-base": "^1.1.48-0",
-    "@subwallet/extension-chains": "^1.1.48-0",
-    "@subwallet/extension-dapp": "^1.1.48-0",
-    "@subwallet/extension-inject": "^1.1.48-0",
+    "@subwallet/extension-base": "^1.1.49-0",
+    "@subwallet/extension-chains": "^1.1.49-0",
+    "@subwallet/extension-dapp": "^1.1.49-0",
+    "@subwallet/extension-inject": "^1.1.49-0",
     "@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.48-0'
+  version: '1.1.49-0'
 };

package/services/balance-service/helpers/subscribe/substrate/index.js

@@ -276,22 +276,19 @@ async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
       // Get Token Balance
       return await api.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {
         const items = balances.map((balance, index) => {
-          // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
-          const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
+          const bdata = balance === null || balance === void 0 ? void 0 : balance.toPrimitive();
           let frozen = BN_ZERO;
           let total = BN_ZERO;
           if (bdata) {
             // @ts-ignore
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
             const addressBalance = new BN(String(bdata === null || bdata === void 0 ? void 0 : bdata.balance).replaceAll(',', '') || '0');
 
             // @ts-ignore
-            if (bdata !== null && bdata !== void 0 && bdata.isFrozen) {
+            if (bdata !== null && bdata !== void 0 && bdata.isFrozen || ['Blocked', 'Frozen'].includes(bdata === null || bdata === void 0 ? void 0 : bdata.status)) {
+              // Status 'Frozen' and 'Blocked' are for frozen balance
               frozen = addressBalance;
-            } else {
-              total = addressBalance;
             }
+            total = addressBalance;
           }
           const free = total.sub(frozen);
           return {