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

package/koni/background/handlers/Extension.js

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

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.78-0",
+  "version": "1.3.79-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -194,11 +194,6 @@
       "require": "./cjs/core/logic-validation/request.js",
       "default": "./core/logic-validation/request.js"
     },
-    "./core/logic-validation/swap": {
-      "types": "./core/logic-validation/swap.d.ts",
-      "require": "./cjs/core/logic-validation/swap.js",
-      "default": "./core/logic-validation/swap.js"
-    },
     "./core/logic-validation/transfer": {
       "types": "./core/logic-validation/transfer.d.ts",
       "require": "./cjs/core/logic-validation/transfer.js",
@@ -3029,10 +3024,10 @@
     "@substrate/connect": "^0.8.9",
     "@subwallet-monorepos/subwallet-services-sdk": "0.1.16",
     "@subwallet/chain-list": "0.2.127",
-    "@subwallet/extension-base": "^1.3.78-0",
-    "@subwallet/extension-chains": "^1.3.78-0",
-    "@subwallet/extension-dapp": "^1.3.78-0",
-    "@subwallet/extension-inject": "^1.3.78-0",
+    "@subwallet/extension-base": "^1.3.79-1",
+    "@subwallet/extension-chains": "^1.3.79-1",
+    "@subwallet/extension-dapp": "^1.3.79-1",
+    "@subwallet/extension-inject": "^1.3.79-1",
     "@subwallet/keyring": "^0.1.14",
     "@subwallet/ui-keyring": "^0.1.14",
     "@ton/core": "^0.56.3",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.78-0'
+  version: '1.3.79-1'
 };

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

@@ -13,7 +13,7 @@ import { fetchFromProxyService } from '@subwallet/extension-base/utils';
 import BigNumber from 'bignumber.js';
 import { assert, compactToU8a, isHex, u8aConcat, u8aEq } from '@polkadot/util';
 import { _isBittensorToSubtensorBridge, _isSubtensorToBittensorBridge } from "./bittensorBridge/index.js";
-const version = '/v5';
+const version = '/v1';
 const paraSpellApi = {
   buildXcm: `${version}/x-transfer`,
   feeXcm: `${version}/xcm-fee`,
@@ -93,8 +93,8 @@ export async function buildXcm(request) {
   }
   const paraSpellChainMap = await fetchParaSpellChainMap();
   const bodyData = {
-    senderAddress: sender,
-    address: recipient,
+    sender,
+    recipient,
     from: paraSpellChainMap[originChain.slug],
     to: paraSpellChainMap[destinationChain.slug],
     currency: createParaSpellCurrency(paraSpellIdentifyV4, sendingValue),
@@ -134,8 +134,8 @@ export 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),
@@ -178,8 +178,8 @@ export 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),
@@ -226,8 +226,8 @@ export 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/services/earning-service/handlers/native-staking/dtao.js

@@ -9,20 +9,19 @@ import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
 import { BN_ZERO } from '@polkadot/util';
 import TaoNativeStakingPoolHandler, { DEFAULT_DTAO_MINBOND } from "./tao.js";
-const getAlphaToTaoRateMap = async substrateApi => {
-  const allSubnets = (await substrateApi.api.call.subnetInfoRuntimeApi.getAllDynamicInfo()).toJSON();
-  if (!allSubnets || allSubnets.length === 0) {
-    return {};
-  }
+const getAlphaToTaoRateMap = async (substrateApi, priceScaleDecimals = 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 BigN(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 BigN(subnetPrice.price) : new BigN(0);
+      result[netuid] = netuid === 0 ? '1' : rawPrice.dividedBy(PRICE_SCALE).toFixed();
     }
-    const taoIn = subnet !== null && subnet !== void 0 && subnet.taoIn ? new BigN(subnet.taoIn) : new BigN(0);
-    const alphaIn = subnet !== null && subnet !== void 0 && subnet.alphaIn ? new BigN(subnet.alphaIn) : new BigN(0);
-    result[netuid] = netuid === 0 || alphaIn.lte(0) ? '1' : taoIn.dividedBy(alphaIn).toString();
   }
   return result;
 };
