@exodus/ethereum-lib 4.5.0 → 4.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "4.5.0",
+  "version": "4.7.0",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -60,5 +60,5 @@
     "@exodus/bnbmainnet-meta": "^1.0.0",
     "@exodus/elliptic": "^6.5.4-precomputed"
   },
-  "gitHead": "539b25e53db7092fab6a1645f6d0e0f3118fe75c"
+  "gitHead": "fc95d105fa19691ee2549d2e4ac07ddf20a2b8af"
 }

package/src/index.js

@@ -5,6 +5,7 @@ export * from './utils'
 export * from './constants'
 export * from './fee-monitor'
 export * from './selectors'
+export { signMessage } from './sign-message'
 export { default as createGetKeyIdentifier } from './key-identifier'
 export { default as createEthereumLikeAccountState } from './account-state'
 

package/src/key-identifier.js

@@ -1,8 +1,6 @@
 import assert from 'minimalistic-assert'
 import { createGetKeyIdentifier, unhardenDerivationIndex } from '@exodus/key-utils'
 
-const HARDWARE_WALLETS = new Set(['ledger', 'trezor'])
-
 const createEthereumGetKeyIdentifier =
   ({ bip44, assetName, keyType = 'secp256k1', allowMetaMaskCompat = false } = {}) =>
   (partialParams = {}) => {
@@ -15,7 +13,6 @@ const createEthereumGetKeyIdentifier =
     }
 
     const { accountIndex, addressIndex, compatibilityMode } = params
-    const isHardwareWallet = HARDWARE_WALLETS.has(compatibilityMode)
     const unhardenedBip44 = unhardenDerivationIndex(bip44)
     const isMetaMask = allowMetaMaskCompat && compatibilityMode === 'metamask'
 
@@ -35,7 +32,7 @@ const createEthereumGetKeyIdentifier =
       keyType,
       validationRules: {
         allowMultipleAddresses: true,
-        allowXPUB: isHardwareWallet,
+        allowXPUB: true,
       },
     })(params)
   }

package/src/sign-message.js

@@ -1,5 +1,13 @@
 import assert from 'minimalistic-assert'
-import { SignTypedDataVersion, personalSign, signTypedData } from '@metamask/eth-sig-util'
+import {
+  SignTypedDataVersion,
+  typedSignatureHash,
+  TypedDataUtils,
+  personalSign,
+  signTypedData,
+  concatSig,
+} from '@metamask/eth-sig-util'
+import { hashPersonalMessage, toBuffer } from '@exodus/ethereumjs-util'
 
 function hex0xStringToBuffer(hex) {
   // Remove the 0x
@@ -45,3 +53,44 @@ export const signMessage = async ({ privateKey, message }) => {
     return hex0xStringToBuffer(signTypedData({ privateKey, data: EIP712Message, version }))
   }
 }
+
+/**
+ * @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
+ * @return {Promise<string>}
+ */
+export async function signMessageWithSigner({ message, signer }) {
+  const { rawMessage, EIP712Message } = message
+  assert(!!rawMessage !== !!EIP712Message, 'Need either rawMessage or EIP712Message')
+
+  const msgHash = EIP712Message
+    ? getEIP712MessageHash(EIP712Message)
+    : hashPersonalMessage(rawMessage)
+
+  const sig = await signer.sign({
+    data: msgHash,
+    ecOptions: { canonical: true },
+    enc: 'raw',
+  })
+
+  return hex0xStringToBuffer(
+    concatSig(toBuffer(sig.recoveryParam), sig.r.toBuffer(), sig.s.toBuffer())
+  )
+}
+
+function getEIP712MessageHash(message) {
+  const version = Array.isArray(message) ? SignTypedDataVersion.V1 : SignTypedDataVersion.V4
+  return version === SignTypedDataVersion.V1
+    ? hex0xStringToBuffer(typedSignatureHash(message))
+    : TypedDataUtils.eip712Hash(message, version)
+}

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

@@ -57,6 +57,7 @@ export default function createUnsignedTx({
     privateKey, // Used for importing private key
     fee: baseAsset.currency.baseUnit(gasPrice.toBaseNumber() * gasLimit),
     eip1559Enabled: !!eip1559Enabled,
+    fromAddress,
   }
 
   return {

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

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