Merge branch 'development' into fix/dev-tools-pages/finalTouches

* development: (22 commits)
  Fix linter
  Update packages/sol-tracing-utils/src/trace_collection_subprovider.ts
  Update packages/sol-tracing-utils/CHANGELOG.json
  Update packages/sol-tracing-utils/CHANGELOG.json
  Add PR numbers
  Fix/simplify handling of revert trace snippets
  Fix a bug when TraceCollectionSubprovider was hanging on the fake Geth snapshot transaction
  Fix a bug when a custom Geth tracer didn't return stack entries for DELEGATECALL
  Revert devnet mining period from 1 to 0
  update team info, add brent
  Publish
  Updated CHANGELOGS
  Add commented-out pre-publish checks
  Add additional check to make sure user was added to our DockerHub org
  Update test for required amountAvailableToFill
  Add actual error message thrown
  Flag order-watcher as having a Docker image to publish
  Add publish to DockerHub step to publish flow
  Flesh out postpublish configs in packageJSON type
  Add pre-publish check to ensure publisher is logged in to docker cmdline
  ...

4 files changed, 22 insertions, 20 deletions

diff --git a/packages/sol-trace/CHANGELOG.json b/packages/sol-trace/CHANGELOG.json
index 858ec8227..8157d441e 100644
--- a/packages/sol-trace/CHANGELOG.json
+++ b/packages/sol-trace/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1547561734,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1547225310,
         "version": "1.0.1",
         "changes": [
diff --git a/packages/sol-trace/CHANGELOG.md b/packages/sol-trace/CHANGELOG.md
index f2c34622d..ac09a1bbf 100644
--- a/packages/sol-trace/CHANGELOG.md
+++ b/packages/sol-trace/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.2 - _January 15, 2019_
+
+    * Dependencies updated
+
 ## v1.0.1 - _January 11, 2019_
 
     * Dependencies updated
diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json
index cfe2bc953..acae60303 100644
--- a/packages/sol-trace/package.json
+++ b/packages/sol-trace/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/sol-trace",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,16 +29,16 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-trace/README.md",
     "dependencies": {
-        "@0x/sol-tracing-utils": "^3.0.0",
-        "@0x/subproviders": "^2.1.10",
-        "@0x/typescript-typings": "^3.0.7",
-        "ethereum-types": "^1.1.5",
+        "@0x/sol-tracing-utils": "^4.0.0",
+        "@0x/subproviders": "^2.1.11",
+        "@0x/typescript-typings": "^3.0.8",
+        "ethereum-types": "^1.1.6",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5",
         "loglevel": "^1.6.1"
     },
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.1",
+        "@0x/tslint-config": "^2.0.2",
         "@types/loglevel": "^1.5.3",
         "@types/node": "*",
         "npm-run-all": "^4.1.2",
diff --git a/packages/sol-trace/src/revert_trace_subprovider.ts b/packages/sol-trace/src/revert_trace_subprovider.ts
index fa065cfcb..046dad812 100644
--- a/packages/sol-trace/src/revert_trace_subprovider.ts
+++ b/packages/sol-trace/src/revert_trace_subprovider.ts
@@ -109,9 +109,7 @@ export class RevertTraceSubprovider extends TraceCollectionSubprovider {
             const fileNameToFileIndex = _.invert(contractData.sources);
             const fileIndex = _.parseInt(fileNameToFileIndex[sourceRange.fileName]);
             const sourceSnippet = getSourceRangeSnippet(sourceRange, contractData.sourceCodes[fileIndex]);
-            if (sourceSnippet !== null) {
-                sourceSnippets.push(sourceSnippet);
-            }
+            sourceSnippets.push(sourceSnippet);
         }
         const filteredSnippets = filterSnippets(sourceSnippets);
         if (filteredSnippets.length > 0) {
@@ -135,9 +133,7 @@ function filterSnippets(sourceSnippets: SourceSnippet[]): SourceSnippet[] {
     const results: SourceSnippet[] = [sourceSnippets[0]];
     let prev = sourceSnippets[0];
     for (const sourceSnippet of sourceSnippets) {
-        if (sourceSnippet.type === 'IfStatement') {
-            continue;
-        } else if (sourceSnippet.source === prev.source) {
+        if (sourceSnippet.source === prev.source) {
             prev = sourceSnippet;
             continue;
         }
@@ -157,12 +153,5 @@ function getStackTraceString(sourceSnippet: SourceSnippet): string {
 }
 
 function getSourceSnippetString(sourceSnippet: SourceSnippet): string {
-    switch (sourceSnippet.type) {
-        case 'ContractDefinition':
-            return `contract ${sourceSnippet.name}`;
-        case 'FunctionDefinition':
-            return `function ${sourceSnippet.name}`;
-        default:
-            return `${sourceSnippet.source}`;
-    }
+    return `${sourceSnippet.source}`;
 }