@exodus/ethereum-lib 5.6.0 → 5.7.0

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.7.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-lib@5.6.0...@exodus/ethereum-lib@5.7.0) (2024-10-29)
+
+
+### Features
+
+* introduce exodus/ethereumjs ([#4339](https://github.com/ExodusMovement/assets/issues/4339)) ([e81d577](https://github.com/ExodusMovement/assets/commit/e81d5771c4956a22cfcf434a999310bbb5be81a3))
+* load more imports from ethereumjs/util ([#4379](https://github.com/ExodusMovement/assets/issues/4379)) ([dead85c](https://github.com/ExodusMovement/assets/commit/dead85cfb55223c344af506d8d7ca7cf7eeb516c))
+
+
+### Bug Fixes
+
+* remove stray direct dependencies ([#4176](https://github.com/ExodusMovement/assets/issues/4176)) ([c4f93fa](https://github.com/ExodusMovement/assets/commit/c4f93fad5a930b40d326d7add1093b2d4f243f2a))
+
+
+
 ## [5.6.0](https://github.com/ExodusMovement/assets/compare/@exodus/ethereum-lib@5.5.0...@exodus/ethereum-lib@5.6.0) (2024-10-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "description": "Ethereum Library",
   "type": "module",
   "main": "src/index.js",
@@ -23,16 +23,12 @@
   "dependencies": {
     "@exodus/basic-utils": "^3.0.1",
     "@exodus/currency": "^5.0.2",
-    "@exodus/ethereum-meta": "^2.0.0",
-    "@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/ethereumjs": "^1.2.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",
-    "ethjs-util": "^0.1.6",
     "lodash": "^4.17.15",
     "minimalistic-assert": "^1.0.1",
     "ms": "^2.1.1",
@@ -43,6 +39,7 @@
     "@exodus/bitcoin-meta": "^2.0.0",
     "@exodus/bsc-meta": "^2.0.0",
     "@exodus/crypto": "^1.0.0-rc.13",
+    "@exodus/ethereum-meta": "^2.0.0",
     "@exodus/ethereumclassic-meta": "^2.0.0",
     "@exodus/fantommainnet-meta": "^2.0.0",
     "@exodus/matic-meta": "^2.0.0"
@@ -54,5 +51,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "a20bb277d8dfa3d3137d35ee8fa45333f9dd91d3"
+  "gitHead": "24fdca197cb82cfb999348146080364ff9b78c34"
 }

package/src/account-state/parse-legacy-balances.js

@@ -11,7 +11,7 @@ function parseBalance({ asset, balance }) {
     }
 
     throw new Error(
-      `Balance '${balance.toDefaultString()}' is not of currency ${currency.toString()}`
+      `Balance '${balance.toDefaultString({ unit: true })}' is not of currency ${currency.toDefaultString({ unit: true })}`
     )
   }
 

package/src/create-contract/erc20.js

@@ -1,14 +1,14 @@
-import ethUtil from '@exodus/ethereumjs-util'
+import { bufferToHex, toBuffer } from '@exodus/ethereumjs/util'
 
 // TODO: obsolete, remove this
 // TODO: migrate to using solidity-contract
 export default function createContract(addresses, currency) {
   // First 4 bytes of Keccak256('transfer(address,uint256)')
-  // const TRANSFER_METHOD_ID = ethUtil.bufferToHex(ethUtil.sha3('transfer(address,uint256)').slice(0, 4))
+  // const TRANSFER_METHOD_ID = bufferToHex(sha3('transfer(address,uint256)').slice(0, 4))
   const TRANSFER_METHOD_ID = '0xa9059cbb'
 
   // Keccak256('Transfer(address,address,uint256)')
-  // const TRANSFER_EVENT_ID = ethUtil.bufferToHex(ethUtil.sha3('Transfer(address,address,uint256)'))
+  // const TRANSFER_EVENT_ID = bufferToHex(sha3('Transfer(address,address,uint256)'))
   const TRANSFER_EVENT_ID = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef'
 
   const transfer = {
@@ -17,33 +17,33 @@ export default function createContract(addresses, currency) {
 
     build(to, bufAmount) {
       return Buffer.concat([
-        ethUtil.toBuffer(TRANSFER_METHOD_ID),
-        ethUtil.zeros(12),
-        ethUtil.toBuffer(to),
-        ethUtil.zeros(32 - bufAmount.length),
+        toBuffer(TRANSFER_METHOD_ID),
+        Buffer.alloc(12),
+        toBuffer(to),
+        Buffer.alloc(32 - bufAmount.length),
         bufAmount,
       ])
     },
 
     test(data) {
-      return ethUtil.bufferToHex(data.slice(0, 4)) === TRANSFER_METHOD_ID
+      return bufferToHex(data.slice(0, 4)) === TRANSFER_METHOD_ID
     },
 
     parse(data) {
       if (!transfer.test(data)) throw new Error('It is not transfer data')
 
       return {
-        to: ethUtil.bufferToHex(data.slice(16, 36)),
-        amount: currency.baseUnit(ethUtil.bufferToHex(data.slice(36, 68))),
+        to: bufferToHex(data.slice(16, 36)),
+        amount: currency.baseUnit(bufferToHex(data.slice(36, 68))),
       }
     },
   }
 
-  // ethUtil.bufferToHex(ethUtil.sha3('approve(address,uint256)').slice(0, 4))
+  // bufferToHex(sha3('approve(address,uint256)').slice(0, 4))
   const APPROVE_METHOD_ID = '0x095ea7b3'
 
   // TODO: not verified:
-  // ethUtil.bufferToHex(ethUtil.sha3('Approval(address,address,uint256)'))
+  // bufferToHex(sha3('Approval(address,address,uint256)'))
   const APPROVE_EVENT_ID = '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925'
 
   const approve = {
@@ -52,24 +52,24 @@ export default function createContract(addresses, currency) {
 
     build(address, bufAmount) {
       return Buffer.concat([
-        ethUtil.toBuffer(APPROVE_METHOD_ID),
-        ethUtil.zeros(12),
-        ethUtil.toBuffer(address),
-        ethUtil.zeros(32 - bufAmount.length),
+        toBuffer(APPROVE_METHOD_ID),
+        Buffer.alloc(12),
+        toBuffer(address),
+        Buffer.alloc(32 - bufAmount.length),
         bufAmount,
       ])
     },
 
     test(data) {
-      return ethUtil.bufferToHex(data.slice(0, 4)) === APPROVE_METHOD_ID
+      return bufferToHex(data.slice(0, 4)) === APPROVE_METHOD_ID
     },
 
     parse(data) {
       if (!approve.test(data)) throw new Error('It is not approve data')
 
       return {
-        address: ethUtil.bufferToHex(data.slice(16, 36)),
-        amount: currency.baseUnit(ethUtil.bufferToHex(data.slice(36, 68))),
+        address: bufferToHex(data.slice(16, 36)),
+        amount: currency.baseUnit(bufferToHex(data.slice(36, 68))),
       }
     },
   }

package/src/encode.js

@@ -1,4 +1,10 @@
-import * as etherUtil from '@exodus/ethereumjs-util'
+import {
+  isValidChecksumAddress,
+  isValidPrivate as _isValidPrivate,
+  privateToAddress,
+  publicToAddress,
+  toChecksumAddress,
+} from '@exodus/ethereumjs/util'
 import assert from 'minimalistic-assert'
 
 export const validateFactory = ({ chainId, useEip1191ChainIdChecksum }) => {
@@ -15,8 +21,8 @@ export const validateFactory = ({ chainId, useEip1191ChainIdChecksum }) => {
     if (!hasChecksum(address)) return true
 
     return (
-      (useEip1191ChainIdChecksum && etherUtil.isValidChecksumAddress(address, chainId)) ||
-      etherUtil.isValidChecksumAddress(address)
+      (useEip1191ChainIdChecksum && isValidChecksumAddress(address, chainId)) ||
+      isValidChecksumAddress(address)
     )
   }
 }
@@ -35,9 +41,9 @@ export const encodePublicFactory = ({ chainId, useEip1191ChainIdChecksum }) => {
     'chainId is required when useEip1191ChainIdChecksum is true'
   )
   return (compressedPubKey) => {
-    const hash160bits = etherUtil.publicToAddress(compressedPubKey, true)
+    const hash160bits = publicToAddress(compressedPubKey, true)
 
-    const basicAddress = etherUtil.toChecksumAddress(
+    const basicAddress = toChecksumAddress(
       '0x' + hash160bits.toString('hex'),
       useEip1191ChainIdChecksum ? chainId : undefined
     )
@@ -46,7 +52,7 @@ export const encodePublicFactory = ({ chainId, useEip1191ChainIdChecksum }) => {
 }
 
 export function isValidPrivate(privateKey) {
-  return !(privateKey.length !== 32 || !etherUtil.isValidPrivate(privateKey))
+  return privateKey.length === 32 && _isValidPrivate(privateKey)
 }
 
 export const encodePublicFromPrivateFactory = ({ chainId, useEip1191ChainIdChecksum }) => {
@@ -55,8 +61,8 @@ export const encodePublicFromPrivateFactory = ({ chainId, useEip1191ChainIdCheck
     'chainId is required when useEip1191ChainIdChecksum is true'
   )
   return (privateKey) => {
-    return etherUtil.toChecksumAddress(
-      '0x' + etherUtil.privateToAddress(privateKey).toString('hex'),
+    return toChecksumAddress(
+      '0x' + privateToAddress(privateKey).toString('hex'),
       useEip1191ChainIdChecksum ? chainId : undefined
     )
   }

package/src/sign-message.js

@@ -1,4 +1,4 @@
-import { hashPersonalMessage } from '@exodus/ethereumjs-util'
+import { hashPersonalMessage } from '@exodus/ethereumjs/util'
 import {
   personalSign,
   signTypedData,

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

@@ -1,7 +1,5 @@
-import CommonCJS, { Hardfork } from '@exodus/ethereumjs-common'
-import { FeeMarketEIP1559Transaction, Transaction } from '@exodus/ethereumjs-tx'
-
-const Common = CommonCJS.default || CommonCJS
+import { Common, Hardfork } from '@exodus/ethereumjs/common'
+import { FeeMarketEIP1559Transaction, Transaction } from '@exodus/ethereumjs/tx'
 
 export default function createEthereumJsTx(unsignedTx) {
   const {

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

@@ -1,5 +1,4 @@
-import { toBuffer } from '@exodus/ethereumjs-util'
-import { intToBuffer } from 'ethjs-util'
+import { intToBuffer, toBuffer } from '@exodus/ethereumjs/util'
 import assert from 'minimalistic-assert'
 
 import { currency2buffer, isToken } from '../utils/index.js'

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

@@ -1,4 +1,4 @@
-import * as ethUtil from '@exodus/ethereumjs-util'
+import { bufferToInt } from '@exodus/ethereumjs/util'
 
 import { buffer2currency, isToken } from '../utils/index.js'
 
@@ -7,7 +7,7 @@ export default function parseUnsignedTx(asset, unsignedTx) {
   const _isToken = isToken(asset)
   const baseAsset = asset.baseAsset
   const gasPrice = buffer2currency({ asset: baseAsset, value: txData.gasPrice })
-  const gasLimit = ethUtil.bufferToInt(txData.gasLimit)
+  const gasLimit = bufferToInt(txData.gasLimit)
 
   let { to, data, value } = txData
   let amount
@@ -16,7 +16,7 @@ export default function parseUnsignedTx(asset, unsignedTx) {
     const { method, values } = asset.contract.decodeInput(data)
     if (method === 'transfer' || method === 'approve') {
       to = values[0]
-      amount = asset.currency.baseUnit(values[1]).toDefault()
+      amount = asset.currency.baseUnit(values[1])
     } else {
       to = values[0]
       amount = asset.currency.ZERO

package/src/utils/calculate-extra-eth.js

@@ -6,5 +6,10 @@ export default function ({ fee, balance, multiplier = defaultMultiplier }) {
   if (typeof multiplier !== 'number' || multiplier < 1) multiplier = defaultMultiplier
   if (balance.gt(fee)) return balance.unitType.ZERO
 
-  return fee.mul(multiplier).sub(balance).toDefault().toFixed(4, 'ceil').toString()
+  return fee
+    .mul(multiplier)
+    .sub(balance)
+    .toDefault() // ensure correct unit before `toFixed`
+    .toFixed(4, 'ceil')
+    .toDefaultString({ unit: true })
 }

package/src/utils/index.js

@@ -1,5 +1,5 @@
-import { FeeMarketEIP1559Transaction, Transaction } from '@exodus/ethereumjs-tx'
-import * as ethUtil from '@exodus/ethereumjs-util'
+import { FeeMarketEIP1559Transaction, Transaction } from '@exodus/ethereumjs/tx'
+import { padToEven, toBuffer } from '@exodus/ethereumjs/util'
 import baseX from 'base-x'
 
 // eslint-disable-next-line @exodus/import/no-deprecated
@@ -61,7 +61,7 @@ export const isEthereumLikeByName = (assetName) => {
 }
 
 export function buffer2currency({ asset, value }) {
-  return asset.currency.baseUnit(base10.encode(value)).toDefault()
+  return asset.currency.baseUnit(base10.encode(value))
 }
 
 export function currency2buffer(value) {
@@ -75,7 +75,7 @@ export function currency2buffer(value) {
     throw new RangeError(`${value.toBaseString()} can not be converted to Buffer`)
   }
 
-  return Buffer.from(ethUtil.padToEven(hexValue), 'hex')
+  return Buffer.from(padToEven(hexValue), 'hex')
 }
 
 export function normalizeTxId(txId) {
@@ -92,7 +92,7 @@ const TRANSACTION_TYPE = 2
 const TRANSACTION_TYPE_BUFFER = Buffer.from(TRANSACTION_TYPE.toString(16).padStart(2, '0'), 'hex')
 
 export function deserialize(hex) {
-  const buf = ethUtil.toBuffer(hex)
+  const buf = toBuffer(hex)
   return buf.slice(0, 1).equals(TRANSACTION_TYPE_BUFFER)
     ? FeeMarketEIP1559Transaction.fromSerializedTx(buf)
     : Transaction.fromSerializedTx(buf)