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

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

@@ -10,9 +10,10 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _TransactionWarning = require("@subwallet/extension-base/background/warnings/TransactionWarning");
 var _constants = require("@subwallet/extension-base/constants");
+var _constants2 = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/services/chain-service/utils");
-var _constants2 = require("@subwallet/extension-base/services/request-service/constants");
-var _constants3 = require("@subwallet/extension-base/services/transaction-service/constants");
+var _constants3 = require("@subwallet/extension-base/services/request-service/constants");
+var _constants4 = require("@subwallet/extension-base/services/transaction-service/constants");
 var _eventParser = require("@subwallet/extension-base/services/transaction-service/event-parser");
 var _helpers = require("@subwallet/extension-base/services/transaction-service/helpers");
 var _utils2 = require("@subwallet/extension-base/services/transaction-service/utils");
@@ -116,6 +117,10 @@ class TransactionService {
             }
           }
         } catch (e) {
+          const error = e;
+          if (error.message.includes('gas required exceeds allowance')) {
+            validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
+          }
           estimateFee.value = '0';
         }
       }
@@ -142,16 +147,22 @@ class TransactionService {
     const balanceNum = parseInt(balance.value);
     const edNum = parseInt(existentialDeposit);
     const transferNativeNum = parseInt(transferNative);
-    if (!isTransferAll) {
-      if (transferNativeNum + feeNum > balanceNum) {
+    if (transferNativeNum + feeNum > balanceNum) {
+      if (!isTransferAll) {
         validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
       } else {
-        if (balanceNum - (transferNativeNum + feeNum) <= edNum) {
-          if (edAsWarning) {
-            validationResponse.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
-          } else {
-            validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
-          }
+        if ([..._constants2._TRANSFER_CHAIN_GROUP.acala, ..._constants2._TRANSFER_CHAIN_GROUP.genshiro, ..._constants2._TRANSFER_CHAIN_GROUP.bitcountry, ..._constants2._TRANSFER_CHAIN_GROUP.statemine].includes(chain)) {
+          // Chain not have transfer all function
+          validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_BALANCE));
+        }
+      }
+    }
+    if (!isTransferAll) {
+      if (balanceNum - (transferNativeNum + feeNum) < edNum) {
+        if (edAsWarning) {
+          validationResponse.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+        } else {
+          validationResponse.errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
         }
       }
     }
@@ -172,7 +183,7 @@ class TransactionService {
       updatedAt: new Date().getTime(),
       errors: transaction.errors || [],
       warnings: transaction.warnings || [],
-      url: transaction.url || _constants2.EXTENSION_REQUEST_URL,
+      url: transaction.url || _constants3.EXTENSION_REQUEST_URL,
       status: _KoniTypes.ExtrinsicStatus.QUEUED,
       isInternal,
       id: transactionId,
@@ -213,6 +224,7 @@ class TransactionService {
       // @ts-ignore
       'transaction' in validatedTransaction && delete validatedTransaction.transaction;
       'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
+      'eventsHandler' in validatedTransaction && delete validatedTransaction.eventsHandler;
       return validatedTransaction;
     }
     validatedTransaction.warnings = [];
@@ -234,11 +246,15 @@ class TransactionService {
     // @ts-ignore
     'transaction' in validatedTransaction && delete validatedTransaction.transaction;
     'additionalValidator' in validatedTransaction && delete validatedTransaction.additionalValidator;
+    'eventsHandler' in validatedTransaction && delete validatedTransaction.eventsHandler;
     return validatedTransaction;
   }
   async sendTransaction(transaction) {
     // Send Transaction
     const emitter = transaction.chainType === 'substrate' ? this.signAndSendSubstrateTransaction(transaction) : await this.signAndSendEvmTransaction(transaction);
+    const {
+      eventsHandler
+    } = transaction;
     emitter.on('signed', data => {
       this.onSigned(data);
     });
@@ -262,6 +278,7 @@ class TransactionService {
 
     // Todo: handle any event with transaction.eventsHandler
 
+    eventsHandler === null || eventsHandler === void 0 ? void 0 : eventsHandler(emitter);
     return emitter;
   }
   removeTransaction(id) {
@@ -288,6 +305,7 @@ class TransactionService {
   }
   transactionToHistories(id, startBlock, nonce, eventLogs) {
     const transaction = this.getTransaction(id);
+    const extrinsicType = transaction.extrinsicType;
     const historyItem = {
       origin: 'app',
       chain: transaction.chain,
@@ -318,7 +336,7 @@ class TransactionService {
     };
 
     // Fill data by extrinsicType
-    switch (transaction.extrinsicType) {
+    switch (extrinsicType) {
       case _KoniTypes.ExtrinsicType.TRANSFER_BALANCE:
         {
           const inputData = (0, _utils2.parseTransactionData)(transaction.data);
@@ -357,9 +375,10 @@ class TransactionService {
           };
 
           // @ts-ignore
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           historyItem.additionalInfo = {
-            destinationChain: (inputData === null || inputData === void 0 ? void 0 : inputData.destinationNetworkKey) || ''
+            destinationChain: (inputData === null || inputData === void 0 ? void 0 : inputData.destinationNetworkKey) || '',
+            originalChain: inputData.originNetworkKey || '',
+            fee: transaction.estimateFee
           };
           eventLogs && (0, _eventParser.parseXcmEventLogs)(historyItem, eventLogs, transaction.chain, sendingTokenInfo, chainInfo);
         }
@@ -458,11 +477,22 @@ class TransactionService {
       // Return one more history record if transaction send to account in the wallets
       const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && _uiKeyring.default.getPair(historyItem.to);
       if (toAccount) {
-        return [historyItem, {
+        const receiverHistory = {
           ...historyItem,
           address: toAccount.address,
           direction: _KoniTypes.TransactionDirection.RECEIVED
-        }];
+        };
+        switch (extrinsicType) {
+          case _KoniTypes.ExtrinsicType.TRANSFER_XCM:
+            {
+              const inputData = (0, _utils2.parseTransactionData)(transaction.data);
+              receiverHistory.chain = inputData.destinationNetworkKey;
+              break;
+            }
+          default:
+            break;
+        }
+        return [historyItem, receiverHistory];
       }
     } catch (e) {
       console.warn(e);
@@ -554,10 +584,11 @@ class TransactionService {
       blockNumber: blockNumber || 0,
       blockHash: blockHash || ''
     }).catch(console.error);
+    const info = (0, _util.isHex)(extrinsicHash) ? extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.chainService.getChainInfoMap());
     this.notificationService.notify({
       type: _KoniTypes.NotificationType.SUCCESS,
       title: 'Transaction completed',
-      message: `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} completed`,
+      message: `Transaction ${info} completed`,
       action: {
         url: this.getTransactionLink(id)
       },
@@ -589,10 +620,11 @@ class TransactionService {
         blockNumber: blockNumber || 0,
         blockHash: blockHash || ''
       }).catch(console.error);
+      const info = (0, _util.isHex)(transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash) ? transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash : (0, _helpers.getBaseTransactionInfo)(transaction, this.chainService.getChainInfoMap());
       this.notificationService.notify({
         type: _KoniTypes.NotificationType.ERROR,
         title: 'Transaction failed',
-        message: `Transaction ${transaction === null || transaction === void 0 ? void 0 : transaction.extrinsicHash} failed`,
+        message: `Transaction ${info} failed`,
         action: {
           url: this.getTransactionLink(id)
         },
@@ -687,9 +719,10 @@ class TransactionService {
     const eventData = {
       id,
       errors: [],
-      warnings: []
+      warnings: [],
+      extrinsicHash: id
     };
-    this.requestService.addConfirmation(id, url || _constants2.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref7 => {
+    this.requestService.addConfirmation(id, url || _constants3.EXTENSION_REQUEST_URL, 'evmSendTransactionRequest', payload, {}).then(async _ref7 => {
       let {
         isApproved,
         payload
@@ -760,12 +793,13 @@ class TransactionService {
     const eventData = {
       id,
       errors: [],
-      warnings: []
+      warnings: [],
+      extrinsicHash: id
     };
     transaction.signAsync(address, {
       signer: {
         signPayload: async payload => {
-          const signing = await this.requestService.signInternalTransaction(id, address, url || _constants2.EXTENSION_REQUEST_URL, payload);
+          const signing = await this.requestService.signInternalTransaction(id, address, url || _constants3.EXTENSION_REQUEST_URL, payload);
           return {
             id: new Date().getTime(),
             signature: signing.signature
@@ -790,7 +824,7 @@ class TransactionService {
         }
         if (txState.status.isInBlock) {
           eventData.eventLogs = txState.events;
-          if (!eventData.extrinsicHash || eventData.extrinsicHash === '') {
+          if (!eventData.extrinsicHash || eventData.extrinsicHash === '' || !(0, _util.isHex)(eventData.extrinsicHash)) {
             eventData.extrinsicHash = txState.txHash.toHex();
             eventData.blockHash = txState.status.asInBlock.toHex();
             emitter.emit('extrinsicHash', eventData);
@@ -841,7 +875,7 @@ class TransactionService {
         emitter.emit('error', eventData);
         clearTimeout(timeout);
       }
-    }, _constants3.TRANSACTION_TIMEOUT);
+    }, _constants4.TRANSACTION_TIMEOUT);
     emitter.once('success', () => {
       clearTimeout(timeout);
     });

package/cjs/utils/eth/parseTransaction/index.js

@@ -107,44 +107,59 @@ const isContractAddress = async (address, evmApi) => {
   }
 };
 exports.isContractAddress = isContractAddress;
+const parseInputWithAbi = (input, abi) => {
+  const decoder = new _base.InputDataDecoder(abi);
+  const raw = decoder.decodeData(input);
+  if (raw.method && raw.methodName) {
+    const temp = {
+      method: raw.method,
+      methodName: raw.methodName,
+      args: []
+    };
+    raw.types.forEach((type, index) => {
+      temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
+    });
+    return temp;
+  } else {
+    return null;
+  }
+};
 const parseContractInput = async (input, contractAddress, network) => {
-  let result = input;
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const _ABIs = [...ABIs];
+  for (const abi of ABIs) {
+    const temp = parseInputWithAbi(input, abi);
+    if (temp) {
+      return {
+        result: temp
+      };
+    }
+  }
   if (contractAddress && network) {
+    console.log('parseOnline');
     if ((0, _utils._getEvmAbiExplorer)(network)) {
-      const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
-        params: {
-          address: contractAddress
-        }
-      });
+      try {
+        const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
+          params: {
+            address: contractAddress
+          },
+          timeout: 3000
+        });
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      if (res.status === 200 && res.data.status === '1') {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        _ABIs.unshift(res.data.result);
-      }
-    }
-  }
-  for (const abi of _ABIs) {
-    const decoder = new _base.InputDataDecoder(abi);
-    const raw = decoder.decodeData(input);
-    if (raw.method && raw.methodName) {
-      const temp = {
-        method: raw.method,
-        methodName: raw.methodName,
-        args: []
-      };
-      raw.types.forEach((type, index) => {
-        temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
-      });
-      result = temp;
-      break;
+        if (res.status === 200 && res.data.status === '1') {
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+          const abi = res.data.result;
+          const temp = parseInputWithAbi(input, abi);
+          if (temp) {
+            return {
+              result: temp
+            };
+          }
+        }
+      } catch (e) {}
     }
   }
   return {
-    result
+    result: input
   };
 };
 exports.parseContractInput = parseContractInput;
@@ -187,43 +202,38 @@ const parseEvmRlp = async (data, networkMap, evmApiMap) => {
     nonce: new _bignumber.default(tx.nonce).toNumber()
   };
   const network = getChainInfoByChainId(networkMap, parseInt(tx.ethereumChainId));
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const _ABIs = [...ABIs];
+  for (const abi of ABIs) {
+    const temp = parseInputWithAbi(tx.data, abi);
+    if (temp) {
+      result.data = temp;
+      return result;
+    }
+  }
   if (tx.action && network) {
     if (await isContractAddress(tx.action, evmApiMap[network.slug])) {
       if ((0, _utils._getEvmAbiExplorer)(network) !== '') {
-        const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
-          params: {
-            address: tx.action
-          }
-        });
+        try {
+          const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
+            params: {
+              address: tx.action
+            },
+            timeout: 2000
+          });
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (res.status === 200 && res.data.status === '1') {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          _ABIs.unshift(res.data.result);
-        }
+          if (res.status === 200 && res.data.status === '1') {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+            const abi = res.data.result;
+            const temp = parseInputWithAbi(tx.data, abi);
+            if (temp) {
+              result.data = temp;
+              return result;
+            }
+          }
+        } catch (e) {}
       }
     }
   }
-  for (const abi of _ABIs) {
-    const decoder = new _base.InputDataDecoder(abi);
-    const raw = decoder.decodeData(tx.data);
-    if (raw.method && raw.methodName) {
-      const temp = {
-        method: raw.method,
-        methodName: raw.methodName,
-        args: []
-      };
-      raw.types.forEach((type, index) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-        temp.args.push(parseResult(type, raw.inputs[index], raw.names[index]));
-      });
-      result.data = temp;
-      break;
-    }
-  }
   return result;
 };
 exports.parseEvmRlp = parseEvmRlp;

package/cjs/utils/number.js

@@ -0,0 +1,112 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toBNString = exports.formatNumber = exports.balanceFormatter = exports.PREDEFINED_FORMATTER = exports.BN_TEN = void 0;
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const BN_TEN = new _bignumber.default(10);
+exports.BN_TEN = BN_TEN;
+// Clear zero from end, use with decimal only
+const clearZero = result => {
+  let index = result.length - 1;
+  while (result[index] === '0') {
+    result = result.slice(0, index);
+    index--;
+  }
+  return result;
+};
+const NUM_1T = new _bignumber.default(1e12);
+const TLIM = new _bignumber.default(1e17);
+const NUM_1B = new _bignumber.default(1e9);
+const BLIM = new _bignumber.default(1e14);
+const NUM_1M = new _bignumber.default(1e6);
+const NUM_100M = new _bignumber.default(1e8);
+const balanceFormatter = (input, metadata) => {
+  const absGteOne = new _bignumber.default(input).abs().gte(1);
+  const minNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.minNumberFormat) || 2;
+  const maxNumberFormat = (metadata === null || metadata === void 0 ? void 0 : metadata.maxNumberFormat) || 6;
+  const [int, decimal = '0'] = input.split('.');
+  let _decimal = '';
+  if (absGteOne) {
+    const intNumber = new _bignumber.default(int);
+    const max = BN_TEN.pow(maxNumberFormat);
+
+    // If count of number in integer part greater or equal maxNumberFormat, do not show decimal
+    if (intNumber.gte(max)) {
+      if (intNumber.gte(NUM_100M)) {
+        if (intNumber.gte(BLIM)) {
+          if (intNumber.gte(TLIM)) {
+            return `${intNumber.dividedBy(NUM_1T).toFixed(2)} T`;
+          }
+          return `${intNumber.dividedBy(NUM_1B).toFixed(2)} B`;
+        }
+        return `${intNumber.dividedBy(NUM_1M).toFixed(2)} M`;
+      }
+      return int;
+    }
+
+    // Get only minNumberFormat number at decimal
+    if (decimal.length <= minNumberFormat) {
+      _decimal = decimal;
+    } else {
+      _decimal = decimal.slice(0, minNumberFormat);
+    }
+
+    // Clear zero number for decimal
+    _decimal = clearZero(_decimal);
+  } else {
+    // Index of cursor
+    let index = 0;
+
+    // Count of not zero number in decimal
+    let current = 0;
+
+    // Find a not zero number in decimal
+    let metNotZero = false;
+
+    // Get at least minNumberFormat number not 0 from index 0
+    // If count of 0 number at prefix greater or equal maxNumberFormat should stop and return 0
+
+    // current === minNumberFormat: get enough number
+    // index === decimal.length: end of decimal
+    // index === maxNumberFormat: reach limit of 0 number at prefix
+    while (current < minNumberFormat && index < decimal.length && (index < maxNumberFormat || metNotZero)) {
+      const _char = decimal[index];
+      _decimal += _char;
+      index++;
+      if (_char !== '0') {
+        metNotZero = true;
+      }
+      if (metNotZero) {
+        current++;
+      }
+    }
+
+    // Clear zero number for decimal
+    _decimal = clearZero(_decimal);
+  }
+  if (_decimal) {
+    return `${int}.${_decimal}`;
+  }
+  return int;
+};
+exports.balanceFormatter = balanceFormatter;
+const PREDEFINED_FORMATTER = {
+  balance: balanceFormatter
+};
+exports.PREDEFINED_FORMATTER = PREDEFINED_FORMATTER;
+const toBNString = (input, decimal) => {
+  const raw = new _bignumber.default(input);
+  return raw.multipliedBy(BN_TEN.pow(decimal)).toFixed();
+};
+exports.toBNString = toBNString;
+const formatNumber = (input, decimal, formatter, metadata) => {
+  const raw = new _bignumber.default(input).dividedBy(BN_TEN.pow(decimal)).toFixed();
+  return formatter(raw, metadata);
+};
+exports.formatNumber = formatNumber;

package/constants/index.d.ts

@@ -17,4 +17,5 @@ export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;
 export declare const IGNORE_GET_SUBSTRATE_FEATURES_LIST: string[];
 export declare const IGNORE_QR_SIGNER: string[];
+export declare const XCM_MIN_AMOUNT_RATIO = 1.2;
 export * from './staking';

package/constants/index.js

@@ -20,4 +20,5 @@ export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;
 export const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 export const IGNORE_QR_SIGNER = [];
+export const XCM_MIN_AMOUNT_RATIO = 1.2;
 export * from "./staking.js";

package/koni/api/dotsama/balance.js

@@ -12,6 +12,7 @@ import { state } from '@subwallet/extension-base/koni/background/handlers';
 import { _BALANCE_CHAIN_GROUP, _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isPureEvmChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, sumBN } from '@subwallet/extension-base/utils';
+import BigN from 'bignumber.js';
 import { BN, BN_ZERO } from '@polkadot/util';
 // main subscription
 export function subscribeBalance(addresses, chainInfoMap, substrateApiMap, evmApiMap, callback) {
@@ -229,7 +230,7 @@ async function subscribeEquilibriumTokenBalance(addresses, chain, api, callBack,
 
         // @ts-ignore
         const freeTokenBalance = balanceList.find(data => data[0] === parseInt(assetId));
-        const bnFreeTokenBalance = freeTokenBalance ? new BN(freeTokenBalance[1].positive.toString()) : BN_ZERO;
+        const bnFreeTokenBalance = freeTokenBalance ? new BN(new BigN(freeTokenBalance[1].positive).toString()) : BN_ZERO;
         tokenFreeBalance = tokenFreeBalance.add(bnFreeTokenBalance);
       }
       const tokenBalance = {
@@ -284,10 +285,11 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
       const onChainInfo = _getTokenOnChainInfo(tokenInfo);
+      const assetId = _getTokenOnChainAssetId(tokenInfo);
 
       // Get Token Balance
       // @ts-ignore
-      return await api.query.tokens.accounts.multi(addresses.map(address => [address, onChainInfo]), balances => {
+      return await api.query.tokens.accounts.multi(addresses.map(address => [address, onChainInfo || assetId]), balances => {
         const tokenBalance = {
           reserved: sumBN(balances.map(b => b.reserved || new BN(0))),
           frozen: sumBN(balances.map(b => b.frozen || new BN(0))),

package/koni/api/dotsama/crowdloan.js

@@ -5,7 +5,7 @@ import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { APIItemState, CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ACALA_REFRESH_CROWDLOAN_INTERVAL } from '@subwallet/extension-base/constants';
 import registry from '@subwallet/extension-base/koni/api/dotsama/typeRegistry';
-import { _getChainSubstrateAddressPrefix, _getSubstrateParaId, _getSubstrateRelayParent, _isChainEvmCompatible, _isSubstrateParachain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainSubstrateAddressPrefix, _getSubstrateParaId, _getSubstrateRelayParent, _isChainEvmCompatible, _isSubstrateParaChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, reformatAddress } from '@subwallet/extension-base/utils';
 import axios from 'axios';
 import { BN } from '@polkadot/util';
@@ -97,7 +97,7 @@ export async function subscribeCrowdloan(addresses, substrateApiMap, callback, c
       return registry.createType('AccountId', address).toHex();
     });
     Object.entries(chainInfoMap).forEach(([networkKey, chainInfo]) => {
-      if (_isSubstrateParachain(chainInfo)) {
+      if (_isSubstrateParaChain(chainInfo)) {
         const parentChain = _getSubstrateRelayParent(chainInfo);
         const crowdloanCb = rs => {
           callback(networkKey, rs);

package/koni/api/dotsama/transfer.js

@@ -82,7 +82,14 @@ export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMa
   } else if (_TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !_isNativeToken(tokenInfo)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
+  } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey)) {
+    result.supportTransfer = true;
+    result.supportTransferAll = true;
+    // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey) && _isNativeToken(tokenInfo)) {
+    //   result.supportTransfer = true;
+    //   result.supportTransferAll = true;
   }
+
   return result;
 }
 export const createTransferExtrinsic = async ({
@@ -102,6 +109,7 @@ export const createTransferExtrinsic = async ({
   const isTxBalancesSupported = !!api && !!api.tx && !!api.tx.balances;
   const isTxTokensSupported = !!api && !!api.tx && !!api.tx.tokens;
   const isTxEqBalancesSupported = !!api && !!api.tx && !!api.tx.eqBalances;
+  const isTxAssetsSupported = !!api && !!api.tx && !!api.tx.assets;
   let transferAmount; // for PSP-22 tokens, might be deprecated in the future
 
   if (_isTokenWasmSmartContract(tokenInfo) && api.query.contracts) {
@@ -116,14 +124,14 @@ export const createTransferExtrinsic = async ({
     transferAmount = value;
   } else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxCurrenciesSupported) {
     transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
-  } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
+  } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && isTxTokensSupported) {
     if (transferAll) {
-      transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo), false);
+      transfer = api.tx.tokens.transferAll(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), false);
     } else if (value) {
-      transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo), new BN(value));
+      transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), new BN(value));
     }
-  } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported) {
-    transfer = api.tx.eqBalances.transfer([_getTokenOnChainAssetId(tokenInfo)], to, value);
+  } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && isTxEqBalancesSupported) {
+    transfer = api.tx.eqBalances.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
   } else if (!_isNativeToken(tokenInfo) && (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) || _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol))) {
     if (transferAll) {
       transfer = api.tx.kton.transferAll(to, false);
@@ -134,6 +142,12 @@ export const createTransferExtrinsic = async ({
     transfer = api.tx.currencies.transfer(to, _getTokenOnChainInfo(tokenInfo), value);
   } else if (_TRANSFER_CHAIN_GROUP.statemine.includes(networkKey) && !_isNativeToken(tokenInfo)) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
+    // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey)) {
+    //   if (_isNativeToken(tokenInfo)) {
+    //     transfer = api.tx.currencies.transferNativeCurrency(to, value);
+    //   }
+  } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
+    transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
   } else if (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);

package/koni/api/tokens/wasm/index.js

@@ -10,9 +10,15 @@ export function getPSP22ContractPromise(apiPromise, contractAddress) {
 export function getPSP34ContractPromise(apiPromise, contractAddress) {
   return new ContractPromise(apiPromise, _PSP34_ABI, contractAddress);
 }
+const mustFormatNumberReg = /^-?[0-9][0-9,.]+$/;
 export async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress, recipientAddress, params) {
   const contractAddress = params.contractAddress;
   const onChainOption = params.onChainOption;
+  for (const [key, value] of Object.entries(onChainOption)) {
+    if (mustFormatNumberReg.test(value)) {
+      onChainOption[key] = value.replaceAll(',', '');
+    }
+  }
   try {
     const contractPromise = getPSP34ContractPromise(substrateApi.api, contractAddress);
     // @ts-ignore
@@ -23,6 +29,7 @@ export async function getPSP34TransferExtrinsic(networkKey, substrateApi, sender
       gasLimit
     }, recipientAddress, onChainOption, {});
   } catch (e) {
+    console.debug(e);
     return null;
   }
 }