@subwallet/extension-base 1.3.78-0 → 1.3.80-0

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/core/substrate/system-pallet.js

@@ -43,6 +43,9 @@ function _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMo
   if (strictMode) {
     return bnExistentialDeposit;
   }
+  if (accountInfo.data.free.toString() === existentialDeposit) {
+    return BigInt(0);
+  }
   return _canAccountBeReaped(accountInfo) ? BigInt(0) : bnExistentialDeposit; // account for ED here will go better with max transfer logic
 }
 function _getSystemPalletTransferableV2(accountInfo, existentialDeposit, strictMode) {

package/koni/api/nft/index.js

@@ -14,7 +14,7 @@ import { UniqueNftApi } from '@subwallet/extension-base/koni/api/nft/unique_netw
 import { VaraNftApi } from '@subwallet/extension-base/koni/api/nft/vara_nft';
 import { WasmNftApi } from '@subwallet/extension-base/koni/api/nft/wasm_nft';
 import { _NFT_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft, _isSupportOrdinal } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isChainSupportNativeNft, _isChainSupportWasmNft, _isSupportOrdinal } from '@subwallet/extension-base/services/chain-service/utils';
 import { getAddressesByChainType, targetIsWeb } from '@subwallet/extension-base/utils';
 import AssetHubNftsPalletApi from "./assethub_nft/index.js";
 import { RariNftApi } from "./rari/index.js";
@@ -33,8 +33,6 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
     return [new AssetHubUniquesPalletApi(substrateApi, substrateAddresses, chain), new AssetHubNftsPalletApi(substrateApi, substrateAddresses, chain)];
   } else if (_NFT_CHAIN_GROUP.statemint.includes(chain)) {
     return [new AssetHubUniquesPalletApi(substrateApi, substrateAddresses, chain), new AssetHubNftsPalletApi(substrateApi, substrateAddresses, chain)];
-  } else if (_NFT_CHAIN_GROUP.unique_network.includes(chain)) {
-    return [new UniqueNftApi(chain, substrateAddresses)];
   } else if (_NFT_CHAIN_GROUP.unique_evm.includes(chain)) {
     return [new UniqueNftApi(chain, evmAddresses)];
   } else if (_NFT_CHAIN_GROUP.bitcountry.includes(chain)) {
@@ -56,10 +54,6 @@ function createWasmNftApi(chain, apiProps, addresses) {
   const substrateAddresses = getAddressesByChainType(addresses, [ChainType.SUBSTRATE]);
   return new WasmNftApi(apiProps, substrateAddresses, chain);
 }
-function createWeb3NftApi(chain, evmApi, addresses) {
-  const evmAddresses = getAddressesByChainType(addresses, [ChainType.EVM]);
-  return new EvmNftApi(evmApi, evmAddresses, chain);
-}
 const createOrdinalApi = (chain, subscanChain, addresses) => {
   return new OrdinalNftApi(addresses, chain, subscanChain);
 };
@@ -128,14 +122,6 @@ export class NftHandler {
               }
             }
           }
