@subwallet/extension-base 1.3.65-0 → 1.3.67-0

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,

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/utils/patch.d.ts

@@ -1,5 +1,5 @@
 import { _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
-export declare const ChainListVersion = "0.2.120";
+export declare const ChainListVersion = "0.2.121";
 export interface PatchInfo {
     patchVersion: string;
     appliedVersion: string;

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = process.env.PATCH_CHAIN_LIST_URL || (PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev');
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-export const ChainListVersion = '0.2.120'; // update this when build chain-list
+export const ChainListVersion = '0.2.121'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 

package/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateTransactionHistoryBySymbol20251107 extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107.js

@@ -0,0 +1,42 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateTransactionHistoryBySymbol20251107 extends BaseMigrationJob {
+  async run() {
+    const state = this.state;
+    try {
+      const changeSlugsMap = {
+        'bittensor-LOCAL-ف': 'bittensor-LOCAL-ㄴ'
+      };
+      const allTxs = [];
+      await Promise.all(Object.entries(changeSlugsMap).map(async ([oldSlug, newSlug], i) => {
+        const oldSlugSplit = oldSlug.split('-');
+        const oldChainSlug = oldSlugSplit[0];
+        const oldSymbolSlug = oldSlugSplit[2];
+        const newSlugSplit = newSlug.split('-');
+        const newSymbolSlug = newSlugSplit[2];
+        const filterTransactions = await state.dbService.stores.transaction.table.where({
+          chain: oldChainSlug
+        }).and(tx => {
+          var _tx$amount;
+          return ((_tx$amount = tx.amount) === null || _tx$amount === void 0 ? void 0 : _tx$amount.symbol) === oldSymbolSlug;
+        }).toArray();
+        if (filterTransactions.length > 0) {
+          for (const transaction of filterTransactions) {
+            if (transaction.amount && transaction.amount.symbol === oldSymbolSlug) {
+              transaction.amount.symbol = newSymbolSlug;
+            }
+            if (transaction.fee && transaction.fee.symbol === oldSymbolSlug) {
+              transaction.fee.symbol = newSymbolSlug;
+            }
+          }
+        }
+        allTxs.push(...filterTransactions);
+      }));
+      await state.dbService.stores.transaction.table.bulkPut(allTxs);
+    } catch (e) {
+      this.logger.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/databases/MigrateAssetSetting20251107.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateAssetSetting20251107 extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/databases/MigrateAssetSetting20251107.js

@@ -0,0 +1,29 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateAssetSetting20251107 extends BaseMigrationJob {
+  async run() {
+    try {
+      const changeSlugsMap = {
+        'bittensor-LOCAL-ف': 'bittensor-LOCAL-ㄴ'
+      };
+      const assetSetting = await this.state.chainService.getAssetSettings();
+      const migratedAssetSetting = {};
+      for (const [oldSlug, newSlug] of Object.entries(changeSlugsMap)) {
+        if (Object.keys(assetSetting).includes(oldSlug)) {
+          const isVisible = assetSetting[oldSlug].visible;
+          migratedAssetSetting[newSlug] = {
+            visible: isVisible
+          };
+        }
+      }
+      this.state.chainService.setAssetSettings({
+        ...assetSetting,
+        ...migratedAssetSetting
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/index.js

@@ -1,7 +1,9 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import MigrateAssetSetting20251107 from '@subwallet/extension-base/services/migration-service/scripts/databases/MigrateAssetSetting20251107';
 import MigrateChainPatrol from '@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol';
+import MigrateTransactionHistoryBySymbol20251107 from '@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107';
 import ClearMetadataDatabase from "./databases/ClearMetadataDatabase.js";
 import ClearMetadataForMythos from "./databases/ClearMetadataForMythos.js";
 import MigrateAssetSetting from "./databases/MigrateAssetSetting.js";
@@ -77,5 +79,7 @@ export default {
   '1.3.58-01': OptimizeEnableToken,
   '1.3.64-01': MigrateAssetSetting20251027,
   '1.3.64-02': MigrateTransactionHistoryBySymbol20251027,
-  '1.3.65-01': DeleteEarningData20251105
+  '1.3.65-01': DeleteEarningData20251105,
+  '1.3.66-01': MigrateAssetSetting20251107,
+  '1.3.66-02': MigrateTransactionHistoryBySymbol20251107
 };

package/services/request-service/handler/EvmRequestHandler.js

@@ -194,7 +194,7 @@ export default class EvmRequestHandler {
     const params = {
       ...transaction,
       gas: anyNumberToBN(gas).toNumber(),
-      value: anyNumberToBN(value).toNumber(),
+      value: anyNumberToBN(value).toFixed(),
       gasPrice: anyNumberToBN(gasPrice).toNumber(),
       gasLimit: anyNumberToBN(estimateGas).toNumber(),
       maxFeePerGas: anyNumberToBN(maxFeePerGas).toNumber(),

package/services/swap-service/handler/base-handler.d.ts

@@ -34,7 +34,6 @@ export declare class SwapBaseHandler {
     handleBridgeStep(params: SwapSubmitParams, type: string): Promise<SwapSubmitStepData>;
     handleBridgeSubstrate(params: SwapSubmitParams): Promise<SwapSubmitStepData>;
     handleBridgeAcross(params: SwapSubmitParams): Promise<SwapSubmitStepData>;
-    validateSetFeeTokenStep(params: ValidateSwapProcessParams, stepIndex: number): Promise<TransactionError[]>;
     private validateBridgeStep;
     private validateSwapStepV2;
     validateSwapOnlyProcess(params: ValidateSwapProcessParams, swapIndex: number): Promise<TransactionError[]>;

package/services/swap-service/handler/base-handler.js

@@ -7,7 +7,7 @@ import { validateSpendingAndFeePayment } from '@subwallet/extension-base/core/lo
 import { _isAccountActive } from '@subwallet/extension-base/core/substrate/system-pallet';
 import { _isAcrossBridgeXcm, _isSnowBridgeXcm, _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { _isSufficientToken } from '@subwallet/extension-base/core/utils';
-import { createXcmExtrinsicV2, dryRunXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
+import { createXcmExtrinsicV2, dryRunXcmExtrinsicV2, getXcmOriginFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { _isAcrossChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import { estimateXcmFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm/utils';
 import { _getAssetDecimals, _getAssetOriginChain, _getAssetSymbol, _getChainNativeTokenSlug, _getTokenMinAmount, _isChainEvmCompatible, _isNativeToken, _isPureBitcoinChain } from '@subwallet/extension-base/services/chain-service/utils';
@@ -298,21 +298,6 @@ export class SwapBaseHandler {
       txData: txData
     };
   }
-  async validateSetFeeTokenStep(params, stepIndex) {
-    if (!params.selectedQuote) {
-      return Promise.resolve([new TransactionError(BasicTxErrorType.INTERNAL_ERROR)]);
-    }
-    const feeInfo = params.process.totalFee[stepIndex];
-    const feeAmount = feeInfo.feeComponent[0];
-    const feeTokenInfo = this.chainService.getAssetBySlug(feeInfo.defaultFeeToken);
-    const feeTokenBalance = await this.balanceService.getTransferableBalance(params.address, feeTokenInfo.originChain, feeTokenInfo.slug);
-    const bnFeeTokenBalance = new BigN(feeTokenBalance.value);
-    const bnFeeAmount = new BigN(feeAmount.amount);
-    if (bnFeeAmount.gte(bnFeeTokenBalance)) {
-      return Promise.resolve([new TransactionError(BasicTxErrorType.NOT_ENOUGH_BALANCE)]);
-    }
-    return [];
-  }
   async validateBridgeStep(request) {
     const {
       bnBridgeAmount,
@@ -377,7 +362,7 @@ export class SwapBaseHandler {
       const xcmRequest = {
         originTokenInfo: fromToken,
         destinationTokenInfo: toToken,
-        sendingValue: bnBridgeAmount.toString(),
+        sendingValue: bnBridgeAmount.toFixed(),
         recipient: receiver,
         substrateApi: substrateApi,
         sender: sender,
@@ -385,11 +370,23 @@ export class SwapBaseHandler {
         originChain: fromChain,
         feeInfo
       };
-      const isDryRunSuccess = await dryRunXcmExtrinsicV2(xcmRequest);
-
-      // temp skip dry-run for later step todo: wait for dry-run-predict
-      if (isFirstBridge && !isDryRunSuccess) {
-        return [new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Unable to perform transaction. Select another token or destination chain and try again')];
+      if (isFirstBridge) {
+        const isDryRunSuccess = await dryRunXcmExtrinsicV2(xcmRequest, false);
+        if (!isDryRunSuccess) {
+          return [new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Swap amount too small. Increase amount and try again')];
+        }
+      } else {
+        const isDryRunPreviewSuccess = await dryRunXcmExtrinsicV2(xcmRequest, true);
+        const originFee = await getXcmOriginFee(xcmRequest);
+        if (originFee) {
+          const isBridgeTokenNativeBalanceEnough = bnFeeTokenBalance.gte(originFee);
+          if (!isBridgeTokenNativeBalanceEnough) {
+            return [new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Swap amount too small. Increase amount and try again')];
+          }
+        }
+        if (!isDryRunPreviewSuccess) {
+          return [new TransactionError(BasicTxErrorType.UNABLE_TO_SEND, 'Swap amount too small. Increase amount and try again')];
+        }
       }
     }
     return [];

package/services/transaction-service/index.js

@@ -1416,7 +1416,7 @@ export default class TransactionService {
       maxPriorityFeePerGas: anyNumberToBN(payload.maxPriorityFeePerGas).toNumber(),
       gasLimit: anyNumberToBN(payload.gas).toNumber(),
       to: payload.to,
-      value: anyNumberToBN(payload.value).toNumber(),
+      value: anyNumberToBN(payload.value).toFixed(),
       data: payload.data,
       chainId: payload.chainId
     };

package/types/transaction/data.d.ts

@@ -10,7 +10,7 @@ export interface Web3TransactionBase {
     nonce: number;
     chainId: number;
     data?: string;
-    value: number;
+    value: number | string;
 }
 export interface Web3Transaction extends Web3TransactionBase {
     from: string;

package/utils/eth.js

@@ -25,12 +25,13 @@ export class Transaction {
   }
 }
 export const anyNumberToBN = value => {
+  // TODO: Be careful when using .toNumber() outside this function. It may not round exactly for very large numbers.
   if (typeof value === 'string' || typeof value === 'number') {
     return new BigN(value);
   } else if (typeof value === 'undefined') {
     return new BigN(0);
   } else {
-    return new BigN(value.toNumber());
+    return new BigN(value.toString());
   }
 };
 export const createTransactionFromRLP = rlp => {

package/utils/fee/transfer.js

@@ -6,7 +6,7 @@ import { _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-p
 import { DEFAULT_CARDANO_TTL_OFFSET } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/cardano/consts';
 import { createBitcoinTransaction } from '@subwallet/extension-base/services/balance-service/transfer/bitcoin-transfer';
 import { createCardanoTransaction } from '@subwallet/extension-base/services/balance-service/transfer/cardano-transfer';
-import { getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
+import { gasSettingsForEWC, getERC20TransactionObject, getEVMTransactionObject } from '@subwallet/extension-base/services/balance-service/transfer/smart-contract';
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { createTonTransaction } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { createAcrossBridgeExtrinsic, createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsicV2 } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
@@ -191,9 +191,13 @@ export const calculateTransferMaxTransferable = async (id, request, freeBalance,
       var _tx$gas;
       // Calculate fee for evm transaction
       const tx = transaction;
-      const gasLimit = ((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.toString()) || (await evmApi.api.eth.estimateGas(tx)).toString();
+      let gasLimit = ((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.toString()) || (await evmApi.api.eth.estimateGas(tx)).toString();
       const _feeCustom = feeCustom;
       const combineFee = combineEthFee(fee, feeOption, _feeCustom);
+      if (srcChain.slug === 'energy_web_chain') {
+        gasLimit = gasSettingsForEWC.gasLimit.toString();
+        combineFee.maxFeePerGas = gasSettingsForEWC.maxFeePerGas;
+      }
       if (combineFee.maxFeePerGas) {
         estimatedFee = new BigN(combineFee.maxFeePerGas).multipliedBy(gasLimit).toFixed(0);
       } else {
@@ -384,7 +388,6 @@ export const calculateXcmMaxTransferable = async (id, request, freeBalance, fee)
       funcCreateExtrinsic = createAvailBridgeExtrinsicFromAvail;
     } else {
       funcCreateExtrinsic = createXcmExtrinsicV2;
-      params.sendingValue = '1';
     }
     const extrinsic = await funcCreateExtrinsic(params);
 

package/cjs/services/balance-service/transfer/xcm/polkadotXcm.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getExtrinsicByPolkadotXcmPallet = getExtrinsicByPolkadotXcmPallet;
-var _xcmParser = require("@subwallet/extension-base/core/substrate/xcm-parser");
-var _utils = require("@subwallet/extension-base/services/balance-service/transfer/xcm/utils");
-var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
-// Copyright 2019-2022 @subwallet/extension-base
-// SPDX-License-Identifier: Apache-2.0
-
-function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  let version = _utils.STABLE_XCM_VERSION;
-  let method = 'limitedReserveTransferAssets';
-  if ((0, _utils2._isBridgedToken)(tokenInfo) && !(0, _xcmParser._isXcmWithinSameConsensus)(originChainInfo, destinationChainInfo)) {
-    version = 4;
-    method = 'transferAssets';
-  }
-  if ((0, _utils.isUseTeleportProtocol)(originChainInfo, destinationChainInfo, tokenInfo.slug)) {
-    method = 'limitedTeleportAssets';
-  }
-  const weightParam = (0, _xcmParser._getXcmDestWeight)(originChainInfo);
-  const destination = (0, _xcmParser._getXcmMultiLocation)(originChainInfo, destinationChainInfo, version);
-  const beneficiary = (0, _xcmParser._getXcmBeneficiary)(destinationChainInfo, recipientAddress, version);
-  const tokenLocation = (0, _xcmParser._getXcmMultiAssets)(tokenInfo, value, version);
-  return api.tx.polkadotXcm[method](destination, beneficiary, tokenLocation, 0,
-  // FeeAssetItem
-  weightParam);
-}