@subwallet/extension-base 1.0.12-0 → 1.0.13-1

package/koni/background/handlers/State.js

@@ -6,12 +6,12 @@ import { EvmProviderError } from '@subwallet/extension-base/background/errors/Ev
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
-import { _PREDEFINED_SINGLE_MODES } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getEvmChainId, _getSubstrateGenesisHash, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _isSubstrateParaChain, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
+import { _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _PREDEFINED_SINGLE_MODES } from '@subwallet/extension-base/services/chain-service/constants';
+import { _getEvmChainId, _getSubstrateGenesisHash, _getTokenOnChainAssetId, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _isSubstrateParaChain, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
@@ -24,7 +24,9 @@ import DatabaseService from '@subwallet/extension-base/services/storage-service/
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
 import { SUBSCAN_CHAIN_MAP_REVERSE } from '@subwallet/extension-base/services/subscan-service/subscan-chain-map';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
+import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
+import { stripUrl } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { decodePair } from '@subwallet/keyring/pair/decode';
@@ -35,6 +37,9 @@ import { assert, BN, hexStripPrefix, hexToU8a, isHex, logger as createLogger, u8
 import { base64Decode, isEthereumAddress, keyExtractSuri } from '@polkadot/util-crypto';
 import { KoniCron } from "../cron.js";
 import { KoniSubscription } from "../subscription.js";
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
+const passworder = require('browser-passworder');
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 
 // List of providers passed into constructor. This is the list of providers
@@ -65,6 +70,8 @@ export default class KoniState {
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new Subject();
   nftSubject = new Subject();
+  mantaPayConfigSubject = new Subject();
+  isMantaPayEnabled = false;
   stakingSubject = new Subject();
   chainStakingMetadataSubject = new Subject();
   stakingNominatorMetadataSubject = new Subject();
@@ -92,6 +99,7 @@ export default class KoniState {
     this.balanceService = new BalanceService(this.chainService);
     this.historyService = new HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService);
     this.transactionService = new TransactionService(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
+    this.walletConnectService = new WalletConnectService(this, this.requestService);
     this.migrationService = new MigrationService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
     this.cron = new KoniCron(this, this.subscription, this.dbService);
@@ -204,11 +212,25 @@ export default class KoniState {
     this.onAccountRemove();
     await this.startSubscription();
   }
+  async initMantaPay(password) {
+    const mantaPayConfig = await this.chainService.mantaPay.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN);
+    if (mantaPayConfig && mantaPayConfig.enabled && !this.isMantaPayEnabled) {
+      // only init the first login
+      console.debug('Initiating MantaPay for', mantaPayConfig.address);
+      await this.enableMantaPay(false, mantaPayConfig.address, password);
+      console.debug('Initiated MantaPay for', mantaPayConfig.address);
+      this.isMantaPayEnabled = true;
+      this.eventService.emit('mantaPay.enable', mantaPayConfig.address);
+    }
+  }
   async startSubscription() {
     await this.eventService.waitKeyringReady;
     this.dbService.subscribeChainStakingMetadata([], data => {
       this.chainStakingMetadataSubject.next(data);
     });
+    this.dbService.subscribeMantaPayConfig(_DEFAULT_MANTA_ZK_CHAIN, data => {
+      this.mantaPayConfigSubject.next(data);
+    });
     let unsub;
     this.keyringService.accountSubject.subscribe(accounts => {
       // TODO: improve this
@@ -281,6 +303,10 @@ export default class KoniState {
   async getNominatorMetadata() {
     return this.dbService.getNominatorMetadata();
   }
+  async getMantaPayConfig(chain) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return this.dbService.getMantaPayConfig(chain);
+  }
   async getStaking() {
     const addresses = this.getDecodedAddresses();
     const stakings = await this.dbService.getStakings(addresses, this.activeChainSlugs);
@@ -302,6 +328,9 @@ export default class KoniState {
   async getPooledStakingRecordsByAddress(addresses) {
     return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
+  subscribeMantaPayConfig() {
+    return this.mantaPayConfigSubject;
+  }
   subscribeStaking() {
     return this.stakingSubject;
   }
@@ -871,8 +900,13 @@ export default class KoniState {
     return result;
   };
   async disableChain(chainSlug) {
-    // const defaultChains = this.getDefaultNetworkKeys();
     await this.chainService.updateAssetSettingByChain(chainSlug, false);
+    if (_MANTA_ZK_CHAIN_GROUP.includes(chainSlug)) {
+      const mantaPayConfig = await this.chainService.mantaPay.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN);
+      if (mantaPayConfig && mantaPayConfig.enabled && this.isMantaPayEnabled) {
+        await this.disableMantaPay(mantaPayConfig.address);
+      }
+    }
     return this.chainService.disableChain(chainSlug);
   }
   async enableChain(chainSlug, enableTokens = true) {
@@ -1248,9 +1282,10 @@ export default class KoniState {
     const transactionData = {
       ...transaction
     };
+    const token = this.chainService.getNativeTokenInfo(networkKey);
     if (eType === ExtrinsicType.TRANSFER_BALANCE) {
       // @ts-ignore
-      transactionData.tokenSlug = this.chainService.getNativeTokenInfo(networkKey).slug;
+      transactionData.tokenSlug = token.slug;
     }
 
     // Custom handle this instead of general handler transaction
@@ -1261,7 +1296,13 @@ export default class KoniState {
       url,
       data: transactionData,
       extrinsicType: eType,
-      chainType: ChainType.EVM
+      chainType: ChainType.EVM,
+      estimateFee: {
+        value: estimateGas,
+        symbol: token.symbol,
+        decimals: token.decimals || 18
+      },
+      id
     });
 
     // Wait extrinsic hash
@@ -1292,48 +1333,51 @@ export default class KoniState {
     return await this.requestService.completeConfirmation(request);
   }
   onInstall() {
-    const singleModes = Object.values(_PREDEFINED_SINGLE_MODES);
-    try {
-      // Open expand page
-      const url = `${chrome.extension.getURL('index.html')}#/`;
-      withErrorLog(() => chrome.tabs.create({
-        url
-      }));
-    } catch (e) {
-      console.error(e);
-    }
-    const setUpSingleMode = ({
-      networkKeys,
-      theme
-    }) => {
-      networkKeys.forEach(key => {
-        this.enableChain(key).catch(console.error);
-      });
-      const chainInfo = this.chainService.getChainInfoByKey(networkKeys[0]);
-      const genesisHash = _getSubstrateGenesisHash(chainInfo);
-      this.setCurrentAccount({
-        address: ALL_ACCOUNT_KEY,
-        currentGenesisHash: genesisHash.length > 0 ? genesisHash : null
-      });
-      this.setTheme(theme);
-    };
-    chrome.tabs.query({}, function (tabs) {
-      const openingUrls = tabs.map(t => t.url);
-      const singleMode = singleModes.find(({
-        autoTriggerDomain
-      }) => {
-        const urlRegex = new RegExp(autoTriggerDomain);
-        return Boolean(openingUrls.find(url => {
-          return url && urlRegex.test(url);
-        }));
-      });
-      if (singleMode) {
-        // Wait for everything is ready before enable single mode
-        setTimeout(() => {
-          setUpSingleMode(singleMode);
-        }, 999);
-      }
-    });
+    // const singleModes = Object.values(_PREDEFINED_SINGLE_MODES);
+
+    // This logic is moved to installation.ts
+    // try {
+    //   // Open expand page
+    //   const url = `${chrome.extension.getURL('index.html')}#/`;
+    //
+    //   withErrorLog(() => chrome.tabs.create({ url }));
+    // } catch (e) {
+    //   console.error(e);
+    // }
+
+    // const setUpSingleMode = ({ networkKeys, theme }: SingleModeJson) => {
+    //   networkKeys.forEach((key) => {
+    //     this.enableChain(key).catch(console.error);
+    //   });
+    //
+    //   const chainInfo = this.chainService.getChainInfoByKey(networkKeys[0]);
+    //   const genesisHash = _getSubstrateGenesisHash(chainInfo);
+    //
+    //   this.setCurrentAccount({
+    //     address: ALL_ACCOUNT_KEY,
+    //     currentGenesisHash: genesisHash.length > 0 ? genesisHash : null
+    //   });
+    //   this.setTheme(theme);
+    // };
+    //
+    // chrome.tabs.query({}, function (tabs) {
+    //   const openingUrls = tabs.map((t) => t.url);
+    //
+    //   const singleMode = singleModes.find(({ autoTriggerDomain }) => {
+    //     const urlRegex = new RegExp(autoTriggerDomain);
+    //
+    //     return Boolean(openingUrls.find((url) => {
+    //       return url && urlRegex.test(url);
+    //     }));
+    //   });
+    //
+    //   if (singleMode) {
+    //     // Wait for everything is ready before enable single mode
+    //     setTimeout(() => {
+    //       setUpSingleMode(singleMode);
+    //     }, 999);
+    //   }
+    // });
   }
   get activeNetworks() {
     return this.chainService.getActiveChainInfos();
@@ -1420,9 +1464,6 @@ export default class KoniState {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.unsubscriptionMap[id] = unsubscribe;
   }
-  updateChainConnectionStatus(chain, status) {
-    this.chainService.setChainConnectionStatus(chain, status);
-  }
   async autoEnableChains(addresses) {
     const assetMap = this.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
@@ -1505,7 +1546,7 @@ export default class KoniState {
         const result = {
           ...value
         };
-        const url = this.requestService.stripUrl(_url);
+        const url = stripUrl(_url);
         result[url] = {
           pass: true
         };
@@ -1525,6 +1566,151 @@ export default class KoniState {
       this.settingService.resetWallet();
     }
     this.chainService.resetWallet(resetAll);
+    await this.walletConnectService.resetWallet(resetAll);
     await this.chainService.init();
   }
+  async enableMantaPay(updateStore, address, password, seedPhrase) {
+    var _this$chainService$ma, _this$chainService$ma6;
+    if (!address || isEthereumAddress(address)) {
+      return;
+    }
+    this.chainService.mantaPay.setCurrentAddress(address);
+    await ((_this$chainService$ma = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma === void 0 ? void 0 : _this$chainService$ma.initialSigner());
+    if (updateStore && seedPhrase) {
+      var _this$chainService$ma2, _this$chainService$ma3, _this$chainService$ma4;
+      // first time initiation
+      await ((_this$chainService$ma2 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma2 === void 0 ? void 0 : _this$chainService$ma2.loadUserSeedPhrase(seedPhrase));
+      const authContext = await ((_this$chainService$ma3 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma3 === void 0 ? void 0 : _this$chainService$ma3.getAuthorizationContext());
+      await ((_this$chainService$ma4 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma4 === void 0 ? void 0 : _this$chainService$ma4.loadAuthorizationContext(authContext));
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      const encryptedData = await passworder.encrypt(password, authContext);
+      await this.chainService.mantaPay.saveMantaAuthContext({
+        chain: _DEFAULT_MANTA_ZK_CHAIN,
+        address,
+        data: encryptedData
+      });
+    } else {
+      var _this$chainService$ma5;
+      const authContext = await this.chainService.mantaPay.getMantaAuthContext(address, _DEFAULT_MANTA_ZK_CHAIN);
+
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+      const decryptedData = await passworder.decrypt(password, authContext.data);
+
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
+      const proofAuthKey = new Uint8Array(Object.values(decryptedData.proof_authorization_key));
+      await ((_this$chainService$ma5 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma5 === void 0 ? void 0 : _this$chainService$ma5.loadAuthorizationContext({
+        proof_authorization_key: proofAuthKey
+      }));
+    }
+    const zkAddress = await ((_this$chainService$ma6 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma6 === void 0 ? void 0 : _this$chainService$ma6.getZkAddress());
+    if (updateStore) {
+      var _this$chainService$ma7, _this$chainService$ma8;
+      await this.chainService.mantaPay.saveMantaPayConfig({
+        address,
+        zkAddress: zkAddress,
+        enabled: true,
+        chain: (_this$chainService$ma7 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma7 === void 0 ? void 0 : (_this$chainService$ma8 = _this$chainService$ma7.network) === null || _this$chainService$ma8 === void 0 ? void 0 : _this$chainService$ma8.toLowerCase(),
+        isInitialSync: false
+      });
+    }
+    this.isMantaPayEnabled = true;
+    return zkAddress;
+  }
+  async disableMantaPay(address) {
+    var _this$chainService$ma9, _this$chainService$ma10;
+    const config = await this.chainService.mantaPay.getMantaPayConfig(address, _DEFAULT_MANTA_ZK_CHAIN);
+    if (!config) {
+      return false;
+    }
+    await ((_this$chainService$ma9 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma9 === void 0 ? void 0 : _this$chainService$ma9.dropAuthorizationContext());
+    await ((_this$chainService$ma10 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma10 === void 0 ? void 0 : _this$chainService$ma10.dropUserSeedPhrase());
+    // await this.chainService.mantaPay.privateWallet?.resetState();
+    await this.chainService.mantaPay.deleteMantaPayConfig(address, _DEFAULT_MANTA_ZK_CHAIN);
+    await this.chainService.mantaPay.deleteMantaAuthContext(address, _DEFAULT_MANTA_ZK_CHAIN);
+    this.chainService.setMantaZkAssetSettings(false);
+    this.isMantaPayEnabled = false;
+    return true;
+  }
+  async initialSyncMantaPay(address) {
+    var _this$chainService$ma11, _this$chainService$ma12, _this$chainService$ma13;
+    if (!address || isEthereumAddress(address)) {
+      return;
+    }
+    this.chainService.mantaPay.setCurrentAddress(address);
+    await ((_this$chainService$ma11 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma11 === void 0 ? void 0 : (_this$chainService$ma12 = _this$chainService$ma11.baseWallet) === null || _this$chainService$ma12 === void 0 ? void 0 : _this$chainService$ma12.isApiReady());
+    const syncResult = await ((_this$chainService$ma13 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma13 === void 0 ? void 0 : _this$chainService$ma13.initialWalletSync());
+    await this.chainService.mantaPay.updateMantaPayConfig(address, _DEFAULT_MANTA_ZK_CHAIN, {
+      isInitialSync: true
+    });
+    this.eventService.emit('mantaPay.initSync', undefined);
+    return syncResult;
+  }
+  getMantaZkBalance() {
+    var _this$chainService, _this$chainService$ma14, _this$chainService$ma15, _this$chainService2, _this$chainService2$m, _this$chainService$ma16;
+    if (!this.chainService || !this.chainService.mantaPay) {
+      return;
+    }
+    if (!((_this$chainService = this.chainService) !== null && _this$chainService !== void 0 && (_this$chainService$ma14 = _this$chainService.mantaPay) !== null && _this$chainService$ma14 !== void 0 && (_this$chainService$ma15 = _this$chainService$ma14.privateWallet) !== null && _this$chainService$ma15 !== void 0 && _this$chainService$ma15.initialSyncIsFinished)) {
+      return;
+    }
+    const chain = (_this$chainService2 = this.chainService) === null || _this$chainService2 === void 0 ? void 0 : (_this$chainService2$m = _this$chainService2.mantaPay.privateWallet) === null || _this$chainService2$m === void 0 ? void 0 : _this$chainService2$m.network;
+    if (!chain) {
+      return;
+    }
+    const assetMap = this.chainService.getMantaZkAssets(chain === null || chain === void 0 ? void 0 : chain.toLowerCase());
+    (_this$chainService$ma16 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma16 === void 0 ? void 0 : _this$chainService$ma16.getMultiZkBalance(Object.values(assetMap).map(tokenInfo => new BN(_getTokenOnChainAssetId(tokenInfo)))).then(zkBalances => {
+      const assetList = Object.values(assetMap);
+      for (let i = 0; i < assetList.length; i++) {
+        var _zkBalances$i;
+        const balanceItem = {
+          tokenSlug: assetList[i].slug,
+          state: APIItemState.PENDING,
+          free: '0',
+          locked: '0'
+        };
+        balanceItem.free = ((_zkBalances$i = zkBalances[i]) === null || _zkBalances$i === void 0 ? void 0 : _zkBalances$i.toString()) || '0';
+        balanceItem.state = APIItemState.READY;
+        this.setBalanceItem(balanceItem.tokenSlug, balanceItem);
+      }
+    }).catch(console.warn);
+  }
+  subscribeMantaPayBalance() {
+    let interval;
+    this.chainService.mantaPay.getMantaPayConfig(this.keyringService.currentAccount.address, _DEFAULT_MANTA_ZK_CHAIN).then(config => {
+      if (config && config.enabled && config.isInitialSync) {
+        this.getMantaZkBalance();
+        interval = setInterval(this.getMantaZkBalance, MANTA_PAY_BALANCE_INTERVAL);
+      }
+    }).catch(console.warn);
+    return () => {
+      interval && clearInterval(interval);
+    };
+  }
+  async syncMantaPay() {
+    var _this$chainService3, _this$chainService3$m, _this$chainService3$m2;
+    const config = await this.chainService.mantaPay.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN);
+    if (!config.isInitialSync) {
+      return;
+    }
+    if ((_this$chainService3 = this.chainService) !== null && _this$chainService3 !== void 0 && (_this$chainService3$m = _this$chainService3.mantaPay) !== null && _this$chainService3$m !== void 0 && (_this$chainService3$m2 = _this$chainService3$m.privateWallet) !== null && _this$chainService3$m2 !== void 0 && _this$chainService3$m2.initialSyncIsFinished) {
+      var _this$chainService4, _this$chainService4$m, _this$chainService4$m2;
+      await ((_this$chainService4 = this.chainService) === null || _this$chainService4 === void 0 ? void 0 : (_this$chainService4$m = _this$chainService4.mantaPay) === null || _this$chainService4$m === void 0 ? void 0 : (_this$chainService4$m2 = _this$chainService4$m.privateWallet) === null || _this$chainService4$m2 === void 0 ? void 0 : _this$chainService4$m2.walletSync());
+    } else {
+      var _this$chainService5, _this$chainService5$m, _this$chainService5$m2;
+      await ((_this$chainService5 = this.chainService) === null || _this$chainService5 === void 0 ? void 0 : (_this$chainService5$m = _this$chainService5.mantaPay) === null || _this$chainService5$m === void 0 ? void 0 : (_this$chainService5$m2 = _this$chainService5$m.privateWallet) === null || _this$chainService5$m2 === void 0 ? void 0 : _this$chainService5$m2.initialWalletSync());
+    }
+  }
+  async getMantaPayZkBalance(address, tokenInfo) {
+    var _this$chainService$ma17;
+    const bnAssetId = new BN(_getTokenOnChainAssetId(tokenInfo));
+    const balance = await ((_this$chainService$ma17 = this.chainService.mantaPay.privateWallet) === null || _this$chainService$ma17 === void 0 ? void 0 : _this$chainService$ma17.getZkBalance(bnAssetId));
+    return {
+      decimals: tokenInfo.decimals || 0,
+      symbol: tokenInfo.symbol,
+      value: (balance === null || balance === void 0 ? void 0 : balance.toString()) || '0'
+    };
+  }
+  subscribeMantaPaySyncState() {
+    return this.chainService.mantaPay.subscribeSyncState();
+  }
 }

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

@@ -1,5 +1,6 @@
 /// <reference types="chrome" />
 import { AuthUrlInfo } from '@subwallet/extension-base/background/handlers/State';
+import { RequestAddPspToken } from '@subwallet/extension-base/background/KoniTypes';
 import { MessageTypes, RequestTypes, ResponseTypes } from '@subwallet/extension-base/background/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { RequestArguments } from 'web3-core';
@@ -46,5 +47,6 @@ export default class KoniTabs {
     private handleEvmRequest;
     private handleEvmSend;
     isEvmPublicRequest(type: string, request: RequestArguments): boolean;
+    addPspToken(id: string, url: string, { genesisHash, tokenInfo: input }: RequestAddPspToken): Promise<true>;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], url: string, port: chrome.runtime.Port): Promise<ResponseTypes[keyof ResponseTypes]>;
 }

package/koni/background/handlers/Tabs.js

@@ -13,16 +13,11 @@ import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
-import { canDerive } from '@subwallet/extension-base/utils';
+import { canDerive, stripUrl } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { assert, isNumber } from '@polkadot/util';
-function stripUrl(url) {
-  assert(url && (url.startsWith('http:') || url.startsWith('https:') || url.startsWith('ipfs:') || url.startsWith('ipns:')), `Invalid url ${url}, expected to start with http: or https: or ipfs: or ipns:`);
-  const parts = url.split('/');
-  return parts[2];
-}
 function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthType) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   let authTypeFilter = ({
@@ -401,7 +396,7 @@ export default class KoniTabs {
         tokenInfo.contractError = true;
       } else {
         tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
-        tokenInfo.name = validate.name;
+        tokenInfo.name = validate.name || tokenInfo.name;
         tokenInfo.symbol = validate.symbol;
         tokenInfo.decimals = validate.decimals;
       }
@@ -825,6 +820,60 @@ export default class KoniTabs {
       return false;
     }
   }
+  async addPspToken(id, url, {
+    genesisHash,
+    tokenInfo: input
+  }) {
+    const _tokenType = input.type;
+    if (_tokenType !== 'psp22' && _tokenType !== 'psp34') {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, `Assets type ${_tokenType} is not supported`);
+    }
+    if (!input.address || !input.symbol) {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Assets params require address and symbol');
+    }
+    const [chain] = this.#koniState.findNetworkKeyByGenesisHash(genesisHash);
+    if (!chain) {
+      throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current chain is not available');
+    }
+    const state = this.#koniState.getChainStateByKey(chain);
+    if (!state.active) {
+      await this.#koniState.enableChain(chain, false);
+      const api = this.#koniState.getSubstrateApi(chain);
+      await api.isReady;
+    }
+    const tokenType = _tokenType === 'psp22' ? _AssetType.PSP22 : _AssetType.PSP34;
+    const tokenInfo = {
+      slug: '',
+      type: tokenType,
+      name: input.symbol || '',
+      contractAddress: input.address,
+      symbol: input.symbol || '',
+      decimals: input.decimals || 0,
+      originChain: chain,
+      contractError: false,
+      validated: false
+    };
+    this.#koniState.validateCustomAsset({
+      type: tokenType,
+      contractAddress: input.address,
+      originChain: chain
+    }).then(validate => {
+      if (validate.contractError) {
+        tokenInfo.contractError = true;
+      } else {
+        tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
+        tokenInfo.name = validate.name || tokenInfo.name;
+        tokenInfo.symbol = validate.symbol;
+        tokenInfo.decimals = validate.decimals;
+      }
+    }).catch(() => {
+      tokenInfo.contractError = true;
+    }).finally(() => {
+      tokenInfo.validated = true;
+      this.#koniState.requestService.updateConfirmation(id, 'addTokenRequest', tokenInfo);
+    });
+    return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
+  }
   async handle(id, type, request, url, port) {
     if (type === 'pub(phishing.redirectIfDenied)') {
       return this.redirectIfPhishing(url);
@@ -860,6 +909,8 @@ export default class KoniTabs {
         return this.rpcSubscribeConnected(request, id, port);
       case 'pub(rpc.unsubscribe)':
         return this.rpcUnsubscribe(request, port);
+      case 'pub(token.add)':
+        return this.addPspToken(id, url, request);
 
       ///
       case 'pub(authorize.tabV2)':

package/koni/background/subscription.js

@@ -151,12 +151,15 @@ export class KoniSubscription {
     const unsub = subscribeBalance(addresses, filteredChainInfoMap, substrateApiMap, evmApiMap, result => {
       this.state.setBalanceItem(result.tokenSlug, result);
     });
+    const unsub2 = this.state.subscribeMantaPayBalance();
     if (onlyRunOnFirstTime) {
       unsub && unsub();
+      unsub2 && unsub2();
       return;
     }
     return () => {
       unsub && unsub();
+      unsub2 && unsub2();
     };
   }
   initCrowdloanSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {