@exodus/ethereum-api 0.2.6 → 0.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -19,5 +19,5 @@
     "url-join": "4.0.0",
     "ws": "6.1.0"
   },
-  "gitHead": "cb562d91bae2c526403fb66ab8b05127a8f1d673"
+  "gitHead": "7b2e88a73e28ff83bafb6ba4695f3c24ecd20d21"
 }

package/src/with-fallback.js

@@ -1,5 +1,4 @@
 import { get } from 'lodash'
-import { _isEthereumToken } from '@exodus/ethereum-lib'
 import { eth as ethServer, etc as etcServer } from './exodus-eth-server'
 import * as etherscan from './etherscan'
 
@@ -19,9 +18,12 @@ export function withFallback(fn, fn2) {
 }
 
 export async function isContract(assetName, address) {
-  const server =
-    assetName === 'ethereumclassic' ? etcServer : withFallback(ethServer.getCode, etherscan.getCode)
-  const code = await server.getCode(address)
+  const _getCode =
+    assetName === 'ethereumclassic'
+      ? withFallback(etcServer.getCode, etcServer.getCode)
+      : withFallback(ethServer.getCode, etherscan.getCode)
+
+  const code = await _getCode(address)
   return code.length > 2
 }
 
@@ -29,48 +31,57 @@ export async function getNonce({ asset, address }) {
   if (!['ethereum', 'ethereumclassic'].includes(asset.name)) return
 
   const _getNonce =
-    asset.name === 'ethereum'
-      ? withFallback(ethServer.getTransactionCount, etherscan.getTransactionCount)
-      : etcServer.getTransactionCount
+    asset.name === 'ethereumclassic'
+      ? withFallback(etcServer.getTransactionCount, etcServer.getTransactionCount)
+      : withFallback(ethServer.getTransactionCount, etherscan.getTransactionCount)
 
   const nonce = await _getNonce(address)
   return parseInt(nonce, 16)
 }
 
 export async function estimateGas({ asset, ...args }) {
-  const useEthServer: boolean = asset.name === 'ethereum' || _isEthereumToken(asset)
-  return (useEthServer
-    ? withFallback(ethServer.estimateGas, etherscan.estimateGas)
-    : etcServer.estimateGas)(args)
+  const _estimateGas =
+    asset.name === 'ethereumclassic'
+      ? withFallback(etcServer.estimateGas, etcServer.estimateGas)
+      : withFallback(ethServer.estimateGas, etherscan.estimateGas)
+
+  return _estimateGas(args)
 }
 
-export async function getBalance({ asset, address }) {
-  const fetchEthereumBalance = withFallback(async (address) => {
-    const balances = await ethServer.getBalance(address)
-    return get(balances, 'confirmed.value', '0')
-  }, etherscan.fetchBalance)
+const fetchEthereumBalance = async (address, contractAddress = 'value') => {
+  const balances = await ethServer.getBalance(address)
+  return get(balances, ['confirmed', contractAddress], '0')
+}
 
-  const fetchEthereumClassicBalance = async (address) => {
-    const balances = await etcServer.getBalance(address)
-    return get(balances, 'confirmed.value', '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 (asset.name === 'ethereum' ? fetchEthereumBalance : fetchEthereumClassicBalance)(address)
+  return _getBalance(address)
 }
 
 // Only Ethereum ERC20, not Ethereumclassic
 export async function getTokenBalance({ asset, address }) {
-  const contractAddress = asset.contract.addresses.current.toLowerCase()
+  const _getTokenBalance = withFallback(
+    async (contractAddress, address) => fetchEthereumBalance(address, contractAddress),
+    etherscan.tokenBalance
+  )
 
-  return withFallback(async (contractAddress, address) => {
-    const balances = await ethServer.getBalance(address)
-    return get(balances, ['confirmed', contractAddress], '0')
-  }, etherscan.tokenBalance)(contractAddress, address)
+  const contractAddress = asset.contract.addresses.current.toLowerCase()
+  return _getTokenBalance(contractAddress, address)
 }
 
 // Returns function for supplied asset
 export function sendRawTransaction(asset) {
-  return asset.name === 'ethereum' || _isEthereumToken(asset)
-    ? withFallback(ethServer.sendRawTransaction, etherscan.sendRawTransaction)
-    : etcServer.sendRawTransaction
+  return asset.name === 'ethereumclassic'
+    ? withFallback(etcServer.sendRawTransaction, etcServer.sendRawTransaction)
+    : withFallback(ethServer.sendRawTransaction, etherscan.sendRawTransaction)
 }