@exodus/ethereum-api 2.4.5 → 2.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.4.5",
+  "version": "2.5.1",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -10,7 +10,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/ethereum-lib": "^2.7.4",
+    "@exodus/ethereum-lib": "^2.8.1",
     "@exodus/simple-retry": "^0.0.6",
     "fetchival": "0.3.3",
     "lodash": "^4.17.11",
@@ -20,5 +20,5 @@
     "url-join": "4.0.0",
     "ws": "6.1.0"
   },
-  "gitHead": "14b8266879ea622f272c94f98e71c1a16dd274f1"
+  "gitHead": "beb8b96a02d08dc9e32746e65d3c666cc77ed746"
 }

package/src/eth-like-util.js

@@ -1,5 +1,5 @@
 import { get } from 'lodash'
-import { normalizeTxId } from '@exodus/ethereum-lib'
+import { normalizeTxId, isEthereumLikeAsset, isEthereumLikeToken } from '@exodus/ethereum-lib'
 import { eth, serverMap, getServer } from './exodus-eth-server'
 
 // Mobile only.
@@ -34,8 +34,7 @@ export async function estimateGas({ asset, ...args }) {
 
 // Only base assets, not tokens
 export async function getBalance({ asset, address }) {
-  if (!['ethereum', 'ethereumclassic', 'quorum', 'bsc'].includes(asset.name))
-    throw new Error(`unsupported asset ${asset.name}`)
+  if (!isEthereumLikeAsset(asset)) throw new Error(`unsupported asset ${asset.name}`)
   const server = getServer(asset)
   const balances = await server.getBalance(address)
   return get(balances, ['confirmed', 'value'], '0')
@@ -43,8 +42,7 @@ export async function getBalance({ asset, address }) {
 
 // Only ETH-like assets with token support
 export async function getTokenBalance({ asset, address }) {
-  if (!['ethereum', 'quorum', 'bsc'].includes(asset.baseAsset.name))
-    throw new Error(`unsupported base asset ${asset.baseAsset.name}`)
+  if (!isEthereumLikeToken(asset)) throw new Error(`unsupported ETH-like token ${asset.name}`)
   const server = getServer(asset)
   const balances = await server.getBalance(address)
   return get(balances, ['confirmed', asset.contract.address.toLowerCase()], '0')

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

@@ -144,6 +144,14 @@ export function create(defaultURL) {
       })
     },
 
+    async getBaseFee() {
+      const { baseFeePerGas } = await requestWithRetry('proxy', {
+        method: 'eth_getBlockByNumber',
+        number: 'latest',
+      })
+      return baseFeePerGas
+    },
+
     async getLogs(params) {
       return requestWithRetry('proxy', { method: 'eth_getLogs', ...params })
     },

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

@@ -2,21 +2,18 @@ import { create } from './api'
 
 const EXODUS_ETH_SERVER_URL = 'https://geth.a.exodus.io/wallet/v1/'
 const EXODUS_ETC_SERVER_URL = 'https://getc.a.exodus.io/wallet/v1/'
-const EXODUS_QUORUM_SERVER_URL = 'https://geth-quorum.a.exodus.io/wallet/v1/'
 const EXODUS_BSC_SERVER_URL = 'https://bsc.a.exodus.io/wallet/v1/'
 
 // allow self-signed certs
 // process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 export const eth = create(EXODUS_ETH_SERVER_URL)
 export const etc = create(EXODUS_ETC_SERVER_URL)
-export const quorum = create(EXODUS_QUORUM_SERVER_URL)
 export const bsc = create(EXODUS_BSC_SERVER_URL)
 
 // exported for in-library use only.
 export const serverMap = {
   ethereum: eth,
   ethereumclassic: etc,
-  quorum,
   bsc,
 }
 

package/src/fee-monitor/ethereum.js

@@ -2,11 +2,13 @@ import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
 import { eth as ethServer } from '../exodus-eth-server'
 
 export class EthereumFeeMonitor extends EthereumLikeFeeMonitor {
-  constructor({ updateFee }) {
+  constructor({ updateFee, eip1559Enabled }) {
     super({
       updateFee,
       assetName: 'ethereum',
       getGasPrice: ethServer.gasPrice,
+      getBaseFee: ethServer.getBaseFee,
+      eip1559Enabled,
     })
   }
 }