@exodus/web3-ethereum-utils 4.4.0 → 4.5.1

package/lib/signatures.js

@@ -1,7 +1,6 @@
-import { Common, Hardfork } from '@exodus/ethereumjs/common';
+import { getEthereumJsTxByTransactionProps } from '@exodus/ethereum-lib';
 import { SignTypedDataVersion, personalSign, signTypedData as ethSigUtilSignTypedData, } from '@exodus/ethereumjs/eth-sig-util';
-import { FeeMarketEIP1559Transaction, Transaction as LegacyTransaction, } from '@exodus/ethereumjs/tx';
-const custom = Common.default?.custom || Common.custom;
+import assert from 'minimalistic-assert';
 export function signMessage(message, privateKey) {
     return personalSign({ privateKey, data: message });
 }
@@ -9,15 +8,13 @@ export function signTypedData(typedData, privateKey, version = SignTypedDataVers
     return ethSigUtilSignTypedData({ privateKey, data: typedData, version });
 }
 export function signTransaction(transactionParams, privateKey) {
-    const { chainId, ...transactionData } = transactionParams;
-    const isEIP1559Enabled = !!transactionParams.maxFeePerGas;
-    const transaction = isEIP1559Enabled
-        ? FeeMarketEIP1559Transaction.fromTxData(transactionData, {
-            common: custom({ chainId }, { hardfork: Hardfork.London }),
-        })
-        : LegacyTransaction.fromTxData(transactionData, {
-            common: custom({ chainId }),
-        });
+    const { chainId, ...transactionProps } = transactionParams;
+    assert(typeof chainId === 'number', 'signTransaction must be explicitly passed a chainId');
+    const transaction = getEthereumJsTxByTransactionProps({
+        chainId,
+        eip1559Enabled: Boolean(transactionProps.maxFeePerGas),
+        transactionProps,
+    });
     const signedTransaction = transaction.sign(privateKey);
     return signedTransaction.serialize();
 }

package/lib/simulation/simulateTransactions.js

@@ -163,6 +163,17 @@ export const simulateTransactions = async ({ transactions, apiEndpoint, origin,
             errorMessage: error?.humanReadableError,
         };
     }
+    const { action } = response;
+    if (action === 'BLOCK') {
+        const warning = {
+            kind: 'MALICIOUS_ACTION',
+            severity: 'CRITICAL',
+            // We use a generic default message unless we find a known warning type below
+            // (TODO: add known warning types)
+            message: 'This dApp could be malicious. Do not proceed unless you are certain this is safe.',
+        };
+        simulationResult.warnings.push(warning);
+    }
     const noExpectedStateChangesDetected = Object.keys(expectedStateChanges).length === 0;
     // This is a self-send transaction, adding a zero "transfer" so that the UI can display it.
     if (noExpectedStateChangesDetected) {

package/lib/transactions.d.ts

@@ -1,6 +1,10 @@
 import type { EthTransaction } from './types.js';
 import type { ApprovalBalanceChange } from '@exodus/web3-types';
-export declare function getTransactionId(serializedTransaction: Buffer, isEIP1559Transaction?: boolean): string;
+export declare function getTransactionId({ chainId, serializedTransaction, }: {
+    chainId: number;
+    serializedTransaction: Buffer;
+    eip1559Enabled?: boolean;
+}): string;
 export declare function getDisplayDetails(willApprove: ApprovalBalanceChange[]): {
     title: string;
 };

package/lib/transactions.js

@@ -1,10 +1,10 @@
-import { FeeMarketEIP1559Transaction, Transaction as LegacyTransaction, } from '@exodus/ethereumjs/tx';
+import { getEthereumJsTxByTransactionBuffer } from '@exodus/ethereum-lib';
 import SolidityContract from '@exodus/solidity-contract';
-export function getTransactionId(serializedTransaction, isEIP1559Transaction = false) {
-    const Transaction = isEIP1559Transaction
-        ? FeeMarketEIP1559Transaction
-        : LegacyTransaction;
-    const transaction = Transaction.fromSerializedTx(serializedTransaction);
+export function getTransactionId({ chainId, serializedTransaction, }) {
+    const transaction = getEthereumJsTxByTransactionBuffer({
+        chainId,
+        transactionBuffer: serializedTransaction,
+    });
     return `0x${transaction.hash().toString('hex')}`;
 }
 export function getDisplayDetails(willApprove) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum-utils",
   "description": "Web3 Ethereum utils.",
-  "version": "4.4.0",
+  "version": "4.5.1",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -34,10 +34,11 @@
     "test": "run -T exodus-test --jest --esbuild"
   },
   "devDependencies": {
-    "@exodus/web3-types": "1.57.1"
+    "@exodus/web3-types": "1.59.0"
   },
   "dependencies": {
     "@exodus/basic-utils": "^3.0.1",
+    "@exodus/ethereum-lib": "^5.18.1",
     "@exodus/ethereumjs": "^1.5.0",
     "@exodus/solidity-contract": "^1.2.1",
     "@exodus/web3-utils": "^1.50.1",
@@ -48,5 +49,5 @@
     "url": "https://github.com/ExodusMovement/assets/issues?q=is%3Aissue+is%3Aopen+label%3Aweb3-ethereum-utils"
   },
   "homepage": "https://github.com/ExodusMovement/assets/tree/master/web3/web3-ethereum-utils",
-  "gitHead": "45be970be70f9211b8a6489566c352f4caeb82dc"
+  "gitHead": "f6ea2714c95f2e7ec71ffecdc589726b7974511e"
 }