aboutsummaryrefslogtreecommitdiffstats
path: root/packages/web3-wrapper/src/marshaller.ts
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-07-07 01:23:24 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-07-07 01:23:24 +0800
commitacfbba5476d48645eee7f471ecaa4b1142709939 (patch)
tree8e62f46a85c50cf3685d3a02fe63bc56fd3d6028 /packages/web3-wrapper/src/marshaller.ts
parent188bf000b784fe6d9e24e3758a30a72a2795bc58 (diff)
downloaddexon-sol-tools-acfbba5476d48645eee7f471ecaa4b1142709939.tar
dexon-sol-tools-acfbba5476d48645eee7f471ecaa4b1142709939.tar.gz
dexon-sol-tools-acfbba5476d48645eee7f471ecaa4b1142709939.tar.bz2
dexon-sol-tools-acfbba5476d48645eee7f471ecaa4b1142709939.tar.lz
dexon-sol-tools-acfbba5476d48645eee7f471ecaa4b1142709939.tar.xz
dexon-sol-tools-acfbba5476d48645eee7f471ecaa4b1142709939.tar.zst
dexon-sol-tools-acfbba5476d48645eee7f471ecaa4b1142709939.zip
Revert moving formatUtils into utils
Diffstat (limited to 'packages/web3-wrapper/src/marshaller.ts')
-rw-r--r--packages/web3-wrapper/src/marshaller.ts76
1 files changed, 35 insertions, 41 deletions
diff --git a/packages/web3-wrapper/src/marshaller.ts b/packages/web3-wrapper/src/marshaller.ts
index 584f6252d..15384417e 100644
--- a/packages/web3-wrapper/src/marshaller.ts
+++ b/packages/web3-wrapper/src/marshaller.ts
@@ -1,4 +1,4 @@
-import { addressUtils, formatUtils } from '@0xproject/utils';
+import { addressUtils } from '@0xproject/utils';
import {
BlockParam,
BlockParamLiteral,
@@ -14,6 +14,8 @@ import {
import ethUtil = require('ethereumjs-util');
import * as _ from 'lodash';
+import { utils } from './utils';
+
import {
BlockWithoutTransactionDataRPC,
BlockWithTransactionDataRPC,
@@ -29,30 +31,26 @@ export const marshaller = {
): BlockWithoutTransactionData {
const block = {
...blockWithHexValues,
- gasLimit: formatUtils.convertHexToNumber(blockWithHexValues.gasLimit),
- gasUsed: formatUtils.convertHexToNumber(blockWithHexValues.gasUsed),
- size: formatUtils.convertHexToNumber(blockWithHexValues.size),
- timestamp: formatUtils.convertHexToNumber(blockWithHexValues.timestamp),
- number: _.isNull(blockWithHexValues.number)
- ? null
- : formatUtils.convertHexToNumber(blockWithHexValues.number),
- difficulty: formatUtils.convertAmountToBigNumber(blockWithHexValues.difficulty),
- totalDifficulty: formatUtils.convertAmountToBigNumber(blockWithHexValues.totalDifficulty),
+ gasLimit: utils.convertHexToNumber(blockWithHexValues.gasLimit),
+ gasUsed: utils.convertHexToNumber(blockWithHexValues.gasUsed),
+ size: utils.convertHexToNumber(blockWithHexValues.size),
+ timestamp: utils.convertHexToNumber(blockWithHexValues.timestamp),
+ number: _.isNull(blockWithHexValues.number) ? null : utils.convertHexToNumber(blockWithHexValues.number),
+ difficulty: utils.convertAmountToBigNumber(blockWithHexValues.difficulty),
+ totalDifficulty: utils.convertAmountToBigNumber(blockWithHexValues.totalDifficulty),
};
return block;
},
unmarshalIntoBlockWithTransactionData(blockWithHexValues: BlockWithTransactionDataRPC): BlockWithTransactionData {
const block = {
...blockWithHexValues,
- gasLimit: formatUtils.convertHexToNumber(blockWithHexValues.gasLimit),
- gasUsed: formatUtils.convertHexToNumber(blockWithHexValues.gasUsed),
- size: formatUtils.convertHexToNumber(blockWithHexValues.size),
- timestamp: formatUtils.convertHexToNumber(blockWithHexValues.timestamp),
- number: _.isNull(blockWithHexValues.number)
- ? null
- : formatUtils.convertHexToNumber(blockWithHexValues.number),
- difficulty: formatUtils.convertAmountToBigNumber(blockWithHexValues.difficulty),
- totalDifficulty: formatUtils.convertAmountToBigNumber(blockWithHexValues.totalDifficulty),
+ gasLimit: utils.convertHexToNumber(blockWithHexValues.gasLimit),
+ gasUsed: utils.convertHexToNumber(blockWithHexValues.gasUsed),
+ size: utils.convertHexToNumber(blockWithHexValues.size),
+ timestamp: utils.convertHexToNumber(blockWithHexValues.timestamp),
+ number: _.isNull(blockWithHexValues.number) ? null : utils.convertHexToNumber(blockWithHexValues.number),
+ difficulty: utils.convertAmountToBigNumber(blockWithHexValues.difficulty),
+ totalDifficulty: utils.convertAmountToBigNumber(blockWithHexValues.totalDifficulty),
transactions: [] as Transaction[],
};
block.transactions = _.map(blockWithHexValues.transactions, (tx: TransactionRPC) => {
@@ -64,14 +62,14 @@ export const marshaller = {
unmarshalTransaction(txRpc: TransactionRPC): Transaction {
const tx = {
...txRpc,
- blockNumber: !_.isNull(txRpc.blockNumber) ? formatUtils.convertHexToNumber(txRpc.blockNumber) : null,
+ blockNumber: !_.isNull(txRpc.blockNumber) ? utils.convertHexToNumber(txRpc.blockNumber) : null,
transactionIndex: !_.isNull(txRpc.transactionIndex)
- ? formatUtils.convertHexToNumber(txRpc.transactionIndex)
+ ? utils.convertHexToNumber(txRpc.transactionIndex)
: null,
- nonce: formatUtils.convertHexToNumber(txRpc.nonce),
- gas: formatUtils.convertHexToNumber(txRpc.gas),
- gasPrice: formatUtils.convertAmountToBigNumber(txRpc.gasPrice),
- value: formatUtils.convertAmountToBigNumber(txRpc.value),
+ nonce: utils.convertHexToNumber(txRpc.nonce),
+ gas: utils.convertHexToNumber(txRpc.gas),
+ gasPrice: utils.convertAmountToBigNumber(txRpc.gasPrice),
+ value: utils.convertAmountToBigNumber(txRpc.value),
};
return tx;
},
@@ -81,12 +79,10 @@ export const marshaller = {
}
const txData = {
...txDataRpc,
- value: !_.isUndefined(txDataRpc.value) ? formatUtils.convertHexToNumber(txDataRpc.value) : undefined,
- gas: !_.isUndefined(txDataRpc.gas) ? formatUtils.convertHexToNumber(txDataRpc.gas) : undefined,
- gasPrice: !_.isUndefined(txDataRpc.gasPrice)
- ? formatUtils.convertHexToNumber(txDataRpc.gasPrice)
- : undefined,
- nonce: !_.isUndefined(txDataRpc.nonce) ? formatUtils.convertHexToNumber(txDataRpc.nonce) : undefined,
+ value: !_.isUndefined(txDataRpc.value) ? utils.convertHexToNumber(txDataRpc.value) : undefined,
+ gas: !_.isUndefined(txDataRpc.gas) ? utils.convertHexToNumber(txDataRpc.gas) : undefined,
+ gasPrice: !_.isUndefined(txDataRpc.gasPrice) ? utils.convertHexToNumber(txDataRpc.gasPrice) : undefined,
+ nonce: !_.isUndefined(txDataRpc.nonce) ? utils.convertHexToNumber(txDataRpc.nonce) : undefined,
};
return txData;
},
@@ -133,15 +129,15 @@ export const marshaller = {
if (_.isUndefined(blockParam)) {
return BlockParamLiteral.Latest;
}
- const encodedBlockParam = _.isNumber(blockParam) ? formatUtils.numberToHex(blockParam) : blockParam;
+ const encodedBlockParam = _.isNumber(blockParam) ? utils.numberToHex(blockParam) : blockParam;
return encodedBlockParam;
},
unmarshalLog(rawLog: RawLogEntry): LogEntry {
const formattedLog = {
...rawLog,
- logIndex: formatUtils.convertHexToNumberOrNull(rawLog.logIndex),
- blockNumber: formatUtils.convertHexToNumberOrNull(rawLog.blockNumber),
- transactionIndex: formatUtils.convertHexToNumberOrNull(rawLog.transactionIndex),
+ logIndex: utils.convertHexToNumberOrNull(rawLog.logIndex),
+ blockNumber: utils.convertHexToNumberOrNull(rawLog.blockNumber),
+ transactionIndex: utils.convertHexToNumberOrNull(rawLog.transactionIndex),
};
return formattedLog;
},
@@ -151,16 +147,14 @@ export const marshaller = {
to: _.isUndefined(callTxDataBase.to) ? undefined : this.marshalAddress(callTxDataBase.to),
gasPrice: _.isUndefined(callTxDataBase.gasPrice)
? undefined
- : formatUtils.encodeAmountAsHexString(callTxDataBase.gasPrice),
- gas: _.isUndefined(callTxDataBase.gas)
- ? undefined
- : formatUtils.encodeAmountAsHexString(callTxDataBase.gas),
+ : utils.encodeAmountAsHexString(callTxDataBase.gasPrice),
+ gas: _.isUndefined(callTxDataBase.gas) ? undefined : utils.encodeAmountAsHexString(callTxDataBase.gas),
value: _.isUndefined(callTxDataBase.value)
? undefined
- : formatUtils.encodeAmountAsHexString(callTxDataBase.value),
+ : utils.encodeAmountAsHexString(callTxDataBase.value),
nonce: _.isUndefined(callTxDataBase.nonce)
? undefined
- : formatUtils.encodeAmountAsHexString(callTxDataBase.nonce),
+ : utils.encodeAmountAsHexString(callTxDataBase.nonce),
};
return callTxDataBaseRPC;