@subwallet/extension-base 1.2.24-0 → 1.2.24-1

package/cjs/services/chain-service/handler/SubstrateApi.js

@@ -10,7 +10,6 @@ var _api2 = require("@gear-js/api");
 var _types = require("@oak-foundation/types");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _lightClient = require("@subwallet/extension-base/services/chain-service/handler/light-client");
-var _SubstrateChainHandler = require("@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler");
 var _types2 = require("@subwallet/extension-base/services/chain-service/types");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _availJsSdk = require("avail-js-sdk");
@@ -18,8 +17,6 @@ var _rxjs = require("rxjs");
 var _api3 = require("@polkadot/api");
 var _api4 = require("@polkadot/apps-config/api");
 var _create = require("@polkadot/types/create");
-var _util = require("@polkadot/util");
-var _defaults = require("@polkadot/util-crypto/address/defaults");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -62,6 +59,11 @@ class SubstrateApi {
       this.connectionStatusSubject.next(status);
     }
   }
+
+  // apiDefaultTx?: SubmittableExtrinsicFunction;
+  // apiDefaultTxSudo?: SubmittableExtrinsicFunction;
+  // defaultFormatBalance?: _SubstrateDefaultFormatBalance;
+
   specName = '';
   specVersion = '';
   systemChain = '';
@@ -231,44 +233,136 @@ class SubstrateApi {
     console.warn(`${this.chainSlug} connection got error`, e);
   }
   async fillApiInfo() {
-    var _api$rpc$system, _api$rpc$system2, _api$rpc$system3;
-    const {
-      api,
-      registry
-    } = this;
-    const DEFAULT_DECIMALS = registry.createType('u32', 12);
-    const DEFAULT_SS58 = registry.createType('u32', _defaults.defaults.prefix);
+    // const { registry } = this;
+    // const DEFAULT_DECIMALS = registry.createType('u32', 12);
+    // const DEFAULT_SS58 = registry.createType('u32', addressDefaults.prefix);
+
     this.specName = this.api.runtimeVersion.specName.toString();
     this.specVersion = this.api.runtimeVersion.specVersion.toString();
-    const [systemChain, systemName, systemVersion] = await Promise.all([(_api$rpc$system = api.rpc.system) === null || _api$rpc$system === void 0 ? void 0 : _api$rpc$system.chain(), (_api$rpc$system2 = api.rpc.system) === null || _api$rpc$system2 === void 0 ? void 0 : _api$rpc$system2.name(), (_api$rpc$system3 = api.rpc.system) === null || _api$rpc$system3 === void 0 ? void 0 : _api$rpc$system3.version()]);
+    const [systemChain, systemName, systemVersion] = await Promise.all([this.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'chain'
+    }), this.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'name'
+    }), this.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'version'
+    })]);
     this.systemChain = systemChain.toString();
     this.systemName = systemName.toString();
     this.systemVersion = systemVersion.toString();
-    const properties = registry.createType('ChainProperties', {
-      ss58Format: api.registry.chainSS58,
-      tokenDecimals: api.registry.chainDecimals,
-      tokenSymbol: api.registry.chainTokens
-    });
-    const ss58Format = properties.ss58Format.unwrapOr(DEFAULT_SS58).toNumber();
-    const tokenSymbol = properties.tokenSymbol.unwrapOr([_util.formatBalance.getDefaults().unit, ..._SubstrateChainHandler.DEFAULT_AUX]);
-    const tokenDecimals = properties.tokenDecimals.unwrapOr([DEFAULT_DECIMALS]);
-    registry.setChainProperties(registry.createType('ChainProperties', {
-      ss58Format,
-      tokenDecimals,
-      tokenSymbol
-    }));
+
+    // const [ss58Format, tokenDecimals, tokenSymbol] = await Promise.all([
+    //   this.makeRpcQuery<number | undefined>({ section: 'registry', module: 'chainSS58' }),
+    //   this.makeRpcQuery<number[]>({ section: 'registry', module: 'chainDecimals' }),
+    //   this.makeRpcQuery<string[]>({ section: 'registry', module: 'chainTokens' })
+    // ]);
+    //
+    // const properties = registry.createType('ChainProperties', {
+    //   ss58Format,
+    //   tokenDecimals,
+    //   tokenSymbol
+    // });
+    // const ss58Format = properties.ss58Format.unwrapOr(DEFAULT_SS58).toNumber();
+    // const tokenSymbol = properties.tokenSymbol.unwrapOr([formatBalance.getDefaults().unit, ...DEFAULT_AUX]);
+    // const tokenDecimals = properties.tokenDecimals.unwrapOr([DEFAULT_DECIMALS]);
+    //
+    // registry.setChainProperties(registry.createType('ChainProperties', { ss58Format, tokenDecimals, tokenSymbol }));
 
     // first set up the UI helpers
