@exodus/ethereum-api 2.21.6 → 2.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.21.6",
+  "version": "2.22.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -14,14 +14,15 @@
     "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.19.4",
+    "@exodus/ethereum-lib": "^2.20.0",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/simple-retry": "^0.0.6",
     "@exodus/solidity-contract": "^1.0.1",
     "fetchival": "0.3.3",
+    "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 +35,5 @@
     "@exodus/assets-base": "^8.0.136",
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "f5f2bd5dcde6504d06ba68f01385d8215c82d224"
+  "gitHead": "6a99fbefed718767bf3f8a81f18881084ffbdb6c"
 }

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/exodus-eth-server/ws.js

@@ -37,7 +37,7 @@ export default function createWebSocket(getURL) {
         events.emit(`address-${data.address}`)
         break
       case 'gasprice':
-        events.emit('gasprice', data.gasprice)
+        events.emit('gasprice', { gasPrice: data.gasprice, baseFeePerGas: data.baseGasPrice })
         break
     }
   }

package/src/tx-log/ethereum-monitor.js

@@ -199,10 +199,18 @@ export class EthereumMonitor extends BaseMonitor {
     }
   }
 
-  async updateGasPrice(newGasPrice) {
+  async updateGasPrice({ gasPrice, baseFeePerGas }) {
     try {
-      const feeConfig = { gasPrice: `${parseInt(newGasPrice, 16)} wei` }
-      this.logger.debug(`Update ${this.asset.name} gas price: ${feeConfig.gasPrice}`)
+      const feeConfig = {
+        gasPrice: `${parseInt(gasPrice, 16)} wei`,
+      }
+      if (baseFeePerGas) {
+        feeConfig.baseFeePerGas = `${parseInt(baseFeePerGas, 16)} wei`
+      }
+
+      this.logger.debug(
+        `Update ${this.asset.name} gas price: ${feeConfig.gasPrice}, baseFeePerGas: ${feeConfig.baseFeePerGas}`
+      )
       await this.aci.updateFeeConfig({ assetName: this.asset.name, feeConfig })
     } catch (e) {
       this.logger.warn('error updating gasPrice', e)