@subwallet/extension-base 1.0.7-2 → 1.0.9-0

package/koni/api/xcm/polkadotXcm.js

@@ -1,49 +1,30 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { getBeneficiary, getDestWeight } from '@subwallet/extension-base/koni/api/xcm/utils';
-import { _getSubstrateParaId, _getXcmAssetMultilocation, _isSubstrateParaChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
-function getDestinationChainLocation(destinationChainInfo) {
-  if (_isSubstrateParaChain(destinationChainInfo)) {
-    return {
-      V1: {
-        parents: 1,
-        interior: {
-          X1: {
-            Parachain: _getSubstrateParaId(destinationChainInfo)
-          }
-        }
-      }
-    };
-  }
-  return {
-    // to relaychain by default
-    V1: {
-      parents: 1,
-      interior: 'Here'
-    }
-  };
-}
-function getAssetLocation(tokenInfo, sendingValue) {
-  const multilocation = _getXcmAssetMultilocation(tokenInfo);
-  return {
-    V1: [{
-      id: multilocation,
-      fun: {
-        Fungible: sendingValue
-      }
-    }]
-  };
-}
+import { getBeneficiary, getDestinationChainLocation, getDestWeight, getTokenLocation } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { _isNativeToken, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 export function getExtrinsicByPolkadotXcmPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = getDestWeight();
-  const beneficiary = getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress);
-  const destination = getDestinationChainLocation(destinationChainInfo);
-  const assetLocation = getAssetLocation(tokenInfo, value);
+  const beneficiary = getBeneficiary(destinationChainInfo, recipientAddress);
+  const destination = getDestinationChainLocation(originChainInfo, destinationChainInfo);
+  let assetLocation = getTokenLocation(tokenInfo, value);
   let method = 'limitedReserveTransferAssets';
-  if (['astar', 'shiden'].includes(originChainInfo.slug)) {
+  if (['astar', 'shiden'].includes(originChainInfo.slug) && !_isNativeToken(tokenInfo)) {
     method = 'limitedReserveWithdrawAssets';
-  } else if (_isSubstrateRelayChain(destinationChainInfo)) {
+  } else if (['statemint', 'statemine'].includes(originChainInfo.slug) && _isSubstrateRelayChain(destinationChainInfo)) {
+    assetLocation = {
+      V1: [{
+        id: {
+          Concrete: {
+            parents: 1,
+            interior: 'Here'
+          }
+        },
+        fun: {
+          Fungible: value
+        }
+      }]
+    };
     method = 'limitedTeleportAssets';
   }
   return api.tx.polkadotXcm[method](destination, beneficiary, assetLocation, 0,

package/koni/api/xcm/utils.d.ts

@@ -1,10 +1,10 @@
-import { _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 export declare const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
 export declare const FOUR_INSTRUCTIONS_LIMITED_WEIGHT: {
     Limited: number;
 };
-export declare function getReceiverLocation(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, toAddress: string): Record<string, any>;
-export declare function getBeneficiary(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, recipientAddress: string, version?: string): {
+export declare function getReceiverLocation(destinationChainInfo: _ChainInfo, toAddress: string, version?: string): Record<string, any>;
+export declare function getBeneficiary(destinationChainInfo: _ChainInfo, recipientAddress: string, version?: string): {
     [x: string]: {
         parents: number;
         interior: {
@@ -13,3 +13,36 @@ export declare function getBeneficiary(originChainInfo: _ChainInfo, destinationC
     };
 };
 export declare function getDestWeight(): string;
+export declare function getTokenLocation(tokenInfo: _ChainAsset, sendingValue: string, version?: string): {
+    [x: string]: {
+        id: Record<string, any>;
+        fun: {
+            Fungible: string;
+        };
+    }[];
+};
+export declare function getDestMultilocation(destinationChainInfo: _ChainInfo, recipient: string, version?: string): {
+    [x: string]: {
+        parents: number;
+        interior: {
+            X2: Record<string, any>[];
+        };
+    };
+} | {
+    [x: string]: {
+        parents: number;
+        interior: {
+            X1: Record<string, any>;
+        };
+    };
+};
+export declare function getDestinationChainLocation(originChainInfo: _ChainInfo, destinationChainInfo: _ChainInfo, version?: string): {
+    [x: string]: {
+        parents: number;
+        interior: string | {
+            X1: {
+                Parachain: number;
+            };
+        };
+    };
+};

package/koni/api/xcm/utils.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
-import { _isChainEvmCompatible } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getSubstrateParaId, _getXcmAssetMultilocation, _isChainEvmCompatible, _isNativeToken, _isSubstrateParaChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
 export const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
 export const FOUR_INSTRUCTIONS_LIMITED_WEIGHT = {
@@ -11,13 +11,14 @@ export const FOUR_INSTRUCTIONS_LIMITED_WEIGHT = {
 
 // get multilocation for destination chain from a parachain
 
-export function getReceiverLocation(originChainInfo, destinationChainInfo, toAddress) {
+export function getReceiverLocation(destinationChainInfo, toAddress, version) {
+  const network = version && version === 'V3' ? undefined : 'Any';
   if (destinationChainInfo.slug === COMMON_CHAIN_SLUGS.ASTAR_EVM) {
     const ss58Address = evmToAddress(toAddress, 2006); // TODO: shouldn't pass addressPrefix directly
 
     return {
       AccountId32: {
-        network: 'Any',
+        network,
         id: decodeAddress(ss58Address)
       }
     };
@@ -25,20 +26,20 @@ export function getReceiverLocation(originChainInfo, destinationChainInfo, toAdd
   if (_isChainEvmCompatible(destinationChainInfo)) {
     return {
       AccountKey20: {
-        network: 'Any',
+        network,
         key: toAddress
       }
     };
   }
   return {
     AccountId32: {
-      network: 'Any',
+      network,
       id: decodeAddress(toAddress)
     }
   };
 }
-export function getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress, version = 'V1') {
-  const receiverLocation = getReceiverLocation(originChainInfo, destinationChainInfo, recipientAddress);
+export function getBeneficiary(destinationChainInfo, recipientAddress, version = 'V1') {
+  const receiverLocation = getReceiverLocation(destinationChainInfo, recipientAddress, version);
   return {
     [version]: {
       parents: 0,
@@ -50,8 +51,68 @@ export function getBeneficiary(originChainInfo, destinationChainInfo, recipientA
 }
 export function getDestWeight() {
   return 'Unlimited';
-  // return api.tx.xTokens.transfer.meta.args[3].type.toString() ===
-  // 'XcmV2WeightLimit'
-  //   ? 'Unlimited'
-  //   : FOUR_INSTRUCTIONS_WEIGHT;
+}
+export function getTokenLocation(tokenInfo, sendingValue, version = 'V1') {
+  if (!_isNativeToken(tokenInfo)) {
+    const multilocation = _getXcmAssetMultilocation(tokenInfo);
+    return {
+      [version]: [{
+        id: multilocation,
+        fun: {
+          Fungible: sendingValue
+        }
+      }]
+    };
+  }
+  return {
+    [version]: [{
+      id: {
+        Concrete: {
+          parents: 0,
+          interior: 'Here'
+        }
+      },
+      fun: {
+        Fungible: sendingValue
+      }
+    }]
+  };
+}
+export function getDestMultilocation(destinationChainInfo, recipient, version = 'V1') {
+  const receiverLocation = getReceiverLocation(destinationChainInfo, recipient, version);
+  if (_isSubstrateParaChain(destinationChainInfo)) {
+    const interior = {
+      X2: [{
+        Parachain: _getSubstrateParaId(destinationChainInfo)
+      }, receiverLocation]
+    };
+    return {
+      [version]: {
+        parents: 1,
+        interior
+      }
+    };
+  }
+  return {
+    [version]: {
+      parents: 1,
+      interior: {
+        X1: receiverLocation
+      }
+    }
+  };
+}
+export function getDestinationChainLocation(originChainInfo, destinationChainInfo, version = 'V1') {
+  const parents = _isSubstrateRelayChain(originChainInfo) ? 0 : 1;
+  const interior = _isSubstrateParaChain(destinationChainInfo) ? {
+    X1: {
+      Parachain: _getSubstrateParaId(destinationChainInfo)
+    }
+  } : 'Here';
+  return {
+    [version]: {
+      parents,
+      interior
+    }
+  };
 }

package/koni/api/xcm/xTokens.js

@@ -1,9 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { FOUR_INSTRUCTIONS_WEIGHT, getDestWeight, getReceiverLocation } from '@subwallet/extension-base/koni/api/xcm/utils';
-import { _XCM_TYPE } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getSubstrateParaId, _getTokenOnChainInfo, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType, _getXcmTransferType, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
+import { FOUR_INSTRUCTIONS_WEIGHT, getDestMultilocation, getDestWeight } from '@subwallet/extension-base/koni/api/xcm/utils';
+import { _getTokenOnChainAssetId, _getTokenOnChainInfo, _getXcmAssetId, _getXcmAssetMultilocation, _getXcmAssetType, _isNativeToken } from '@subwallet/extension-base/services/chain-service/utils';
 function getCurrencyId(tokenInfo) {
   if (['acala', 'karura'].includes(tokenInfo.originChain) && _isNativeToken(tokenInfo)) {
     return _getXcmAssetMultilocation(tokenInfo);
@@ -16,38 +15,10 @@ function getCurrencyId(tokenInfo) {
   } else if (['pioneer'].includes(tokenInfo.originChain)) {
     return _getXcmAssetMultilocation(tokenInfo);
   }
-  return _getTokenOnChainInfo(tokenInfo);
-}
-function getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo, toAddress) {
-  const xcmType = _getXcmTransferType(originChainInfo, destinationChainInfo);
-  const paraId = _getSubstrateParaId(destinationChainInfo);
-  const receiverLocation = getReceiverLocation(originChainInfo, destinationChainInfo, toAddress);
-  if (xcmType === _XCM_TYPE.PP) {
-    // parachain -> parachain
-    const interior = {
-      X2: [{
-        Parachain: paraId
-      }, receiverLocation]
-    };
-    return {
-      V1: {
-        parents: 1,
-        interior
-      }
-    };
-  }
-
-  // parachain -> relaychain by default
-  return {
-    V1: {
-      parents: 1,
-      interior: {
-        X1: receiverLocation
-      }
-    }
-  };
+  return _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo);
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
-  const weightParam = ['pioneer'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : getDestWeight();
-  return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getMultiLocationForXtokensPallet(originChainInfo, destinationChainInfo, recipientAddress), weightParam);
+  const weightParam = ['pioneer', 'hydradx_main'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : getDestWeight();
+  const destVersion = ['moonbeam', 'moonriver'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getDestMultilocation(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/koni/api/xcm/xcmPallet.js

@@ -1,44 +1,14 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { getBeneficiary, getDestWeight } from '@subwallet/extension-base/koni/api/xcm/utils';
-import { _getSubstrateParaId } from '@subwallet/extension-base/services/chain-service/utils';
-function getDestinationChainLocation(destinationChainInfo, version = 'V1') {
-  return {
-    [version]: {
-      parents: 0,
-      interior: {
-        X1: {
-          Parachain: _getSubstrateParaId(destinationChainInfo)
-        }
-      }
-    }
-  };
-}
-function getTokenLocation(sendingValue, version = 'V2') {
-  return {
-    // always native token of relaychain
-    [version]: [{
-      id: {
-        Concrete: {
-          parents: 0,
-          interior: 'Here'
-        }
-      },
-      fun: {
-        Fungible: sendingValue
-      }
-    }]
-  };
-}
-
+import { getBeneficiary, getDestinationChainLocation, getDestWeight, getTokenLocation } from '@subwallet/extension-base/koni/api/xcm/utils';
 // this pallet is only used by Relaychains
 export function getExtrinsicByXcmPalletPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = getDestWeight();
-  const xcmVer = ['kusama'].includes(originChainInfo.slug) ? 'V2' : 'V1';
-  const destination = getDestinationChainLocation(destinationChainInfo, xcmVer);
-  const beneficiary = getBeneficiary(originChainInfo, destinationChainInfo, recipientAddress, xcmVer);
-  const tokenLocation = getTokenLocation(value, xcmVer);
+  const xcmVer = ['kusama'].includes(originChainInfo.slug) ? 'V3' : 'V1';
+  const destination = getDestinationChainLocation(originChainInfo, destinationChainInfo, xcmVer);
+  const beneficiary = getBeneficiary(destinationChainInfo, recipientAddress, xcmVer);
+  const tokenLocation = getTokenLocation(tokenInfo, value, xcmVer);
   let method = 'limitedReserveTransferAssets';
   if (['statemint', 'statemine'].includes(destinationChainInfo.slug)) {
     method = 'limitedTeleportAssets';

package/koni/background/handlers/Extension.js

@@ -2,13 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import Common from '@ethereumjs/common';
+import { _AssetType } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { isJsonPayload, SEED_DEFAULT_LENGTH, SEED_LENGTHS } from '@subwallet/extension-base/background/handlers/Extension';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
 import { checkReferenceCount, checkSupportTransfer, createTransferExtrinsic } from '@subwallet/extension-base/koni/api/dotsama/transfer';
@@ -26,6 +27,7 @@ import { reformatAddress } from '@subwallet/extension-base/utils';
 import { convertSubjectInfoToAddresses } from '@subwallet/extension-base/utils/address';
 import { createTransactionFromRLP, signatureToHex } from '@subwallet/extension-base/utils/eth';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
+import { balanceFormatter, formatNumber } from '@subwallet/extension-base/utils/number';
 import { createPair } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
@@ -1399,41 +1401,57 @@ export default class KoniExtension {
 
     // Get native token amount
     const freeBalance = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-    if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(tokenInfo)) {
-      // TODO: review this
-      chainType = ChainType.EVM;
-      const txVal = transferAll ? freeBalance.value : value || '0';
-
-      // Estimate with EVM API
-      if (_isTokenEvmSmartContract(tokenInfo) || _isLocalToken(tokenInfo)) {
-        [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
+    try {
+      if (isEthereumAddress(from) && isEthereumAddress(to) && _isTokenTransferredByEvm(tokenInfo)) {
+        // TODO: review this
+        chainType = ChainType.EVM;
+        const txVal = transferAll ? freeBalance.value : value || '0';
+
+        // Estimate with EVM API
+        if (_isTokenEvmSmartContract(tokenInfo) || _isLocalToken(tokenInfo)) {
+          [transaction, transferAmount.value] = await getERC20TransactionObject(_getContractAddressOfToken(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
+        } else {
+          [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, to, txVal, !!transferAll, evmApiMap);
+        }
       } else {
-        [transaction, transferAmount.value] = await getEVMTransactionObject(chainInfo, to, txVal, !!transferAll, evmApiMap);
+        const substrateApi = this.#koniState.getSubstrateApi(networkKey);
+        [transaction, transferAmount.value] = await createTransferExtrinsic({
+          transferAll: !!transferAll,
+          value: value || '0',
+          from: from,
+          networkKey,
+          tokenInfo,
+          to: to,
+          substrateApi
+        });
       }
-    } else {
-      const substrateApi = this.#koniState.getSubstrateApi(networkKey);
-      [transaction, transferAmount.value] = await createTransferExtrinsic({
-        transferAll: !!transferAll,
-        value: value || '0',
-        from: from,
-        networkKey,
-        tokenInfo,
-        to: to,
-        substrateApi
-      });
+    } catch (e) {
+      const error = e;
+      if (error.message.includes('transfer amount exceeds balance')) {
+        error.message = 'Not enough balance';
+      }
+      throw error;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
     this.addContact(to);
     const additionalValidator = async inputTransaction => {
+      const minAmount = tokenInfo.minAmount || '0';
       if (!isTransferNativeToken) {
         const {
           value: balance
         } = await this.#koniState.balanceService.getTokenFreeBalance(from, networkKey, tokenSlug);
-        const minAmount = tokenInfo.minAmount || '0';
         if (new BigN(balance).minus(transferAmount.value).lt(minAmount)) {
           inputTransaction.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
         }
       }
+      const {
+        value: receiverBalance
+      } = await this.#koniState.balanceService.getTokenFreeBalance(to, networkKey, tokenSlug);
+      if (new BigN(receiverBalance).plus(transferAmount.value).lt(minAmount)) {
+        const atLeast = new BigN(minAmount).minus(receiverBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
+        const atLeastStr = formatNumber(atLeast, tokenInfo.decimals || 0, balanceFormatter);
+        inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, `You must transfer at least ${atLeastStr} ${tokenInfo.symbol} to keep the destination account alive`));
+      }
     };
     return this.#koniState.transactionService.handleTransaction({
       errors,
@@ -1447,7 +1465,7 @@ export default class KoniExtension {
       extrinsicType: isTransferNativeToken ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.TRANSFER_TOKEN,
       ignoreWarnings: transferAll,
       isTransferAll: isTransferNativeToken ? transferAll : false,
-      edAsWarning: true,
+      edAsWarning: isTransferNativeToken,
       additionalValidator: additionalValidator
     });
   }
@@ -1476,6 +1494,8 @@ export default class KoniExtension {
     if (errors.length > 0) {
       return this.#koniState.transactionService.generateBeforeHandleResponseErrors(errors);
     }
+    let additionalValidator;
+    let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
       const substrateApi = this.#koniState.getSubstrateApi(originNetworkKey);
       const chainInfoMap = this.#koniState.getChainInfoMap();
@@ -1487,6 +1507,40 @@ export default class KoniExtension {
         chainInfoMap,
         substrateApi
       });
+      additionalValidator = async inputTransaction => {
+        const destMinAmount = destinationTokenInfo.minAmount || '0';
+        const atLeast = new BigN(destMinAmount).multipliedBy(XCM_MIN_AMOUNT_RATIO);
+        if (new BigN(value).lt(atLeast)) {
+          const atLeastStr = formatNumber(atLeast, destinationTokenInfo.decimals || 0, balanceFormatter);
+          inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, `You must transfer at least ${atLeastStr} ${originTokenInfo.symbol} to keep the destination account alive`));
+        }
+        const srcMinAmount = originTokenInfo.minAmount || '0';
+        const isTransferNativeToken = originTokenInfo.assetType === _AssetType.NATIVE;
+        if (!isTransferNativeToken) {
+          const {
+            value: balance
+          } = await this.#koniState.balanceService.getTokenFreeBalance(from, originNetworkKey, originTokenInfo.slug);
+          if (new BigN(balance).minus(value).lt(srcMinAmount)) {
+            inputTransaction.warnings.push(new TransactionWarning(BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+          }
+        }
+      };
+      eventsHandler = eventEmitter => {
+        eventEmitter.on('send', () => {
+          try {
+            const dest = keyring.getPair(to);
+            if (dest) {
+              this.updateAssetSetting({
+                autoEnableNativeToken: false,
+                tokenSlug: destinationTokenInfo.slug,
+                assetSetting: {
+                  visible: true
+                }
+              }).catch(console.error);
+            }
+          } catch (e) {}
+        });
+      };
     }
     this.addContact(to);
     return await this.#koniState.transactionService.handleTransaction({
@@ -1498,8 +1552,11 @@ export default class KoniExtension {
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
       chainType: ChainType.SUBSTRATE,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
+      ignoreWarnings: inputData.transferAll,
       isTransferAll: inputData.transferAll,
-      errors
+      errors,
+      additionalValidator: additionalValidator,
+      eventsHandler: eventsHandler
     });
   }
   async evmNftSubmitTransaction(inputData) {
@@ -2861,6 +2918,7 @@ export default class KoniExtension {
       return Object.fromEntries(Object.entries(rs).map(([key, value]) => {
         const {
           additionalValidator,
+          eventsHandler,
           transaction,
           ...transactionResult
         } = value;

package/koni/background/handlers/State.js

@@ -10,7 +10,7 @@ import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH } from '@subwallet/extension-base/con
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { _PREDEFINED_SINGLE_MODES } from '@subwallet/extension-base/services/chain-service/constants';
-import { _getEvmChainId, _getSubstrateGenesisHash, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _isSubstrateParachain, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getEvmChainId, _getSubstrateGenesisHash, _isAssetFungibleToken, _isChainEnabled, _isChainTestNet, _isSubstrateParaChain, _parseMetadataForSmartContractAsset } from '@subwallet/extension-base/services/chain-service/utils';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { HistoryService } from '@subwallet/extension-base/services/history-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
@@ -44,7 +44,7 @@ const getSuri = (seed, type) => {
 const generateDefaultCrowdloanMap = () => {
   const crowdloanMap = {};
   Object.entries(ChainInfoMap).forEach(([networkKey, chainInfo]) => {
-    if (_isSubstrateParachain(chainInfo)) {
+    if (_isSubstrateParaChain(chainInfo)) {
       crowdloanMap[networkKey] = {
         state: APIItemState.PENDING,
         contribute: '0'

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.7-2",
+  "version": "1.0.9-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1190,6 +1190,11 @@
       "require": "./cjs/services/history-service/index.js",
       "default": "./services/history-service/index.js"
     },
+    "./services/history-service/constants": {
+      "types": "./services/history-service/constants/index.d.ts",
+      "require": "./cjs/services/history-service/constants/index.js",
+      "default": "./services/history-service/constants/index.js"
+    },
     "./services/history-service/helpers/recoverHistoryStatus": {
       "types": "./services/history-service/helpers/recoverHistoryStatus.d.ts",
       "require": "./cjs/services/history-service/helpers/recoverHistoryStatus.js",
@@ -1635,6 +1640,11 @@
       "require": "./cjs/utils/keyring.js",
       "default": "./utils/keyring.js"
     },
+    "./utils/number": {
+      "types": "./utils/number.d.ts",
+      "require": "./cjs/utils/number.js",
+      "default": "./utils/number.js"
+    },
     "./utils/promise": {
       "types": "./utils/promise.d.ts",
       "require": "./cjs/utils/promise.js",
@@ -1697,13 +1707,13 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.1.9",
-    "@subwallet/extension-base": "^1.0.7-2",
-    "@subwallet/extension-chains": "^1.0.7-2",
-    "@subwallet/extension-dapp": "^1.0.7-2",
-    "@subwallet/extension-inject": "^1.0.7-2",
-    "@subwallet/keyring": "^0.0.9",
-    "@subwallet/ui-keyring": "^0.0.9",
+    "@subwallet/chain-list": "0.1.11-beta.1",
+    "@subwallet/extension-base": "^1.0.9-0",
+    "@subwallet/extension-chains": "^1.0.9-0",
+    "@subwallet/extension-dapp": "^1.0.9-0",
+    "@subwallet/extension-inject": "^1.0.9-0",
+    "@subwallet/keyring": "^0.0.10",
+    "@subwallet/ui-keyring": "^0.0.10",
     "@unique-nft/types": "^0.6.0-4",
     "@zeitgeistpm/type-defs": "^1.0.0",
     "@zeroio/type-definitions": "^0.0.14",

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.7-2'
+  version: '1.0.9-0'
 };

package/services/chain-service/constants.d.ts

@@ -62,6 +62,8 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     crab: string[];
     bitcountry: string[];
     statemine: string[];
+    riochain: string[];
+    sora_substrate: string[];
 };
 export declare const _BALANCE_PARSING_CHAIN_GROUP: {
     bobabeam: string[];