@exodus/web3-ethereum-utils 1.2.0 → 1.4.0

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './addresses.js';
 export * from './signatures.js';
+export * from './transactions.js';
 export * from './types.js';

package/lib/index.js

@@ -1,3 +1,4 @@
 export * from './addresses.js';
 export * from './signatures.js';
+export * from './transactions.js';
 export * from './types.js';

package/lib/signatures.d.ts

@@ -3,4 +3,4 @@ import { MessageTypes, SignTypedDataVersion, TypedDataV1, TypedMessage } from '@
 import { EthTransactionParams } from './types.js';
 export declare function signMessage(message: string, privateKey: Buffer): string;
 export declare function signTypedData(typedData: TypedDataV1 | TypedMessage<MessageTypes>, privateKey: Buffer, version?: SignTypedDataVersion): string;
-export declare function signTransaction(transactionParams: EthTransactionParams, privateKey: Buffer): string;
+export declare function signTransaction(transactionParams: EthTransactionParams, privateKey: Buffer): Buffer;

package/lib/signatures.js

@@ -1,5 +1,5 @@
 import Common, { Hardfork } from '@exodus/ethereumjs-common';
-import { FeeMarketEIP1559Transaction } from '@exodus/ethereumjs-tx';
+import { FeeMarketEIP1559Transaction, Transaction as LegacyTransaction, } from '@exodus/ethereumjs-tx';
 import { SignTypedDataVersion, personalSign, signTypedData as ethSigUtilSignTypedData, } from '@metamask/eth-sig-util';
 export function signMessage(message, privateKey) {
     return personalSign({ privateKey, data: message });
@@ -10,8 +10,15 @@ export function signTypedData(typedData, privateKey, version = SignTypedDataVers
 export function signTransaction(transactionParams, privateKey) {
     const { chainId: hexChainId, gas, ...rest } = transactionParams;
     const chainId = Number.parseInt(hexChainId, 16);
-    const transaction = FeeMarketEIP1559Transaction.fromTxData({ ...rest, gasLimit: gas }, { common: Common.custom({ chainId }, { hardfork: Hardfork.London }) });
+    const transactionData = { ...rest, gasLimit: gas };
+    const isEIP1559Enabled = !!transactionParams.maxFeePerGas;
+    const transaction = isEIP1559Enabled
+        ? FeeMarketEIP1559Transaction.fromTxData(transactionData, {
+            common: Common.custom({ chainId }, { hardfork: Hardfork.London }),
+        })
+        : LegacyTransaction.fromTxData(transactionData, {
+            common: Common.custom({ chainId }),
+        });
     const signedTransaction = transaction.sign(privateKey);
-    const rawTransaction = `0x${signedTransaction.serialize().toString('hex')}`;
-    return rawTransaction;
+    return signedTransaction.serialize();
 }

package/lib/transactions.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="node" resolution-mode="require"/>
+export declare function getTransactionId(serializedTransaction: Buffer, isEIP1559Transaction: boolean): string;

package/lib/transactions.js

@@ -0,0 +1,8 @@
+import { FeeMarketEIP1559Transaction, Transaction as LegacyTransaction, } from '@exodus/ethereumjs-tx';
+export function getTransactionId(serializedTransaction, isEIP1559Transaction) {
+    const TransactionClass = isEIP1559Transaction
+        ? FeeMarketEIP1559Transaction
+        : LegacyTransaction;
+    const transaction = TransactionClass.fromSerializedTx(serializedTransaction);
+    return `0x${transaction.hash().toString('hex')}`;
+}

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-export interface EthSwitchEthereumChainParam {
+export interface EthChainParam {
     chainId: string;
 }
 export interface EthTransactionParams {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum-utils",
   "description": "Web3 Ethereum utils.",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -30,5 +30,5 @@
     "@exodus/ethereumjs-tx": "^3.3.0-exodus.6",
     "@metamask/eth-sig-util": "^4.0.1"
   },
-  "gitHead": "cf17d96a6722d0770cd9072192633d4aa10c73bd"
+  "gitHead": "e8db76660e5b1b230147c3391e843421a630d376"
 }