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

package/cjs/koni/background/handlers/State.js

@@ -222,7 +222,8 @@ class KoniState {
     await this.startSubscription();
   }
   async initMantaPay(password) {
-    const mantaPayConfig = await this.chainService.mantaPay.getMantaPayFirstConfig(_constants2._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(_constants2._DEFAULT_MANTA_ZK_CHAIN));
     if (mantaPayConfig && mantaPayConfig.enabled && !this.isMantaPayEnabled) {
       // only init the first login
       console.debug('Initiating MantaPay for', mantaPayConfig.address);
@@ -620,51 +621,20 @@ class KoniState {
   setSettings(settings, callback) {
     this.settingService.setSettings(settings, callback);
   }
-  setTheme(theme, callback) {
+  updateSetting(key, value) {
     this.settingService.getSettings(settings => {
       const newSettings = {
         ...settings,
-        theme
-      };
-      this.settingService.setSettings(newSettings, () => {
-        callback && callback(newSettings);
-      });
-    });
-  }
-  setBrowserConfirmationType(browserConfirmationType, callback) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        browserConfirmationType
-      };
-      this.settingService.setSettings(newSettings, () => {
-        callback && callback(newSettings);
-      });
-    });
-  }
-  setCamera(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        camera: value
-      };
-      this.settingService.setSettings(newSettings);
-    });
-  }
-  setAutoLockTime(value) {
-    this.settingService.getSettings(settings => {
-      const newSettings = {
-        ...settings,
-        timeAutoLock: value
+        [key]: value
       };
       this.settingService.setSettings(newSettings);
     });
   }
