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

package/background/KoniTypes.d.ts

@@ -628,6 +628,7 @@ export interface CreateHardwareAccountItem {
     genesisHash: string;
     hardwareType: string;
     name: string;
+    isEthereum: boolean;
 }
 export interface RequestAccountCreateHardwareMultiple {
     accounts: CreateHardwareAccountItem[];
@@ -979,11 +980,14 @@ export interface ResponseParseEvmContractInput {
 }
 export interface LedgerNetwork {
     genesisHash: string;
-    displayName: string;
+    networkName: string;
+    accountName: string;
+    appName: string;
     network: string;
     slug: string;
     icon: 'substrate' | 'ethereum';
     isDevMode: boolean;
+    isEthereum: boolean;
 }
 export interface TransakNetwork {
     networks: string[];

package/background/types.d.ts

@@ -27,7 +27,6 @@ export interface AbstractAddressJson extends KeyringPair$Meta {
     type?: KeypairType;
     whenCreated?: number;
     name?: string;
-    originGenesisHash?: string | null;
 }
 export interface AccountJson extends AbstractAddressJson {
     accountIndex?: number;
@@ -41,6 +40,8 @@ export interface AccountJson extends AbstractAddressJson {
     isReadOnly?: boolean;
     parentAddress?: string;
     suri?: string;
+    originGenesisHash?: string | null;
+    availableGenesisHashes?: string[];
 }
 export interface AddressJson extends AbstractAddressJson {
     isRecent?: boolean;

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

@@ -1740,7 +1740,7 @@ class KoniExtension {
           }
         } else {
           const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
-          if ((0, _utils._isChainEvmCompatible)(chainInfo)) {
+          if ((0, _utils._isChainEvmCompatible)(chainInfo) && (0, _utils._isTokenTransferredByEvm)(tokenInfo)) {
             const web3 = this.#koniState.chainService.getEvmApi(networkKey);
             const transaction = {
               value: 0,
@@ -1983,6 +1983,7 @@ class KoniExtension {
     if (!accounts.length) {
       throw new Error('No accounts to import');
     }
+    const slugMap = {};
     for (const account of accounts) {
       const {
         accountIndex,
@@ -1990,16 +1991,36 @@ class KoniExtension {
         addressOffset,
         genesisHash,
         hardwareType,
+        isEthereum,
         name
       } = account;
-      const key = _uiKeyring.keyring.addHardware(address, hardwareType, {
+      let result;
+      const baseMeta = {
+        name,
+        hardwareType,
         accountIndex,
         addressOffset,
         genesisHash,
-        name,
         originGenesisHash: genesisHash
-      });
-      const result = key.pair;
+      };
+      if (isEthereum) {
+        result = _uiKeyring.keyring.keyring.addFromAddress(address, {
+          ...baseMeta,
+          isExternal: true,
+          isHardware: true
+        }, null, 'ethereum');
+        _uiKeyring.keyring.saveAccount(result);
+        slugMap.ethereum = 'ethereum';
+      } else {
+        result = _uiKeyring.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 => {
@@ -2027,6 +2048,12 @@ class KoniExtension {
         resolve();
       });
     });
+    if (Object.keys(slugMap).length) {
+      this.enableChains({
+        chainSlugs: Object.keys(slugMap),
+        enableTokens: true
+      }).catch(console.error);
+    }
     return true;
   }
   async accountsCreateWithSecret(_ref53) {
@@ -2253,7 +2280,7 @@ class KoniExtension {
       }
       const txObject = {
         gasPrice: new _bignumber.default(tx.gasPrice).toNumber(),
-        to: tx.action,
+        to: tx.to,
         value: new _bignumber.default(tx.value).toNumber(),
         data: tx.data,
         nonce: new _bignumber.default(tx.nonce).toNumber(),

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

@@ -1151,12 +1151,12 @@ 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':
@@ -1174,7 +1174,7 @@ class KoniState {
       account: account,
       type: method,
       payload: payload,
-      hashPayload: qrPayload,
+      hashPayload: hashPayload,
       canSign: canSign,
       id
     };

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

package/cjs/services/chain-service/constants.js

@@ -192,10 +192,10 @@ const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystre
 exports._TRANSFER_NOT_SUPPORTED_CHAINS = _TRANSFER_NOT_SUPPORTED_CHAINS;
 const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
-  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'bifrost_dot', 'hydradx_main', 'mangatax_para'],
+  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'hydradx_main', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
-  bitcountry: ['pioneer', 'bitcountry', 'bifrost'],
+  bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate']

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

@@ -558,7 +558,7 @@ class ChainService {
           mergedChainInfoMap[storedSlug].providers = {
             ...storedChainInfo.providers,
             ...mergedChainInfoMap[storedSlug].providers
-          };
+          }; // TODO: review merging providers
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: storedChainInfo.currentProvider,
             slug: storedSlug,

package/cjs/services/migration-service/scripts/MigrateLedgerAccount.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _stores = require("@subwallet/extension-base/stores");
+var _util = require("@polkadot/util");
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateLedgerAccount extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        const store = new _stores.AccountsStore();
+        const update = (key, value) => {
+          var _value$meta;
+          if (key.startsWith('account:') && value.meta && (0, _util.isString)((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
+            const newValue = {
+              ...value
+            };
+            newValue.meta.availableGenesisHashes = [value.meta.originGenesisHash];
+            store.set(key, newValue);
+          }
+        };
+        store.allMap(map => {
+          Object.entries(map).forEach(_ref => {
+            let [key, value] = _ref;
+            update(key, value);
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateLedgerAccount;

package/cjs/services/migration-service/scripts/index.js

@@ -10,6 +10,7 @@ var _MigrateAuthUrls = _interopRequireDefault(require("@subwallet/extension-base
 var _MigrateAutoLock = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateAutoLock"));
 var _MigrateChainPatrol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol"));
 var _MigrateImportedToken = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken"));
+var _MigrateLedgerAccount = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateLedgerAccount"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings"));
 var _MigrateSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateSettings"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistory"));
@@ -26,7 +27,8 @@ var _default = {
   '1.0.1-50': _MigrateSettings.default,
   '1.0.1-60': _MigrateAuthUrls.default,
   '1.0.3-01': _MigrateAutoLock.default,
-  '1.0.3-02': _MigrateChainPatrol.default
+  '1.0.3-02': _MigrateChainPatrol.default,
+  '1.0.9-01': _MigrateLedgerAccount.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

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/background/handlers/Extension.js

@@ -1688,7 +1688,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,
@@ -1921,6 +1921,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 +1929,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 +1986,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 +2213,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
     };

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.9-0",
+  "version": "1.0.9-2",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1260,6 +1260,11 @@
       "require": "./cjs/services/migration-service/scripts/MigrateImportedToken.js",
       "default": "./services/migration-service/scripts/MigrateImportedToken.js"
     },
+    "./services/migration-service/scripts/MigrateLedgerAccount": {
+      "types": "./services/migration-service/scripts/MigrateLedgerAccount.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateLedgerAccount.js",
+      "default": "./services/migration-service/scripts/MigrateLedgerAccount.js"
+    },
     "./services/migration-service/scripts/MigrateNetworkSettings": {
       "types": "./services/migration-service/scripts/MigrateNetworkSettings.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateNetworkSettings.js",
@@ -1707,11 +1712,11 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.26",
-    "@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/chain-list": "0.1.11",
+    "@subwallet/extension-base": "^1.0.9-2",
+    "@subwallet/extension-chains": "^1.0.9-2",
+    "@subwallet/extension-dapp": "^1.0.9-2",
+    "@subwallet/extension-inject": "^1.0.9-2",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@unique-nft/types": "^0.6.0-4",
@@ -1729,7 +1734,7 @@
     "eth-simple-keyring": "^4.2.0",
     "ethereumjs-tx": "^2.1.2",
     "ethereumjs-util": "^7.1.5",
-    "ethers": "^5.7.2",
+    "ethers": "^6.4.2",
     "eventemitter3": "^5.0.0",
     "file-saver": "^2.0.5",
     "graphql": "^16.6.0",
@@ -1741,7 +1746,6 @@
     "phosphor-react": "^1.4.1",
     "pontem-types-bundle": "^1.0.15",
     "protobufjs": "^7.1.2",
-    "rlp": "^3.0.0",
     "rxjs": "^7.8.0",
     "web3": "^1.10.0",
     "web3-core": "^1.10.0",

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

package/services/chain-service/constants.js

@@ -176,10 +176,10 @@ export const _KNOWN_CHAIN_INFLATION_PARAMS = {
 export const _TRANSFER_NOT_SUPPORTED_CHAINS = ['subspace_gemini_3a', 'kulupu', 'joystream', 'equilibrium_parachain', 'genshiro_testnet', 'genshiro'];
 export const _TRANSFER_CHAIN_GROUP = {
   acala: ['karura', 'acala', 'acala_testnet'],
-  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'bifrost_dot', 'hydradx_main', 'mangatax_para'],
+  kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'hydradx_main', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   crab: ['crab', 'pangolin'],
-  bitcountry: ['pioneer', 'bitcountry', 'bifrost'],
+  bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate']

package/services/chain-service/index.js

@@ -547,7 +547,7 @@ export class ChainService {
           mergedChainInfoMap[storedSlug].providers = {
             ...storedChainInfo.providers,
             ...mergedChainInfoMap[storedSlug].providers
-          };
+          }; // TODO: review merging providers
           this.dataMap.chainStateMap[storedSlug] = {
             currentProvider: storedChainInfo.currentProvider,
             slug: storedSlug,

package/services/migration-service/scripts/MigrateLedgerAccount.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateLedgerAccount extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/MigrateLedgerAccount.js

@@ -0,0 +1,33 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+import { AccountsStore } from '@subwallet/extension-base/stores';
+import { isString } from '@polkadot/util';
+export default class MigrateLedgerAccount extends BaseMigrationJob {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        const store = new AccountsStore();
+        const update = (key, value) => {
+          var _value$meta;
+          if (key.startsWith('account:') && value.meta && isString((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
+            const newValue = {
+              ...value
+            };
+            newValue.meta.availableGenesisHashes = [value.meta.originGenesisHash];
+            store.set(key, newValue);
+          }
+        };
+        store.allMap(map => {
+          Object.entries(map).forEach(([key, value]) => {
+            update(key, value);
+          });
+          resolve();
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/index.js

@@ -6,6 +6,7 @@ import MigrateAuthUrls from '@subwallet/extension-base/services/migration-servic
 import MigrateAutoLock from '@subwallet/extension-base/services/migration-service/scripts/MigrateAutoLock';
 import MigrateChainPatrol from '@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol';
 import MigrateImportedToken from '@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken';
+import MigrateLedgerAccount from '@subwallet/extension-base/services/migration-service/scripts/MigrateLedgerAccount';
 import MigrateNetworkSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings';
 import MigrateSettings from '@subwallet/extension-base/services/migration-service/scripts/MigrateSettings';
 import MigrateTransactionHistory from '@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistory';
@@ -18,6 +19,7 @@ export default {
   '1.0.1-50': MigrateSettings,
   '1.0.1-60': MigrateAuthUrls,
   '1.0.3-01': MigrateAutoLock,
-  '1.0.3-02': MigrateChainPatrol
+  '1.0.3-02': MigrateChainPatrol,
+  '1.0.9-01': MigrateLedgerAccount
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/transaction-service/index.js

@@ -14,13 +14,14 @@ import { parseTransferEventLogs, parseXcmEventLogs } from '@subwallet/extension-
 import { getBaseTransactionInfo, getTransactionId, isSubstrateTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { getExplorerLink, parseTransactionData } from '@subwallet/extension-base/services/transaction-service/utils';
 import { anyNumberToBN } from '@subwallet/extension-base/utils/eth';
-import { parseTxAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
+import { mergeTransactionAndSignature } from '@subwallet/extension-base/utils/eth/mergeTransactionAndSignature';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import keyring from '@subwallet/ui-keyring';
+import { addHexPrefix } from 'ethereumjs-util';
+import { ethers } from 'ethers';
 import EventEmitter from 'eventemitter3';
-import RLP from 'rlp';
 import { BehaviorSubject } from 'rxjs';
-import { isHex, u8aToHex } from '@polkadot/util';
+import { isHex } from '@polkadot/util';
 export default class TransactionService {
   transactionSubject = new BehaviorSubject({});
   get transactions() {
@@ -39,7 +40,7 @@ export default class TransactionService {
     return Object.values(this.transactions);
   }
   get processingTransactions() {
-    return this.allTransactions.filter(t => t.status === ExtrinsicStatus.QUEUED || t.status === ExtrinsicStatus.PROCESSING);
+    return this.allTransactions.filter(t => t.status === ExtrinsicStatus.QUEUED || t.status === ExtrinsicStatus.SUBMITTING);
   }
   getTransaction(id) {
     return this.transactions[id];
@@ -317,7 +318,7 @@ export default 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);
@@ -622,20 +623,18 @@ export default 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: anyNumberToBN(transaction.gasPrice).toNumber(),
-      gasLimit: anyNumberToBN(transaction.gas).toNumber(),
+      nonce: (_transaction$nonce = transaction.nonce) !== null && _transaction$nonce !== void 0 ? _transaction$nonce : 0,
+      gasPrice: addHexPrefix(anyNumberToBN(transaction.gasPrice).toString(16)),
+      gasLimit: addHexPrefix(anyNumberToBN(transaction.gas).toString(16)),
       to: transaction.to !== undefined ? transaction.to : '',
-      value: anyNumberToBN(transaction.value).toNumber(),
-      data: transaction.data ? transaction.data : '',
+      value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
+      data: transaction.data,
       chainId: _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.encode(data);
-    return u8aToHex(encoded);
+    return ethers.Transaction.from(txObject).unsignedSerialized;
   }
   async signAndSendEvmTransaction({
     address,
@@ -644,6 +643,7 @@ export default class TransactionService {
     transaction,
     url
   }) {
+    var _payload$nonce;
     const payload = transaction;
     const evmApi = this.chainService.getEvmApi(chain);
     const chainInfo = this.chainService.getChainInfoByKey(chain);
@@ -694,13 +694,13 @@ export default class TransactionService {
     payload.hashPayload = this.generateHashPayload(chain, payload);
     const emitter = new EventEmitter();
     const txObject = {
-      nonce: payload.nonce || 1,
+      nonce: (_payload$nonce = payload.nonce) !== null && _payload$nonce !== void 0 ? _payload$nonce : 0,
       from: payload.from,
       gasPrice: anyNumberToBN(payload.gasPrice).toNumber(),
       gasLimit: anyNumberToBN(payload.gas).toNumber(),
       to: payload.to !== undefined ? payload.to : '',
       value: anyNumberToBN(payload.value).toNumber(),
-      data: payload.data ? payload.data : '',
+      data: payload.data,
       chainId: payload.chainId
     };
     const eventData = {
@@ -722,7 +722,7 @@ export default class TransactionService {
         if (!isExternal) {
           signedTransaction = payload;
         } else {
-          const signed = parseTxAndSignature(txObject, payload);
+          const signed = mergeTransactionAndSignature(txObject, payload);
           const recover = web3Api.eth.accounts.recoverTransaction(signed);
           if (recover.toLowerCase() !== account.address.toLowerCase()) {
             throw new EvmProviderError(EvmProviderErrorType.UNAUTHORIZED, 'Bad signature');

package/signers/types.d.ts

@@ -11,7 +11,7 @@ export interface Web3TransactionBase {
     gasLimit: number;
     nonce: number;
     chainId: number;
-    data: string;
+    data?: string;
     value: number;
 }
 export interface Web3Transaction extends Web3TransactionBase {

package/signers/web3/QrSigner.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ExternalRequestPromiseStatus } from '@subwallet/extension-base/background/KoniTypes';
-import RLP from 'rlp';
-import { u8aToHex } from '@polkadot/util';
+import { addHexPrefix } from 'ethereumjs-util';
+import { ethers } from 'ethers';
 export default class QrSigner {
   #callback;
   #id;
@@ -22,8 +22,17 @@ export default 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.encode(data);
+      var _tx$nonce;
+      const txObject = {
+        nonce: (_tx$nonce = tx.nonce) !== null && _tx$nonce !== void 0 ? _tx$nonce : 0,
+        gasPrice: addHexPrefix(tx.gasPrice.toString(16)),
+        gasLimit: addHexPrefix(tx.gasLimit.toString(16)),
+        to: tx.to !== undefined ? tx.to : '',
+        value: addHexPrefix(tx.value.toString(16)),
+        data: tx.data,
+        chainId: tx.chainId
+      };
+      const qrPayload = ethers.Transaction.from(txObject).unsignedSerialized;
       const resolver = result => {
         this.#resolver();
         resolve(result);
@@ -38,7 +47,7 @@ export default class QrSigner {
         qrState: {
           isQrHashed: false,
           qrAddress: tx.from,
-          qrPayload: u8aToHex(qrPayload),
+          qrPayload: qrPayload,
           qrId: this.#id,
           isEthereum: true
         }

package/utils/eth/mergeTransactionAndSignature.d.ts

@@ -1,2 +1,2 @@
 import { Web3Transaction } from '@subwallet/extension-base/signers/types';
-export declare const parseTxAndSignature: (tx: Web3Transaction, _signature: `0x${string}`) => `0x${string}`;
+export declare const mergeTransactionAndSignature: (tx: Web3Transaction, _rawSignature: `0x${string}`) => `0x${string}`;

package/utils/eth/mergeTransactionAndSignature.js

@@ -1,14 +1,24 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import RLP from 'rlp';
-import { u8aToHex } from '@polkadot/util';
-export 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.encode(data);
-  return u8aToHex(encoded);
+import { addHexPrefix } from 'ethereumjs-util';
+import { ethers } from 'ethers';
+export 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: addHexPrefix(tx.gasPrice.toString(16)),
+    gasLimit: addHexPrefix(tx.gasLimit.toString(16)),
+    to: tx.to,
+    value: addHexPrefix(tx.value.toString(16)),
+    data: tx.data,
+    chainId: tx.chainId,
+    signature: signature
+  };
+  return ethers.Transaction.from(transaction).serialized;
 };

package/utils/eth/parseTransaction/base.js

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

package/utils/eth/parseTransaction/index.js

@@ -127,7 +127,6 @@ export const parseContractInput = async (input, contractAddress, network) => {
     }
   }
   if (contractAddress && network) {
-    console.log('parseOnline');
     if (_getEvmAbiExplorer(network)) {
       try {
         const res = await axios.get(_getEvmAbiExplorer(network), {
@@ -189,7 +188,7 @@ export const parseEvmRlp = async (data, networkMap, evmApiMap) => {
     data: tx.data,
     gasPrice: new BigN(tx.gasPrice).toNumber(),
     gas: new BigN(tx.gas).toNumber(),
-    to: tx.action,
+    to: tx.to,
     value: new BigN(tx.value).toNumber(),
     nonce: new BigN(tx.nonce).toNumber()
   };
@@ -201,13 +200,13 @@ export 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 (_getEvmAbiExplorer(network) !== '') {
         try {
           const res = await axios.get(_getEvmAbiExplorer(network), {
             params: {
-              address: tx.action
+              address: tx.to
             },
             timeout: 2000
           });

package/utils/eth.d.ts

@@ -5,14 +5,13 @@ export declare class Transaction {
     readonly nonce: string;
     readonly gasPrice: string;
     readonly gas: string;
-    readonly action: string;
+    readonly to: string;
     readonly value: string;
     readonly data: string;
     readonly ethereumChainId: string;
     readonly isSafe: boolean;
-    constructor(nonce: string, gasPrice: string, gas: string, action: string, value: string, data: string, ethereumChainId: string);
+    constructor(nonce: string, gasPrice: string, gas: string, to: string, value: string, data: string, ethereumChainId: string);
 }
 export declare const anyNumberToBN: (value?: string | number | BNEther) => BigN;
-export declare const rlpItem: (rlp: string, position: number) => `0x${string}`;
 export declare const createTransactionFromRLP: (rlp: string) => Transaction | null;
 export declare const signatureToHex: (sig: SignedTransaction) => string;

package/utils/eth.js

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import BigN from 'bignumber.js';
-import RLP from 'rlp';
-import { hexStripPrefix, numberToHex, u8aToHex } from '@polkadot/util';
+import { ethers } from 'ethers';
+import { hexStripPrefix, numberToHex } from '@polkadot/util';
 const hexToNumberString = s => {
   const temp = parseInt(s, 16);
   if (isNaN(temp)) {
@@ -13,11 +13,11 @@ const hexToNumberString = s => {
   }
 };
 export 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();
@@ -33,21 +33,18 @@ export const anyNumberToBN = value => {
     return new BigN(value.toNumber());
   }
 };
-export const rlpItem = (rlp, position) => {
-  const decodeArr = RLP.decode(rlp);
-  const u8a = decodeArr[position] || [0];
-  return u8aToHex(u8a);
-};
 export 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.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;