-    this.defaultFormatBalance = {
-      decimals: tokenDecimals.map(b => {
-        return b.toNumber();
-      }),
-      unit: tokenSymbol[0].toString()
-    };
-    const defaultSection = Object.keys(api.tx)[0];
-    const defaultMethod = Object.keys(api.tx[defaultSection])[0];
-    this.apiDefaultTx = api.tx[defaultSection][defaultMethod];
-    this.apiDefaultTxSudo = api.tx.system && api.tx.system.setCode || this.apiDefaultTx;
+    // this.defaultFormatBalance = {
+    //   decimals: tokenDecimals.map((b: BN) => {
+    //     return b.toNumber();
+    //   }),
+    //   unit: tokenSymbol[0].toString()
+    // };
+    //
+    // const defaultSection = Object.keys(api.tx)[0];
+    // const defaultMethod = Object.keys(api.tx[defaultSection])[0];
+
+    // this.apiDefaultTx = api.tx[defaultSection][defaultMethod];
+    // this.apiDefaultTxSudo = (api.tx.system && api.tx.system.setCode) || this.apiDefaultTx;
+  }
+
+  async makeRpcQuery(_ref) {
+    let {
+      args,
+      method,
+      module,
+      section
+    } = _ref;
+    const isGetterCall = section === 'genesisHash' || section === 'extrinsicVersion' || section === 'runtimeVersion' || section === 'runtimeMetadata' || section === 'registry';
+    const isRuntimeConstQuery = section === 'consts' && !!method && !!module && !args;
+    const isRpcQuery = section === 'rpc' && !!method && !!module && !args;
+    const isStateQuery = section === 'query' && method && module;
+    if (isGetterCall) {
+      if (section === 'genesisHash') {
+        return this.api[section].toHex();
+      } else if (section === 'extrinsicVersion') {
+        return this.api[section];
+      } else if (section === 'runtimeVersion') {
+        return this.api[section].toPrimitive();
+      } else if (section === 'runtimeMetadata') {
+        return this.api[section].toHex();
+      } else if (section === 'registry') {
+        return this.api[section];
+      }
+    }
+    if (isRuntimeConstQuery) {
+      if (!this.api[section][module]) {
+        return undefined;
+      }
+      return this.api[section][module][method].toPrimitive();
+    }
+    if (isRpcQuery) {
+      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      if (!this.api[section][module]) {
+        return undefined;
+      }
+
+      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      return (await this.api[section][module][method]()).toPrimitive(); // todo: improve this
+    }
+
+    if (isStateQuery) {
+      if (!this.api[section][module]) {
+        return undefined;
+      }
+      if (args) {
+        return (await this.api[section][module][method](...args)).toPrimitive();
+      } else {
+        return (await this.api[section][module][method]()).toPrimitive();
+      }
+    }
+    return Promise.reject(new Error('Cannot handle query'));
+  }
+  subscribeDataWithMulti(params, callback) {
+    const apiRx = this.api.rx;
+    const observables = {};
+    params.forEach(queryParams => {
+      const {
+        args,
+        method,
+        module,
+        section
+      } = queryParams;
+      const key = `${section}_${module}_${method}`;
+      if (!this.api[section][module] || !this.api[section][module][method]) {
+        // if method not found, returns an empty observable
+        observables[key] = new _rxjs.Observable(subscriber => {
+          subscriber.next([]);
+        });
+      } else {
+        observables[key] = apiRx[section][module][method].multi(args).pipe((0, _rxjs.map)(codecs => codecs.map(codec => codec.toPrimitive())));
+      }
+    });
+    return (0, _rxjs.combineLatest)(observables).subscribe(callback);
   }
 }
 exports.SubstrateApi = SubstrateApi;

package/cjs/services/chain-service/handler/SubstrateChainHandler.js

