@exodus/ethereum-api 2.22.0 → 2.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.22.0",
+  "version": "2.23.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -9,19 +9,21 @@
   ],
   "author": "Exodus Movement, Inc.",
   "license": "UNLICENSED",
-  "homepage": "https://github.com/ExodusMovement/ethereum#readme",
+  "homepage": "https://github.com/ExodusMovement/assets/tree/main/ethereum",
   "publishConfig": {
     "access": "restricted"
   },
   "dependencies": {
-    "@ensdomains/eth-ens-namehash": "^2.0.15",
     "@exodus/asset-lib": "^3.5.4",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^2.20.0",
+    "@exodus/ethereum-lib": "^2.21.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
+    "@exodus/fetch": "^1.2.1",
     "@exodus/simple-retry": "^0.0.6",
     "@exodus/solidity-contract": "^1.0.1",
-    "fetchival": "0.3.3",
+    "events": "^1.1.1",
+    "idna-uts46-hx": "^2.3.1",
+    "js-sha3": "^0.8.0",
     "make-concurrent": "4.0.0",
     "minimalistic-assert": "^1.0.1",
     "ms": "^2.1.1",
@@ -34,5 +36,5 @@
     "@exodus/assets-base": "^8.0.136",
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "57fae619663ea5193c733bd089c9031447f0d025"
+  "gitHead": "5a1621d8fb3c1ecf4c47dc37f284e9a40d7fd018"
 }

package/src/ens/index.js

@@ -1,5 +1,6 @@
-import { hash } from '@ensdomains/eth-ens-namehash'
 import SolidityContract from '@exodus/solidity-contract'
+import { toUnicode } from 'idna-uts46-hx'
+import { keccak256 } from 'js-sha3'
 import { ABI } from '@exodus/ethereum-lib'
 
 import ENS_REGISTRY_ADDRESSES from './addresses'
@@ -7,6 +8,35 @@ import ENS_REGISTRY_ADDRESSES from './addresses'
 const registry = new SolidityContract(ABI.ensRegistry)
 const resolver = new SolidityContract(ABI.ensResolver)
 
+function normalize(name) {
+  // Implementation based on @ensdomains/eth-ens-namehash package
+  return name ? toUnicode(name, { useStd3ASCII: true, transitional: false }) : name
+}
+
+function namehash(inputName) {
+  // Implementation based on @ensdomains/eth-ens-namehash package
+
+  // Reject empty names:
+  var node = ''
+  var i
+  for (i = 0; i < 32; i++) {
+    node += '00'
+  }
+
+  var name = normalize(inputName)
+
+  if (name) {
+    var labels = name.split('.')
+
+    for (i = labels.length - 1; i >= 0; i--) {
+      var labelSha = keccak256(labels[i])
+      node = keccak256(Buffer.from(node + labelSha, 'hex'))
+    }
+  }
+
+  return '0x' + node
+}
+
 // ENS only available on mainnet atm
 const ENS_REGISTRY_ADDRESS = ENS_REGISTRY_ADDRESSES['ethereum']
 
@@ -14,7 +44,7 @@ const getResolverAddress = async (name: string, server: Object) =>
   server
     .ethCall({
       to: ENS_REGISTRY_ADDRESS,
-      data: registry.resolver.methodId + hash(name).slice(2),
+      data: registry.resolver.methodId + namehash(name).slice(2),
     })
     .then((result) => '0x' + result.slice(26))
 
@@ -22,7 +52,7 @@ const resolveEnsName = async (name: string, server: Object) => {
   const resolverAddress = await getResolverAddress(name, server)
   const hex = await server.ethCall({
     to: resolverAddress,
-    data: resolver.addr.methodId + hash(name).slice(2),
+    data: resolver.addr.methodId + namehash(name).slice(2),
   })
   return '0x' + hex.slice(26)
 }
@@ -34,7 +64,7 @@ const resolveEnsAddress = async (address: string, server: Object) => {
 
   const data = await server.ethCall({
     to: resolverAddress,
-    data: resolver.name.methodId + hash(name).slice(2),
+    data: resolver.name.methodId + namehash(name).slice(2),
   })
 
   return resolver.decodeOutput({ data, method: 'name' })[0]

package/src/etherscan/request.js

@@ -1,9 +1,6 @@
 import ms from 'ms'
 import makeConcurrent from 'make-concurrent'
-import fetchival from 'fetchival'
-// The module in desktop explicitly sets node-fetch. Do we need this?
-// import fetch from '../fetch'
-// fetchival.fetch = fetch
+import { fetchival } from '@exodus/fetch'
 
 const ETHERSCAN_API_URL = 'https://api.etherscan.io/api'
 const DEFAULT_ETHERSCAN_API_KEY = 'XM3VGRSNW1TMSIR14I9MVFP15X74GNHTRI'

package/src/etherscan/ws.js

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import EventEmitter from 'events/' // '/' forces it to use the module from node_modules
 import ms from 'ms'
 import WebSocket from '../websocket'
 

package/src/exodus-eth-server/api.js

@@ -1,8 +1,8 @@
 import urlJoin from 'url-join'
 import url from 'url'
-import fetchival from 'fetchival'
 import ms from 'ms'
 import createWebSocket from './ws'
+import { fetchival } from '@exodus/fetch'
 import { retry } from '@exodus/simple-retry'
 import SolidityContract from '@exodus/solidity-contract'
 import { bufferToHex } from '@exodus/ethereumjs-util'

package/src/exodus-eth-server/ws.js

@@ -1,5 +1,5 @@
 import ms from 'ms'
-import { EventEmitter } from 'events'
+import EventEmitter from 'events/' // '/' forces it to use the module from node_modules
 import WebSocket from '../websocket'
 
 const RECONNECT_INTERVAL = ms('10s')

package/src/websocket/index.js

@@ -6,11 +6,14 @@
  */
 if (
   typeof process !== 'undefined' &&
-  process &&
   (process.type === 'renderer' || process.type === 'worker')
 ) {
   // THIS IS FOR DESKTOP
-  module.exports = require('ws')
+  if (process.env.EXODUS_DISABLE_WS) {
+    module.exports = globalThis.WebSocket
+  } else {
+    module.exports = require('ws')
+  }
 } else {
   // eslint-disable-next-line no-undef
   if (global.window?.WebSocket) {