@subwallet/extension-base 1.1.2-1 → 1.1.3-0

package/koni/background/handlers/State.js

@@ -213,7 +213,8 @@ export default class KoniState {
     await this.startSubscription();
   }
   async initMantaPay(password) {
-    const mantaPayConfig = await this.chainService.mantaPay.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN);
+    var _this$chainService, _this$chainService$ma;
+    const mantaPayConfig = await ((_this$chainService = this.chainService) === null || _this$chainService === void 0 ? void 0 : (_this$chainService$ma = _this$chainService.mantaPay) === null || _this$chainService$ma === void 0 ? void 0 : _this$chainService$ma.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN));
     if (mantaPayConfig && mantaPayConfig.enabled && !this.isMantaPayEnabled) {
       // only init the first login
       console.debug('Initiating MantaPay for', mantaPayConfig.address);
@@ -614,6 +615,15 @@ export default class KoniState {
       this.settingService.setSettings(newSettings);
     });
   }
+  setShowBalance(value) {
+    this.settingService.getSettings(settings => {
+      const newSettings = {
+        ...settings,
+        isShowBalance: value
+      };
+      this.settingService.setSettings(newSettings);
+    });
+  }
   subscribeSettingsSubject() {
     return this.settingService.getSubject();
   }
@@ -862,7 +872,8 @@ export default class KoniState {
   async disableChain(chainSlug) {
     await this.chainService.updateAssetSettingByChain(chainSlug, false);
     if (_MANTA_ZK_CHAIN_GROUP.includes(chainSlug)) {
-      const mantaPayConfig = await this.chainService.mantaPay.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN);
+      var _this$chainService2, _this$chainService2$m;
+      const mantaPayConfig = await ((_this$chainService2 = this.chainService) === null || _this$chainService2 === void 0 ? void 0 : (_this$chainService2$m = _this$chainService2.mantaPay) === null || _this$chainService2$m === void 0 ? void 0 : _this$chainService2$m.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN));
       if (mantaPayConfig && mantaPayConfig.enabled && this.isMantaPayEnabled) {
         await this.disableMantaPay(mantaPayConfig.address);
       }
@@ -1533,95 +1544,95 @@ export default class KoniState {
     await this.chainService.init();
   }
   async enableMantaPay(updateStore, address, password, seedPhrase) {
-    var _this$chainService$ma, _this$chainService$ma6;
+    var _this$chainService3, _this$chainService3$m, _this$chainService4, _this$chainService4$m, _this$chainService4$m2, _this$chainService11, _this$chainService11$, _this$chainService11$2;
     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());
+    (_this$chainService3 = this.chainService) === null || _this$chainService3 === void 0 ? void 0 : (_this$chainService3$m = _this$chainService3.mantaPay) === null || _this$chainService3$m === void 0 ? void 0 : _this$chainService3$m.setCurrentAddress(address);
+    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.initialSigner());
     if (updateStore && seedPhrase) {
-      var _this$chainService$ma2, _this$chainService$ma3, _this$chainService$ma4;
+      var _this$chainService5, _this$chainService5$m, _this$chainService5$m2, _this$chainService6, _this$chainService6$m, _this$chainService6$m2, _this$chainService7, _this$chainService7$m, _this$chainService7$m2, _this$chainService8, _this$chainService8$m;
       // 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));
+      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.loadUserSeedPhrase(seedPhrase));
+      const authContext = await ((_this$chainService6 = this.chainService) === null || _this$chainService6 === void 0 ? void 0 : (_this$chainService6$m = _this$chainService6.mantaPay) === null || _this$chainService6$m === void 0 ? void 0 : (_this$chainService6$m2 = _this$chainService6$m.privateWallet) === null || _this$chainService6$m2 === void 0 ? void 0 : _this$chainService6$m2.getAuthorizationContext());
+      await ((_this$chainService7 = this.chainService) === null || _this$chainService7 === void 0 ? void 0 : (_this$chainService7$m = _this$chainService7.mantaPay) === null || _this$chainService7$m === void 0 ? void 0 : (_this$chainService7$m2 = _this$chainService7$m.privateWallet) === null || _this$chainService7$m2 === void 0 ? void 0 : _this$chainService7$m2.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({
+      await ((_this$chainService8 = this.chainService) === null || _this$chainService8 === void 0 ? void 0 : (_this$chainService8$m = _this$chainService8.mantaPay) === null || _this$chainService8$m === void 0 ? void 0 : _this$chainService8$m.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);
+      var _this$chainService9, _this$chainService9$m, _this$chainService10, _this$chainService10$, _this$chainService10$2;
+      const authContext = await ((_this$chainService9 = this.chainService) === null || _this$chainService9 === void 0 ? void 0 : (_this$chainService9$m = _this$chainService9.mantaPay) === null || _this$chainService9$m === void 0 ? void 0 : _this$chainService9$m.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({
+      await ((_this$chainService10 = this.chainService) === null || _this$chainService10 === void 0 ? void 0 : (_this$chainService10$ = _this$chainService10.mantaPay) === null || _this$chainService10$ === void 0 ? void 0 : (_this$chainService10$2 = _this$chainService10$.privateWallet) === null || _this$chainService10$2 === void 0 ? void 0 : _this$chainService10$2.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());
+    const zkAddress = await ((_this$chainService11 = this.chainService) === null || _this$chainService11 === void 0 ? void 0 : (_this$chainService11$ = _this$chainService11.mantaPay) === null || _this$chainService11$ === void 0 ? void 0 : (_this$chainService11$2 = _this$chainService11$.privateWallet) === null || _this$chainService11$2 === void 0 ? void 0 : _this$chainService11$2.getZkAddress());
     if (updateStore) {
-      var _this$chainService$ma7, _this$chainService$ma8;
-      await this.chainService.mantaPay.saveMantaPayConfig({
+      var _this$chainService12, _this$chainService12$, _this$chainService13, _this$chainService13$, _this$chainService13$2, _this$chainService13$3;
+      await ((_this$chainService12 = this.chainService) === null || _this$chainService12 === void 0 ? void 0 : (_this$chainService12$ = _this$chainService12.mantaPay) === null || _this$chainService12$ === void 0 ? void 0 : _this$chainService12$.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(),
+        chain: (_this$chainService13 = this.chainService) === null || _this$chainService13 === void 0 ? void 0 : (_this$chainService13$ = _this$chainService13.mantaPay) === null || _this$chainService13$ === void 0 ? void 0 : (_this$chainService13$2 = _this$chainService13$.privateWallet) === null || _this$chainService13$2 === void 0 ? void 0 : (_this$chainService13$3 = _this$chainService13$2.network) === null || _this$chainService13$3 === void 0 ? void 0 : _this$chainService13$3.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);
+    var _this$chainService14, _this$chainService14$, _this$chainService15, _this$chainService15$, _this$chainService15$2, _this$chainService16, _this$chainService16$, _this$chainService16$2, _this$chainService17, _this$chainService17$, _this$chainService18, _this$chainService18$;
+    const config = await ((_this$chainService14 = this.chainService) === null || _this$chainService14 === void 0 ? void 0 : (_this$chainService14$ = _this$chainService14.mantaPay) === null || _this$chainService14$ === void 0 ? void 0 : _this$chainService14$.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);
+    await ((_this$chainService15 = this.chainService) === null || _this$chainService15 === void 0 ? void 0 : (_this$chainService15$ = _this$chainService15.mantaPay) === null || _this$chainService15$ === void 0 ? void 0 : (_this$chainService15$2 = _this$chainService15$.privateWallet) === null || _this$chainService15$2 === void 0 ? void 0 : _this$chainService15$2.dropAuthorizationContext());
+    await ((_this$chainService16 = this.chainService) === null || _this$chainService16 === void 0 ? void 0 : (_this$chainService16$ = _this$chainService16.mantaPay) === null || _this$chainService16$ === void 0 ? void 0 : (_this$chainService16$2 = _this$chainService16$.privateWallet) === null || _this$chainService16$2 === void 0 ? void 0 : _this$chainService16$2.dropUserSeedPhrase());
+    // await this.chainService?.mantaPay?.privateWallet?.resetState();
+    await ((_this$chainService17 = this.chainService) === null || _this$chainService17 === void 0 ? void 0 : (_this$chainService17$ = _this$chainService17.mantaPay) === null || _this$chainService17$ === void 0 ? void 0 : _this$chainService17$.deleteMantaPayConfig(address, _DEFAULT_MANTA_ZK_CHAIN));
+    await ((_this$chainService18 = this.chainService) === null || _this$chainService18 === void 0 ? void 0 : (_this$chainService18$ = _this$chainService18.mantaPay) === null || _this$chainService18$ === void 0 ? void 0 : _this$chainService18$.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;
+    var _this$chainService19, _this$chainService19$, _this$chainService20, _this$chainService20$, _this$chainService20$2, _this$chainService20$3, _this$chainService21, _this$chainService21$, _this$chainService21$2, _this$chainService22, _this$chainService22$;
     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, {
+    (_this$chainService19 = this.chainService) === null || _this$chainService19 === void 0 ? void 0 : (_this$chainService19$ = _this$chainService19.mantaPay) === null || _this$chainService19$ === void 0 ? void 0 : _this$chainService19$.setCurrentAddress(address);
+    await ((_this$chainService20 = this.chainService) === null || _this$chainService20 === void 0 ? void 0 : (_this$chainService20$ = _this$chainService20.mantaPay) === null || _this$chainService20$ === void 0 ? void 0 : (_this$chainService20$2 = _this$chainService20$.privateWallet) === null || _this$chainService20$2 === void 0 ? void 0 : (_this$chainService20$3 = _this$chainService20$2.baseWallet) === null || _this$chainService20$3 === void 0 ? void 0 : _this$chainService20$3.isApiReady());
+    const syncResult = await ((_this$chainService21 = this.chainService) === null || _this$chainService21 === void 0 ? void 0 : (_this$chainService21$ = _this$chainService21.mantaPay) === null || _this$chainService21$ === void 0 ? void 0 : (_this$chainService21$2 = _this$chainService21$.privateWallet) === null || _this$chainService21$2 === void 0 ? void 0 : _this$chainService21$2.initialWalletSync());
+    await ((_this$chainService22 = this.chainService) === null || _this$chainService22 === void 0 ? void 0 : (_this$chainService22$ = _this$chainService22.mantaPay) === null || _this$chainService22$ === void 0 ? void 0 : _this$chainService22$.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) {
+    var _this$chainService23, _this$chainService24, _this$chainService24$, _this$chainService24$2, _this$chainService25, _this$chainService25$, _this$chainService26, _this$chainService26$, _this$chainService26$2;
+    if (!this.chainService || !((_this$chainService23 = this.chainService) !== null && _this$chainService23 !== void 0 && _this$chainService23.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)) {
+    if (!((_this$chainService24 = this.chainService) !== null && _this$chainService24 !== void 0 && (_this$chainService24$ = _this$chainService24.mantaPay) !== null && _this$chainService24$ !== void 0 && (_this$chainService24$2 = _this$chainService24$.privateWallet) !== null && _this$chainService24$2 !== void 0 && _this$chainService24$2.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;
+    const chain = (_this$chainService25 = this.chainService) === null || _this$chainService25 === void 0 ? void 0 : (_this$chainService25$ = _this$chainService25.mantaPay.privateWallet) === null || _this$chainService25$ === void 0 ? void 0 : _this$chainService25$.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 => {
+    (_this$chainService26 = this.chainService) === null || _this$chainService26 === void 0 ? void 0 : (_this$chainService26$ = _this$chainService26.mantaPay) === null || _this$chainService26$ === void 0 ? void 0 : (_this$chainService26$2 = _this$chainService26$.privateWallet) === null || _this$chainService26$2 === void 0 ? void 0 : _this$chainService26$2.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;
@@ -1638,8 +1649,9 @@ export default class KoniState {
     }).catch(console.warn);
   }
   subscribeMantaPayBalance() {
+    var _this$chainService27, _this$chainService27$;
     let interval;
-    this.chainService.mantaPay.getMantaPayConfig(this.keyringService.currentAccount.address, _DEFAULT_MANTA_ZK_CHAIN).then(config => {
+    (_this$chainService27 = this.chainService) === null || _this$chainService27 === void 0 ? void 0 : (_this$chainService27$ = _this$chainService27.mantaPay) === null || _this$chainService27$ === void 0 ? void 0 : _this$chainService27$.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);
@@ -1650,23 +1662,23 @@ export default class KoniState {
     };
   }
   async syncMantaPay() {
-    var _this$chainService3, _this$chainService3$m, _this$chainService3$m2;
-    const config = await this.chainService.mantaPay.getMantaPayFirstConfig(_DEFAULT_MANTA_ZK_CHAIN);
+    var _this$chainService28, _this$chainService28$, _this$chainService29, _this$chainService29$, _this$chainService29$2;
+    const config = await ((_this$chainService28 = this.chainService) === null || _this$chainService28 === void 0 ? void 0 : (_this$chainService28$ = _this$chainService28.mantaPay) === null || _this$chainService28$ === void 0 ? void 0 : _this$chainService28$.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());
+    if ((_this$chainService29 = this.chainService) !== null && _this$chainService29 !== void 0 && (_this$chainService29$ = _this$chainService29.mantaPay) !== null && _this$chainService29$ !== void 0 && (_this$chainService29$2 = _this$chainService29$.privateWallet) !== null && _this$chainService29$2 !== void 0 && _this$chainService29$2.initialSyncIsFinished) {
+      var _this$chainService30, _this$chainService30$, _this$chainService30$2;
+      await ((_this$chainService30 = this.chainService) === null || _this$chainService30 === void 0 ? void 0 : (_this$chainService30$ = _this$chainService30.mantaPay) === null || _this$chainService30$ === void 0 ? void 0 : (_this$chainService30$2 = _this$chainService30$.privateWallet) === null || _this$chainService30$2 === void 0 ? void 0 : _this$chainService30$2.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());
+      var _this$chainService31, _this$chainService31$, _this$chainService31$2;
+      await ((_this$chainService31 = this.chainService) === null || _this$chainService31 === void 0 ? void 0 : (_this$chainService31$ = _this$chainService31.mantaPay) === null || _this$chainService31$ === void 0 ? void 0 : (_this$chainService31$2 = _this$chainService31$.privateWallet) === null || _this$chainService31$2 === void 0 ? void 0 : _this$chainService31$2.initialWalletSync());
     }
   }
   async getMantaPayZkBalance(address, tokenInfo) {
-    var _this$chainService$ma17;
+    var _this$chainService32, _this$chainService32$, _this$chainService32$2;
     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));
+    const balance = await ((_this$chainService32 = this.chainService) === null || _this$chainService32 === void 0 ? void 0 : (_this$chainService32$ = _this$chainService32.mantaPay) === null || _this$chainService32$ === void 0 ? void 0 : (_this$chainService32$2 = _this$chainService32$.privateWallet) === null || _this$chainService32$2 === void 0 ? void 0 : _this$chainService32$2.getZkBalance(bnAssetId));
     return {
       decimals: tokenInfo.decimals || 0,
       symbol: tokenInfo.symbol,
@@ -1674,6 +1686,19 @@ export default class KoniState {
     };
   }
   subscribeMantaPaySyncState() {
-    return this.chainService.mantaPay.subscribeSyncState();
+    var _this$chainService33, _this$chainService34, _this$chainService34$;
+    if (!((_this$chainService33 = this.chainService) !== null && _this$chainService33 !== void 0 && _this$chainService33.mantaPay)) {
+      return new Subject();
+    }
+    return (_this$chainService34 = this.chainService) === null || _this$chainService34 === void 0 ? void 0 : (_this$chainService34$ = _this$chainService34.mantaPay) === null || _this$chainService34$ === void 0 ? void 0 : _this$chainService34$.subscribeSyncState();
+  }
+
+  // Metadata
+  async findMetadata(hash) {
+    const metadata = await this.chainService.getMetadataByHash(hash);
+    return {
+      metadata: (metadata === null || metadata === void 0 ? void 0 : metadata.hexValue) || '',
+      specVersion: parseInt((metadata === null || metadata === void 0 ? void 0 : metadata.specVersion) || '0')
+    };
   }
 }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.2-1",
+  "version": "1.1.3-0",
   "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/manta-extension-sdk-empty": {
+      "types": "./services/chain-service/handler/manta/manta-extension-sdk-empty.d.ts",
+      "require": "./cjs/services/chain-service/handler/manta/manta-extension-sdk-empty.js",
+      "default": "./services/chain-service/handler/manta/manta-extension-sdk-empty.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",
@@ -1125,6 +1130,11 @@
       "require": "./cjs/utils/promise.js",
       "default": "./utils/promise.js"
     },
+    "./utils/registry": {
+      "types": "./utils/registry.d.ts",
+      "require": "./cjs/utils/registry.js",
+      "default": "./utils/registry.js"
+    },
     "./utils/request": {
       "types": "./utils/request.d.ts",
       "require": "./cjs/utils/request.js",
@@ -1163,16 +1173,17 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.2.5",
-    "@subwallet/extension-base": "^1.1.2-1",
-    "@subwallet/extension-chains": "^1.1.2-1",
-    "@subwallet/extension-dapp": "^1.1.2-1",
-    "@subwallet/extension-inject": "^1.1.2-1",
+    "@subwallet/chain-list": "^0.2.7",
+    "@subwallet/extension-base": "^1.1.3-0",
+    "@subwallet/extension-chains": "^1.1.3-0",
+    "@subwallet/extension-dapp": "^1.1.3-0",
+    "@subwallet/extension-inject": "^1.1.3-0",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.4",
     "@walletconnect/types": "^2.8.4",
     "@walletconnect/utils": "^2.8.4",
+    "avail-js-sdk": "^0.0.10",
     "axios": "^1.2.1",
     "bignumber.js": "^9.1.1",
     "bn.js": "^5.2.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.1.2-1'
+  version: '1.1.3-0'
 };

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

@@ -5,6 +5,7 @@ export declare const API_MAX_RETRY = 2;
 export declare const _API_OPTIONS_CHAIN_GROUP: {
     acala: string[];
     turing: string[];
+    avail: string[];
 };
 export declare const _PREDEFINED_SINGLE_MODES: Record<string, SingleModeJson>;
 export declare const _PURE_EVM_CHAINS: string[];

package/services/chain-service/constants.js

@@ -9,7 +9,8 @@ export const API_CONNECT_TIMEOUT = 30000;
 export const API_MAX_RETRY = 2;
 export const _API_OPTIONS_CHAIN_GROUP = {
   acala: ['acala', 'karura', 'origintrail', 'kintsugi'],
-  turing: ['turingStaging', 'turing']
+  turing: ['turingStaging', 'turing'],
+  avail: ['kate']
 };
 export const _PREDEFINED_SINGLE_MODES = {
   subspace: {

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

@@ -8,6 +8,7 @@ import { _API_OPTIONS_CHAIN_GROUP, API_AUTO_CONNECT_MS, API_CONNECT_TIMEOUT } fr
 import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/chain-service/handler/light-client';
 import { DEFAULT_AUX } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
+import { spec as availSpec } from 'avail-js-sdk';
 import { BehaviorSubject } from 'rxjs';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { typesBundle } from '@polkadot/apps-config/api';
@@ -63,6 +64,13 @@ export class SubstrateApi {
         rpc: oakRpc,
         types: oakTypes
       });
+    } else if (_API_OPTIONS_CHAIN_GROUP.avail.includes(this.chainSlug)) {
+      return new ApiPromise({
+        provider,
+        rpc: availSpec.rpc,
+        types: availSpec.types,
+        signedExtensions: availSpec.signedExtensions
+      });
     } else {
       return new ApiPromise(apiOption);
     }

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

@@ -23,7 +23,7 @@ export declare class MantaPrivateHandler {
     deleteMantaAuthContext(address: string, chain: string): Promise<number>;
     private saveLedgerState;
     private getLedgerState;
-    initMantaPay(providerUrl: string, network: string): Promise<import("@polkadot/api").ApiPromise>;
+    initMantaPay(providerUrl: string, network: string): Promise<import("avail-js-sdk").ApiPromise>;
     getCurrentLedgerState(): Promise<number>;
     setSyncState(data: MantaPaySyncState): void;
     subscribeSyncProgress(): Promise<() => void>;

package/services/chain-service/handler/manta/MantaPrivateHandler.js

@@ -88,7 +88,7 @@ export class MantaPrivateHandler {
 
     const baseWallet = await BaseWallet.init({
       apiEndpoint: providerUrl,
-      loggingEnabled: false,
+      loggingEnabled: true,
       provingFilePath: './manta-pay/proving',
       parametersFilePath: './manta-pay/parameters',
       saveStorageStateToLocal: this.saveLedgerState.bind(this),

package/services/chain-service/handler/manta/manta-extension-sdk-empty.d.ts

@@ -0,0 +1,4 @@
+export declare class BaseWallet {
+}
+export declare class MantaPayWallet {
+}

package/services/chain-service/handler/manta/manta-extension-sdk-empty.js

@@ -0,0 +1,5 @@
+// Copyright 2019-2022 @subwallet/web-runner authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export class BaseWallet {}
+export class MantaPayWallet {}

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

@@ -14,7 +14,7 @@ export declare class ChainService {
     private substrateChainHandler;
     private evmChainHandler;
     private mantaChainHandler;
-    get mantaPay(): MantaPrivateHandler;
+    get mantaPay(): MantaPrivateHandler | undefined;
     private chainInfoMapSubject;
     private chainStateMapSubject;
     private assetRegistrySubject;
@@ -110,4 +110,5 @@ export declare class ChainService {
     resetWallet(resetAll: boolean): void;
     getMetadata(chain: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
     upsertMetadata(chain: string, metadata: IMetadataItem): import("dexie").PromiseExtended<unknown>;
+    getMetadataByHash(hash: string): import("dexie").PromiseExtended<IMetadataItem | undefined>;
 }

package/services/chain-service/index.js

@@ -11,6 +11,7 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
 import { _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
+import { MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
 import Web3 from 'web3';
 import { logger as createLogger } from '@polkadot/util/logger';
@@ -40,14 +41,14 @@ export class ChainService {
   constructor(dbService, eventService) {
     this.dbService = dbService;
     this.eventService = eventService;
-    this.substrateChainHandler = new SubstrateChainHandler();
-    this.evmChainHandler = new EvmChainHandler();
-    this.mantaChainHandler = new MantaPrivateHandler(dbService);
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
-    this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
     this.xcmRefMapSubject.next(this.dataMap.assetRefMap);
+    if (MODULE_SUPPORT.MANTA_ZK) {
+      console.log('Init Manta ZK');
+      this.mantaChainHandler = new MantaPrivateHandler(dbService);
+    }
     this.substrateChainHandler = new SubstrateChainHandler(this);
     this.evmChainHandler = new EvmChainHandler(this);
     this.logger = createLogger('chain-service');
@@ -417,8 +418,9 @@ export class ChainService {
       }
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
-      if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug)) {
-        const apiPromise = await this.mantaChainHandler.initMantaPay(endpoint, chainInfo.slug);
+      if (_MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && MODULE_SUPPORT.MANTA_ZK && this.mantaChainHandler) {
+        var _this$mantaChainHandl;
+        const apiPromise = await ((_this$mantaChainHandl = this.mantaChainHandler) === null || _this$mantaChainHandl === void 0 ? void 0 : _this$mantaChainHandl.initMantaPay(endpoint, chainInfo.slug));
         const chainApi = await this.substrateChainHandler.initApi(chainInfo.slug, endpoint, {
           providerName,
           externalApiPromise: apiPromise,
@@ -1304,4 +1306,7 @@ export class ChainService {
   upsertMetadata(chain, metadata) {
     return this.dbService.stores.metadata.upsertMetadata(chain, metadata);
   }
+  getMetadataByHash(hash) {
+    return this.dbService.stores.metadata.getMetadataByGenesisHash(hash);
+  }
 }

package/services/request-service/handler/PopupHandler.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
-import { getOS } from '@subwallet/extension-base/services/request-service/helper';
 import { DEFAULT_NOTIFICATION_TYPE } from '@subwallet/extension-base/services/setting-service/constants';
+import { getOS } from '@subwallet/extension-base/utils';
 const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
 const OS = getOS();
 const extraHeight = OS === 'Linux' ? 0 : 28;

package/services/request-service/helper/index.d.ts

@@ -1,4 +1,2 @@
 import { MetadataStore } from '@subwallet/extension-base/stores';
-import { OSType } from '../types';
 export declare const extractMetadata: (store: MetadataStore) => void;
-export declare const getOS: () => OSType;

package/services/request-service/helper/index.js

@@ -41,27 +41,4 @@ export const extractMetadata = store => {
       def
     }) => addMetadata(def));
   });
-};
-export const getOS = () => {
-  var _window$navigator, _window$navigator$use;
-  const userAgent = window.navigator.userAgent;
-  // @ts-ignore
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-  const platform = ((_window$navigator = window.navigator) === null || _window$navigator === void 0 ? void 0 : (_window$navigator$use = _window$navigator.userAgentData) === null || _window$navigator$use === void 0 ? void 0 : _window$navigator$use.platform) || window.navigator.platform;
-  const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
-  const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
-  const iosPlatforms = ['iPhone', 'iPad', 'iPod'];
-  let os = 'Unknown';
-  if (macosPlatforms.indexOf(platform) !== -1) {
-    os = 'Mac OS';
-  } else if (iosPlatforms.indexOf(platform) !== -1) {
-    os = 'iOS';
-  } else if (windowsPlatforms.indexOf(platform) !== -1) {
-    os = 'Windows';
-  } else if (/Android/.test(userAgent)) {
-    os = 'Android';
-  } else if (/Linux/.test(platform)) {
-    os = 'Linux';
-  }
-  return os;
 };

package/services/request-service/types.d.ts

@@ -22,4 +22,3 @@ export interface AuthUrlInfo {
     currentEvmNetworkKey?: string;
 }
 export declare type AuthUrls = Record<string, AuthUrlInfo>;
-export declare type OSType = 'Mac OS' | 'iOS' | 'Windows' | 'Android' | 'Linux' | 'Unknown';

package/services/storage-service/db-stores/Metadata.js

@@ -10,7 +10,7 @@ export default class MetadataStore extends BaseStoreWithChain {
     return this.table.put(metadata, chain);
   }
   getMetadataByGenesisHash(genesisHash) {
-    return this.table.where('[genesisHash]').equals([genesisHash]).first();
+    return this.table.get(genesisHash);
   }
   updateMetadataByGenesisHash(genesisHash, metadata) {
     return this.table.put(metadata, genesisHash);

package/services/wallet-connect-service/constants.d.ts

@@ -1,6 +1,7 @@
 import { WalletConnectSigningMethod } from '@subwallet/extension-base/services/wallet-connect-service/types';
 import { SignClientTypes } from '@walletconnect/types';
-export declare const PROJECT_ID = "6da34c0b48164d27681924dd9a46d6be";
+export declare const PROJECT_ID_EXTENSION = "6da34c0b48164d27681924dd9a46d6be";
+export declare const PROJECT_ID_MOBILE = "6da34c0b48164d27681924dd9a46d6be";
 export declare const RELAY_URL = "wss://relay.walletconnect.com";
 export declare const DEFAULT_WALLET_CONNECT_OPTIONS: SignClientTypes.Options;
 export declare const ALL_WALLET_CONNECT_EVENT: SignClientTypes.Event[];

package/services/wallet-connect-service/constants.js

@@ -2,17 +2,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from '@subwallet/extension-base/services/wallet-connect-service/types';
-export const PROJECT_ID = '6da34c0b48164d27681924dd9a46d6be';
+import { isMobile } from '@subwallet/extension-base/utils';
+export const PROJECT_ID_EXTENSION = '6da34c0b48164d27681924dd9a46d6be';
+export const PROJECT_ID_MOBILE = '6da34c0b48164d27681924dd9a46d6be';
 export const RELAY_URL = 'wss://relay.walletconnect.com';
 export const DEFAULT_WALLET_CONNECT_OPTIONS = {
   logger: 'debug',
-  projectId: PROJECT_ID,
+  projectId: !isMobile ? PROJECT_ID_EXTENSION : PROJECT_ID_MOBILE,
   relayUrl: RELAY_URL,
   metadata: {
     name: 'SubWallet',
     description: 'React Wallet for WalletConnect',
     url: 'https://www.subwallet.app/',
-    icons: ['https://1570604715-files.gitbook.io/~/files/v0/b/gitbook-x-prod.appspot.com/o/spaces%2F-Lh39Kwxa1xxZM9WX_Bs%2Ficon%2FiETEgi1ykXUQRW63vPnL%2FLogo%3DWhite%2C%20Background%3DGradient.jpg?alt=media&token=46c5dafa-ce09-4576-bcd9-a5c796786f1a']
+    icons: ['https://raw.githubusercontent.com/Koniverse/SubWallet-Extension/master/packages/extension-koni/public/images/icon-128.png']
   }
 };
 export const ALL_WALLET_CONNECT_EVENT = ['session_proposal', 'session_update', 'session_extend', 'session_ping', 'session_delete', 'session_expire', 'session_request', 'session_request_sent', 'session_event', 'proposal_expire'];

package/services/wallet-connect-service/index.d.ts

@@ -10,7 +10,6 @@ export default class WalletConnectService {
     get sessions(): SessionTypes.Struct[];
     getSession(topic: string): SessionTypes.Struct;
     changeOption(newOption: Omit<SignClientTypes.Options, 'projectId'>): Promise<void>;
-    getSessions(): void;
     connect(uri: string): Promise<void>;
     approveSession(result: ResultApproveWalletConnectSession): Promise<void>;
     rejectSession(id: number): Promise<void>;