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

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';
@@ -204,6 +204,11 @@ export interface NftItem extends NftItemExtraInfo {
     rarity?: string;
     description?: string;
     properties?: Record<any, any> | null;
+    isBundle?: boolean;
+    nestingLevel?: number;
+    nestingTokens?: NftItem[];
+    parent?: NftItem;
+    parentId?: string;
 }
 interface NftItemExtraInfo {
     type?: _AssetType.ERC721 | _AssetType.PSP34 | RMRK_VER;
@@ -817,9 +822,15 @@ export interface NftTransactionRequest extends BaseRequestSign {
     nftItem: NftItem;
 }
 export interface NftFullListRequest {
-    contractAddress: string;
+    collectionId: string;
     owners: string[];
     chainInfo: _ChainInfo;
+    tokenIds?: string[];
+}
+export interface NftDetailRequest {
+    collectionId: string;
+    chainSlug: string;
+    tokenId: string;
 }
 export interface EvmNftTransaction extends ValidateTransactionResponse {
     tx: Record<string, any> | null;
@@ -1875,11 +1886,10 @@ export interface KoniRequestSignatures {
     'pri(evmNft.getTransaction)': [NftTransactionRequest, EvmNftTransaction];
     'pri(substrateNft.submitTransaction)': [NftTransactionRequest, SWTransactionResponse];
     'pri(substrateNft.getTransaction)': [NftTransactionRequest, SubstrateNftTransaction];
-    'pri(nft.getNft)': [null, NftJson];
     'pri(nft.getSubscription)': [RequestSubscribeNft, NftJson, NftJson];
-    'pri(nftCollection.getNftCollection)': [null, NftCollectionJson];
     'pri(nftCollection.getSubscription)': [null, NftCollection[], NftCollection[]];
     'pri(nft.getFullList)': [NftFullListRequest, boolean];
+    'pri(nft.getNftdetail)': [NftDetailRequest, NftItem];
     'pri(staking.getStaking)': [null, StakingJson];
     'pri(staking.getSubscription)': [RequestSubscribeStaking, StakingJson, StakingJson];
     'pri(stakingReward.getStakingReward)': [null, StakingRewardJson];
@@ -2117,10 +2127,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/core/substrate/system-pallet.js

@@ -54,6 +54,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/cjs/koni/api/nft/index.js

@@ -40,8 +40,6 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
     return [new _assethub_unique.default(substrateApi, substrateAddresses, chain), new _assethub_nft.default(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.statemint.includes(chain)) {
     return [new _assethub_unique.default(substrateApi, substrateAddresses, chain), new _assethub_nft.default(substrateApi, substrateAddresses, chain)];
-  } else if (_constants._NFT_CHAIN_GROUP.unique_network.includes(chain)) {
-    return [new _unique_network_nft.UniqueNftApi(chain, substrateAddresses)];
   } else if (_constants._NFT_CHAIN_GROUP.unique_evm.includes(chain)) {
     return [new _unique_network_nft.UniqueNftApi(chain, evmAddresses)];
   } else if (_constants._NFT_CHAIN_GROUP.bitcountry.includes(chain)) {
@@ -63,10 +61,6 @@ function createWasmNftApi(chain, apiProps, addresses) {
   const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   return new _wasm_nft.WasmNftApi(apiProps, substrateAddresses, chain);
 }
-function createWeb3NftApi(chain, evmApi, addresses) {
-  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-  return new _evm_nft.EvmNftApi(evmApi, evmAddresses, chain);
-}
 const createOrdinalApi = (chain, subscanChain, addresses) => {
   return new _ordinal_nft.default(addresses, chain, subscanChain);
 };
@@ -136,14 +130,6 @@ class NftHandler {
               }
             }
           }
-          if ((0, _utils._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/cjs/koni/background/cron.js

@@ -98,7 +98,6 @@ 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');
@@ -114,7 +113,6 @@ 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()), _constants.CRON_REFRESH_NFT_INTERVAL);
-        (commonReload || needUpdateNft) && this.addCron('detectNft', this.detectEvmCollectionNft(address), _constants.CRON_NFT_DETECT_INTERVAL);
         reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
       }
     };
@@ -127,8 +125,6 @@ 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()), _constants.CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('detectNft', this.detectEvmCollectionNft(currentAccountInfo.proxyId), _constants.CRON_NFT_DETECT_INTERVAL);
-      // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
     }
     this.status = 'running';
