@subwallet/extension-base 1.0.6-2 → 1.0.7-1

package/cjs/koni/api/staking/subsquidStaking.js

@@ -39,9 +39,8 @@ const getSubsquidQuery = (account, chain) => {
     }
   }`;
 };
-const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
+const getSubsquidStaking = async (accounts, chain, chainInfoMap, callback) => {
   try {
-    const result = [];
     await Promise.all(accounts.map(async account => {
       if ((0, _utils._isChainEvmCompatible)(chainInfoMap[chain]) && (0, _utilCrypto.isEthereumAddress)(account) || !(0, _utils._isChainEvmCompatible)(chainInfoMap[chain]) && !(0, _utilCrypto.isEthereumAddress)(account)) {
         const parsedAccount = (0, _utils2.reformatAddress)(account, (0, _utils._getChainSubstrateAddressPrefix)(chainInfoMap[chain]));
@@ -77,17 +76,15 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
           }
         }
         if (stakingRewardItem.totalReward && parseFloat(stakingRewardItem.totalReward) > 0) {
-          result.push(stakingRewardItem);
+          callback(stakingRewardItem);
         }
       }
     }));
-    return result;
   } catch (e) {
-    return [];
+    console.debug(e);
   }
 };
-const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
-  let rewardList = [];
+const getAllSubsquidStaking = async (accounts, chainInfoMap, callback) => {
   const filteredNetworks = [];
   Object.values(chainInfoMap).forEach(network => {
     if (_config.INDEXER_SUPPORTED_STAKING_CHAINS.includes(network.slug)) {
@@ -96,12 +93,10 @@ const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
   });
   try {
     await Promise.all(filteredNetworks.map(async network => {
-      const rewardItems = await getSubsquidStaking(accounts, network, chainInfoMap);
-      rewardList = rewardList.concat(rewardItems);
+      await getSubsquidStaking(accounts, network, chainInfoMap, callback);
     }));
   } catch (e) {
-    return rewardList;
+    console.debug(e);
   }
-  return rewardList;
 };
 exports.getAllSubsquidStaking = getAllSubsquidStaking;

package/cjs/koni/background/cron.js

@@ -60,26 +60,6 @@ class KoniCron {
       delete this.cronMap[key];
     });
   };
-
-  // init = () => {
-  //   const currentAccountInfo = this.state.keyringService.currentAccount;
-  //
-  //   if (!currentAccountInfo?.address) {
-  //     return;
-  //   }
-  //
-  //   if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
-  //     this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap());
-  //     this.updateApiMapStatus();
-  //     this.refreshStakingReward(currentAccountInfo.address);
-  //     this.refreshStakingRewardFastInterval(currentAccountInfo.address);
-  //     // this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
-  //     this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap());
-  //   } else {
-  //     this.setStakingRewardReady();
-  //   }
-  // };
-
   start = () => {
     if (this.status === 'running') {
       return;
@@ -120,7 +100,6 @@ class KoniCron {
       (commonReload || needUpdateStaking || stakingSubmitted) && this.resetStakingReward();
       (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshStakingReward');
       (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshPoolingStakingReward');
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('updateNominatorMetadata');
       needUpdateStaking && this.removeCron('updateChainStakingMetadata');
 
       // Chains
@@ -133,7 +112,6 @@ class KoniCron {
         chainUpdated && this.addCron('recoverApiMap', this.recoverApiMap, _constants.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
         needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
       } else {
         this.setStakingRewardReady();
@@ -151,7 +129,6 @@ class KoniCron {
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_STAKING_METADATA);
-      this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
     } else {
       this.setStakingRewardReady();
     }
@@ -246,10 +223,8 @@ class KoniCron {
     this.resetStakingReward();
     this.removeCron('refreshStakingReward');
     this.removeCron('refreshPoolingStakingReward');
-    this.removeCron('updateNominatorMetadata');
     this.addCron('refreshStakingReward', this.refreshStakingReward(address), _constants.CRON_REFRESH_STAKING_REWARD_INTERVAL);
     this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), _constants.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-    this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), _constants.CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
     await (0, _utils2.waitTimeout)(1800);
     return true;
   }

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

@@ -77,8 +77,7 @@ class KoniState {
   stakingRewardSubject = new _rxjs.Subject();
   stakingRewardState = {
     ready: false,
-    slowInterval: [],
-    fastInterval: []
+    data: {}
   };
   lazyMap = {};
   ready = false;
@@ -203,18 +202,24 @@ class KoniState {
   async init() {
     await this.chainService.init();
     await this.migrationService.run();
-    this.startSubscription();
     this.eventService.emit('chain.ready', true);
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
+    await this.startSubscription();
   }
-  startSubscription() {
+  async startSubscription() {
+    await this.eventService.waitKeyringReady;
     this.dbService.subscribeChainStakingMetadata([], data => {
       this.chainStakingMetadataSubject.next(data);
     });
-    this.dbService.subscribeNominatorMetadata(data => {
-      this.stakingNominatorMetadataSubject.next(data);
+    let unsub;
+    this.keyringService.accountSubject.subscribe(accounts => {
+      // TODO: improve this
+      unsub && unsub.unsubscribe();
+      unsub = this.dbService.subscribeNominatorMetadata(Object.keys(accounts), data => {
+        this.stakingNominatorMetadataSubject.next(data);
+      });
     });
   }
   onReady() {
@@ -309,14 +314,6 @@ class KoniState {
   async getPooledStakingRecordsByAddress(addresses) {
     return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
-
-  // TODO: delete later
-  // public async getStoredStaking (address: string) {
-  //   const items = await this.dbService.stores.staking.getDataByAddressAsObject(address);
-  //
-  //   return items || {};
-  // }
-
   subscribeStaking() {
     return this.stakingSubject;
   }
@@ -332,8 +329,8 @@ class KoniState {
   setStakingItem(networkKey, item) {
     this.dbService.updateStaking(networkKey, item.address, item).catch(e => this.logger.warn(e));
   }
-  updateChainStakingMetadata(item) {
-    this.dbService.updateChainStakingMetadata(item).catch(e => this.logger.warn(e));
+  updateChainStakingMetadata(item, changes) {
+    this.dbService.updateChainStakingMetadata(item, changes).catch(e => this.logger.warn(e));
   }
   updateStakingNominatorMetadata(item) {
     this.dbService.updateNominatorMetadata(item).catch(e => this.logger.warn(e));
@@ -386,12 +383,13 @@ class KoniState {
     return this.nftSubject;
   }
   resetStakingReward() {
-    this.stakingRewardState.slowInterval = [];
+    this.stakingRewardState.data = {};
     this.stakingRewardSubject.next(this.stakingRewardState);
   }
-  updateStakingReward(stakingRewardData, type, callback) {
+  updateStakingReward(stakingRewardData, callback) {
     this.stakingRewardState.ready = true;
-    this.stakingRewardState[type] = stakingRewardData;
+    const key = `${stakingRewardData.chain}___${stakingRewardData.address}___${stakingRewardData.type}`;
+    this.stakingRewardState.data[key] = stakingRewardData;
     if (callback) {
       callback(this.stakingRewardState);
     }
@@ -1370,6 +1368,7 @@ class KoniState {
     await this.priceService.stop();
   }
   async wakeup() {
+    await this.eventService.waitChainReady;
     await this.resumeAllNetworks();
     this.cron.start();
     this.subscription.start();

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

@@ -14,6 +14,7 @@ var _RequestBytesSign = _interopRequireDefault(require("@subwallet/extension-bas
 var _RequestExtrinsicSign = _interopRequireDefault(require("@subwallet/extension-base/background/RequestExtrinsicSign"));
 var _constants = require("@subwallet/extension-base/constants");
 var _defaults = require("@subwallet/extension-base/defaults");
+var _types2 = require("@subwallet/extension-base/services/chain-service/handler/types");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
 var _constants2 = require("@subwallet/extension-base/services/setting-service/constants");
 var _utils2 = require("@subwallet/extension-base/utils");
@@ -405,7 +406,7 @@ class KoniTabs {
     return null;
   }
   async addEvmToken(id, url, _ref13) {
-    var _input$type, _input$options, _input$options2;
+    var _input$type, _input$options, _input$options2, _input$options3, _input$options4, _input$options5;
     let {
       params
     } = _ref13;
@@ -423,28 +424,42 @@ class KoniTabs {
       throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, 'Current chain is not available');
     }
     const tokenType = _tokenType === 'erc20' ? _types._AssetType.ERC20 : _types._AssetType.ERC721;
-    const validate = await this.#koniState.validateCustomAsset({
+    const tokenInfo = {
+      slug: '',
+      type: tokenType,
+      name: (input === null || input === void 0 ? void 0 : (_input$options3 = input.options) === null || _input$options3 === void 0 ? void 0 : _input$options3.symbol) || '',
+      contractAddress: input.options.address,
+      symbol: (input === null || input === void 0 ? void 0 : (_input$options4 = input.options) === null || _input$options4 === void 0 ? void 0 : _input$options4.symbol) || '',
+      decimals: (input === null || input === void 0 ? void 0 : (_input$options5 = input.options) === null || _input$options5 === void 0 ? void 0 : _input$options5.decimals) || 0,
+      originChain: chain,
+      contractError: false,
+      validated: false
+    };
+    this.#koniState.validateCustomAsset({
       type: tokenType,
       contractAddress: input.options.address,
       originChain: chain
+    }).then(validate => {
+      if (validate.contractError) {
+        tokenInfo.contractError = true;
+      } else {
+        tokenInfo.slug = validate === null || validate === void 0 ? void 0 : validate.existedSlug;
+        tokenInfo.name = validate.name;
+        tokenInfo.symbol = validate.symbol;
+        tokenInfo.decimals = validate.decimals;
+      }
+    }).catch(() => {
+      tokenInfo.contractError = true;
+    }).finally(() => {
+      tokenInfo.validated = true;
+      this.#koniState.requestService.updateConfirmation(id, 'addTokenRequest', tokenInfo);
     });
 
     // Below code is comment because we will handle exited token in the ui-view
     // if (validate.isExist) {
     //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
     // } else
-    if (validate.contractError) {
-      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
-    }
-    const tokenInfo = {
-      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
-      type: tokenType,
-      name: validate.name,
-      contractAddress: input.options.address,
-      symbol: validate.symbol,
-      decimals: validate.decimals,
-      originChain: chain
-    };
+
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
   async addEvmChain(id, url, _ref14) {
@@ -457,6 +472,10 @@ class KoniTabs {
         blockExplorerUrls,
         chainId,
         chainName,
+        nativeCurrency: {
+          decimals,
+          symbol
+        },
         rpcUrls
       } = input[0];
       if (chainId) {
@@ -507,12 +526,19 @@ class KoniTabs {
             throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INTERNAL_ERROR, 'Currently HTTP provider for EVM network');
           }
           const provider = filteredUrls[0];
-          const chainInfo = await this.#koniState.validateCustomChain(provider);
-          if (!chainInfo.success) {
-            throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
-          }
+          const chainInfo = {
+            existentialDeposit: '0',
+            genesisHash: '',
+            success: true,
+            addressPrefix: '',
+            evmChainId: chainIdNum,
+            decimals: decimals,
+            symbol: symbol,
+            paraId: null,
+            name: chainName
+          };
           const newProviderKey = (0, _utils._generateCustomProviderKey)(0);
-          return await this.#koniState.addNetworkConfirm(id, url, {
+          const networkData = {
             mode: 'insert',
             chainSpec: {
               evmChainId: chainInfo.evmChainId,
@@ -532,8 +558,31 @@ class KoniTabs {
               symbol: chainInfo.symbol,
               chainType: 'EVM',
               name: chainInfo.name
+            },
+            unconfirmed: true
+          };
+          this.#koniState.validateCustomChain(provider).then(res => {
+            if (!res.success) {
+              networkData.providerError = res.error;
+            } else {
+              networkData.chainSpec = {
+                evmChainId: res.evmChainId,
+                decimals: res.decimals,
+                existentialDeposit: res.existentialDeposit,
+                genesisHash: res.genesisHash,
+                paraId: res.paraId,
+                addressPrefix: res.addressPrefix ? parseInt(res.addressPrefix) : 0
+              };
+              networkData.chainEditInfo.symbol = res.symbol;
+              networkData.chainEditInfo.name = res.name;
             }
+          }).catch(() => {
+            networkData.providerError = _types2._CHAIN_VALIDATION_ERROR.NONE;
+          }).finally(() => {
+            networkData.unconfirmed = false;
+            this.#koniState.requestService.updateConfirmation(id, 'addNetworkRequest', networkData);
           });
+          return await this.#koniState.addNetworkConfirm(id, url, networkData);
         } else {
           throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }

package/cjs/koni/background/subscription.js

@@ -26,7 +26,8 @@ class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,
     balance: undefined,
-    stakingOnChain: undefined
+    stakingOnChain: undefined,
+    essentialChainStakingMetadata: undefined
   };
   constructor(state, dbService) {
     this.dbService = dbService;
@@ -105,11 +106,38 @@ class KoniSubscription {
       return;
     }
     this.updateSubscription('stakingOnChain', this.initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime));
+    this.updateSubscription('essentialChainStakingMetadata', this.initEssentialChainStakingMetadataSubscription(substrateApiMap, onlyRunOnFirstTime)); // TODO: might not need to re-subscribe on changing account
   }
+
   initStakingOnChainSubscription(addresses, substrateApiMap, onlyRunOnFirstTime) {
-    const unsub = (0, _staking.stakingOnChainApi)(addresses, substrateApiMap, (networkKey, rs) => {
+    const stakingCallback = (networkKey, rs) => {
       this.state.setStakingItem(networkKey, rs);
-    }, this.state.getActiveChainInfoMap());
+    };
+    const nominatorStateCallback = nominatorMetadata => {
+      this.state.updateStakingNominatorMetadata(nominatorMetadata);
+    };
+    const unsub = (0, _staking.stakingOnChainApi)(addresses, substrateApiMap, this.state.getActiveChainInfoMap(), stakingCallback, nominatorStateCallback);
+    if (onlyRunOnFirstTime) {
+      unsub && unsub();
+      return;
+    }
+    return () => {
+      unsub && unsub();
+    };
+  }
+  initEssentialChainStakingMetadataSubscription(substrateApiMap, onlyRunOnFirstTime) {
+    const unsub = (0, _bonding.subscribeEssentialChainStakingMetadata)(substrateApiMap, this.state.getActiveChainInfoMap(), (networkKey, rs) => {
+      this.state.updateChainStakingMetadata(rs, {
+        era: rs.era,
+        minStake: rs.minStake,
+        maxValidatorPerNominator: rs.maxValidatorPerNominator,
+        // temporary fix for Astar, there's no limit for now
+        maxWithdrawalRequestPerValidator: rs.maxWithdrawalRequestPerValidator,
+        // by default
+        allowCancelUnstaking: rs.allowCancelUnstaking,
+        unstakingPeriod: rs.unstakingPeriod
+      });
+    });
     if (onlyRunOnFirstTime) {
       unsub && unsub();
       return;
@@ -183,8 +211,9 @@ class KoniSubscription {
         targetNetworkMap[key] = network;
       }
     });
-    const result = await (0, _staking.getNominationStakingRewardData)(addresses, targetNetworkMap);
-    this.state.updateStakingReward(result, 'slowInterval');
+    await (0, _staking.getNominationStakingRewardData)(addresses, targetNetworkMap, rewardItem => {
+      this.state.updateStakingReward(rewardItem);
+    });
   }
   async subscribeStakingRewardFastInterval(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -211,9 +240,10 @@ class KoniSubscription {
     Object.keys(targetChainMap).forEach(key => {
       activeNetworks.push(key);
     });
-    const [poolingStakingRewards, amplitudeUnclaimedStakingRewards] = await Promise.all([(0, _staking.getPoolingStakingRewardData)(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap()), (0, _paraChain.getAmplitudeUnclaimedStakingReward)(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks)]);
-    const result = [...poolingStakingRewards, ...amplitudeUnclaimedStakingRewards];
-    this.state.updateStakingReward(result, 'fastInterval');
+    const updateState = result => {
+      this.state.updateStakingReward(result);
+    };
+    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 {
@@ -237,16 +267,31 @@ class KoniSubscription {
     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 this.fetchingStakingFromApi();
+    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[chainInfo.slug]) {
-        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug]);
+      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);
+        this.state.updateChainStakingMetadata(chainStakingMetadata, {
+          expectedReturn: chainStakingMetadata.expectedReturn,
+          inflation: chainStakingMetadata.inflation,
+          nominatorCount: chainStakingMetadata.nominatorCount
+        });
       }
     }));
   }

package/cjs/packageInfo.js

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

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

@@ -121,7 +121,12 @@ function _isPureSubstrateChain(chainInfo) {
 }
 function _getOriginChainOfAsset(assetSlug) {
   if (assetSlug.startsWith(_types2._CUSTOM_PREFIX)) {
-    return assetSlug.split('-')[1];
+    const arr = assetSlug.split('-').slice(1);
+    if (arr[0] === 'custom') {
+      const end = arr.findIndex(str => Object.values(_types._AssetType).includes(str));
+      return arr.slice(0, end).join('-');
+    }
+    return arr[0];
   }
   return assetSlug.split('-')[0];
 }

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

@@ -19,8 +19,8 @@ class MigrationService {
   async run() {
     const keys = Object.keys(_scripts.default).sort((a, b) => a.localeCompare(b));
 
-    // Await timeout 2s
-    await new Promise(resolve => setTimeout(resolve, 2000));
+    // Await timeout 1s
+    await new Promise(resolve => setTimeout(resolve, 1000));
     for (let i = 0; i < keys.length; i++) {
       try {
         const JobClass = _scripts.default[keys[i]];

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

@@ -81,6 +81,29 @@ class EvmRequestHandler {
     this.#requestService.updateIconV2();
     return promise;
   }
+  updateConfirmation(id, type, payload) {
+    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    let validator = arguments.length > 4 ? arguments[4] : undefined;
+    const confirmations = this.confirmationsQueueSubject.getValue();
+    const confirmationType = confirmations[type];
+
+    // Check duplicate request
+    const exists = confirmationType[id];
+    if (!exists) {
+      throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.INVALID_PARAMS, 'Request does not exist');
+    }
+    const payloadJson = JSON.stringify(payload);
+    confirmationType[id] = {
+      ...exists,
+      payload,
+      payloadJson,
+      ...options
+    };
+    if (validator) {
+      this.confirmationsPromiseMap[id].validator = validator;
+    }
+    this.confirmationsQueueSubject.next(confirmations);
+  }
   async signMessage(confirmation) {
     const {
       account,

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

@@ -164,6 +164,11 @@ class RequestService {
   async completeConfirmation(request) {
     return await this.#evmRequestHandler.completeConfirmation(request);
   }
+  updateConfirmation(id, type, payload) {
+    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    let validator = arguments.length > 4 ? arguments[4] : undefined;
+    return this.#evmRequestHandler.updateConfirmation(id, type, payload, options, validator);
+  }
 
   // General methods
   get numRequests() {

package/cjs/services/storage-service/DatabaseService.js

@@ -106,8 +106,8 @@ class DatabaseService {
       next: data => callback && callback(data)
     });
   }
-  subscribeNominatorMetadata(callback) {
-    this.stores.nominatorMetadata.subscribeAll().subscribe({
+  subscribeNominatorMetadata(addresses, callback) {
+    return this.stores.nominatorMetadata.subscribeByAddresses(addresses).subscribe({
       next: data => callback && callback(data)
     });
   }
@@ -198,7 +198,11 @@ class DatabaseService {
   }
 
   // Staking
-  async updateChainStakingMetadata(item) {
+  async updateChainStakingMetadata(item, changes) {
+    const existingRecord = await this.stores.chainStakingMetadata.getByChainAndType(item.chain, item.type);
+    if (existingRecord && changes) {
+      return this.stores.chainStakingMetadata.updateByChainAndType(item.chain, item.type, changes);
+    }
     return this.stores.chainStakingMetadata.upsert(item);
   }
   async getChainStakingMetadata() {

package/cjs/services/storage-service/db-stores/ChainStakingMetadata.js

@@ -34,5 +34,10 @@ class ChainStakingMetadataStore extends _BaseStoreWithChain.default {
   async removeByChains(chains) {
     return this.table.where('chain').anyOfIgnoreCase(chains).delete();
   }
+  updateByChainAndType(chain) {
+    let type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _KoniTypes.StakingType.NOMINATED;
+    let changes = arguments.length > 2 ? arguments[2] : undefined;
+    return this.table.update([chain, type], changes);
+  }
 }
 exports.default = ChainStakingMetadataStore;

package/cjs/services/storage-service/db-stores/NominatorMetadata.js

@@ -14,14 +14,14 @@ class NominatorMetadataStore extends _BaseStoreWithAddressAndChain.default {
   async getAll() {
     return this.table.toArray();
   }
-  subscribeByAddress(address) {
-    return (0, _dexie.liveQuery)(() => this.getByAddress(address));
+  subscribeByAddresses(addresses) {
+    return (0, _dexie.liveQuery)(() => this.getByAddress(addresses));
   }
   subscribeAll() {
     return (0, _dexie.liveQuery)(() => this.getAll());
   }
-  getByAddress(address) {
-    return this.table.where('address').anyOfIgnoreCase(address).toArray();
+  getByAddress(addresses) {
+    return this.table.where('address').anyOfIgnoreCase(addresses).toArray();
   }
   async removeByAddress(address) {
     return this.table.where('address').anyOfIgnoreCase(address).delete();

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

@@ -644,7 +644,12 @@ class TransactionService {
     if (!payload.parseData) {
       const isToContract = await (0, _parseTransaction.isContractAddress)(payload.to || '', evmApi);
       payload.isToContract = isToContract;
-      payload.parseData = isToContract ? payload.data ? (await (0, _parseTransaction.parseContractInput)(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
+      try {
+        payload.parseData = isToContract ? payload.data ? (await (0, _parseTransaction.parseContractInput)(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
+      } catch (e) {
+        console.warn('Unable to parse contract input data');
+        payload.parseData = payload.data;
+      }
     }
     if ('data' in payload && payload.data === undefined) {
       delete payload.data;

package/constants/index.d.ts

@@ -6,7 +6,7 @@ export declare const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
 export declare const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
 export declare const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export declare const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 45000;
+export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
 export declare const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export declare const CRON_GET_API_MAP_STATUS = 10000;
 export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;

package/constants/index.js

@@ -9,7 +9,7 @@ export const ASTAR_REFRESH_BALANCE_INTERVAL = 60000;
 export const SUB_TOKEN_REFRESH_BALANCE_INTERVAL = 60000;
 export const CRON_REFRESH_NFT_INTERVAL = 7200000;
 export const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
-export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 45000;
+export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
 export const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 export const CRON_GET_API_MAP_STATUS = 10000;
 export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;

package/koni/api/staking/bonding/amplitude.d.ts

@@ -1,7 +1,11 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { ChainStakingMetadata, NominatorMetadata, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { ParachainStakingStakeOption } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { Codec } from '@polkadot/types/types';
+export declare function subscribeAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi, callback: (chain: string, rs: ChainStakingMetadata) => void): Promise<Codec>;
 export declare function getAmplitudeStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
+export declare function subscribeAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi, delegatorState: ParachainStakingStakeOption, unstakingInfo: Record<string, number>): Promise<NominatorMetadata>;
 export declare function getAmplitudeNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
 export declare function getAmplitudeCollatorsInfo(chain: string, substrateApi: _SubstrateApi): Promise<ValidatorInfo[]>;
 export declare function getAmplitudeBondingExtrinsic(substrateApi: _SubstrateApi, amount: string, selectedValidatorInfo: ValidatorInfo, nominatorMetadata?: NominatorMetadata): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;