@subwallet/extension-base 1.0.5-2 → 1.0.6-0

package/background/KoniTypes.d.ts

@@ -1075,7 +1075,6 @@ export interface ChainStakingMetadata {
     minJoinNominationPool?: string;
     minStake: string;
     nominatorCount?: number;
-    minPoolBonding?: string;
     maxValidatorPerNominator: number;
     maxWithdrawalRequestPerValidator: number;
     allowCancelUnstaking: boolean;
@@ -1384,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];
@@ -1437,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/staking/bonding/relayChain.js

@@ -34,7 +34,7 @@ function validateRelayUnbondingCondition(amount, chainStakingMetadata, nominator
   const errors = [];
   const bnActiveStake = new _util.BN(nominatorMetadata.activeStake);
   const bnRemainingStake = bnActiveStake.sub(new _util.BN(amount));
-  const minStake = new _util.BN(chainStakingMetadata.minPoolBonding || '0');
+  const minStake = new _util.BN(chainStakingMetadata.minJoinNominationPool || '0');
   if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INVALID_ACTIVE_STAKE));
   }
@@ -48,7 +48,7 @@ function validatePoolBondingCondition(chainInfo, amount, selectedPool, address,
   // amount >= min stake
   const errors = [];
   let bnTotalStake = new _util.BN(amount);
-  const bnMinStake = new _util.BN(chainStakingMetadata.minPoolBonding || '0');
+  const bnMinStake = new _util.BN(chainStakingMetadata.minJoinNominationPool || '0');
   if (selectedPool.state !== 'Open') {
     errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.INACTIVE_NOMINATION_POOL));
   }
@@ -90,9 +90,6 @@ function validateRelayBondingCondition(chainInfo, amount, selectedValidators, ad
 async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
   var _chainApi$api$query$a, _chainApi$api$query, _chainApi$api$query$s, _chainApi$api$query2, _chainApi$api$query2$, _chainApi$api$query3, _chainApi$api$query3$;
   const chain = chainInfo.slug;
-  const {
-    decimals
-  } = (0, _utils2._getChainNativeTokenBasicInfo)(chainInfo);
   const chainApi = await substrateApi.isReady;
   const _era = await chainApi.api.query.staking.currentEra();
   const currentEra = _era.toString();
@@ -136,8 +133,6 @@ async function getRelayChainStakingMetadata(chainInfo, substrateApi) {
     // in %, annually
     inflation,
     minStake: minStake.toString(),
-    minPoolBonding: (10 ** decimals).toString(),
-    // default is 1
     maxValidatorPerNominator: parseInt(maxNominations),
     maxWithdrawalRequestPerValidator: parseInt(maxUnlockingChunks),
     allowCancelUnstaking: true,

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

@@ -17,6 +17,7 @@ exports.getParaCurrentInflation = getParaCurrentInflation;
 exports.getStakingAvailableActionsByChain = getStakingAvailableActionsByChain;
 exports.getStakingAvailableActionsByNominator = getStakingAvailableActionsByNominator;
 exports.getStakingStatusByNominations = getStakingStatusByNominations;
+exports.getValidatorLabel = getValidatorLabel;
 exports.getWithdrawalInfo = getWithdrawalInfo;
 exports.isActionFromValidator = isActionFromValidator;
 exports.isShowNominationByValidator = isShowNominationByValidator;
@@ -268,4 +269,12 @@ function getStakingStatusByNominations(bnTotalActiveStake, nominationList) {
     }
   }
   return stakingStatus;
+}
+function getValidatorLabel(chain) {
+  if (_constants._STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return 'dApp';
+  } else if (_constants._STAKING_CHAIN_GROUP.relay.includes(chain)) {
+    return 'Validator';
+  }
+  return 'Collator';
 }

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

