@exodus/ethereum-api 2.21.5 → 2.22.0

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.21.5",
+  "version": "2.22.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
+  "files": [
+    "src",
+    "!src/**/__tests__"
+  ],
   "author": "Exodus Movement, Inc.",
   "license": "UNLICENSED",
   "homepage": "https://github.com/ExodusMovement/ethereum#readme",
@@ -13,7 +17,7 @@
     "@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.3",
+    "@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",
@@ -30,5 +34,5 @@
     "@exodus/assets-base": "^8.0.136",
     "@exodus/models": "^8.7.2"
   },
-  "gitHead": "17da5c475386e928e677702982b5e757c0f3870b"
+  "gitHead": "57fae619663ea5193c733bd089c9031447f0d025"
 }

package/src/ens/index.js

@@ -2,7 +2,6 @@ import { hash } from '@ensdomains/eth-ens-namehash'
 import SolidityContract from '@exodus/solidity-contract'
 import { ABI } from '@exodus/ethereum-lib'
 
-import { eth as server } from '../exodus-eth-server'
 import ENS_REGISTRY_ADDRESSES from './addresses'
 
 const registry = new SolidityContract(ABI.ensRegistry)
@@ -11,7 +10,7 @@ const resolver = new SolidityContract(ABI.ensResolver)
 // ENS only available on mainnet atm
 const ENS_REGISTRY_ADDRESS = ENS_REGISTRY_ADDRESSES['ethereum']
 
-const getResolverAddress = async (name: string) =>
+const getResolverAddress = async (name: string, server: Object) =>
   server
     .ethCall({
       to: ENS_REGISTRY_ADDRESS,
@@ -19,8 +18,8 @@ const getResolverAddress = async (name: string) =>
     })
     .then((result) => '0x' + result.slice(26))
 
-const resolveEnsName = async (name: string) => {
-  const resolverAddress = await getResolverAddress(name)
+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),
@@ -28,10 +27,10 @@ const resolveEnsName = async (name: string) => {
   return '0x' + hex.slice(26)
 }
 
