Merge pull request #337 from 0xProject/feature/0x.js/update-artifacts

Add Rinkeby addresses to artifacts

14 files changed, 55 insertions, 56 deletions

diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index 7fc1d9bba..ec44bfc16 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -1,9 +1,10 @@
 # CHANGELOG
 
-## v0.30.1 - _January 18, 2018_
+## v0.30.1 - _TBD, 2018_
 
     * Fix a bug allowing negative fill values  (#212)
     * Fix a bug that made it impossible to pass a custom ZRX address  (#341)
+    * Add Rinkeby testnet addresses to artifacts  (#337)
 
 ## v0.30.0 - _January 17, 2018_
 
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index fb27f48de..fc0334dd0 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -2,27 +2,24 @@
     "name": "0x.js",
     "version": "0.30.1",
     "description": "A javascript library for interacting with the 0x protocol",
-    "keywords": [
-        "0x.js",
-        "0xproject",
-        "ethereum",
-        "tokens",
-        "exchange"
-    ],
+    "keywords": ["0x.js", "0xproject", "ethereum", "tokens", "exchange"],
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
         "prebuild": "run-s clean generate_contract_wrappers",
         "build": "run-p build:umd:prod build:commonjs; exit 0;",
         "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR",
-        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abiGlob 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --templates contract_templates --output src/contract_wrappers/generated",
+        "upload_docs_json":
+            "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json",
+        "generate_contract_wrappers":
+            "node ../abi-gen/lib/index.js --abiGlob 'src/artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --templates contract_templates --output src/contract_wrappers/generated",
         "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
         "test:circleci": "run-s test:coverage report_test_coverage",
         "test": "run-s clean test:commonjs",
         "test:coverage": "nyc npm run test --all",
         "report_test_coverage": "nyc report --reporter=text-lcov | coveralls",
-        "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;",
+        "update_contracts":
+            "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;",
         "clean": "shx rm -rf _bundles lib test_temp",
         "build:umd:prod": "NODE_ENV=production webpack",
         "build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts;",
diff --git a/packages/0x.js/src/artifacts/EtherToken.json b/packages/0x.js/src/artifacts/EtherToken.json
index 91fba7f0a..26cca57cd 100644
--- a/packages/0x.js/src/artifacts/EtherToken.json
+++ b/packages/0x.js/src/artifacts/EtherToken.json
@@ -274,6 +274,9 @@
         "3": {
             "address": "0xc00fd9820cd2898cc4c054b7bf142de637ad129a"
         },
+        "4": {
+            "address": "0xc778417e063141139fce010982780140aa0cd5ab"
+        },
         "42": {
             "address": "0x653e49e301e508a13237c0ddc98ae7d4cd2667a1"
         },
diff --git a/packages/0x.js/src/artifacts/Exchange.json b/packages/0x.js/src/artifacts/Exchange.json
index 45e277c45..af8db7360 100644
--- a/packages/0x.js/src/artifacts/Exchange.json
+++ b/packages/0x.js/src/artifacts/Exchange.json
@@ -597,6 +597,9 @@
         "3": {
             "address": "0x479cc461fecd078f766ecc58533d6f69580cf3ac"
         },
+        "4": {
+            "address": "0x1d16ef40fac01cec8adac2ac49427b9384192c05"
+        },
         "42": {
             "address": "0x90fe2af704b34e0224bf2299c838e04d4dcf1364"
         },
diff --git a/packages/0x.js/src/artifacts/TokenRegistry.json b/packages/0x.js/src/artifacts/TokenRegistry.json
index 81780074c..0f583628c 100644
--- a/packages/0x.js/src/artifacts/TokenRegistry.json
+++ b/packages/0x.js/src/artifacts/TokenRegistry.json
@@ -534,6 +534,9 @@
         "3": {
             "address": "0x6b1a50f0bb5a7995444bd3877b22dc89c62843ed"
         },
+        "4": {
+            "address": "0x4e9aad8184de8833365fea970cd9149372fdf1e6"
+        },
         "42": {
             "address": "0xf18e504561f4347bea557f3d4558f559dddbae7f"
         },
diff --git a/packages/0x.js/src/artifacts/TokenTransferProxy.json b/packages/0x.js/src/artifacts/TokenTransferProxy.json
index 9b6a6cdf9..8cf551ddb 100644
--- a/packages/0x.js/src/artifacts/TokenTransferProxy.json
+++ b/packages/0x.js/src/artifacts/TokenTransferProxy.json
@@ -174,6 +174,9 @@
         "3": {
             "address": "0x4e9aad8184de8833365fea970cd9149372fdf1e6"
         },
+        "4": {
+            "address": "0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d"
+        },
         "42": {
             "address": "0x087eed4bc1ee3de49befbd66c662b434b15d49d4"
         },
diff --git a/packages/0x.js/src/artifacts/ZRX.json b/packages/0x.js/src/artifacts/ZRX.json
index 1bd973178..e40b8f268 100644
--- a/packages/0x.js/src/artifacts/ZRX.json
+++ b/packages/0x.js/src/artifacts/ZRX.json
@@ -7,6 +7,9 @@
         "3": {
             "address": "0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d"
         },
+        "4": {
+            "address": "0x00f58d6d585f84b2d7267940cede30ce2fe6eae8"
+        },
         "42": {
             "address": "0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570"
         },
diff --git a/packages/chai-as-promised-typescript-typings/package.json b/packages/chai-as-promised-typescript-typings/package.json
index 34f4ed1f3..20383594f 100644
--- a/packages/chai-as-promised-typescript-typings/package.json
+++ b/packages/chai-as-promised-typescript-typings/package.json
@@ -9,9 +9,7 @@
         "url": "git+https://github.com/0xProject/0x.js.git"
     },
     "author": "Fabio Berger",
-    "contributors": [
-        "Leonid Logvinov <logvinov.leon@gmail.com>"
-    ],
+    "contributors": ["Leonid Logvinov <logvinov.leon@gmail.com>"],
     "license": "Apache-2.0",
     "bugs": {
         "url": "https://github.com/0xProject/0x.js/issues"
diff --git a/packages/connect/package.json b/packages/connect/package.json
index a28916903..fe28be21d 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -2,20 +2,15 @@
     "name": "@0xproject/connect",
     "version": "0.5.1",
     "description": "A javascript library for interacting with the standard relayer api",
-    "keywords": [
-        "connect",
-        "0xproject",
-        "ethereum",
-        "tokens",
-        "exchange"
-    ],
+    "keywords": ["connect", "0xproject", "ethereum", "tokens", "exchange"],
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
         "build": "tsc",
         "clean": "shx rm -rf _bundles lib test_temp",
         "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR",
-        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json",
+        "upload_docs_json":
+            "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json",
         "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
         "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
         "run_mocha": "mocha lib/test/**/*_test.js",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 5a76bbf7f..23a45218f 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -8,9 +8,11 @@
         "test": "test"
     },
     "scripts": {
-        "build": "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;",
+        "build":
+            "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;",
         "test": "npm run build; truffle test",
-        "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
+        "compile:comment":
+            "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
         "compile": "node ../deployer/lib/src/cli.js compile",
         "clean": "rm -rf ./lib",
         "migrate": "node ../deployer/lib/src/cli.js migrate",
diff --git a/packages/testnet-faucets/README.md b/packages/testnet-faucets/README.md
index 00352cc2a..a52d16a00 100644
--- a/packages/testnet-faucets/README.md
+++ b/packages/testnet-faucets/README.md
@@ -63,24 +63,24 @@ Returns a JSON payload describing the state of the queues for each network. For
 
 ```json
 {
-    "3":{
-        "ether":{
-            "full":false,
-            "size":4
+    "3": {
+        "ether": {
+            "full": false,
+            "size": 4
         },
-        "zrx":{
-            "full":false,
-            "size":6
+        "zrx": {
+            "full": false,
+            "size": 6
         }
     },
-    "42":{
-        "ether":{
-            "full":false,
-            "size":8
+    "42": {
+        "ether": {
+            "full": false,
+            "size": 8
         },
-        "zrx":{
-            "full":false,
-            "size":20
+        "zrx": {
+            "full": false,
+            "size": 20
         }
     }
 }
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index bcffe5a8e..cdee9e279 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -8,22 +8,12 @@
         "clean": "shx rm -rf lib",
         "lint": "tslint --project . 'rules/**/*.ts'"
     },
-    "files": [
-        "tslint.js",
-        "README.md",
-        "LICENSE"
-    ],
+    "files": ["tslint.js", "README.md", "LICENSE"],
     "repository": {
         "type": "git",
         "url": "git://github.com/0xProject/0x.js.git"
     },
-    "keywords": [
-        "tslint",
-        "config",
-        "0xProject",
-        "typescript",
-        "ts"
-    ],
+    "keywords": ["tslint", "config", "0xProject", "typescript", "ts"],
     "author": {
         "name": "Fabio Berger",
         "email": "fabio@0xproject.com"
diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json
index 6dddf22aa..6f7dd0931 100644
--- a/packages/web3-typescript-typings/package.json
+++ b/packages/web3-typescript-typings/package.json
@@ -12,9 +12,7 @@
         "url": "git+https://github.com/0xProject/0x.js.git"
     },
     "author": "Fabio Berger",
-    "contributors": [
-        "Leonid Logvinov <logvinov.leon@gmail.com>"
-    ],
+    "contributors": ["Leonid Logvinov <logvinov.leon@gmail.com>"],
     "license": "Apache-2.0",
     "bugs": {
         "url": "https://github.com/0xProject/0x.js/issues"
diff --git a/packages/website/package.json b/packages/website/package.json
index fcfa12301..568bca47f 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -8,9 +8,12 @@
         "clean": "shx rm -f public/bundle*",
         "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
         "dev": "webpack-dev-server --content-base public --https",
-        "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../website/contracts; done;",
-        "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
-        "deploy_live": "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
+        "update_contracts":
+            "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../website/contracts; done;",
+        "deploy_staging":
+            "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
+        "deploy_live":
+            "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
     },
     "config": {
         "artifacts": "Mintable"