@subwallet/extension-base 1.1.5-0 → 1.1.6-1

package/background/KoniTypes.d.ts

@@ -320,6 +320,7 @@ export interface UiSettings {
     camera: boolean;
     timeAutoLock: number;
     enableChainPatrol: boolean;
+    walletReference: string;
 }
 export declare type RequestSettingsType = UiSettings;
 export declare type RequestCameraSettings = {

package/cjs/koni/api/nft/config.js

@@ -53,7 +53,7 @@ const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 exports.IPFS_GATEWAY_4EVERLAND = IPFS_GATEWAY_4EVERLAND;
 const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
 exports.IPFS_FLEEK = IPFS_FLEEK;
-const IPFS_HARDBIN = 'https://hardbin.com/ipfs';
+const IPFS_HARDBIN = 'https://hardbin.com/ipfs/';
 exports.IPFS_HARDBIN = IPFS_HARDBIN;
 let SUPPORTED_NFT_NETWORKS;
 exports.SUPPORTED_NFT_NETWORKS = SUPPORTED_NFT_NETWORKS;

package/cjs/koni/api/staking/bonding/amplitude.js

@@ -213,23 +213,24 @@ async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
   const allCollators = [];
   for (const _collator of _allCollators) {
-    const collatorInfo = _collator[1].toHuman();
-    if (typeof collatorInfo.status === 'string' && collatorInfo.status.toLowerCase() === 'active') {
-      allCollators.push({
-        address: collatorInfo.id,
-        totalStake: (0, _utils2.parseRawNumber)(collatorInfo.total).toString(),
-        ownStake: (0, _utils2.parseRawNumber)(collatorInfo.stake).toString(),
-        otherStake: ((0, _utils2.parseRawNumber)(collatorInfo.total) - (0, _utils2.parseRawNumber)(collatorInfo.stake)).toString(),
-        nominatorCount: collatorInfo.delegators.length,
-        commission: 0,
-        expectedReturn: delegatorReturn,
-        blocked: false,
-        isVerified: false,
-        minBond: '0',
-        chain,
-        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-      });
-    }
+    const collatorInfo = _collator[1].toPrimitive();
+    const bnTotalStake = new _util.BN(collatorInfo.total);
+    const bnOwnStake = new _util.BN(collatorInfo.stake);
+    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+    allCollators.push({
+      address: collatorInfo.id,
+      totalStake: bnTotalStake.toString(),
+      ownStake: bnOwnStake.toString(),
+      otherStake: bnOtherStake.toString(),
+      nominatorCount: collatorInfo.delegators.length,
+      commission: 0,
+      expectedReturn: delegatorReturn,
+      blocked: false,
+      isVerified: false,
+      minBond: '0',
+      chain,
+      isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+    });
   }
   return allCollators;
 }

package/cjs/koni/api/staking/bonding/paraChain.js