@@ -204,7 +203,7 @@ export default class SubnetTaoStakingPoolHandler extends TaoNativeStakingPoolHan
     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/services/earning-service/handlers/native-staking/tao.d.ts

@@ -82,10 +82,11 @@ export declare class BittensorCache {
     fetchApr(netuid: number): Promise<ValidatorAprResponse>;
     fetchSubnetFeeRate(netuid: number): Promise<string>;
 }
-export declare const getAlphaToTaoRate: (substrateApi: _SubstrateApi, netuid: number) => Promise<string>;
+export declare const getAlphaToTaoRate: (substrateApi: _SubstrateApi, netuid: number, priceScaleDecimals?: number) => Promise<string>;
 export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
     readonly availableMethod: YieldPoolMethodInfo;
     protected bittensorCache: BittensorCache;
+    protected getAlphaPriceScaleDecimals(): number;
     protected getMinBond(netuid?: number): Promise<BigN>;
     constructor(state: KoniState, chain: string);
     get maintainBalance(): string;

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

@@ -113,14 +113,16 @@ export class BittensorCache {
     }
   }
 }
-export const getAlphaToTaoRate = async (substrateApi, netuid) => {
-  const subnetInfo = (await substrateApi.api.call.subnetInfoRuntimeApi.getDynamicInfo(netuid)).toJSON();
-  if (!subnetInfo) {
+export const getAlphaToTaoRate = async (substrateApi, netuid, priceScaleDecimals = 9) => {
+  if (netuid === 0) {
     return '1';
   }
-  const taoIn = subnetInfo.taoIn ? new BigN(subnetInfo.taoIn) : new BigN(0);
-  const alphaIn = subnetInfo.alphaIn ? new BigN(subnetInfo.alphaIn) : new BigN(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 BigN(rawSubnetPrice.toString());
+  const defaultScale = new BigN(10).pow(priceScaleDecimals);
+  const rootPrice = new BigN(rawRootPrice.toString());
+  const priceScale = rootPrice.lte(0) ? defaultScale : rootPrice;
+  return subnetPrice.lte(0) ? '0' : subnetPrice.dividedBy(priceScale).toFixed();
 };
 export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHandler {
   availableMethod = {
@@ -132,6 +134,9 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     claimReward: false,
     changeValidator: true
   };
+  getAlphaPriceScaleDecimals() {
+    return _getAssetDecimals(this.nativeToken);
+  }
   async getMinBond(netuid) {
     var _cachedPool$metadata2, _cachedPool$statistic, _cachedPool$statistic2, _onlinePool$metadata2, _onlinePool$statistic, _onlinePool$statistic2;
     // @ts-ignore
@@ -469,7 +474,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     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 BigN(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid, this.getAlphaPriceScaleDecimals()));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 + slippage);
     const BNlimitPrice = new BigN(limitPrice.integerValue(BigN.ROUND_CEIL).toFixed());
     const extrinsic = chainApi.api.tx.subtensorModule.addStakeLimit(hotkey, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
@@ -511,7 +516,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
       return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
     }
     const binaryAmount = new BigN(amount);
-    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid, this.getAlphaPriceScaleDecimals()));
     const limitPrice = alphaToTaoPrice.multipliedBy(10 ** _getAssetDecimals(this.nativeToken)).multipliedBy(1 - slippage);
     const BNlimitPrice = new BigN(limitPrice.integerValue(BigN.ROUND_CEIL).toFixed());
     const extrinsic = apiPromise.api.tx.subtensorModule.removeStakeLimit(selectedTarget, netuid, binaryAmount.toFixed(), BNlimitPrice.toFixed(), false);
@@ -527,7 +532,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
       return [new TransactionError(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 BigN(await getAlphaToTaoRate(this.substrateApi, netuid || 0));
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid || 0, this.getAlphaPriceScaleDecimals()));
     const minDelegatorStake = await this.getMinBond(netuid);
     const minUnstake = minDelegatorStake.dividedBy(alphaToTaoPrice);
     if (new BigN(amount).lt(minUnstake)) {
@@ -567,7 +572,7 @@ export default class TaoNativeStakingPoolHandler extends BaseParaStakingPoolHand
     if (originValidator === destValidator) {
       return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('bg.EARNING.services.service.earning.nativeStaking.tao.fromValidatorSameAsTo')));
     }
