@subwallet/extension-base 1.3.36-0 → 1.3.38-0

package/koni/background/handlers/State.js

@@ -8,7 +8,7 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, CardanoProviderErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { BACKEND_API_URL, BACKEND_PRICE_HISTORY_URL, MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
-import { convertErrorFormat, generateValidationProcess, validationAuthMiddleware, validationAuthWCMiddleware, validationCardanoSignDataMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
+import { convertErrorFormat, generateValidationProcess, validationAuthCardanoMiddleware, validationAuthMiddleware, validationAuthWCMiddleware, validationCardanoSignDataMiddleware, validationConnectMiddleware, validationEvmDataTransactionMiddleware, validationEvmSignMessageMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import BuyService from '@subwallet/extension-base/services/buy-service';
@@ -41,7 +41,7 @@ import WalletConnectService from '@subwallet/extension-base/services/wallet-conn
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import { addLazy, isManifestV3, isSameAddress, reformatAddress, stripUrl, targetIsWeb } from '@subwallet/extension-base/utils';
-import { convertCardanoHexToBech32 } from '@subwallet/extension-base/utils/cardano';
+import { convertCardanoHexToBech32, validateAddressNetwork } from '@subwallet/extension-base/utils/cardano';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import subwalletApiSdk from '@subwallet/subwallet-api-sdk';
 import { keyring } from '@subwallet/ui-keyring';
@@ -1046,14 +1046,12 @@ export default class KoniState {
       errors: [],
       networkKey: ''
     };
-    const validationSteps = [validationAuthMiddleware, validationCardanoSignDataMiddleware];
+    const validationSteps = [validationAuthCardanoMiddleware, validationCardanoSignDataMiddleware];
     const result = await generateValidationProcess(this, url, payloadValidation, validationSteps);
-    if (!isSameAddress(address, currentAddress)) {
-      throw new CardanoProviderError(CardanoProviderErrorType.ACCOUNT_CHANGED);
-    }
     const errorsFormated = convertErrorFormat(result.errors);
     const payloadAfterValidated = {
       ...result.payloadAfterValidated,
+      currentAddress,
       errors: errorsFormated,
       id
     };
@@ -1094,13 +1092,13 @@ export default class KoniState {
     if (authInfo !== null && authInfo !== void 0 && authInfo.isAllowed) {
       autoActiveChain = true;
     }
-    const currentEvmNetwork = this.requestService.getDAppChainInfo({
+    const currentCardanoNetwork = this.requestService.getDAppChainInfo({
       autoActive: autoActiveChain,
       accessType: 'cardano',
       defaultChain: networkKey,
       url
     });
-    networkKey = (currentEvmNetwork === null || currentEvmNetwork === void 0 ? void 0 : currentEvmNetwork.slug) || 'cardano';
+    networkKey = (currentCardanoNetwork === null || currentCardanoNetwork === void 0 ? void 0 : currentCardanoNetwork.slug) || 'cardano';
     const allUtxos = await this.chainService.getUtxosByAddress(currentAddress, networkKey);
     const outputTransactionUnSpend = CardanoWasm.TransactionOutputs.new();
     inputs.to_js_value().forEach(input => {
@@ -1137,12 +1135,23 @@ export default class KoniState {
         values: convertValueToAsset(output)
       };
       if (isSameAddress(currentAddress, address)) {
+        if (!validateAddressNetwork(address, currentCardanoNetwork)) {
+          throw new CardanoProviderError(CardanoProviderErrorType.ACCOUNT_CHANGED, t('Current network is changed'));
+        }
         transactionValue = transactionValue.checked_add(amount);
         addressInputAmountMap[address].isOwner = true;
         addressOutputAmountMap[address].isOwner = true;
       }
+
+      // Check if address is valid with current network
+      if (!validateAddressNetwork(address, currentCardanoNetwork)) {
+        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Current network is not match with input address'));
+      }
     }
     for (const address in addressOutputMap) {
+      if (!validateAddressNetwork(address, currentCardanoNetwork)) {
+        throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, t('Current network is not match with output address'));
+      }
       if (!addressInputAmountMap[address] && !addressOutputMap[address].is_zero()) {
         addressOutputAmountMap[address] = {
           values: convertValueToAsset(addressOutputMap[address]),
@@ -1150,7 +1159,6 @@ export default class KoniState {
         };
       }
     }
-    transactionValue = transactionValue.checked_sub(CardanoWasm.Value.new(tx.body().fee()));
     const transactionBody = tx.body();
     const getSpecificUtxo = this.chainService.getSpecificUtxo.bind(this);
     requireKeyHashes.push(...extractKeyHashFromCertificate(transactionBody.certs()));
@@ -1163,9 +1171,8 @@ export default class KoniState {
     const keyHashAddressMap = {};
     const pair = keyring.getPair(currentAddress);
     if (pair) {
-      const publicKey = CardanoWasm.Bip32PublicKey.from_bytes(pair.publicKey);
-      const paymentPubKey = publicKey.derive(0).derive(0).to_raw_key().hash().to_hex();
-      const stakePubKey = publicKey.derive(2).derive(0).to_raw_key().hash().to_hex();
+      const paymentPubKey = CardanoWasm.Bip32PublicKey.from_hex(pair.cardano.paymentPubKey).to_raw_key().hash().to_hex();
+      const stakePubKey = CardanoWasm.Bip32PublicKey.from_hex(pair.cardano.stakePubKey).to_raw_key().hash().to_hex();
       keyHashAddressMap[paymentPubKey] = 'payment';
       keyHashAddressMap[stakePubKey] = 'stake';
     } else {
@@ -1250,13 +1257,7 @@ export default class KoniState {
   async onMV3Update() {
     const migrationStatus = await SWStorage.instance.getItem('mv3_migration');
     if (!migrationStatus || migrationStatus !== 'done') {
-      if (isManifestV3) {
-        // Open migration tab
-        const url = `${chrome.runtime.getURL('index.html')}#/mv3-migration`;
-        await openPopup(url);
-
-        // migrateMV3LocalStorage will be called when user open migration tab with data from localStorage on frontend
-      } else {
+      if (!isManifestV3) {
         this.migrateMV3LocalStorage(JSON.stringify(self.localStorage)).catch(console.error);
       }
     }

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

@@ -53,6 +53,7 @@ export default class KoniTabs {
     private cardanoGetAccountList;
     private cardanoGetAccountBalance;
     private cardanoGetChangeAddress;
+    private cardanoGetRewardAddress;
     private cardanoGetCurrentNetworkId;
     private cardanoGetUtxo;
     private cardanoGetCollateral;

package/koni/background/handlers/Tabs.js

@@ -27,6 +27,7 @@ import { isEthereumAddress } from '@polkadot/util-crypto';
 function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTypes) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   const authTypeFilter = ({
+    json,
     type
   }) => {
     if (accountAuthTypes) {
@@ -39,10 +40,19 @@ function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTyp
         ton: TonKeypairTypes,
         cardano: CardanoKeypairTypes
       };
-      return accountAuthTypes.some(authType => {
+      const isValidTypes = accountAuthTypes.some(authType => {
         var _validTypes$authType;
         return (_validTypes$authType = validTypes[authType]) === null || _validTypes$authType === void 0 ? void 0 : _validTypes$authType.includes(type);
       });
+      if (!isValidTypes) {
+        return false;
+      }
+
+      // This condition ensures that the resulting UTXOs from the user's transaction are not sent to addresses the wallet cannot manage.
+      if (type === 'cardano' && json.meta.isReadOnly) {
+        return false;
+      }
+      return true;
     } else {
       return true;
     }
@@ -1099,8 +1109,8 @@ export default class KoniTabs {
       this.#koniState.setAuthorize(authList);
     }
     return accountList.map(address => {
-      const isTestnet = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano) !== 'cardano_preproduction';
-      const addressChainFormat = reformatAddress(address, +isTestnet);
+      const isMainnet = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano) !== 'cardano_preproduction';
+      const addressChainFormat = reformatAddress(address, +isMainnet);
       return convertCardanoAddressToHex(addressChainFormat);
     });
   }
@@ -1128,10 +1138,31 @@ export default class KoniTabs {
       address,
       network
     } = await this.getCurrentInformationCardanoDapp(url);
-    const isTestnet = network !== 'cardano_preproduction';
-    const addressChainFormat = reformatAddress(address, +isTestnet);
+    const isMainnet = network !== 'cardano_preproduction';
+    const addressChainFormat = reformatAddress(address, +isMainnet);
     return convertCardanoAddressToHex(addressChainFormat);
   }
+  async cardanoGetRewardAddress(id, url) {
+    const authList = await this.#koniState.getAuthList();
+    const urlStripped = stripUrl(url);
+    const authInfo = authList[urlStripped];
+    if (!authInfo || !authInfo.isAllowedMap) {
+      throw new CardanoProviderError(CardanoProviderErrorType.REFUSED_REQUEST, 'You need to connect to the wallet first');
+    }
+    const accountList = await this.getCurrentAccount(url, 'cardano');
+    const currentCardanoAccount = authInfo.currentAccount;
+    if (currentCardanoAccount !== accountList[0]) {
+      authList[urlStripped].currentAccount = accountList[0];
+      this.#koniState.setAuthorize(authList);
+    }
+    return accountList.map(address => {
+      const pair = keyring.getPair(address);
+      const rewardAddress = pair.cardano.rewardAddress;
+      const isTestnet = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano) !== 'cardano_preproduction';
+      const addressChainFormat = reformatAddress(rewardAddress, +isTestnet);
+      return convertCardanoAddressToHex(addressChainFormat);
+    });
+  }
   async cardanoGetCurrentNetworkId(id, url) {
     let currentChain;
     let autoActiveChain = false;
@@ -1312,6 +1343,8 @@ export default class KoniTabs {
         return await this.cardanoGetAccountBalance(id, url);
       case 'cardano(account.get.change.address)':
         return await this.cardanoGetChangeAddress(id, url);
+      case 'cardano(account.get.reward.address)':
+        return await this.cardanoGetRewardAddress(id, url);
       case 'cardano(account.get.collateral)':
         return await this.cardanoGetCollateral(id, url, request);
       case 'cardano(account.get.utxos)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.36-0",
+  "version": "1.3.38-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2710,20 +2710,20 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.104",
-    "@subwallet/extension-base": "^1.3.36-0",
-    "@subwallet/extension-chains": "^1.3.36-0",
-    "@subwallet/extension-dapp": "^1.3.36-0",
-    "@subwallet/extension-inject": "^1.3.36-0",
-    "@subwallet/keyring": "^0.1.11",
-    "@subwallet/subwallet-api-sdk": "^1.3.36-0",
-    "@subwallet/ui-keyring": "^0.1.11",
+    "@subwallet/extension-base": "^1.3.38-0",
+    "@subwallet/extension-chains": "^1.3.38-0",
+    "@subwallet/extension-dapp": "^1.3.38-0",
+    "@subwallet/extension-inject": "^1.3.38-0",
+    "@subwallet/keyring": "^0.1.12",
+    "@subwallet/subwallet-api-sdk": "^1.3.38-0",
+    "@subwallet/ui-keyring": "^0.1.12",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
     "@ton/ton": "^15.0.0",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/sign-client": "^2.14.0",
-    "@walletconnect/types": "^2.14.0",
-    "@walletconnect/utils": "^2.14.0",
+    "@walletconnect/sign-client": "^2.20.2",
+    "@walletconnect/types": "^2.20.2",
+    "@walletconnect/utils": "^2.20.2",
     "avail-js-sdk": "^0.2.12",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.1",

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.36-0'
+  version: '1.3.38-0'
 };

package/page/cardano/cips/cip30.d.ts

@@ -1,22 +1,36 @@
 import { CardanoPaginate, Cbor } from '@subwallet/extension-base/background/KoniTypes';
 import { SendRequest } from '@subwallet/extension-base/page/types';
 export declare class CIP30Api {
-    private sendMessage;
+    private readonly sendMessage;
     constructor(sendMessage: SendRequest);
-    getExtension(): {
-        cip: number;
-    }[];
-    getNetworkId(): Promise<number>;
-    getCollateral(payload: {
-        amount: Cbor;
-    }): Promise<string[] | null>;
-    getUtxos(amount?: Cbor, paginate?: CardanoPaginate): Promise<string[] | null>;
-    getUsedAddresses(): Promise<string[]>;
-    getChangeAddress(): Promise<string>;
-    getUnusedAddresses(): Promise<string[]>;
-    getRewardAddresses(): Promise<string[]>;
-    signTx(tx: Cbor, partialSign?: boolean): Promise<string>;
-    signData(address: string, payload: string): Promise<import("@subwallet/extension-base/background/KoniTypes").ResponseCardanoSignData>;
-    submitTx(tx: Cbor): Promise<string>;
-    getBalance(): Promise<string>;
+    private getExtension;
+    private getNetworkId;
+    private getCollateral;
+    private getUtxos;
+    private getUsedAddresses;
+    private getChangeAddress;
+    private getUnusedAddresses;
+    private getRewardAddresses;
+    private signTx;
+    private signData;
+    private submitTx;
+    private getBalance;
+    get apis(): {
+        getExtension: () => {
+            cip: number;
+        }[];
+        getNetworkId: () => Promise<number>;
+        getCollateral: (payload: {
+            amount: Cbor;
+        }) => Promise<string[] | null>;
+        getUtxos: (amount?: Cbor, paginate?: CardanoPaginate) => Promise<string[] | null>;
+        getUsedAddresses: () => Promise<string[]>;
+        getChangeAddress: () => Promise<string>;
+        getUnusedAddresses: () => Promise<string[]>;
+        getRewardAddresses: () => Promise<string[]>;
+        signTx: (tx: Cbor, partialSign?: boolean) => Promise<string>;
+        signData: (address: string, payload: string) => Promise<import("@subwallet/extension-base/background/KoniTypes").ResponseCardanoSignData>;
+        submitTx: (tx: Cbor) => Promise<string>;
+        getBalance: () => Promise<string>;
+    };
 }

package/page/cardano/cips/cip30.js

@@ -32,7 +32,7 @@ export class CIP30Api {
     return new Promise(resolve => resolve([]));
   }
   async getRewardAddresses() {
-    return new Promise(resolve => resolve([]));
+    return await this.sendMessage('cardano(account.get.reward.address)');
   }
   async signTx(tx, partialSign = false) {
     return await this.sendMessage('cardano(transaction.sign)', {
@@ -52,4 +52,20 @@ export class CIP30Api {
   async getBalance() {
     return await this.sendMessage('cardano(account.get.balance)');
   }
+  get apis() {
+    return {
+      getExtension: () => this.getExtension(),
+      getNetworkId: () => this.getNetworkId(),
+      getCollateral: payload => this.getCollateral(payload),
+      getUtxos: (amount, paginate) => this.getUtxos(amount, paginate),
+      getUsedAddresses: () => this.getUsedAddresses(),
+      getChangeAddress: () => this.getChangeAddress(),
+      getUnusedAddresses: () => this.getUnusedAddresses(),
+      getRewardAddresses: () => this.getRewardAddresses(),
+      signTx: (tx, partialSign = false) => this.signTx(tx, partialSign),
+      signData: (address, payload) => this.signData(address, payload),
+      submitTx: tx => this.submitTx(tx),
+      getBalance: () => this.getBalance()
+    };
+  }
 }

package/page/cardano/index.d.ts

@@ -1,13 +1,29 @@
 import type { CardanoExtensionCIP, CardanoProvider } from '@subwallet/extension-inject/types';
-import { CIP30Api } from '@subwallet/extension-base/page/cardano/cips';
 import { SendRequest } from '@subwallet/extension-base/page/types';
 export default class SubWalletCardanoProvider implements CardanoProvider {
     readonly apiVersion: string;
     readonly icon: string;
     readonly name: string;
     readonly supportedExtensions: CardanoExtensionCIP[];
-    protected sendMessage: SendRequest;
+    private readonly sendMessage;
     constructor(sendMessage: SendRequest);
-    enable(): Promise<Readonly<CIP30Api>>;
-    isEnable(): Promise<boolean>;
+    enable: () => Promise<Readonly<{
+        getExtension: () => {
+            cip: number;
+        }[];
+        getNetworkId: () => Promise<number>;
+        getCollateral: (payload: {
+            amount: string;
+        }) => Promise<string[] | null>;
+        getUtxos: (amount?: string | undefined, paginate?: import("../../background/KoniTypes").CardanoPaginate | undefined) => Promise<string[] | null>;
+        getUsedAddresses: () => Promise<string[]>;
+        getChangeAddress: () => Promise<string>;
+        getUnusedAddresses: () => Promise<string[]>;
+        getRewardAddresses: () => Promise<string[]>;
+        signTx: (tx: string, partialSign?: boolean) => Promise<string>;
+        signData: (address: string, payload: string) => Promise<import("../../background/KoniTypes").ResponseCardanoSignData>;
+        submitTx: (tx: string) => Promise<string>;
+        getBalance: () => Promise<string>;
+    }>>;
+    isEnable: () => Promise<boolean>;
 }

package/page/cardano/index.js

@@ -14,7 +14,7 @@ export default class SubWalletCardanoProvider {
     this.icon = WALLET_ICON;
     this.sendMessage = sendMessage;
   }
-  async enable() {
+  enable = async () => {
     const isEnabled = await this.sendMessage('pub(authorize.tabV2)', {
       origin,
       accountAuthTypes: ['cardano']
@@ -23,12 +23,12 @@ export default class SubWalletCardanoProvider {
       throw new Error('Access to the wallet is denied');
     }
     const CIP30 = new CIP30Api(this.sendMessage);
-    return Object.freeze(CIP30);
-  }
-  async isEnable() {
+    return Object.freeze(CIP30.apis);
+  };
+  isEnable = async () => {
     const accountList = await this.sendMessage('pub(accounts.list)', {
       accountAuthType: 'cardano'
     });
     return accountList.length > 0;
-  }
+  };
 }

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

@@ -15,8 +15,8 @@ import { ChainProperties, ChainType, RuntimeVersion } from '@polkadot/types/inte
 import { AnyJson, Registry } from '@polkadot/types/types';
 export interface _DataMap {
     chainInfoMap: Record<string, _ChainInfo>;
-    chainStateMap: Record<string, _ChainState>;
     assetRegistry: Record<string, _ChainAsset>;
+    chainStateMap: Record<string, _ChainState>;
     assetRefMap: Record<string, _AssetRef>;
 }
 export declare enum _ChainConnectionStatus {

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

@@ -260,7 +260,10 @@ export default class AuthRequestHandler {
           origin,
           url,
           accountAuthTypes: [...new Set([...accountAuthTypes, ...((existed === null || existed === void 0 ? void 0 : existed.accountAuthTypes) || [])])],
-          currentNetworkMap: existed ? existed.currentNetworkMap : defaultNetworkMap
+          currentNetworkMap: existed ? {
+            ...defaultNetworkMap,
+            ...existed.currentNetworkMap
+          } : defaultNetworkMap
         };
         this.setAuthorize(authorizeList, () => {
           cb();

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

@@ -132,14 +132,15 @@ export default class CardanoRequestHandler {
   }
   signMessage(confirmation) {
     const {
-      address,
+      address: addressToSign,
+      currentAddress,
       payload
     } = confirmation.payload;
-    const pair = keyring.getPair(address);
+    const pair = keyring.getPair(currentAddress);
     if (pair.isLocked) {
       keyring.unlockPair(pair.address);
     }
-    return pair.cardano.signMessage(payload, true);
+    return pair.cardano.signMessage(payload, addressToSign);
   }
   signTransactionCardano(confirmation) {
     // alibaba

package/services/request-service/helper/index.js

@@ -46,25 +46,27 @@ export const extractMetadata = store => {
 export const convertAssetToValue = amount => {
   const value = CardanoWasm.Value.new(CardanoWasm.BigNum.from_str('0'));
   const multiAsset = CardanoWasm.MultiAsset.new();
-  for (const item of amount) {
-    if (item.unit === 'lovelace') {
-      value.set_coin(CardanoWasm.BigNum.from_str(item.quantity));
-    } else {
-      const policyIdHex = item.unit.slice(0, 56);
-      const assetNameHex = item.unit.slice(56);
-      const scriptHash = CardanoWasm.ScriptHash.from_bytes(Buffer.from(policyIdHex, 'hex'));
-      const assetName = CardanoWasm.AssetName.new(Buffer.from(assetNameHex, 'hex'));
-      const quantity = CardanoWasm.BigNum.from_str(item.quantity);
-      let assets = multiAsset.get(scriptHash);
-      if (!assets) {
-        assets = CardanoWasm.Assets.new();
+  if (amount !== null && amount !== void 0 && amount.length) {
+    for (const item of amount) {
+      if (item.unit === 'lovelace') {
+        value.set_coin(CardanoWasm.BigNum.from_str(item.quantity));
+      } else {
+        const policyIdHex = item.unit.slice(0, 56);
+        const assetNameHex = item.unit.slice(56);
+        const scriptHash = CardanoWasm.ScriptHash.from_bytes(Buffer.from(policyIdHex, 'hex'));
+        const assetName = CardanoWasm.AssetName.new(Buffer.from(assetNameHex, 'hex'));
+        const quantity = CardanoWasm.BigNum.from_str(item.quantity);
+        let assets = multiAsset.get(scriptHash);
+        if (!assets) {
+          assets = CardanoWasm.Assets.new();
+        }
+        assets.insert(assetName, quantity);
+        multiAsset.insert(scriptHash, assets);
       }
-      assets.insert(assetName, quantity);
-      multiAsset.insert(scriptHash, assets);
     }
-  }
-  if (multiAsset.len() > 0) {
-    value.set_multiasset(multiAsset);
+    if (multiAsset.len() > 0) {
+      value.set_multiasset(multiAsset);
+    }
   }
   return value;
 };

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

@@ -165,6 +165,8 @@ export class SwapBaseHandler {
         if (needEditAmount) {
           bnSendingValue = BigN(selectedQuote.toAmount).multipliedBy(DEFAULT_EXCESS_AMOUNT_WEIGHT); // need to round
         } else {
+          // todo: remove
+          console.log('The code cannot run into here, if it runs into here, pls ask dev to check');
           bnSendingValue = BigN(selectedQuote.toAmount);
         }
       }
@@ -365,8 +367,8 @@ export class SwapBaseHandler {
     if (recipient) {
       const isEvmAddress = isEthereumAddress(recipient);
       const isEvmDestChain = _isChainEvmCompatible(swapToChain);
-      if (isEvmAddress && !isEvmDestChain || !isEvmAddress && isEvmDestChain) {
-        // todo: update this condition
+      if (isEvmAddress !== isEvmDestChain) {
+        // todo: update condition if support swap chain # EVM or Substrate
         return [new TransactionError(SwapErrorType.INVALID_RECIPIENT)];
       }
     }

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

@@ -71,7 +71,7 @@ export declare class UniswapHandler implements SwapBaseInterface {
     generateOptimalProcessV2(params: OptimalSwapPathParamsV2): Promise<CommonOptimalSwapPath>;
     getApprovalStep(params: OptimalSwapPathParamsV2, stepIndex: number): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
     getApproveSwap(params: OptimalSwapPathParamsV2): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
-    getApproveBridge(params: OptimalSwapPathParamsV2): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
+    getApproveBridge(params: OptimalSwapPathParamsV2, isBridgeFirst: boolean): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
     getPermitStep(params: OptimalSwapPathParamsV2, stepIndex: number): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
     getSubmitStep(params: OptimalSwapPathParamsV2, stepIndex: number): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
     getBridgeStep(params: OptimalSwapPathParamsV2, stepIndex: number): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;