@exodus/ethereum-lib 3.3.33 → 3.3.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "3.3.33",
+  "version": "3.3.34",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "files": [
@@ -25,7 +25,7 @@
     "@exodus/cronos-meta": "^1.0.4",
     "@exodus/ethereum-meta": "^1.0.30",
     "@exodus/ethereumarbnova-meta": "^1.0.2",
-    "@exodus/ethereumarbone-meta": "^1.1.4",
+    "@exodus/ethereumarbone-meta": "^1.1.5",
     "@exodus/ethereumclassic-meta": "^1.0.1",
     "@exodus/ethereumgoerli-meta": "^1.0.3",
     "@exodus/ethereumjs-common": "^2.4.0-exodus.6",
@@ -44,5 +44,5 @@
     "ms": "^2.1.1",
     "reselect": "~3.0.1"
   },
-  "gitHead": "a3f47ac29169f74502d0889f1cf867416fdce821"
+  "gitHead": "b08bcfa935e1f208104276cc6e07a9992ea2147f"
 }

package/src/constants.js

@@ -76,6 +76,7 @@ const CHAIN_DATA = {
     confirmationsNumber: 3,
     monitorType: 'no-history',
     tokenType: 'RSK_ERC20',
+    eip1191ChainIdChecksum: true,
   },
   flare: {
     chainId: 14,
@@ -113,6 +114,11 @@ export const ETHEREUM_LIKE_MONITOR_TYPES = mapValues(
   ({ monitorType }) => monitorType || 'magnifier'
 )
 export const CHAIN_IDS = mapValues(CHAIN_DATA, ({ chainId }) => chainId)
+
+export const EIP1191_ASSET_NAMES = Object.entries(CHAIN_DATA)
+  .filter(([, data]) => data.eip1191ChainIdChecksum)
+  .map(([assetName]) => assetName)
+
 export const MIN_GASPRICE = 1e9 // 1 gwei
 export const DEFAULT_FEE_MONITOR_INTERVAL = '1m'
 export const CONFIRMATIONS_NUMBER = mapValues(

package/src/encode.js

@@ -1,5 +1,5 @@
 import * as etherUtil from '@exodus/ethereumjs-util'
-import { CHAIN_IDS } from './constants'
+import { CHAIN_IDS, EIP1191_ASSET_NAMES } from './constants'
 
 export function validate(address, { baseAssetName } = {}) {
   if (typeof address !== 'string') return false
@@ -8,14 +8,13 @@ export function validate(address, { baseAssetName } = {}) {
   if (address.slice(0, 2) !== '0x' || address.length !== 42) return false
 
   if (!hasChecksum(address)) return true
-  if (baseAssetName && CHAIN_IDS[baseAssetName]) {
-    const checksumWithChainIdResult = etherUtil.isValidChecksumAddress(
-      address,
-      CHAIN_IDS[baseAssetName]
-    )
-    if (checksumWithChainIdResult) return true
-  }
-  return etherUtil.isValidChecksumAddress(address)
+
+  const eip1191ChainIdChecksum = EIP1191_ASSET_NAMES.includes(baseAssetName)
+  const chainId = CHAIN_IDS[baseAssetName]
+  return (
+    (eip1191ChainIdChecksum && etherUtil.isValidChecksumAddress(address, chainId)) ||
+    etherUtil.isValidChecksumAddress(address)
+  )
 }
 
 export function hasChecksum(address) {
@@ -30,14 +29,14 @@ export function encodePrivate(privKey) {
 export function encodePublic(compressedPubKey, { baseAssetName } = {}) {
   const hash160bits = etherUtil.publicToAddress(compressedPubKey, true)
 
-  if (baseAssetName && CHAIN_IDS[baseAssetName]) {
-    const address = etherUtil.toChecksumAddress(
-      '0x' + hash160bits.toString('hex'),
-      CHAIN_IDS[baseAssetName]
-    )
-    return baseAssetName === 'rootstock' ? address.toLowerCase() : address
-  }
-  return etherUtil.toChecksumAddress('0x' + hash160bits.toString('hex'))
+  const eip1191ChainIdChecksum = EIP1191_ASSET_NAMES.includes(baseAssetName)
+  const chainId = CHAIN_IDS[baseAssetName]
+
+  const basicAddress = etherUtil.toChecksumAddress(
+    '0x' + hash160bits.toString('hex'),
+    eip1191ChainIdChecksum ? chainId : undefined
+  )
+  return eip1191ChainIdChecksum ? basicAddress.toLowerCase() : basicAddress
 }
 
 export function isValidPrivate(privateKey) {
@@ -48,11 +47,11 @@ export function isValidPrivate(privateKey) {
 }
 
 export function encodePublicFromPrivate(privateKey, { baseAssetName } = {}) {
-  if (baseAssetName && CHAIN_IDS[baseAssetName]) {
-    return etherUtil.toChecksumAddress(
-      etherUtil.privateToAddress(privateKey).toString('hex'),
-      CHAIN_IDS[baseAssetName]
-    )
-  }
-  return etherUtil.toChecksumAddress(etherUtil.privateToAddress(privateKey).toString('hex'))
+  const eip1191ChainIdChecksum = EIP1191_ASSET_NAMES.includes(baseAssetName)
+  const chainId = CHAIN_IDS[baseAssetName]
+
+  return etherUtil.toChecksumAddress(
+    '0x' + etherUtil.privateToAddress(privateKey).toString('hex'),
+    eip1191ChainIdChecksum ? chainId : undefined
+  )
 }