@exodus/ethereum-api 6.2.6 → 6.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "6.2.6",
+  "version": "6.2.8",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "files": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
     "@exodus/crypto": "^1.0.0-rc.0",
-    "@exodus/ethereum-lib": "^3.3.0",
+    "@exodus/ethereum-lib": "^3.3.1",
     "@exodus/ethereumjs-util": "^7.1.0-exodus.6",
     "@exodus/fetch": "^1.2.1",
     "@exodus/simple-retry": "^0.0.6",
@@ -36,5 +36,5 @@
   "devDependencies": {
     "@exodus/models": "^8.10.4"
   },
-  "gitHead": "267d6f4bdfeb19fc7cd060b67083ca45437e9bfd"
+  "gitHead": "eb4cad64f725a9460b8c57ec19bd073ed95be343"
 }

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

@@ -143,6 +143,9 @@ export default class ApiCoinNodesServer extends EventEmitter {
     return this.sendRequest(request)
   }
 
+  // for fee monitor
+  getGasPrice = this.gasPrice
+
   async estimateGas(...params) {
     const request = this.estimateGasRequest(...params)
     return this.sendRequest(request)
@@ -197,4 +200,8 @@ export default class ApiCoinNodesServer extends EventEmitter {
     const request = this.simulateRawTransactionRequest(...params)
     return this.sendRequest(request)
   }
+
+  stop() {
+    // no web socket to stop!
+  }
 }

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

@@ -118,6 +118,11 @@ export function create(defaultURL, ensAssetName) {
       return requestWithRetry('proxy', { method: 'eth_gasPrice' })
     },
 
+    // for fee monitor
+    async getGasPrice() {
+      return requestWithRetry('proxy', { method: 'eth_gasPrice' })
+    },
+
     async getTransactionCount(address, tag = 'latest') {
       return requestWithRetry('proxy', { method: 'eth_getTransactionCount', address, tag })
     },

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

@@ -130,6 +130,12 @@ export default class ClarityServer extends EventEmitter {
     })
   }
 
+  // for fee monitors
+  async getGasPrice() {
+    const fee = await this.getFee()
+    return fee?.gasPrice
+  }
+
   async sendRpcRequest(rpcRequest) {
     const rpcSocket = this.connectRpc()
     return new Promise((resolve, reject) => {
@@ -393,4 +399,8 @@ export default class ClarityServer extends EventEmitter {
   formatFeeNamespace() {
     return `${this.baseNamespace}/fee`
   }
+
+  stop() {
+    this.dispose()
+  }
 }

package/src/fee-monitor/avalanchec.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'avalanchec'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class AvalancheFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
     })
   }
 }

package/src/fee-monitor/bsc.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'bsc'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class BscFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
     })
   }
 }

package/src/fee-monitor/ethereum.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'ethereum'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class EthereumFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee, interval }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
       interval,
     })
   }

package/src/fee-monitor/ethereumarbnova.js

@@ -3,6 +3,7 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'ethereumarbnova'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class EthereumArbnovaFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee, interval }) {
     super({

package/src/fee-monitor/ethereumarbone.js

@@ -3,6 +3,7 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'ethereumarbone'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class EthereumArboneFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee, interval }) {
     super({

package/src/fee-monitor/ethereumclassic.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'ethereumclassic'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class EthereumClassicFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
     })
   }
 }

package/src/fee-monitor/ethereumgoerli.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'ethereumgoerli'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class EthereumGoerliFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee, interval }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
       interval,
     })
   }

package/src/fee-monitor/fantom.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'fantommainnet'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class FantomFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
     })
   }
 }

package/src/fee-monitor/harmony.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'harmonymainnet'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class HarmonyFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
     })
   }
 }

package/src/fee-monitor/index.js

@@ -1,3 +1,5 @@
+export * from './server-based-fee-monitor'
+
 export * from './ethereum'
 export * from './ethereumclassic'
 export * from './ethereumgoerli'

package/src/fee-monitor/optimism.js

@@ -3,6 +3,7 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'optimism'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class OptimismFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee, interval }) {
     super({

package/src/fee-monitor/polygon.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'matic'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class PolygonFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
     })
   }
 }

package/src/fee-monitor/rootstock.js

@@ -3,12 +3,15 @@ import { getServerByName } from '../exodus-eth-server'
 
 const assetName = 'rootstock'
 
+// @deprecated use ./server-based-fee-monitor.js
 export class RootstockFeeMonitor extends EthereumLikeFeeMonitor {
   constructor({ updateFee }) {
+    const server = getServerByName(assetName)
+    const getGasPrice = (...args) => server.gasPrice(...args)
     super({
       updateFee,
       assetName,
-      getGasPrice: getServerByName(assetName).gasPrice,
+      getGasPrice,
     })
   }
 }

package/src/fee-monitor/server-based-fee-monitor.js

@@ -0,0 +1,39 @@
+import { EthereumLikeFeeMonitor } from '@exodus/ethereum-lib'
+import assert from 'minimalistic-assert'
+import { getServerByName } from '../exodus-eth-server'
+
+/**
+ * Generic eth server based fee monitor.
+ *
+ * Compatible with all servers, clarity, magnifier and api-coin (they all implement the gasPrice method).
+ *
+ * Usage in the index files:
+ *
+ * const api = {
+ *  ...
+ *  createFeeMonitor: serverBasedFeeMonitorFactoryFactory({ interval: '50s', assetName: base.name }),
+ *  ...
+ * }
+ */
+
+export const serverBasedFeeMonitorFactoryFactory = ({ assetName, interval }) => {
+  assert(assetName, 'assetName is required')
+
+  // NOTE: Using getServerByName for simplicity now but
+  // remove getServerByName and convert server to a param instead.
+  // This is to avoid global references, static creation, remove the chain specific map and allow IOC
+  const server = getServerByName(assetName)
+  const getGasPrice = (...args) => server.getGasPrice(...args)
+  const FeeMonitorClass = class ServerBaseEthereumFeeMonitor extends EthereumLikeFeeMonitor {
+    constructor({ updateFee }) {
+      assert(updateFee, 'updateFee is required')
+      super({
+        updateFee,
+        assetName,
+        getGasPrice,
+        interval,
+      })
+    }
+  }
+  return (...args) => new FeeMonitorClass(...args)
+}