1 files changed, 0 insertions, 230 deletions
diff --git a/packages/web3-wrapper/src/marshaller.ts b/packages/web3-wrapper/src/marshaller.ts
deleted file mode 100644
index 4230f8eab..000000000
--- a/packages/web3-wrapper/src/marshaller.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import { addressUtils } from '@0x/utils';
-import {
-    BlockParam,
-    BlockParamLiteral,
-    BlockWithoutTransactionData,
-    BlockWithTransactionData,
-    CallData,
-    CallTxDataBase,
-    LogEntry,
-    RawLogEntry,
-    Transaction,
-    TransactionReceipt,
-    TxData,
-} from 'ethereum-types';
-import ethUtil = require('ethereumjs-util');
-import * as _ from 'lodash';
-
-import { utils } from './utils';
-
-import {
-    BlockWithoutTransactionDataRPC,
-    BlockWithTransactionDataRPC,
-    CallDataRPC,
-    CallTxDataBaseRPC,
-    TransactionReceiptRPC,
-    TransactionRPC,
-    TxDataRPC,
-} from './types';
-
-/**
- * Utils to convert ethereum structures from user-space format to RPC format. (marshall/unmarshall)
- */
-export const marshaller = {
-    /**
-     * Unmarshall block without transaction data
-     * @param blockWithHexValues block to unmarshall
-     * @return unmarshalled block without transaction data
-     */
-    unmarshalIntoBlockWithoutTransactionData(
-        blockWithHexValues: BlockWithoutTransactionDataRPC,
-    ): BlockWithoutTransactionData {
-        const block = {
-            ...blockWithHexValues,
-            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;
-    },
-    /**
-     * Unmarshall block with transaction data
-     * @param blockWithHexValues block to unmarshall
-     * @return unmarshalled block with transaction data
-     */
-    unmarshalIntoBlockWithTransactionData(blockWithHexValues: BlockWithTransactionDataRPC): BlockWithTransactionData {
-        const block = {
-            ...blockWithHexValues,
-            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) => {
-            const transaction = marshaller.unmarshalTransaction(tx);
-            return transaction;
-        });
-        return block;
-    },
-    /**
-     * Unmarshall transaction
-     * @param txRpc transaction to unmarshall
-     * @return unmarshalled transaction
-     */
-    unmarshalTransaction(txRpc: TransactionRPC): Transaction {
-        const tx = {
-            ...txRpc,
-            blockNumber: !_.isNull(txRpc.blockNumber) ? utils.convertHexToNumber(txRpc.blockNumber) : null,
-            transactionIndex: !_.isNull(txRpc.transactionIndex)
-                ? utils.convertHexToNumber(txRpc.transactionIndex)
-                : null,
-            nonce: utils.convertHexToNumber(txRpc.nonce),
-            gas: utils.convertHexToNumber(txRpc.gas),
-            gasPrice: utils.convertAmountToBigNumber(txRpc.gasPrice),
-            value: utils.convertAmountToBigNumber(txRpc.value),
-        };
-        return tx;
-    },
-    /**
-     * Unmarshall transaction receipt
-     * @param txReceiptRpc transaction receipt to unmarshall
-     * @return unmarshalled transaction receipt
-     */
-    unmarshalTransactionReceipt(txReceiptRpc: TransactionReceiptRPC): TransactionReceipt {
-        const txReceipt = {
-            ...txReceiptRpc,
-            blockNumber: utils.convertHexToNumber(txReceiptRpc.blockNumber),
-            transactionIndex: utils.convertHexToNumber(txReceiptRpc.transactionIndex),
-            cumulativeGasUsed: utils.convertHexToNumber(txReceiptRpc.cumulativeGasUsed),
-            gasUsed: utils.convertHexToNumber(txReceiptRpc.gasUsed),
-            logs: _.map(txReceiptRpc.logs, marshaller.unmarshalLog.bind(marshaller)),
-        };
-        return txReceipt;
-    },
-    /**
-     * Unmarshall transaction data
-     * @param txDataRpc transaction data to unmarshall
-     * @return unmarshalled transaction data
-     */
-    unmarshalTxData(txDataRpc: TxDataRPC): TxData {
-        if (_.isUndefined(txDataRpc.from)) {
-            throw new Error(`txData must include valid 'from' value.`);
-        }
-        const txData = {
-            ...txDataRpc,
-            value: !_.isUndefined(txDataRpc.value) ? utils.convertAmountToBigNumber(txDataRpc.value) : undefined,
-            gas: !_.isUndefined(txDataRpc.gas) ? utils.convertHexToNumber(txDataRpc.gas) : undefined,
-            gasPrice: !_.isUndefined(txDataRpc.gasPrice)
-                ? utils.convertAmountToBigNumber(txDataRpc.gasPrice)
-                : undefined,
-            nonce: !_.isUndefined(txDataRpc.nonce) ? utils.convertHexToNumber(txDataRpc.nonce) : undefined,
-        };
-        return txData;
-    },
-    /**
-     * Marshall transaction data
-     * @param txData transaction data to marshall
-     * @return marshalled transaction data
-     */
-    marshalTxData(txData: Partial<TxData>): Partial<TxDataRPC> {
-        if (_.isUndefined(txData.from)) {
-            throw new Error(`txData must include valid 'from' value.`);
-        }
-        const callTxDataBase = {
-            ...txData,
-        };
-        delete callTxDataBase.from;
-        const callTxDataBaseRPC = marshaller._marshalCallTxDataBase(callTxDataBase);
-        const txDataRPC = {
-            ...callTxDataBaseRPC,
-            from: marshaller.marshalAddress(txData.from),
-        };
-        const prunableIfUndefined = ['gasPrice', 'gas', 'value', 'nonce'];
-        _.each(txDataRPC, (value: any, key: string) => {
-            if (_.isUndefined(value) && _.includes(prunableIfUndefined, key)) {
-                delete (txDataRPC as any)[key];
-            }
-        });
-        return txDataRPC;
-    },
-    /**
-     * Marshall call data
-     * @param callData call data to marshall
-     * @return marshalled call data
-     */
-    marshalCallData(callData: Partial<CallData>): Partial<CallDataRPC> {
-        const callTxDataBase = {
-            ...callData,
-        };
-        delete callTxDataBase.from;
-        const callTxDataBaseRPC = marshaller._marshalCallTxDataBase(callTxDataBase);
-        const callDataRPC = {
-            ...callTxDataBaseRPC,
-            from: _.isUndefined(callData.from) ? undefined : marshaller.marshalAddress(callData.from),
-        };
-        return callDataRPC;
-    },
-    /**
-     * Marshall address
-     * @param address address to marshall
-     * @return marshalled address
-     */
-    marshalAddress(address: string): string {
-        if (addressUtils.isAddress(address)) {
-            return ethUtil.addHexPrefix(address);
-        }
-        throw new Error(`Invalid address encountered: ${address}`);
-    },
-    /**
-     * Marshall block param
-     * @param blockParam block param to marshall
-     * @return marshalled block param
-     */
-    marshalBlockParam(blockParam: BlockParam | string | number | undefined): string | undefined {
-        if (_.isUndefined(blockParam)) {
-            return BlockParamLiteral.Latest;
-        }
-        const encodedBlockParam = _.isNumber(blockParam) ? utils.numberToHex(blockParam) : blockParam;
-        return encodedBlockParam;
-    },
-    /**
-     * Unmarshall log
-     * @param rawLog log to unmarshall
-     * @return unmarshalled log
-     */
-    unmarshalLog(rawLog: RawLogEntry): LogEntry {
-        const formattedLog = {
-            ...rawLog,
-            logIndex: utils.convertHexToNumberOrNull(rawLog.logIndex),
-            blockNumber: utils.convertHexToNumberOrNull(rawLog.blockNumber),
-            transactionIndex: utils.convertHexToNumberOrNull(rawLog.transactionIndex),
-        };
-        return formattedLog;
-    },
-    _marshalCallTxDataBase(callTxDataBase: Partial<CallTxDataBase>): Partial<CallTxDataBaseRPC> {
-        const callTxDataBaseRPC = {
-            ...callTxDataBase,
-            to: _.isUndefined(callTxDataBase.to) ? undefined : marshaller.marshalAddress(callTxDataBase.to),
-            gasPrice: _.isUndefined(callTxDataBase.gasPrice)
-                ? undefined
-                : utils.encodeAmountAsHexString(callTxDataBase.gasPrice),
-            gas: _.isUndefined(callTxDataBase.gas) ? undefined : utils.encodeAmountAsHexString(callTxDataBase.gas),
-            value: _.isUndefined(callTxDataBase.value)
-                ? undefined
-                : utils.encodeAmountAsHexString(callTxDataBase.value),
-            nonce: _.isUndefined(callTxDataBase.nonce)
-                ? undefined
-                : utils.encodeAmountAsHexString(callTxDataBase.nonce),
-        };
-
-        return callTxDataBaseRPC;
-    },
-};