@subwallet/extension-base 1.1.1 → 1.1.2-1

package/koni/background/subscription.d.ts

@@ -1,5 +1,4 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
-import { ChainStakingMetadata } from '@subwallet/extension-base/background/KoniTypes';
 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';
@@ -27,8 +26,6 @@ export declare class KoniSubscription {
     initNftSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>): void;
     subscribeStakingReward(address: string): Promise<void>;
     subscribeStakingRewardFastInterval(address: string): Promise<void>;
-    fetchingStakingFromApi(): Promise<Record<string, ChainStakingMetadata>>;
-    fetchChainStakingMetadata(chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>): Promise<void>;
-    fetchNominatorMetadata(currentAddress: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>): Promise<void>;
+    reloadStaking(): Promise<void>;
 }
 export {};

package/koni/background/subscription.js

@@ -1,20 +1,16 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-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, subscribeEssentialChainStakingMetadata } from '@subwallet/extension-base/koni/api/staking/bonding';
-import { getRelayChainPoolMemberMetadata } from '@subwallet/extension-base/koni/api/staking/bonding/relayChain';
+import { subscribeEssentialChainStakingMetadata } from '@subwallet/extension-base/koni/api/staking/bonding';
 import { getAmplitudeUnclaimedStakingReward } from '@subwallet/extension-base/koni/api/staking/paraChain';
 import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
-import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _isChainEnabled, _isChainEvmCompatible, _isChainSupportSubstrateStaking, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isChainEnabled, _isChainSupportSubstrateStaking } from '@subwallet/extension-base/services/chain-service/utils';
 import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
-import axios from 'axios';
+import { waitTimeout } from '@subwallet/extension-base/utils';
 import { logger as createLogger } from '@polkadot/util';
-import { isEthereumAddress } from '@polkadot/util-crypto';
 export class KoniSubscription {
   subscriptionMap = {
     crowdloan: undefined,
@@ -186,7 +182,7 @@ export class KoniSubscription {
     nftHandler.setDotSamaApiMap(substrateApiMap);
     nftHandler.setWeb3ApiMap(evmApiMap);
     nftHandler.setAddresses(addresses);
-    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args), (...args) => this.state.cleanUpNfts(...args)).catch(this.logger.log);
+    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args)).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -234,85 +230,10 @@ export class KoniSubscription {
     };
     await Promise.all([getPoolingStakingRewardData(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap(), updateState), getAmplitudeUnclaimedStakingReward(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks, updateState)]);
   }
-  async fetchingStakingFromApi() {
-    try {
-      const response = await axios.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 && _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 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 && _isChainSupportSubstrateStaking(chainInfo)) {
-        filteredChainInfoMap[chainInfo.slug] = chainInfo;
-      }
-    });
-    let addresses = [currentAddress];
-    if (currentAddress === ALL_ACCOUNT_KEY) {
-      addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
-    }
-    await Promise.all(addresses.map(async address => {
-      const isEvmAddress = isEthereumAddress(address);
-      await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
-        if (isEvmAddress && !_isChainEvmCompatible(chainInfo)) {
-          return;
-        }
-        if (_isSubstrateRelayChain(chainInfo) && _STAKING_CHAIN_GROUP.nominationPool.includes(chainInfo.slug)) {
-          const poolMemberMetadata = await getRelayChainPoolMemberMetadata(chainInfo, address, substrateApiMap[chainInfo.slug]);
-          if (poolMemberMetadata) {
-            this.state.updateStakingNominatorMetadata(poolMemberMetadata);
-          }
-        }
-        const nominatorMetadata = await 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 waitTimeout(1800);
   }
 }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.2-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1129,6 +1129,11 @@
       "types": "./utils/request.d.ts",
       "require": "./cjs/utils/request.js",
       "default": "./utils/request.js"
+    },
+    "./utils/translate": {
+      "types": "./utils/translate.d.ts",
+      "require": "./cjs/utils/translate.js",
+      "default": "./utils/translate.js"
     }
   },
   "dependencies": {
@@ -1158,11 +1163,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.2.4",
-    "@subwallet/extension-base": "^1.1.1",
-    "@subwallet/extension-chains": "^1.1.1",
-    "@subwallet/extension-dapp": "^1.1.1",
-    "@subwallet/extension-inject": "^1.1.1",
+    "@subwallet/chain-list": "^0.2.5",
+    "@subwallet/extension-base": "^1.1.2-1",
+    "@subwallet/extension-chains": "^1.1.2-1",
+    "@subwallet/extension-dapp": "^1.1.2-1",
+    "@subwallet/extension-inject": "^1.1.2-1",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.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.1.1'
+  version: '1.1.2-1'
 };

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

@@ -66,6 +66,7 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     riochain: string[];
     sora_substrate: string[];
     avail: string[];
+    pendulum: string[];
 };
 export declare const _BALANCE_PARSING_CHAIN_GROUP: {
     bobabeam: string[];

package/services/chain-service/constants.js

@@ -26,7 +26,7 @@ export 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
 };
@@ -51,7 +51,7 @@ export 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'],
@@ -84,6 +84,7 @@ export const _STAKING_ERA_LENGTH_MAP = {
   calamari_test: 6,
   amplitude: 2,
   amplitude_test: 2,
+  pendulum: 2,
   kilt: 2,
   kilt_peregrine: 2
 };
