@exodus/ethereum-lib 5.5.0 → 5.6.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-lib@5.5.0...@exodus/ethereum-lib@5.6.0) (2024-10-04)
+
+
+### Features
+
+* **ethereum-lib:** use 'sig,rec' keychain enc ([#4155](https://github.com/ExodusMovement/assets/issues/4155)) ([d928541](https://github.com/ExodusMovement/assets/commit/d92854184bd26380192a224564b6dca924504975))
+
+
+
 ## [5.5.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-lib@5.4.0...@exodus/ethereum-lib@5.5.0) (2024-09-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "5.5.0",
+  "version": "5.6.0",
   "description": "Ethereum Library",
   "type": "module",
   "main": "src/index.js",
@@ -27,7 +27,7 @@
     "@exodus/ethereumjs-common": "^2.4.0-exodus.6",
     "@exodus/ethereumjs-tx": "^3.3.0-exodus.7",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.7",
-    "@exodus/key-utils": "^3.1.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",
@@ -42,7 +42,7 @@
     "@exodus/assets": "^11.0.0",
     "@exodus/bitcoin-meta": "^2.0.0",
     "@exodus/bsc-meta": "^2.0.0",
-    "@exodus/elliptic": "^6.5.4-precomputed",
+    "@exodus/crypto": "^1.0.0-rc.13",
     "@exodus/ethereumclassic-meta": "^2.0.0",
     "@exodus/fantommainnet-meta": "^2.0.0",
     "@exodus/matic-meta": "^2.0.0"
@@ -54,5 +54,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "476cff14cc4c30ee72c85b3d265055771b48c1d1"
+  "gitHead": "a20bb277d8dfa3d3137d35ee8fa45333f9dd91d3"
 }

package/src/sign-message.js

@@ -1,6 +1,5 @@
-import { hashPersonalMessage, toBuffer } from '@exodus/ethereumjs-util'
+import { hashPersonalMessage } from '@exodus/ethereumjs-util'
 import {
-  concatSig,
   personalSign,
   signTypedData,
   SignTypedDataVersion,
@@ -56,19 +55,10 @@ export const signMessage = async ({ privateKey, message }) => {
   }
 }
 
-/**
- * @typedef {import('bn.js').BN} BN
- * @typedef {{r: BN, s: BN, recoverParam: number}} Signature
- * @typedef {{
- *   sign: ({ data: Buffer, ecOptions?: { canonical?: boolean }, enc?: string }) => Promise<Signature | Buffer>
- *   getPublicKey: () => Promise<Buffer>
- * }} Signer
- */
-
 /**
  * @param {object} params
  * @param {{rawMessage: Buffer, EIP712Message: any}} params.message
- * @param {Signer} signer
+ * @param {object} signer
  * @returns {Promise<string>}
  */
 export async function signMessageWithSigner({ message, signer }) {
@@ -79,20 +69,14 @@ export async function signMessageWithSigner({ message, signer }) {
     ? getEIP712MessageHash(EIP712Message)
     : hashPersonalMessage(rawMessage)
 
-  const sig = await signer.sign({
+  const { signature, recovery } = await signer.sign({
     data: msgHash,
-    ecOptions: { canonical: true },
-    enc: 'raw',
+    enc: 'sig,rec',
     signatureType: 'ecdsa',
   })
 
-  return hex0xStringToBuffer(
-    concatSig(
-      toBuffer(normalizeRecoveryParam(sig.recoveryParam, { includeBase: true })),
-      sig.r.toBuffer(),
-      sig.s.toBuffer()
-    )
-  )
+  const recoveryNormalized = normalizeRecoveryParam(recovery, { includeBase: true })
+  return Buffer.concat([signature, new Uint8Array([recoveryNormalized])])
 }
 
 function getEIP712MessageHash(message) {

package/src/unsigned-tx/sign-unsigned-tx.js

@@ -11,14 +11,12 @@ export async function signUnsignedTxWithSigner(unsignedTx, signer) {
   const tx = createEthereumJsTx(unsignedTx)
 
   const ethSigner = async (data) => {
-    // temporarily support both function and object
-    const sig = await (typeof signer === 'function'
-      ? signer({ data, ecOptions: { canonical: true }, enc: 'raw', signatureType: 'ecdsa' })
-      : signer.sign({ data, ecOptions: { canonical: true }, enc: 'raw', signatureType: 'ecdsa' }))
-    const signature = new Uint8Array(64)
-    signature.set(sig.r.toArrayLike(Uint8Array, 'be', 32), 0)
-    signature.set(sig.s.toArrayLike(Uint8Array, 'be', 32), 32)
-    return { signature, recid: sig.recoveryParam }
+    const { signature, recovery } = await signer.sign({
+      data,
+      enc: 'sig,rec',
+      signatureType: 'ecdsa',
+    })
+    return { signature, recid: recovery }
   }
 
   const signedTx = await tx.signWithSigner(ethSigner)

package/src/utils/index.js

@@ -1,13 +1,10 @@
 import { FeeMarketEIP1559Transaction, Transaction } from '@exodus/ethereumjs-tx'
 import * as ethUtil from '@exodus/ethereumjs-util'
 import baseX from 'base-x'
-import lodash from 'lodash'
 
 // eslint-disable-next-line @exodus/import/no-deprecated
 import { ETHEREUM_LIKE_NO_HISTORY_ASSET_NAMES } from '../constants.js'
 
-const { uniq } = lodash
-
 export { default as calculateExtraEth } from './calculate-extra-eth.js'
 
 const base10 = baseX('0123456789')
@@ -175,5 +172,5 @@ export const getAssetAddresses = (asset) => {
     ...(asset.addresses?.previous || []), // asset in wallets:
     ...(asset.contract?.previous || []), // asset in @exodus/assets-base:
   ]
-  return uniq(addresses.filter((a) => a && typeof a === 'string'))
+  return [...new Set(addresses.filter((a) => a && typeof a === 'string'))]
 }