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

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'));
       }
     }
 
@@ -168,8 +168,8 @@ class TransactionService {
     const transactionId = (0, _helpers.getTransactionId)(transaction.chainType, transaction.chain, isInternal);
     return {
       ...transaction,
-      createdAt: new Date(),
-      updatedAt: new Date(),
+      createdAt: new Date().getTime(),
+      updatedAt: new Date().getTime(),
       errors: transaction.errors || [],
       warnings: transaction.warnings || [],
       url: transaction.url || _constants2.EXTENSION_REQUEST_URL,
@@ -210,6 +210,9 @@ class TransactionService {
     const stopByErrors = validatedTransaction.errors.length > 0;
     const stopByWarnings = validatedTransaction.warnings.length > 0 && !validatedTransaction.ignoreWarnings;
     if (stopByErrors || stopByWarnings) {
+      // @ts-ignore
+      'transaction' in validatedTransaction && delete validatedTransaction.transaction;
+      'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
       return validatedTransaction;
     }
     validatedTransaction.warnings = [];
@@ -227,6 +230,10 @@ class TransactionService {
         }
       });
     });
+
+    // @ts-ignore
+    'transaction' in validatedTransaction && delete validatedTransaction.transaction;
+    'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
     return validatedTransaction;
   }
   async sendTransaction(transaction) {
@@ -293,7 +300,7 @@ class TransactionService {
       status: transaction.status,
       transactionId: transaction.id,
       extrinsicHash: transaction.extrinsicHash,
-      time: transaction.createdAt.getTime(),
+      time: transaction.createdAt,
       fee: transaction.estimateFee,
       blockNumber: 0,
       // Will be added in next step
@@ -302,7 +309,6 @@ class TransactionService {
       nonce: nonce || 0,
       startBlock: startBlock || 0
     };
-    console.log('historyItem', historyItem);
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
     const nativeAsset = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
     const baseNativeAmount = {

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

@@ -27,6 +27,9 @@ function getBlockExplorerTxRoute(chainInfo) {
   if ((0, _utils._isPureEvmChain)(chainInfo)) {
     return 'tx';
   }
+  if (['aventus'].includes(chainInfo.slug)) {
+    return 'transaction';
+  }
   return 'extrinsic';
 }
 function getExplorerLink(chainInfo, value, type) {

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/staking/bonding/relayChain.js

@@ -5,7 +5,7 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { StakingStatus, StakingTxErrorType, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
 import { calculateAlephZeroValidatorReturn, calculateChainStakedReturn, calculateInflation, calculateValidatorStakedReturn, getCommission, parseIdentity, parsePoolStashAddress, transformPoolName } from '@subwallet/extension-base/koni/api/staking/bonding/utils';
 import { _STAKING_CHAIN_GROUP, _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getChainNativeTokenBasicInfo, _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainSubstrateAddressPrefix } from '@subwallet/extension-base/services/chain-service/utils';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_ZERO } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -13,7 +13,7 @@ export function validateRelayUnbondingCondition(amount, chainStakingMetadata, no
   const errors = [];
   const bnActiveStake = new BN(nominatorMetadata.activeStake);
   const bnRemainingStake = bnActiveStake.sub(new BN(amount));
-  const minStake = new BN(chainStakingMetadata.minPoolBonding || '0');
+  const minStake = new BN(chainStakingMetadata.minJoinNominationPool || '0');
   if (!(bnRemainingStake.isZero() || bnRemainingStake.gte(minStake))) {
     errors.push(new TransactionError(StakingTxErrorType.INVALID_ACTIVE_STAKE));
   }
@@ -27,7 +27,7 @@ export function validatePoolBondingCondition(chainInfo, amount, selectedPool, ad
   // amount >= min stake
   const errors = [];
   let bnTotalStake = new BN(amount);
-  const bnMinStake = new BN(chainStakingMetadata.minPoolBonding || '0');
+  const bnMinStake = new BN(chainStakingMetadata.minJoinNominationPool || '0');
   if (selectedPool.state !== 'Open') {
     errors.push(new TransactionError(StakingTxErrorType.INACTIVE_NOMINATION_POOL));
   }
@@ -69,9 +69,6 @@ export function validateRelayBondingCondition(chainInfo, amount, selectedValidat
 export 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
-  } = _getChainNativeTokenBasicInfo(chainInfo);
   const chainApi = await substrateApi.isReady;
   const _era = await chainApi.api.query.staking.currentEra();
   const currentEra = _era.toString();
@@ -115,8 +112,6 @@ export 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/koni/api/staking/bonding/utils.d.ts

@@ -153,3 +153,4 @@ export declare function getStakingAvailableActionsByNominator(nominatorMetadata:
 export declare function isActionFromValidator(stakingType: StakingType, chain: string): boolean;
 export declare function getWithdrawalInfo(nominatorMetadata: NominatorMetadata): UnstakingInfo | undefined;
 export declare function getStakingStatusByNominations(bnTotalActiveStake: BN, nominationList: NominationInfo[]): StakingStatus;
+export declare function getValidatorLabel(chain: string): "dApp" | "Validator" | "Collator";

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

@@ -241,4 +241,12 @@ export function getStakingStatusByNominations(bnTotalActiveStake, nominationList
     }
   }
   return stakingStatus;
+}
+export function getValidatorLabel(chain) {
+  if (_STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return 'dApp';
+  } else if (_STAKING_CHAIN_GROUP.relay.includes(chain)) {
+    return 'Validator';
+  }
+  return 'Collator';
 }

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

@@ -18,7 +18,7 @@ import { getPoolingBondingExtrinsic, getPoolingUnbondingExtrinsic, validatePoolB
 import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObject } from '@subwallet/extension-base/koni/api/tokens/evm/transfer';
 import { getPSP34TransferExtrinsic } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { createXcmExtrinsic } from '@subwallet/extension-base/koni/api/xcm';
-import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isNativeToken, _isTokenEvmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getSubstrateGenesisHash, _getTokenMinAmount, _isAssetSmartContractNft, _isChainEvmCompatible, _isCustomAsset, _isLocalToken, _isNativeToken, _isTokenEvmSmartContract, _isTokenTransferredByEvm } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { reformatAddress } from '@subwallet/extension-base/utils';
@@ -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;
@@ -1398,7 +1398,8 @@ export default class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    if (isEthereumAddress(from) && isEthereumAddress(to)) {
+    if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(tokenInfo)) {
+      // TODO: review this
       chainType = ChainType.EVM;
       const txVal = transferAll ? freeBalance.value : value || '0';
 
@@ -1589,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 {
@@ -2837,6 +2837,7 @@ export default class KoniExtension {
     function convertRs(rs) {
       return Object.fromEntries(Object.entries(rs).map(([key, value]) => {
         const {
+          additionalValidator,
           transaction,
           ...transactionResult
         } = value;
@@ -2883,6 +2884,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) {
@@ -3208,6 +3217,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;
+  }
 
   ///
 
@@ -401,35 +419,36 @@ export default 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/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.5-2",
+  "version": "1.0.6-0",
   "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",
@@ -1692,11 +1697,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.1.2",
-    "@subwallet/extension-base": "^1.0.5-2",
-    "@subwallet/extension-chains": "^1.0.5-2",
-    "@subwallet/extension-dapp": "^1.0.5-2",
-    "@subwallet/extension-inject": "^1.0.5-2",
+    "@subwallet/chain-list": "^0.1.7",
+    "@subwallet/extension-base": "^1.0.6-0",
+    "@subwallet/extension-chains": "^1.0.6-0",
+    "@subwallet/extension-dapp": "^1.0.6-0",
+    "@subwallet/extension-inject": "^1.0.6-0",
     "@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-2'
+  version: '1.0.6-0'
 };

package/services/chain-service/constants.js

@@ -26,7 +26,7 @@ export 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
 };
 
@@ -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 = {
@@ -179,7 +179,7 @@ export const _TRANSFER_CHAIN_GROUP = {
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
   bitcountry: ['pioneer', 'bitcountry'],
-  statemine: ['statemint', 'statemine']
+  statemine: ['statemint', 'statemine', 'darwinia2']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']