@exodus/web3-ethereum-utils 3.18.0 → 3.19.0

package/lib/signatures.d.ts

@@ -5,3 +5,5 @@ import type { MessageTypes, TypedDataV1, TypedMessage } from '@metamask/eth-sig-
 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): Buffer;
+export declare function hex0xStringToBuffer(hex: string): Buffer;
+export declare function bufferToHex0xString(buf: Buffer): string;

package/lib/signatures.js

@@ -20,3 +20,25 @@ export function signTransaction(transactionParams, privateKey) {
     const signedTransaction = transaction.sign(privateKey);
     return signedTransaction.serialize();
 }
+export function hex0xStringToBuffer(hex) {
+    // Remove the 0x
+    const hexWithout0x = hex.startsWith('0x') ? hex.slice(2) : hex;
+    // Pad the value until even
+    const hexWithLeadingZeros = hexWithout0x.length % 2 === 0 ? hexWithout0x : '0' + hexWithout0x;
+    // Finally  return the buffer
+    return Buffer.from(hexWithLeadingZeros, 'hex');
+}
+export function bufferToHex0xString(buf) {
+    if (!Buffer.isBuffer(buf)) {
+        throw new Error('expected a buffer');
+    }
+    let hex = buf.toString('hex');
+    if (typeof hex !== 'string') {
+        throw new Error('expected hex string');
+    }
+    // Remove leading zeros
+    while (hex.length > 0 && hex[0] === '0') {
+        hex = hex.slice(1);
+    }
+    return '0x' + hex;
+}

package/lib/simulation/simulateTransactions.js

@@ -50,7 +50,7 @@ const createBalanceAmount = (amount, { decimals, symbol }) => {
     });
     return beforeAmount.sub(afterAmount);
 };
-const handleExpectedBalanceChange = (expectedBalanceChange, simulationResult) => {
+const handleExpectedBalanceChange = (expectedBalanceChange, simulationResult, { network }) => {
     const { willApprove, willSend, willReceive } = simulationResult.balanceChanges;
     const { data, kind } = expectedBalanceChange.rawInfo;
     const { asset } = data;
@@ -84,8 +84,10 @@ const handleExpectedBalanceChange = (expectedBalanceChange, simulationResult) =>
     };
     if (isNftTransfer) {
         const tokenId = data.tokenId;
+        const compositeId = `${asset.address}/${tokenId}`;
         balanceChange.nft = {
-            id: `ethereum:${asset.address}/${tokenId}`,
+            id: `${network}:${compositeId}`,
+            compositeId,
             title: asset.name,
         };
     }
@@ -147,6 +149,6 @@ export const simulateTransactions = async ({ transactions, apiEndpoint, origin,
         return;
     }
     userExpectedChanges.forEach((expectedChange) => {
-        handleExpectedBalanceChange(expectedChange, simulationResult);
+        handleExpectedBalanceChange(expectedChange, simulationResult, { network });
     });
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum-utils",
   "description": "Web3 Ethereum utils.",
-  "version": "3.18.0",
+  "version": "3.19.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -26,13 +26,13 @@
     "build": "yarn clean && tsc"
   },
   "devDependencies": {
-    "@exodus/web3-types": "^1.45.0"
+    "@exodus/web3-types": "^1.46.0"
   },
   "dependencies": {
     "@exodus/ethereumjs-common": "^2.4.0-exodus.6",
     "@exodus/ethereumjs-tx": "^3.3.0-exodus.6",
-    "@exodus/web3-utils": "^1.39.0",
+    "@exodus/web3-utils": "^1.40.0",
     "@metamask/eth-sig-util": "^4.0.1"
   },
-  "gitHead": "f7bc0aaecb18b659a85b6229b49a491886f0b570"
+  "gitHead": "5c013e1a549fba97227b325120666139258e0020"
 }