Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulator

* v2-prototype:
  Fix a bug in SolCompilerArtifacts adapter config overriding
  Increase timeout for contract migrations
  Remove some copy-paste code
  Await transactions in migrations
  Fix typos
  Await transactions in migrations
  Await fake transactions
  Fix a typo
  Implement SolidityProfiler & adapt sol-cov to work with Geth

# Conflicts:
#	packages/migrations/CHANGELOG.json

1 files changed, 1 insertions, 0 deletions

diff --git a/packages/dev-utils/src/env.ts b/packages/dev-utils/src/env.ts
index 114dbf4a8..e74ef3d23 100644
--- a/packages/dev-utils/src/env.ts
+++ b/packages/dev-utils/src/env.ts
@@ -3,6 +3,7 @@ import * as process from 'process';
 
 export enum EnvVars {
     SolidityCoverage = 'SOLIDITY_COVERAGE',
+    SolidityProfiler = 'SOLIDITY_PROFILER',
     VerboseGanache = 'VERBOSE_GANACHE',
 }