@subwallet/extension-base 1.3.78-0 → 1.3.79-1

package/background/KoniTypes.d.ts

@@ -17,7 +17,7 @@ import { AuthUrls } from '@subwallet/extension-base/services/request-service/typ
 import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
 import { BitcoinTransactionData, SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BalanceType, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleSubstrateProxyWrappedTxResponse, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeBittensorRootClaimType, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningImpact, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitChangeValidatorStaking, SubmitYieldJoinData, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapRequestV2, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
+import { AccountChainType, AccountJson, AccountsWithCurrentAddress, AddressJson, BalanceJson, BalanceType, BaseRequestSign, BuyServiceInfo, BuyTokenInfo, CommonOptimalTransferPath, CurrentAccountInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleSubstrateProxyWrappedTxResponse, HandleYieldStepParams, InternalRequestSign, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestAccountBatchExportV2, RequestAccountCreateSuriV2, RequestAccountNameValidate, RequestAccountProxyEdit, RequestAccountProxyForget, RequestBatchJsonGetAccountInfo, RequestBatchRestoreV2, RequestBounceableValidate, RequestChangeAllowOneSign, RequestChangeBittensorRootClaimType, RequestChangeTonWalletContractVersion, RequestCheckCrossChainTransfer, RequestCheckPublicAndSecretKey, RequestCheckTransfer, RequestCrossChainTransfer, RequestDeriveCreateMultiple, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestEarlyValidateYield, RequestEarningImpact, RequestExportAccountProxyMnemonic, RequestGetAllTonWalletContractVersion, RequestGetAmountForPair, RequestGetDeriveAccounts, RequestGetDeriveSuggestion, RequestGetTokensCanPayFee, RequestGetYieldPoolTargets, RequestInputAccountSubscribe, RequestJsonGetAccountInfo, RequestJsonRestoreV2, RequestMetadataHash, RequestMnemonicCreateV2, RequestMnemonicValidateV2, RequestPrivateKeyValidateV2, RequestShortenMetadata, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestSubmitProcessTransaction, RequestSubscribeProcessById, RequestTransfer, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountNameValidate, ResponseBatchJsonGetAccountInfo, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseEarlyValidateYield, ResponseExportAccountProxyMnemonic, ResponseGetAllTonWalletContractVersion, ResponseGetDeriveAccounts, ResponseGetDeriveSuggestion, ResponseGetYieldPoolTargets, ResponseInputAccountSubscribe, ResponseJsonGetAccountInfo, ResponseMetadataHash, ResponseMnemonicCreateV2, ResponseMnemonicValidateV2, ResponsePrivateKeyValidateV2, ResponseShortenMetadata, ResponseSubscribeProcessAlive, ResponseSubscribeProcessById, StorageDataInterface, SubmitChangeValidatorStaking, SubmitYieldJoinData, SubmitYieldStepData, SubnetYieldPositionInfo, SwapPair, SwapQuoteResponse, SwapRequestResult, SwapRequestV2, SwapSubmitParams, SwapTxData, TokenSpendingApprovalParams, UnlockDotTransactionNft, UnstakingStatus, ValidateSwapProcessParams, ValidateYieldProcessParams, YieldPoolInfo, YieldPoolType, YieldPositionInfo } from '@subwallet/extension-base/types';
 import { RequestSubmitSignPsbtTransfer, RequestSubmitTransfer, RequestSubmitTransferWithId, RequestSubscribeTransfer, ResponseSubscribeTransfer, ResponseSubscribeTransferConfirmation } from '@subwallet/extension-base/types/balance/transfer';
 import { RequestClaimBridge } from '@subwallet/extension-base/types/bridge';
 import { ApprovePendingTxRequest, CancelPendingTxRequest, ExecutePendingTxRequest, InitMultisigTxRequest, InitMultisigTxResponse, PrepareMultisigSignRequest, PrepareMultisigSignResponse, RequestGetSignableAccountInfos, ResponseGetSignableAccountInfos } from '@subwallet/extension-base/types/multisig';
@@ -2117,10 +2117,10 @@ export interface KoniRequestSignatures {
     'pri(database.setLocalStorage)': [StorageDataInterface, boolean];
     'pri(database.getLocalStorage)': [string, string | null];
     'pri(swapService.subscribePairs)': [null, SwapPair[], SwapPair[]];
-    'pri(swapService.handleSwapRequest)': [SwapRequest, SwapRequestResult];
+    'pri(swapService.handleSwapRequest)': [SwapRequestV2, SwapRequestResult];
     'pri(swapService.handleSwapRequestV2)': [SwapRequestV2, SwapRequestResult];
     'pri(swapService.handleSwapStep)': [SwapSubmitParams, SWTransactionResponse];
-    'pri(swapService.getLatestQuote)': [SwapRequest, SwapQuoteResponse];
+    'pri(swapService.getLatestQuote)': [SwapRequestV2, SwapQuoteResponse];
     'pri(swapService.validateSwapProcess)': [ValidateSwapProcessParams, TransactionError[]];
     'pri(inappNotification.subscribeUnreadNotificationCountMap)': [null, Record<string, number>, Record<string, number>];
     'pri(inappNotification.markAllReadNotification)': [MarkAllReadParams, null];

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

@@ -11,18 +11,6 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/types");
 var _i18next = require("i18next");
-var _swap = require("./swap");
-Object.keys(_swap).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _swap[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _swap[key];
-    }
-  });
-});
 var _request = require("./request");
 Object.keys(_request).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

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

