@subwallet/extension-base 1.3.66-0 → 1.3.68-0

package/services/balance-service/index.js

@@ -9,6 +9,7 @@ import { getAcrossbridgeTransferProcessFromEvm, getDefaultTransferProcess, getSn
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { _getChainNativeTokenSlug, _isCustomAsset, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAccountBalance';
+import { BalanceType } from '@subwallet/extension-base/types';
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
 import { EthereumKeypairTypes, SubstrateKeypairTypes } from '@subwallet/keyring/types';
@@ -18,6 +19,7 @@ import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { noop } from '@polkadot/util';
+import { _BALANCE_CHAIN_GROUP } from "../chain-service/constants.js";
 import { _isAcrossChainBridge, getAcrossQuote } from "./transfer/xcm/acrossBridge/index.js";
 import { BalanceMapImpl } from "./BalanceMapImpl.js";
 import { subscribeBalance } from "./helpers/index.js";
@@ -175,7 +177,7 @@ export class BalanceService {
   }
 
   /** Subscribe token free balance of an address on chain */
-  async subscribeBalance(address, chain, tokenSlug, balanceType = 'transferable', extrinsicType, callback) {
+  async subscribeBalance(address, chain, tokenSlug, balanceType = BalanceType.TRANSFERABLE, extrinsicType, callback) {
     const chainInfo = this.state.chainService.getChainInfoByKey(chain);
     const chainState = this.state.chainService.getChainStateByKey(chain);
     if (!chainInfo || !chainState || !chainState.active) {
@@ -208,9 +210,20 @@ export class BalanceService {
         const rs = result[0];
         let value;
         switch (balanceType) {
-          case 'total':
+          case BalanceType.TOTAL:
             value = new BigN(rs.free).plus(new BigN(rs.locked)).toFixed();
             break;
+          case BalanceType.TOTAL_MINUS_RESERVED:
+            if (_BALANCE_CHAIN_GROUP.notSupportGetBalanceByType.includes(chainInfo.slug)) {
+              // TODO: Currently Vara and Avail staking from nomination pools is not fully supported.
+              // Return `free` to avoid incorrect TOTAL_MINUS_RESERVED calculation.
+              // Improve later when full staking breakdown is available.
+              value = rs.free;
+            } else {
+              var _rs$lockedDetails, _rs$lockedDetails2;
+              value = new BigN(rs.free).plus(new BigN(rs.locked)).minus(BigN.max(new BigN(((_rs$lockedDetails = rs.lockedDetails) === null || _rs$lockedDetails === void 0 ? void 0 : _rs$lockedDetails.reserved) || 0), new BigN(((_rs$lockedDetails2 = rs.lockedDetails) === null || _rs$lockedDetails2 === void 0 ? void 0 : _rs$lockedDetails2.staking) || 0))).toFixed();
+            }
+            break;
           default:
             value = rs.free;
         }
@@ -242,10 +255,13 @@ export class BalanceService {
     });
   }
   async subscribeTransferableBalance(address, chain, tokenSlug, extrinsicType, callback) {
-    return this.subscribeBalance(address, chain, tokenSlug, 'transferable', extrinsicType, callback);
+    return this.subscribeBalance(address, chain, tokenSlug, BalanceType.TRANSFERABLE, extrinsicType, callback);
   }
   async subscribeTotalBalance(address, chain, tokenSlug, extrinsicType, callback) {
-    return this.subscribeBalance(address, chain, tokenSlug, 'total', extrinsicType, callback);
+    return this.subscribeBalance(address, chain, tokenSlug, BalanceType.TOTAL, extrinsicType, callback);
+  }
+  async subscribeBalanceByType(address, chain, tokenSlug, balanceType = BalanceType.TRANSFERABLE, extrinsicType, callback) {
+    return this.subscribeBalance(address, chain, tokenSlug, balanceType, extrinsicType, callback);
   }
 
   /**
@@ -267,6 +283,10 @@ export class BalanceService {
     const [, balance] = await this.subscribeTotalBalance(address, chain, tokenSlug, extrinsicType);
     return balance;
   }
+  async getBalanceByType(address, chain, tokenSlug, balanceType = BalanceType.TRANSFERABLE, extrinsicType) {
+    const [, balance] = await this.subscribeBalanceByType(address, chain, tokenSlug, balanceType, extrinsicType);
+    return balance;
+  }
 
   /** Remove balance from the subject object by addresses */
   removeBalanceByAddresses(addresses) {
@@ -452,7 +472,7 @@ export class BalanceService {
       const type = getKeypairTypeByAddress(address);
       const typeValid = [...EthereumKeypairTypes].includes(type);
       if (typeValid) {
-        return subwalletApiSdk.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+        return subwalletApiSdk.balanceDetectionApi.getSwEvmTokenBalance(address).catch(e => {
           console.error(e);
           return null;
         });
@@ -632,7 +652,7 @@ export class BalanceService {
   async evmDetectBalanceToken(addresses) {
     const assetMap = this.state.chainService.getAssetRegistry();
     const evmPromiseList = addresses.map(address => {
-      return subwalletApiSdk.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+      return subwalletApiSdk.balanceDetectionApi.getSwEvmTokenBalance(address).catch(e => {
         console.error(e);
         return null;
       });

package/services/balance-service/transfer/smart-contract.d.ts

@@ -12,6 +12,10 @@ interface TransferEvmProps extends TransactionFee {
     fallbackFee?: boolean;
     data?: string;
 }
+export declare const gasSettingsForEWC: {
+    gasLimit: number;
+    maxFeePerGas: string;
+};
 export declare function getEVMTransactionObject(props: TransferEvmProps): Promise<[TransactionConfig, string, string]>;
 export declare function getERC20TransactionObject(props: TransferERC20Props): Promise<[TransactionConfig, string, string]>;
 interface TransferERC20Props extends TransactionFee {

package/services/balance-service/transfer/smart-contract.js

@@ -9,6 +9,11 @@ import { EVM_REFORMAT_DECIMALS } from '@subwallet/extension-base/services/chain-
 import { combineEthFee } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
+// hot fix gas settings for Energy Web Chain
+export const gasSettingsForEWC = {
+  gasLimit: 4900000,
+  maxFeePerGas: '10000000'
+};
 export async function getEVMTransactionObject(props) {
   const {
     chain,
@@ -23,10 +28,18 @@ export async function getEVMTransactionObject(props) {
     transferAll,
     value
   } = props;
+  const isEnergyWebChain = chain === 'energy_web_chain'; // hot fix gas settings for Energy Web Chain
+
   const feeCustom = _feeCustom;
   const feeInfo = _feeInfo;
   const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
   let errorOnEstimateFee = '';
+  if (isEnergyWebChain) {
+    feeCombine.maxFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    if (!feeCombine.maxPriorityFeePerGas || new BigN(feeCombine.maxPriorityFeePerGas).gt(feeCombine.maxFeePerGas)) {
+      feeCombine.maxPriorityFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    }
+  }
   const transactionObject = {
     to,
     value,
@@ -34,16 +47,21 @@ export async function getEVMTransactionObject(props) {
     data,
     ...feeCombine
   };
-  const gasEstimate = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
-    console.log('Cannot estimate fee with native transfer on', chain, e);
-    if (fallbackFee) {
-      errorOnEstimateFee = e.message;
-      return 21000;
-    } else {
-      throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
-    }
-  });
-  const gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
+  let gasLimit;
+  if (isEnergyWebChain) {
+    gasLimit = gasSettingsForEWC.gasLimit;
+  } else {
+    const gasEstimate = await evmApi.api.eth.estimateGas(transactionObject).catch(e => {
+      console.log('Cannot estimate fee with native transfer on', chain, e);
+      if (fallbackFee) {
+        errorOnEstimateFee = e.message;
+        return 21000;
+      } else {
+        throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
+      }
+    });
+    gasLimit = Math.floor(gasEstimate * 1.1); // 10% buffer for fluctuations
+  }
 
   transactionObject.gas = gasLimit;
   let estimateFee;
@@ -74,6 +92,8 @@ export async function getERC20TransactionObject(props) {
     transferAll,
     value
   } = props;
+  const isEnergyWebChain = chain === 'energy_web_chain'; // hot fix gas settings for Energy Web Chain
+
   const erc20Contract = getERC20Contract(assetAddress, evmApi);
   const feeCustom = _feeCustom;
   let freeAmount = new BigN(0);
@@ -89,21 +109,30 @@ export async function getERC20TransactionObject(props) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
     return erc20Contract.methods.transfer(to, transferValue).encodeABI();
   }
-  const transferData = generateTransferData(to, transferValue);
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  const gasLimit = await erc20Contract.methods.transfer(to, transferValue).estimateGas({
-    from
-  }).catch(e => {
-    console.log('Cannot estimate fee with token contract', assetAddress, chain, e);
-    if (fallbackFee) {
-      errorOnEstimateFee = e.message;
-      return 70000;
-    } else {
-      throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
-    }
-  });
   const feeInfo = _feeInfo;
   const feeCombine = combineEthFee(feeInfo, feeOption, feeCustom);
+  const transferData = generateTransferData(to, transferValue);
+  let gasLimit;
+  if (isEnergyWebChain) {
+    gasLimit = gasSettingsForEWC.gasLimit;
+    feeCombine.maxFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    if (!feeCombine.maxPriorityFeePerGas || new BigN(feeCombine.maxPriorityFeePerGas).gt(feeCombine.maxFeePerGas)) {
+      feeCombine.maxPriorityFeePerGas = gasSettingsForEWC.maxFeePerGas;
+    }
+  } else {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+    gasLimit = await erc20Contract.methods.transfer(to, transferValue).estimateGas({
+      from
+    }).catch(e => {
+      console.log('Cannot estimate fee with token contract', assetAddress, chain, e);
+      if (fallbackFee) {
+        errorOnEstimateFee = e.message;
+        return 70000;
+      } else {
+        throw Error('Unable to estimate fee for this transaction. Edit fee and try again.');
+      }
+    });
+  }
   const transactionObject = {
     gas: gasLimit,
     from,
@@ -132,7 +161,9 @@ export async function getERC721Transaction(web3Api, chain, contractAddress, send
     const error = e;
     if (error.message.includes('transfer to non ERC721Receiver implementer')) {
       error.message = t('bg.BALANCE.services.service.balance.transfer.smartContract.nftNotSupportedOnRecipient');
+      throw error;
     }
+    error.message = t('bg.BALANCE.services.service.balance.transfer.smartContract.temporarilyNontransferableNFT');
     throw error;
   }
   const feeInfo = _feeInfo;

package/services/balance-service/transfer/xcm/index.d.ts

@@ -17,10 +17,10 @@ export declare type CreateXcmExtrinsicProps = {
 } & TransactionFee;
 export declare type FunctionCreateXcmExtrinsic = (props: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | TransactionConfig | undefined>;
 export declare const createSnowBridgeExtrinsic: ({ destinationChain, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
-export declare const createXcmExtrinsic: ({ destinationChain, originChain, originTokenInfo, recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const createAvailBridgeTxFromEth: ({ evmApi, feeCustom, feeInfo, feeOption, originChain, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createAvailBridgeExtrinsicFromAvail: ({ recipient, sendingValue, substrateApi }: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'>>;
 export declare const createPolygonBridgeExtrinsic: ({ destinationChain, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;
 export declare const createXcmExtrinsicV2: (request: CreateXcmExtrinsicProps) => Promise<SubmittableExtrinsic<'promise'> | undefined>;
-export declare const dryRunXcmExtrinsicV2: (request: CreateXcmExtrinsicProps) => Promise<boolean>;
+export declare const dryRunXcmExtrinsicV2: (request: CreateXcmExtrinsicProps, isPreview?: boolean) => Promise<boolean>;
+export declare const getXcmOriginFee: (request: CreateXcmExtrinsicProps) => Promise<string | undefined>;
 export declare const createAcrossBridgeExtrinsic: ({ destinationChain, destinationTokenInfo, evmApi, feeCustom, feeInfo, feeOption, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<TransactionConfig>;

package/services/balance-service/transfer/xcm/index.js

@@ -3,14 +3,9 @@
 
 import { _isAcrossBridgeXcm, _isPolygonBridgeXcm, _isPosBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAvailBridgeExtrinsicFromAvail, getAvailBridgeTxFromEth } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
-import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
 import { _createPolygonBridgeL1toL2Extrinsic, _createPolygonBridgeL2toL1Extrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { getSnowBridgeEvmTransfer } from '@subwallet/extension-base/services/balance-service/transfer/xcm/snowBridge';
-import { buildXcm, dryRunXcm, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
-import { getExtrinsicByXcmPalletPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xcmPallet';
-import { getExtrinsicByXtokensPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/xTokens';
-import { _XCM_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { buildXcm, dryRunPreviewXcm, dryRunXcm, estimateXcmFee, isChainNotSupportDryRun, isChainNotSupportPolkadotApi } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { combineEthFee } from '@subwallet/extension-base/utils';
 import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
 import { _createPosBridgeL1toL2Extrinsic, _createPosBridgeL2toL1Extrinsic } from "./posBridge.js";
@@ -38,30 +33,6 @@ export const createSnowBridgeExtrinsic = async ({
   }
   return getSnowBridgeEvmTransfer(originTokenInfo, originChain, destinationChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
-
-// deprecated
-export const createXcmExtrinsic = async ({
-  destinationChain,
-  originChain,
-  originTokenInfo,
-  recipient,
-  sendingValue,
-  substrateApi
-}) => {
-  if (!substrateApi) {
-    throw Error('Substrate API is not available');
-  }
-  const chainApi = await substrateApi.isReady;
-  const api = chainApi.api;
-  const polkadotXcmSpecialCases = _XCM_CHAIN_GROUP.polkadotXcmSpecialCases.includes(originChain.slug) && _isNativeToken(originTokenInfo);
-  if (_XCM_CHAIN_GROUP.polkadotXcm.includes(originTokenInfo.originChain) || polkadotXcmSpecialCases) {
-    return getExtrinsicByPolkadotXcmPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
-  }
-  if (_XCM_CHAIN_GROUP.xcmPallet.includes(originTokenInfo.originChain)) {
-    return getExtrinsicByXcmPalletPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
-  }
-  return getExtrinsicByXtokensPallet(originTokenInfo, originChain, destinationChain, recipient, sendingValue, api);
-};
 export const createAvailBridgeTxFromEth = ({
   evmApi,
   feeCustom,
@@ -125,9 +96,9 @@ export const createXcmExtrinsicV2 = async request => {
     return undefined;
   }
 };
-export const dryRunXcmExtrinsicV2 = async request => {
+export const dryRunXcmExtrinsicV2 = async (request, isPreview = false) => {
   try {
-    const dryRunResult = await dryRunXcm(request);
+    const dryRunResult = isPreview ? await dryRunPreviewXcm(request) : await dryRunXcm(request);
     const originDryRunRs = dryRunResult.origin;
     if (originDryRunRs.success) {
       const {
@@ -157,6 +128,21 @@ export const dryRunXcmExtrinsicV2 = async request => {
     return false;
   }
 };
+export const getXcmOriginFee = async request => {
+  try {
+    const xcmFeeInfo = await estimateXcmFee({
+      fromChainInfo: request.originChain,
+      fromTokenInfo: request.originTokenInfo,
+      toChainInfo: request.destinationChain,
+      recipient: request.recipient,
+      sender: request.sender,
+      value: request.sendingValue
+    });
+    return xcmFeeInfo === null || xcmFeeInfo === void 0 ? void 0 : xcmFeeInfo.origin.fee;
+  } catch (e) {
+    return undefined;
+  }
+};
 export const createAcrossBridgeExtrinsic = async ({
   destinationChain,
   destinationTokenInfo,

package/services/balance-service/transfer/xcm/utils.d.ts

@@ -44,9 +44,8 @@ export declare type GetXcmFeeResult = {
 };
 export declare function buildXcm(request: CreateXcmExtrinsicProps): Promise<SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function dryRunXcm(request: CreateXcmExtrinsicProps): Promise<DryRunResult>;
+export declare function dryRunPreviewXcm(request: CreateXcmExtrinsicProps): Promise<DryRunResult>;
 export declare function estimateXcmFee(request: GetXcmFeeRequest): Promise<GetXcmFeeResult | undefined>;
 export declare function isChainNotSupportPolkadotApi(str: string): boolean;
 export declare function isChainNotSupportDryRun(str: string): boolean;
-export declare const STABLE_XCM_VERSION = 3;
-export declare function isUseTeleportProtocol(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, tokenSlug?: string): boolean;
 export {};

package/services/balance-service/transfer/xcm/utils.js

@@ -4,12 +4,14 @@
 import { fetchParaSpellChainMap } from '@subwallet/extension-base/constants/paraspell-chain-map';
 import { ProxyServiceRoute } from '@subwallet/extension-base/types/environment';
 import { fetchFromProxyService } from '@subwallet/extension-base/utils';
+import BigNumber from 'bignumber.js';
 import { assert, compactToU8a, isHex, u8aConcat, u8aEq } from '@polkadot/util';
 const version = '/v4';
 const paraSpellApi = {
   buildXcm: `${version}/x-transfer`,
+  feeXcm: `${version}/xcm-fee`,
   dryRunXcm: `${version}/dry-run`,
-  feeXcm: `${version}/xcm-fee`
+  dryRunPreviewXcm: `${version}/dry-run-preview`
 };
 function txHexToSubmittableExtrinsic(api, hex) {
   try {
@@ -151,6 +153,51 @@ export async function dryRunXcm(request) {
   }
   return await response.json();
 }
+export async function dryRunPreviewXcm(request) {
+  var _originTokenInfo$meta3;
+  const {
+    destinationChain,
+    originChain,
+    originTokenInfo,
+    recipient,
+    sender,
+    sendingValue
+  } = request;
+  const paraSpellChainMap = await fetchParaSpellChainMap();
+  const paraSpellIdentifyV4 = (_originTokenInfo$meta3 = originTokenInfo.metadata) === null || _originTokenInfo$meta3 === void 0 ? void 0 : _originTokenInfo$meta3.paraSpellIdentifyV4;
+  if (!paraSpellIdentifyV4) {
+    throw new Error('Token is not support XCM at this time');
+  }
+  const bodyData = {
+    senderAddress: sender,
+    address: recipient,
+    from: paraSpellChainMap[originChain.slug],
+    to: paraSpellChainMap[destinationChain.slug],
+    currency: createParaSpellCurrency(paraSpellIdentifyV4, sendingValue),
+    options: {
+      abstractDecimals: false,
+      mintFeeAssets: true
+    }
+  };
+  const response = await fetchFromProxyService(ProxyServiceRoute.PARASPELL, paraSpellApi.dryRunPreviewXcm, {
+    method: 'POST',
+    body: JSON.stringify(bodyData),
+    headers: {
+      'Content-Type': 'application/json',
+      Accept: 'application/json'
+    }
+  });
+  if (!response.ok) {
+    const error = await response.json();
+    return {
+      origin: {
+        success: false,
+        failureReason: error.message
+      }
+    };
+  }
+  return await response.json();
+}
 export async function estimateXcmFee(request) {
   var _fromTokenInfo$metada;
   const {
@@ -163,6 +210,8 @@ export async function estimateXcmFee(request) {
   } = request;
   const paraSpellChainMap = await fetchParaSpellChainMap();
   const paraSpellIdentifyV4 = (_fromTokenInfo$metada = fromTokenInfo.metadata) === null || _fromTokenInfo$metada === void 0 ? void 0 : _fromTokenInfo$metada.paraSpellIdentifyV4;
+  const requestValue = BigNumber(value).gt(0) ? value : '1'; // avoid bug in-case estimate fee sendingValue <= 0;
+
   if (!paraSpellIdentifyV4) {
     console.error('Lack of paraspell metadata');
     return undefined;
@@ -172,7 +221,7 @@ export async function estimateXcmFee(request) {
     address: recipient,
     from: paraSpellChainMap[fromChainInfo.slug],
     to: paraSpellChainMap[toChainInfo.slug],
-    currency: createParaSpellCurrency(paraSpellIdentifyV4, value),
+    currency: createParaSpellCurrency(paraSpellIdentifyV4, requestValue),
     options: {
       abstractDecimals: false
     }
@@ -192,8 +241,6 @@ export async function estimateXcmFee(request) {
   return await response.json();
 }
 function createParaSpellCurrency(paraSpellIdentifyV4, amount) {
-  // todo: handle complex conditions for asset has same symbol in a chain: Id, Multi-location, ...
-  // todo: or update all asset to use multi-location
   return {
     ...paraSpellIdentifyV4,
     amount
@@ -208,15 +255,4 @@ export function isChainNotSupportDryRun(str) {
   const regex = /(?=.*DryRunApi)(?=.*not available).*/i; // Example: DryRunApi is not available on node Acala
 
   return regex.test(str);
-}
-
-// todo: remove
-export const STABLE_XCM_VERSION = 3;
-
-// todo: remove
-export function isUseTeleportProtocol(originChainInfo, destChainInfo, tokenSlug) {
-  const relayChainToSystemChain = ['polkadot'].includes(originChainInfo.slug) && ['statemint'].includes(destChainInfo.slug) || ['kusama'].includes(originChainInfo.slug) && ['statemine'].includes(destChainInfo.slug) || ['rococo'].includes(originChainInfo.slug) && ['rococo_assethub'].includes(destChainInfo.slug) || ['westend'].includes(originChainInfo.slug) && ['westend_assethub'].includes(destChainInfo.slug);
-  const systemChainToRelayChain = ['polkadot'].includes(destChainInfo.slug) && ['statemint'].includes(originChainInfo.slug) || ['kusama'].includes(destChainInfo.slug) && ['statemine'].includes(originChainInfo.slug) || ['rococo'].includes(destChainInfo.slug) && ['rococo_assethub'].includes(originChainInfo.slug) || ['westend'].includes(destChainInfo.slug) && ['westend_assethub'].includes(originChainInfo.slug);
-  const isXcmMythos = originChainInfo.slug === 'mythos' && destChainInfo.slug === 'statemint' && tokenSlug === 'mythos-NATIVE-MYTH' || originChainInfo.slug === 'statemint' && destChainInfo.slug === 'mythos' && tokenSlug === 'statemint-LOCAL-MYTH';
-  return relayChainToSystemChain || systemChainToRelayChain || isXcmMythos;
 }

package/services/chain-service/constants.d.ts

@@ -1,7 +1,6 @@
 import { SingleModeJson } from '@subwallet/extension-base/background/KoniTypes';
 export declare const API_AUTO_CONNECT_MS = 3000;
 export declare const API_CONNECT_TIMEOUT = 30000;
-export declare const API_MAX_RETRY = 2;
 export declare const _API_OPTIONS_CHAIN_GROUP: {
     acala: string[];
     turing: string[];
@@ -22,10 +21,12 @@ export declare const _BALANCE_CHAIN_GROUP: {
     supportBridged: string[];
     bittensor: string[];
     moonbeam: string[];
+    notSupportGetBalanceByType: string[];
 };
-export declare const _BALANCE_TOKEN_GROUP: {
-    crab: string[];
-    bitcountry: string[];
+export declare const _BALANCE_LOCKED_ID_GROUP: {
+    staking: string[];
+    gov: string[];
+    democracy: string[];
 };
 export declare const _NFT_CHAIN_GROUP: {
     acala: string[];
@@ -59,7 +60,6 @@ export interface _SubstrateUniformEraPayoutInflationParams extends _SubstrateInf
 }
 export declare const _SUBSTRATE_DEFAULT_INFLATION_PARAMS: _SubstrateInflationParams;
 export declare const _KNOWN_CHAIN_INFLATION_PARAMS: Record<string, _SubstrateInflationParams>;
-export declare const _TRANSFER_NOT_SUPPORTED_CHAINS: string[];
 export declare const _TRANSFER_CHAIN_GROUP: {
     acala: string[];
     kintsugi: string[];
@@ -74,22 +74,9 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     disable_transfer: string[];
     truth: string[];
 };
-export declare const _BALANCE_PARSING_CHAIN_GROUP: {
-    bobabeam: string[];
-};
 export declare const _MANTA_ZK_CHAIN_GROUP: string[];
 export declare const _ZK_ASSET_PREFIX = "zk";
 export declare const _DEFAULT_MANTA_ZK_CHAIN = "calamari";
-export declare const _XCM_CHAIN_GROUP: {
-    polkadotXcm: string[];
-    polkadotXcmSpecialCases: string[];
-    xcmPallet: string[];
-};
-export declare const _XCM_TYPE: {
-    RP: string;
-    PP: string;
-    PR: string;
-};
 export declare const _DEFAULT_ACTIVE_CHAINS: string[];
 export declare const EVM_PASS_CONNECT_STATUS: Record<string, string[]>;
 export declare const EVM_REFORMAT_DECIMALS: {
@@ -100,10 +87,4 @@ export declare const _BITCOIN_CHAIN_SLUG = "bitcoin";
 export declare const _BITCOIN_TESTNET_CHAIN_SLUG = "bitcoinTestnet";
 export declare const _BITCOIN_NAME = "Bitcoin";
 export declare const _BITCOIN_TESTNET_NAME = "Bitcoin Testnet";
-export declare const _CHAIN_INFO_SRC: string;
-export declare const _CHAIN_ASSET_SRC: string;
-export declare const _ASSET_REF_SRC: string;
-export declare const _MULTI_CHAIN_ASSET_SRC: string;
-export declare const _CHAIN_LOGO_MAP_SRC: string;
-export declare const _ASSET_LOGO_MAP_SRC: string;
 export declare const _BTC_SERVICE_TOKEN: string;

package/services/chain-service/constants.js

@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { _DEFAULT_CHAINS } from '@subwallet/chain-list';
-import { _SubstrateChainType } from '@subwallet/chain-list/types';
 import { ThemeNames } from '@subwallet/extension-base/background/KoniTypes';
 export const API_AUTO_CONNECT_MS = 3000;
 export const API_CONNECT_TIMEOUT = 30000;
-export const API_MAX_RETRY = 2;
 export const _API_OPTIONS_CHAIN_GROUP = {
   acala: ['acala', 'karura', 'origintrail', 'kintsugi'],
   turing: ['turingStaging', 'turing'],
@@ -36,11 +34,13 @@ export const _BALANCE_CHAIN_GROUP = {
   centrifuge: ['centrifuge'],
   supportBridged: ['rococo_assethub', 'statemint', 'statemine', 'polimec'],
   bittensor: ['bittensor', 'bittensor_testnet'],
-  moonbeam: ['moonbeam', 'moonriver', 'moonbase']
+  moonbeam: ['moonbeam', 'moonriver', 'moonbase'],
+  notSupportGetBalanceByType: ['vara_network', 'vara_testnet', 'availTuringTest', 'avail_mainnet']
 };
-export const _BALANCE_TOKEN_GROUP = {
-  crab: ['CKTON', 'PKTON'],
-  bitcountry: ['BIT']
+export const _BALANCE_LOCKED_ID_GROUP = {
+  staking: ['staking', 'delegatedStaking', 'pooledStaking', 'stkngdel', 'stk_stks', 'dappStaking', 'parachainStaking', 'appstakeappstake', 'collatorStaking'],
+  gov: ['pyconvot'],
+  democracy: ['democrac']
 };
 export const _NFT_CHAIN_GROUP = {
   acala: ['acala'],
@@ -274,12 +274,10 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
 
 // Send fund------------------------------------------------------------------------------------------------------------
 
-export const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystream', 'equilibrium_parachain', 'genshiro_testnet', 'genshiro'];
 export const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
   kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
-  // crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain', 'westend_assethub', 'chainflip_assethub', 'origintrail', 'xode', 'paseo_assethub'],
   riochain: ['riochain'],
@@ -290,30 +288,12 @@ export const _TRANSFER_CHAIN_GROUP = {
   disable_transfer: ['crab', 'pangolin'],
   truth: ['truth_network']
 };
-export const _BALANCE_PARSING_CHAIN_GROUP = {
-  bobabeam: ['bobabeam', 'bobabase']
-};
 export const _MANTA_ZK_CHAIN_GROUP = ['calamari'];
 export const _ZK_ASSET_PREFIX = 'zk';
 export const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 
 // XCM------------------------------------------------------------------------------------------------------------------
 
-export const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub', 'mythos', 'westend_assethub'],
-  polkadotXcmSpecialCases: ['astar', 'shiden'],
-  xcmPallet: ['polkadot', 'kusama', 'rococo', 'westend']
-  // default is xTokens pallet
-};
-
-export const _XCM_TYPE = {
-  RP: `${_SubstrateChainType.RELAYCHAIN}-${_SubstrateChainType.PARACHAIN}`,
-  // DMP
-  PP: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.PARACHAIN}`,
-  // HRMP
-  PR: `${_SubstrateChainType.PARACHAIN}-${_SubstrateChainType.RELAYCHAIN}` // UMP
-};
-
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS, 'vara_network', 'ton'];
 export const EVM_PASS_CONNECT_STATUS = {
   arbitrum_one: ['*'],
@@ -326,17 +306,8 @@ export const EVM_REFORMAT_DECIMALS = {
   acala: ['acala_evm', 'karura_evm']
 };
 export const LATEST_CHAIN_DATA_FETCHING_INTERVAL = 120000;
-
-// TODO: review
-const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 export const _BITCOIN_CHAIN_SLUG = 'bitcoin';
 export const _BITCOIN_TESTNET_CHAIN_SLUG = 'bitcoinTestnet';
 export const _BITCOIN_NAME = 'Bitcoin';
 export const _BITCOIN_TESTNET_NAME = 'Bitcoin Testnet';
-export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
-export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
-export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
-export const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/MultiChainAsset.json`;
-export const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
-export const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;
 export const _BTC_SERVICE_TOKEN = process.env.BTC_SERVICE_TOKEN || '';

package/services/chain-service/handler/EvmChainHandler.js

@@ -118,6 +118,9 @@ export class EvmChainHandler extends AbstractChainHandler {
         tokenContract.methods.symbol().call()]);
         name = _name;
         symbol = _symbol;
+        if (name === '') {
+          contractError = true;
+        }
       } else {
         tokenContract = new evmApi.api.eth.Contract(_ERC20_ABI, contractAddress);
         const [_decimals, _symbol, _name] = await Promise.all([
@@ -130,9 +133,9 @@ export class EvmChainHandler extends AbstractChainHandler {
         name = _name;
         decimals = new BigN(_decimals).toNumber();
         symbol = _symbol;
-      }
-      if (name === '' || symbol === '') {
-        contractError = true;
+        if (name === '' || symbol === '') {
+          contractError = true;
+        }
       }
       return {
         name,

package/services/earning-service/handlers/base.js

@@ -5,6 +5,7 @@ import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/K
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { DEFAULT_YIELD_FIRST_STEP, STAKING_IDENTITY_API_SLUG } from '@subwallet/extension-base/services/earning-service/constants';
 import { createClaimNotification, createWithdrawNotifications } from '@subwallet/extension-base/services/inapp-notification-service/utils';
+import { BalanceType, YieldPoolType } from '@subwallet/extension-base/types';
 import { formatNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_TEN } from '@polkadot/util';
 /**
@@ -154,7 +155,12 @@ export default class BasePoolHandler {
     }
     const nativeTokenInfo = this.state.chainService.getNativeTokenInfo(this.chain);
     // Use TRANSFER_BALANCE extrinsic in order to get transferable balanace without minus ED
-    const nativeTokenBalance = await this.state.balanceService.getTransferableBalance(request.address, this.chain, undefined, ExtrinsicType.TRANSFER_BALANCE);
+    let nativeTokenBalance;
+    if ([YieldPoolType.NATIVE_STAKING, YieldPoolType.NOMINATION_POOL].includes(poolInfo.type)) {
+      nativeTokenBalance = await this.state.balanceService.getBalanceByType(request.address, this.chain, undefined, BalanceType.TOTAL_MINUS_RESERVED, ExtrinsicType.TRANSFER_BALANCE);
+    } else {
+      nativeTokenBalance = await this.state.balanceService.getTransferableBalance(request.address, this.chain, undefined, ExtrinsicType.TRANSFER_BALANCE);
+    }
     const bnNativeTokenBalance = new BN(nativeTokenBalance.value);
     const bnMinBalanceToJoin = new BN(((_poolInfo$statistic2 = poolInfo.statistic) === null || _poolInfo$statistic2 === void 0 ? void 0 : (_poolInfo$statistic2$ = _poolInfo$statistic2.earningThreshold) === null || _poolInfo$statistic2$ === void 0 ? void 0 : _poolInfo$statistic2$.join) || '0').add(new BN(poolInfo.metadata.maintainBalance));
     if (bnNativeTokenBalance.lte(bnMinBalanceToJoin)) {