-  setEnableChainPatrol(value) {
+  setShowBalance(value) {
     this.settingService.getSettings(settings => {
       const newSettings = {
         ...settings,
-        enableChainPatrol: value
+        isShowBalance: value
       };
       this.settingService.setSettings(newSettings);
     });
@@ -918,7 +888,8 @@ class KoniState {
   async disableChain(chainSlug) {
     await this.chainService.updateAssetSettingByChain(chainSlug, false);
     if (_constants2._MANTA_ZK_CHAIN_GROUP.includes(chainSlug)) {
-      const mantaPayConfig = await this.chainService.mantaPay.getMantaPayFirstConfig(_constants2._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(_constants2._DEFAULT_MANTA_ZK_CHAIN));
       if (mantaPayConfig && mantaPayConfig.enabled && this.isMantaPayEnabled) {
         await this.disableMantaPay(mantaPayConfig.address);
       }
@@ -1561,10 +1532,13 @@ class KoniState {
     });
   }
   async reloadNft() {
+    const currentAddress = this.keyringService.currentAccount.address;
+    await this.dbService.removeNftsByAddress(currentAddress);
     return await this.cron.reloadNft();
   }
   async reloadStaking() {
-    return await this.cron.reloadStaking();
+    await this.subscription.reloadStaking();
+    return true;
   }
   async approvePassPhishingPage(_url) {
     return new Promise(resolve => {
@@ -1596,95 +1570,95 @@ 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 || (0, _utilCrypto.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: _constants2._DEFAULT_MANTA_ZK_CHAIN,
         address,
         data: encryptedData
-      });
+      }));
     } else {
-      var _this$chainService$ma5;
-      const authContext = await this.chainService.mantaPay.getMantaAuthContext(address, _constants2._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, _constants2._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, _constants2._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, _constants2._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, _constants2._DEFAULT_MANTA_ZK_CHAIN);
-    await this.chainService.mantaPay.deleteMantaAuthContext(address, _constants2._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, _constants2._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, _constants2._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 || (0, _utilCrypto.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, _constants2._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, _constants2._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 _util.BN((0, _utils._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 _util.BN((0, _utils._getTokenOnChainAssetId)(tokenInfo)))).then(zkBalances => {
       const assetList = Object.values(assetMap);
       for (let i = 0; i < assetList.length; i++) {
         var _zkBalances$i;
@@ -1701,8 +1675,9 @@ class KoniState {
     }).catch(console.warn);
   }
   subscribeMantaPayBalance() {
+    var _this$chainService27, _this$chainService27$;
     let interval;
-    this.chainService.mantaPay.getMantaPayConfig(this.keyringService.currentAccount.address, _constants2._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, _constants2._DEFAULT_MANTA_ZK_CHAIN).then(config => {
       if (config && config.enabled && config.isInitialSync) {
         this.getMantaZkBalance();
         interval = setInterval(this.getMantaZkBalance, _constants.MANTA_PAY_BALANCE_INTERVAL);
@@ -1713,23 +1688,23 @@ class KoniState {
     };
   }
   async syncMantaPay() {
-    var _this$chainService3, _this$chainService3$m, _this$chainService3$m2;
-    const config = await this.chainService.mantaPay.getMantaPayFirstConfig(_constants2._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(_constants2._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 _util.BN((0, _utils._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,
@@ -1737,7 +1712,20 @@ 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 _rxjs.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')
+    };
   }
 }
 exports.default = KoniState;

package/cjs/koni/background/subscription.js

@@ -1,24 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.KoniSubscription = void 0;
-var _constants = require("@subwallet/extension-base/constants");
 var _balance = require("@subwallet/extension-base/koni/api/dotsama/balance");
 var _crowdloan = require("@subwallet/extension-base/koni/api/dotsama/crowdloan");
 var _staking = require("@subwallet/extension-base/koni/api/staking");
 var _bonding = require("@subwallet/extension-base/koni/api/staking/bonding");
-var _relayChain = require("@subwallet/extension-base/koni/api/staking/bonding/relayChain");
 var _paraChain = require("@subwallet/extension-base/koni/api/staking/paraChain");
 var _handlers = require("@subwallet/extension-base/koni/background/handlers");
-var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _types = require("@subwallet/extension-base/services/event-service/types");
-var _axios = _interopRequireDefault(require("axios"));
+var _utils2 = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
-var _utilCrypto = require("@polkadot/util-crypto");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -198,8 +193,6 @@ class KoniSubscription {
       return _this.state.updateNftData(...arguments);
     }, function () {
       return _this.state.setNftCollection(...arguments);
-    }, function () {
-      return _this.state.cleanUpNfts(...arguments);
     }).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
@@ -250,86 +243,11 @@ class KoniSubscription {
     };
     await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), (0, _paraChain.getAmplitudeUnclaimedStakingReward)(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
   }
-  async fetchingStakingFromApi() {
-    try {
-      const response = await _axios.default.get('https://staking-data.subwallet.app/api/staking/get');
-      if (response.status === 200) {
-        return response.data;
-      }
-    } catch (e) {
-      this.logger.error(e);
-    }
-    return {};
-  }
-  async fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap) {
-    const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      const chainState = chainStateMap[chainInfo.slug];
-      if (chainState !== null && chainState !== void 0 && chainState.active && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
-      }
-    });
-    if (Object.values(filteredChainInfoMap).length === 0) {
-      return;
-    }
-    const timeout = new Promise(resolve => {
-      const id = setTimeout(() => {
-        clearTimeout(id);
-        resolve(null);
-      }, 3000);
-    });
-
-    // Fetch data from helper API
-    const _dataFromApi = await Promise.race([this.fetchingStakingFromApi(), timeout]);
-    const dataFromApi = _dataFromApi;
-    await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-      // Use fetch API data if available
-      if (dataFromApi && dataFromApi[chainInfo.slug]) {
-        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug], {
-          expectedReturn: dataFromApi[chainInfo.slug].expectedReturn,
-          inflation: dataFromApi[chainInfo.slug].inflation,
-          nominatorCount: dataFromApi[chainInfo.slug].nominatorCount
-        });
-      } else {
-        const chainStakingMetadata = await (0, _bonding.getChainStakingMetadata)(chainInfo, substrateApiMap[chainInfo.slug]);
-        this.state.updateChainStakingMetadata(chainStakingMetadata, {
-          expectedReturn: chainStakingMetadata.expectedReturn,
-          inflation: chainStakingMetadata.inflation,
-          nominatorCount: chainStakingMetadata.nominatorCount
-        });
-      }
-    }));
-  }
-  async fetchNominatorMetadata(currentAddress, chainInfoMap, chainStateMap, substrateApiMap) {
-    const filteredChainInfoMap = {};
-    Object.values(chainInfoMap).forEach(chainInfo => {
-      const chainState = chainStateMap[chainInfo.slug];
-      if (chainState !== null && chainState !== void 0 && chainState.active && (0, _utils._isChainSupportSubstrateStaking)(chainInfo)) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
-      }
-    });
-    let addresses = [currentAddress];
-    if (currentAddress === _constants.ALL_ACCOUNT_KEY) {
-      addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
-    }
-    await Promise.all(addresses.map(async address => {
-      const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(address);
-      await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-        if (isEvmAddress && !(0, _utils._isChainEvmCompatible)(chainInfo)) {
-          return;
-        }
-        if ((0, _utils._isSubstrateRelayChain)(chainInfo) && _constants2._STAKING_CHAIN_GROUP.nominationPool.includes(chainInfo.slug)) {
-          const poolMemberMetadata = await (0, _relayChain.getRelayChainPoolMemberMetadata)(chainInfo, address, substrateApiMap[chainInfo.slug]);
-          if (poolMemberMetadata) {
-            this.state.updateStakingNominatorMetadata(poolMemberMetadata);
-          }
-        }
-        const nominatorMetadata = await (0, _bonding.getNominatorMetadata)(chainInfo, address, substrateApiMap[chainInfo.slug]);
-        if (nominatorMetadata) {
-          this.state.updateStakingNominatorMetadata(nominatorMetadata);
-        }
-      }));
-    }));
+  async reloadStaking() {
+    var _this$state$keyringSe2;
+    const currentAddress = (_this$state$keyringSe2 = this.state.keyringService.currentAccount) === null || _this$state$keyringSe2 === void 0 ? void 0 : _this$state$keyringSe2.address;
+    this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
+    await (0, _utils2.waitTimeout)(1800);
   }
 }
 exports.KoniSubscription = KoniSubscription;

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.2-0'
+  version: '1.1.3-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/constants.js