@@ -184,7 +185,8 @@ export const _TRANSFER_CHAIN_GROUP = {
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
-  avail: ['kate']
+  avail: ['kate'],
+  pendulum: ['pendulum']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']
@@ -212,7 +214,7 @@ export const _XCM_TYPE = {
 export const _DEFAULT_ACTIVE_CHAINS = [..._DEFAULT_CHAINS];
 
 // TODO: review
-const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni/dev/issue-15' : 'master';
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 export const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 export const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
 export const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;

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

@@ -1,6 +1,11 @@
-import { BrowserConfirmationType, ThemeNames, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
+import { BrowserConfirmationType, LanguageType, ThemeNames, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
 export declare const DEFAULT_THEME: ThemeNames;
 export declare const DEFAULT_NOTIFICATION_TYPE: BrowserConfirmationType;
 export declare const DEFAULT_AUTO_LOCK_TIME = 15;
 export declare const DEFAULT_CHAIN_PATROL_ENABLE = false;
+export declare const DEFAULT_LANGUAGE: LanguageType;
+export declare const DEFAULT_SHOW_ZERO_BALANCE = true;
+export declare const DEFAULT_SHOW_BALANCE = false;
+export declare const DEFAULT_ALL_LOGO = "";
+export declare const DEFAULT_CAMERA_ENABLE = false;
 export declare const DEFAULT_SETTING: UiSettings;

package/services/setting-service/constants.js

@@ -6,14 +6,19 @@ export const DEFAULT_THEME = ThemeNames.DARK;
 export const DEFAULT_NOTIFICATION_TYPE = 'popup';
 export const DEFAULT_AUTO_LOCK_TIME = 15;
 export const DEFAULT_CHAIN_PATROL_ENABLE = false;
+export const DEFAULT_LANGUAGE = 'en';
+export const DEFAULT_SHOW_ZERO_BALANCE = true;
+export const DEFAULT_SHOW_BALANCE = false;
+export const DEFAULT_ALL_LOGO = '';
+export const DEFAULT_CAMERA_ENABLE = false;
 export const DEFAULT_SETTING = {
-  // language: 'en',
+  language: DEFAULT_LANGUAGE,
   browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
-  // isShowZeroBalance: true,
-  isShowBalance: false,
-  accountAllLogo: '',
+  isShowZeroBalance: DEFAULT_SHOW_ZERO_BALANCE,
+  isShowBalance: DEFAULT_SHOW_BALANCE,
+  accountAllLogo: DEFAULT_ALL_LOGO,
   theme: DEFAULT_THEME,
-  camera: false,
+  camera: DEFAULT_CAMERA_ENABLE,
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
   enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
 };

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

@@ -56,6 +56,7 @@ export default class DatabaseService {
     addNft(address: string, nft: NftItem): Promise<unknown>;
     handleNftTransfer(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;
     removeNfts(chain: string, address: string, collectionId: string, nftIds: string[]): import("dexie").PromiseExtended<number>;
+    removeNftsByAddress(address: string): import("dexie").PromiseExtended<number>;
     updateChainStore(item: IChain): Promise<unknown>;
     bulkUpdateChainStore(data: IChain[]): Promise<unknown>;
     removeFromChainStore(chains: string[]): Promise<number>;

package/services/storage-service/DatabaseService.js

@@ -171,6 +171,9 @@ export default class DatabaseService {
   removeNfts(chain, address, collectionId, nftIds) {
     return this.stores.nft.removeNfts(chain, address, collectionId, nftIds);
   }
+  removeNftsByAddress(address) {
+    return this.stores.nft.removeNftsByAddress([address]);
+  }
 
   // Chain
   async updateChainStore(item) {

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

@@ -10,4 +10,5 @@ export default class NftStore extends BaseStoreWithAddressAndChain<INft> {
     deleteNftItem(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;
     deleteNftsByCollection(chain: string, collectionId: string): import("dexie").PromiseExtended<number>;
     removeNfts(chain: string, address: string, collectionId: string, nftIds: string[]): import("dexie").PromiseExtended<number>;
+    removeNftsByAddress(addresses: string[]): import("dexie").PromiseExtended<number>;
 }

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

@@ -46,6 +46,9 @@ export default class NftStore extends BaseStoreWithAddressAndChain {
       collectionId
     }).filter(item => nftIds.includes(item.id || '')).delete();
   }
+  removeNftsByAddress(addresses) {
+    return this.table.where('address').anyOfIgnoreCase(addresses).delete();
+  }
 
   // reformatCollectionIds (items: INft[]) {
   //   return items.map((item) => {

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

@@ -1,11 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { StakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import BaseStoreWithAddressAndChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain';
 import { liveQuery } from 'dexie';
 export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain {
   async getAll() {
-    return this.table.toArray();
+    return this.table.filter(item => item.status !== StakingStatus.NOT_STAKING).toArray();
   }
   subscribeByAddresses(addresses) {
     return liveQuery(() => this.getByAddress(addresses));
@@ -14,7 +15,7 @@ export default class NominatorMetadataStore extends BaseStoreWithAddressAndChain
     return liveQuery(() => this.getAll());
   }
   getByAddress(addresses) {
-    return this.table.where('address').anyOfIgnoreCase(addresses).toArray();
+    return this.table.where('address').anyOfIgnoreCase(addresses).and(item => item.status !== StakingStatus.NOT_STAKING).toArray();
   }
   async removeByAddress(address) {
     return this.table.where('address').anyOfIgnoreCase(address).delete();

package/utils/index.d.ts

@@ -41,3 +41,4 @@ export declare const stripUrl: (url: string) => string;
 export * from './array';
 export * from './environment';
 export * from './lazy';
+export * from './translate';

package/utils/index.js

@@ -286,4 +286,5 @@ export const stripUrl = url => {
 };
 export * from "./array.js";
 export * from "./environment.js";
-export * from "./lazy.js";
+export * from "./lazy.js";
+export * from "./translate.js";

package/utils/translate.d.ts

@@ -0,0 +1 @@
+export declare const detectTranslate: (message: string) => string;

package/utils/translate.js

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export const detectTranslate = message => message;