@@ -69,12 +69,13 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     }
   }
   async getChainSpec(substrateApi) {
-    var _substrateApi$api$gen, _substrateApi$api, _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3;
     const result = {
       addressPrefix: -1,
       decimals: 0,
       existentialDeposit: '',
-      genesisHash: (_substrateApi$api$gen = substrateApi.api.genesisHash) === null || _substrateApi$api$gen === void 0 ? void 0 : _substrateApi$api$gen.toHex(),
+      genesisHash: await substrateApi.makeRpcQuery({
+        section: 'genesisHash'
+      }),
       name: '',
       symbol: '',
       paraId: null
@@ -82,17 +83,33 @@ class SubstrateChainHandler extends _AbstractChainHandler.AbstractChainHandler {
     const {
       chainDecimals,
       chainTokens
-    } = substrateApi.api.registry;
-    if (substrateApi.api.query.parachainInfo) {
-      result.paraId = (await substrateApi.api.query.parachainInfo.parachainId()).toPrimitive();
-    }
+    } = await substrateApi.makeRpcQuery({
+      section: 'registry'
+    });
+    result.paraId = await substrateApi.makeRpcQuery({
+      section: 'query',
+      module: 'parachainInfo',
+      method: 'parachainId'
+    });
 
     // get first token by default, might change
-    result.name = (await substrateApi.api.rpc.system.chain()).toPrimitive();
+    result.name = await substrateApi.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'chain'
+    });
     result.symbol = chainTokens[0];
     result.decimals = chainDecimals[0];
