Merge branch 'development' into 3.0

packages/dev-utils/CHANGELOG.json

@@ -1,6 +1,6 @@
 [
     {
-        "version": "2.3.1",
+        "version": "2.3.2",
         "changes": [
             {
                 "note": "`revertWith` mocha extensions now accept Promise-like objects instead of just Promises",
@@ -9,7 +9,7 @@
         ]
     },
     {
-        "version": "2.3.0",
+        "version": "2.3.1",
         "changes": [
             {
                 "note": "Add `chaiSetup` function with `RevertError` testing support",
@@ -21,6 +21,34 @@
             }
         ]
     },
+    {
+        "version": "2.3.0",
+        "changes": [
+            {
+                "note": "Move `tokenUtils` here from `@0x/contract-wrappers`",
+                "pr": 2037
+            }
+        ],
+        "timestamp": 1565296576
+    },
+    {
+        "timestamp": 1564604963,
+        "version": "2.2.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1563957393,
+        "version": "2.2.5",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "timestamp": 1563006338,
         "version": "2.2.4",

packages/dev-utils/CHANGELOG.md

@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.3.0 - _August 8, 2019_
+
+    * Move `tokenUtils` here from `@0x/contract-wrappers` (#2037)
+
+## v2.2.6 - _July 31, 2019_
+
+    * Dependencies updated
+
+## v2.2.5 - _July 24, 2019_
+
+    * Dependencies updated
+
 ## v2.2.4 - _July 13, 2019_
 
     * Dependencies updated

packages/dev-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/dev-utils",
-    "version": "2.2.4",
+    "version": "2.3.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -32,9 +32,9 @@
     "devDependencies": {
         "@0x/tslint-config": "^3.0.1",
         "@types/lodash": "4.14.104",
-        "@types/mocha": "^2.2.42",
+        "@types/mocha": "^5.2.7",
         "make-promises-safe": "^1.1.0",
-        "mocha": "^4.1.0",
+        "mocha": "^6.2.0",
         "npm-run-all": "^4.1.2",
         "nyc": "^11.0.1",
         "shx": "^0.2.2",
@@ -42,17 +42,17 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/subproviders": "^4.1.1",
-        "@0x/types": "^2.4.0",
-        "@0x/typescript-typings": "^4.2.3",
-        "@0x/utils": "^4.4.0",
-        "@0x/web3-wrapper": "^6.0.7",
+        "@0x/subproviders": "^5.0.1",
+        "@0x/types": "^2.4.1",
+        "@0x/typescript-typings": "^4.2.4",
+        "@0x/utils": "^4.5.0",
+        "@0x/web3-wrapper": "^6.0.10",
         "@types/web3-provider-engine": "^14.0.0",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ethereum-types": "^2.1.3",
+        "ethereum-types": "^2.1.4",
         "lodash": "^4.17.11"
     },
     "publishConfig": {

packages/dev-utils/src/index.ts

@@ -4,3 +4,4 @@ export { constants as devConstants } from './constants';
 export { env, EnvVars } from './env';
 export { callbackErrorReporter } from './callback_error_reporter';
 export { chaiSetup } from './chai_setup';
+export { tokenUtils } from './token_utils';

packages/dev-utils/src/token_utils.ts

@@ -0,0 +1,21 @@
+// Those addresses come from migrations. They're deterministic so it's relatively safe to hard-code them here.
+// Before we were fetching them from the TokenRegistry but now we can't as it's deprecated and removed.
+// TODO(albrow): Import these from the migrations package instead of hard-coding them.
+const DUMMY_ERC_20_ADRESSES = [
+    '0x34d402f14d58e001d8efbe6585051bf9706aa064',
+    '0x25b8fe1de9daf8ba351890744ff28cf7dfa8f5e3',
+    '0xcdb594a32b1cc3479d8746279712c39d18a07fc0',
+    '0x1e2f9e10d02a6b8f8f69fcbf515e75039d2ea30d',
+    '0xbe0037eaf2d64fe5529bca93c18c9702d3930376',
+];
+
+const DUMMY_ERC_721_ADRESSES = ['0x07f96aa816c1f244cbc6ef114bb2b023ba54a2eb'];
+
+export const tokenUtils = {
+    getDummyERC20TokenAddresses(): string[] {
+        return DUMMY_ERC_20_ADRESSES;
+    },
+    getDummyERC721TokenAddresses(): string[] {
+        return DUMMY_ERC_721_ADRESSES;
+    },
+};