@subwallet/extension-base 1.0.9-1 → 1.0.10-0

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

@@ -21,8 +21,9 @@ var _eth = require("@subwallet/extension-base/utils/eth");
 var _mergeTransactionAndSignature = require("@subwallet/extension-base/utils/eth/mergeTransactionAndSignature");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _uiKeyring = _interopRequireDefault(require("@subwallet/ui-keyring"));
+var _ethereumjsUtil = require("ethereumjs-util");
+var _ethers = require("ethers");
 var _eventemitter = _interopRequireDefault(require("eventemitter3"));
-var _rlp = _interopRequireDefault(require("rlp"));
 var _rxjs = require("rxjs");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
@@ -46,7 +47,7 @@ class TransactionService {
     return Object.values(this.transactions);
   }
   get processingTransactions() {
-    return this.allTransactions.filter(t => t.status === _KoniTypes.ExtrinsicStatus.QUEUED || t.status === _KoniTypes.ExtrinsicStatus.PROCESSING);
+    return this.allTransactions.filter(t => t.status === _KoniTypes.ExtrinsicStatus.QUEUED || t.status === _KoniTypes.ExtrinsicStatus.SUBMITTING);
   }
   getTransaction(id) {
     return this.transactions[id];
@@ -324,7 +325,7 @@ class TransactionService {
       // Will be added in next step
       blockHash: '',
       // Will be added in next step
-      nonce: nonce || 0,
+      nonce: nonce !== null && nonce !== void 0 ? nonce : 0,
       startBlock: startBlock || 0
     };
     const chainInfo = this.chainService.getChainInfoByKey(transaction.chain);
@@ -634,22 +635,21 @@ class TransactionService {
     this.eventService.emit('transaction.failed', transaction);
   }
   generateHashPayload(chain, transaction) {
+    var _transaction$nonce;
     const chainInfo = this.chainService.getChainInfoByKey(chain);
     const txObject = {
-      nonce: transaction.nonce || 1,
-      from: transaction.from,
-      gasPrice: (0, _eth.anyNumberToBN)(transaction.gasPrice).toNumber(),
-      gasLimit: (0, _eth.anyNumberToBN)(transaction.gas).toNumber(),
+      nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
+      gasPrice: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gasPrice).toString(16)),
+      gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.gas).toString(16)),
       to: transaction.to !== undefined ? transaction.to : '',
-      value: (0, _eth.anyNumberToBN)(transaction.value).toNumber(),
-      data: transaction.data ? transaction.data : '',
+      value: (0, _ethereumjsUtil.addHexPrefix)((0, _eth.anyNumberToBN)(transaction.value).toString(16)),
+      data: transaction.data,
       chainId: (0, _utils._getEvmChainId)(chainInfo)
     };
