@exodus/ethereum-lib 0.2.11 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/ethereum-lib",
-  "version": "0.2.11",
+  "version": "1.0.1",
   "description": "Ethereum Library",
   "main": "src/index.js",
   "author": "Exodus Movement, Inc.",
@@ -20,5 +20,5 @@
   "peerDependencies": {
     "@exodus/assets": "8.0.x"
   },
-  "gitHead": "b3be7ab2c2dfba90b30aaaea41027fadb27f3571"
+  "gitHead": "a9a7090a6ecf3e29a191e632f2f0ccaef89b5cb2"
 }

package/src/create-contract/index.js

@@ -1,11 +1,12 @@
 import SolidityContract from '@exodus/solidity-contract'
-// import createContractErc20 from './erc20'
-import ABI from '../abi'
+// import ABI from '../abi'
 
 export default function createContract(address, assetName) {
   switch (assetName) {
-    case 'dai':
-      return new SolidityContract(ABI.dai, address)
+    // case 'dai':
+    //   return new SolidityContract(ABI.dai, address)
+    // case 'cdai':
+    //   return new SolidityContract(ABI.cdai, address)
     default:
       return SolidityContract.erc20(address)
   }

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

@@ -1,20 +1,17 @@
 /* @flow */
 import * as ethUtil from 'ethereumjs-util'
-import assets from '@exodus/assets'
-import { isEthereumToken, buffer2currency } from '../utils'
+import { isEthereumToken, buffer2currency, getBaseAsset } from '../utils'
 import { CHAIN_IDS } from '../constants'
 
 import type { UnsignedTransaction, ParsedTransaction } from '@exodus/models/lib/types'
 
-export default function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransaction {
-  const {
-    txData,
-    txMeta: { assetName },
-  } = unsignedTx
-  const asset = assets[assetName]
+export default function parseUnsignedTx(
+  asset: Object,
+  unsignedTx: UnsignedTransaction
+): ParsedTransaction {
+  const { txData } = unsignedTx
   const isToken = isEthereumToken(asset)
-  const baseAsset = isToken ? assets.ethereum : asset
-
+  const baseAsset = getBaseAsset(asset)
   const gasPrice = buffer2currency({ asset: baseAsset, value: txData.gasPrice })
   const gasLimit = ethUtil.bufferToInt(txData.gasLimit)
 
@@ -22,23 +19,27 @@ export default function parseUnsignedTx(unsignedTx: UnsignedTransaction): Parsed
   let amount
   const fee = gasPrice.mul(gasLimit)
   if (isToken) {
-    const parsed = asset.contract.transfer.parse(data)
-    to = parsed.to
-    amount = parsed.amount
+    const { method, values } = asset.contract.decodeInput(data)
+    if (method === 'transfer' || method === 'approve') {
+      to = values[0]
+      amount = asset.currency.baseUnit(values[1]).toDefault()
+    } else {
+      to = values[0]
+      amount = asset.currency.ZERO
+    }
   } else {
-    amount = buffer2currency({ asset: baseAsset, value: txData.value })
+    amount = buffer2currency({ asset, value: txData.value })
   }
 
   if (chainId !== CHAIN_IDS[baseAsset.name]) {
-    throw new Error(`invalid chainId ${chainId} for asset ${assetName}`)
+    throw new Error(`invalid chainId ${chainId} for asset ${asset.name}`)
   }
 
   return {
-    baseAsset,
     asset,
-    from: null, // TODO: how?
     to,
     amount,
     fee,
+    from: null, // TODO: how?
   }
 }