@exodus/ethereum-api 1.0.17 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "1.0.17",
+  "version": "2.0.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -10,7 +10,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/ethereum-lib": "^1.2.2",
+    "@exodus/ethereum-lib": "^2.0.0",
     "@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": "0c3b4952a99f9157becc9a3754a34e289a0a1095"
+  "gitHead": "cc2ade686dff7693c028ca9d6796ada2a0eed6f1"
 }

package/src/eth-like-util.js

@@ -0,0 +1,47 @@
+import { get } from 'lodash'
+import { eth, etc } from './exodus-eth-server'
+
+export async function isContract(assetName, address) {
+  const server = assetName === 'ethereumclassic' ? etc : eth
+  return server.isContract(address)
+}
+
+export async function getNonce({ asset, address, tag = 'latest' }) {
+  if (!['ethereum', 'ethereumclassic'].includes(asset.name)) return
+  const server = asset.name === 'ethereumclassic' ? etc : eth
+  const nonce = await server.getTransactionCount(address, tag)
+  return parseInt(nonce, 16)
+}
+
+export async function estimateGas({ asset, ...args }) {
+  const server = asset.name === 'ethereumclassic' ? etc : eth
+  return server.estimateGas(args)
+}
+
+const fetchEthereumBalance = async (address, balanceField = 'value') => {
+  const balances = await eth.getBalance(address)
+  return get(balances, ['confirmed', balanceField], '0')
+}
+
+const fetchEthereumClassicBalance = async (address) => {
+  const balances = await etc.getBalance(address)
+  return get(balances, 'confirmed.value', '0')
+}
+
+// Only Ethereum and Ethereumclassic, not ERC20
+export async function getBalance({ asset, address }) {
+  const _getBalance =
+    asset.name === 'ethereumclassic' ? fetchEthereumClassicBalance : fetchEthereumBalance
+  return _getBalance(address)
+}
+
+// Only Ethereum ERC20, not Ethereumclassic
+export async function getTokenBalance({ asset, address }) {
+  return fetchEthereumBalance(address, asset.contract.address.toLowerCase())
+}
+
+// Returns function for supplied asset
+export function sendRawTransaction(asset) {
+  const server = asset.name === 'ethereumclassic' ? etc : eth
+  return server.sendRawTransaction
+}

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

@@ -28,6 +28,7 @@ export function create(defaultURL) {
           const msg = data.error.replace(/^RPC error \(code: -\d+\): /, '')
           nerr = new Error(msg)
         } catch (err) {}
+        nerr.finalError = true
       }
 
       throw nerr
