@subwallet/extension-base 1.0.7-0 → 1.0.7-2

package/koni/api/staking/subsquidStaking.d.ts

@@ -1,3 +1,3 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { StakingRewardItem } from '@subwallet/extension-base/background/KoniTypes';
-export declare const getAllSubsquidStaking: (accounts: string[], chainInfoMap: Record<string, _ChainInfo>) => Promise<StakingRewardItem[]>;
+export declare const getAllSubsquidStaking: (accounts: string[], chainInfoMap: Record<string, _ChainInfo>, callback: (rewardItem: StakingRewardItem) => void) => Promise<void>;

package/koni/api/staking/subsquidStaking.js

@@ -32,9 +32,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 (_isChainEvmCompatible(chainInfoMap[chain]) && isEthereumAddress(account) || !_isChainEvmCompatible(chainInfoMap[chain]) && !isEthereumAddress(account)) {
         const parsedAccount = reformatAddress(account, _getChainSubstrateAddressPrefix(chainInfoMap[chain]));
@@ -70,17 +69,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);
   }
 };
-export const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
-  let rewardList = [];
+export const getAllSubsquidStaking = async (accounts, chainInfoMap, callback) => {
   const filteredNetworks = [];
   Object.values(chainInfoMap).forEach(network => {
     if (INDEXER_SUPPORTED_STAKING_CHAINS.includes(network.slug)) {
@@ -89,11 +86,9 @@ export 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;
 };

package/koni/background/cron.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, CRON_GET_API_MAP_STATUS, CRON_REFRESH_CHAIN_NOMINATOR_METADATA, CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
+import { CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, CRON_GET_API_MAP_STATUS, CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
 import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportSubstrateStaking, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
@@ -49,26 +49,6 @@ export 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;
@@ -109,7 +89,6 @@ export 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
@@ -122,7 +101,6 @@ export class KoniCron {
         chainUpdated && this.addCron('recoverApiMap', this.recoverApiMap, CRON_AUTO_RECOVER_DOTSAMA_INTERVAL, false);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
         (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
         needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
       } else {
         this.setStakingRewardReady();
@@ -140,7 +118,6 @@ export class KoniCron {
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
       this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
-      this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(currentAccountInfo.address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
     } else {
       this.setStakingRewardReady();
     }
@@ -235,10 +212,8 @@ export class KoniCron {
     this.resetStakingReward();
     this.removeCron('refreshStakingReward');
     this.removeCron('refreshPoolingStakingReward');
-    this.removeCron('updateNominatorMetadata');
     this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
     this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-    this.addCron('updateNominatorMetadata', this.updateNominatorMetadata(address, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_NOMINATOR_METADATA);
     await waitTimeout(1800);
     return true;
   }

package/koni/background/handlers/Extension.js

@@ -6,7 +6,8 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/extension-base/background/handlers/Extension';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { AccountExternalErrorCode, BasicTxErrorType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
@@ -1423,6 +1424,17 @@ export default class KoniExtension {
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     this.addContact(to);
+    const additionalValidator = async inputTransaction => {
+      if (!isTransferNativeToken) {
+        const {
+          value: balance
+        } = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
+        const minAmount = tokenInfo.minAmount || '0';
+        if (new BigN(balance).minus(transferAmount.value).lt(minAmount)) {
+          inputTransaction.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+        }
+      }
+    };
     return this.#koniState.transactionService.handleTransaction({
       errors,
       warnings,
@@ -1434,8 +1446,9 @@ export default class KoniExtension {
       data: inputData,
       extrinsicType: isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
-      isTransferAll: transferAll,
-      edAsWarning: isTransferNativeToken
+      isTransferAll: isTransferNativeToken ? transferAll : false,
+      edAsWarning: true,
+      additionalValidator: additionalValidator
     });
   }
   validateCrossChainTransfer(destinationNetworkKey, sendingTokenSlug, sender, sendingValue) {
@@ -1524,8 +1537,11 @@ export default class KoniExtension {
   disableChain(networkKey) {
     return this.#koniState.disableChain(networkKey);
   }
-  async enableChain(networkKey) {
-    return await this.#koniState.enableChain(networkKey);
+  async enableChain({
+    chainSlug,
+    enableTokens
+  }) {
+    return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
   async validateNetwork({
     existedChainSlug,
@@ -1715,9 +1731,15 @@ export default class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(targetKeys) {
+  async enableChains({
+    chainSlugs,
+    enableTokens
+  }) {
     try {
-      await Promise.all(targetKeys.map(networkKey => this.enableChain(networkKey)));
+      await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
+        chainSlug,
+        enableTokens
+      })));
     } catch (e) {
       return false;
     }

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

@@ -101,7 +101,7 @@ export default class KoniState {
     subscribeNominatorMetadata(): Subject<NominatorMetadata[]>;
     ensureUrlAuthorizedV2(url: string): Promise<boolean>;
     setStakingItem(networkKey: string, item: StakingItem): void;
-    updateChainStakingMetadata(item: ChainStakingMetadata): void;
+    updateChainStakingMetadata(item: ChainStakingMetadata, changes?: Record<string, unknown>): void;
     updateStakingNominatorMetadata(item: NominatorMetadata): void;
     setNftCollection(network: string, data: NftCollection, callback?: (data: NftCollection) => void): void;
     getNftCollection(): import("dexie").PromiseExtended<NftCollection[]>;
@@ -113,7 +113,7 @@ export default class KoniState {
     getNft(): Promise<NftJson | undefined>;
     subscribeNft(): Subject<NftJson>;
     resetStakingReward(): void;
-    updateStakingReward(stakingRewardData: StakingRewardItem[], type: 'slowInterval' | 'fastInterval', callback?: (stakingRewardData: StakingRewardJson) => void): void;
+    updateStakingReward(stakingRewardData: StakingRewardItem, callback?: (stakingRewardData: StakingRewardJson) => void): void;
     updateStakingRewardReady(ready: boolean): void;
     getAccountRefMap(callback: (refMap: Record<string, Array<string>>) => void): void;
     addAccountRef(addresses: string[], callback: () => void): void;

package/koni/background/handlers/State.js

@@ -69,8 +69,7 @@ export default class KoniState {
   stakingRewardSubject = new Subject();
   stakingRewardState = {
     ready: false,
-    slowInterval: [],
-    fastInterval: []
+    data: {}
   };
   lazyMap = {};
   ready = false;
@@ -193,18 +192,24 @@ export default 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() {
@@ -296,14 +301,6 @@ export default 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;
   }
@@ -319,8 +316,8 @@ export default 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));
@@ -373,12 +370,13 @@ export default 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);
     }

package/koni/background/subscription.d.ts

@@ -3,7 +3,7 @@ import { ChainStakingMetadata } from '@subwallet/extension-base/background/KoniT
 import { _ChainState, _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import KoniState from './handlers/State';
-declare type SubscriptionName = 'balance' | 'crowdloan' | 'stakingOnChain';
+declare type SubscriptionName = 'balance' | 'crowdloan' | 'stakingOnChain' | 'essentialChainStakingMetadata';
 export declare class KoniSubscription {
     private eventHandler?;
     private subscriptionMap;
@@ -20,6 +20,7 @@ export declare class KoniSubscription {
     subscribeBalancesAndCrowdloans(address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, web3ApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): void;
     subscribeStakingOnChain(address: string, substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): void;
     initStakingOnChainSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
+    initEssentialChainStakingMetadataSubscription(substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     initBalanceSubscription(addresses: string[], chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     initCrowdloanSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, onlyRunOnFirstTime?: boolean): (() => void) | undefined;
     subscribeNft(address: string, substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>): void;

package/koni/background/subscription.js

@@ -5,7 +5,7 @@ import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { subscribeBalance } from '@subwallet/extension-base/koni/api/dotsama/balance';
 import { subscribeCrowdloan } from '@subwallet/extension-base/koni/api/dotsama/crowdloan';
 import { getNominationStakingRewardData, getPoolingStakingRewardData, stakingOnChainApi } from '@subwallet/extension-base/koni/api/staking';
-import { getChainStakingMetadata, getNominatorMetadata } from '@subwallet/extension-base/koni/api/staking/bonding';
+import { getChainStakingMetadata, getNominatorMetadata, subscribeEssentialChainStakingMetadata } from '@subwallet/extension-base/koni/api/staking/bonding';
 import { getRelayChainPoolMemberMetadata } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
 import { getAmplitudeUnclaimedStakingReward } from '@subwallet/extension-base/koni/api/staking/paraChain';
 import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
@@ -19,7 +19,8 @@ export class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,
     balance: undefined,
-    stakingOnChain: undefined
+    stakingOnChain: undefined,
+    essentialChainStakingMetadata: undefined
   };
   constructor(state, dbService) {
     this.dbService = dbService;
@@ -98,11 +99,38 @@ export 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 = 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 = stakingOnChainApi(addresses, substrateApiMap, this.state.getActiveChainInfoMap(), stakingCallback, nominatorStateCallback);
+    if (onlyRunOnFirstTime) {
+      unsub && unsub();
+      return;
+    }
+    return () => {
+      unsub && unsub();
+    };
+  }
+  initEssentialChainStakingMetadataSubscription(substrateApiMap, onlyRunOnFirstTime) {
+    const unsub = 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;
@@ -168,8 +196,9 @@ export class KoniSubscription {
         targetNetworkMap[key] = network;
       }
     });
-    const result = await getNominationStakingRewardData(addresses, targetNetworkMap);
-    this.state.updateStakingReward(result, 'slowInterval');
+    await getNominationStakingRewardData(addresses, targetNetworkMap, rewardItem => {
+      this.state.updateStakingReward(rewardItem);
+    });
   }
   async subscribeStakingRewardFastInterval(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -195,9 +224,10 @@ export class KoniSubscription {
     Object.keys(targetChainMap).forEach(key => {
       activeNetworks.push(key);
     });
-    const [poolingStakingRewards, amplitudeUnclaimedStakingRewards] = await Promise.all([getPoolingStakingRewardData(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap()), 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([getPoolingStakingRewardData(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), getAmplitudeUnclaimedStakingReward(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
   }
   async fetchingStakingFromApi() {
     try {
@@ -221,16 +251,31 @@ export 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 getChainStakingMetadata(chainInfo, substrateApiMap[chainInfo.slug]);
-        this.state.updateChainStakingMetadata(chainStakingMetadata);
+        this.state.updateChainStakingMetadata(chainStakingMetadata, {
+          expectedReturn: chainStakingMetadata.expectedReturn,
+          inflation: chainStakingMetadata.inflation,
+          nominatorCount: chainStakingMetadata.nominatorCount
+        });
       }
     }));
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.7-0",
+  "version": "1.0.7-2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1698,10 +1698,10 @@
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "^0.1.9",
-    "@subwallet/extension-base": "^1.0.7-0",
-    "@subwallet/extension-chains": "^1.0.7-0",
-    "@subwallet/extension-dapp": "^1.0.7-0",
-    "@subwallet/extension-inject": "^1.0.7-0",
+    "@subwallet/extension-base": "^1.0.7-2",
+    "@subwallet/extension-chains": "^1.0.7-2",
+    "@subwallet/extension-dapp": "^1.0.7-2",
+    "@subwallet/extension-inject": "^1.0.7-2",
     "@subwallet/keyring": "^0.0.9",
     "@subwallet/ui-keyring": "^0.0.9",
     "@unique-nft/types": "^0.6.0-4",

package/packageInfo.js

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

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

@@ -36,6 +36,7 @@ export declare const _STAKING_CHAIN_GROUP: {
     nominationPool: string[];
     bifrost: string[];
     aleph: string[];
+    ternoa: string[];
 };
 export declare const _STAKING_ERA_LENGTH_MAP: Record<string, number>;
 export declare const _PARACHAIN_INFLATION_DISTRIBUTION: Record<string, Record<string, number>>;

package/services/chain-service/constants.js

@@ -55,9 +55,10 @@ export const _STAKING_CHAIN_GROUP = {
   kilt: ['kilt', 'kilt_peregrine'],
   nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph'],
   bifrost: ['bifrost', 'bifrost_testnet'],
-  aleph: ['aleph', 'alephTest'] // A0 has distinct tokenomics
+  aleph: ['aleph', 'alephTest'],
+  // A0 has distinct tokenomics
+  ternoa: ['ternoa', 'ternoa_alphanet']
 };
-
 export const _STAKING_ERA_LENGTH_MAP = {
   // in hours
   alephTest: 24,

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

@@ -93,6 +93,14 @@ export declare type _NetworkUpsertParams = {
     providerError?: _CHAIN_VALIDATION_ERROR;
 };
 export declare const _CUSTOM_PREFIX = "custom-";
+export interface EnableChainParams {
+    chainSlug: string;
+    enableTokens?: boolean;
+}
+export interface EnableMultiChainParams {
+    chainSlugs: string[];
+    enableTokens?: boolean;
+}
 export interface _ValidateCustomAssetRequest {
     contractAddress: string;
     originChain: string;

package/services/chain-service/utils.js

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

package/services/storage-service/DatabaseService.d.ts

@@ -38,7 +38,7 @@ export default class DatabaseService {
     getPooledStakings(addresses: string[], chainHashes?: string[]): Promise<StakingItem[]>;
     subscribeStaking(addresses: string[], chainList?: string[], callback?: (stakingItems: StakingItem[]) => void): Subscription;
     subscribeChainStakingMetadata(chains: string[], callback: (data: ChainStakingMetadata[]) => void): void;
-    subscribeNominatorMetadata(callback: (data: NominatorMetadata[]) => void): void;
+    subscribeNominatorMetadata(addresses: string[], callback: (data: NominatorMetadata[]) => void): Subscription;
     getHistories(query?: HistoryQuery): Promise<import("@subwallet/extension-base/services/storage-service/databases").ITransactionHistoryItem[]>;
     upsertHistory(histories: TransactionHistoryItem[]): Promise<unknown>;
     updateHistoryByExtrinsicHash(extrinsicHash: string, updateData: Partial<TransactionHistoryItem>): Promise<unknown>;
@@ -58,7 +58,7 @@ export default class DatabaseService {
     updateAssetStore(item: _ChainAsset): Promise<unknown>;
     getAllAssetStore(): Promise<_ChainAsset[]>;
     removeFromAssetStore(items: string[]): Promise<number>;
-    updateChainStakingMetadata(item: ChainStakingMetadata): Promise<unknown>;
+    updateChainStakingMetadata(item: ChainStakingMetadata, changes?: Record<string, unknown>): Promise<unknown>;
     getChainStakingMetadata(): Promise<ChainStakingMetadata[]>;
     getStakingMetadataByChain(chain: string, type?: StakingType): Promise<ChainStakingMetadata | undefined>;
     updateNominatorMetadata(item: NominatorMetadata): Promise<unknown>;

package/services/storage-service/DatabaseService.js

@@ -99,8 +99,8 @@ export default 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)
     });
   }
@@ -191,7 +191,11 @@ export default 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/services/storage-service/db-stores/ChainStakingMetadata.d.ts

@@ -6,4 +6,5 @@ export default class ChainStakingMetadataStore extends BaseStoreWithChain<ChainS
     getByChains(chains: string[]): Promise<ChainStakingMetadata[]>;
     getByChainAndType(chain: string, type?: StakingType): import("dexie").PromiseExtended<ChainStakingMetadata | undefined>;
     removeByChains(chains: string[]): Promise<number>;
+    updateByChainAndType(chain: string, type: StakingType | undefined, changes: Record<string, unknown>): import("dexie").PromiseExtended<number>;
 }

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

@@ -26,4 +26,7 @@ export default class ChainStakingMetadataStore extends BaseStoreWithChain {
   async removeByChains(chains) {
     return this.table.where('chain').anyOfIgnoreCase(chains).delete();
   }
+  updateByChainAndType(chain, type = StakingType.NOMINATED, changes) {
+    return this.table.update([chain, type], changes);
+  }
 }

package/services/storage-service/db-stores/NominatorMetadata.d.ts

@@ -2,8 +2,8 @@ import { NominatorMetadata } from '@subwallet/extension-base/background/KoniType
 import BaseStoreWithAddressAndChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain';
 export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain<NominatorMetadata> {
     getAll(): Promise<NominatorMetadata[]>;
-    subscribeByAddress(address: string): import("dexie").Observable<NominatorMetadata[]>;
+    subscribeByAddresses(addresses: string[]): import("dexie").Observable<NominatorMetadata[]>;
     subscribeAll(): import("dexie").Observable<NominatorMetadata[]>;
-    getByAddress(address: string): import("dexie").PromiseExtended<NominatorMetadata[]>;
+    getByAddress(addresses: string[]): import("dexie").PromiseExtended<NominatorMetadata[]>;
     removeByAddress(address: string): Promise<number>;
 }

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

@@ -7,14 +7,14 @@ export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain
   async getAll() {
     return this.table.toArray();
   }
-  subscribeByAddress(address) {
-    return liveQuery(() => this.getByAddress(address));
+  subscribeByAddresses(addresses) {
+    return liveQuery(() => this.getByAddress(addresses));
   }
   subscribeAll() {
     return 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/services/transaction-service/index.js

@@ -631,7 +631,12 @@ export default class TransactionService {
     if (!payload.parseData) {
       const isToContract = await isContractAddress(payload.to || '', evmApi);
       payload.isToContract = isToContract;
-      payload.parseData = isToContract ? payload.data ? (await parseContractInput(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
+      try {
+        payload.parseData = isToContract ? payload.data ? (await 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;