@@ -18,7 +18,8 @@ const API_MAX_RETRY = 2;
 exports.API_MAX_RETRY = API_MAX_RETRY;
 const _API_OPTIONS_CHAIN_GROUP = {
   acala: ['acala', 'karura', 'origintrail', 'kintsugi'],
-  turing: ['turingStaging', 'turing']
+  turing: ['turingStaging', 'turing'],
+  avail: ['kate']
 };
 exports._API_OPTIONS_CHAIN_GROUP = _API_OPTIONS_CHAIN_GROUP;
 const _PREDEFINED_SINGLE_MODES = {
@@ -37,7 +38,7 @@ const _BALANCE_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'interlay', 'kintsugi_test', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
-  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main'],
+  bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry', 'bifrost_dot', 'hydradx_main', 'pendulum'],
   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
 };
@@ -63,7 +64,7 @@ const _STAKING_CHAIN_GROUP = {
   relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
   astar: ['astar', 'shiden', 'shibuya'],
-  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine'],
+  amplitude: ['amplitude', 'amplitude_test', 'kilt', 'kilt_peregrine', 'pendulum'],
   // amplitude and kilt only share some common logic
   kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph'],
@@ -97,6 +98,7 @@ const _STAKING_ERA_LENGTH_MAP = {
   calamari_test: 6,
   amplitude: 2,
   amplitude_test: 2,
+  pendulum: 2,
   kilt: 2,
   kilt_peregrine: 2
 };
@@ -201,7 +203,8 @@ const _TRANSFER_CHAIN_GROUP = {
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
-  avail: ['kate']
+  avail: ['kate'],
+  pendulum: ['pendulum']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {
@@ -234,7 +237,7 @@ const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS];
 
 // TODO: review
 exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
-const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni/dev/issue-15' : 'master';
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;
 const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;

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

@@ -11,6 +11,7 @@ var _constants = require("@subwallet/extension-base/services/chain-service/const
 var _lightClient = require("@subwallet/extension-base/services/chain-service/handler/light-client");
 var _SubstrateChainHandler = require("@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler");
 var _promise = require("@subwallet/extension-base/utils/promise");
+var _availJsSdk = require("avail-js-sdk");
 var _rxjs = require("rxjs");
 var _api2 = require("@polkadot/api");
 var _api3 = require("@polkadot/apps-config/api");
@@ -69,6 +70,13 @@ class SubstrateApi {
         rpc: _types.rpc,
         types: _types.types
       });
+    } else if (_constants._API_OPTIONS_CHAIN_GROUP.avail.includes(this.chainSlug)) {
+      return new _api2.ApiPromise({
+        provider,
+        rpc: _availJsSdk.spec.rpc,
+        types: _availJsSdk.spec.types,
+        signedExtensions: _availJsSdk.spec.signedExtensions
+      });
     } else {
       return new _api2.ApiPromise(apiOption);
     }

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

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

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

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MantaPayWallet = exports.BaseWallet = void 0;
+// Copyright 2019-2022 @subwallet/web-runner authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class BaseWallet {}
+exports.BaseWallet = BaseWallet;
+class MantaPayWallet {}
+exports.MantaPayWallet = MantaPayWallet;

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

@@ -15,6 +15,7 @@ var _types2 = require("@subwallet/extension-base/services/chain-service/handler/
 var _types3 = require("@subwallet/extension-base/services/chain-service/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _AssetSetting = _interopRequireDefault(require("@subwallet/extension-base/stores/AssetSetting"));
+var _utils2 = require("@subwallet/extension-base/utils");
 var _rxjs = require("rxjs");
 var _web = _interopRequireDefault(require("web3"));
 var _logger = require("@polkadot/util/logger");
@@ -47,14 +48,14 @@ class ChainService {
   constructor(dbService, eventService) {
     this.dbService = dbService;
     this.eventService = eventService;
-    this.substrateChainHandler = new _SubstrateChainHandler.SubstrateChainHandler();
-    this.evmChainHandler = new _EvmChainHandler.EvmChainHandler();
-    this.mantaChainHandler = new _MantaPrivateHandler.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 (_utils2.MODULE_SUPPORT.MANTA_ZK) {
+      console.log('Init Manta ZK');
+      this.mantaChainHandler = new _MantaPrivateHandler.MantaPrivateHandler(dbService);
+    }
     this.substrateChainHandler = new _SubstrateChainHandler.SubstrateChainHandler(this);
     this.evmChainHandler = new _EvmChainHandler.EvmChainHandler(this);
     this.logger = (0, _logger.logger)('chain-service');
@@ -433,8 +434,9 @@ class ChainService {
       }
     };
     if (chainInfo.substrateInfo !== null && chainInfo.substrateInfo !== undefined) {
-      if (_constants._MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug)) {
-        const apiPromise = await this.mantaChainHandler.initMantaPay(endpoint, chainInfo.slug);
+      if (_constants._MANTA_ZK_CHAIN_GROUP.includes(chainInfo.slug) && _utils2.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,
@@ -1322,5 +1324,8 @@ class ChainService {
   upsertMetadata(chain, metadata) {
     return this.dbService.stores.metadata.upsertMetadata(chain, metadata);
   }
+  getMetadataByHash(hash) {
+    return this.dbService.stores.metadata.getMetadataByGenesisHash(hash);
+  }
 }
 exports.ChainService = ChainService;

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

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
-var _helper = require("@subwallet/extension-base/services/request-service/helper");
 var _constants = require("@subwallet/extension-base/services/setting-service/constants");
+var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
-const OS = (0, _helper.getOS)();
+const OS = (0, _utils.getOS)();
 const extraHeight = OS === 'Linux' ? 0 : 28;
 const extraWidth = OS === 'Windows' ? 16 : 0;
 const POPUP_WINDOW_OPTS = {