Update to use ContractWrappers + Infura instead of Etherscan

12 files changed, 97 insertions, 648 deletions

diff --git a/packages/pipeline/src/data_sources/etherscan/index.ts b/packages/pipeline/src/data_sources/etherscan/index.ts
deleted file mode 100644
index 044fff02e..000000000
--- a/packages/pipeline/src/data_sources/etherscan/index.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { default as axios } from 'axios';
-import { BlockParam, BlockParamLiteral } from 'ethereum-types';
-
-const ETHERSCAN_URL = 'https://api.etherscan.io/api';
-
-export class Etherscan {
-    private readonly _apiKey: string;
-    constructor(apiKey: string) {
-        this._apiKey = apiKey;
-    }
-
-    /**
-     * Gets the raw events for a specific contract and block range.
-     * @param contractAddress  The address of the contract to get the events for.
-     * @param fromBlock The start of the block range to get events for (inclusive).
-     * @param toBlock The end of the block range to get events for (inclusive).
-     * @returns A list of decoded events.
-     */
-    public async getContractEventsAsync(
-        contractAddress: string,
-        fromBlock: BlockParam = BlockParamLiteral.Earliest,
-        toBlock: BlockParam = BlockParamLiteral.Latest,
-    ): Promise<EventsResponse> {
-        const fullURL = `${ETHERSCAN_URL}?module=logs&action=getLogs&address=${contractAddress}&fromBlock=${fromBlock}&toBlock=${toBlock}&apikey=${
-            this._apiKey
-        }`;
-        const resp = await axios.get<EventsResponse>(fullURL);
-        // TODO(albrow): Check response code.
-        return resp.data;
-    }
-}
-
-// Raw events response from etherescan.io
-export interface EventsResponse {
-    status: string;
-    message: string;
-    result: EventsResponseResult[];
-}
-
-// Events as represented in the response from etherscan.io
-export interface EventsResponseResult {
-    address: string;
-    topics: string[];
-    data: string;
-    blockNumber: string;
-    timeStamp: string;
-    gasPrice: string;
-    gasUsed: string;
-    logIndex: string;
-    transactionHash: string;
-    transactionIndex: string;
-}
diff --git a/packages/pipeline/src/data_types/events/event_utils.ts b/packages/pipeline/src/data_types/events/event_utils.ts
deleted file mode 100644
index 6be964807..000000000
--- a/packages/pipeline/src/data_types/events/event_utils.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { AbiDecoder } from '@0xproject/utils';
-import { AbiDefinition, LogEntry, LogWithDecodedArgs } from 'ethereum-types';
-
-import { EventsResponseResult } from '../../data_sources/etherscan';
-
-const hexRadix = 16;
-
-function hexToInt(hex: string): number {
-    return parseInt(hex.replace('0x', ''), hexRadix);
-}
-
-// Converts a raw event response to a LogEntry
-export function convertResponseToLogEntry(result: EventsResponseResult): LogEntry {
-    return {
-        logIndex: hexToInt(result.logIndex),
-        transactionIndex: hexToInt(result.transactionIndex),
-        transactionHash: result.transactionHash,
-        blockHash: '',
-        blockNumber: hexToInt(result.blockNumber),
-        address: result.address,
-        data: result.data,
-        topics: result.topics,
-    };
-}
-
-// Decodes a LogEntry into a LogWithDecodedArgs
-export function decodeLogEntry<EventArgsType>(
-    contractAbi: AbiDefinition[],
-    log: LogEntry,
-): LogWithDecodedArgs<EventArgsType> {
-    const abiDecoder = new AbiDecoder([contractAbi]);
-    const logWithDecodedArgs = abiDecoder.tryToDecodeLogOrNoop<EventArgsType>(log);
-    // tslint:disable-next-line:no-unnecessary-type-assertion
-    return logWithDecodedArgs as LogWithDecodedArgs<EventArgsType>;
-}
diff --git a/packages/pipeline/src/data_types/events/exchange_events.ts b/packages/pipeline/src/data_types/events/exchange_events.ts
deleted file mode 100644
index 30ef058f3..000000000
--- a/packages/pipeline/src/data_types/events/exchange_events.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { Exchange } from '@0xproject/contract-artifacts';
-import {
-    ExchangeCancelEventArgs,
-    ExchangeCancelUpToEventArgs,
-    ExchangeEventArgs,
-    ExchangeFillEventArgs,
-} from '@0xproject/contract-wrappers';
-import { assetDataUtils } from '@0xproject/order-utils';
-import { AssetProxyId, ERC721AssetData } from '@0xproject/types';
-import { LogWithDecodedArgs } from 'ethereum-types';
-import * as R from 'ramda';
-
-import { EventsResponse } from '../../data_sources/etherscan';
-import { ExchangeCancelEvent } from '../../entities/ExchangeCancelEvent';
-import { ExchangeCancelUpToEvent } from '../../entities/ExchangeCancelUpToEvent';
-import { ExchangeFillEvent } from '../../entities/ExchangeFillEvent';
-import { bigNumbertoStringOrNull } from '../../utils';
-
-import { convertResponseToLogEntry, decodeLogEntry } from './event_utils';
-
-export type ExchangeEventEntity = ExchangeFillEvent | ExchangeCancelEvent | ExchangeCancelUpToEvent;
-
-export function parseExchangeEvents(rawEventsResponse: EventsResponse): ExchangeEventEntity[] {
-    const logEntries = R.map(convertResponseToLogEntry, rawEventsResponse.result);
-    const decodedLogEntries = R.map(
-        eventResponse => decodeLogEntry<ExchangeEventArgs>(Exchange.compilerOutput.abi, eventResponse),
-        logEntries,
-    );
-    const filteredLogEntries = R.filter(shouldIncludeLogEntry, decodedLogEntries);
-    return R.map(_convertToEntity, filteredLogEntries);
-}
-
-export function shouldIncludeLogEntry(logEntry: LogWithDecodedArgs<ExchangeEventArgs>): boolean {
-    if (!R.contains(logEntry.event, ['Fill', 'Cancel', 'CancelUpTo'])) {
-        return false;
-    } else if (logEntry.logIndex == null || isNaN(logEntry.logIndex)) {
-        return false;
-    }
-    return true;
-}
-
-export function _convertToEntity(eventLog: LogWithDecodedArgs<ExchangeEventArgs>): ExchangeEventEntity {
-    switch (eventLog.event) {
-        case 'Fill':
-            return _convertToExchangeFillEvent(eventLog as LogWithDecodedArgs<ExchangeFillEventArgs>);
-        case 'Cancel':
-            return _convertToExchangeCancelEvent(eventLog as LogWithDecodedArgs<ExchangeCancelEventArgs>);
-        case 'CancelUpTo':
-            return _convertToExchangeCancelUpToEvent(eventLog as LogWithDecodedArgs<ExchangeCancelUpToEventArgs>);
-        default:
-            throw new Error('unexpected eventLog.event type: ' + eventLog.event);
-    }
-}
-
-export function _convertToExchangeFillEvent(eventLog: LogWithDecodedArgs<ExchangeFillEventArgs>): ExchangeFillEvent {
-    const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.makerAssetData);
-    const makerAssetType = makerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
-    const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.takerAssetData);
-    const takerAssetType = takerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
-    const exchangeFillEvent = new ExchangeFillEvent();
-    exchangeFillEvent.contractAddress = eventLog.address as string;
-    exchangeFillEvent.blockNumber = eventLog.blockNumber as number;
-    exchangeFillEvent.logIndex = eventLog.logIndex as number;
-    exchangeFillEvent.rawData = eventLog.data as string;
-    exchangeFillEvent.makerAddress = eventLog.args.makerAddress.toString();
-    exchangeFillEvent.takerAddress = eventLog.args.takerAddress.toString();
-    exchangeFillEvent.feeRecepientAddress = eventLog.args.feeRecipientAddress;
-    exchangeFillEvent.senderAddress = eventLog.args.senderAddress;
-    exchangeFillEvent.makerAssetFilledAmount = eventLog.args.makerAssetFilledAmount.toString();
-    exchangeFillEvent.takerAssetFilledAmount = eventLog.args.takerAssetFilledAmount.toString();
-    exchangeFillEvent.makerFeePaid = eventLog.args.makerFeePaid.toString();
-    exchangeFillEvent.takerFeePaid = eventLog.args.takerFeePaid.toString();
-    exchangeFillEvent.orderHash = eventLog.args.orderHash;
-    exchangeFillEvent.rawMakerAssetData = eventLog.args.makerAssetData;
-    exchangeFillEvent.makerAssetType = makerAssetType;
-    exchangeFillEvent.makerAssetProxyId = makerAssetData.assetProxyId;
-    exchangeFillEvent.makerTokenAddress = makerAssetData.tokenAddress;
-    exchangeFillEvent.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
-    exchangeFillEvent.rawTakerAssetData = eventLog.args.takerAssetData;
-    exchangeFillEvent.takerAssetType = takerAssetType;
-    exchangeFillEvent.takerAssetProxyId = takerAssetData.assetProxyId;
-    exchangeFillEvent.takerTokenAddress = takerAssetData.tokenAddress;
-    exchangeFillEvent.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
-    return exchangeFillEvent;
-}
-
-export function _convertToExchangeCancelEvent(
-    eventLog: LogWithDecodedArgs<ExchangeCancelEventArgs>,
-): ExchangeCancelEvent {
-    const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.makerAssetData);
-    const makerAssetType = makerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
-    const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.takerAssetData);
-    const takerAssetType = takerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
-    const exchangeCancelEvent = new ExchangeCancelEvent();
-    exchangeCancelEvent.contractAddress = eventLog.address as string;
-    exchangeCancelEvent.blockNumber = eventLog.blockNumber as number;
-    exchangeCancelEvent.logIndex = eventLog.logIndex as number;
-    exchangeCancelEvent.rawData = eventLog.data as string;
-    exchangeCancelEvent.makerAddress = eventLog.args.makerAddress.toString();
-    exchangeCancelEvent.takerAddress =
-        eventLog.args.takerAddress == null ? null : eventLog.args.takerAddress.toString();
-    exchangeCancelEvent.feeRecepientAddress = eventLog.args.feeRecipientAddress;
-    exchangeCancelEvent.senderAddress = eventLog.args.senderAddress;
-    exchangeCancelEvent.orderHash = eventLog.args.orderHash;
-    exchangeCancelEvent.rawMakerAssetData = eventLog.args.makerAssetData;
-    exchangeCancelEvent.makerAssetType = makerAssetType;
-    exchangeCancelEvent.makerAssetProxyId = makerAssetData.assetProxyId;
-    exchangeCancelEvent.makerTokenAddress = makerAssetData.tokenAddress;
-    exchangeCancelEvent.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
-    exchangeCancelEvent.rawTakerAssetData = eventLog.args.takerAssetData;
-    exchangeCancelEvent.takerAssetType = takerAssetType;
-    exchangeCancelEvent.takerAssetProxyId = takerAssetData.assetProxyId;
-    exchangeCancelEvent.takerTokenAddress = takerAssetData.tokenAddress;
-    exchangeCancelEvent.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
-    return exchangeCancelEvent;
-}
-
-export function _convertToExchangeCancelUpToEvent(
-    eventLog: LogWithDecodedArgs<ExchangeCancelUpToEventArgs>,
-): ExchangeCancelUpToEvent {
-    const exchangeCancelUpToEvent = new ExchangeCancelUpToEvent();
-    exchangeCancelUpToEvent.contractAddress = eventLog.address as string;
-    exchangeCancelUpToEvent.blockNumber = eventLog.blockNumber as number;
-    exchangeCancelUpToEvent.logIndex = eventLog.logIndex as number;
-    exchangeCancelUpToEvent.rawData = eventLog.data as string;
-    exchangeCancelUpToEvent.makerAddress = eventLog.args.makerAddress.toString();
-    exchangeCancelUpToEvent.senderAddress = eventLog.args.senderAddress.toString();
-    exchangeCancelUpToEvent.orderEpoch = eventLog.args.orderEpoch.toString();
-    return exchangeCancelUpToEvent;
-}
diff --git a/packages/pipeline/src/data_types/sra_orders/index.ts b/packages/pipeline/src/data_types/sra_orders/index.ts
deleted file mode 100644
index fb2b74dfe..000000000
--- a/packages/pipeline/src/data_types/sra_orders/index.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { APIOrder, OrdersResponse } from '@0xproject/connect';
-import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils';
-import { AssetProxyId, ERC721AssetData } from '@0xproject/types';
-import * as R from 'ramda';
-
-import { SraOrder } from '../../entities/SraOrder';
-import { bigNumbertoStringOrNull } from '../../utils';
-
-export function parseSraOrders(rawOrdersResponse: OrdersResponse): SraOrder[] {
-    return R.map(_convertToEntity, rawOrdersResponse.records);
-}
-
-export function _convertToEntity(apiOrder: APIOrder): SraOrder {
-    // TODO(albrow): refactor out common asset data decoding code.
-    const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(apiOrder.order.makerAssetData);
-    const makerAssetType = makerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
-    const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(apiOrder.order.takerAssetData);
-    const takerAssetType = takerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
-
-    const sraOrder = new SraOrder();
-    sraOrder.exchangeAddress = apiOrder.order.exchangeAddress;
-    sraOrder.orderHashHex = orderHashUtils.getOrderHashHex(apiOrder.order);
-
-    // TODO(albrow): Set these fields to the correct values upstack.
-    sraOrder.lastUpdatedTimestamp = 0;
-    sraOrder.firstSeenTimestamp = 0;
-
-    sraOrder.makerAddress = apiOrder.order.makerAddress;
-    sraOrder.takerAddress = apiOrder.order.takerAddress;
-    sraOrder.feeRecipientAddress = apiOrder.order.feeRecipientAddress;
-    sraOrder.senderAddress = apiOrder.order.senderAddress;
-    sraOrder.makerAssetAmount = apiOrder.order.makerAssetAmount.toString();
-    sraOrder.takerAssetAmount = apiOrder.order.takerAssetAmount.toString();
-    sraOrder.makerFee = apiOrder.order.makerFee.toString();
-    sraOrder.takerFee = apiOrder.order.takerFee.toString();
-    sraOrder.expirationTimeSeconds = apiOrder.order.expirationTimeSeconds.toString();
-    sraOrder.salt = apiOrder.order.salt.toString();
-    sraOrder.signature = apiOrder.order.signature;
-
-    sraOrder.rawMakerAssetData = apiOrder.order.makerAssetData;
-    sraOrder.makerAssetType = makerAssetType;
-    sraOrder.makerAssetProxyId = makerAssetData.assetProxyId;
-    sraOrder.makerTokenAddress = makerAssetData.tokenAddress;
-    sraOrder.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
-    sraOrder.rawTakerAssetData = apiOrder.order.takerAssetData;
-    sraOrder.takerAssetType = takerAssetType;
-    sraOrder.takerAssetProxyId = takerAssetData.assetProxyId;
-    sraOrder.takerTokenAddress = takerAssetData.tokenAddress;
-    sraOrder.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
-
-    sraOrder.metaDataJson = JSON.stringify(apiOrder.metaData);
-
-    return sraOrder;
-}
diff --git a/packages/pipeline/src/index.ts b/packages/pipeline/src/index.ts
index a1dbb35ff..77c92cc34 100644
--- a/packages/pipeline/src/index.ts
+++ b/packages/pipeline/src/index.ts
@@ -1,52 +1,43 @@
 import { HttpClient } from '@0xproject/connect';
