@subwallet/extension-base 1.0.13-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';
@@ -37,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
@@ -67,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();
@@ -207,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
@@ -284,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);
@@ -305,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;
   }
@@ -874,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) {
@@ -1302,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();
@@ -1430,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 => {
@@ -1538,4 +1569,148 @@ export default class KoniState {
     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/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) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.13-0",
+  "version": "1.0.13-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -530,6 +530,11 @@
       "require": "./cjs/services/chain-service/handler/light-client/index.js",
       "default": "./services/chain-service/handler/light-client/index.js"
     },
+    "./services/chain-service/handler/manta/MantaPrivateHandler": {
+      "types": "./services/chain-service/handler/manta/MantaPrivateHandler.d.ts",
+      "require": "./cjs/services/chain-service/handler/manta/MantaPrivateHandler.js",
+      "default": "./services/chain-service/handler/manta/MantaPrivateHandler.js"
+    },
     "./services/chain-service/handler/SubstrateApi": {
       "types": "./services/chain-service/handler/SubstrateApi.d.ts",
       "require": "./cjs/services/chain-service/handler/SubstrateApi.js",
@@ -820,6 +825,11 @@
       "require": "./cjs/services/storage-service/db-stores/Crowdloan.js",
       "default": "./services/storage-service/db-stores/Crowdloan.js"
     },
+    "./services/storage-service/db-stores/MantaPay": {
+      "types": "./services/storage-service/db-stores/MantaPay.d.ts",
+      "require": "./cjs/services/storage-service/db-stores/MantaPay.js",
+      "default": "./services/storage-service/db-stores/MantaPay.js"
+    },
     "./services/storage-service/db-stores/Metadata": {
       "types": "./services/storage-service/db-stores/Metadata.d.ts",
       "require": "./cjs/services/storage-service/db-stores/Metadata.js",
@@ -1100,6 +1110,11 @@
       "require": "./cjs/utils/keyring.js",
       "default": "./utils/keyring.js"
     },
+    "./utils/lazy": {
+      "types": "./utils/lazy.d.ts",
+      "require": "./cjs/utils/lazy.js",
+      "default": "./utils/lazy.js"
+    },
     "./utils/number": {
       "types": "./utils/number.d.ts",
       "require": "./cjs/utils/number.js",
@@ -1144,10 +1159,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "^0.2.4",
-    "@subwallet/extension-base": "^1.0.13-0",
-    "@subwallet/extension-chains": "^1.0.13-0",
-    "@subwallet/extension-dapp": "^1.0.13-0",
-    "@subwallet/extension-inject": "^1.0.13-0",
+    "@subwallet/extension-base": "^1.0.13-1",
+    "@subwallet/extension-chains": "^1.0.13-1",
+    "@subwallet/extension-dapp": "^1.0.13-1",
+    "@subwallet/extension-inject": "^1.0.13-1",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1156,6 +1171,7 @@
     "axios": "^1.2.1",
     "bignumber.js": "^9.1.1",
     "bn.js": "^5.2.1",
+    "browser-passworder": "^2.0.3",
     "buffer": "^6.0.3",
     "cross-fetch": "^3.1.5",
     "dexie": "^3.2.2",
@@ -1168,6 +1184,7 @@
     "i18next": "^21.9.2",
     "is-buffer": "^2.0.5",
     "json-rpc-engine": "^6.1.0",
+    "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",
     "protobufjs": "^7.1.2",
     "rxjs": "^7.8.1",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.0.13-0'
+  version: '1.0.13-1'
 };

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

@@ -70,6 +70,9 @@ export declare const _TRANSFER_CHAIN_GROUP: {
 export declare const _BALANCE_PARSING_CHAIN_GROUP: {
     bobabeam: string[];
 };
+export declare const _MANTA_ZK_CHAIN_GROUP: string[];
+export declare const _ZK_ASSET_PREFIX = "zk";
+export declare const _DEFAULT_MANTA_ZK_CHAIN = "calamari";
 export declare const _XCM_CHAIN_GROUP: {
     polkadotXcm: string[];
     xcmPallet: string[];

package/services/chain-service/constants.js

@@ -27,7 +27,7 @@ export const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2', 'parallel', 'calamari'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'] // perhaps there are some runtime updates
 };
 
@@ -189,6 +189,9 @@ export const _TRANSFER_CHAIN_GROUP = {
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']
 };
+export const _MANTA_ZK_CHAIN_GROUP = ['calamari'];
+export const _ZK_ASSET_PREFIX = 'zk';
+export const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 
 // XCM------------------------------------------------------------------------------------------------------------------
 
@@ -209,7 +212,7 @@ export const _XCM_TYPE = {
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
 
 // TODO: review
-const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni/dev/issue-15' : 'master';
 export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
 export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;

package/services/chain-service/handler/SubstrateApi.d.ts

@@ -33,7 +33,7 @@ export declare class SubstrateApi implements _SubstrateApi {
     systemVersion: string;
     private createProvider;
     private createApi;
-    constructor(chainSlug: string, apiUrl: string, { metadata, providerName }?: _ApiOptions);
+    constructor(chainSlug: string, apiUrl: string, { externalApiPromise, metadata, providerName }?: _ApiOptions);
     get isReady(): Promise<_SubstrateApi>;
     updateApiUrl(apiUrl: string): Promise<void>;
     connect(): void;

package/services/chain-service/handler/SubstrateApi.js

@@ -68,6 +68,7 @@ export class SubstrateApi {
     }
   }
   constructor(chainSlug, apiUrl, {
+    externalApiPromise,
     metadata,
     providerName
   } = {}) {
@@ -77,7 +78,7 @@ export class SubstrateApi {
     this.registry = new TypeRegistry();
     this.metadata = metadata;
     this.provider = this.createProvider(apiUrl);
-    this.api = this.createApi(this.provider);
+    this.api = externalApiPromise || this.createApi(this.provider);
     this.handleApiReady = createPromiseHandler();
     this.api.on('ready', this.onReady.bind(this));
     this.api.on('connected', this.onConnect.bind(this));

package/services/chain-service/handler/SubstrateChainHandler.d.ts

@@ -19,5 +19,5 @@ export declare class SubstrateChainHandler extends AbstractChainHandler {
     getSmartContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string, contractCaller?: string): Promise<_SmartContractTokenInfo>;
     setSubstrateApi(chainSlug: string, substrateApi: SubstrateApi): void;
     destroySubstrateApi(chainSlug: string): void;
-    initApi(chainSlug: string, apiUrl: string, { onUpdateStatus, providerName }?: Omit<_ApiOptions, 'metadata'>): Promise<_SubstrateApi>;
+    initApi(chainSlug: string, apiUrl: string, { externalApiPromise, onUpdateStatus, providerName }?: Omit<_ApiOptions, 'metadata'>): Promise<SubstrateApi>;
 }

package/services/chain-service/handler/SubstrateChainHandler.js

@@ -173,6 +173,7 @@ export class SubstrateChainHandler extends AbstractChainHandler {
     substrateAPI === null || substrateAPI === void 0 ? void 0 : substrateAPI.destroy().catch(console.error);
   }
   async initApi(chainSlug, apiUrl, {
+    externalApiPromise,
     onUpdateStatus,
     providerName
   } = {}) {
@@ -190,7 +191,8 @@ export class SubstrateChainHandler extends AbstractChainHandler {
     const metadata = await ((_this$parent2 = this.parent) === null || _this$parent2 === void 0 ? void 0 : _this$parent2.getMetadata(chainSlug));
     const apiObject = new SubstrateApi(chainSlug, apiUrl, {
       providerName,
-      metadata
+      metadata,
+      externalApiPromise
     });
     apiObject.isApiConnectedSubject.subscribe(this.handleConnect.bind(this, chainSlug));
     onUpdateStatus && apiObject.isApiConnectedSubject.subscribe(onUpdateStatus);

package/services/chain-service/handler/manta/MantaPrivateHandler.d.ts

@@ -0,0 +1,30 @@
+import { MantaAuthorizationContext, MantaPayConfig, MantaPaySyncState } from '@subwallet/extension-base/background/KoniTypes';
+import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
+import { MantaPayWallet } from 'manta-extension-sdk';
+import { Subject } from 'rxjs';
+export declare class MantaPrivateHandler {
+    private dbService;
+    private _privateWallet;
+    private currentAddress;
+    private syncStateSubject;
+    private syncState;
+    constructor(dbService: DatabaseService);
+    setCurrentAddress(address: string): void;
+    getSyncState(): MantaPaySyncState;
+    get privateWallet(): MantaPayWallet | undefined;
+    subscribeSyncState(): Subject<MantaPaySyncState>;
+    updateMantaPayConfig(address: string, chain: string, changes: Record<string, any>): Promise<void>;
+    saveMantaPayConfig(config: MantaPayConfig): Promise<void>;
+    getMantaPayConfig(address: string, chain: string): Promise<any>;
+    getMantaPayFirstConfig(chain: string): Promise<any>;
+    deleteMantaPayConfig(address: string, chain: string): Promise<any>;
+    saveMantaAuthContext(context: MantaAuthorizationContext): Promise<void>;
+    getMantaAuthContext(address: string, chain: string): Promise<any>;
+    deleteMantaAuthContext(address: string, chain: string): Promise<number>;
+    private saveLedgerState;
+    private getLedgerState;
+    initMantaPay(providerUrl: string, network: string): Promise<import("@polkadot/api").ApiPromise>;
+    getCurrentLedgerState(): Promise<number>;
+    setSyncState(data: MantaPaySyncState): void;
+    subscribeSyncProgress(): Promise<() => void>;
+}