-    const data = [txObject.nonce, txObject.gasPrice, txObject.gasLimit, txObject.to, txObject.value, txObject.data, txObject.chainId, new Uint8Array([0x00]), new Uint8Array([0x00])];
-    const encoded = _rlp.default.encode(data);
-    return (0, _util.u8aToHex)(encoded);
+    return _ethers.ethers.Transaction.from(txObject).unsignedSerialized;
   }
   async signAndSendEvmTransaction(_ref6) {
+    var _payload$nonce;
     let {
       address,
       chain,
@@ -707,13 +707,13 @@ class TransactionService {
     payload.hashPayload = this.generateHashPayload(chain, payload);
     const emitter = new _eventemitter.default();
     const txObject = {
-      nonce: payload.nonce || 1,
+      nonce: (_payload$nonce = payload.nonce) !== null && _payload$nonce !== void 0 ? _payload$nonce : 0,
       from: payload.from,
       gasPrice: (0, _eth.anyNumberToBN)(payload.gasPrice).toNumber(),
       gasLimit: (0, _eth.anyNumberToBN)(payload.gas).toNumber(),
       to: payload.to !== undefined ? payload.to : '',
       value: (0, _eth.anyNumberToBN)(payload.value).toNumber(),
-      data: payload.data ? payload.data : '',
+      data: payload.data,
       chainId: payload.chainId
     };
     const eventData = {
@@ -736,7 +736,7 @@ class TransactionService {
         if (!isExternal) {
           signedTransaction = payload;
         } else {
-          const signed = (0, _mergeTransactionAndSignature.parseTxAndSignature)(txObject, payload);
+          const signed = (0, _mergeTransactionAndSignature.mergeTransactionAndSignature)(txObject, payload);
           const recover = web3Api.eth.accounts.recoverTransaction(signed);
           if (recover.toLowerCase() !== account.address.toLowerCase()) {
             throw new _EvmProviderError.EvmProviderError(_KoniTypes.EvmProviderErrorType.UNAUTHORIZED, 'Bad signature');

package/cjs/signers/web3/QrSigner.js

@@ -1,13 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
-var _rlp = _interopRequireDefault(require("rlp"));
-var _util = require("@polkadot/util");
+var _ethereumjsUtil = require("ethereumjs-util");
+var _ethers = require("ethers");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -30,8 +29,17 @@ class QrSigner {
   }
   async signTransaction(tx) {
     return new Promise((resolve, reject) => {
-      const data = [tx.nonce, tx.gasPrice, tx.gasLimit, tx.to, tx.value, tx.data, tx.chainId, new Uint8Array([0x00]), new Uint8Array([0x00])];
-      const qrPayload = _rlp.default.encode(data);
+      var _tx$nonce;
+      const txObject = {
+        nonce: (_tx$nonce = tx.nonce) !== null && _tx$nonce !== void 0 ? _tx$nonce : 0,
+        gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
+        gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
+        to: tx.to !== undefined ? tx.to : '',
+        value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
+        data: tx.data,
+        chainId: tx.chainId
+      };
+      const qrPayload = _ethers.ethers.Transaction.from(txObject).unsignedSerialized;
       const resolver = result => {
         this.#resolver();
         resolve(result);
@@ -46,7 +54,7 @@ class QrSigner {
         qrState: {
           isQrHashed: false,
           qrAddress: tx.from,
-          qrPayload: (0, _util.u8aToHex)(qrPayload),
+          qrPayload: qrPayload,
           qrId: this.#id,
           isEthereum: true
         }

package/cjs/utils/eth/mergeTransactionAndSignature.js

@@ -1,22 +1,31 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseTxAndSignature = void 0;
-var _rlp = _interopRequireDefault(require("rlp"));
-var _util = require("@polkadot/util");
+exports.mergeTransactionAndSignature = void 0;
+var _ethereumjsUtil = require("ethereumjs-util");
+var _ethers = require("ethers");
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const parseTxAndSignature = (tx, _signature) => {
-  const signature = _signature.slice(2);
-  const r = `0x${signature.substring(0, 64)}`;
-  const s = `0x${signature.substring(64, 128)}`;
-  const v = `0x${signature.substring(128)}`;
-  const data = [tx.nonce, tx.gasPrice, tx.gasLimit, tx.to, tx.value, tx.data, v, r, s];
-  const encoded = _rlp.default.encode(data);
-  return (0, _util.u8aToHex)(encoded);
+const mergeTransactionAndSignature = (tx, _rawSignature) => {
+  const _signature = _rawSignature.slice(2);
+  const signature = {
+    r: `0x${_signature.substring(0, 64)}`,
+    s: `0x${_signature.substring(64, 128)}`,
+    v: parseInt(`0x${_signature.substring(128)}`)
+  };
+  const transaction = {
+    nonce: tx.nonce,
+    gasPrice: (0, _ethereumjsUtil.addHexPrefix)(tx.gasPrice.toString(16)),
+    gasLimit: (0, _ethereumjsUtil.addHexPrefix)(tx.gasLimit.toString(16)),
+    to: tx.to,
+    value: (0, _ethereumjsUtil.addHexPrefix)(tx.value.toString(16)),
+    data: tx.data,
+    chainId: tx.chainId,
+    signature: signature
+  };
+  return _ethers.ethers.Transaction.from(transaction).serialized;
 };
-exports.parseTxAndSignature = parseTxAndSignature;
+exports.mergeTransactionAndSignature = mergeTransactionAndSignature;

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

@@ -129,7 +129,7 @@ class InputDataDecoder {
       if (data.indexOf('0x') !== 0) {
         data = `0x${data}`;
       }
-      const _inputs = _ethers.ethers.utils.defaultAbiCoder.decode(types, data);
+      const _inputs = _ethers.ethers.AbiCoder.defaultAbiCoder().decode(types, data);
       const inputs = deepRemoveUnwantedArrayProperties(_inputs);
       return {
         methodName,
@@ -188,11 +188,11 @@ class InputDataDecoder {
           let inputs = [];
           try {
             // @ts-ignore
-            inputs = _ethers.ethers.utils.defaultAbiCoder.decode(types, inputsBuf);
+            inputs = _ethers.ethers.AbiCoder.defaultAbiCoder().decode(types, inputsBuf);
           } catch (err) {
             try {
-              const ifc = new _ethers.ethers.utils.Interface([]);
-              inputs = ifc.decodeFunctionData(_ethers.ethers.utils.FunctionFragment.fromObject(abi), data);
+              const ifc = new _ethers.ethers.Interface([]);
+              inputs = ifc.decodeFunctionData(_ethers.ethers.FunctionFragment.from(abi), data);
             } catch (err) {}
           }
 
@@ -243,8 +243,8 @@ class InputDataDecoder {
         }
         const method = obj.name || null;
         try {
-          const ifc = new _ethers.ethers.utils.Interface([]);
-          const _result = ifc.decodeFunctionData(_ethers.ethers.utils.FunctionFragment.fromObject(obj), data);
+          const ifc = new _ethers.ethers.Interface([]);
+          const _result = ifc.decodeFunctionData(_ethers.ethers.FunctionFragment.from(obj), data);
           const inputs = deepRemoveUnwantedArrayProperties(_result);
           result.method = method;
           result.methodName = getMethodName(obj);

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

@@ -134,7 +134,6 @@ const parseContractInput = async (input, contractAddress, network) => {
     }
   }
   if (contractAddress && network) {
-    console.log('parseOnline');
     if ((0, _utils._getEvmAbiExplorer)(network)) {
       try {
         const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
@@ -197,7 +196,7 @@ const parseEvmRlp = async (data, networkMap, evmApiMap) => {
     data: tx.data,
     gasPrice: new _bignumber.default(tx.gasPrice).toNumber(),
     gas: new _bignumber.default(tx.gas).toNumber(),
-    to: tx.action,
+    to: tx.to,
     value: new _bignumber.default(tx.value).toNumber(),
     nonce: new _bignumber.default(tx.nonce).toNumber()
   };
@@ -209,13 +208,13 @@ const parseEvmRlp = async (data, networkMap, evmApiMap) => {
       return result;
     }
   }
-  if (tx.action && network) {
-    if (await isContractAddress(tx.action, evmApiMap[network.slug])) {
+  if (tx.to && network) {
+    if (await isContractAddress(tx.to, evmApiMap[network.slug])) {
       if ((0, _utils._getEvmAbiExplorer)(network) !== '') {
         try {
           const res = await _axios.default.get((0, _utils._getEvmAbiExplorer)(network), {
             params: {
-              address: tx.action
+              address: tx.to
             },
             timeout: 2000
           });

package/cjs/utils/eth.js

@@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.signatureToHex = exports.rlpItem = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
+exports.signatureToHex = exports.createTransactionFromRLP = exports.anyNumberToBN = exports.Transaction = void 0;
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
-var _rlp = _interopRequireDefault(require("rlp"));
+var _ethers = require("ethers");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
@@ -20,11 +20,11 @@ const hexToNumberString = s => {
   }
 };
 class Transaction {
-  constructor(nonce, gasPrice, gas, action, value, data, ethereumChainId) {
+  constructor(nonce, gasPrice, gas, to, value, data, ethereumChainId) {
     this.nonce = hexToNumberString(nonce);
     this.gasPrice = hexToNumberString(gasPrice);
     this.gas = hexToNumberString(gas);
-    this.action = action;
+    this.to = to;
     this.value = hexToNumberString(value);
     this.data = data || '';
     this.ethereumChainId = parseInt(ethereumChainId, 16).toString();
@@ -42,22 +42,18 @@ const anyNumberToBN = value => {
   }
 };
 exports.anyNumberToBN = anyNumberToBN;
-const rlpItem = (rlp, position) => {
-  const decodeArr = _rlp.default.decode(rlp);
-  const u8a = decodeArr[position] || [0];
-  return (0, _util.u8aToHex)(u8a);
-};
-exports.rlpItem = rlpItem;
 const createTransactionFromRLP = rlp => {
   try {
-    const nonce = rlpItem(rlp, 0);
-    const gasPrice = rlpItem(rlp, 1);
-    const gas = rlpItem(rlp, 2);
-    const action = rlpItem(rlp, 3);
-    const value = rlpItem(rlp, 4);
-    const data = rlpItem(rlp, 5);
-    const ethereumChainId = rlpItem(rlp, 6);
-    return new Transaction(nonce, gasPrice, gas, action, value, data, ethereumChainId);
+    var _transaction$gasPrice;
+    const transaction = _ethers.ethers.Transaction.from(rlp);
+    const nonce = transaction.nonce.toString(16);
+    const gasPrice = ((_transaction$gasPrice = transaction.gasPrice) === null || _transaction$gasPrice === void 0 ? void 0 : _transaction$gasPrice.toString(16)) || '';
+    const gas = transaction.gasLimit.toString(16);
+    const to = transaction.to || '';
+    const value = transaction.value.toString(16);
+    const data = transaction.data;
+    const ethereumChainId = transaction.chainId.toString(16);
+    return new Transaction(nonce, gasPrice, gas, to, value, data, ethereumChainId);
   } catch (e) {
     console.log(e.message);
     return null;

package/koni/api/dotsama/transfer.js

@@ -67,9 +67,11 @@ export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMa
   } else if (_TRANSFER_CHAIN_GROUP.kintsugi.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxTokensSupported) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
-  } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported) {
-    result.supportTransfer = true;
-    result.supportTransferAll = true;
+  } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey)
+  // && !_isNativeToken(tokenInfo) && isTxEqBalancesSupported
+  ) {
+    result.supportTransfer = false;
+    result.supportTransferAll = false;
   } else if (_TRANSFER_CHAIN_GROUP.crab.includes(networkKey) && _BALANCE_TOKEN_GROUP.crab.includes(tokenInfo.symbol)) {
     result.supportTransfer = true;
     result.supportTransferAll = true;
@@ -88,8 +90,10 @@ export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMa
     // } else if (_TRANSFER_CHAIN_GROUP.riochain.includes(networkKey) && _isNativeToken(tokenInfo)) {
     //   result.supportTransfer = true;
     //   result.supportTransferAll = true;
+  } else if (_TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
+    result.supportTransfer = false;
+    result.supportTransferAll = false;
   }
-
   return result;
 }
 export const createTransferExtrinsic = async ({
@@ -108,7 +112,7 @@ export const createTransferExtrinsic = async ({
   const isTxCurrenciesSupported = !!api && !!api.tx && !!api.tx.currencies;
   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 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
 
@@ -130,8 +134,11 @@ export const createTransferExtrinsic = async ({
     } else if (value) {
       transfer = api.tx.tokens.transfer(to, _getTokenOnChainInfo(tokenInfo) || _getTokenOnChainAssetId(tokenInfo), new BN(value));
     }
-  } else if (_TRANSFER_CHAIN_GROUP.genshiro.includes(networkKey) && 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);
+    /* empty */
   } 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);
@@ -148,6 +155,8 @@ export const createTransferExtrinsic = async ({
     //   }
   } else if (_TRANSFER_CHAIN_GROUP.sora_substrate.includes(networkKey) && isTxAssetsSupported) {
     transfer = api.tx.assets.transfer(_getTokenOnChainAssetId(tokenInfo), to, value);
+  } else if (_TRANSFER_CHAIN_GROUP.avail.includes(networkKey)) {
+    /* empty */
   } else if (isTxBalancesSupported && _isNativeToken(tokenInfo)) {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);

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

@@ -147,10 +147,11 @@ export async function subscribeParaChainNominatorMetadata(chainInfo, address, su
   const roundInfo = _roundInfo.toPrimitive();
   const currentRound = roundInfo.current;
   await Promise.all(delegatorState.delegations.map(async delegation => {
-    const [_delegationScheduledRequests, _identity, _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), substrateApi.api.query.identity.identityOf(delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
+    var _substrateApi$api$que;
+    const [_delegationScheduledRequests, _identity, _collatorInfo] = await Promise.all([substrateApi.api.query.parachainStaking.delegationScheduledRequests(delegation.owner), (_substrateApi$api$que = substrateApi.api.query.identity) === null || _substrateApi$api$que === void 0 ? void 0 : _substrateApi$api$que.identityOf(delegation.owner), substrateApi.api.query.parachainStaking.candidateInfo(delegation.owner)]);
     const collatorInfo = _collatorInfo.toPrimitive();
     const minDelegation = collatorInfo === null || collatorInfo === void 0 ? void 0 : collatorInfo.lowestTopDelegationAmount.toString();
-    const identityInfo = _identity.toHuman();
+    const identityInfo = _identity === null || _identity === void 0 ? void 0 : _identity.toHuman();
     const delegationScheduledRequests = _delegationScheduledRequests.toPrimitive();
     const identity = parseIdentity(identityInfo);
     let hasUnstaking = false;

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

@@ -171,10 +171,11 @@ export async function subscribeRelayChainNominatorMetadata(chainInfo, address, s
   if (nominations) {
     const validatorList = nominations.targets;
     await Promise.all(validatorList.map(async validatorAddress => {
+      var _chainApi$api$query$i;
       let nominationStatus = StakingStatus.NOT_EARNING;
-      const [_identityInfo, _eraStaker] = await Promise.all([chainApi.api.query.identity.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
+      const [_identityInfo, _eraStaker] = await Promise.all([(_chainApi$api$query$i = chainApi.api.query.identity) === null || _chainApi$api$query$i === void 0 ? void 0 : _chainApi$api$query$i.identityOf(validatorAddress), chainApi.api.query.staking.erasStakers(currentEra, validatorAddress)]);
       const eraStaker = _eraStaker.toPrimitive();
-      const identityInfo = _identityInfo.toHuman();
+      const identityInfo = _identityInfo === null || _identityInfo === void 0 ? void 0 : _identityInfo.toHuman();
       const identity = parseIdentity(identityInfo);
       const topNominators = eraStaker.others.map(nominator => {
         return nominator.who;

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

@@ -26,7 +26,7 @@ export function transformPoolName(input) {
 }
 export function parseIdentity(identityInfo) {
   let identity;
-  if (identityInfo !== null) {
+  if (identityInfo) {
     var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
     const displayName = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
     const web = identityInfo === null || identityInfo === void 0 ? void 0 : (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;

package/koni/api/xcm/polkadotXcm.js

@@ -5,15 +5,16 @@ import { getBeneficiary, getDestinationChainLocation, getDestWeight, getTokenLoc
 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(destinationChainInfo, recipientAddress);
-  const destination = getDestinationChainLocation(originChainInfo, destinationChainInfo);
-  let assetLocation = getTokenLocation(tokenInfo, value);
+  const version = ['statemint', 'statemine', 'shiden'].includes(originChainInfo.slug) ? 'V3' : 'V1';
+  const beneficiary = getBeneficiary(destinationChainInfo, recipientAddress, version);
+  const destination = getDestinationChainLocation(originChainInfo, destinationChainInfo, version);
+  let assetLocation = getTokenLocation(tokenInfo, value, version);
   let method = 'limitedReserveTransferAssets';
   if (['astar', 'shiden'].includes(originChainInfo.slug) && !_isNativeToken(tokenInfo)) {
     method = 'limitedReserveWithdrawAssets';
   } else if (['statemint', 'statemine'].includes(originChainInfo.slug) && _isSubstrateRelayChain(destinationChainInfo)) {
     assetLocation = {
-      V1: [{
+      [version]: [{
         id: {
           Concrete: {
             parents: 1,

package/koni/api/xcm/xTokens.js

@@ -19,6 +19,6 @@ function getCurrencyId(tokenInfo) {
 }
 export function getExtrinsicByXtokensPallet(tokenInfo, originChainInfo, destinationChainInfo, recipientAddress, value, api) {
   const weightParam = ['pioneer', 'hydradx_main'].includes(originChainInfo.slug) ? FOUR_INSTRUCTIONS_WEIGHT : getDestWeight();
-  const destVersion = ['moonbeam', 'moonriver'].includes(originChainInfo.slug) ? 'V3' : undefined;
+  const destVersion = ['moonbeam', 'moonriver', 'bifrost_dot'].includes(originChainInfo.slug) ? 'V3' : undefined;
   return api.tx.xTokens.transfer(getCurrencyId(tokenInfo), value, getDestMultilocation(destinationChainInfo, recipientAddress, destVersion), weightParam);
 }

package/koni/api/xcm/xcmPallet.js

@@ -5,7 +5,7 @@ import { getBeneficiary, getDestinationChainLocation, getDestWeight, getTokenLoc
 // 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) ? 'V3' : 'V1';
+  const xcmVer = 'V3';
   const destination = getDestinationChainLocation(originChainInfo, destinationChainInfo, xcmVer);
   const beneficiary = getBeneficiary(destinationChainInfo, recipientAddress, xcmVer);
   const tokenLocation = getTokenLocation(tokenInfo, value, xcmVer);

package/koni/background/handlers/Extension.d.ts

@@ -112,7 +112,6 @@ export default class KoniExtension {
     private getStaking;
     private subscribeStaking;
     private subscribeHistory;
-    private addContact;
     private validateTransfer;
     private makeTransfer;
     private validateCrossChainTransfer;

package/koni/background/handlers/Extension.js

@@ -1343,14 +1343,18 @@ export default class KoniExtension {
     });
     return historySubject.getValue();
   }
-  addContact(to) {
-    const toAddress = reformatAddress(to);
-    const account = keyring.getAccount(toAddress);
-    const contact = keyring.getAddress(toAddress);
-    if (!account && (!contact || contact.meta.isRecent)) {
-      keyring.saveAddress(toAddress, {});
-    }
-  }
+
+  // Save address to contact
+  // private addContact (to: string) {
+  //   const toAddress = reformatAddress(to);
+  //   const account = keyring.getAccount(toAddress);
+  //   const contact = keyring.getAddress(toAddress);
+  //
+  //   if (!account && (!contact || contact.meta.isRecent)) {
+  //     keyring.saveAddress(toAddress, {});
+  //   }
+  // }
+
   validateTransfer(tokenSlug, from, to, value, transferAll) {
     const errors = [];
     const keypair = keyring.getPair(from);
@@ -1433,7 +1437,9 @@ export default class KoniExtension {
       throw error;
     }
     const transferNativeAmount = isTransferNativeToken ? transferAmount.value : '0';
-    this.addContact(to);
+
+    // this.addContact(to);
+
     const additionalValidator = async inputTransaction => {
       const minAmount = tokenInfo.minAmount || '0';
       if (!isTransferNativeToken) {
@@ -1542,7 +1548,9 @@ export default class KoniExtension {
         });
       };
     }
-    this.addContact(to);
+
+    // this.addContact(to);
+
     return await this.#koniState.transactionService.handleTransaction({
       url: EXTENSION_REQUEST_URL,
       address: from,
@@ -1569,7 +1577,9 @@ export default class KoniExtension {
     const contractAddress = params.contractAddress;
     const tokenId = params.tokenId;
     const transaction = await getERC721Transaction(this.#koniState.getEvmApi(networkKey), contractAddress, senderAddress, recipientAddress, tokenId);
-    this.addContact(recipientAddress);
+
+    // this.addContact(recipientAddress);
+
     return await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1688,7 +1698,7 @@ export default class KoniExtension {
           }
         } else {
           const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
-          if (_isChainEvmCompatible(chainInfo)) {
+          if (_isChainEvmCompatible(chainInfo) && _isTokenTransferredByEvm(tokenInfo)) {
             const web3 = this.#koniState.chainService.getEvmApi(networkKey);
             const transaction = {
               value: 0,
@@ -1771,7 +1781,9 @@ export default class KoniExtension {
     const networkKey = params === null || params === void 0 ? void 0 : params.networkKey;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const extrinsic = !isPSP34 ? getNftTransferExtrinsic(networkKey, apiProps, senderAddress, recipientAddress, params || {}) : await getPSP34TransferExtrinsic(networkKey, apiProps, senderAddress, recipientAddress, params || {});
-    this.addContact(recipientAddress);
+
+    // this.addContact(recipientAddress);
+
     const rs = await this.#koniState.transactionService.handleTransaction({
       address: senderAddress,
       chain: networkKey,
@@ -1921,6 +1933,7 @@ export default class KoniExtension {
     if (!accounts.length) {
       throw new Error('No accounts to import');
     }
+    const slugMap = {};
     for (const account of accounts) {
       const {
         accountIndex,
@@ -1928,16 +1941,36 @@ export default class KoniExtension {
         addressOffset,
         genesisHash,
         hardwareType,
+        isEthereum,
         name
       } = account;
-      const key = keyring.addHardware(address, hardwareType, {
+      let result;
+      const baseMeta = {
+        name,
+        hardwareType,
         accountIndex,
         addressOffset,
         genesisHash,
-        name,
         originGenesisHash: genesisHash
-      });
-      const result = key.pair;
+      };
+      if (isEthereum) {
+        result = keyring.keyring.addFromAddress(address, {
+          ...baseMeta,
+          isExternal: true,
+          isHardware: true
+        }, null, 'ethereum');
+        keyring.saveAccount(result);
+        slugMap.ethereum = 'ethereum';
+      } else {
+        result = keyring.addHardware(address, hardwareType, {
+          ...baseMeta,
+          availableGenesisHashes: [genesisHash]
+        }).pair;
+        const [slug] = this.#koniState.findNetworkKeyByGenesisHash(genesisHash);
+        if (slug) {
+          slugMap[slug] = slug;
+        }
+      }
       const _address = result.address;
       addresses.push(_address);
       await new Promise(resolve => {
@@ -1965,6 +1998,12 @@ export default class KoniExtension {
         resolve();
       });
     });
+    if (Object.keys(slugMap).length) {
+      this.enableChains({
+        chainSlugs: Object.keys(slugMap),
+        enableTokens: true
+      }).catch(console.error);
+    }
     return true;
   }
   async accountsCreateWithSecret({
@@ -2186,7 +2225,7 @@ export default class KoniExtension {
       }
       const txObject = {
         gasPrice: new BigN(tx.gasPrice).toNumber(),
-        to: tx.action,
+        to: tx.to,
         value: new BigN(tx.value).toNumber(),
         data: tx.data,
         nonce: new BigN(tx.nonce).toNumber(),

package/koni/background/handlers/State.js

@@ -1127,12 +1127,12 @@ export default class KoniState {
       address: pair.address,
       ...pair.meta
     };
-    let qrPayload = '';
+    let hashPayload = '';
     let canSign = false;
     switch (method) {
       case 'personal_sign':
         canSign = true;
-        qrPayload = payload;
+        hashPayload = payload;
         break;
       case 'eth_sign':
       case 'eth_signTypedData':
@@ -1150,7 +1150,7 @@ export default class KoniState {
       account: account,
       type: method,
       payload: payload,
-      hashPayload: qrPayload,
+      hashPayload: hashPayload,
       canSign: canSign,
       id
     };