@exodus/ethereum-lib 0.2.4 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "0.2.4",
+  "version": "0.2.8",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -16,8 +16,8 @@
     "ethereumjs-tx": "1.3.7",
     "ethereumjs-util": "5.2.0"
   },
-  "devDependencies": {
+  "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "bcaf797f81e5f31a8b15cd2c2efdf6a1ee4c8e65"
+  "gitHead": "fc53854a8e60f021526fa8b6f4ac7fb5ccb0a5a4"
 }

package/src/unsigned-tx/create-unsigned-tx.js

@@ -1,5 +1,5 @@
 import ethUtil from 'ethereumjs-util'
-import { _isEthereumToken, currency2buffer } from '../utils'
+import { isEthereumToken, currency2buffer } from '../utils'
 import { CHAIN_IDS } from '../constants'
 
 import type { UnsignedTransaction } from '#/app-models'
@@ -25,9 +25,9 @@ export default function createUnsignedTx({
 
   if (!chainId) chainId = CHAIN_IDS[baseAsset.name] // mainnet
 
-  const isEthereumToken = _isEthereumToken(asset)
-  const to = isEthereumToken ? asset.contract.addresses.current : address
-  let value = currency2buffer(isEthereumToken ? baseAsset.currency.ZERO : amount)
+  const isToken = isEthereumToken(asset)
+  const to = isToken ? asset.contract.addresses.current : address
+  let value = currency2buffer(isToken ? baseAsset.currency.ZERO : amount)
 
   // TODO: check: present on desktop missing on mobile. This insures we never have a buffer specifying 0.
   // In ETH, a buffer of zero length and a buffer specifying 0 imply different things

package/src/unsigned-tx/parse-unsigned-tx.js

@@ -1,7 +1,7 @@
 /* @flow */
 import * as ethUtil from 'ethereumjs-util'
 import assets from '@exodus/assets'
-import { _isEthereumToken, buffer2currency } from '../utils'
+import { isEthereumToken, buffer2currency } from '../utils'
 import { CHAIN_IDS } from '../constants'
 
 import type { UnsignedTransaction, ParsedTransaction } from '@exodus/models/lib/types'
@@ -12,8 +12,8 @@ export default function parseUnsignedTx(unsignedTx: UnsignedTransaction): Parsed
     txMeta: { assetName },
   } = unsignedTx
   const asset = assets[assetName]
-  const isEthereumToken = _isEthereumToken(asset)
-  const baseAsset = isEthereumToken ? assets.ethereum : asset
+  const isToken = isEthereumToken(asset)
+  const baseAsset = isToken ? assets.ethereum : asset
 
   const gasPrice = buffer2currency({ asset: baseAsset, value: txData.gasPrice })
   const gasLimit = ethUtil.bufferToInt(txData.gasLimit)
@@ -21,7 +21,7 @@ export default function parseUnsignedTx(unsignedTx: UnsignedTransaction): Parsed
   let { to, chainId, data } = txData
   let amount
   const fee = gasPrice.mul(gasLimit)
-  if (isEthereumToken) {
+  if (isToken) {
     const parsed = asset.contract.transfer.parse(data)
     to = parsed.to
     amount = parsed.amount

package/src/utils.js

@@ -1,10 +1,11 @@
 import baseX from 'base-x'
 import * as ethUtil from 'ethereumjs-util'
+import assets from '@exodus/assets'
 
 const base10 = baseX('0123456789')
 const base16 = baseX('0123456789abcdef')
 
-export const _isEthereumToken = (asset) => asset.assetType === 'ETHEREUM_ERC20'
+export const isEthereumToken = (asset) => asset.assetType === 'ETHEREUM_ERC20'
 
 export function buffer2currency({ asset, value }) {
   return asset.currency.baseUnit(base10.encode(value)).toDefault()
@@ -31,3 +32,7 @@ export function normalizeTxId(txId: string): string {
   if (txId.startsWith('0x')) return txId
   else return '0x' + txId
 }
+
+export function getBaseAsset(asset) {
+  return isEthereumToken(asset) ? assets.ethereum : asset
+}