@subwallet/extension-base 1.0.5-3 → 1.0.6-1

package/background/KoniTypes.d.ts

@@ -1383,6 +1383,12 @@ export interface AllLogoMap {
     chainLogoMap: Record<string, string>;
     assetLogoMap: Record<string, string>;
 }
+export interface PassPhishing {
+    pass: boolean;
+}
+export interface RequestPassPhishingPage {
+    url: string;
+}
 export interface KoniRequestSignatures {
     'pri(staking.submitTuringCancelCompound)': [RequestTuringCancelStakeCompound, SWTransactionResponse];
     'pri(staking.submitTuringCompound)': [RequestTuringStakeCompound, SWTransactionResponse];
@@ -1436,6 +1442,7 @@ export interface KoniRequestSignatures {
     'pri(balance.getSubscription)': [RequestSubscribeBalance, BalanceJson, BalanceJson];
     'pri(crowdloan.getCrowdloan)': [RequestCrowdloan, CrowdloanJson];
     'pri(crowdloan.getSubscription)': [RequestSubscribeCrowdloan, CrowdloanJson, CrowdloanJson];
+    'pri(phishing.pass)': [RequestPassPhishingPage, boolean];
     'pri(authorize.listV2)': [null, ResponseAuthorizeList];
     'pri(authorize.requestsV2)': [RequestAuthorizeSubscribe, boolean, AuthorizeRequest[]];
     'pri(authorize.approveV2)': [RequestAuthorizeApproveV2, boolean];

package/cjs/constants/index.js

@@ -56,7 +56,7 @@ const CRON_REFRESH_NFT_INTERVAL = 7200000;
 exports.CRON_REFRESH_NFT_INTERVAL = CRON_REFRESH_NFT_INTERVAL;
 const CRON_REFRESH_STAKING_REWARD_INTERVAL = 900000;
 exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = CRON_REFRESH_STAKING_REWARD_INTERVAL;
-const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 300000;
+const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 45000;
 exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL;
 const CRON_REFRESH_HISTORY_INTERVAL = 900000;
 exports.CRON_REFRESH_HISTORY_INTERVAL = CRON_REFRESH_HISTORY_INTERVAL;

package/cjs/koni/api/nft/rmrk_nft/index.js

@@ -50,9 +50,6 @@ class RmrkNftApi extends _nft.BaseNftApi {
   }
   async getAllByAccount(account) {
     const fetchUrls = [{
-      url: _config.SINGULAR_V1_ENDPOINT + account,
-      source: RMRK_SOURCE.SINGULAR_V1
-    }, {
       url: _config.SINGULAR_V2_ENDPOINT + account,
       source: RMRK_SOURCE.SINGULAR_V2
     }];

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

@@ -67,11 +67,14 @@ async function getNominationStakingRewardData(addresses, chainInfoMap) {
 }
 async function getPoolingStakingRewardData(addresses, networkMap, dotSamaApiMap) {
   const activeNetworks = [];
-  Object.keys(networkMap).forEach(key => {
-    activeNetworks.push(key);
+  Object.entries(networkMap).forEach(_ref3 => {
+    let [key, chainInfo] = _ref3;
+    if ((0, _utils._isChainSupportSubstrateStaking)(chainInfo) && (0, _utils._isSubstrateRelayChain)(chainInfo)) {
+      activeNetworks.push(key);
+    }
   });
   if (activeNetworks.length === 0) {
     return [];
   }
-  return await (0, _relayChain.getNominationPoolReward)(addresses, networkMap, dotSamaApiMap);
+  return (0, _relayChain.getNominationPoolReward)(addresses, networkMap, dotSamaApiMap);
 }

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

@@ -148,20 +148,22 @@ async function getNominationPoolReward(addresses, chainInfoMap, substrateApiMap)
   try {
     await Promise.all(targetNetworks.map(async networkKey => {
       const substrateApi = await substrateApiMap[networkKey].isReady;
-      await Promise.all(validAddresses.map(async address => {
-        var _substrateApi$api$cal, _substrateApi$api$cal2;
-        const _unclaimedReward = await ((_substrateApi$api$cal = substrateApi.api.call) === null || _substrateApi$api$cal === void 0 ? void 0 : (_substrateApi$api$cal2 = _substrateApi$api$cal.nominationPoolsApi) === null || _substrateApi$api$cal2 === void 0 ? void 0 : _substrateApi$api$cal2.pendingRewards(address));
-        if (_unclaimedReward) {
-          rewardList.push({
-            address: address,
-            chain: networkKey,
-            unclaimedReward: _unclaimedReward.toString(),
-            name: chainInfoMap[networkKey].name,
-            state: _KoniTypes.APIItemState.READY,
-            type: _KoniTypes.StakingType.POOLED
-          });
-        }
-      }));
+      if (substrateApi.api.call.nominationPoolsApi) {
+        await Promise.all(validAddresses.map(async address => {
+          var _substrateApi$api$cal, _substrateApi$api$cal2;
+          const _unclaimedReward = await ((_substrateApi$api$cal = substrateApi.api.call) === null || _substrateApi$api$cal === void 0 ? void 0 : (_substrateApi$api$cal2 = _substrateApi$api$cal.nominationPoolsApi) === null || _substrateApi$api$cal2 === void 0 ? void 0 : _substrateApi$api$cal2.pendingRewards(address));
+          if (_unclaimedReward) {
+            rewardList.push({
+              address: address,
+              chain: networkKey,
+              unclaimedReward: _unclaimedReward.toString(),
+              name: chainInfoMap[networkKey].name,
+              state: _KoniTypes.APIItemState.READY,
+              type: _KoniTypes.StakingType.POOLED
+            });
+          }
+        }));
+      }
     }));
   } catch (e) {
     return rewardList;

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

@@ -1641,61 +1641,60 @@ class KoniExtension {
       const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
       let estimatedFee;
       let maxTransferable = new _util.BN(freeBalance.value);
-      if (isXcmTransfer) {
-        const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
-        const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, tokenInfo.slug);
-        if (!destinationTokenInfo) {
-          estimatedFee = '0';
-        } else {
-          maxTransferable = maxTransferable.sub(new _util.BN(tokenInfo.minAmount || '0'));
-          const mockTx = await (0, _xcm.createXcmExtrinsic)({
-            chainInfoMap,
-            destinationTokenInfo,
-            originTokenInfo: tokenInfo,
-            recipient: address,
-            sendingValue: '0',
-            substrateApi
-          });
-          try {
+      try {
+        if (isXcmTransfer) {
+          const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
+          const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, tokenInfo.slug);
+          if (!destinationTokenInfo) {
+            estimatedFee = '0';
+          } else {
             var _paymentInfo$partialF;
+            maxTransferable = maxTransferable.sub(new _util.BN(tokenInfo.minAmount || '0'));
+            const desChainInfo = chainInfoMap[destChain];
+            const orgChainInfo = chainInfoMap[networkKey];
+            const recipient = !(0, _utilCrypto.isEthereumAddress)(address) && (0, _utils._isChainEvmCompatible)(desChainInfo) && !(0, _utils._isChainEvmCompatible)(orgChainInfo) ? (0, _util.u8aToHex)((0, _utilCrypto.addressToEvm)(address)) : address;
+            const mockTx = await (0, _xcm.createXcmExtrinsic)({
+              chainInfoMap,
+              destinationTokenInfo,
+              originTokenInfo: tokenInfo,
+              recipient: recipient,
+              sendingValue: '0',
+              substrateApi
+            });
             const paymentInfo = await mockTx.paymentInfo(address);
             estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
-          } catch (e) {
-            estimatedFee = '0';
-            console.warn(e);
           }
-        }
-      } else {
-        const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
-        if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
-          const web3 = this.#koniState.chainService.getEvmApi(networkKey);
-          const transaction = {
-            value: 1,
-            to: address,
-            from: address
-          };
-          const gasPrice = await web3.api.eth.getGasPrice();
-          const gasLimit = await web3.api.eth.estimateGas(transaction);
-          estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
         } else {
-          const [mockTx] = await (0, _transfer.createTransferExtrinsic)({
-            from: address,
-            networkKey,
-            substrateApi,
-            to: address,
-            tokenInfo,
-            transferAll: true,
-            value: '0'
-          });
-          try {
+          const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
+          if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
+            const web3 = this.#koniState.chainService.getEvmApi(networkKey);
+            const transaction = {
+              value: 0,
+              to: '0x0000000000000000000000000000000000000000',
+              // null address
+              from: address
+            };
+            const gasPrice = await web3.api.eth.getGasPrice();
+            const gasLimit = await web3.api.eth.estimateGas(transaction);
+            estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
+          } else {
             var _paymentInfo$partialF2;
+            const [mockTx] = await (0, _transfer.createTransferExtrinsic)({
+              from: address,
+              networkKey,
+              substrateApi,
+              to: address,
+              tokenInfo,
+              transferAll: true,
+              value: '0'
+            });
             const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
             estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';
-          } catch (e) {
-            estimatedFee = '0';
-            console.warn('Error estimating fee', e);
           }
         }
+      } catch (e) {
+        estimatedFee = '0';
+        console.warn('Error estimating fee', e);
       }
       maxTransferable = maxTransferable.sub(new _util.BN(estimatedFee));
       return {
@@ -2388,7 +2387,8 @@ class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: _KoniTypes.ExtrinsicType.STAKING_JOIN_POOL,
-      chainType: _KoniTypes.ChainType.SUBSTRATE
+      chainType: _KoniTypes.ChainType.SUBSTRATE,
+      transferNativeAmount: amount
     });
   }
   async submitPoolingUnbonding(inputData) {
@@ -2966,6 +2966,15 @@ class KoniExtension {
     };
   }
 
+  // Phishing detect
+
+  async passPhishingPage(_ref72) {
+    let {
+      url
+    } = _ref72;
+    return await this.#koniState.approvePassPhishingPage(url);
+  }
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -3291,6 +3300,10 @@ class KoniExtension {
       case 'pri(authorize.subscribe)':
         return await this.subscribeAuthUrls(id, port);
 
+      // Phishing page
+      case 'pri(phishing.pass)':
+        return await this.passPhishingPage(request);
+
       /// Keyring state
       case 'pri(keyring.subscribe)':
         return this.keyringStateSubscribe(id, port);

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

@@ -1469,6 +1469,22 @@ class KoniState {
   async reloadStaking() {
     return await this.cron.reloadStaking();
   }
+  async approvePassPhishingPage(_url) {
+    return new Promise(resolve => {
+      this.settingService.getPassPhishingList(value => {
+        const result = {
+          ...value
+        };
+        const url = this.requestService.stripUrl(_url);
+        result[url] = {
+          pass: true
+        };
+        this.settingService.setPassPhishing(result, () => {
+          resolve(true);
+        });
+      });
+    });
+  }
   async resetWallet(resetAll) {
     this.keyringService.resetWallet(resetAll);
     this.requestService.resetWallet();

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

@@ -116,6 +116,7 @@ class KoniTabs {
   #koniState;
   evmEventEmitterMap = {};
   #chainPatrolService = _constants2.DEFAULT_CHAIN_PATROL_ENABLE;
+  #passPhishing = {};
   constructor(koniState) {
     this.#koniState = koniState;
     const updateChainPatrolService = rs => {
@@ -125,6 +126,13 @@ class KoniTabs {
     this.#koniState.settingService.getSubject().subscribe({
       next: updateChainPatrolService
     });
+    const updatePassPhishing = rs => {
+      this.#passPhishing = rs;
+    };
+    this.#koniState.settingService.getPassPhishingList(updatePassPhishing);
+    this.#koniState.settingService.passPhishingSubject().subscribe({
+      next: updatePassPhishing
+    });
   }
 
   /// Clone from Polkadot.js
@@ -217,21 +225,31 @@ class KoniTabs {
       })));
     });
   }
-  async redirectIfPhishing(url) {
+  checkPassList(_url) {
+    const url = stripUrl(_url);
+    const result = this.#passPhishing[url];
+    return result ? !result.pass : true;
+  }
+  async checkPhishing(url) {
     const isInDenyList = await (0, _phishing.checkIfDenied)(url);
     if (isInDenyList) {
-      this.redirectPhishingLanding(url);
-      return true;
+      return this.checkPassList(url);
     }
     if (this.#chainPatrolService) {
       const isInChainPatrolDenyList = await chainPatrolCheckUrl(url);
       if (isInChainPatrolDenyList) {
-        this.redirectPhishingLanding(url);
-        return true;
+        return this.checkPassList(url);
       }
     }
     return false;
   }
+  async redirectIfPhishing(url) {
+    const result = await this.checkPhishing(url);
+    if (result) {
+      this.redirectPhishingLanding(url);
+    }
+    return result;
+  }
 
   ///
 

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

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

@@ -66,7 +66,7 @@ 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
 };
 exports._STAKING_CHAIN_GROUP = _STAKING_CHAIN_GROUP;
 const _STAKING_ERA_LENGTH_MAP = {

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

@@ -42,6 +42,9 @@ class RequestService {
   updateIconV2(shouldClose) {
     this.#popupHandler.updateIconV2(shouldClose);
   }
+  stripUrl(url) {
+    return this.#authRequestHandler.stripUrl(url);
+  }
   getAddressList() {
     let value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     const addressList = Object.keys(this.keyringService.accounts);

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _PassPhishingStore = _interopRequireDefault(require("@subwallet/extension-base/stores/PassPhishingStore"));
 var _Settings = _interopRequireDefault(require("@subwallet/extension-base/stores/Settings"));
 var _constants = require("./constants");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -12,6 +13,7 @@ var _constants = require("./constants");
 
 class SettingService {
   settingsStore = new _Settings.default();
+  passPhishingStore = new _PassPhishingStore.default();
   getSubject() {
     return this.settingsStore.getSubject();
   }
@@ -27,8 +29,20 @@ class SettingService {
   setSettings(data, callback) {
     this.settingsStore.set('Settings', data, callback);
   }
+  passPhishingSubject() {
+    return this.passPhishingStore.getSubject();
+  }
+  getPassPhishingList(update) {
+    this.passPhishingStore.get('PassPhishing', value => {
+      update(value || {});
+    });
+  }
+  setPassPhishing(data, callback) {
+    this.passPhishingStore.set('PassPhishing', data, callback);
+  }
   resetWallet() {
     this.settingsStore.set('Settings', _constants.DEFAULT_SETTING);
+    this.passPhishingStore.set('PassPhishing', {});
   }
 }
 exports.default = SettingService;

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

@@ -152,7 +152,7 @@ class DatabaseService {
   }
   async cleanUpNft(chain, owner, collectionIds, nftIds, ownNothing) {
     if (ownNothing) {
-      return this.stores.nft.deleteNftsByChainAndOwner(chain, (0, _utils.reformatAddress)(owner, 42));
+      return this.stores.nft.deleteNftsByChainAndOwner(chain, (0, _utils.reformatAddress)(owner, 42), collectionIds);
     }
     return this.stores.nft.cleanUpNfts(chain, (0, _utils.reformatAddress)(owner, 42), collectionIds, nftIds);
   }

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

@@ -28,13 +28,13 @@ class NftStore extends _BaseStoreWithAddressAndChain.default {
     return this.table.where({
       address,
       chain
-    }).and(nft => !collectionIds.includes(nft.collectionId) || collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
+    }).and(nft => collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
   }
-  deleteNftsByChainAndOwner(chain, address) {
+  deleteNftsByChainAndOwner(chain, address, collectionIds) {
     return this.table.where({
       address,
       chain
-    }).delete();
+    }).and(nft => collectionIds.includes(nft.collectionId)).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

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

@@ -129,7 +129,7 @@ class TransactionService {
     } else {
       var _pair$meta;
       if ((_pair$meta = pair.meta) !== null && _pair$meta !== void 0 && _pair$meta.isReadOnly) {
-        validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR, 'This is read-only account'));
+        validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INTERNAL_ERROR, 'This is watch-only account'));
       }
     }
 

package/cjs/stores/PassPhishingStore.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defaults = require("@subwallet/extension-base/defaults");
+var _SubscribableStore = _interopRequireDefault(require("@subwallet/extension-base/stores/SubscribableStore"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class PassPhishingStore extends _SubscribableStore.default {
+  constructor() {
+    super(_defaults.EXTENSION_PREFIX ? `${_defaults.EXTENSION_PREFIX}subwallet-pass-phishing-list` : null);
+  }
+}
+exports.default = PassPhishingStore;

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 = 300000;
+export declare const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 45000;
 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 = 300000;
+export const CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = 45000;
 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/nft/rmrk_nft/index.js

@@ -5,7 +5,7 @@ import { RMRK_VER } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl, reformatAddress } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
-import { getRandomIpfsGateway, SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V1_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from "../config.js";
+import { getRandomIpfsGateway, SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from "../config.js";
 var RMRK_SOURCE;
 (function (RMRK_SOURCE) {
   RMRK_SOURCE["BIRD_KANARIA"] = "bird_kanaria";
@@ -44,9 +44,6 @@ export class RmrkNftApi extends BaseNftApi {
   }
   async getAllByAccount(account) {
     const fetchUrls = [{
-      url: SINGULAR_V1_ENDPOINT + account,
-      source: RMRK_SOURCE.SINGULAR_V1
-    }, {
       url: SINGULAR_V2_ENDPOINT + account,
       source: RMRK_SOURCE.SINGULAR_V2
     }];

package/koni/api/staking/index.js

@@ -5,7 +5,7 @@ import { getAmplitudeStakingOnChain, getAstarStakingOnChain, getParaStakingOnCha
 import { getNominationPoolReward, getRelayPoolingOnChain, getRelayStakingOnChain } from '@subwallet/extension-base/koni/api/staking/relayChain';
 import { getAllSubsquidStaking } from '@subwallet/extension-base/koni/api/staking/subsquidStaking';
 import { _PURE_EVM_CHAINS, _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _isChainEvmCompatible, _isChainSupportSubstrateStaking } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isChainEvmCompatible, _isChainSupportSubstrateStaking, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses } from '@subwallet/extension-base/utils';
 export function stakingOnChainApi(addresses, substrateApiMap, callback, chainInfoMap) {
   const filteredApiMap = [];
@@ -57,11 +57,13 @@ export async function getNominationStakingRewardData(addresses, chainInfoMap) {
 }
 export async function getPoolingStakingRewardData(addresses, networkMap, dotSamaApiMap) {
   const activeNetworks = [];
-  Object.keys(networkMap).forEach(key => {
-    activeNetworks.push(key);
+  Object.entries(networkMap).forEach(([key, chainInfo]) => {
+    if (_isChainSupportSubstrateStaking(chainInfo) && _isSubstrateRelayChain(chainInfo)) {
+      activeNetworks.push(key);
+    }
   });
   if (activeNetworks.length === 0) {
     return [];
   }
-  return await getNominationPoolReward(addresses, networkMap, dotSamaApiMap);
+  return getNominationPoolReward(addresses, networkMap, dotSamaApiMap);
 }

package/koni/api/staking/relayChain.js

@@ -138,20 +138,22 @@ export async function getNominationPoolReward(addresses, chainInfoMap, substrate
   try {
     await Promise.all(targetNetworks.map(async networkKey => {
       const substrateApi = await substrateApiMap[networkKey].isReady;
-      await Promise.all(validAddresses.map(async address => {
-        var _substrateApi$api$cal, _substrateApi$api$cal2;
-        const _unclaimedReward = await ((_substrateApi$api$cal = substrateApi.api.call) === null || _substrateApi$api$cal === void 0 ? void 0 : (_substrateApi$api$cal2 = _substrateApi$api$cal.nominationPoolsApi) === null || _substrateApi$api$cal2 === void 0 ? void 0 : _substrateApi$api$cal2.pendingRewards(address));
-        if (_unclaimedReward) {
-          rewardList.push({
-            address: address,
-            chain: networkKey,
-            unclaimedReward: _unclaimedReward.toString(),
-            name: chainInfoMap[networkKey].name,
-            state: APIItemState.READY,
-            type: StakingType.POOLED
-          });
-        }
-      }));
+      if (substrateApi.api.call.nominationPoolsApi) {
+        await Promise.all(validAddresses.map(async address => {
+          var _substrateApi$api$cal, _substrateApi$api$cal2;
+          const _unclaimedReward = await ((_substrateApi$api$cal = substrateApi.api.call) === null || _substrateApi$api$cal === void 0 ? void 0 : (_substrateApi$api$cal2 = _substrateApi$api$cal.nominationPoolsApi) === null || _substrateApi$api$cal2 === void 0 ? void 0 : _substrateApi$api$cal2.pendingRewards(address));
+          if (_unclaimedReward) {
+            rewardList.push({
+              address: address,
+              chain: networkKey,
+              unclaimedReward: _unclaimedReward.toString(),
+              name: chainInfoMap[networkKey].name,
+              state: APIItemState.READY,
+              type: StakingType.POOLED
+            });
+          }
+        }));
+      }
     }));
   } catch (e) {
     return rewardList;

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

@@ -188,5 +188,6 @@ export default class KoniExtension {
     private subscribeNotifications;
     private reloadCron;
     private getLogoMap;
+    private passPhishingPage;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }

package/koni/background/handlers/Extension.js

@@ -31,7 +31,7 @@ import BigN from 'bignumber.js';
 import { Transaction } from 'ethereumjs-tx';
 import { TypeRegistry } from '@polkadot/types';
 import { assert, BN, BN_ZERO, hexStripPrefix, hexToU8a, isAscii, isHex, u8aToHex, u8aToString } from '@polkadot/util';
-import { base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
+import { addressToEvm, base64Decode, decodeAddress, isAddress, isEthereumAddress, jsonDecrypt, keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
 const ETH_DERIVE_DEFAULT = '/m/44\'/60\'/0\'/0/0';
 function getSuri(seed, type) {
   return type === 'ethereum' ? `${seed}${ETH_DERIVE_DEFAULT}` : seed;
@@ -1590,61 +1590,60 @@ export default class KoniExtension {
       const substrateApi = this.#koniState.chainService.getSubstrateApi(networkKey);
       let estimatedFee;
       let maxTransferable = new BN(freeBalance.value);
-      if (isXcmTransfer) {
-        const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
-        const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, tokenInfo.slug);
-        if (!destinationTokenInfo) {
-          estimatedFee = '0';
-        } else {
-          maxTransferable = maxTransferable.sub(new BN(tokenInfo.minAmount || '0'));
-          const mockTx = await createXcmExtrinsic({
-            chainInfoMap,
-            destinationTokenInfo,
-            originTokenInfo: tokenInfo,
-            recipient: address,
-            sendingValue: '0',
-            substrateApi
-          });
-          try {
+      try {
+        if (isXcmTransfer) {
+          const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
+          const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, tokenInfo.slug);
+          if (!destinationTokenInfo) {
+            estimatedFee = '0';
+          } else {
             var _paymentInfo$partialF;
+            maxTransferable = maxTransferable.sub(new BN(tokenInfo.minAmount || '0'));
+            const desChainInfo = chainInfoMap[destChain];
+            const orgChainInfo = chainInfoMap[networkKey];
+            const recipient = !isEthereumAddress(address) && _isChainEvmCompatible(desChainInfo) && !_isChainEvmCompatible(orgChainInfo) ? u8aToHex(addressToEvm(address)) : address;
+            const mockTx = await createXcmExtrinsic({
+              chainInfoMap,
+              destinationTokenInfo,
+              originTokenInfo: tokenInfo,
+              recipient: recipient,
+              sendingValue: '0',
+              substrateApi
+            });
             const paymentInfo = await mockTx.paymentInfo(address);
             estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
-          } catch (e) {
-            estimatedFee = '0';
-            console.warn(e);
           }
-        }
-      } else {
-        const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
-        if (_isChainEvmCompatible(chainInfo)) {
-          const web3 = this.#koniState.chainService.getEvmApi(networkKey);
-          const transaction = {
-            value: 1,
-            to: address,
-            from: address
-          };
-          const gasPrice = await web3.api.eth.getGasPrice();
-          const gasLimit = await web3.api.eth.estimateGas(transaction);
-          estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
         } else {
-          const [mockTx] = await createTransferExtrinsic({
-            from: address,
-            networkKey,
-            substrateApi,
-            to: address,
-            tokenInfo,
-            transferAll: true,
-            value: '0'
-          });
-          try {
+          const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
+          if (_isChainEvmCompatible(chainInfo)) {
+            const web3 = this.#koniState.chainService.getEvmApi(networkKey);
+            const transaction = {
+              value: 0,
+              to: '0x0000000000000000000000000000000000000000',
+              // null address
+              from: address
+            };
+            const gasPrice = await web3.api.eth.getGasPrice();
+            const gasLimit = await web3.api.eth.estimateGas(transaction);
+            estimatedFee = (gasLimit * parseInt(gasPrice)).toString();
+          } else {
             var _paymentInfo$partialF2;
+            const [mockTx] = await createTransferExtrinsic({
+              from: address,
+              networkKey,
+              substrateApi,
+              to: address,
+              tokenInfo,
+              transferAll: true,
+              value: '0'
+            });
             const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
             estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';
-          } catch (e) {
-            estimatedFee = '0';
-            console.warn('Error estimating fee', e);
           }
         }
+      } catch (e) {
+        estimatedFee = '0';
+        console.warn('Error estimating fee', e);
       }
       maxTransferable = maxTransferable.sub(new BN(estimatedFee));
       return {
@@ -2322,7 +2321,8 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: ExtrinsicType.STAKING_JOIN_POOL,
-      chainType: ChainType.SUBSTRATE
+      chainType: ChainType.SUBSTRATE,
+      transferNativeAmount: amount
     });
   }
   async submitPoolingUnbonding(inputData) {
@@ -2885,6 +2885,14 @@ export default class KoniExtension {
     };
   }
 
+  // Phishing detect
+
+  async passPhishingPage({
+    url
+  }) {
+    return await this.#koniState.approvePassPhishingPage(url);
+  }
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -3210,6 +3218,10 @@ export default class KoniExtension {
       case 'pri(authorize.subscribe)':
         return await this.subscribeAuthUrls(id, port);
 
+      // Phishing page
+      case 'pri(phishing.pass)':
+        return await this.passPhishingPage(request);
+
       /// Keyring state
       case 'pri(keyring.subscribe)':
         return this.keyringStateSubscribe(id, port);

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

@@ -223,6 +223,7 @@ export default class KoniState {
     onAccountRemove(): void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
+    approvePassPhishingPage(_url: string): Promise<boolean>;
     resetWallet(resetAll: boolean): Promise<void>;
 }
 export {};

package/koni/background/handlers/State.js

@@ -1441,6 +1441,22 @@ export default class KoniState {
   async reloadStaking() {
     return await this.cron.reloadStaking();
   }
+  async approvePassPhishingPage(_url) {
+    return new Promise(resolve => {
+      this.settingService.getPassPhishingList(value => {
+        const result = {
+          ...value
+        };
+        const url = this.requestService.stripUrl(_url);
+        result[url] = {
+          pass: true
+        };
+        this.settingService.setPassPhishing(result, () => {
+          resolve(true);
+        });
+      });
+    });
+  }
   async resetWallet(resetAll) {
     this.keyringService.resetWallet(resetAll);
     this.requestService.resetWallet();

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

@@ -20,6 +20,8 @@ export default class KoniTabs {
     private rpcSubscribeConnected;
     private rpcUnsubscribe;
     private redirectPhishingLanding;
+    private checkPassList;
+    protected checkPhishing(url: string): Promise<boolean>;
     protected redirectIfPhishing(url: string): Promise<boolean>;
     private cancelSubscription;
     private createUnsubscriptionHandle;

package/koni/background/handlers/Tabs.js

@@ -84,6 +84,7 @@ export default class KoniTabs {
   #koniState;
   evmEventEmitterMap = {};
   #chainPatrolService = DEFAULT_CHAIN_PATROL_ENABLE;
+  #passPhishing = {};
   constructor(koniState) {
     this.#koniState = koniState;
     const updateChainPatrolService = rs => {
@@ -93,6 +94,13 @@ export default class KoniTabs {
     this.#koniState.settingService.getSubject().subscribe({
       next: updateChainPatrolService
     });
+    const updatePassPhishing = rs => {
+      this.#passPhishing = rs;
+    };
+    this.#koniState.settingService.getPassPhishingList(updatePassPhishing);
+    this.#koniState.settingService.passPhishingSubject().subscribe({
+      next: updatePassPhishing
+    });
   }
 
   /// Clone from Polkadot.js
@@ -179,21 +187,31 @@ export default class KoniTabs {
       })));
     });
   }
-  async redirectIfPhishing(url) {
+  checkPassList(_url) {
+    const url = stripUrl(_url);
+    const result = this.#passPhishing[url];
+    return result ? !result.pass : true;
+  }
+  async checkPhishing(url) {
     const isInDenyList = await checkIfDenied(url);
     if (isInDenyList) {
-      this.redirectPhishingLanding(url);
-      return true;
+      return this.checkPassList(url);
     }
     if (this.#chainPatrolService) {
       const isInChainPatrolDenyList = await chainPatrolCheckUrl(url);
       if (isInChainPatrolDenyList) {
-        this.redirectPhishingLanding(url);
-        return true;
+        return this.checkPassList(url);
       }
     }
     return false;
   }
+  async redirectIfPhishing(url) {
+    const result = await this.checkPhishing(url);
+    if (result) {
+      this.redirectPhishingLanding(url);
+    }
+    return result;
+  }
 
   ///
 

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.5-3",
+  "version": "1.0.6-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1555,6 +1555,11 @@
       "require": "./cjs/stores/Metadata.js",
       "default": "./stores/Metadata.js"
     },
+    "./stores/PassPhishingStore": {
+      "types": "./stores/PassPhishingStore.d.ts",
+      "require": "./cjs/stores/PassPhishingStore.js",
+      "default": "./stores/PassPhishingStore.js"
+    },
     "./stores/Settings": {
       "types": "./stores/Settings.d.ts",
       "require": "./cjs/stores/Settings.js",
@@ -1693,10 +1698,10 @@
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
     "@subwallet/chain-list": "^0.1.7",
-    "@subwallet/extension-base": "^1.0.5-3",
-    "@subwallet/extension-chains": "^1.0.5-3",
-    "@subwallet/extension-dapp": "^1.0.5-3",
-    "@subwallet/extension-inject": "^1.0.5-3",
+    "@subwallet/extension-base": "^1.0.6-1",
+    "@subwallet/extension-chains": "^1.0.6-1",
+    "@subwallet/extension-dapp": "^1.0.6-1",
+    "@subwallet/extension-inject": "^1.0.6-1",
     "@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.5-3'
+  version: '1.0.6-1'
 };

package/services/chain-service/constants.js

@@ -55,7 +55,7 @@ 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
 };
 
 export const _STAKING_ERA_LENGTH_MAP = {

package/services/request-service/handler/AuthRequestHandler.d.ts

@@ -15,7 +15,7 @@ export default class AuthRequestHandler {
     private readonly evmChainSubject;
     readonly authSubjectV2: BehaviorSubject<AuthorizeRequest[]>;
     constructor(requestService: RequestService, chainService: ChainService, keyringService: KeyringService);
-    private stripUrl;
+    stripUrl(url: string): string;
     private getAddressList;
     get numAuthRequestsV2(): number;
     private get allAuthRequestsV2();

package/services/request-service/index.d.ts

@@ -14,6 +14,7 @@ export default class RequestService {
     constructor(chainService: ChainService, settingService: SettingService, keyringService: KeyringService);
     get numAllRequests(): number;
     updateIconV2(shouldClose?: boolean): void;
+    stripUrl(url: string): string;
     getAddressList(value?: boolean): Record<string, boolean>;
     get popup(): number[];
     popupClose(): void;

package/services/request-service/index.js

@@ -35,6 +35,9 @@ export default class RequestService {
   updateIconV2(shouldClose) {
     this.#popupHandler.updateIconV2(shouldClose);
   }
+  stripUrl(url) {
+    return this.#authRequestHandler.stripUrl(url);
+  }
   getAddressList(value = false) {
     const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({

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

@@ -1,9 +1,13 @@
-import { RequestSettingsType } from '@subwallet/extension-base/background/KoniTypes';
+import { PassPhishing, RequestSettingsType } from '@subwallet/extension-base/background/KoniTypes';
 import { Subject } from 'rxjs';
 export default class SettingService {
     private readonly settingsStore;
+    private readonly passPhishingStore;
     getSubject(): Subject<RequestSettingsType>;
     getSettings(update: (value: RequestSettingsType) => void): void;
     setSettings(data: RequestSettingsType, callback?: () => void): void;
+    passPhishingSubject(): Subject<Record<string, PassPhishing>>;
+    getPassPhishingList(update: (value: Record<string, PassPhishing>) => void): void;
+    setPassPhishing(data: Record<string, PassPhishing>, callback?: () => void): void;
     resetWallet(): void;
 }

package/services/setting-service/SettingService.js

@@ -1,10 +1,12 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import PassPhishingStore from '@subwallet/extension-base/stores/PassPhishingStore';
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
 import { DEFAULT_SETTING } from "./constants.js";
 export default class SettingService {
   settingsStore = new SettingsStore();
+  passPhishingStore = new PassPhishingStore();
   getSubject() {
     return this.settingsStore.getSubject();
   }
@@ -20,7 +22,19 @@ export default class SettingService {
   setSettings(data, callback) {
     this.settingsStore.set('Settings', data, callback);
   }
+  passPhishingSubject() {
+    return this.passPhishingStore.getSubject();
+  }
+  getPassPhishingList(update) {
+    this.passPhishingStore.get('PassPhishing', value => {
+      update(value || {});
+    });
+  }
+  setPassPhishing(data, callback) {
+    this.passPhishingStore.set('PassPhishing', data, callback);
+  }
   resetWallet() {
     this.settingsStore.set('Settings', DEFAULT_SETTING);
+    this.passPhishingStore.set('PassPhishing', {});
   }
 }

package/services/storage-service/DatabaseService.js

@@ -145,7 +145,7 @@ export default class DatabaseService {
   }
   async cleanUpNft(chain, owner, collectionIds, nftIds, ownNothing) {
     if (ownNothing) {
-      return this.stores.nft.deleteNftsByChainAndOwner(chain, reformatAddress(owner, 42));
+      return this.stores.nft.deleteNftsByChainAndOwner(chain, reformatAddress(owner, 42), collectionIds);
     }
     return this.stores.nft.cleanUpNfts(chain, reformatAddress(owner, 42), collectionIds, nftIds);
   }

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

@@ -5,7 +5,7 @@ export default class NftStore extends BaseStoreWithAddressAndChain<INft> {
     getNft(addresses: string[], chainList?: string[]): import("dexie").PromiseExtended<INft[]>;
     subscribeNft(addresses: string[], chainList?: string[]): import("dexie").Observable<INft[]>;
     cleanUpNfts(chain: string, address: string, collectionIds: string[], nftIds: string[]): import("dexie").PromiseExtended<number>;
-    deleteNftsByChainAndOwner(chain: string, address: string): import("dexie").PromiseExtended<number>;
+    deleteNftsByChainAndOwner(chain: string, address: string, collectionIds: string[]): import("dexie").PromiseExtended<number>;
     deleteNftByAddress(addresses: string[]): import("dexie").PromiseExtended<number>;
     deleteNftItem(chain: string, addresses: string[], nftItem: NftItem): import("dexie").PromiseExtended<number>;
     deleteNftsByCollection(chain: string, collectionId: string): import("dexie").PromiseExtended<number>;

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

@@ -19,13 +19,13 @@ export default class NftStore extends BaseStoreWithAddressAndChain {
     return this.table.where({
       address,
       chain
-    }).and(nft => !collectionIds.includes(nft.collectionId) || collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
+    }).and(nft => collectionIds.includes(nft.collectionId) && !nftIds.includes(nft.id)).delete();
   }
-  deleteNftsByChainAndOwner(chain, address) {
+  deleteNftsByChainAndOwner(chain, address, collectionIds) {
     return this.table.where({
       address,
       chain
-    }).delete();
+    }).and(nft => collectionIds.includes(nft.collectionId)).delete();
   }
   deleteNftByAddress(addresses) {
     return this.table.where('address').anyOfIgnoreCase(addresses).delete();

package/services/transaction-service/index.js

@@ -122,7 +122,7 @@ export default class TransactionService {
     } else {
       var _pair$meta;
       if ((_pair$meta = pair.meta) !== null && _pair$meta !== void 0 && _pair$meta.isReadOnly) {
-        validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'This is read-only account'));
+        validationResponse.errors.push(new TransactionError(BasicTxErrorType.INTERNAL_ERROR, 'This is watch-only account'));
       }
     }
 

package/stores/PassPhishingStore.d.ts

@@ -0,0 +1,5 @@
+import { PassPhishing } from '@subwallet/extension-base/background/KoniTypes';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class PassPhishingStore extends SubscribableStore<Record<string, PassPhishing>> {
+    constructor();
+}

package/stores/PassPhishingStore.js

@@ -0,0 +1,10 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { EXTENSION_PREFIX } from '@subwallet/extension-base/defaults';
+import SubscribableStore from '@subwallet/extension-base/stores/SubscribableStore';
+export default class PassPhishingStore extends SubscribableStore {
+  constructor() {
+    super(EXTENSION_PREFIX ? `${EXTENSION_PREFIX}subwallet-pass-phishing-list` : null);
+  }
+}