-          if (_isChainSupportEvmNft(chainInfo)) {
-            if (this.evmApiMap[chain]) {
-              const handler = createWeb3NftApi(chain, this.evmApiMap[chain], evmAddresses);
-              if (handler) {
-                this.handlers.push(handler);
-              }
-            }
-          }
           if (chain === 'unique_evm') {
             const handlers = createSubstrateNftApi(chain, null, evmAddresses);
             if (handlers && !!handlers.length) {

package/koni/background/cron.d.ts

@@ -29,7 +29,6 @@ export declare class KoniCron {
     refreshNft: (address: string, apiMap: ApiMap, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>) => () => void;
     resetNft: (newAddress: string) => void;
     checkNetworkAvailable: (serviceInfo: ServiceInfo) => boolean;
-    detectEvmCollectionNft: (address: string) => () => void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
     private needUpdateNft;

package/koni/background/cron.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_NFT_DETECT_INTERVAL, CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_MKT_CAMPAIGN_INTERVAL, CRON_REFRESH_NFT_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
+import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_MKT_CAMPAIGN_INTERVAL, CRON_REFRESH_NFT_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -87,7 +87,6 @@ export class KoniCron {
       // NFT
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
-      (commonReload || needUpdateNft) && this.removeCron('detectNft');
       commonReload && this.removeCron('refreshPoolingStakingReward');
       if (mktCampaignNeedReload) {
         this.removeCron('fetchMktCampaignData');
@@ -103,7 +102,6 @@ export class KoniCron {
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron jobs if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-        (commonReload || needUpdateNft) && this.addCron('detectNft', this.detectEvmCollectionNft(address), CRON_NFT_DETECT_INTERVAL);
         reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
       }
     };
@@ -116,8 +114,6 @@ export class KoniCron {
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.proxyId);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.proxyId, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('detectNft', this.detectEvmCollectionNft(currentAccountInfo.proxyId), CRON_NFT_DETECT_INTERVAL);
-      // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
     }
     this.status = 'running';
@@ -166,25 +162,12 @@ export class KoniCron {
   checkNetworkAvailable = serviceInfo => {
     return Object.keys(serviceInfo.chainApiMap.substrate).length > 0 || Object.keys(serviceInfo.chainApiMap.evm).length > 0;
   };
-  detectEvmCollectionNft = address => {
-    return () => {
-      let addresses = [];
-      addresses = this.state.keyringService.context.getDecodedAddresses();
-      if (!addresses.length) {
-        console.warn('[Cron] No decoded addresses found for ALL_ACCOUNT_KEY');
-        return;
-      }
-      this.state.nftDetectionService.fetchEvmCollectionsWithPreview(addresses).catch(err => console.warn(`[Cron] NFT detection failed for ${address}:`, err));
-    };
-  };
   async reloadNft() {
     const address = this.state.keyringService.context.currentAccount.proxyId;
     const serviceInfo = this.state.getServiceInfo();
     this.resetNft(address);
     this.removeCron('refreshNft');
-    this.removeCron('detectNft');
     this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-    this.addCron('detectNft', this.detectEvmCollectionNft(address), CRON_NFT_DETECT_INTERVAL);
     await waitTimeout(1800);
     return true;
   }

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

@@ -117,6 +117,7 @@ export default class KoniExtension {
     private getNft;
     private subscribeNft;
     private handleGetNftFullList;
+    private handleGetNftDetail;
     private getStakingReward;
     private subscribeStakingReward;
     private getStaking;
@@ -297,6 +298,9 @@ export default class KoniExtension {
     private subscribeBuyTokens;
     private subscribeBuyServices;
     private subscribeSwapPairs;
+    /**
+     * @deprecated Use function `handleSwapRequestV2` instead.
+     */
     private handleSwapRequest;
     private handleSwapRequestV2;
     private getLatestSwapQuote;

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;
     }
   }
@@ -1150,7 +1150,10 @@ export default class KoniExtension {
     return this.getNft();
   }
   async handleGetNftFullList(request) {
-    return this.#koniState.nftDetectionService.getFullNftInstancesByCollection(request);
+    return this.#koniState.nftService.fetchFullListNftOfACollection(request);
+  }
+  async handleGetNftDetail(request) {
+    return this.#koniState.nftService.fetchNftDetail(request);
   }
   getStakingReward() {
     return new Promise((resolve, reject) => {
@@ -4540,7 +4543,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 +4924,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);
@@ -5652,16 +5660,14 @@ export default class KoniExtension {
         return this.getCrowdloanContributions(request);
       case 'pri(crowdloan.getSubscription)':
         return this.subscribeCrowdloan(id, port);
-      case 'pri(nft.getNft)':
-        return await this.getNft();
       case 'pri(nft.getSubscription)':
         return await this.subscribeNft(id, port);
-      case 'pri(nftCollection.getNftCollection)':
-        return await this.getNftCollection();
       case 'pri(nftCollection.getSubscription)':
         return await this.subscribeNftCollection(id, port);
       case 'pri(nft.getFullList)':
         return await this.handleGetNftFullList(request);
+      case 'pri(nft.getNftdetail)':
+        return await this.handleGetNftDetail(request);
       case 'pri(staking.getStaking)':
         return this.getStaking();
       case 'pri(staking.getSubscription)':

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

@@ -20,7 +20,7 @@ import MigrationService from '@subwallet/extension-base/services/migration-servi
 import MintCampaignService from '@subwallet/extension-base/services/mint-campaign-service';
 import MktCampaignService from '@subwallet/extension-base/services/mkt-campaign-service';
 import { MultisigService } from '@subwallet/extension-base/services/multisig-service';
-import NftService from '@subwallet/extension-base/services/nft-service';
+import { NftService } from '@subwallet/extension-base/services/nft-service';
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import OpenGovService from '@subwallet/extension-base/services/open-gov';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
@@ -48,6 +48,11 @@ export default class KoniState {
     private externalRequest;
     private crowdloanMap;
     private crowdloanSubject;
+    /**
+     * TODO: Remove this subject once NFT migration to the service layer is completed.
+     * The state manager should not handle the internal state of the NFT service.
+     * The NFT service will manage its own state independently.
+     */
     private nftSubject;
     private mantaPayConfigSubject;
     isMantaPayEnabled: boolean;
@@ -77,7 +82,7 @@ export default class KoniState {
     readonly mintCampaignService: MintCampaignService;
     readonly campaignService: CampaignService;
     readonly mktCampaignService: MktCampaignService;
-    readonly nftDetectionService: NftService;
+    readonly nftService: NftService;
     readonly buyService: BuyService;
     readonly earningService: EarningService;
     readonly feeService: FeeService;
@@ -273,6 +278,7 @@ export default class KoniState {
     onAccountAdd(): void;
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;
+    reloadNftV2(): Promise<void>;
     reloadStaking(): Promise<boolean>;
     reloadBalance(): Promise<boolean>;
     approvePassPhishingPage(_url: string): Promise<boolean>;

package/koni/background/handlers/State.js

@@ -29,7 +29,7 @@ import MigrationService from '@subwallet/extension-base/services/migration-servi
 import MintCampaignService from '@subwallet/extension-base/services/mint-campaign-service';
 import MktCampaignService from '@subwallet/extension-base/services/mkt-campaign-service';
 import { MultisigService } from '@subwallet/extension-base/services/multisig-service';
-import NftService from '@subwallet/extension-base/services/nft-service';
+import { NftService } from '@subwallet/extension-base/services/nft-service';
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import OpenGovService from '@subwallet/extension-base/services/open-gov';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
@@ -79,6 +79,12 @@ export default class KoniState {
   externalRequest = {};
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new Subject();
+
+  /**
+   * TODO: Remove this subject once NFT migration to the service layer is completed.
+   * The state manager should not handle the internal state of the NFT service.
+   * The NFT service will manage its own state independently.
+   */
   nftSubject = new Subject();
   mantaPayConfigSubject = new Subject();
   isMantaPayEnabled = false;
@@ -115,13 +121,13 @@ export default class KoniState {
     this.requestService = new RequestService(this.chainService, this.settingService, this.keyringService, this.transactionService);
     this.priceService = new PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new BalanceService(this);
+    this.nftService = new NftService(this);
     this.historyService = new HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService, this.subscanService);
     this.mintCampaignService = new MintCampaignService(this);
     this.walletConnectService = new WalletConnectService(this, this.requestService);
     this.migrationService = new MigrationService(this, this.eventService);
     this.campaignService = new CampaignService(this);
     this.mktCampaignService = new MktCampaignService(this);
-    this.nftDetectionService = new NftService(this);
     this.buyService = new BuyService(this);
     this.earningService = new EarningService(this);
     this.swapService = new SwapService(this);
@@ -232,6 +238,7 @@ export default class KoniState {
     this.mktCampaignService.init();
     this.eventService.emit('chain.ready', true);
     await this.balanceService.init();
+    await this.nftService.init();
     await this.earningService.init();
     await this.swapService.init();
     await this.inappNotificationService.init();
@@ -387,6 +394,7 @@ export default class KoniState {
     return this.dbService.getAllNftCollection(this.activeChainSlugs);
   }
   subscribeNftCollection() {
+    // TODO: Move this logic to the NFT service once migration is complete.
     const getChains = () => this.activeChainSlugs;
     return this.dbService.stores.nftCollection.subscribeNftCollection(getChains);
   }
@@ -1768,7 +1776,7 @@ export default class KoniState {
     this.campaignService.stop();
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop(), this.inappNotificationService.stop(), this.openGovService.stop(), this.multisigService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.nftService.stop(), this.earningService.stop(), this.swapService.stop(), this.inappNotificationService.stop(), this.openGovService.stop(), this.multisigService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1824,7 +1832,7 @@ export default class KoniState {
     this.generalStatus = ServiceStatus.STARTING_FULL;
     const startingFull = createPromiseHandler();
     this.waitStartingFull = startingFull.promise;
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start(), this.inappNotificationService.start(), this.openGovService.start(), this.multisigService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.nftService.start(), this.earningService.start(), this.swapService.start(), this.inappNotificationService.start(), this.openGovService.start(), this.multisigService.start()]);
     this.eventService.emit('general.start_full', true);
     this.waitStartingFull = null;
     this.generalStatus = ServiceStatus.STARTED_FULL;
@@ -1885,9 +1893,19 @@ export default class KoniState {
     });
   }
   async reloadNft() {
-    const currentAddress = this.keyringService.context.currentAccount.proxyId;
+    const currentProxyId = this.keyringService.context.currentAccount.proxyId;
+    const currentAddress = this.keyringService.context.addressesByProxyId(currentProxyId);
     await this.dbService.removeNftsByAddress(currentAddress);
-    return await this.cron.reloadNft();
+    await this.cron.reloadNft();
+    await this.reloadNftV2();
+    return true;
+  }
+  async reloadNftV2() {
+    // TODO: Recheck: Uncomment this block when migration is complete
+    // const currentAddress = this.keyringService.context.currentAccount.proxyId;
+    //
+    // await this.dbService.removeNftsByAddress(currentAddress);
+    await this.nftService.forceReload();
   }
   async reloadStaking() {
     await this.earningService.reloadEarning(true);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.78-0",
+  "version": "1.3.80-0",
   "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",
@@ -1756,6 +1751,31 @@
       "require": "./cjs/services/nft-service/index.js",
       "default": "./services/nft-service/index.js"
     },
+    "./services/nft-service/multi-chain-nft-fetcher": {
+      "types": "./services/nft-service/multi-chain-nft-fetcher.d.ts",
+      "require": "./cjs/services/nft-service/multi-chain-nft-fetcher.js",
+      "default": "./services/nft-service/multi-chain-nft-fetcher.js"
+    },
+    "./services/nft-service/nft-handlers/base-nft-handler": {
+      "types": "./services/nft-service/nft-handlers/base-nft-handler.d.ts",
+      "require": "./cjs/services/nft-service/nft-handlers/base-nft-handler.js",
+      "default": "./services/nft-service/nft-handlers/base-nft-handler.js"
+    },
+    "./services/nft-service/nft-handlers/evm/evm-nft-handler": {
+      "types": "./services/nft-service/nft-handlers/evm/evm-nft-handler.d.ts",
+      "require": "./cjs/services/nft-service/nft-handlers/evm/evm-nft-handler.js",
+      "default": "./services/nft-service/nft-handlers/evm/evm-nft-handler.js"
+    },
+    "./services/nft-service/nft-handlers/registry": {
+      "types": "./services/nft-service/nft-handlers/registry.d.ts",
+      "require": "./cjs/services/nft-service/nft-handlers/registry.js",
+      "default": "./services/nft-service/nft-handlers/registry.js"
+    },
+    "./services/nft-service/nft-handlers/unique/unique-nft-handler": {
+      "types": "./services/nft-service/nft-handlers/unique/unique-nft-handler.d.ts",
+      "require": "./cjs/services/nft-service/nft-handlers/unique/unique-nft-handler.js",
+      "default": "./services/nft-service/nft-handlers/unique/unique-nft-handler.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -3027,12 +3047,12 @@
     "@snowbridge/registry": "^0.2.0",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet-monorepos/subwallet-services-sdk": "0.1.16",
+    "@subwallet-monorepos/subwallet-services-sdk": "0.1.17-beta.2",
     "@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.80-0",
+    "@subwallet/extension-chains": "^1.3.80-0",
+    "@subwallet/extension-dapp": "^1.3.80-0",
+    "@subwallet/extension-inject": "^1.3.80-0",
     "@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.80-0'
 };

package/services/balance-service/helpers/process.d.ts

@@ -11,4 +11,4 @@ export interface RequestOptimalTransferProcess {
 }
 export declare function getDefaultTransferProcess(): CommonOptimalTransferPath;
 export declare function getSnowbridgeTransferProcessFromEvm(address: string, evmApi: _EvmApi, tokenInfo: _ChainAsset, amount: string): Promise<CommonOptimalTransferPath>;
-export declare function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress: string): Promise<CommonOptimalTransferPath>;
+export declare function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress: string, address: string, tokenInfo: _ChainAsset, evmApi: _EvmApi, amount: string): Promise<CommonOptimalTransferPath>;

package/services/balance-service/helpers/process.js

@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { getERC20Allowance } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { getSnowBridgeGatewayContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
+import { _getContractAddressOfToken } from '@subwallet/extension-base/services/chain-service/utils';
 import { CommonStepType, DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
+import BigN from 'bignumber.js';
 export function getDefaultTransferProcess() {
   return {
     totalFee: [MOCK_STEP_FEE, MOCK_STEP_FEE],
@@ -22,18 +26,25 @@ export async function getSnowbridgeTransferProcessFromEvm(address, evmApi, token
     totalFee: [MOCK_STEP_FEE],
     steps: [DEFAULT_FIRST_STEP]
   };
-  // const allowance = await getERC20Allowance(getSnowBridgeGatewayContract(evmApi.chainSlug), address, _getContractAddressOfToken(tokenInfo), evmApi);
-
-  result.steps.push({
-    // always approve spending because sometimes allowance check fails
-    id: result.steps.length,
-    type: CommonStepType.TOKEN_APPROVAL,
-    name: 'Approve spending'
-  });
-  result.totalFee.push(MOCK_STEP_FEE);
-  // if (!allowance || BigInt(allowance) < BigInt(amount)) {
-  // }
-
+  try {
+    const allowance = await getERC20Allowance(getSnowBridgeGatewayContract(evmApi.chainSlug), address, _getContractAddressOfToken(tokenInfo), evmApi);
+    if (!allowance || new BigN(allowance).lt(amount)) {
+      result.steps.push({
+        id: result.steps.length,
+        type: CommonStepType.TOKEN_APPROVAL,
+        name: 'Approve spending'
+      });
+      result.totalFee.push(MOCK_STEP_FEE);
+    }
+  } catch (e) {
+    console.error(e);
+    result.steps.push({
+      id: result.steps.length,
+      type: CommonStepType.TOKEN_APPROVAL,
+      name: 'Approve spending'
+    });
+    result.totalFee.push(MOCK_STEP_FEE);
+  }
   result.steps.push({
     id: result.steps.length,
     type: CommonStepType.TRANSFER,
@@ -42,20 +53,36 @@ export async function getSnowbridgeTransferProcessFromEvm(address, evmApi, token
   result.totalFee.push(MOCK_STEP_FEE);
   return Promise.resolve(result);
 }
-export async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress) {
+export async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress, address, tokenInfo, evmApi, amount) {
   const result = {
     totalFee: [MOCK_STEP_FEE],
     steps: [DEFAULT_FIRST_STEP]
   };
-  result.steps.push({
-    id: result.steps.length,
-    type: CommonStepType.TOKEN_APPROVAL,
-    name: 'Approve spending',
-    metadata: {
-      SpokePoolAddress
+  try {
+    const allowance = await getERC20Allowance(SpokePoolAddress, address, _getContractAddressOfToken(tokenInfo), evmApi);
+    if (!allowance || new BigN(allowance).lt(amount)) {
+      result.steps.push({
+        id: result.steps.length,
+        type: CommonStepType.TOKEN_APPROVAL,
+        name: 'Approve spending',
+        metadata: {
+          SpokePoolAddress
+        }
+      });
+      result.totalFee.push(MOCK_STEP_FEE);
     }
-  });
-  result.totalFee.push(MOCK_STEP_FEE);
+  } catch (e) {
+    console.error(e);
+    result.steps.push({
+      id: result.steps.length,
+      type: CommonStepType.TOKEN_APPROVAL,
+      name: 'Approve spending',
+      metadata: {
+        SpokePoolAddress
+      }
+    });
+    result.totalFee.push(MOCK_STEP_FEE);
+  }
   result.steps.push({
     id: result.steps.length,
     type: CommonStepType.TRANSFER,