@@ -44,7 +44,7 @@ function validateParaChainUnbondingCondition(amount, nominatorMetadata, chainSta
   const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
   const bnChainMinStake = new _util.BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new _util.BN(targetNomination.validatorMinStake || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
+  const bnMinStake = _util.BN.max(bnCollatorMinStake, bnChainMinStake);
   if (targetNomination.hasUnstaking) {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
   }
@@ -101,9 +101,10 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
 }
 function subscribeParaChainStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.parachainStaking.round(_round => {
+    var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3;
     const roundObj = _round.toHuman();
     const round = (0, _utils3.parseRawNumber)(roundObj.current);
-    const maxDelegations = substrateApi.api.consts.parachainStaking.maxDelegationsPerDelegator.toString();
+    const maxDelegations = (_substrateApi$api$con = substrateApi.api.consts) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.parachainStaking) === null || _substrateApi$api$con2 === void 0 ? void 0 : (_substrateApi$api$con3 = _substrateApi$api$con2.maxDelegationsPerDelegator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
     const unstakingDelay = substrateApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
     const unstakingPeriod = parseInt(unstakingDelay) * (_constants._STAKING_ERA_LENGTH_MAP[chain] || _constants._STAKING_ERA_LENGTH_MAP.default);
     callback(chain, {
@@ -332,17 +333,21 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     const _collatorAddress = collator[0].toHuman();
     const collatorAddress = _collatorAddress[0];
     const collatorInfo = collator[1].toPrimitive();
+    const bnTotalStake = new _util.BN(collatorInfo.totalCounted);
+    const bnOwnStake = new _util.BN(collatorInfo.bond);
+    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+    const bnMinBond = new _util.BN(collatorInfo.lowestTopDelegationAmount);
     allCollators.push({
       commission: 0,
       expectedReturn: 0,
       address: collatorAddress,
-      totalStake: collatorInfo.totalCounted.toString(),
-      ownStake: collatorInfo.bond.toString(),
-      otherStake: (collatorInfo.totalCounted - collatorInfo.bond).toString(),
+      totalStake: bnTotalStake.toString(),
+      ownStake: bnOwnStake.toString(),
+      otherStake: bnOtherStake.toString(),
       nominatorCount: collatorInfo.delegationCount,
       blocked: false,
       isVerified: false,
-      minBond: collatorInfo.lowestTopDelegationAmount.toString(),
+      minBond: bnMinBond.toString(),
       chain,
       isCrowded: parseInt(maxDelegationPerCollator) > 0
     });
@@ -354,10 +359,6 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     ]);
     const rawInfo = _info.toHuman();
     const rawIdentity = _identity ? _identity.toHuman() : null;
-    const rawBond = rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.bond;
-    const bond = new _util.BN(rawBond.replaceAll(',', ''));
-    const delegationCount = (0, _utils3.parseRawNumber)(rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.delegationCount);
-    const minDelegation = (0, _utils3.parseRawNumber)(rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.lowestTopDelegationAmount);
     const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
     let isReasonable = false;
     let identity;
@@ -369,21 +370,14 @@ async function getParachainCollatorsInfo(chain, substrateApi) {
     extraInfoMap[collator.address] = {
       identity,
       isVerified: isReasonable,
-      bond: bond.toString(),
-      minDelegation: minDelegation.toString(),
-      delegationCount,
       active
     };
   }));
   for (const validator of allCollators) {
-    validator.minBond = extraInfoMap[validator.address].minDelegation.toString();
-    validator.ownStake = extraInfoMap[validator.address].bond.toString();
     validator.blocked = !extraInfoMap[validator.address].active;
     validator.identity = extraInfoMap[validator.address].identity;
     validator.isVerified = extraInfoMap[validator.address].isVerified;
     // @ts-ignore
-    validator.otherStake = (validator.totalStake - validator.ownStake).toString();
-    validator.nominatorCount = extraInfoMap[validator.address].delegationCount;
     validator.commission = collatorCommission;
   }
   return allCollators;

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

@@ -1423,12 +1423,20 @@ class KoniExtension {
   async subscribeHistory(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const historySubject = await this.#koniState.historyService.getHistorySubject();
-    historySubject.subscribe(cb);
-    this.createUnsubscriptionHandle(id, historySubject.unsubscribe);
+    const subscription = historySubject.subscribe(histories => {
+      const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+
+      // Re-filter
+      cb(histories.filter(item => addresses.includes(item.address.toLowerCase())));
+    });
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return historySubject.getValue();
+    const addresses = _uiKeyring.keyring.getAccounts().map(a => a.address.toLowerCase());
+
+    // Re-filter
+    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
   }
 
   // Save address to contact

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

@@ -894,11 +894,7 @@ class KoniTabs {
     return true;
   }
   isEvmPublicRequest(type, request) {
-    if (type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method)) {
-      return true;
-    } else {
-      return false;
-    }
+    return type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method);
   }
   async addPspToken(id, url, _ref22) {
     let {

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.5-0'
+  version: '1.1.6-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/page/SubWalleEvmProvider.js

@@ -9,11 +9,11 @@ var _safeEventEmitter = _interopRequireDefault(require("@metamask/safe-event-emi
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+let subscribeFlag = false;
 class SubWalletEvmProvider extends _safeEventEmitter.default {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;
-  _subscribed = false;
   constructor(sendMessage, version) {
     super();
     this.version = version;
@@ -27,7 +27,7 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
     return this._connected;
   }
   subscribeExtensionEvents() {
-    if (this._subscribed) {
+    if (subscribeFlag) {
       return;
     }
     this.sendMessage('evm(events.subscribe)', null, _ref => {
@@ -49,19 +49,33 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
         console.warn('Can not handle event', type, payload);
       }
     }).then(done => {
-      this._subscribed = true;
-    }).catch(console.error);
+      subscribeFlag = true;
+    }).catch(() => {
+      subscribeFlag = false;
+    });
+    subscribeFlag = true;
   }
   async enable() {
     return this.request({
       method: 'eth_requestAccounts'
     });
   }
+  on(eventName, listener) {
+    this.subscribeExtensionEvents();
+    super.on(eventName, listener);
+    return this;
+  }
+  once(eventName, listener) {
+    this.subscribeExtensionEvents();
+    super.once(eventName, listener);
+    return this;
+  }
   request(_ref2) {
     let {
       method,
       params
     } = _ref2;
+    // Subscribe events
     switch (method) {
       case 'eth_requestAccounts':
         return new Promise((resolve, reject) => {
@@ -70,9 +84,6 @@ class SubWalletEvmProvider extends _safeEventEmitter.default {
             origin,
             accountAuthType: 'evm'
           }).then(() => {
-            // Subscribe event
-            this.subscribeExtensionEvents();
-
             // Return account list
             this.request({
               method: 'eth_accounts'

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

@@ -61,13 +61,13 @@ const _NFT_CHAIN_GROUP = {
 // Staking--------------------------------------------------------------------------------------------------------------
 exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
 const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
   astar: ['astar', 'shiden', 'shibuya'],
   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'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics
@@ -100,7 +100,9 @@ const _STAKING_ERA_LENGTH_MAP = {
   amplitude_test: 2,
   pendulum: 2,
   kilt: 2,
-  kilt_peregrine: 2
+  kilt_peregrine: 2,
+  edgeware: 6,
+  kate: 6
 };
 exports._STAKING_ERA_LENGTH_MAP = _STAKING_ERA_LENGTH_MAP;
 const _PARACHAIN_INFLATION_DISTRIBUTION = {

package/cjs/services/migration-service/scripts/MigrateWalletReference.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _uuid = require("uuid");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateWalletReference extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          const walletReference = (0, _uuid.v4)();
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            walletReference: walletReference
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateWalletReference;

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

@@ -15,6 +15,7 @@ var _MigrateLedgerAccount = _interopRequireDefault(require("./MigrateLedgerAccou
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
+var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -30,7 +31,8 @@ var _default = {
   '1.0.3-01': _MigrateAutoLock.default,
   '1.0.3-02': _MigrateChainPatrol.default,
   '1.0.9-01': _MigrateLedgerAccount.default,
-  '1.0.12-02': _MigrateEthProvider.default
+  '1.0.12-02': _MigrateEthProvider.default,
+  '1.1.6-01': _MigrateWalletReference.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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

@@ -35,6 +35,7 @@ const DEFAULT_SETTING = {
   theme: DEFAULT_THEME,
   camera: DEFAULT_CAMERA_ENABLE,
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
-  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
+  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE,
+  walletReference: ''
 };
 exports.DEFAULT_SETTING = DEFAULT_SETTING;

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

@@ -14,11 +14,11 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
   getNft(addresses) {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     if (addresses.length) {
-      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => !chainList.length || chainList.includes(item.chain)).toArray();
+      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => chainList && chainList.includes(item.chain)).toArray();
     }
 
     // return this.table.filter((item) => !chainHashes.length || chainHashes.includes(item.chainHash)).toArray();
-    return this.table.filter(item => !chainList.length || chainList.includes(item.chain)).toArray();
+    return this.table.filter(item => chainList && chainList.includes(item.chain)).toArray();
   }
   subscribeNft(addresses) {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];

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

@@ -18,9 +18,9 @@ class StakingStore extends _BaseStoreWithAddressAndChain.default {
   getStakings(addresses) {
     let chainList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     if (addresses.length) {
-      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => (!chainList.length || chainList.includes(item.chain)) && parseFloat(item.balance) > 0).toArray();
+      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => chainList && chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();
     }
-    return this.table.filter(item => (!chainList.length || chainList.includes(item.chain)) && parseFloat(item.balance) > 0).toArray();
+    return this.table.filter(item => chainList && chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();
   }
   getStakingsByChains(chainList) {
     return this.table.filter(item => chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();

package/koni/api/nft/config.d.ts

@@ -20,7 +20,7 @@ export declare const GATEWAY_IPFS_IO = "https://gateway.ipfs.io/ipfs/";
 export declare const DWEB_LINK = "https://dweb.link/ipfs/";
 export declare const IPFS_GATEWAY_4EVERLAND = "https://4everland.io/ipfs/";
 export declare const IPFS_FLEEK = "https://ipfs.fleek.co/ipfs/";
-export declare const IPFS_HARDBIN = "https://hardbin.com/ipfs";
+export declare const IPFS_HARDBIN = "https://hardbin.com/ipfs/";
 export declare enum SUPPORTED_NFT_NETWORKS {
     karura = "karura",
     acala = "acala",

package/koni/api/nft/config.js

@@ -24,7 +24,7 @@ export const GATEWAY_IPFS_IO = 'https://gateway.ipfs.io/ipfs/';
 export const DWEB_LINK = 'https://dweb.link/ipfs/';
 export const IPFS_GATEWAY_4EVERLAND = 'https://4everland.io/ipfs/';
 export const IPFS_FLEEK = 'https://ipfs.fleek.co/ipfs/';
-export const IPFS_HARDBIN = 'https://hardbin.com/ipfs';
+export const IPFS_HARDBIN = 'https://hardbin.com/ipfs/';
 export let SUPPORTED_NFT_NETWORKS;
 (function (SUPPORTED_NFT_NETWORKS) {
   SUPPORTED_NFT_NETWORKS["karura"] = "karura";

package/koni/api/staking/bonding/amplitude.js

@@ -199,23 +199,24 @@ export async function getAmplitudeCollatorsInfo(chain, substrateApi) {
   const delegatorReturn = parseFloat(rawDelegatorReturn.split('%')[0]);
   const allCollators = [];
   for (const _collator of _allCollators) {
-    const collatorInfo = _collator[1].toHuman();
-    if (typeof collatorInfo.status === 'string' && collatorInfo.status.toLowerCase() === 'active') {
-      allCollators.push({
-        address: collatorInfo.id,
-        totalStake: parseRawNumber(collatorInfo.total).toString(),
-        ownStake: parseRawNumber(collatorInfo.stake).toString(),
-        otherStake: (parseRawNumber(collatorInfo.total) - parseRawNumber(collatorInfo.stake)).toString(),
-        nominatorCount: collatorInfo.delegators.length,
-        commission: 0,
-        expectedReturn: delegatorReturn,
-        blocked: false,
-        isVerified: false,
-        minBond: '0',
-        chain,
-        isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
-      });
-    }
+    const collatorInfo = _collator[1].toPrimitive();
+    const bnTotalStake = new BN(collatorInfo.total);
+    const bnOwnStake = new BN(collatorInfo.stake);
+    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+    allCollators.push({
+      address: collatorInfo.id,
+      totalStake: bnTotalStake.toString(),
+      ownStake: bnOwnStake.toString(),
+      otherStake: bnOtherStake.toString(),
+      nominatorCount: collatorInfo.delegators.length,
+      commission: 0,
+      expectedReturn: delegatorReturn,
+      blocked: false,
+      isVerified: false,
+      minBond: '0',
+      chain,
+      isCrowded: collatorInfo.delegators.length >= parseInt(maxDelegatorsPerCollator)
+    });
   }
   return allCollators;
 }

package/koni/api/staking/bonding/paraChain.js

@@ -26,7 +26,7 @@ export function validateParaChainUnbondingCondition(amount, nominatorMetadata, c
   const bnRemainingStake = bnActiveStake.sub(new BN(amount));
   const bnChainMinStake = new BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new BN(targetNomination.validatorMinStake || '0');
-  const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
+  const bnMinStake = BN.max(bnCollatorMinStake, bnChainMinStake);
   if (targetNomination.hasUnstaking) {
     errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
   }
@@ -83,9 +83,10 @@ export function validateParaChainBondingCondition(chainInfo, amount, selectedCol
 }
 export function subscribeParaChainStakingMetadata(chain, substrateApi, callback) {
   return substrateApi.api.query.parachainStaking.round(_round => {
+    var _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3;
     const roundObj = _round.toHuman();
     const round = parseRawNumber(roundObj.current);
-    const maxDelegations = substrateApi.api.consts.parachainStaking.maxDelegationsPerDelegator.toString();
+    const maxDelegations = (_substrateApi$api$con = substrateApi.api.consts) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.parachainStaking) === null || _substrateApi$api$con2 === void 0 ? void 0 : (_substrateApi$api$con3 = _substrateApi$api$con2.maxDelegationsPerDelegator) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toString();
     const unstakingDelay = substrateApi.api.consts.parachainStaking.delegationBondLessDelay.toString();
     const unstakingPeriod = parseInt(unstakingDelay) * (_STAKING_ERA_LENGTH_MAP[chain] || _STAKING_ERA_LENGTH_MAP.default);
     callback(chain, {
@@ -314,17 +315,21 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
     const _collatorAddress = collator[0].toHuman();
     const collatorAddress = _collatorAddress[0];
     const collatorInfo = collator[1].toPrimitive();
+    const bnTotalStake = new BN(collatorInfo.totalCounted);
+    const bnOwnStake = new BN(collatorInfo.bond);
+    const bnOtherStake = bnTotalStake.sub(bnOwnStake);
+    const bnMinBond = new BN(collatorInfo.lowestTopDelegationAmount);
     allCollators.push({
       commission: 0,
       expectedReturn: 0,
       address: collatorAddress,
-      totalStake: collatorInfo.totalCounted.toString(),
-      ownStake: collatorInfo.bond.toString(),
-      otherStake: (collatorInfo.totalCounted - collatorInfo.bond).toString(),
+      totalStake: bnTotalStake.toString(),
+      ownStake: bnOwnStake.toString(),
+      otherStake: bnOtherStake.toString(),
       nominatorCount: collatorInfo.delegationCount,
       blocked: false,
       isVerified: false,
-      minBond: collatorInfo.lowestTopDelegationAmount.toString(),
+      minBond: bnMinBond.toString(),
       chain,
       isCrowded: parseInt(maxDelegationPerCollator) > 0
     });
@@ -336,10 +341,6 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
     ]);
     const rawInfo = _info.toHuman();
     const rawIdentity = _identity ? _identity.toHuman() : null;
-    const rawBond = rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.bond;
-    const bond = new BN(rawBond.replaceAll(',', ''));
-    const delegationCount = parseRawNumber(rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.delegationCount);
-    const minDelegation = parseRawNumber(rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.lowestTopDelegationAmount);
     const active = (rawInfo === null || rawInfo === void 0 ? void 0 : rawInfo.status) === 'Active';
     let isReasonable = false;
     let identity;
@@ -351,21 +352,14 @@ export async function getParachainCollatorsInfo(chain, substrateApi) {
     extraInfoMap[collator.address] = {
       identity,
       isVerified: isReasonable,
-      bond: bond.toString(),
-      minDelegation: minDelegation.toString(),
-      delegationCount,
       active
     };
   }));
   for (const validator of allCollators) {
-    validator.minBond = extraInfoMap[validator.address].minDelegation.toString();
-    validator.ownStake = extraInfoMap[validator.address].bond.toString();
     validator.blocked = !extraInfoMap[validator.address].active;
     validator.identity = extraInfoMap[validator.address].identity;
     validator.isVerified = extraInfoMap[validator.address].isVerified;
     // @ts-ignore
-    validator.otherStake = (validator.totalStake - validator.ownStake).toString();
-    validator.nominatorCount = extraInfoMap[validator.address].delegationCount;
     validator.commission = collatorCommission;
   }
   return allCollators;

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

@@ -38,10 +38,10 @@ export interface ParachainStakingStakeOption {
     amount: number;
 }
 export interface ParachainStakingCandidateMetadata {
-    bond: number;
+    bond: string;
     delegationCount: number;
-    totalCounted: number;
-    lowestTopDelegationAmount: number;
+    totalCounted: string;
+    lowestTopDelegationAmount: string;
     status: any | 'Active';
 }
 export declare enum PalletParachainStakingRequestType {

package/koni/background/handlers/Extension.js

@@ -1371,12 +1371,20 @@ export default class KoniExtension {
   async subscribeHistory(id, port) {
     const cb = createSubscription(id, port);
     const historySubject = await this.#koniState.historyService.getHistorySubject();
-    historySubject.subscribe(cb);
-    this.createUnsubscriptionHandle(id, historySubject.unsubscribe);
+    const subscription = historySubject.subscribe(histories => {
+      const addresses = keyring.getAccounts().map(a => a.address.toLowerCase());
+
+      // Re-filter
+      cb(histories.filter(item => addresses.includes(item.address.toLowerCase())));
+    });
+    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
     port.onDisconnect.addListener(() => {
       this.cancelSubscription(id);
     });
-    return historySubject.getValue();
+    const addresses = keyring.getAccounts().map(a => a.address.toLowerCase());
+
+    // Re-filter
+    return historySubject.getValue().filter(item => addresses.includes(item.address.toLowerCase()));
   }
 
   // Save address to contact

package/koni/background/handlers/Tabs.js

@@ -843,11 +843,7 @@ export default class KoniTabs {
     return true;
   }
   isEvmPublicRequest(type, request) {
-    if (type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method)) {
-      return true;
-    } else {
-      return false;
-    }
+    return type === 'evm(request)' && ['eth_chainId', 'net_version'].includes(request === null || request === void 0 ? void 0 : request.method);
   }
   async addPspToken(id, url, {
     genesisHash,

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.5-0",
+  "version": "1.1.6-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -695,6 +695,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistory.js",
       "default": "./services/migration-service/scripts/MigrateTransactionHistory.js"
     },
+    "./services/migration-service/scripts/MigrateWalletReference": {
+      "types": "./services/migration-service/scripts/MigrateWalletReference.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateWalletReference.js",
+      "default": "./services/migration-service/scripts/MigrateWalletReference.js"
+    },
     "./services/notification-service/NotificationService": {
       "types": "./services/notification-service/NotificationService.d.ts",
       "require": "./cjs/services/notification-service/NotificationService.js",
@@ -1183,11 +1188,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.2.8",
-    "@subwallet/extension-base": "^1.1.5-0",
-    "@subwallet/extension-chains": "^1.1.5-0",
-    "@subwallet/extension-dapp": "^1.1.5-0",
-    "@subwallet/extension-inject": "^1.1.5-0",
+    "@subwallet/chain-list": "0.2.9-beta.1",
+    "@subwallet/extension-base": "^1.1.6-1",
+    "@subwallet/extension-chains": "^1.1.6-1",
+    "@subwallet/extension-dapp": "^1.1.6-1",
+    "@subwallet/extension-inject": "^1.1.6-1",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@walletconnect/sign-client": "^2.8.4",
@@ -1212,8 +1217,9 @@
     "json-rpc-engine": "^6.1.0",
     "manta-extension-sdk": "^1.1.0",
     "moment": "^2.29.4",
-    "protobufjs": "^7.1.2",
+    "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
+    "uuid": "^9.0.0",
     "web3": "^1.10.0",
     "web3-core": "^1.10.0",
     "web3-core-helpers": "^1.10.0",

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.5-0'
+  version: '1.1.6-1'
 };

package/page/SubWalleEvmProvider.d.ts

@@ -12,12 +12,13 @@ export declare class SubWalletEvmProvider extends SafeEventEmitter implements Ev
     readonly version: string;
     protected sendMessage: SendRequest;
     protected _connected: boolean;
-    protected _subscribed: boolean;
     constructor(sendMessage: SendRequest, version: string);
     get connected(): boolean;
     isConnected(): boolean;
     protected subscribeExtensionEvents(): void;
     enable(): Promise<unknown>;
+    on(eventName: string | symbol, listener: (...args: any[]) => void): this;
+    once(eventName: string | symbol, listener: (...args: any[]) => void): this;
     request<T>({ method, params }: RequestArguments): Promise<T>;
     private _sendSync;
     send<T>(method: string, params?: T[]): Promise<JsonRpcResponse<T>>;

package/page/SubWalleEvmProvider.js

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import SafeEventEmitter from '@metamask/safe-event-emitter';
+let subscribeFlag = false;
 export class SubWalletEvmProvider extends SafeEventEmitter {
   isSubWallet = true;
   isMetaMask = false;
   _connected = false;
-  _subscribed = false;
   constructor(sendMessage, version) {
     super();
     this.version = version;
@@ -20,7 +20,7 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
     return this._connected;
   }
   subscribeExtensionEvents() {
-    if (this._subscribed) {
+    if (subscribeFlag) {
       return;
     }
     this.sendMessage('evm(events.subscribe)', null, ({
@@ -41,18 +41,32 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
         console.warn('Can not handle event', type, payload);
       }
     }).then(done => {
-      this._subscribed = true;
-    }).catch(console.error);
+      subscribeFlag = true;
+    }).catch(() => {
+      subscribeFlag = false;
+    });
+    subscribeFlag = true;
   }
   async enable() {
     return this.request({
       method: 'eth_requestAccounts'
     });
   }
+  on(eventName, listener) {
+    this.subscribeExtensionEvents();
+    super.on(eventName, listener);
+    return this;
+  }
+  once(eventName, listener) {
+    this.subscribeExtensionEvents();
+    super.once(eventName, listener);
+    return this;
+  }
   request({
     method,
     params
   }) {
+    // Subscribe events
     switch (method) {
       case 'eth_requestAccounts':
         return new Promise((resolve, reject) => {
@@ -61,9 +75,6 @@ export class SubWalletEvmProvider extends SafeEventEmitter {
             origin,
             accountAuthType: 'evm'
           }).then(() => {
-            // Subscribe event
-            this.subscribeExtensionEvents();
-
             // Return account list
             this.request({
               method: 'eth_accounts'

package/services/chain-service/constants.js

@@ -49,13 +49,13 @@ export const _NFT_CHAIN_GROUP = {
 // Staking--------------------------------------------------------------------------------------------------------------
 
 export const _STAKING_CHAIN_GROUP = {
-  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend'],
+  relay: ['polkadot', 'kusama', 'aleph', 'polkadex', 'ternoa', 'ternoa_alphanet', 'alephTest', 'polkadexTest', 'westend', 'kate', 'edgeware'],
   para: ['moonbeam', 'moonriver', 'moonbase', 'turing', 'turingStaging', 'bifrost', 'bifrost_testnet', 'calamari_test', 'calamari'],
   astar: ['astar', 'shiden', 'shibuya'],
   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'],
+  nominationPool: ['polkadot', 'kusama', 'westend', 'alephTest', 'aleph', 'kate'],
   bifrost: ['bifrost', 'bifrost_testnet'],
   aleph: ['aleph', 'alephTest'],
   // A0 has distinct tokenomics
@@ -87,7 +87,9 @@ export const _STAKING_ERA_LENGTH_MAP = {
   amplitude_test: 2,
   pendulum: 2,
   kilt: 2,
-  kilt_peregrine: 2
+  kilt_peregrine: 2,
+  edgeware: 6,
+  kate: 6
 };
 export const _PARACHAIN_INFLATION_DISTRIBUTION = {
   moonbeam: {

package/services/migration-service/scripts/MigrateWalletReference.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateWalletReference extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateWalletReference.js

@@ -0,0 +1,23 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { v4 as uuidv4 } from 'uuid';
+export default class MigrateWalletReference extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.settingService.getSettings(currentSettings => {
+          const walletReference = uuidv4();
+          this.state.settingService.setSettings({
+            ...currentSettings,
+            walletReference: walletReference
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

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

@@ -11,6 +11,7 @@ import MigrateLedgerAccount from "./MigrateLedgerAccount.js";
 import MigrateNetworkSettings from "./MigrateNetworkSettings.js";
 import MigrateSettings from "./MigrateSettings.js";
 import MigrateTransactionHistory from "./MigrateTransactionHistory.js";
+import MigrateWalletReference from "./MigrateWalletReference.js";
 export const EVERYTIME = '__everytime__';
 export default {
   '1.0.1-11': MigrateNetworkSettings,
@@ -22,6 +23,7 @@ export default {
   '1.0.3-01': MigrateAutoLock,
   '1.0.3-02': MigrateChainPatrol,
   '1.0.9-01': MigrateLedgerAccount,
-  '1.0.12-02': MigrateEthProvider
+  '1.0.12-02': MigrateEthProvider,
+  '1.1.6-01': MigrateWalletReference
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/setting-service/constants.js

@@ -20,5 +20,6 @@ export const DEFAULT_SETTING = {
   theme: DEFAULT_THEME,
   camera: DEFAULT_CAMERA_ENABLE,
   timeAutoLock: DEFAULT_AUTO_LOCK_TIME,
-  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE
+  enableChainPatrol: DEFAULT_CHAIN_PATROL_ENABLE,
+  walletReference: ''
 };

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

@@ -6,11 +6,11 @@ import { liveQuery } from 'dexie';
 export default class NftStore extends BaseStoreWithAddressAndChain {
   getNft(addresses, chainList = []) {
     if (addresses.length) {
-      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => !chainList.length || chainList.includes(item.chain)).toArray();
+      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => chainList && chainList.includes(item.chain)).toArray();
     }
 
     // return this.table.filter((item) => !chainHashes.length || chainHashes.includes(item.chainHash)).toArray();
-    return this.table.filter(item => !chainList.length || chainList.includes(item.chain)).toArray();
+    return this.table.filter(item => chainList && chainList.includes(item.chain)).toArray();
   }
   subscribeNft(addresses, chainList = []) {
     return liveQuery(() => this.getNft(addresses, chainList));

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

@@ -10,9 +10,9 @@ export default class StakingStore extends BaseStoreWithAddressAndChain {
   }
   getStakings(addresses, chainList = []) {
     if (addresses.length) {
-      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => (!chainList.length || chainList.includes(item.chain)) && parseFloat(item.balance) > 0).toArray();
+      return this.table.where('address').anyOfIgnoreCase(addresses).and(item => chainList && chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();
     }
-    return this.table.filter(item => (!chainList.length || chainList.includes(item.chain)) && parseFloat(item.balance) > 0).toArray();
+    return this.table.filter(item => chainList && chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();
   }
   getStakingsByChains(chainList) {
     return this.table.filter(item => chainList.includes(item.chain) && parseFloat(item.balance) > 0).toArray();