@@ -1446,7 +1446,8 @@ class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to)) {
+    if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils._isTokenTransferredByEvm)(tokenInfo)) {
+      // TODO: review this
       chainType = _KoniTypes.ChainType.EVM;
       const txVal = transferAll ? freeBalance.value : value || '0';
 
@@ -1640,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 {
@@ -2917,6 +2917,7 @@ class KoniExtension {
       return Object.fromEntries(Object.entries(rs).map(_ref70 => {
         let [key, value] = _ref70;
         const {
+          additionalValidator,
           transaction,
           ...transactionResult
         } = value;
@@ -2964,6 +2965,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) {
@@ -3289,6 +3299,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;
+  }
 
   ///
 
@@ -445,35 +463,36 @@ class KoniTabs {
         const chainIdNum = parseInt(chainId, 16);
         const [existedNetworkSlug, existedChainInfo] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
         if (existedNetworkSlug && existedChainInfo && existedChainInfo !== null && existedChainInfo !== void 0 && existedChainInfo.evmInfo) {
-          const evmInfo = existedChainInfo.evmInfo;
-          const substrateInfo = existedChainInfo.substrateInfo;
-          const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
-          await this.#koniState.addNetworkConfirm(id, url, {
-            mode: 'update',
-            chainSpec: {
-              evmChainId: evmInfo.evmChainId,
-              decimals: evmInfo.decimals,
-              existentialDeposit: evmInfo.existentialDeposit,
-              genesisHash: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.genesisHash) || '',
-              paraId: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.paraId) || null,
-              addressPrefix: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.addressPrefix) || 0
-            },
-            chainEditInfo: {
-              blockExplorer: blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0],
-              slug: existedNetworkSlug,
-              currentProvider: chainState.currentProvider,
-              providers: existedChainInfo.providers,
-              symbol: evmInfo.symbol,
-              chainType: 'EVM',
-              name: existedChainInfo.name
-            }
-          });
           return await this.switchEvmChain(id, url, {
             method: 'wallet_switchEthereumChain',
             params: [{
               chainId
             }]
           });
+          // const evmInfo = existedChainInfo.evmInfo;
+          // const substrateInfo = existedChainInfo.substrateInfo;
+          // const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
+          //
+          // return await this.#koniState.addNetworkConfirm(id, url, {
+          //   mode: 'update',
+          //   chainSpec: {
+          //     evmChainId: evmInfo.evmChainId,
+          //     decimals: evmInfo.decimals,
+          //     existentialDeposit: evmInfo.existentialDeposit,
+          //     genesisHash: substrateInfo?.genesisHash || '',
+          //     paraId: substrateInfo?.paraId || null,
+          //     addressPrefix: substrateInfo?.addressPrefix || 0
+          //   },
+          //   chainEditInfo: {
+          //     blockExplorer: blockExplorerUrls?.[0],
+          //     slug: existedNetworkSlug,
+          //     currentProvider: chainState.currentProvider,
+          //     providers: existedChainInfo.providers,
+          //     symbol: evmInfo.symbol,
+          //     chainType: 'EVM',
+          //     name: existedChainInfo.name
+          //   }
+          // });
         } else if (rpcUrls && chainName) {
           const filteredUrls = rpcUrls.filter(targetString => {
             let url;

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-2'
+  version: '1.0.6-0'
 };
 exports.packageInfo = packageInfo;

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

@@ -36,7 +36,7 @@ const _BALANCE_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro'],
   equilibrium_parachain: ['equilibrium_parachain'],
   bifrost: ['bifrost', 'acala', 'karura', 'acala_testnet', 'pioneer', 'bitcountry'],
-  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain'],
+  statemine: ['statemine', 'astar', 'shiden', 'statemint', 'moonbeam', 'moonbase', 'moonriver', 'crabParachain', 'darwinia2'],
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'] // perhaps there are some runtime updates
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
@@ -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 = {
@@ -194,7 +194,7 @@ const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine']
+  statemine: ['statemint', 'statemine', 'darwinia2']
 };
 exports._TRANSFER_CHAIN_GROUP = _TRANSFER_CHAIN_GROUP;
 const _BALANCE_PARSING_CHAIN_GROUP = {

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

@@ -720,6 +720,11 @@ class ChainService {
         targetChainInfo.substrateInfo.crowdloanUrl = params.chainEditInfo.crowdloanUrl;
       }
     }
+    if (targetChainInfo.evmInfo) {
+      if (params.chainEditInfo.blockExplorer !== undefined) {
+        targetChainInfo.evmInfo.blockExplorer = params.chainEditInfo.blockExplorer;
+      }
+    }
     this.updateChainInfoMapSubscription();
     this.dbService.updateChainStore({
       ...targetChainInfo,

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

@@ -61,6 +61,7 @@ exports._isSubstrateParaChain = _isSubstrateParaChain;
 exports._isSubstrateParachain = _isSubstrateParachain;
 exports._isSubstrateRelayChain = _isSubstrateRelayChain;
 exports._isTokenEvmSmartContract = _isTokenEvmSmartContract;
+exports._isTokenTransferredByEvm = _isTokenTransferredByEvm;
 exports._isTokenWasmSmartContract = _isTokenWasmSmartContract;
 exports._isXcmPathSupported = _isXcmPathSupported;
 exports._parseAssetRefKey = _parseAssetRefKey;
@@ -128,6 +129,10 @@ function _getContractAddressOfToken(tokenInfo) {
   var _tokenInfo$metadata;
   return ((_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.contractAddress) || '';
 }
+function _isTokenTransferredByEvm(tokenInfo) {
+  var _tokenInfo$metadata2;
+  return !!((_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.contractAddress) || _isNativeToken(tokenInfo);
+}
 function _checkSmartContractSupportByChain(chainInfo, contractType) {
   // EVM chains support smart contract by default so just checking Substrate chains
   if (chainInfo.substrateInfo === null || chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract === null) {
@@ -138,12 +143,12 @@ function _checkSmartContractSupportByChain(chainInfo, contractType) {
 
 // Utils for balance functions
 function _getTokenOnChainAssetId(tokenInfo) {
-  var _tokenInfo$metadata2;
-  return ((_tokenInfo$metadata2 = tokenInfo.metadata) === null || _tokenInfo$metadata2 === void 0 ? void 0 : _tokenInfo$metadata2.assetId) || '-1';
+  var _tokenInfo$metadata3;
+  return ((_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.assetId) || '-1';
 }
 function _getTokenOnChainInfo(tokenInfo) {
-  var _tokenInfo$metadata3;
-  return (_tokenInfo$metadata3 = tokenInfo.metadata) === null || _tokenInfo$metadata3 === void 0 ? void 0 : _tokenInfo$metadata3.onChainInfo;
+  var _tokenInfo$metadata4;
+  return (_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.onChainInfo;
 }
 function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
@@ -296,16 +301,16 @@ function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, assetRefMap)
   return assetRef.path === _types._AssetRefPath.XCM;
 }
 function _getXcmAssetType(tokenInfo) {
-  var _tokenInfo$metadata4;
-  return ((_tokenInfo$metadata4 = tokenInfo.metadata) === null || _tokenInfo$metadata4 === void 0 ? void 0 : _tokenInfo$metadata4.assetType) || '';
+  var _tokenInfo$metadata5;
+  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetType) || '';
 }
 function _getXcmAssetId(tokenInfo) {
-  var _tokenInfo$metadata5;
-  return ((_tokenInfo$metadata5 = tokenInfo.metadata) === null || _tokenInfo$metadata5 === void 0 ? void 0 : _tokenInfo$metadata5.assetId) || '-1';
+  var _tokenInfo$metadata6;
+  return ((_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.assetId) || '-1';
 }
 function _getXcmAssetMultilocation(tokenInfo) {
-  var _tokenInfo$metadata6;
-  return (_tokenInfo$metadata6 = tokenInfo.metadata) === null || _tokenInfo$metadata6 === void 0 ? void 0 : _tokenInfo$metadata6.multilocation;
+  var _tokenInfo$metadata7;
+  return (_tokenInfo$metadata7 = tokenInfo.metadata) === null || _tokenInfo$metadata7 === void 0 ? void 0 : _tokenInfo$metadata7.multilocation;
 }
 function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;

package/cjs/services/history-service/subsquid-multi-chain-history.js

@@ -255,7 +255,7 @@ async function fetchMultiChainHistories(addresses, chainMap) {
     const usedAddresses = relatedAddresses.filter(a => lowerAddresses.includes(a.toLowerCase()));
     const chainInfo = chainMap[chainId];
     if (chainInfo === undefined) {
-      console.warn(`Not found chain info for chain id: ${chainId}`); // TODO: resolve conflicting chainId
+      console.debug(`Not found chain info for chain id: ${chainId}`); // TODO: resolve conflicting chainId
 
       return;
     }
@@ -264,7 +264,7 @@ async function fetchMultiChainHistories(addresses, chainMap) {
         const transactionData = parseSubsquidTransactionData(address, name, historyItem, chainInfo, parseData(args), parseData(_data));
         histories.push(transactionData);
       } catch (e) {
-        console.warn('Parse transaction data failed', address, e);
+        console.debug('Parse transaction data failed', address, e);
       }
     });
   });

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();