Merge branch 'v2-prototype' into feature/combinatorial-testing

* v2-prototype: (26 commits)
  Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider
  Refactor sol-cov to de-duplicate code for coverage and profiling
  Rename popByte and popAddress
  Hard code test addresses/bytes32 instead of generating pseudorandom ones
  Update artifacts
  Rename computeCoverageAsync -> computeSingleTraceCoverageAsync
  Fix linter errors
  Refactor sol-cov to avoid keeping traceInfo in memory
  Unpop byte rather than making deep copy
  Pass gas in to marketBuyOrdersNoThrow
  Looks up the memory location of makerAssetData/takerAssetData
  Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA
  Add tests for deepCopyBytes and missing write methods from LibBytes
  Pop id from assetData before dispatching to AssetProxies
  Upgrade solidity-parser-entlr 0.2.11 => 0.2.12
  Fix import order
  Fix typos
  Add CHANGELOGs
  Speed-up sol-cov
  Increase delay when sending transactions during devnet startup
  ...

1 files changed, 16 insertions, 1 deletions

diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts
index 780695091..5d2eedcb3 100644
--- a/packages/web3-wrapper/src/web3_wrapper.ts
+++ b/packages/web3-wrapper/src/web3_wrapper.ts
@@ -402,6 +402,21 @@ export class Web3Wrapper {
         pollingIntervalMs: number = 1000,
         timeoutMs?: number,
     ): Promise<TransactionReceiptWithDecodedLogs> {
+        // Immediately check if the transaction has already been mined.
+        let transactionReceipt = await this.getTransactionReceiptAsync(txHash);
+        if (!_.isNull(transactionReceipt)) {
+            const logsWithDecodedArgs = _.map(
+                transactionReceipt.logs,
+                this.abiDecoder.tryToDecodeLogOrNoop.bind(this.abiDecoder),
+            );
+            const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = {
+                ...transactionReceipt,
+                logs: logsWithDecodedArgs,
+            };
+            return transactionReceiptWithDecodedLogArgs;
+        }
+
+        // Otherwise, check again every pollingIntervalMs.
         let wasTimeoutExceeded = false;
         if (timeoutMs) {
             setTimeout(() => (wasTimeoutExceeded = true), timeoutMs);
@@ -416,7 +431,7 @@ export class Web3Wrapper {
                             return reject(Web3WrapperErrors.TransactionMiningTimeout);
                         }
 
-                        const transactionReceipt = await this.getTransactionReceiptAsync(txHash);
+                        transactionReceipt = await this.getTransactionReceiptAsync(txHash);
                         if (!_.isNull(transactionReceipt)) {
                             intervalUtils.clearAsyncExcludingInterval(intervalId);
                             const logsWithDecodedArgs = _.map(