@@ -177,25 +173,12 @@ 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()), _constants.CRON_REFRESH_NFT_INTERVAL);
-    this.addCron('detectNft', this.detectEvmCollectionNft(address), _constants.CRON_NFT_DETECT_INTERVAL);
     await (0, _utils2.waitTimeout)(1800);
     return true;
   }

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;
     }
   }
@@ -1198,7 +1198,10 @@ 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) => {
@@ -4636,7 +4639,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 +5023,10 @@ class KoniExtension {
     ready = true;
     return this.#koniState.swapService.getSwapPairs();
   }
+
+  /**
+   * @deprecated Use function `handleSwapRequestV2` instead.
+   */
   async handleSwapRequest(request) {
     // @ts-ignore
     return Promise.resolve(null);
@@ -5753,16 +5761,14 @@ 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/cjs/koni/background/handlers/State.js

@@ -33,7 +33,7 @@ var _migrationService = _interopRequireDefault(require("@subwallet/extension-bas
 var _mintCampaignService = _interopRequireDefault(require("@subwallet/extension-base/services/mint-campaign-service"));
 var _mktCampaignService = _interopRequireDefault(require("@subwallet/extension-base/services/mkt-campaign-service"));
 var _multisigService = require("@subwallet/extension-base/services/multisig-service");
-var _nftService = _interopRequireDefault(require("@subwallet/extension-base/services/nft-service"));
+var _nftService = require("@subwallet/extension-base/services/nft-service");
 var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _openGov = _interopRequireDefault(require("@subwallet/extension-base/services/open-gov"));
 var _priceService = require("@subwallet/extension-base/services/price-service");
@@ -86,6 +86,12 @@ class KoniState {
   externalRequest = {};
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new _rxjs.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 _rxjs.Subject();
   mantaPayConfigSubject = new _rxjs.Subject();
   isMantaPayEnabled = false;
@@ -123,13 +129,13 @@ class KoniState {
     this.requestService = new _requestService.default(this.chainService, this.settingService, this.keyringService, this.transactionService);
     this.priceService = new _priceService.PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new _balanceService.BalanceService(this);
+    this.nftService = new _nftService.NftService(this);
     this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService, this.subscanService);
     this.mintCampaignService = new _mintCampaignService.default(this);
     this.walletConnectService = new _walletConnectService.default(this, this.requestService);
     this.migrationService = new _migrationService.default(this, this.eventService);
     this.campaignService = new _campaignService.default(this);
     this.mktCampaignService = new _mktCampaignService.default(this);
-    this.nftDetectionService = new _nftService.default(this);
     this.buyService = new _buyService.default(this);
     this.earningService = new _service.default(this);
     this.swapService = new _swapService.SwapService(this);
@@ -241,6 +247,7 @@ 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();
@@ -398,6 +405,7 @@ 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);
   }
@@ -1799,7 +1807,7 @@ 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();
@@ -1855,7 +1863,7 @@ class KoniState {
     this.generalStatus = _types.ServiceStatus.STARTING_FULL;
     const startingFull = (0, _promise.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 = _types.ServiceStatus.STARTED_FULL;
@@ -1917,9 +1925,19 @@ 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/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.80-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,7 +8,11 @@ exports.getAcrossbridgeTransferProcessFromEvm = getAcrossbridgeTransferProcessFr
 exports.getDefaultTransferProcess = getDefaultTransferProcess;
 exports.getSnowbridgeTransferProcessFromEvm = getSnowbridgeTransferProcessFromEvm;
 var _chainList = require("@subwallet/chain-list");
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -30,18 +35,25 @@ async function getSnowbridgeTransferProcessFromEvm(address, evmApi, tokenInfo, a
     totalFee: [_serviceBase.MOCK_STEP_FEE],
     steps: [_serviceBase.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: _serviceBase.CommonStepType.TOKEN_APPROVAL,
-    name: 'Approve spending'
-  });
-  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
-  // if (!allowance || BigInt(allowance) < BigInt(amount)) {
-  // }
-
+  try {
+    const allowance = await (0, _web.getERC20Allowance)((0, _utils.getSnowBridgeGatewayContract)(evmApi.chainSlug), address, (0, _utils2._getContractAddressOfToken)(tokenInfo), evmApi);
+    if (!allowance || new _bignumber.default(allowance).lt(amount)) {
+      result.steps.push({
+        id: result.steps.length,
+        type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+        name: 'Approve spending'
+      });
+      result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+    }
+  } catch (e) {
+    console.error(e);
+    result.steps.push({
+      id: result.steps.length,
+      type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+      name: 'Approve spending'
+    });
+    result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  }
   result.steps.push({
     id: result.steps.length,
     type: _serviceBase.CommonStepType.TRANSFER,
@@ -50,20 +62,36 @@ async function getSnowbridgeTransferProcessFromEvm(address, evmApi, tokenInfo, a
   result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
   return Promise.resolve(result);
 }
-async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress) {
+async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress, address, tokenInfo, evmApi, amount) {
   const result = {
     totalFee: [_serviceBase.MOCK_STEP_FEE],
     steps: [_serviceBase.DEFAULT_FIRST_STEP]
   };
-  result.steps.push({
-    id: result.steps.length,
-    type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
-    name: 'Approve spending',
-    metadata: {
-      SpokePoolAddress
+  try {
+    const allowance = await (0, _web.getERC20Allowance)(SpokePoolAddress, address, (0, _utils2._getContractAddressOfToken)(tokenInfo), evmApi);
+    if (!allowance || new _bignumber.default(allowance).lt(amount)) {
+      result.steps.push({
+        id: result.steps.length,
+        type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+        name: 'Approve spending',
+        metadata: {
+          SpokePoolAddress
+        }
+      });
+      result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
     }
-  });
-  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  } catch (e) {
+    console.error(e);
+    result.steps.push({
+      id: result.steps.length,
+      type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+      name: 'Approve spending',
+      metadata: {
+        SpokePoolAddress
+      }
+    });
+    result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  }
   result.steps.push({
     id: result.steps.length,
     type: _serviceBase.CommonStepType.TRANSFER,

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

@@ -627,10 +627,10 @@ class BalanceService {
       return (0, _process.getDefaultTransferProcess)();
     }
     const destChainInfo = this.state.chainService.getChainInfoByKey(params.destChain);
+    const evmApi = this.state.chainService.getEvmApi(originChainInfo.slug);
 
     // xcm
     if (!(0, _xcmParser._isXcmWithinSameConsensus)(originChainInfo, destChainInfo) && (0, _utils._isPureEvmChain)(originChainInfo)) {
-      const evmApi = this.state.chainService.getEvmApi(originChainInfo.slug);
       const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
       return (0, _process.getSnowbridgeTransferProcessFromEvm)(params.address, evmApi, tokenInfo, params.amount);
     }
@@ -658,7 +658,7 @@ class BalanceService {
         if (!data) {
           throw new Error('Failed to fetch Across Bridge Data. Please try again later');
         }
-        return (0, _process.getAcrossbridgeTransferProcessFromEvm)(data.to);
+        return (0, _process.getAcrossbridgeTransferProcessFromEvm)(data.to, params.address, originTokenInfo, evmApi, params.amount);
       }
     }
     return (0, _process.getDefaultTransferProcess)();

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/chain-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._GOVERNANCE_CHAIN_GROUP = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.USE_MULTILOCATION_INDEX = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._GOVERNANCE_CHAIN_GROUP = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.USE_MULTILOCATION_INDEX = exports.NFT_CHAIN_GROUPS_MIGRATED = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -80,9 +80,13 @@ const _NFT_CHAIN_GROUP = {
   rari: ['rari'],
   story_odyssey: ['storyOdyssey', 'storyOdyssey_testnet']
 };
+exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
+const NFT_CHAIN_GROUPS_MIGRATED = {
+  unique_network: ['unique_network']
+};
 
 // Staking--------------------------------------------------------------------------------------------------------------
-exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
+exports.NFT_CHAIN_GROUPS_MIGRATED = NFT_CHAIN_GROUPS_MIGRATED;
 const _STAKING_ERA_LENGTH_MAP = {
   // in hours
   alephTest: 24,

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;
       }