@@ -55,12 +56,12 @@ export function create(defaultURL) {
 
     async getBalance(address, opts) {
       opts = { startblock: 'earliest', endblock: 'pending', ...opts }
-      return request('balance', { address, from: opts.startblock, to: opts.endblock })
+      return requestWithRetry('balance', { address, from: opts.startblock, to: opts.endblock })
     },
 
     async getHistory(address, opts) {
       opts = { startblock: 'earliest', endblock: 'pending', limit: 1000, ...opts }
-      return request('history', {
+      return requestWithRetry('history', {
         address,
         from: opts.startblock,
         to: opts.endblock,
@@ -73,27 +74,32 @@ export function create(defaultURL) {
     },
 
     async getTransactionCount(address, tag = 'latest') {
-      return request('proxy', { method: 'eth_getTransactionCount', address, tag })
+      return requestWithRetry('proxy', { method: 'eth_getTransactionCount', address, tag })
     },
 
     async getTransactionByHash(hash) {
-      return request('proxy', { method: 'eth_getTransactionByHash', hash })
+      return requestWithRetry('proxy', { method: 'eth_getTransactionByHash', hash })
     },
 
     async getTransactionReceipt(txhash) {
-      return request('proxy', { method: 'eth_getTransactionReceipt', txhash })
+      return requestWithRetry('proxy', { method: 'eth_getTransactionReceipt', txhash })
     },
 
     async getCode(address, tag = 'latest') {
-      return request('proxy', { method: 'eth_getCode', address, tag })
+      return requestWithRetry('proxy', { method: 'eth_getCode', address, tag })
+    },
+
+    async isContract(address) {
+      const code = await requestWithRetry('proxy', { method: 'eth_getCode', address })
+      return code.length > 2
     },
 
     async sendRawTransaction(data) {
-      return request('proxy', { method: 'eth_sendRawTransaction', hex: '0x' + data })
+      return requestWithRetry('proxy', { method: 'eth_sendRawTransaction', hex: '0x' + data })
     },
 
     async estimateGas(data, tag = 'latest') {
-      return request('proxy', { method: 'eth_estimateGas', ...data, tag })
+      return requestWithRetry('proxy', { method: 'eth_estimateGas', ...data, tag })
     },
 
     async ethCall(data, tag = 'latest') {
@@ -101,15 +107,19 @@ export function create(defaultURL) {
     },
 
     async blockNumber() {
-      return request('proxy', { method: 'eth_blockNumber' })
+      return requestWithRetry('proxy', { method: 'eth_blockNumber' })
     },
 
     async getBlockByNumber(number, isFullTransactions = false) {
-      return request('proxy', { method: 'eth_getBlockByNumber', number, isFullTransactions })
+      return requestWithRetry('proxy', {
+        method: 'eth_getBlockByNumber',
+        number,
+        isFullTransactions,
+      })
     },
 
     async getLogs(params) {
-      return request('proxy', { method: 'eth_getLogs', ...params })
+      return requestWithRetry('proxy', { method: 'eth_getLogs', ...params })
     },
 
     async simulateRawTransaction(rawTransaction, applyPending = true) {

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

@@ -1,7 +1,7 @@
 import { create } from './api'
 
-const EXODUS_ETH_SERVER_URL = 'https://eth.a.exodus.io/wallet/v1/'
-const EXODUS_ETC_SERVER_URL = 'https://etc.a.exodus.io/wallet/v1/'
+const EXODUS_ETH_SERVER_URL = 'https://geth.a.exodus.io/wallet/v1/'
+const EXODUS_ETC_SERVER_URL = 'https://getc.a.exodus.io/wallet/v1/'
 
 // allow self-signed certs
 // process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'

package/src/gas-estimation.js

@@ -1,7 +1,7 @@
 import BN from 'bn.js'
 import * as ethUtil from 'ethereumjs-util'
 import { currency2buffer, isEthereumToken, getBaseAsset } from '@exodus/ethereum-lib'
-import { estimateGas, isContract as _isContract } from './with-fallback'
+import { estimateGas, isContract as _isContract } from './eth-like-util'
 
 const EXTRA_PERCENTAGE = 20
 

package/src/index.js

@@ -1,9 +1,4 @@
-import * as etherscan from './etherscan'
-import * as ethWithFallback from './eth-with-fallback'
-import * as etcWithFallback from './etc-with-fallback'
-
-export * from './with-fallback'
+export * from './eth-like-util'
 export * from './fee-monitor'
 export * from './gas-estimation'
 export * from './exodus-eth-server'
-export { etherscan, ethWithFallback, etcWithFallback }

package/src/etc-with-fallback.js

@@ -1,12 +0,0 @@
-import { etc as etcServer } from './exodus-eth-server'
-import { withFallback } from './with-fallback'
-
-export const isContract = async (address) => {
-  const code = await withFallback(etcServer.getCode, etcServer.getCode)(address)
-  return code.length > 2
-}
-
-export const sendRawTransaction = withFallback(
-  etcServer.sendRawTransaction,
-  etcServer.sendRawTransaction
-)

package/src/eth-with-fallback.js

@@ -1,13 +0,0 @@
-import { eth as ethServer } from './exodus-eth-server'
-import { withFallback } from './with-fallback'
-import * as etherscan from './etherscan'
-
-export const isContract = async (address) => {
-  const code = await withFallback(ethServer.getCode, etherscan.getCode)(address)
-  return code.length > 2
-}
-
-export const sendRawTransaction = withFallback(
-  ethServer.sendRawTransaction,
-  etherscan.sendRawTransaction
-)

package/src/with-fallback.js

@@ -1,87 +0,0 @@
-import { get } from 'lodash'
-import { eth as ethServer, etc as etcServer } from './exodus-eth-server'
-import * as etherscan from './etherscan'
-
-export function withFallback(fn, fn2) {
-  return async (...args) => {
-    try {
-      return await fn(...args)
-    } catch (err1) {
-      try {
-        return await fn2(...args)
-      } catch (err2) {
-        const err = new Error(`${err1.message} | ${err2.message}`)
-        throw Object.assign(err, { err1, err2 })
-      }
-    }
-  }
-}
-
-export async function isContract(assetName, address) {
-  const _getCode =
-    assetName === 'ethereumclassic'
-      ? withFallback(etcServer.getCode, etcServer.getCode)
-      : withFallback(ethServer.getCode, etherscan.getCode)
-
-  const code = await _getCode(address)
-  return code.length > 2
-}
-
-export async function getNonce({ asset, address, tag = 'latest' }) {
-  if (!['ethereum', 'ethereumclassic'].includes(asset.name)) return
-
-  const _getNonce =
-    asset.name === 'ethereumclassic'
-      ? withFallback(etcServer.getTransactionCount, etcServer.getTransactionCount)
-      : withFallback(ethServer.getTransactionCount, etherscan.getTransactionCount)
-
-  const nonce = await _getNonce(address, tag)
-  return parseInt(nonce, 16)
-}
-
-export async function estimateGas({ asset, ...args }) {
-  const _estimateGas =
-    asset.name === 'ethereumclassic'
-      ? withFallback(etcServer.estimateGas, etcServer.estimateGas)
-      : withFallback(ethServer.estimateGas, etherscan.estimateGas)
-
-  return _estimateGas(args)
-}
-
-const fetchEthereumBalance = async (address, balanceField = 'value') => {
-  const balances = await ethServer.getBalance(address)
-  return get(balances, ['confirmed', balanceField], '0')
-}
-
-const fetchEthereumClassicBalance = async (address) => {
-  const balances = await etcServer.getBalance(address)
-  return get(balances, 'confirmed.value', '0')
-}
-
-// Only Ethereum and Ethereumclassic, not ERC20
-export async function getBalance({ asset, address }) {
-  const _getBalance =
-    asset.name === 'ethereumclassic'
-      ? withFallback(fetchEthereumClassicBalance, fetchEthereumClassicBalance)
-      : withFallback(fetchEthereumBalance, etherscan.fetchBalance)
-
-  return _getBalance(address)
-}
-
-// Only Ethereum ERC20, not Ethereumclassic
-export async function getTokenBalance({ asset, address }) {
-  const _getTokenBalance = withFallback(
-    async (contractAddress, address) => fetchEthereumBalance(address, contractAddress),
-    etherscan.tokenBalance
-  )
-
-  const contractAddress = asset.contract.address.toLowerCase()
-  return _getTokenBalance(contractAddress, address)
-}
-
-// Returns function for supplied asset
-export function sendRawTransaction(asset) {
-  return asset.name === 'ethereumclassic'
-    ? withFallback(etcServer.sendRawTransaction, etcServer.sendRawTransaction)
-    : withFallback(ethServer.sendRawTransaction, etherscan.sendRawTransaction)
-}