-    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid));
+    const alphaToTaoPrice = new BigN(await getAlphaToTaoRate(this.substrateApi, netuid, this.getAlphaPriceScaleDecimals()));
     const bnMinStake = await this.getMinBond(netuid);
     const minUnstake = bnMinStake.dividedBy(alphaToTaoPrice);
     const formattedMinUnstake = minUnstake.dividedBy(1000000).integerValue(BigN.ROUND_CEIL).dividedBy(1000);

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

@@ -248,6 +248,7 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
           }
           const metadata = {
             sendingValue,
+            xcmDestinationFee,
             originTokenInfo: altInputTokenInfo,
             destinationTokenInfo: inputTokenInfo
           };
@@ -459,7 +460,8 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
     const {
       destinationTokenInfo,
       originTokenInfo,
-      sendingValue
+      sendingValue,
+      xcmDestinationFee
     } = metadata;
     const originChainInfo = this.state.getChainInfo(originTokenInfo.originChain);
     const originTokenSlug = _getChainNativeTokenSlug(originChainInfo);
@@ -497,7 +499,12 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       txData: xcmData,
       transferNativeAmount: sendingValue,
       chainType: ChainType.SUBSTRATE,
-      xcmStepFee
+      xcmStepFee,
+      xcmDestinationFee: xcmDestinationFee ? {
+        decimals: _getAssetDecimals(destinationTokenInfo),
+        symbol: _getAssetSymbol(destinationTokenInfo),
+        value: xcmDestinationFee
+      } : undefined
     };
   }
   handleYieldJoin(data, path, currentStep) {

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

@@ -64,7 +64,10 @@ export class AssetHubSwapHandler {
     const {
       path,
       request: {
-        fromAmount
+        address,
+        alternativeAddress,
+        fromAmount,
+        recipient
       },
       selectedQuote
     } = params;
@@ -86,12 +89,12 @@ export class AssetHubSwapHandler {
     const needModifyData = swapXcm || xcmSwapXcm;
     let bnSendingValue = BigN(fromAmount);
     let bnExpectedReceive = BigN(selectedQuote.toAmount);
-    const sender = _reformatAddressWithChain(params.request.address, originChain);
-    let receiver = _reformatAddressWithChain(params.request.recipient || params.request.address, destinationChain);
+    const sender = _reformatAddressWithChain(address, originChain, alternativeAddress);
+    let receiver = _reformatAddressWithChain(recipient || address, destinationChain);
     if (needModifyData) {
       bnSendingValue = bnSendingValue.multipliedBy(DEFAULT_EXCESS_AMOUNT_WEIGHT);
       bnExpectedReceive = bnExpectedReceive.multipliedBy(DEFAULT_EXCESS_AMOUNT_WEIGHT);
-      receiver = _reformatAddressWithChain(params.request.address, destinationChain);
+      receiver = _reformatAddressWithChain(address, destinationChain, alternativeAddress);
     }
     const submitStep = {
       name: 'Swap',

package/services/swap-service/handler/asset-hub/router.d.ts

@@ -1,7 +1,6 @@
 import { _ChainAsset } from '@subwallet/chain-list/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { AssetHubSwapEarlyValidation, SwapPair, SwapRequest } from '@subwallet/extension-base/types/swap';
 import { SubmittableExtrinsic } from '@polkadot/api/types';
 export declare class AssetHubRouter {
     private readonly chain;
@@ -9,8 +8,5 @@ export declare class AssetHubRouter {
     constructor(chain: string, chainService: ChainService);
     get substrateApi(): _SubstrateApi;
     get nativeToken(): _ChainAsset;
-    buildPath(pair: SwapPair): Array<_ChainAsset>;
-    earlyValidateSwapValidation(request: SwapRequest): Promise<AssetHubSwapEarlyValidation>;
-    estimateAmountOut(pair: SwapPair, amountIn: string): Promise<string>;
     buildSwapExtrinsic(path: Array<_ChainAsset>, recipient: string, amountIn: string, amountOutMin: string): Promise<SubmittableExtrinsic<'promise'>>;
 }

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

@@ -1,10 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { _getTokenMinAmount } from '@subwallet/extension-base/services/chain-service/utils';
-import { buildSwapExtrinsic, checkLiquidityForPath, checkMinAmountForPath, estimatePriceImpactPct, estimateRateAfterForPath, estimateRateForPath, estimateTokensForPath, getReserveForPath } from '@subwallet/extension-base/services/swap-service/handler/asset-hub/utils';
-import { SwapErrorType } from '@subwallet/extension-base/types/swap';
-import BigN from 'bignumber.js';
+import { buildSwapExtrinsic } from '@subwallet/extension-base/services/swap-service/handler/asset-hub/utils';
 export class AssetHubRouter {
   constructor(chain, chainService) {
     this.chain = chain;
@@ -16,66 +13,6 @@ export 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 getReserveForPath(api, paths);
-    const amounts = estimateTokensForPath(amount, reserves);
-    const marketRate = estimateRateForPath(reserves);
-    const marketRateAfter = estimateRateAfterForPath(amount, reserves);
-    const priceImpactPct = estimatePriceImpactPct(marketRate, marketRateAfter);
-    const errors = [];
-
-    // Check liquidity
-    const liquidityError = checkLiquidityForPath(amounts, reserves);
-    if (liquidityError) {
-      errors.push(liquidityError);
-    }
-
-    // Check amount token in pool after swap
-    const minAmounts = paths.map(asset => _getTokenMinAmount(asset));
-    const minAmountAfterSwapError = checkMinAmountForPath(reserves, amounts, minAmounts);
-    if (minAmountAfterSwapError) {
-      errors.push(minAmountAfterSwapError);
-    }
-    const bnAmount = new BigN(request.fromAmount);
-    if (bnAmount.lte(0)) {
-      errors.push(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 getReserveForPath(api, paths);
-    const amounts = 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;

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

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

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

@@ -108,7 +108,11 @@ export class HydradxHandler {
     const {
       path,
       request: {
-        fromAmount
+        address,
+        alternativeAddress,
+        fromAmount,
+        recipient,
+        slippage
       },
       selectedQuote
     } = params;
@@ -127,8 +131,8 @@ export 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 = _reformatAddressWithChain(params.request.address, originChain);
-    let receiver = _reformatAddressWithChain(params.request.recipient || params.request.address, destinationChain);
+    const sender = _reformatAddressWithChain(address, originChain, alternativeAddress);
+    let receiver = _reformatAddressWithChain(recipient || address, destinationChain);
     const actionList = JSON.stringify(path.map(step => step.action));
     const xcmSwapXcm = actionList === JSON.stringify([DynamicSwapType.BRIDGE, DynamicSwapType.SWAP, DynamicSwapType.BRIDGE]);
     const swapXcm = actionList === JSON.stringify([DynamicSwapType.SWAP, DynamicSwapType.BRIDGE]);
@@ -152,7 +156,7 @@ export 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}`);
@@ -163,7 +167,7 @@ export class HydradxHandler {
       }
       const overrideQuote = quoteAskResponse.quote;
       txHex = overrideQuote.metadata;
-      receiver = _reformatAddressWithChain(params.request.address, destinationChain);
+      receiver = _reformatAddressWithChain(address, destinationChain, alternativeAddress);
     }
     if (!txHex || !isHex(txHex)) {
       return Promise.resolve(undefined);

package/services/swap-service/index.js

@@ -103,8 +103,7 @@ export 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
@@ -129,6 +128,8 @@ export 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) {
@@ -147,7 +148,7 @@ export class SwapService {
     }
 
     // override fee for quote because some cases need estimate network fee on Extension (i.e. Optimex)
-    if (swapQuoteResponse.optimalQuote) {
+    if (swapQuoteResponse.optimalQuote && [SwapProviderId.OPTIMEX, SwapProviderId.OPTIMEX_TESTNET].includes(swapQuoteResponse.optimalQuote.provider.id)) {
       const swapIndex = optimalProcess.steps.findIndex(step => step.type === SwapStepType.SWAP);
       swapQuoteResponse.optimalQuote.feeInfo.feeComponent = optimalProcess.totalFee[swapIndex].feeComponent;
     }
@@ -190,7 +191,7 @@ export class SwapService {
     const swapAction = path.find(step => step.action === DynamicSwapType.SWAP);
     const directSwapRequest = swapAction ? {
       ...request,
-      address: _reformatAddressWithChain(request.address, this.chainService.getChainInfoByKey(_getAssetOriginChain(this.chainService.getAssetBySlug(swapAction.pair.from)))),
+      address: _reformatAddressWithChain(request.address, this.chainService.getChainInfoByKey(_getAssetOriginChain(this.chainService.getAssetBySlug(swapAction.pair.from))), request.alternativeAddress),
       pair: swapAction.pair
     } : undefined;
     if (!directSwapRequest) {

package/types/swap/index.d.ts

@@ -1,6 +1,6 @@
-import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
-import { AmountData, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseStepDetail, BaseStepType, CommonOptimalSwapPath, CommonStepFeeInfo } from '@subwallet/extension-base/types/service-base';
 import BigN from 'bignumber.js';
 import { BaseProcessRequestSign, TransactionData } from '../transaction';
@@ -73,7 +73,6 @@ export declare const _SUPPORTED_SWAP_PROVIDERS: SwapProviderId[];
 export interface SwapProvider {
     id: SwapProviderId;
     name: string;
-    faq?: string;
 }
 export declare enum SwapFeeType {
     PLATFORM_FEE = "PLATFORM_FEE",
@@ -101,30 +100,13 @@ export interface HydradxSwapTxData extends SwapBaseTxData {
     txHex: string;
 }
 export declare type GenSwapStepFuncV2 = (params: OptimalSwapPathParamsV2, stepIndex: number) => Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
-export interface ChainflipPreValidationMetadata {
-    minSwap: AmountData;
-    maxSwap?: AmountData;
-    chain: _ChainInfo;
-}
-export interface HydradxPreValidationMetadata {
-    maxSwap: AmountData;
-    chain: _ChainInfo;
-}
-export interface AssetHubPreValidationMetadata {
-    chain: _ChainInfo;
-    toAmount: string;
-    quoteRate: string;
-    priceImpactPct?: string;
-}
-export interface SimpleSwapValidationMetadata {
-    minSwap: AmountData;
-    maxSwap: AmountData;
-    chain: _ChainInfo;
-}
 export interface ProcessedQuoteAskResponse {
     quote?: SwapQuote;
     error?: SwapError;
 }
+/**
+ * @deprecated Use interface `SwapRequestV2` instead.
+ */
 export interface SwapRequest {
     address: string;
     pair: SwapPair;
@@ -136,6 +118,7 @@ export interface SwapRequest {
 }
 export interface SwapRequestV2 {
     address: string;
+    alternativeAddress?: string;
     pair: SwapPair;
     fromAmount: string;
     slippage: number;
@@ -182,22 +165,11 @@ export interface DynamicSwapAction {
     action: DynamicSwapType;
     pair: ActionPair;
 }
-export declare const enum BridgeStepPosition {
-    FIRST = 0,
-    AFTER_SWAP = 1
-}
 export interface OptimalSwapPathParamsV2 {
-    request: SwapRequest;
+    request: SwapRequestV2;
     selectedQuote?: SwapQuote;
     path: DynamicSwapAction[];
 }
-export interface SwapEarlyValidation {
-    error?: SwapErrorType;
-    metadata?: ChainflipPreValidationMetadata | HydradxPreValidationMetadata | AssetHubPreValidationMetadata;
-}
-export interface AssetHubSwapEarlyValidation extends SwapEarlyValidation {
-    metadata: AssetHubPreValidationMetadata;
-}
 export interface ValidateSwapProcessParams {
     address: string;
     process: CommonOptimalSwapPath;

package/types/swap/index.js

@@ -1,8 +1,6 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-// core
-
 export let SwapErrorType;
 (function (SwapErrorType) {
   SwapErrorType["ERROR_FETCHING_QUOTE"] = "ERROR_FETCHING_QUOTE";
@@ -46,7 +44,6 @@ export let SwapProviderId;
   SwapProviderId["BITTENSOR_TESTNET"] = "BITTENSOR_TESTNET";
 })(SwapProviderId || (SwapProviderId = {}));
 export 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];
-// process handling
 export let SwapFeeType;
 (function (SwapFeeType) {
   SwapFeeType["PLATFORM_FEE"] = "PLATFORM_FEE";
@@ -54,15 +51,13 @@ export let SwapFeeType;
   SwapFeeType["WALLET_FEE"] = "WALLET_FEE";
 })(SwapFeeType || (SwapFeeType = {})); // todo: will be more
 // parameters & responses
+/**
+ * @deprecated Use interface `SwapRequestV2` instead.
+ */
 export let DynamicSwapType;
 (function (DynamicSwapType) {
   DynamicSwapType["SWAP"] = "SWAP";
   DynamicSwapType["BRIDGE"] = "BRIDGE";
 })(DynamicSwapType || (DynamicSwapType = {}));
-export let BridgeStepPosition;
-(function (BridgeStepPosition) {
-  BridgeStepPosition[BridgeStepPosition["FIRST"] = 0] = "FIRST";
-  BridgeStepPosition[BridgeStepPosition["AFTER_SWAP"] = 1] = "AFTER_SWAP";
-})(BridgeStepPosition || (BridgeStepPosition = {}));
 export const CHAINFLIP_SLIPPAGE = 0.02; // Example: 0.01 for 1%
 export const SIMPLE_SWAP_SLIPPAGE = 0.05;

package/types/yield/actions/join/step.d.ts

@@ -98,6 +98,7 @@ export interface OptimalYieldPath {
 export declare type GenStepFunction = (params: OptimalYieldPathParams) => Promise<YieldStepBaseInfo | undefined>;
 export interface XcmStepMetadataForLiqStaking {
     sendingValue: string;
+    xcmDestinationFee?: string;
     originTokenInfo: _ChainAsset;
     destinationTokenInfo: _ChainAsset;
 }

package/types/yield/actions/join/submit.d.ts

@@ -1,4 +1,4 @@
-import { _Address, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
+import { _Address, AmountData, ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseProcessRequestSign, BaseRequestSign, InternalRequestSign, TransactionData } from '../../../transaction';
 import { BittensorRootClaimType, NominationPoolInfo, ValidatorInfo, YieldPoolType, YieldPositionInfo } from '../../info';
 import { OptimalYieldPath } from './step';
@@ -10,6 +10,7 @@ export interface HandleYieldStepData {
     txData: any;
     transferNativeAmount: string;
     xcmStepFee?: string;
+    xcmDestinationFee?: AmountData;
 }
 export interface AbstractSubmitYieldJoinData {
     slug: string;