@exodus/ethereum-lib 5.10.2 → 5.11.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.11.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-lib@5.10.2...@exodus/ethereum-lib@5.11.0) (2025-05-29)
+
+
+### Features
+
+
+* feat: import eth-sig-util sign-typed-data, with fixes (#5716)
+
+* feat: unify ethereum signMessage with signMessageWithSigner (#5709)
+
+
+
 ## [5.10.2](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-lib@5.10.1...@exodus/ethereum-lib@5.10.2) (2025-04-29)
 
 **Note:** Version bump only for package @exodus/ethereum-lib

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "5.10.2",
+  "version": "5.11.0",
   "description": "Ethereum utils, such as for cryptography, address encoding/decoding, transaction building, etc.",
   "type": "module",
   "main": "src/index.js",
@@ -22,12 +22,12 @@
   },
   "dependencies": {
     "@exodus/basic-utils": "^3.0.1",
+    "@exodus/crypto": "^1.0.0-rc.18",
     "@exodus/currency": "^6.0.1",
-    "@exodus/ethereumjs": "^1.2.0",
+    "@exodus/ethereumjs": "^1.5.0",
     "@exodus/key-utils": "^3.7.0",
     "@exodus/models": "^12.0.1",
     "@exodus/solidity-contract": "^1.1.3",
-    "@metamask/eth-sig-util": "^4.0.1",
     "base-x": "^3.0.2",
     "lodash": "^4.17.15",
     "minimalistic-assert": "^1.0.1",
@@ -38,7 +38,6 @@
     "@exodus/assets": "^11.0.0",
     "@exodus/bitcoin-meta": "^2.0.0",
     "@exodus/bsc-meta": "^2.0.0",
-    "@exodus/crypto": "^1.0.0-rc.13",
     "@exodus/ethereum-meta": "^2.5.0",
     "@exodus/ethereumclassic-meta": "^2.0.0",
     "@exodus/fantommainnet-meta": "^2.0.0",
@@ -51,5 +50,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "63620ef41b7f48c835371ee03ca6443193460fe7"
+  "gitHead": "45be970be70f9211b8a6489566c352f4caeb82dc"
 }

package/src/sign-message.js

@@ -1,11 +1,10 @@
-import { hashPersonalMessage } from '@exodus/ethereumjs/util'
+import { ecdsaSignHash } from '@exodus/crypto/secp256k1'
 import {
-  personalSign,
-  signTypedData,
   SignTypedDataVersion,
   TypedDataUtils,
   typedSignatureHash,
-} from '@metamask/eth-sig-util'
+} from '@exodus/ethereumjs/eth-sig-util'
+import { hashPersonalMessage } from '@exodus/ethereumjs/util'
 import assert from 'minimalistic-assert'
 
 import { normalizeRecoveryParam } from './utils/ecdsa.js'
@@ -19,41 +18,19 @@ function hex0xStringToBuffer(hex) {
   return Buffer.from(hexWithLeadingZeros, 'hex')
 }
 
-/**
- * Converts a buffer to the 0xhex encoded value
- * @param {Buffer} buf the buffer to convert to 0xHEXSTRING
- * @returns the hex-encoded value prepended with 0x
- */
-function bufferToHex0xString(buf) {
-  if (!Buffer.isBuffer(buf)) {
-    throw new TypeError('expected a buffer')
-  }
-
-  const hex = buf.toString('hex')
-
-  if (typeof hex !== 'string') {
-    throw new TypeError('expected hex string')
-  }
-
-  return '0x' + hex
-}
-
-export const signMessage = async ({ privateKey, message }) => {
-  const { rawMessage, EIP712Message } = message
-
-  // Exclusive OR (XOR)
-  assert(!!rawMessage !== !!EIP712Message, 'Need either rawMessage or EIP712Message')
-
-  if (rawMessage) {
-    return hex0xStringToBuffer(personalSign({ privateKey, data: bufferToHex0xString(rawMessage) }))
-  }
-
-  if (EIP712Message) {
-    const version = Array.isArray(EIP712Message) ? SignTypedDataVersion.V1 : SignTypedDataVersion.V4
-
-    return hex0xStringToBuffer(signTypedData({ privateKey, data: EIP712Message, version }))
-  }
-}
+export const signMessage = async ({ privateKey, message }) =>
+  signMessageWithSigner({
+    message,
+    signer: {
+      sign: async ({ data }) =>
+        ecdsaSignHash({
+          hash: data,
+          privateKey,
+          recovery: true,
+          extraEntropy: null, // TODO: can we flip this to true?
+        }),
+    },
+  })
 
 /**
  * @param {object} params