+import { web3Factory } from '@0xproject/dev-utils';
 import 'reflect-metadata';
 import { Connection, createConnection } from 'typeorm';
 
-import { Etherscan } from './data_sources/etherscan';
-import { parseExchangeEvents } from './data_types/events/exchange_events';
-import { parseSraOrders } from './data_types/sra_orders';
-import { ExchangeCancelEvent } from './entities/ExchangeCancelEvent';
-import { ExchangeCancelUpToEvent } from './entities/ExchangeCancelUpToEvent';
-import { ExchangeFillEvent } from './entities/ExchangeFillEvent';
+import { ExchangeEventsSource } from './data_sources/contract-wrappers/exchange_events';
 import { SraOrder } from './entities/SraOrder';
 import { config } from './ormconfig';
-
-const etherscan = new Etherscan(process.env.ETHERSCAN_API_KEY as string);
-const EXCHANGE_ADDRESS = '0x4f833a24e1f95d70f028921e27040ca56e09ab0b';
+import { parseExchangeEvents } from './parsers/events';
+import { parseSraOrders } from './parsers/sra_orders';
 
 let connection: Connection;
 
 (async () => {
     connection = await createConnection(config);
     await getExchangeEventsAsync();
-    await getSraOrdersAsync();
+    // await getSraOrdersAsync();
 })();
 
