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

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.9-1",
+  "version": "1.0.10-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -705,6 +705,11 @@
       "require": "./cjs/services/chain-service/helper/api-helper/spec/darwinia.js",
       "default": "./services/chain-service/helper/api-helper/spec/darwinia.js"
     },
+    "./services/chain-service/helper/api-helper/spec/dataavail": {
+      "types": "./services/chain-service/helper/api-helper/spec/dataavail.d.ts",
+      "require": "./cjs/services/chain-service/helper/api-helper/spec/dataavail.js",
+      "default": "./services/chain-service/helper/api-helper/spec/dataavail.js"
+    },
     "./services/chain-service/helper/api-helper/spec/datahighway": {
       "types": "./services/chain-service/helper/api-helper/spec/datahighway.d.ts",
       "require": "./cjs/services/chain-service/helper/api-helper/spec/datahighway.js",
@@ -1260,6 +1265,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 +1717,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-1",
-    "@subwallet/extension-chains": "^1.0.9-1",
-    "@subwallet/extension-dapp": "^1.0.9-1",
-    "@subwallet/extension-inject": "^1.0.9-1",
+    "@subwallet/chain-list": "0.2.1",
+    "@subwallet/extension-base": "^1.0.10-0",
+    "@subwallet/extension-chains": "^1.0.10-0",
+    "@subwallet/extension-dapp": "^1.0.10-0",
+    "@subwallet/extension-inject": "^1.0.10-0",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@unique-nft/types": "^0.6.0-4",
@@ -1729,7 +1739,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 +1751,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-1'
+  version: '1.0.10-0'
 };

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

@@ -64,6 +64,7 @@ export declare const _TRANSFER_CHAIN_GROUP: {
     statemine: string[];
     riochain: string[];
     sora_substrate: string[];
+    avail: string[];
 };
 export declare const _BALANCE_PARSING_CHAIN_GROUP: {
     bobabeam: string[];

package/services/chain-service/constants.js

@@ -182,7 +182,8 @@ export const _TRANSFER_CHAIN_GROUP = {
   bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel'],
   riochain: ['riochain'],
-  sora_substrate: ['sora_substrate']
+  sora_substrate: ['sora_substrate'],
+  avail: ['kate']
 };
 export const _BALANCE_PARSING_CHAIN_GROUP = {
   bobabeam: ['bobabeam', 'bobabase']

package/services/chain-service/helper/api-helper/spec/dataavail.d.ts

@@ -0,0 +1,3 @@
+import type { OverrideBundleDefinition } from '@polkadot/types/types';
+declare const definitions: OverrideBundleDefinition;
+export default definitions;

package/services/chain-service/helper/api-helper/spec/dataavail.js

@@ -0,0 +1,145 @@
+// Copyright 2017-2021 @polkadot/apps-config authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+// import type  {H256}  from '@polkadot/types/interfaces';
+// eslint-disable-next-line header/header
+
+// structs need to be in order
+/* eslint-disable sort-keys */
+
+const definitions = {
+  rpc: {
+    kate: {
+      blockLength: {
+        description: 'Get Block Length',
+        params: [{
+          name: 'at',
+          type: 'Hash',
+          isOptional: true
+        }],
+        type: 'BlockLength'
+      },
+      queryProof: {
+        description: 'Generate the kate proof for the given `cells`',
+        params: [{
+          name: 'cells',
+          type: 'Vec<Cell>'
+        }, {
+          name: 'at',
+          type: 'Hash',
+          isOptional: true
+        }],
+        type: 'Vec<u8>'
+      },
+      queryAppData: {
+        description: 'Fetches app data rows for the given app',
+        params: [{
+          name: 'app_id',
+          type: 'AppId'
+        }, {
+          name: 'at',
+          type: 'Hash',
+          isOptional: true
+        }],
+        type: 'Vec<Option<Vec<u8>>>'
+      },
+      queryDataProof: {
+        description: 'Generate the data proof for the given `index`',
+        params: [{
+          name: 'data_index',
+          type: 'u32'
+        }, {
+          name: 'at',
+          type: 'Hash',
+          isOptional: true
+        }],
+        type: 'DataProof'
+      }
+    }
+  },
+  types: [{
+    // on all versions
+    minmax: [0, undefined],
+    types: {
+      AppId: 'Compact<u32>',
+      DataLookupIndexItem: {
+        appId: 'AppId',
+        start: 'Compact<u32>'
+      },
+      DataLookup: {
+        size: 'Compact<u32>',
+        index: 'Vec<DataLookupIndexItem>'
+      },
+      KateCommitment: {
+        rows: 'Compact<u16>',
+        cols: 'Compact<u16>',
+        dataRoot: 'H256',
+        commitment: 'Vec<u8>'
+      },
+      V1HeaderExtension: {
+        commitment: 'KateCommitment',
+        appLookup: 'DataLookup'
+      },
+      VTHeaderExtension: {
+        newField: 'Vec<u8>',
+        commitment: 'KateCommitment',
+        appLookup: 'DataLookup'
+      },
+      HeaderExtension: {
+        _enum: {
+          V1: 'V1HeaderExtension',
+          VTest: 'VTHeaderExtension'
+        }
+      },
+      DaHeader: {
+        parentHash: 'Hash',
+        number: 'Compact<BlockNumber>',
+        stateRoot: 'Hash',
+        extrinsicsRoot: 'Hash',
+        digest: 'Digest',
+        extension: 'HeaderExtension'
+      },
+      Header: 'DaHeader',
+      CheckAppIdExtra: {
+        appId: 'AppId'
+      },
+      CheckAppIdTypes: {},
+      CheckAppId: {
+        extra: 'CheckAppIdExtra',
+        types: 'CheckAppIdTypes'
+      },
+      BlockLengthColumns: 'Compact<u32>',
+      BlockLengthRows: 'Compact<u32>',
+      BlockLength: {
+        max: 'PerDispatchClass',
+        cols: 'BlockLengthColumns',
+        rows: 'BlockLengthRows',
+        chunkSize: 'Compact<u32>'
+      },
+      PerDispatchClass: {
+        normal: 'u32',
+        operational: 'u32',
+        mandatory: 'u32'
+      },
+      DataProof: {
+        root: 'H256',
+        proof: 'Vec<H256>',
+        numberOfLeaves: 'Compact<u32>',
+        leaf_index: 'Compact<u32>',
+        leaf: 'H256'
+      },
+      Cell: {
+        row: 'BlockLengthRows',
+        col: 'BlockLengthColumns'
+      }
+    }
+  }],
+  signedExtensions: {
+    CheckAppId: {
+      extrinsic: {
+        appId: 'AppId'
+      },
+      payload: {}
+    }
+  }
+};
+export default definitions;

package/services/chain-service/helper/api-helper/spec/index.js

@@ -30,6 +30,7 @@ import crownSterlingChain from "./crown-sterling.js";
 import crust from "./crust.js";
 import testPara from "./cumulus-test-parachain.js";
 import darwinia from "./darwinia.js";
+import dataavail from "./dataavail.js";
 import datahighwayParachain from "./datahighway.js";
 import dockMainnet from "./dock-mainnet.js";
 import dockTestnet from "./dock-testnet.js";
@@ -162,6 +163,7 @@ const spec = {
   'crust-parachain': crust,
   'cumulus-subsocial-parachain': subsocial,
   'cumulus-test-parachain': testPara,
+  'data-avail': dataavail,
   datahighway: westlake,
   'datahighway-parachain': datahighwayParachain,
   dawn: eave,

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;