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

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.79-1",
+  "version": "1.3.80-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1751,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",
@@ -3022,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.79-1",
-    "@subwallet/extension-chains": "^1.3.79-1",
-    "@subwallet/extension-dapp": "^1.3.79-1",
-    "@subwallet/extension-inject": "^1.3.79-1",
+    "@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.79-1'
+  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,

package/services/balance-service/index.js

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

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

@@ -52,6 +52,9 @@ export declare const _NFT_CHAIN_GROUP: {
     rari: string[];
     story_odyssey: string[];
 };
+export declare const NFT_CHAIN_GROUPS_MIGRATED: {
+    unique_network: string[];
+};
 export declare const _STAKING_ERA_LENGTH_MAP: Record<string, number>;
 export declare const _EXPECTED_BLOCK_TIME: Record<string, number>;
 export declare const _PARACHAIN_INFLATION_DISTRIBUTION: Record<string, Record<string, number>>;

package/services/chain-service/constants.js

@@ -67,6 +67,9 @@ export const _NFT_CHAIN_GROUP = {
   rari: ['rari'],
   story_odyssey: ['storyOdyssey', 'storyOdyssey_testnet']
 };
+export const NFT_CHAIN_GROUPS_MIGRATED = {
+  unique_network: ['unique_network']
+};
 
 // Staking--------------------------------------------------------------------------------------------------------------
 

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

@@ -10,7 +10,7 @@ import { estimateXcmFee } from '@subwallet/extension-base/services/balance-servi
 import { _getAssetDecimals, _getAssetExistentialDeposit, _getAssetSymbol, _getChainName, _getChainNativeTokenSlug } from '@subwallet/extension-base/services/chain-service/utils';
 import { MIN_XCM_LIQUID_STAKING_DOT } from '@subwallet/extension-base/services/earning-service/constants';
 import { BasicTxErrorType, YieldStepType, YieldValidationStatus } from '@subwallet/extension-base/types';
-import { createPromiseHandler, formatNumber } from '@subwallet/extension-base/utils';
+import { _reformatAddressWithChain, createPromiseHandler, formatNumber } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import BigN from 'bignumber.js';
 import { t } from 'i18next';
@@ -466,6 +466,7 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
     const originChainInfo = this.state.getChainInfo(originTokenInfo.originChain);
     const originTokenSlug = _getChainNativeTokenSlug(originChainInfo);
     const substrateApi = this.state.getSubstrateApi(originChainInfo.slug);
+    const fromAddress = _reformatAddressWithChain(address, originChainInfo);
     const id = getId();
     const feeInfo = await this.state.feeService.subscribeChainFee(id, originChainInfo.slug, 'substrate');
     const xcmRequest = {
@@ -474,7 +475,7 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
       recipient: address,
       sendingValue,
       substrateApi,
-      sender: address,
+      sender: fromAddress,
       originChain: originChainInfo,
       destinationChain: this.chainInfo,
       feeInfo
@@ -486,7 +487,7 @@ export default class BaseSpecialStakingPoolHandler extends BasePoolHandler {
     const xcmData = {
       originNetworkKey: originChainInfo.slug,
       destinationNetworkKey: destinationTokenInfo.originChain,
-      from: address,
+      from: fromAddress,
       to: address,
       value: sendingValue,
       tokenSlug: originTokenSlug,

package/services/nft-service/index.d.ts

@@ -1,9 +1,45 @@
-import { NftFullListRequest } from '@subwallet/extension-base/background/KoniTypes';
+import { NftCollection, NftDetailRequest, NftFullListRequest, NftItem, NftJson } from '@subwallet/extension-base/background/KoniTypes';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
-export default class NftService {
-    private inProgress;
-    private state;
+import { ServiceStatus, StoppableServiceInterface } from '@subwallet/extension-base/services/base/types';
+import { PromiseHandler } from '@subwallet/extension-base/utils';
+export interface NftState {
+    nftData: NftJson;
+    nftCollections: NftCollection[];
+}
+export declare class NftService implements StoppableServiceInterface {
+    private readonly state;
+    private readonly multiChainFetcher;
+    private _intervalFetchNft;
+    private readonly NFT_INTERVAL_TIME;
+    private readonly nftStateSubject;
+    readonly nftState$: import("rxjs").Observable<NftState>;
+    private isReloading;
+    startPromiseHandler: PromiseHandler<void>;
+    stopPromiseHandler: PromiseHandler<void>;
+    status: ServiceStatus;
+    get isStarted(): boolean;
     constructor(state: KoniState);
-    fetchEvmCollectionsWithPreview(addresses: string[]): Promise<void>;
-    getFullNftInstancesByCollection(request: NftFullListRequest): Promise<boolean>;
+    init(): Promise<void>;
+    private loadCachedData;
+    start(): Promise<void>;
+    stop(): Promise<void>;
+    waitForStarted(): Promise<void>;
+    waitForStopped(): Promise<void>;
+    private checkIfNftUpdateNeeded;
+    private extractUpdatedChains;
+    private hasNftSupportedChainUpdate;
+    private isChainNftSupported;
+    private handleImmediateRefresh;
+    private scheduleLazyRefresh;
+    private handleEvents;
+    fetchFullListNftOfACollection(request: NftFullListRequest): Promise<boolean>;
+    fetchNftDetail(request: NftDetailRequest): Promise<NftItem | null>;
+    private startScanNft;
+    private stopScanNft;
+    private persistNftData;
+    private refreshNftData;
+    /** Subscribe NFT state */
+    subscribeNftItem(): import("rxjs").Observable<NftState>;
+    subscribeNftCollection(): import("dexie").Observable<NftCollection[]>;
+    forceReload(): Promise<void>;
 }