+// TODO(albrow): Separately: Errors do not appear to be handled correctly. If you use the
+// wrong rpcUrl it just returns early with no error.
 async function getExchangeEventsAsync(): Promise<void> {
-    const fillRepository = connection.getRepository(ExchangeFillEvent);
-    const cancelRepository = connection.getRepository(ExchangeCancelEvent);
-    const cancelUpToRepository = connection.getRepository(ExchangeCancelUpToEvent);
-    console.log(
-        `found ${(await fillRepository.count()) +
-            (await cancelRepository.count()) +
-            (await cancelUpToRepository.count())} existing events`,
-    );
-    const rawEvents = await etherscan.getContractEventsAsync(EXCHANGE_ADDRESS);
-    const events = parseExchangeEvents(rawEvents);
+    const provider = web3Factory.getRpcProvider({
+        rpcUrl: 'https://mainnet.infura.io',
+    });
+    const exchangeEvents = new ExchangeEventsSource(provider, 1);
+    const eventLogs = await exchangeEvents.getFillEventsAsync();
+    const events = parseExchangeEvents(eventLogs);
+    console.log('Got events: ' + events.length);
     for (const event of events) {
         await event.save();
     }
-    console.log(
-        `now there are ${(await fillRepository.count()) +
-            (await cancelRepository.count()) +
-            (await cancelUpToRepository.count())} total events`,
-    );
+    console.log('Saved events.');
+    console.log('Exiting process');
+    process.exit(0);
 }
 
 async function getSraOrdersAsync(): Promise<void> {
     const orderRepository = connection.getRepository(SraOrder);
     console.log(`found ${await orderRepository.count()} existing orders`);
-
     const sraUrl = 'https://api.radarrelay.com/0x/v2';
     const connect = new HttpClient(sraUrl);
     const rawOrders = await connect.getOrdersAsync();
diff --git a/packages/pipeline/src/parsers/events/index.ts b/packages/pipeline/src/parsers/events/index.ts
index e18106c75..66f382dda 100644
--- a/packages/pipeline/src/parsers/events/index.ts
+++ b/packages/pipeline/src/parsers/events/index.ts
@@ -1,43 +1,38 @@
-import { ExchangeCancelEventArgs, ExchangeCancelUpToEventArgs, ExchangeFillEventArgs } from '@0x/contract-wrappers';
-import { assetDataUtils } from '@0x/order-utils';
-import { AssetProxyId, ERC721AssetData } from '@0x/types';
+import {
+    ExchangeCancelEventArgs,
+    ExchangeCancelUpToEventArgs,
+    ExchangeEventArgs,
+    ExchangeFillEventArgs,
+} from '@0xproject/contract-wrappers';
+import { assetDataUtils } from '@0xproject/order-utils';
+import { AssetProxyId, ERC721AssetData } from '@0xproject/types';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import * as R from 'ramda';
 
-import { ExchangeCancelEvent, ExchangeCancelUpToEvent, ExchangeFillEvent } from '../../entities';
+import { ExchangeCancelEvent } from '../../entities/ExchangeCancelEvent';
+import { ExchangeCancelUpToEvent } from '../../entities/ExchangeCancelUpToEvent';
+import { ExchangeFillEvent } from '../../entities/ExchangeFillEvent';
 import { bigNumbertoStringOrNull } from '../../utils';
 
-/**
- * Parses raw event logs for a fill event and returns an array of
- * ExchangeFillEvent entities.
- * @param eventLogs Raw event logs (e.g. returned from contract-wrappers).
- */
-export const parseExchangeFillEvents: (
-    eventLogs: Array<LogWithDecodedArgs<ExchangeFillEventArgs>>,
-) => ExchangeFillEvent[] = R.map(_convertToExchangeFillEvent);
+export type ExchangeEventEntity = ExchangeFillEvent | ExchangeCancelEvent | ExchangeCancelUpToEvent;
 
-/**
- * Parses raw event logs for a cancel event and returns an array of
- * ExchangeCancelEvent entities.
- * @param eventLogs Raw event logs (e.g. returned from contract-wrappers).
- */
-export const parseExchangeCancelEvents: (
-    eventLogs: Array<LogWithDecodedArgs<ExchangeCancelEventArgs>>,
-) => ExchangeCancelEvent[] = R.map(_convertToExchangeCancelEvent);
+export const parseExchangeEvents: (
+    eventLogs: Array<LogWithDecodedArgs<ExchangeEventArgs>>,
+) => ExchangeEventEntity[] = R.map(_convertToEntity);
 
-/**
- * Parses raw event logs for a CancelUpTo event and returns an array of
- * ExchangeCancelUpToEvent entities.
- * @param eventLogs Raw event logs (e.g. returned from contract-wrappers).
- */
-export const parseExchangeCancelUpToEvents: (
-    eventLogs: Array<LogWithDecodedArgs<ExchangeCancelUpToEventArgs>>,
-) => ExchangeCancelUpToEvent[] = R.map(_convertToExchangeCancelUpToEvent);
+export function _convertToEntity(eventLog: LogWithDecodedArgs<ExchangeEventArgs>): ExchangeEventEntity {
+    switch (eventLog.event) {
+        case 'Fill':
+            return _convertToExchangeFillEvent(eventLog as LogWithDecodedArgs<ExchangeFillEventArgs>);
+        case 'Cancel':
+            return _convertToExchangeCancelEvent(eventLog as LogWithDecodedArgs<ExchangeCancelEventArgs>);
+        case 'CancelUpTo':
+            return _convertToExchangeCancelUpToEvent(eventLog as LogWithDecodedArgs<ExchangeCancelUpToEventArgs>);
+        default:
+            throw new Error('unexpected eventLog.event type: ' + eventLog.event);
+    }
+}
 
-/**
- * Converts a raw event log for a fill event into an ExchangeFillEvent entity.
- * @param eventLog Raw event log (e.g. returned from contract-wrappers).
- */
 export function _convertToExchangeFillEvent(eventLog: LogWithDecodedArgs<ExchangeFillEventArgs>): ExchangeFillEvent {
     const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.makerAssetData);
     const makerAssetType = makerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
@@ -48,37 +43,28 @@ export function _convertToExchangeFillEvent(eventLog: LogWithDecodedArgs<Exchang
     exchangeFillEvent.blockNumber = eventLog.blockNumber as number;
     exchangeFillEvent.logIndex = eventLog.logIndex as number;
     exchangeFillEvent.rawData = eventLog.data as string;
-    exchangeFillEvent.transactionHash = eventLog.transactionHash;
-    exchangeFillEvent.makerAddress = eventLog.args.makerAddress;
-    exchangeFillEvent.takerAddress = eventLog.args.takerAddress;
-    exchangeFillEvent.feeRecipientAddress = eventLog.args.feeRecipientAddress;
+    exchangeFillEvent.makerAddress = eventLog.args.makerAddress.toString();
+    exchangeFillEvent.takerAddress = eventLog.args.takerAddress.toString();
+    exchangeFillEvent.feeRecepientAddress = eventLog.args.feeRecipientAddress;
     exchangeFillEvent.senderAddress = eventLog.args.senderAddress;
-    exchangeFillEvent.makerAssetFilledAmount = eventLog.args.makerAssetFilledAmount;
-    exchangeFillEvent.takerAssetFilledAmount = eventLog.args.takerAssetFilledAmount;
-    exchangeFillEvent.makerFeePaid = eventLog.args.makerFeePaid;
-    exchangeFillEvent.takerFeePaid = eventLog.args.takerFeePaid;
+    exchangeFillEvent.makerAssetFilledAmount = eventLog.args.makerAssetFilledAmount.toString();
+    exchangeFillEvent.takerAssetFilledAmount = eventLog.args.takerAssetFilledAmount.toString();
+    exchangeFillEvent.makerFeePaid = eventLog.args.makerFeePaid.toString();
+    exchangeFillEvent.takerFeePaid = eventLog.args.takerFeePaid.toString();
     exchangeFillEvent.orderHash = eventLog.args.orderHash;
     exchangeFillEvent.rawMakerAssetData = eventLog.args.makerAssetData;
     exchangeFillEvent.makerAssetType = makerAssetType;
     exchangeFillEvent.makerAssetProxyId = makerAssetData.assetProxyId;
     exchangeFillEvent.makerTokenAddress = makerAssetData.tokenAddress;
-    // tslint has a false positive here. Type assertion is required.
-    // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeFillEvent.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
     exchangeFillEvent.rawTakerAssetData = eventLog.args.takerAssetData;
     exchangeFillEvent.takerAssetType = takerAssetType;
     exchangeFillEvent.takerAssetProxyId = takerAssetData.assetProxyId;
     exchangeFillEvent.takerTokenAddress = takerAssetData.tokenAddress;
-    // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeFillEvent.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
     return exchangeFillEvent;
 }
 
-/**
- * Converts a raw event log for a cancel event into an ExchangeCancelEvent
- * entity.
- * @param eventLog Raw event log (e.g. returned from contract-wrappers).
- */
 export function _convertToExchangeCancelEvent(
     eventLog: LogWithDecodedArgs<ExchangeCancelEventArgs>,
 ): ExchangeCancelEvent {
@@ -91,32 +77,25 @@ export function _convertToExchangeCancelEvent(
     exchangeCancelEvent.blockNumber = eventLog.blockNumber as number;
     exchangeCancelEvent.logIndex = eventLog.logIndex as number;
     exchangeCancelEvent.rawData = eventLog.data as string;
-    exchangeCancelEvent.transactionHash = eventLog.transactionHash;
-    exchangeCancelEvent.makerAddress = eventLog.args.makerAddress;
-    exchangeCancelEvent.takerAddress = eventLog.args.takerAddress;
-    exchangeCancelEvent.feeRecipientAddress = eventLog.args.feeRecipientAddress;
+    exchangeCancelEvent.makerAddress = eventLog.args.makerAddress.toString();
+    exchangeCancelEvent.takerAddress =
+        eventLog.args.takerAddress == null ? null : eventLog.args.takerAddress.toString();
+    exchangeCancelEvent.feeRecepientAddress = eventLog.args.feeRecipientAddress;
     exchangeCancelEvent.senderAddress = eventLog.args.senderAddress;
     exchangeCancelEvent.orderHash = eventLog.args.orderHash;
     exchangeCancelEvent.rawMakerAssetData = eventLog.args.makerAssetData;
     exchangeCancelEvent.makerAssetType = makerAssetType;
     exchangeCancelEvent.makerAssetProxyId = makerAssetData.assetProxyId;
     exchangeCancelEvent.makerTokenAddress = makerAssetData.tokenAddress;
-    // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeCancelEvent.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
     exchangeCancelEvent.rawTakerAssetData = eventLog.args.takerAssetData;
     exchangeCancelEvent.takerAssetType = takerAssetType;
     exchangeCancelEvent.takerAssetProxyId = takerAssetData.assetProxyId;
     exchangeCancelEvent.takerTokenAddress = takerAssetData.tokenAddress;
-    // tslint:disable-next-line:no-unnecessary-type-assertion
     exchangeCancelEvent.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
     return exchangeCancelEvent;
 }
 
-/**
- * Converts a raw event log for a cancelUpTo event into an
- * ExchangeCancelUpToEvent entity.
- * @param eventLog Raw event log (e.g. returned from contract-wrappers).
- */
 export function _convertToExchangeCancelUpToEvent(
     eventLog: LogWithDecodedArgs<ExchangeCancelUpToEventArgs>,
 ): ExchangeCancelUpToEvent {
@@ -125,9 +104,8 @@ export function _convertToExchangeCancelUpToEvent(
     exchangeCancelUpToEvent.blockNumber = eventLog.blockNumber as number;
     exchangeCancelUpToEvent.logIndex = eventLog.logIndex as number;
     exchangeCancelUpToEvent.rawData = eventLog.data as string;
-    exchangeCancelUpToEvent.transactionHash = eventLog.transactionHash;
-    exchangeCancelUpToEvent.makerAddress = eventLog.args.makerAddress;
-    exchangeCancelUpToEvent.senderAddress = eventLog.args.senderAddress;
-    exchangeCancelUpToEvent.orderEpoch = eventLog.args.orderEpoch;
+    exchangeCancelUpToEvent.makerAddress = eventLog.args.makerAddress.toString();
+    exchangeCancelUpToEvent.senderAddress = eventLog.args.senderAddress.toString();
+    exchangeCancelUpToEvent.orderEpoch = eventLog.args.orderEpoch.toString();
     return exchangeCancelUpToEvent;
 }
diff --git a/packages/pipeline/src/parsers/sra_orders/index.ts b/packages/pipeline/src/parsers/sra_orders/index.ts
index ef8901e40..fb2b74dfe 100644
--- a/packages/pipeline/src/parsers/sra_orders/index.ts
+++ b/packages/pipeline/src/parsers/sra_orders/index.ts
@@ -1,24 +1,15 @@
-import { APIOrder, OrdersResponse } from '@0x/connect';
-import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
-import { AssetProxyId, ERC721AssetData } from '@0x/types';
+import { APIOrder, OrdersResponse } from '@0xproject/connect';
+import { assetDataUtils, orderHashUtils } from '@0xproject/order-utils';
+import { AssetProxyId, ERC721AssetData } from '@0xproject/types';
 import * as R from 'ramda';
 
-import { SraOrder } from '../../entities';
+import { SraOrder } from '../../entities/SraOrder';
 import { bigNumbertoStringOrNull } from '../../utils';
 
-/**
- * Parses a raw order response from an SRA endpoint and returns an array of
- * SraOrder entities.
- * @param rawOrdersResponse A raw order response from an SRA endpoint.
- */
 export function parseSraOrders(rawOrdersResponse: OrdersResponse): SraOrder[] {
     return R.map(_convertToEntity, rawOrdersResponse.records);
 }
 
-/**
- * Converts a single APIOrder into an SraOrder entity.
- * @param apiOrder A single order from the response from an SRA endpoint.
- */
 export function _convertToEntity(apiOrder: APIOrder): SraOrder {
     // TODO(albrow): refactor out common asset data decoding code.
     const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(apiOrder.order.makerAssetData);
@@ -30,33 +21,34 @@ export function _convertToEntity(apiOrder: APIOrder): SraOrder {
     sraOrder.exchangeAddress = apiOrder.order.exchangeAddress;
     sraOrder.orderHashHex = orderHashUtils.getOrderHashHex(apiOrder.order);
 
+    // TODO(albrow): Set these fields to the correct values upstack.
+    sraOrder.lastUpdatedTimestamp = 0;
+    sraOrder.firstSeenTimestamp = 0;
+
     sraOrder.makerAddress = apiOrder.order.makerAddress;
     sraOrder.takerAddress = apiOrder.order.takerAddress;
     sraOrder.feeRecipientAddress = apiOrder.order.feeRecipientAddress;
     sraOrder.senderAddress = apiOrder.order.senderAddress;
-    sraOrder.makerAssetAmount = apiOrder.order.makerAssetAmount;
-    sraOrder.takerAssetAmount = apiOrder.order.takerAssetAmount;
-    sraOrder.makerFee = apiOrder.order.makerFee;
-    sraOrder.takerFee = apiOrder.order.takerFee;
-    sraOrder.expirationTimeSeconds = apiOrder.order.expirationTimeSeconds;
-    sraOrder.salt = apiOrder.order.salt;
+    sraOrder.makerAssetAmount = apiOrder.order.makerAssetAmount.toString();
+    sraOrder.takerAssetAmount = apiOrder.order.takerAssetAmount.toString();
+    sraOrder.makerFee = apiOrder.order.makerFee.toString();
+    sraOrder.takerFee = apiOrder.order.takerFee.toString();
+    sraOrder.expirationTimeSeconds = apiOrder.order.expirationTimeSeconds.toString();
+    sraOrder.salt = apiOrder.order.salt.toString();
     sraOrder.signature = apiOrder.order.signature;
 
     sraOrder.rawMakerAssetData = apiOrder.order.makerAssetData;
     sraOrder.makerAssetType = makerAssetType;
     sraOrder.makerAssetProxyId = makerAssetData.assetProxyId;
     sraOrder.makerTokenAddress = makerAssetData.tokenAddress;
-    // tslint has a false positive here. Type assertion is required.
-    // tslint:disable-next-line:no-unnecessary-type-assertion
     sraOrder.makerTokenId = bigNumbertoStringOrNull((makerAssetData as ERC721AssetData).tokenId);
     sraOrder.rawTakerAssetData = apiOrder.order.takerAssetData;
     sraOrder.takerAssetType = takerAssetType;
     sraOrder.takerAssetProxyId = takerAssetData.assetProxyId;
     sraOrder.takerTokenAddress = takerAssetData.tokenAddress;
-    // tslint:disable-next-line:no-unnecessary-type-assertion
     sraOrder.takerTokenId = bigNumbertoStringOrNull((takerAssetData as ERC721AssetData).tokenId);
 
-    sraOrder.metadataJson = JSON.stringify(apiOrder.metaData);
+    sraOrder.metaDataJson = JSON.stringify(apiOrder.metaData);
 
     return sraOrder;
 }
diff --git a/packages/pipeline/test/data_types/events/event_utils_test.ts b/packages/pipeline/test/data_types/events/event_utils_test.ts
deleted file mode 100644
index 731819106..000000000
--- a/packages/pipeline/test/data_types/events/event_utils_test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { Exchange } from '@0xproject/contract-artifacts';
-import { BigNumber } from '@0xproject/utils';
-import * as chai from 'chai';
-import { DecodedLogArgs, LogEntry, LogWithDecodedArgs } from 'ethereum-types';
-import 'mocha';
-
-import { EventsResponseResult } from '../../../src/data_sources/etherscan';
-import { convertResponseToLogEntry, decodeLogEntry } from '../../../src/data_types/events/event_utils';
-import { chaiSetup } from '../../utils/chai_setup';
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-describe('event_utils', () => {
-    describe('convertResponseToLogEntry', () => {
-        it('converts EventsResponseResult to LogEntry', () => {
-            const input: EventsResponseResult = {
-                address: '0x4f833a24e1f95d70f028921e27040ca56e09ab0b',
-                topics: [
-                    '0x82af639571738f4ebd4268fb0363d8957ebe1bbb9e78dba5ebd69eed39b154f0',
-                    '0x00000000000000000000000067032ef7be8fa07c4335d0134099db0f3875e930',
-                    '0x0000000000000000000000000000000000000000000000000000000000000000',
-                ],
-                data: '0x00000000000000000000000000000000000000000000000000000165f2d3f94d',
-                blockNumber: '0x61127b',
-                timeStamp: '0x5ba2878e',
-                gasPrice: '0x1a13b8600',
-                gasUsed: '0xd9dc',
-                logIndex: '0x63',
-                transactionHash: '0xa3f71931ddab6e758b9d1755b2715b376759f49f23fff60755f7e073367d61b5',
-                transactionIndex: '0x35',
-            };
-            const expected: LogEntry = {
-                logIndex: 99,
-                transactionIndex: 53,
-                transactionHash: input.transactionHash,
-                blockHash: '',
-                blockNumber: 6361723,
-                address: input.address,
-                data: input.data,
-                topics: input.topics,
-            };
-            const actual = convertResponseToLogEntry(input);
-            expect(actual).deep.equal(expected);
-        });
-    });
-    describe('decodeLogEntry', () => {
-        it('decodes LogEntry into LogWithDecodedArgs', () => {
-            const input: LogEntry = {
-                logIndex: 96,
-                transactionIndex: 52,
-                transactionHash: '0x02b59043e9b38b430c8c66abe67ab4a9e5509def8f8552b54231e88db1839831',
-                blockHash: '',
-                blockNumber: 6361723,
-                address: '0x4f833a24e1f95d70f028921e27040ca56e09ab0b',
-                data:
-                    '0x00000000000000000000000067032ef7be8fa07c4335d0134099db0f3875e93000000000000000000000000067032ef7be8fa07c4335d0134099db0f3875e930000000000000000000000000000000000000000000000000000000174876e8000000000000000000000000000000000000000000000000000000000013ab668000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000000',
-                topics: [
-                    '0x0bcc4c97732e47d9946f229edb95f5b6323f601300e4690de719993f3c371129',
-                    '0x0000000000000000000000003f7f832abb3be28442c0e48b7222e02b322c78f3',
-                    '0x000000000000000000000000a258b39954cef5cb142fd567a46cddb31a670124',
-                    '0x523404b4e6f847d9aefcf5be024be396449b4635590291fd7a28a8c940843858',
-                ],
-            };
-            const expected: LogWithDecodedArgs<DecodedLogArgs> = {
-                ...input,
-                event: 'Fill',
-                args: {
-                    makerAddress: '0x3f7f832abb3be28442c0e48b7222e02b322c78f3',
-                    feeRecipientAddress: '0xa258b39954cef5cb142fd567a46cddb31a670124',
-                    takerAddress: '0x67032ef7be8fa07c4335d0134099db0f3875e930',
-                    senderAddress: '0x67032ef7be8fa07c4335d0134099db0f3875e930',
-                    makerAssetFilledAmount: new BigNumber('100000000000'),
-                    takerAssetFilledAmount: new BigNumber('330000000'),
-                    makerFeePaid: new BigNumber('0'),
-                    takerFeePaid: new BigNumber('0'),
-                    orderHash: '0x523404b4e6f847d9aefcf5be024be396449b4635590291fd7a28a8c940843858',
-                    makerAssetData: '0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498',
-                    takerAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                },
-            };
-            const actual = decodeLogEntry(Exchange.compilerOutput.abi, input);
-            expect(actual).deep.equal(expected);
-        });
-    });
-});
diff --git a/packages/pipeline/test/data_types/events/exchange_events_test.ts b/packages/pipeline/test/data_types/events/exchange_events_test.ts
deleted file mode 100644
index f1432892d..000000000
--- a/packages/pipeline/test/data_types/events/exchange_events_test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ExchangeFillEventArgs } from '@0xproject/contract-wrappers';
-import { BigNumber } from '@0xproject/utils';
-import * as chai from 'chai';
-import { LogWithDecodedArgs } from 'ethereum-types';
-import 'mocha';
-
-import { _convertToEntity } from '../../../src/data_types/events/exchange_events';
-import { ExchangeFillEvent } from '../../../src/entities/ExchangeFillEvent';
-import { chaiSetup } from '../../utils/chai_setup';
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-// tslint:disable:custom-no-magic-numbers
-describe('exchange_events', () => {
-    describe('_convertToEntity', () => {
-        it('converts LogWithDecodedArgs to ExchangeFillEvent entity', () => {
-            const input: LogWithDecodedArgs<ExchangeFillEventArgs> = {
-                logIndex: 102,
-                transactionIndex: 38,
-                transactionHash: '0x6dd106d002873746072fc5e496dd0fb2541b68c77bcf9184ae19a42fd33657fe',
-                blockHash: '',
-                blockNumber: 6276262,
-                address: '0x4f833a24e1f95d70f028921e27040ca56e09ab0b',
-                data:
-                    '0x000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f49800000000000000000000000000000000000000000000000000000000',
-                topics: [
-                    '0x0bcc4c97732e47d9946f229edb95f5b6323f601300e4690de719993f3c371129',
-                    '0x000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428',
-                    '0x000000000000000000000000c370d2a5920344aa6b7d8d11250e3e861434cbdd',
-                    '0xab12ed2cbaa5615ab690b9da75a46e53ddfcf3f1a68655b5fe0d94c75a1aac4a',
-                ],
-                event: 'Fill',
-                args: {
-                    makerAddress: '0xf6da68519f78b0d0bc93c701e86affcb75c92428',
-                    feeRecipientAddress: '0xc370d2a5920344aa6b7d8d11250e3e861434cbdd',
-                    takerAddress: '0xf6da68519f78b0d0bc93c701e86affcb75c92428',
-                    senderAddress: '0xf6da68519f78b0d0bc93c701e86affcb75c92428',
-                    makerAssetFilledAmount: new BigNumber('10000000000000000'),
-                    takerAssetFilledAmount: new BigNumber('100000000000000000'),
-                    makerFeePaid: new BigNumber('0'),
-                    takerFeePaid: new BigNumber('0'),
-                    orderHash: '0xab12ed2cbaa5615ab690b9da75a46e53ddfcf3f1a68655b5fe0d94c75a1aac4a',
-                    makerAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                    takerAssetData: '0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498',
-                },
-            };
-            const expected = new ExchangeFillEvent();
-            expected.contractAddress = '0x4f833a24e1f95d70f028921e27040ca56e09ab0b';
-            expected.blockNumber = 6276262;
-            expected.logIndex = 102;
-            expected.rawData =
-                '0x000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f49800000000000000000000000000000000000000000000000000000000';
-            expected.makerAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
-            expected.takerAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
-            expected.feeRecepientAddress = '0xc370d2a5920344aa6b7d8d11250e3e861434cbdd';
-            expected.senderAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
-            expected.makerAssetFilledAmount = '10000000000000000';
-            expected.takerAssetFilledAmount = '100000000000000000';
-            expected.makerFeePaid = '0';
-            expected.takerFeePaid = '0';
-            expected.orderHash = '0xab12ed2cbaa5615ab690b9da75a46e53ddfcf3f1a68655b5fe0d94c75a1aac4a';
-            expected.rawMakerAssetData = '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
-            expected.makerAssetType = 'erc20';
-            expected.makerAssetProxyId = '0xf47261b0';
-            expected.makerTokenAddress = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
-            expected.makerTokenId = null;
-            expected.rawTakerAssetData = '0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498';
-            expected.takerAssetType = 'erc20';
-            expected.takerAssetProxyId = '0xf47261b0';
-            expected.takerTokenAddress = '0xe41d2489571d322189246dafa5ebde1f4699f498';
-            expected.takerTokenId = null;
-            const actual = _convertToEntity(input);
-            expect(actual).deep.equal(expected);
-        });
-    });
-});
diff --git a/packages/pipeline/test/data_types/sra_orders/index_test.ts b/packages/pipeline/test/data_types/sra_orders/index_test.ts
deleted file mode 100644
index 174f89b4f..000000000
--- a/packages/pipeline/test/data_types/sra_orders/index_test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { APIOrder } from '@0xproject/types';
-import { BigNumber } from '@0xproject/utils';
-import * as chai from 'chai';
-import 'mocha';
-import { Connection, createConnection } from 'typeorm';
-
-import { _convertToEntity } from '../../../src/data_types/sra_orders';
-import { SraOrder } from '../../../src/entities/SraOrder';
-import { chaiSetup } from '../../utils/chai_setup';
-
-import { config } from '../../../src/ormconfig';
-
-chaiSetup.configure();
-const expect = chai.expect;
-
-// tslint:disable:custom-no-magic-numbers
-describe('sra_orders', () => {
-    describe('_convertToEntity', () => {
-        before(async () => {
-            // HACK(albrow): We don't actually use this connection but it seems
-            // to be required because chai calls the inspect method of the
-            // entity and that method requires a "default" connection.
-            await createConnection(config);
-        });
-        it('converts ApiOrder to SraOrder entity', () => {
-            const input: APIOrder = {
-                order: {
-                    makerAddress: '0xb45df06e38540a675fdb5b598abf2c0dbe9d6b81',
-                    takerAddress: '0x0000000000000000000000000000000000000000',
-                    feeRecipientAddress: '0xa258b39954cef5cb142fd567a46cddb31a670124',
-                    senderAddress: '0x0000000000000000000000000000000000000000',
-                    makerAssetAmount: new BigNumber('1619310371000000000'),
-                    takerAssetAmount: new BigNumber('8178335207070707070707'),
-                    makerFee: new BigNumber('0'),
-                    takerFee: new BigNumber('0'),
-                    exchangeAddress: '0x4f833a24e1f95d70f028921e27040ca56e09ab0b',
-                    expirationTimeSeconds: new BigNumber('1538529488'),
-                    signature:
-                        '0x1b5a5d672b0d647b5797387ccbb89d822d5d2e873346b014f4ff816ff0783f2a7a0d2824d2d7042ec8ea375bc7f870963e1cb8248f1db03ddf125e27b5963aa11f03',
-                    salt: new BigNumber('1537924688891'),
-                    makerAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-                    takerAssetData: '0xf47261b000000000000000000000000042d6622dece394b54999fbd73d108123806f6a18',
-                },
-                metaData: { isThisArbitraryData: true, powerLevel: 9001 },
-            };
-            const expected = new SraOrder();
-            expected.exchangeAddress = '0x4f833a24e1f95d70f028921e27040ca56e09ab0b';
-            expected.orderHashHex = '0x1bdbeb0d088a33da28b9ee6d94e8771452f90f4a69107da2fa75195d61b9a1c9';
-            expected.lastUpdatedTimestamp = 0;
-            expected.firstSeenTimestamp = 0;
-            expected.makerAddress = '0xb45df06e38540a675fdb5b598abf2c0dbe9d6b81';
-            expected.takerAddress = '0x0000000000000000000000000000000000000000';
-            expected.feeRecipientAddress = '0xa258b39954cef5cb142fd567a46cddb31a670124';
-            expected.senderAddress = '0x0000000000000000000000000000000000000000';
-            expected.makerAssetAmount = '1619310371000000000';
-            expected.takerAssetAmount = '8178335207070707070707';
-            expected.makerFee = '0';
-            expected.takerFee = '0';
-            expected.expirationTimeSeconds = '1538529488';
-            expected.salt = '1537924688891';
-            expected.signature =
-                '0x1b5a5d672b0d647b5797387ccbb89d822d5d2e873346b014f4ff816ff0783f2a7a0d2824d2d7042ec8ea375bc7f870963e1cb8248f1db03ddf125e27b5963aa11f03';
-            expected.rawMakerAssetData = '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
-            expected.makerAssetType = 'erc20';
-            expected.makerAssetProxyId = '0xf47261b0';
-            expected.makerTokenAddress = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
-            expected.makerTokenId = null;
-            expected.rawTakerAssetData = '0xf47261b000000000000000000000000042d6622dece394b54999fbd73d108123806f6a18';
-            expected.takerAssetType = 'erc20';
-            expected.takerAssetProxyId = '0xf47261b0';
-            expected.takerTokenAddress = '0x42d6622dece394b54999fbd73d108123806f6a18';
-            expected.takerTokenId = null;
-            expected.metaDataJson = '{"isThisArbitraryData":true,"powerLevel":9001}';
-
-            const actual = _convertToEntity(input);
-            expect(actual).deep.equal(expected);
-        });
-    });
-});
diff --git a/packages/pipeline/test/parsers/events/index_test.ts b/packages/pipeline/test/parsers/events/index_test.ts
index 7e439ce39..2a2db1a94 100644
--- a/packages/pipeline/test/parsers/events/index_test.ts
+++ b/packages/pipeline/test/parsers/events/index_test.ts
@@ -1,11 +1,11 @@
-import { ExchangeFillEventArgs } from '@0x/contract-wrappers';
-import { BigNumber } from '@0x/utils';
+import { ExchangeFillEventArgs } from '@0xproject/contract-wrappers';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import 'mocha';
 
-import { ExchangeFillEvent } from '../../../src/entities';
-import { _convertToExchangeFillEvent } from '../../../src/parsers/events';
+import { ExchangeFillEvent } from '../../../src/entities/ExchangeFillEvent';
+import { _convertToEntity } from '../../../src/parsers/events';
 import { chaiSetup } from '../../utils/chai_setup';
 
 chaiSetup.configure();
@@ -13,7 +13,7 @@ const expect = chai.expect;
 
 // tslint:disable:custom-no-magic-numbers
 describe('exchange_events', () => {
-    describe('_convertToExchangeFillEvent', () => {
+    describe('_convertToEntity', () => {
         it('converts LogWithDecodedArgs to ExchangeFillEvent entity', () => {
             const input: LogWithDecodedArgs<ExchangeFillEventArgs> = {
                 logIndex: 102,
@@ -39,7 +39,7 @@ describe('exchange_events', () => {
                     makerAssetFilledAmount: new BigNumber('10000000000000000'),
                     takerAssetFilledAmount: new BigNumber('100000000000000000'),
                     makerFeePaid: new BigNumber('0'),
-                    takerFeePaid: new BigNumber('12345'),
+                    takerFeePaid: new BigNumber('0'),
                     orderHash: '0xab12ed2cbaa5615ab690b9da75a46e53ddfcf3f1a68655b5fe0d94c75a1aac4a',
                     makerAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
                     takerAssetData: '0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498',
@@ -51,15 +51,14 @@ describe('exchange_events', () => {
             expected.logIndex = 102;
             expected.rawData =
                 '0x000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f49800000000000000000000000000000000000000000000000000000000';
-            expected.transactionHash = '0x6dd106d002873746072fc5e496dd0fb2541b68c77bcf9184ae19a42fd33657fe';
             expected.makerAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
             expected.takerAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
-            expected.feeRecipientAddress = '0xc370d2a5920344aa6b7d8d11250e3e861434cbdd';
+            expected.feeRecepientAddress = '0xc370d2a5920344aa6b7d8d11250e3e861434cbdd';
             expected.senderAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
-            expected.makerAssetFilledAmount = new BigNumber('10000000000000000');
-            expected.takerAssetFilledAmount = new BigNumber('100000000000000000');
-            expected.makerFeePaid = new BigNumber('0');
-            expected.takerFeePaid = new BigNumber('12345');
+            expected.makerAssetFilledAmount = '10000000000000000';
+            expected.takerAssetFilledAmount = '100000000000000000';
+            expected.makerFeePaid = '0';
+            expected.takerFeePaid = '0';
             expected.orderHash = '0xab12ed2cbaa5615ab690b9da75a46e53ddfcf3f1a68655b5fe0d94c75a1aac4a';
             expected.rawMakerAssetData = '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
             expected.makerAssetType = 'erc20';
@@ -71,7 +70,7 @@ describe('exchange_events', () => {
             expected.takerAssetProxyId = '0xf47261b0';
             expected.takerTokenAddress = '0xe41d2489571d322189246dafa5ebde1f4699f498';
             expected.takerTokenId = null;
-            const actual = _convertToExchangeFillEvent(input);
+            const actual = _convertToEntity(input);
             expect(actual).deep.equal(expected);
         });
     });
diff --git a/packages/pipeline/test/parsers/sra_orders/index_test.ts b/packages/pipeline/test/parsers/sra_orders/index_test.ts
index ee2842ef3..952a6f3c6 100644
--- a/packages/pipeline/test/parsers/sra_orders/index_test.ts
+++ b/packages/pipeline/test/parsers/sra_orders/index_test.ts
@@ -1,9 +1,9 @@
-import { APIOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
+import { APIOrder } from '@0xproject/types';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import 'mocha';
 
-import { SraOrder } from '../../../src/entities';
+import { SraOrder } from '../../../src/entities/SraOrder';
 import { _convertToEntity } from '../../../src/parsers/sra_orders';
 import { chaiSetup } from '../../utils/chai_setup';
 
@@ -37,16 +37,18 @@ describe('sra_orders', () => {
             const expected = new SraOrder();
             expected.exchangeAddress = '0x4f833a24e1f95d70f028921e27040ca56e09ab0b';
             expected.orderHashHex = '0x1bdbeb0d088a33da28b9ee6d94e8771452f90f4a69107da2fa75195d61b9a1c9';
+            expected.lastUpdatedTimestamp = 0;
+            expected.firstSeenTimestamp = 0;
             expected.makerAddress = '0xb45df06e38540a675fdb5b598abf2c0dbe9d6b81';
             expected.takerAddress = '0x0000000000000000000000000000000000000000';
             expected.feeRecipientAddress = '0xa258b39954cef5cb142fd567a46cddb31a670124';
             expected.senderAddress = '0x0000000000000000000000000000000000000000';
-            expected.makerAssetAmount = new BigNumber('1619310371000000000');
-            expected.takerAssetAmount = new BigNumber('8178335207070707070707');
-            expected.makerFee = new BigNumber('0');
-            expected.takerFee = new BigNumber('0');
-            expected.expirationTimeSeconds = new BigNumber('1538529488');
-            expected.salt = new BigNumber('1537924688891');
+            expected.makerAssetAmount = '1619310371000000000';
+            expected.takerAssetAmount = '8178335207070707070707';
+            expected.makerFee = '0';
+            expected.takerFee = '0';
+            expected.expirationTimeSeconds = '1538529488';
+            expected.salt = '1537924688891';
             expected.signature =
                 '0x1b5a5d672b0d647b5797387ccbb89d822d5d2e873346b014f4ff816ff0783f2a7a0d2824d2d7042ec8ea375bc7f870963e1cb8248f1db03ddf125e27b5963aa11f03';
             expected.rawMakerAssetData = '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
@@ -59,7 +61,7 @@ describe('sra_orders', () => {
             expected.takerAssetProxyId = '0xf47261b0';
             expected.takerTokenAddress = '0x42d6622dece394b54999fbd73d108123806f6a18';
             expected.takerTokenId = null;
-            expected.metadataJson = '{"isThisArbitraryData":true,"powerLevel":9001}';
+            expected.metaDataJson = '{"isThisArbitraryData":true,"powerLevel":9001}';
 
             const actual = _convertToEntity(input);
             expect(actual).deep.equal(expected);