@subwallet/extension-base 1.0.5-2 → 1.0.5-3

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;

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/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';
 
@@ -2917,6 +2918,7 @@ class KoniExtension {
       return Object.fromEntries(Object.entries(rs).map(_ref70 => {
         let [key, value] = _ref70;
         const {
+          additionalValidator,
           transaction,
           ...transactionResult
         } = value;

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

@@ -445,35 +445,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.5-3'
 };
 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;
@@ -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/transaction-service/index.js

@@ -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/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/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';
@@ -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';
 
@@ -2837,6 +2838,7 @@ export default class KoniExtension {
     function convertRs(rs) {
       return Object.fromEntries(Object.entries(rs).map(([key, value]) => {
         const {
+          additionalValidator,
           transaction,
           ...transactionResult
         } = value;

package/koni/background/handlers/Tabs.js

@@ -401,35 +401,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.5-3",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1692,11 +1692,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.5-3",
+    "@subwallet/extension-chains": "^1.0.5-3",
+    "@subwallet/extension-dapp": "^1.0.5-3",
+    "@subwallet/extension-inject": "^1.0.5-3",
     "@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.5-3'
 };

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
 };
 
@@ -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']

package/services/chain-service/index.js

@@ -707,6 +707,11 @@ export 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/services/chain-service/utils.d.ts

@@ -10,6 +10,7 @@ export declare function _isPureEvmChain(chainInfo: _ChainInfo): boolean;
 export declare function _isPureSubstrateChain(chainInfo: _ChainInfo): boolean;
 export declare function _getOriginChainOfAsset(assetSlug: string): string;
 export declare function _getContractAddressOfToken(tokenInfo: _ChainAsset): string;
+export declare function _isTokenTransferredByEvm(tokenInfo: _ChainAsset): boolean;
 export declare function _checkSmartContractSupportByChain(chainInfo: _ChainInfo, contractType: _AssetType): boolean;
 export declare function _getTokenOnChainAssetId(tokenInfo: _ChainAsset): string;
 export declare function _getTokenOnChainInfo(tokenInfo: _ChainAsset): Record<string, any>;

package/services/chain-service/utils.js

@@ -61,6 +61,10 @@ export function _getContractAddressOfToken(tokenInfo) {
   var _tokenInfo$metadata;
   return ((_tokenInfo$metadata = tokenInfo.metadata) === null || _tokenInfo$metadata === void 0 ? void 0 : _tokenInfo$metadata.contractAddress) || '';
 }
+export function _isTokenTransferredByEvm(tokenInfo) {
+  var _tokenInfo$metadata2;
+  return !!((_tokenInfo$metadata2 = tokenInfo.metadata) !== null && _tokenInfo$metadata2 !== void 0 && _tokenInfo$metadata2.contractAddress) || _isNativeToken(tokenInfo);
+}
 export 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) {
@@ -71,12 +75,12 @@ export function _checkSmartContractSupportByChain(chainInfo, contractType) {
 
 // Utils for balance functions
 export 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';
 }
 export 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;
 }
 export function _getTokenMinAmount(tokenInfo) {
   return tokenInfo.minAmount || '0';
@@ -229,16 +233,16 @@ export function _isXcmPathSupported(originTokenSlug, destinationTokenSlug, asset
   return assetRef.path === _AssetRefPath.XCM;
 }
 export 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) || '';
 }
 export 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';
 }
 export 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;
 }
 export function _getXcmTransferType(originChainInfo, destinationChainInfo) {
   var _originChainInfo$subs, _destinationChainInfo;

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

@@ -244,7 +244,7 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
     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;
     }
@@ -253,7 +253,7 @@ export async function fetchMultiChainHistories(addresses, chainMap, maxPage = 25
         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/services/transaction-service/index.js

@@ -161,8 +161,8 @@ export default class TransactionService {
     const transactionId = 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 || EXTENSION_REQUEST_URL,
@@ -203,6 +203,9 @@ export default 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 = [];
@@ -220,6 +223,10 @@ export default class TransactionService {
         }
       });
     });
+
+    // @ts-ignore
+    'transaction' in validatedTransaction && delete validatedTransaction.transaction;
+    'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
     return validatedTransaction;
   }
   async sendTransaction(transaction) {
@@ -286,7 +293,7 @@ export default 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
@@ -295,7 +302,6 @@ export default class TransactionService {
       nonce: nonce || 0,
       startBlock: startBlock || 0
     };
-    console.log('historyItem', historyItem);
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
     const nativeAsset = _getChainNativeTokenBasicInfo(chainInfo);
     const baseNativeAmount = {

package/services/transaction-service/types.d.ts

@@ -14,14 +14,14 @@ export interface SWTransaction extends ValidateTransactionResponse, Partial<Pick
     status: ExtrinsicStatus;
     extrinsicHash: string;
     extrinsicType: ExtrinsicType;
-    createdAt: Date;
-    updatedAt: Date;
+    createdAt: number;
+    updatedAt: number;
     estimateFee?: AmountData;
     transaction: SubmittableExtrinsic | TransactionConfig;
     additionalValidator?: (inputTransaction: SWTransactionResponse) => Promise<void>;
     eventsHandler?: (eventEmitter: TransactionEmitter) => void;
 }
-export declare type SWTransactionResult = Omit<SWTransaction, 'transaction'>;
+export declare type SWTransactionResult = Omit<SWTransaction, 'transaction' | 'additionalValidator'>;
 declare type SwInputBase = Pick<SWTransaction, 'address' | 'url' | 'data' | 'extrinsicType' | 'chain' | 'chainType' | 'ignoreWarnings' | 'transferNativeAmount'> & Partial<Pick<SWTransaction, 'additionalValidator'>>;
 export interface SWTransactionInput extends SwInputBase {
     transaction?: SWTransaction['transaction'] | null;

package/services/transaction-service/utils.js

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