-const resolveEnsAddress = async (address: string) => {
+const resolveEnsAddress = async (address: string, server: Object) => {
   const name = `${address.slice(2)}.addr.reverse`
 
-  const resolverAddress = await getResolverAddress(name)
+  const resolverAddress = await getResolverAddress(name, server)
 
   const data = await server.ethCall({
     to: resolverAddress,

package/src/eth-like-util.js

@@ -1,15 +1,13 @@
 import { normalizeTxId, isEthereumLikeAsset, isEthereumLikeToken, ABI } from '@exodus/ethereum-lib'
-import { eth, serverMap, getServer } from './exodus-eth-server'
+import { getServerByName, getServer } from './exodus-eth-server'
 import { memoizeLruCache } from '@exodus/asset-lib'
 import assets from '@exodus/assets'
 import SolidityContract from '@exodus/solidity-contract'
 
 // Mobile only.
-// Behavior is buggy, because the default server used is ethereum.
 // We should refactor mobile to pass 'asset' instead of 'assetName' so that we can use 'isContractAddress'. But that would touch many assets.
 export async function isContract(baseAssetName, address) {
-  const server = serverMap[baseAssetName] || eth
-  return server.isContract(address)
+  return getServerByName(baseAssetName).isContract(address)
 }
 
 export async function isContractAddress({ asset, address }) {

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

@@ -245,8 +245,8 @@ export function create(defaultURL, ensAssetName) {
   return ensAssetName === 'ethereum'
     ? {
         ...api,
-        resolveEnsName,
-        resolveEnsAddress,
+        resolveEnsName: (name) => resolveEnsName(name, api),
+        resolveEnsAddress: (address) => resolveEnsAddress(address, api),
       }
     : api
 }

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

@@ -2,8 +2,7 @@ import { DEFAULT_SERVER_URLS, ETHEREUM_LIKE_ASSETS } from '@exodus/ethereum-lib'
 
 import { create } from './api'
 
-// exported for in-library use only.
-export const serverMap = Object.fromEntries(
+const serverMap = Object.fromEntries(
   ETHEREUM_LIKE_ASSETS.map((assetName) => [
     assetName,
     create(DEFAULT_SERVER_URLS[assetName], assetName),
@@ -12,16 +11,26 @@ export const serverMap = Object.fromEntries(
 
 // allow self-signed certs
 // process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
+// @deprecated Use getServer or getServerbyName instead
 export const eth = serverMap['ethereum']
+// @deprecated Use getServer or getServerbyName instead
 export const etc = serverMap['ethereumclassic']
+// @deprecated Use getServer or getServerbyName instead
 export const bsc = serverMap['bsc']
+// @deprecated Use getServer or getServerbyName instead
 export const polygon = serverMap['matic']
+// @deprecated Use getServer or getServerbyName instead
 export const avaxc = serverMap['avalanchec']
+// @deprecated Use getServer or getServerbyName instead
 export const ftm = serverMap['fantommainnet']
+// @deprecated Use getServer or getServerbyName instead
 export const harmony = serverMap['harmonymainnet']
 
 export function getServer(asset) {
-  const baseAssetName = asset.baseAsset.name
+  return getServerByName(asset.baseAsset.name)
+}
+
+export function getServerByName(baseAssetName) {
   const server = serverMap[baseAssetName]
   if (!server) throw new Error(`unsupported base asset ${baseAssetName}`)
   return server

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/fee-monitor/avalanchec.js

@@ -1,12 +1,14 @@
 import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
-import { avaxc as avalancheServer } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'avalanchec'
 
 export class AvalancheFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
     super({
       updateFee,
-      assetName: 'avalanchec',
-      getGasPrice: avalancheServer.gasPrice,
+      assetName,
+      getGasPrice: getServerByName(assetName).gasPrice,
     })
   }
 }

package/src/fee-monitor/bsc.js

@@ -1,12 +1,14 @@
 import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
-import { bsc } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'bsc'
 
 export class BscFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
     super({
       updateFee,
-      assetName: 'bsc',
-      getGasPrice: bsc.gasPrice,
+      assetName,
+      getGasPrice: getServerByName(assetName).gasPrice,
     })
   }
 }

package/src/fee-monitor/ethereum.js

@@ -1,12 +1,14 @@
 import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
-import { eth as ethServer } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'ethereum'
 
 export class EthereumFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee, interval }) {
     super({
       updateFee,
-      assetName: 'ethereum',
-      getGasPrice: ethServer.gasPrice,
+      assetName,
+      getGasPrice: getServerByName(assetName).gasPrice,
       interval,
     })
   }

package/src/fee-monitor/ethereumclassic.js

@@ -1,12 +1,14 @@
 import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
-import { etc as etcServer } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'ethereumclassic'
 
 export class EthereumClassicFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
     super({
       updateFee,
-      assetName: 'ethereumclassic',
-      getGasPrice: etcServer.gasPrice,
+      assetName,
+      getGasPrice: getServerByName(assetName).gasPrice,
     })
   }
 }

package/src/fee-monitor/fantom.js

@@ -1,12 +1,14 @@
 import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
-import { ftm as fantomServer } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'fantommainnet'
 
 export class FantomFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
     super({
       updateFee,
-      assetName: 'fantommainnet',
-      getGasPrice: fantomServer.gasPrice,
+      assetName,
+      getGasPrice: getServerByName(assetName).gasPrice,
     })
   }
 }

package/src/fee-monitor/harmony.js

@@ -1,12 +1,14 @@
 import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
-import { harmony as harmonyServer } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'harmonymainnet'
 
 export class HarmonyFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
     super({
       updateFee,
-      assetName: 'harmonymainnet',
-      getGasPrice: harmonyServer.gasPrice,
+      assetName,
+      getGasPrice: getServerByName(assetName).gasPrice,
     })
   }
 }

package/src/fee-monitor/polygon.js

@@ -1,12 +1,14 @@
 import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
-import { polygon as polygonServer } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
+
+const assetName = 'matic'
 
 export class PolygonFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
     super({
       updateFee,
-      assetName: 'matic',
-      getGasPrice: polygonServer.gasPrice,
+      assetName,
+      getGasPrice: getServerByName(assetName).gasPrice,
     })
   }
 }

package/src/staking/matic-staking.js

@@ -1,5 +1,5 @@
 import { createContract } from '@exodus/ethereum-lib'
-import { eth } from '../exodus-eth-server'
+import { getServerByName } from '../exodus-eth-server'
 import { retry } from '@exodus/simple-retry'
 import { bufferToHex } from '@exodus/ethereumjs-util'
 
@@ -27,6 +27,8 @@ export class MaticStaking {
       tag: 'latest',
     }
 
+    // TODO: why 'ethereum' if this is matic staking?
+    const eth = getServerByName('ethereum')
     return retry(eth.ethCall, { delayTimesMs: RETRY_DELAYS })(data)
   }
 

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)