@@ -1008,7 +1008,7 @@ class KoniExtension {
       this.#koniState.eventService.emit('asset.updateState', params.tokenSlug);
       return true;
     } catch (e) {
-      console.error(e);
+      console.error('[updateAssetSetting] Error:', e);
       return false;
     }
   }
@@ -4636,7 +4636,8 @@ class KoniExtension {
       ...this.createPassConfirmationParams(isPassConfirmation),
       eventsHandler,
       step,
-      xcmFeeDryRun: extrinsicType === _KoniTypes.ExtrinsicType.TRANSFER_XCM ? submitData.xcmStepFee : undefined
+      xcmFeeDryRun: extrinsicType === _KoniTypes.ExtrinsicType.TRANSFER_XCM ? submitData.xcmStepFee : undefined,
+      xcmDestinationFee: submitData.xcmDestinationFee
     });
   }
   async handleYieldLeave(params) {
@@ -5019,6 +5020,10 @@ class KoniExtension {
     ready = true;
     return this.#koniState.swapService.getSwapPairs();
   }
+
+  /**
+   * @deprecated Use function `handleSwapRequestV2` instead.
+   */
   async handleSwapRequest(request) {
     // @ts-ignore
     return Promise.resolve(null);

package/cjs/packageInfo.js

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

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

@@ -27,7 +27,7 @@ var _bittensorBridge = require("./bittensorBridge");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const version = '/v5';
+const version = '/v1';
 const paraSpellApi = {
   buildXcm: `${version}/x-transfer`,
   feeXcm: `${version}/xcm-fee`,
@@ -107,8 +107,8 @@ async function buildXcm(request) {
   }
   const paraSpellChainMap = await (0, _paraspellChainMap.fetchParaSpellChainMap)();
   const bodyData = {
-    senderAddress: sender,
-    address: recipient,
+    sender,
+    recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(paraSpellIdentifyV4, sendingValue),
@@ -148,8 +148,8 @@ async function dryRunXcm(request) {
     throw new Error('Token is not support XCM at this time');
   }
   const bodyData = {
-    senderAddress: sender,
-    address: recipient,
+    sender,
+    recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(paraSpellIdentifyV4, sendingValue),
@@ -192,8 +192,8 @@ async function dryRunPreviewXcm(request) {
     throw new Error('Token is not support XCM at this time');
   }
   const bodyData = {
-    senderAddress: sender,
-    address: recipient,
+    sender,
+    recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(paraSpellIdentifyV4, sendingValue),
@@ -240,8 +240,8 @@ async function estimateXcmFee(request) {
     return undefined;
   }
   const bodyData = {
-    senderAddress: sender,
-    address: recipient,
+    sender,
+    recipient,
     from: paraSpellChainMap[fromChainInfo.slug],
     to: paraSpellChainMap[toChainInfo.slug],
     currency: createParaSpellCurrency(paraSpellIdentifyV4, requestValue),

package/cjs/services/earning-service/handlers/native-staking/dtao.js

@@ -17,20 +17,20 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-const getAlphaToTaoRateMap = async substrateApi => {
-  const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
-  if (!allSubnets || allSubnets.length === 0) {
-    return {};
-  }
+const getAlphaToTaoRateMap = async function (substrateApi) {
+  let priceScaleDecimals = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 9;
   const result = Object.create(null);
-  for (const subnet of allSubnets) {
-    const netuid = subnet === null || subnet === void 0 ? void 0 : subnet.netuid;
-    if (netuid === undefined) {
-      continue;
+  const PRICE_SCALE = new _bignumber.default(10).pow(priceScaleDecimals);
+  const allSubnetPrices = (await substrateApi.api.call.swapRuntimeApi.currentAlphaPriceAll()).toJSON();
+  if (allSubnetPrices && allSubnetPrices.length > 0) {
+    for (const subnetPrice of allSubnetPrices) {
+      const netuid = subnetPrice === null || subnetPrice === void 0 ? void 0 : subnetPrice.netuid;
+      if (netuid === undefined) {
+        continue;
+      }
+      const rawPrice = subnetPrice !== null && subnetPrice !== void 0 && subnetPrice.price ? new _bignumber.default(subnetPrice.price) : new _bignumber.default(0);
+      result[netuid] = netuid === 0 ? '1' : rawPrice.dividedBy(PRICE_SCALE).toFixed();
     }
-    const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new _bignumber.default(subnet.taoIn) : new _bignumber.default(0);
-    const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new _bignumber.default(subnet.alphaIn) : new _bignumber.default(0);
-    result[netuid] = netuid === 0 || alphaIn.lte(0) ? '1' : taoIn.dividedBy(alphaIn).toString();
   }
   return result;
 };
@@ -213,7 +213,7 @@ class SubnetTaoStakingPoolHandler extends _tao.default {
     const getPoolPosition = async () => {
       const rawDelegateStateInfos = await substrateApi.api.call.stakeInfoRuntimeApi.getStakeInfoForColdkeys(useAddresses);
       const delegateStateInfos = rawDelegateStateInfos.toPrimitive();
-      const alphaToTaoRateMap = await getAlphaToTaoRateMap(this.substrateApi);
+      const alphaToTaoRateMap = await getAlphaToTaoRateMap(this.substrateApi, this.getAlphaPriceScaleDecimals());
       if (!delegateStateInfos || delegateStateInfos.length === 0) {
         return;
       }

package/cjs/services/earning-service/handlers/native-staking/tao.js

@@ -122,14 +122,17 @@ class BittensorCache {
   }
 }
 exports.BittensorCache = BittensorCache;
-const getAlphaToTaoRate = async (substrateApi, netuid) => {
-  const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(netuid)).toJSON();
-  if (!subnetInfo) {
+const getAlphaToTaoRate = async function (substrateApi, netuid) {
+  let priceScaleDecimals = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 9;
+  if (netuid === 0) {
     return '1';
   }
-  const taoIn = subnetInfo.taoIn ? new _bignumber.default(subnetInfo.taoIn) : new _bignumber.default(0);
-  const alphaIn = subnetInfo.alphaIn ? new _bignumber.default(subnetInfo.alphaIn) : new _bignumber.default(0);
-  return netuid === 0 || alphaIn.lte(0) ? '1' : taoIn.dividedBy(alphaIn).toString();
+  const [rawSubnetPrice, rawRootPrice] = await Promise.all([substrateApi.api.call.swapRuntimeApi.currentAlphaPrice(netuid), substrateApi.api.call.swapRuntimeApi.currentAlphaPrice(0)]);
+  const subnetPrice = new _bignumber.default(rawSubnetPrice.toString());
+  const defaultScale = new _bignumber.default(10).pow(priceScaleDecimals);
+  const rootPrice = new _bignumber.default(rawRootPrice.toString());
+  const priceScale = rootPrice.lte(0) ? defaultScale : rootPrice;
+  return subnetPrice.lte(0) ? '0' : subnetPrice.dividedBy(priceScale).toFixed();
 };
 exports.getAlphaToTaoRate = getAlphaToTaoRate;
 class TaoNativeStakingPoolHandler extends _basePara.default {
@@ -142,6 +145,9 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     claimReward: false,
     changeValidator: true
   };
+  getAlphaPriceScaleDecimals() {
+    return (0, _utils2._getAssetDecimals)(this.nativeToken);
+  }
   async getMinBond(netuid) {
     var _cachedPool$metadata2, _cachedPool$statistic, _cachedPool$statistic2, _onlinePool$metadata2, _onlinePool$statistic, _onlinePool$statistic2;
     // @ts-ignore
@@ -483,7 +489,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     const hotkey = selectedValidatorInfo.address;
     const netuid = (_subnetData$netuid = subnetData === null || subnetData === void 0 ? void 0 : subnetData.netuid) !== null && _subnetData$netuid !== void 0 ? _subnetData$netuid : 0;
     const slippage = (_subnetData$slippage = subnetData === null || subnetData === void 0 ? void 0 : subnetData.slippage) !== null && _subnetData$slippage !== void 0 ? _subnetData$slippage : DEFAULT_BITTENSOR_SLIPPAGE;
-    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid, this.getAlphaPriceScaleDecimals()));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 + slippage);
     const BNlimitPrice = new _bignumber.default(limitPrice.integerValue(_bignumber.default.ROUND_CEIL).toFixed());
     const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
@@ -527,7 +533,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS));
     }
     const binaryAmount = new _bignumber.default(amount);
-    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid, this.getAlphaPriceScaleDecimals()));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** (0, _utils2._getAssetDecimals)(this.nativeToken)).multipliedBy(1 - slippage);
     const BNlimitPrice = new _bignumber.default(limitPrice.integerValue(_bignumber.default.ROUND_CEIL).toFixed());
     const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
@@ -543,7 +549,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
       return [new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS)];
     }
     const netuid = (_poolInfo$metadata$su = poolInfo.metadata.subnetData) === null || _poolInfo$metadata$su === void 0 ? void 0 : _poolInfo$metadata$su.netuid;
-    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid || 0, this.getAlphaPriceScaleDecimals()));
     const minDelegatorStake = await this.getMinBond(netuid);
     const minUnstake = minDelegatorStake.dividedBy(alphaToTaoPrice);
     if (new _bignumber.default(amount).lt(minUnstake)) {
@@ -583,7 +589,7 @@ class TaoNativeStakingPoolHandler extends _basePara.default {
     if (originValidator === destValidator) {
       return Promise.reject(new _TransactionError.TransactionError(_types.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('bg.EARNING.services.service.earning.nativeStaking.tao.fromValidatorSameAsTo')));
     }
-    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const alphaToTaoPrice = new _bignumber.default(await getAlphaToTaoRate(this.substrateApi, netuid, this.getAlphaPriceScaleDecimals()));
     const bnMinStake = await this.getMinBond(netuid);
     const minUnstake = bnMinStake.dividedBy(alphaToTaoPrice);
     const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(_bignumber.default.ROUND_CEIL).dividedBy(1000);

package/cjs/services/earning-service/handlers/special.js

@@ -255,6 +255,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
           }
           const metadata = {
             sendingValue,
+            xcmDestinationFee,
             originTokenInfo: altInputTokenInfo,
             destinationTokenInfo: inputTokenInfo
           };
@@ -466,7 +467,8 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const {
       destinationTokenInfo,
       originTokenInfo,
-      sendingValue
+      sendingValue,
+      xcmDestinationFee
     } = metadata;
     const originChainInfo = this.state.getChainInfo(originTokenInfo.originChain);
     const originTokenSlug = (0, _utils3._getChainNativeTokenSlug)(originChainInfo);
@@ -504,7 +506,12 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       txData: xcmData,
       transferNativeAmount: sendingValue,
       chainType: _KoniTypes.ChainType.SUBSTRATE,
-      xcmStepFee
+      xcmStepFee,
+      xcmDestinationFee: xcmDestinationFee ? {
+        decimals: (0, _utils3._getAssetDecimals)(destinationTokenInfo),
+        symbol: (0, _utils3._getAssetSymbol)(destinationTokenInfo),
+        value: xcmDestinationFee
+      } : undefined
     };
   }
   handleYieldJoin(data, path, currentStep) {

package/cjs/services/swap-service/handler/asset-hub/handler.js

@@ -71,7 +71,10 @@ class AssetHubSwapHandler {
     const {
       path,
       request: {
-        fromAmount
+        address,
+        alternativeAddress,
+        fromAmount,
+        recipient
       },
       selectedQuote
     } = params;
@@ -93,12 +96,12 @@ class AssetHubSwapHandler {
     const needModifyData = swapXcm || xcmSwapXcm;
     let bnSendingValue = (0, _bignumber.default)(fromAmount);
     let bnExpectedReceive = (0, _bignumber.default)(selectedQuote.toAmount);
-    const sender = (0, _utils3._reformatAddressWithChain)(params.request.address, originChain);
-    let receiver = (0, _utils3._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain);
+    const sender = (0, _utils3._reformatAddressWithChain)(address, originChain, alternativeAddress);
+    let receiver = (0, _utils3._reformatAddressWithChain)(recipient || address, destinationChain);
     if (needModifyData) {
       bnSendingValue = bnSendingValue.multipliedBy(_utils2.DEFAULT_EXCESS_AMOUNT_WEIGHT);
       bnExpectedReceive = bnExpectedReceive.multipliedBy(_utils2.DEFAULT_EXCESS_AMOUNT_WEIGHT);
-      receiver = (0, _utils3._reformatAddressWithChain)(params.request.address, destinationChain);
+      receiver = (0, _utils3._reformatAddressWithChain)(address, destinationChain, alternativeAddress);
     }
     const submitStep = {
       name: 'Swap',

package/cjs/services/swap-service/handler/asset-hub/router.js

@@ -1,14 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AssetHubRouter = void 0;
-var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _utils2 = require("@subwallet/extension-base/services/swap-service/handler/asset-hub/utils");
-var _swap = require("@subwallet/extension-base/types/swap");
-var _bignumber = _interopRequireDefault(require("bignumber.js"));
+var _utils = require("@subwallet/extension-base/services/swap-service/handler/asset-hub/utils");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -23,70 +19,10 @@ class AssetHubRouter {
   get nativeToken() {
     return this.chainService.getNativeTokenInfo(this.chain);
   }
-  buildPath(pair) {
-    // const nativeToken = this.nativeToken;
-    // const nativeTokenSlug = nativeToken.slug;
-
-    const assetFrom = this.chainService.getAssetBySlug(pair.from);
-    const assetTo = this.chainService.getAssetBySlug(pair.to);
-    return [assetFrom, assetTo];
-    // if (pair.from === nativeTokenSlug || pair.to === nativeTokenSlug) {
-    //   return [assetFrom, assetTo];
-    // } else {
-    //   return [assetFrom, nativeToken, assetTo];
-    // }
-  }
-  async earlyValidateSwapValidation(request) {
-    const substrateApi = await this.substrateApi.isReady;
-    const paths = this.buildPath(request.pair);
-    const api = await substrateApi.api.isReady;
-    const amount = request.fromAmount;
-    const reserves = await (0, _utils2.getReserveForPath)(api, paths);
-    const amounts = (0, _utils2.estimateTokensForPath)(amount, reserves);
-    const marketRate = (0, _utils2.estimateRateForPath)(reserves);
-    const marketRateAfter = (0, _utils2.estimateRateAfterForPath)(amount, reserves);
-    const priceImpactPct = (0, _utils2.estimatePriceImpactPct)(marketRate, marketRateAfter);
-    const errors = [];
-
-    // Check liquidity
-    const liquidityError = (0, _utils2.checkLiquidityForPath)(amounts, reserves);
-    if (liquidityError) {
-      errors.push(liquidityError);
-    }
-
-    // Check amount token in pool after swap
-    const minAmounts = paths.map(asset => (0, _utils._getTokenMinAmount)(asset));
-    const minAmountAfterSwapError = (0, _utils2.checkMinAmountForPath)(reserves, amounts, minAmounts);
-    if (minAmountAfterSwapError) {
-      errors.push(minAmountAfterSwapError);
-    }
-    const bnAmount = new _bignumber.default(request.fromAmount);
-    if (bnAmount.lte(0)) {
-      errors.push(_swap.SwapErrorType.AMOUNT_CANNOT_BE_ZERO);
-    }
-    const metadata = {
-      chain: this.chainService.getChainInfoByKey(this.chain),
-      toAmount: amounts[amounts.length - 1],
-      quoteRate: marketRate,
-      priceImpactPct: priceImpactPct
-    };
-    return {
-      error: errors[0],
-      metadata
-    };
-  }
-  async estimateAmountOut(pair, amountIn) {
-    const substrateApi = await this.substrateApi.isReady;
-    const paths = this.buildPath(pair);
-    const api = await substrateApi.api.isReady;
-    const reserves = await (0, _utils2.getReserveForPath)(api, paths);
-    const amounts = (0, _utils2.estimateTokensForPath)(amountIn, reserves);
-    return amounts[amounts.length - 1];
-  }
   async buildSwapExtrinsic(path, recipient, amountIn, amountOutMin) {
     const substrateApi = await this.substrateApi.isReady;
     const api = await substrateApi.api.isReady;
-    return (0, _utils2.buildSwapExtrinsic)(api, path, recipient, amountIn, amountOutMin);
+    return (0, _utils.buildSwapExtrinsic)(api, path, recipient, amountIn, amountOutMin);
   }
 }
 exports.AssetHubRouter = AssetHubRouter;

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

@@ -79,6 +79,7 @@ class SwapBaseHandler {
       path,
       request: {
         address,
+        alternativeAddress,
         fromAmount,
         recipient
       },
@@ -102,12 +103,12 @@ class SwapBaseHandler {
       throw Error('Token or chain not found');
     }
     let recipientAddress;
-    const senderAddress = (0, _utils5._reformatAddressWithChain)(address, fromChainInfo);
+    const senderAddress = (0, _utils5._reformatAddressWithChain)(address, fromChainInfo, alternativeAddress);
     if (stepIndex === 0) {
-      recipientAddress = (0, _utils5._reformatAddressWithChain)(address, toChainInfo);
+      recipientAddress = (0, _utils5._reformatAddressWithChain)(address, toChainInfo, alternativeAddress);
     } else {
       // bridge after swap
-      recipientAddress = (0, _utils5._reformatAddressWithChain)(recipient || address, toChainInfo);
+      recipientAddress = (0, _utils5._reformatAddressWithChain)(recipient || address, toChainInfo, alternativeAddress);
     }
     if (!(0, _xcmParser._isXcmWithinSameConsensus)(fromChainInfo, toChainInfo) || (0, _xcmParser._isSnowBridgeXcm)(fromChainInfo, toChainInfo) || (0, _xcmParser._isAcrossBridgeXcm)(fromChainInfo, toChainInfo)) {
       return undefined;

package/cjs/services/swap-service/handler/hydradx-handler.js

@@ -116,7 +116,11 @@ class HydradxHandler {
     const {
       path,
       request: {
-        fromAmount
+        address,
+        alternativeAddress,
+        fromAmount,
+        recipient,
+        slippage
       },
       selectedQuote
     } = params;
@@ -135,8 +139,8 @@ class HydradxHandler {
     const destinationTokenInfo = this.chainService.getAssetBySlug(swapPairInfo.to);
     const originChain = this.chainService.getChainInfoByKey(originTokenInfo.originChain);
     const destinationChain = this.chainService.getChainInfoByKey(destinationTokenInfo.originChain);
-    const sender = (0, _utils3._reformatAddressWithChain)(params.request.address, originChain);
-    let receiver = (0, _utils3._reformatAddressWithChain)(params.request.recipient || params.request.address, destinationChain);
+    const sender = (0, _utils3._reformatAddressWithChain)(address, originChain, alternativeAddress);
+    let receiver = (0, _utils3._reformatAddressWithChain)(recipient || address, destinationChain);
     const actionList = JSON.stringify(path.map(step => step.action));
     const xcmSwapXcm = actionList === JSON.stringify([_types.DynamicSwapType.BRIDGE, _types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
     const swapXcm = actionList === JSON.stringify([_types.DynamicSwapType.SWAP, _types.DynamicSwapType.BRIDGE]);
@@ -160,7 +164,7 @@ class HydradxHandler {
             slug: swapPairInfo.slug
           },
           fromAmount: bnSendingValue.toFixed(0, 1),
-          slippage: params.request.slippage
+          slippage: slippage
         });
       } catch (error) {
         throw new Error(`Failed to fetch swap quote: ${error.message}`);
@@ -171,7 +175,7 @@ class HydradxHandler {
       }
       const overrideQuote = quoteAskResponse.quote;
       txHex = overrideQuote.metadata;
-      receiver = (0, _utils3._reformatAddressWithChain)(params.request.address, destinationChain);
+      receiver = (0, _utils3._reformatAddressWithChain)(address, destinationChain, alternativeAddress);
     }
     if (!txHex || !(0, _util.isHex)(txHex)) {
       return Promise.resolve(undefined);

package/cjs/services/swap-service/index.js

@@ -110,8 +110,7 @@ class SwapService {
     if (!params.selectedQuote) {
       return this.getDefaultProcessV2(params);
     } else {
-      var _params$request$curre;
-      const providerId = ((_params$request$curre = params.request.currentQuote) === null || _params$request$curre === void 0 ? void 0 : _params$request$curre.id) || params.selectedQuote.provider.id;
+      const providerId = params.selectedQuote.provider.id;
       const handler = this.handlers[providerId];
       if (handler) {
         // todo: handle error response from generateOptimalProcess
@@ -136,6 +135,8 @@ class SwapService {
     console.group('Swap Logger');
     console.log('path', path);
     console.log('swapQuoteResponse', swapQuoteResponse);
+
+    // Just to log routing type for Uniswap Quote
     if (swapQuoteResponse.optimalQuote && swapQuoteResponse.optimalQuote.metadata) {
       const routing = swapQuoteResponse.optimalQuote.metadata.routing;
       if (routing) {
@@ -154,7 +155,7 @@ class SwapService {
     }
 
     // override fee for quote because some cases need estimate network fee on Extension (i.e. Optimex)
-    if (swapQuoteResponse.optimalQuote) {
+    if (swapQuoteResponse.optimalQuote && [_swap.SwapProviderId.OPTIMEX, _swap.SwapProviderId.OPTIMEX_TESTNET].includes(swapQuoteResponse.optimalQuote.provider.id)) {
       const swapIndex = optimalProcess.steps.findIndex(step => step.type === _swap.SwapStepType.SWAP);
       swapQuoteResponse.optimalQuote.feeInfo.feeComponent = optimalProcess.totalFee[swapIndex].feeComponent;
     }
@@ -197,7 +198,7 @@ class SwapService {
     const swapAction = path.find(step => step.action === _types2.DynamicSwapType.SWAP);
     const directSwapRequest = swapAction ? {
       ...request,
-      address: (0, _utils3._reformatAddressWithChain)(request.address, this.chainService.getChainInfoByKey((0, _utils._getAssetOriginChain)(this.chainService.getAssetBySlug(swapAction.pair.from)))),
+      address: (0, _utils3._reformatAddressWithChain)(request.address, this.chainService.getChainInfoByKey((0, _utils._getAssetOriginChain)(this.chainService.getAssetBySlug(swapAction.pair.from))), request.alternativeAddress),
       pair: swapAction.pair
     } : undefined;
     if (!directSwapRequest) {

package/cjs/types/swap/index.js

@@ -3,10 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._SUPPORTED_SWAP_PROVIDERS = exports.SwapStepType = exports.SwapProviderId = exports.SwapFeeType = exports.SwapErrorType = exports.SIMPLE_SWAP_SLIPPAGE = exports.DynamicSwapType = exports.CHAINFLIP_SLIPPAGE = exports.BridgeStepPosition = void 0;
+exports._SUPPORTED_SWAP_PROVIDERS = exports.SwapStepType = exports.SwapProviderId = exports.SwapFeeType = exports.SwapErrorType = exports.SIMPLE_SWAP_SLIPPAGE = exports.DynamicSwapType = exports.CHAINFLIP_SLIPPAGE = void 0;
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
-// core
 let SwapErrorType;
 exports.SwapErrorType = SwapErrorType;
 (function (SwapErrorType) {
@@ -50,7 +49,6 @@ exports.SwapProviderId = SwapProviderId;
 })(SwapProviderId || (exports.SwapProviderId = SwapProviderId = {}));
 const _SUPPORTED_SWAP_PROVIDERS = [SwapProviderId.CHAIN_FLIP_TESTNET, SwapProviderId.CHAIN_FLIP_MAINNET, SwapProviderId.HYDRADX_MAINNET, SwapProviderId.POLKADOT_ASSET_HUB, SwapProviderId.KUSAMA_ASSET_HUB, SwapProviderId.SIMPLE_SWAP, SwapProviderId.UNISWAP, SwapProviderId.KYBER, SwapProviderId.OPTIMEX, SwapProviderId.OPTIMEX_TESTNET, SwapProviderId.BITTENSOR, SwapProviderId.BITTENSOR_TESTNET];
 exports._SUPPORTED_SWAP_PROVIDERS = _SUPPORTED_SWAP_PROVIDERS;
-// process handling
 let SwapFeeType;
 exports.SwapFeeType = SwapFeeType;
 (function (SwapFeeType) {
@@ -59,18 +57,15 @@ exports.SwapFeeType = SwapFeeType;
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
 })(SwapFeeType || (exports.SwapFeeType = SwapFeeType = {})); // todo: will be more
 // parameters & responses
+/**
+ * @deprecated Use interface `SwapRequestV2` instead.
+ */
 let DynamicSwapType;
 exports.DynamicSwapType = DynamicSwapType;
 (function (DynamicSwapType) {
   DynamicSwapType["SWAP"] = "SWAP";
   DynamicSwapType["BRIDGE"] = "BRIDGE";
 })(DynamicSwapType || (exports.DynamicSwapType = DynamicSwapType = {}));
-let BridgeStepPosition;
-exports.BridgeStepPosition = BridgeStepPosition;
-(function (BridgeStepPosition) {
-  BridgeStepPosition[BridgeStepPosition["FIRST"] = 0] = "FIRST";
-  BridgeStepPosition[BridgeStepPosition["AFTER_SWAP"] = 1] = "AFTER_SWAP";
-})(BridgeStepPosition || (exports.BridgeStepPosition = BridgeStepPosition = {}));
 const CHAINFLIP_SLIPPAGE = 0.02; // Example: 0.01 for 1%
 exports.CHAINFLIP_SLIPPAGE = CHAINFLIP_SLIPPAGE;
 const SIMPLE_SWAP_SLIPPAGE = 0.05;

package/cjs/utils/account/common.js

@@ -54,17 +54,53 @@ function reformatAddress(address) {
     return address;
   }
 }
-const _reformatAddressWithChain = (address, chainInfo) => {
+
+/**
+ * @private
+ * Reformats a wallet address based on the provided chain information.
+ *
+ * This function checks the chain type (Substrate, TON, Cardano, or others)
+ * and applies the corresponding formatting logic:
+ * 1. **Substrate**: Reformats the Substrate address using the chain's specific prefix.
+ * If the current `address` is an EVM address, it attempts to use the `alternativeAddress`
+ * (which is currently **always** expected to be the Substrate address) for Substrate
+ * formatting, as direct EVM-to-Substrate reformatting is not possible here.
+ * 2. **TON/Cardano**: Uses a simple prefix logic based on whether the chain is a testnet or a mainnet.
+ * 3. **Default (EVM/Others)**: Returns the original address without reformatting.
+ *
+ * @param address The current wallet address string.
+ * @param chainInfo An object containing chain details (e.g., chain type, testnet status, prefix).
+ * @param alternativeAddress An optional alternative address, which is currently expected to be the Substrate
+ * address associated with the account. It is used as a fallback for Substrate formatting when the main `address` is EVM.
+ * @returns The reformatted wallet address, or the original address if no reformatting is needed or possible.
+ *
+ * @todo This function currently lacks logic to reformat a Substrate address into an EVM address format.
+ */
+const _reformatAddressWithChain = (address, chainInfo, alternativeAddress) => {
   const chainType = (0, _utils._chainInfoToAccountChainType)(chainInfo);
   if (chainType === _types.AccountChainType.SUBSTRATE) {
-    return reformatAddress(address, (0, _utils._getChainSubstrateAddressPrefix)(chainInfo));
-  } else if (chainType === _types.AccountChainType.TON || chainType === _types.AccountChainType.CARDANO) {
-    const isTestnet = chainInfo.isTestnet;
-    return reformatAddress(address, isTestnet ? 0 : 1);
-  } else {
-    // EVM, Bitcoin
-    return address;
+    const addressPrefix = (0, _utils._getChainSubstrateAddressPrefix)(chainInfo);
+    if (addressPrefix < 0) {
+      // not a valid address prefix for substrate chain type
+      return address;
+    }
+    if ((0, _utilCrypto.isEthereumAddress)(address)) {
+      if (alternativeAddress) {
+        // reformat using alternativeAddress of that account. Because can not reformat from evm address to substrate address
+        return reformatAddress(alternativeAddress, addressPrefix);
+      }
+
+      // can not reformat without substrateAddress info
+      return address;
+    }
+
+    // reformat as usual with substrate address
+    return reformatAddress(address, addressPrefix);
+  }
+  if (chainType === _types.AccountChainType.TON || chainType === _types.AccountChainType.CARDANO) {
+    return reformatAddress(address, chainInfo.isTestnet ? 0 : 1);
   }
+  return address;
 };
 exports._reformatAddressWithChain = _reformatAddressWithChain;
 const getAccountChainTypeForAddress = address => {

package/core/logic-validation/index.d.ts

@@ -1,7 +1,6 @@
 import { _ChainAsset } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import BigN from 'bignumber.js';
-export * from './swap';
 export * from './request';
 export * from './earning';
 export * from './transfer';

package/core/logic-validation/index.js

@@ -5,7 +5,6 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { _getTokenMinAmount, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { t } from 'i18next';
-export * from "./swap.js";
 export * from "./request.js";
 export * from "./earning.js";
 export * from "./transfer.js";

package/koni/background/handlers/Extension.d.ts

@@ -297,6 +297,9 @@ export default class KoniExtension {
     private subscribeBuyTokens;
     private subscribeBuyServices;
     private subscribeSwapPairs;
+    /**
+     * @deprecated Use function `handleSwapRequestV2` instead.
+     */
     private handleSwapRequest;
     private handleSwapRequestV2;
     private getLatestSwapQuote;