@exodus/ethereum-api 2.1.6 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-api",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "description": "Ethereum Api",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -10,7 +10,7 @@
     "access": "restricted"
   },
   "dependencies": {
-    "@exodus/ethereum-lib": "^2.3.2",
+    "@exodus/ethereum-lib": "^2.4.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": "52593609ee44ae7f3113482ee84c68646e7bf6ed"
+  "gitHead": "5a78637356487708e369f002616fac2963c6db94"
 }

package/src/eth-like-util.js

@@ -1,58 +1,55 @@
 import { get } from 'lodash'
-import { eth, etc, quorum } from './exodus-eth-server'
-
-export async function isContract(assetName, address) {
-  const server = assetName === 'ethereumclassic' ? etc : assetName === 'quorum' ? quorum : eth
+import { normalizeTxId } from '@exodus/ethereum-lib'
+import { eth, serverMap, getServer } from './exodus-eth-server'
+
+// 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)
 }
 
+export async function isContractAddress({ asset, address }) {
+  return getServer(asset).isContract(address)
+}
+
 export async function getNonce({ asset, address, tag = 'latest' }) {
-  if (!['ethereum', 'ethereumclassic', 'quorum'].includes(asset.name)) return
-  const server = asset.name === 'ethereumclassic' ? etc : asset.name === 'quorum' ? quorum : eth
+  const server = getServer(asset)
   const nonce = await server.getTransactionCount(address, tag)
   return parseInt(nonce, 16)
 }
 
 export async function estimateGas({ asset, ...args }) {
-  const server = asset.name === 'ethereumclassic' ? etc : asset.name === 'quorum' ? quorum : 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')
-}
-
-const fetchQuorumBalance = async (address, balanceField = 'value') => {
-  const balances = await quorum.getBalance(address)
-  return get(balances, ['confirmed', balanceField], '0')
+  return getServer(asset).estimateGas(args)
 }
 
 // Only Ethereum and Ethereumclassic, not ERC20
 export async function getBalance({ asset, address }) {
-  const _getBalance =
-    asset.name === 'ethereumclassic'
-      ? fetchEthereumClassicBalance
-      : asset.name === 'quorum'
-      ? fetchQuorumBalance
-      : fetchEthereumBalance
-  return _getBalance(address)
+  if (!['ethereum', 'ethereumclassic', 'quorum'].includes(asset.name))
+    throw new Error(`unsupported asset ${asset.name}`)
+  const server = getServer(asset)
+  const balances = await server.getBalance(address)
+  return get(balances, ['confirmed', 'value'], '0')
 }
 
 // Only Ethereum ERC20, not Ethereumclassic
 export async function getTokenBalance({ asset, address }) {
-  return asset.name === 'quorum'
-    ? fetchQuorumBalance(address, asset.contract.address.toLowerCase())
-    : fetchEthereumBalance(address, asset.contract.address.toLowerCase())
+  if (!['ethereum', 'quorum'].includes(asset.baseAsset.name))
+    throw new Error(`unsupported base asset ${asset.baseAsset.name}`)
+  const server = getServer(asset)
+  const balances = await server.getBalance(address)
+  return get(balances, ['confirmed', asset.contract.address.toLowerCase()], '0')
 }
 
 // Returns function for supplied asset
 export function sendRawTransaction(asset) {
-  const server = asset.name === 'ethereumclassic' ? etc : asset.name === 'quorum' ? quorum : eth
-  return server.sendRawTransaction
+  return getServer(asset).sendRawTransaction
+}
+
+export async function transactionExists({ asset, txId }) {
+  const server = getServer(asset)
+  txId = normalizeTxId(txId)
+  const txResult = await server.getTransactionByHash(txId)
+  return txResult && txResult.hash === txId
 }

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

@@ -9,3 +9,16 @@ const EXODUS_QUORUM_SERVER_URL = 'https://geth-quorum.a.exodus.io/wallet/v1'
 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 serverMap = {
+  ethereum: eth,
+  ethereumclassic: etc,
+  quorum,
+}
+
+export function getServer(asset) {
+  const baseAssetName = asset.baseAsset.name
+  const server = serverMap[baseAssetName]
+  if (!server) throw new Error(`unsupported base asset ${baseAssetName}`)
+  return server
+}

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 './eth-like-util'
+import { currency2buffer, isEthereumToken } from '@exodus/ethereum-lib'
+import { estimateGas, isContractAddress } from './eth-like-util'
 
 const EXTRA_PERCENTAGE = 20
 
@@ -46,17 +46,18 @@ export async function fetchGasLimit({
   extraPercentage,
 }) {
   if (!amount) amount = asset.currency.ZERO
-  if (!feeData.gasPrice) feeData.gasPrice = getBaseAsset(asset).currency.ZERO
+  if (!feeData.gasPrice) feeData.gasPrice = asset.baseAsset.currency.ZERO
 
   const isToken = isEthereumToken(asset)
   if (isToken) {
     txInput = ethUtil.bufferToHex(
       asset.contract.transfer.build(toAddress, amount.toBase().toNumberString())
     )
-    amount = getBaseAsset(asset).currency.ZERO
+    amount = asset.baseAsset.currency.ZERO
     toAddress = asset.contract.address
   } else if (!isContract) {
-    if (isContract === undefined) isContract = await _isContract(asset.name, toAddress)
+    if (isContract === undefined)
+      isContract = await isContractAddress({ asset, address: toAddress })
     if (!isContract) return asset.gasLimit
   }