-    result.addressPrefix = (_substrateApi$api = substrateApi.api) === null || _substrateApi$api === void 0 ? void 0 : (_substrateApi$api$con = _substrateApi$api.consts) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.system) === null || _substrateApi$api$con2 === void 0 ? void 0 : (_substrateApi$api$con3 = _substrateApi$api$con2.ss58Prefix) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toPrimitive();
-    result.existentialDeposit = substrateApi.api.consts.balances.existentialDeposit.toString();
+    result.addressPrefix = await substrateApi.makeRpcQuery({
+      section: 'consts',
+      module: 'system',
+      method: 'ss58Prefix'
+    });
+    result.existentialDeposit = await substrateApi.makeRpcQuery({
+      section: 'consts',
+      module: 'balances',
+      method: 'existentialDeposit'
+    });
     return result;
   }
   async getPsp22TokenInfo(apiPromise, contractAddress, contractCaller) {

package/cjs/services/chain-service/utils/index.js

@@ -81,6 +81,7 @@ var _exportNames = {
   findChainInfoByChainId: true,
   _isMantaZkAsset: true,
   _getChainExistentialDeposit: true,
+  _getAssetExistentialDeposit: true,
   randomizeProvider: true,
   _isAssetCanPayTxFee: true,
   updateLatestChainInfo: true
@@ -88,6 +89,7 @@ var _exportNames = {
 exports._checkSmartContractSupportByChain = _checkSmartContractSupportByChain;
 exports._generateCustomProviderKey = _generateCustomProviderKey;
 exports._getAssetDecimals = _getAssetDecimals;
+exports._getAssetExistentialDeposit = _getAssetExistentialDeposit;
 exports._getAssetName = _getAssetName;
 exports._getAssetOriginChain = _getAssetOriginChain;
 exports._getAssetPriceId = _getAssetPriceId;
@@ -599,6 +601,9 @@ function _getChainExistentialDeposit(chainInfo) {
   var _chainInfo$substrateI20;
   return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI20 = chainInfo.substrateInfo) === null || _chainInfo$substrateI20 === void 0 ? void 0 : _chainInfo$substrateI20.existentialDeposit) || '0';
 }
+function _getAssetExistentialDeposit(chainAsset) {
+  return (chainAsset === null || chainAsset === void 0 ? void 0 : chainAsset.minAmount) || '0';
+}
 function randomizeProvider(providers, excludedKeys) {
   if (Object.keys(providers).length === 0) {
     return {

package/core/substrate/assets-pallet.d.ts

@@ -0,0 +1,4 @@
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { PalletAssetsAssetAccount } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getAssetsPalletTransferable(accountInfo: PalletAssetsAssetAccount | undefined, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getAssetsPalletLockedBalance(accountInfo: PalletAssetsAssetAccount | undefined): bigint;

package/core/substrate/assets-pallet.js

@@ -0,0 +1,28 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
+import { _getAppliedExistentialDeposit, getStrictMode } from '@subwallet/extension-base/core/utils';
+export function _getAssetsPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
+  const strictMode = getStrictMode(BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  let bnTransferable = BigInt(0);
+  if (!accountInfo) {
+    return BigInt(0);
+  }
+  if (['Liquid'].includes(accountInfo.status)) {
+    bnTransferable = BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
+  }
+  return bnTransferable;
+}
+export function _getAssetsPalletLockedBalance(accountInfo) {
+  let bnLocked = BigInt(0);
+  if (!accountInfo) {
+    return bnLocked;
+  }
+  if (!['Liquid'].includes(accountInfo.status)) {
+    // todo: check case accountInfo has isFrozen?
+    bnLocked = BigInt(accountInfo.balance);
+  }
+  return bnLocked;
+}

package/core/substrate/foreign-asset-pallet.d.ts

@@ -1,8 +1,4 @@
-export declare type PalletAssetsAssetAccount = {
-    balance: number | string;
-    status: 'Frozen' | 'Liquid' | 'Blocked';
-    reason: Record<string, unknown>;
-    extra: unknown;
-};
-export declare function _getForeignAssetPalletTransferable(accountInfo: PalletAssetsAssetAccount): bigint;
-export declare function _getForeignAssetPalletLockedBalance(accountInfo: PalletAssetsAssetAccount): bigint;
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { PalletAssetsAssetAccount } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getForeignAssetPalletTransferable(accountInfo: PalletAssetsAssetAccount | undefined, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getForeignAssetPalletLockedBalance(accountInfo: PalletAssetsAssetAccount | undefined): bigint;

package/core/substrate/foreign-asset-pallet.js

@@ -1,9 +1,19 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-export function _getForeignAssetPalletTransferable(accountInfo) {
-  return accountInfo.status !== 'Liquid' ? BigInt(0) : BigInt(accountInfo.balance);
+import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
+import { _getAppliedExistentialDeposit, getStrictMode } from '@subwallet/extension-base/core/utils';
+export function _getForeignAssetPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
+  const strictMode = getStrictMode(BalanceAccountType.PalletAssetsAssetAccount, extrinsicType);
+  if (!accountInfo || accountInfo.status !== 'Liquid') {
+    return BigInt(0);
+  }
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  return BigInt(accountInfo.balance) - bnAppliedExistentialDeposit;
 }
 export function _getForeignAssetPalletLockedBalance(accountInfo) {
-  return accountInfo.status === 'Liquid' ? BigInt(0) : BigInt(accountInfo.balance);
+  if (!accountInfo || accountInfo.status === 'Liquid') {
+    return BigInt(0);
+  }
+  return BigInt(accountInfo.balance);
 }

package/core/substrate/nominationpools-pallet.d.ts

@@ -1,10 +1,4 @@
-import BigN from 'bignumber.js';
-export declare type PalletNominationPoolsPoolMember = {
-    poolId: number;
-    points: number;
-    lastRecordedRewardCounter: number;
-    unbondingEras: Record<string, number>;
-};
-export declare function _getActiveStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): BigN;
-export declare function _getUnbondingStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): BigN;
-export declare function _getTotalStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): BigN;
+import { PalletNominationPoolsPoolMember } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getActiveStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): bigint;
+export declare function _getUnbondingStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): bigint;
+export declare function _getTotalStakeInNominationPool(memberInfo: PalletNominationPoolsPoolMember): bigint;

package/core/substrate/nominationpools-pallet.js

@@ -1,14 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import BigN from 'bignumber.js';
 export function _getActiveStakeInNominationPool(memberInfo) {
-  return new BigN(memberInfo.points.toString());
+  return BigInt(memberInfo.points);
 }
 export function _getUnbondingStakeInNominationPool(memberInfo) {
-  const unbondingValues = Object.values(memberInfo.unbondingEras).map(unbonding => new BigN(unbonding));
-  return new BigN(Object.values(unbondingValues).reduce((a, b) => a.plus(b), new BigN(0)));
+  const unbondingValues = Object.values(memberInfo.unbondingEras).map(unbonding => BigInt(unbonding));
+  return unbondingValues.reduce((a, b) => a + b, BigInt(0));
 }
 export function _getTotalStakeInNominationPool(memberInfo) {
-  return _getActiveStakeInNominationPool(memberInfo).plus(_getUnbondingStakeInNominationPool(memberInfo));
+  return _getActiveStakeInNominationPool(memberInfo) + _getUnbondingStakeInNominationPool(memberInfo);
 }

package/core/substrate/ormlTokens-pallet.d.ts

@@ -0,0 +1,4 @@
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { OrmlTokensAccountData } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getOrmlTokensPalletTransferable(accountInfo: OrmlTokensAccountData, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getOrmlTokensPalletLockedBalance(accountInfo: OrmlTokensAccountData): bigint;

package/core/substrate/ormlTokens-pallet.js

@@ -0,0 +1,17 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
+import { _getAppliedExistentialDeposit, getMaxBigint, getStrictMode } from '@subwallet/extension-base/core/utils';
+export function _getOrmlTokensPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
+  const strictMode = getStrictMode(BalanceAccountType.OrmlTokensAccountData, extrinsicType);
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  const bnFrozen = BigInt(accountInfo.frozen);
+  const bnFree = BigInt(accountInfo.free);
+  return bnFree - getMaxBigint(bnFrozen, bnAppliedExistentialDeposit);
+}
+export function _getOrmlTokensPalletLockedBalance(accountInfo) {
+  const bnFrozen = BigInt(accountInfo.frozen);
+  const bnReserved = BigInt(accountInfo.reserved);
+  return bnReserved + bnFrozen;
+}

package/core/substrate/system-pallet.d.ts

@@ -1,27 +1,7 @@
 import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-export declare type FrameSystemAccountInfoV2 = Omit<FrameSystemAccountInfoV1, 'data'> & {
-    data: {
-        free: number;
-        reserved: number;
-        frozen: number;
-        flags: number;
-    };
-};
-export declare type FrameSystemAccountInfoV1 = {
-    nonce: number;
-    consumers: number;
-    providers: number;
-    sufficients: number;
-    data: {
-        free: number | string;
-        reserved: number;
-        miscFrozen: number;
-        feeFrozen: number;
-    };
-};
-export declare type FrameSystemAccountInfo = FrameSystemAccountInfoV1 | FrameSystemAccountInfoV2;
-export declare function _getSystemPalletTransferable(accountInfo: FrameSystemAccountInfo, existentialDeposit: string, extrinsicType?: ExtrinsicType): string;
+import { FrameSystemAccountInfo } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getSystemPalletTransferable(accountInfo: FrameSystemAccountInfo, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
 export declare function _canAccountBeReaped(accountInfo: FrameSystemAccountInfo): boolean;
 export declare function _isAccountActive(accountInfo: FrameSystemAccountInfo): boolean;
-export declare function _getSystemPalletTotalBalance(accountInfo: FrameSystemAccountInfo): string;
-export declare function _getAppliedExistentialDepositWithExtrinsicType(accountInfo: FrameSystemAccountInfo, existentialDeposit: string, extrinsicType?: ExtrinsicType): string;
+export declare function _getSystemPalletTotalBalance(accountInfo: FrameSystemAccountInfo): bigint;
+export declare function _getAppliedExistentialDepositWithExtrinsicType(accountInfo: FrameSystemAccountInfo, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;

package/core/substrate/system-pallet.js

@@ -1,17 +1,13 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import BigN from 'bignumber.js';
-
-// https://crates.parity.io/frame_system/struct.AccountInfo.html
-// https://wiki.polkadot.network/docs/learn-account-balances
-
+import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
+import { getMaxBigint, getStrictMode } from '@subwallet/extension-base/core/utils';
 function isV1(accountInfo) {
   return accountInfo.data.miscFrozen !== undefined && accountInfo.data.feeFrozen !== undefined;
 }
 export function _getSystemPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
-  const strictMode = !extrinsicType || ![ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
+  const strictMode = getStrictMode(BalanceAccountType.FrameSystemAccountInfo, extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
 
   if (isV1(accountInfo)) {
     return _getSystemPalletTransferableV1(accountInfo, existentialDeposit, strictMode);
@@ -34,7 +30,7 @@ export function _getSystemPalletTotalBalance(accountInfo) {
   }
 }
 export function _getAppliedExistentialDepositWithExtrinsicType(accountInfo, existentialDeposit, extrinsicType) {
-  const strictMode = !extrinsicType || ![ExtrinsicType.TRANSFER_BALANCE].includes(extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
+  const strictMode = getStrictMode(BalanceAccountType.FrameSystemAccountInfo, extrinsicType); // always apply strict mode to keep account alive unless explicitly specified otherwise
 
   return _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode);
 }
@@ -42,29 +38,28 @@ export function _getAppliedExistentialDepositWithExtrinsicType(accountInfo, exis
 // ----------------------------------------------------------------------
 
 function _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode) {
+  const bnExistentialDeposit = BigInt(existentialDeposit);
+
   // strict mode will always apply existential deposit to keep account alive
   if (strictMode) {
-    return existentialDeposit;
+    return bnExistentialDeposit;
   }
-  return _canAccountBeReaped(accountInfo) ? '0' : existentialDeposit; // account for ED here will go better with max transfer logic
+  return _canAccountBeReaped(accountInfo) ? BigInt(0) : bnExistentialDeposit; // account for ED here will go better with max transfer logic
 }
 
 function _getSystemPalletTransferableV2(accountInfo, existentialDeposit, strictMode) {
-  const bnFree = new BigN(accountInfo.data.free);
-  const bnLocked = new BigN(accountInfo.data.frozen).minus(accountInfo.data.reserved); // locked can go below 0 but this shouldn't matter
-  const bnAppliedExistentialDeposit = new BigN(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
-  const bnTransferableBalance = bnFree.minus(BigN.max(bnLocked, bnAppliedExistentialDeposit));
-  return BigN.max(bnTransferableBalance, 0).toFixed();
+  const bnLocked = BigInt(accountInfo.data.frozen) - BigInt(accountInfo.data.reserved); // locked can go below 0 but this shouldn't matter
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode);
+  return BigInt(accountInfo.data.free) - getMaxBigint(bnLocked, bnAppliedExistentialDeposit);
 }
 function _getSystemPalletTotalBalanceV2(accountInfo) {
-  return new BigN(accountInfo.data.free).plus(accountInfo.data.reserved).toFixed();
+  return BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);
 }
 function _getSystemPalletTransferableV1(accountInfo, existentialDeposit, strictMode) {
-  const bnAppliedExistentialDeposit = new BigN(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
-  const bnAppliedFrozen = BigN.max(accountInfo.data.feeFrozen, accountInfo.data.miscFrozen);
-  const bnTransferableBalance = new BigN(accountInfo.data.free).minus(BigN.max(bnAppliedFrozen, bnAppliedExistentialDeposit));
-  return BigN.max(bnTransferableBalance, 0).toFixed();
+  const bnAppliedExistentialDeposit = BigInt(_getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMode));
+  const bnAppliedFrozen = getMaxBigint(BigInt(accountInfo.data.feeFrozen), BigInt(accountInfo.data.miscFrozen));
+  return BigInt(accountInfo.data.free) - getMaxBigint(bnAppliedFrozen, bnAppliedExistentialDeposit);
 }
 function _getSystemPalletTotalBalanceV1(accountInfo) {
-  return new BigN(accountInfo.data.free).plus(accountInfo.data.reserved).toFixed();
+  return BigInt(accountInfo.data.free) + BigInt(accountInfo.data.reserved);
 }

package/core/substrate/tokens-pallet.d.ts

@@ -0,0 +1,5 @@
+import { ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { OrmlTokensAccountData } from '@subwallet/extension-base/core/substrate/types';
+export declare function _getTokensPalletTransferable(accountInfo: OrmlTokensAccountData, existentialDeposit: string, extrinsicType?: ExtrinsicType): bigint;
+export declare function _getTokensPalletLocked(accountInfo: OrmlTokensAccountData): bigint;
+export declare function _getTokensPalletTotalBalance(accountInfo: OrmlTokensAccountData): bigint;

package/core/substrate/tokens-pallet.js

@@ -0,0 +1,16 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { BalanceAccountType } from '@subwallet/extension-base/core/substrate/types';
+import { _getAppliedExistentialDeposit, getMaxBigint, getStrictMode } from '@subwallet/extension-base/core/utils';
+export function _getTokensPalletTransferable(accountInfo, existentialDeposit, extrinsicType) {
+  const strictMode = getStrictMode(BalanceAccountType.OrmlTokensAccountData, extrinsicType);
+  const bnAppliedExistentialDeposit = _getAppliedExistentialDeposit(existentialDeposit, strictMode);
+  return BigInt(accountInfo.free) - getMaxBigint(BigInt(accountInfo.frozen), bnAppliedExistentialDeposit);
+}
+export function _getTokensPalletLocked(accountInfo) {
+  return BigInt(accountInfo.reserved) + BigInt(accountInfo.frozen);
+}
+export function _getTokensPalletTotalBalance(accountInfo) {
+  return BigInt(accountInfo.free) + BigInt(accountInfo.reserved);
+}

package/core/substrate/types.d.ts

@@ -0,0 +1,43 @@
+export declare type FrameSystemAccountInfoV2 = Omit<FrameSystemAccountInfoV1, 'data'> & {
+    data: {
+        free: number;
+        reserved: number;
+        frozen: number;
+        flags: number;
+    };
+};
+export declare type FrameSystemAccountInfoV1 = {
+    nonce: number;
+    consumers: number;
+    providers: number;
+    sufficients: number;
+    data: {
+        free: number | string;
+        reserved: number;
+        miscFrozen: number;
+        feeFrozen: number;
+    };
+};
+export declare type FrameSystemAccountInfo = FrameSystemAccountInfoV1 | FrameSystemAccountInfoV2;
+export declare type OrmlTokensAccountData = {
+    free: number;
+    reserved: number;
+    frozen: number;
+};
+export declare type PalletAssetsAssetAccount = {
+    balance: number | string;
+    status: 'Frozen' | 'Liquid' | 'Blocked';
+    reason: Record<string, unknown>;
+    extra: unknown;
+};
+export declare type PalletNominationPoolsPoolMember = {
+    poolId: number;
+    points: number;
+    lastRecordedRewardCounter: number;
+    unbondingEras: Record<string, number>;
+};
+export declare const BalanceAccountType: {
+    FrameSystemAccountInfo: string;
+    OrmlTokensAccountData: string;
+    PalletAssetsAssetAccount: string;
+};

package/core/substrate/types.js

@@ -0,0 +1,12 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// https://crates.parity.io/frame_system/struct.AccountInfo.html
+// https://wiki.polkadot.network/docs/learn-account-balances
+
+// export type BalanceAccountType = 'FrameSystemAccountInfo' | 'OrmlTokensAccountData' | 'PalletAssetsAssetAccount' | 'PalletNominationPoolsPoolMember';
+export const BalanceAccountType = {
+  FrameSystemAccountInfo: 'FrameSystemAccountInfo',
+  OrmlTokensAccountData: 'OrmlTokensAccountData',
+  PalletAssetsAssetAccount: 'PalletAssetsAssetAccount'
+};

package/core/substrate/xcm-parser.d.ts

@@ -51,3 +51,4 @@ export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, dest
 export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): string;
 export declare function _isXcmWithinSameConsensus(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isSnowBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
+export declare function _adaptX1Interior(assetIdentifier: Record<string, any>, version: number): Record<string, any>;

package/core/substrate/xcm-parser.js

@@ -191,15 +191,28 @@ function _getRecipientLocation(destChainInfo, recipient, version) {
   };
 }
 function _getAssetIdentifier(tokenInfo, version) {
-  const assetIdentifier = _getXcmAssetMultilocation(tokenInfo);
-  if (!assetIdentifier) {
+  const _assetIdentifier = _getXcmAssetMultilocation(tokenInfo);
+  if (!_assetIdentifier) {
     throw new Error('Asset must have multilocation');
   }
+  const assetIdentifier = _adaptX1Interior(structuredClone(_assetIdentifier), version);
   return version >= 4 // from V4, Concrete is removed
   ? assetIdentifier : {
     Concrete: assetIdentifier
   };
 }
+export function _adaptX1Interior(assetIdentifier, version) {
+  const interior = assetIdentifier.interior;
+  const isInteriorObj = typeof interior === 'object' && interior !== null;
+  const isX1 = isInteriorObj && 'X1' in interior;
+  const needModifyX1 = version <= 4 && Array.isArray(interior.X1);
+  if (isInteriorObj && isX1 && needModifyX1) {
+    // X1 is an object for version < 4. From V4, it's an array
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
+    interior.X1 = interior.X1[0];
+  }
+  return assetIdentifier;
+}
 function _getNetworkByVersion(version) {
   switch (version) {
     case 1: