Merge branch 'development' into feature/instant/heap

11 files changed, 52 insertions, 14 deletions

diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json
index 307d73545..86c6a5c31 100644
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,5 +1,13 @@
 [
     {
+        "version": "1.2.0",
+        "changes": [
+            {
+                "note": "Rinkeby Deployment"
+            }
+        ]
+    },
+    {
         "version": "1.1.0",
         "changes": [
             {
diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts
index f5fd8d0be..57358dd38 100644
--- a/packages/contract-addresses/src/index.ts
+++ b/packages/contract-addresses/src/index.ts
@@ -14,6 +14,7 @@ export interface ContractAddresses {
 export enum NetworkId {
     Mainnet = 1,
     Ropsten = 3,
+    Rinkeby = 4,
     Kovan = 42,
 }
 
@@ -38,6 +39,16 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         forwarder: '0x2240dab907db71e64d3e0dba4800c83b5c502d4e',
         orderValidator: '0x90431a90516ab49af23a0530e04e8c7836e7122f',
     },
+    4: {
+        erc20Proxy: '0x3e809c563c15a295e832e37053798ddc8d6c8dab',
+        erc721Proxy: '0x8e1ff02637cb5e39f2fa36c14706aa348b065b09',
+        zrxToken: '0x2727e688b8fd40b198cd5fe6e408e00494a06f07',
+        etherToken: '0xc778417e063141139fce010982780140aa0cd5ab',
+        exchange: '0x22ebc052f43a88efa06379426120718170f2204e',
+        assetProxyOwner: '0x1da52d1d3a3acfa0a1836b737393b4e9931268fc',
+        forwarder: '0xd2dbf3250a764eaaa94fa0c84ed87c0edc8ed04e',
+        orderValidator: '0x39c3fc9f4d8430af2713306ce80c584752d9e1c7',
+    },
     42: {
         erc20Proxy: '0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e',
         erc721Proxy: '0x2a9127c745688a165106c11cd4d647d2220af821',
diff --git a/packages/instant/.dogfood.discharge.json b/packages/instant/.dogfood.discharge.json
index 9ade97d01..ca36b3861 100644
--- a/packages/instant/.dogfood.discharge.json
+++ b/packages/instant/.dogfood.discharge.json
@@ -1,6 +1,6 @@
 {
     "domain": "0x-instant-dogfood",
-    "build_command": "yarn build:umd:prod",
+    "build_command": "WEBPACK_OUTPUT_PATH=public yarn build:umd:prod",
     "upload_directory": "public",
     "index_key": "index.html",
     "error_key": "index.html",
diff --git a/packages/instant/.gitignore b/packages/instant/.gitignore
index e1ce60fa2..a99cea187 100644
--- a/packages/instant/.gitignore
+++ b/packages/instant/.gitignore
@@ -1,2 +1,3 @@
-public/main.bundle.js
-public/main.bundle.js.map
\ No newline at end of file
+public/instant.js
+public/instant.js.map
+umd/*
\ No newline at end of file
diff --git a/packages/instant/.npmignore b/packages/instant/.npmignore
new file mode 100644
index 000000000..579d65af0
--- /dev/null
+++ b/packages/instant/.npmignore
@@ -0,0 +1,5 @@
+.*
+*
+*/
+!lib/src/**/*
+!umd/**/*
\ No newline at end of file
diff --git a/packages/instant/.staging.discharge.json b/packages/instant/.staging.discharge.json
index 1026b9986..c917a650b 100644
--- a/packages/instant/.staging.discharge.json
+++ b/packages/instant/.staging.discharge.json
@@ -1,6 +1,6 @@
 {
     "domain": "0x-instant-staging",
-    "build_command": "yarn build:umd:prod",
+    "build_command": "WEBPACK_OUTPUT_PATH=public yarn build:umd:prod",
     "upload_directory": "public",
     "index_key": "index.html",
     "error_key": "index.html",
diff --git a/packages/instant/package.json b/packages/instant/package.json
index 6caa3902b..bddc88d18 100644
--- a/packages/instant/package.json
+++ b/packages/instant/package.json
@@ -1,11 +1,11 @@
 {
     "name": "@0x/instant",
-    "version": "0.0.7",
+    "version": "1.0.0",
     "engines": {
         "node": ">=6.12"
     },
-    "private": true,
     "description": "0x Instant React Component",
+    "private": true,
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
@@ -29,8 +29,8 @@
     "config": {
         "postpublish": {
             "assets": [
-                "packages/instant/public/index.js",
-                "packages/instant/public/index.min.js"
+                "packages/instant/umd/instant.js",
+                "packages/instant/umd/instant.js.map"
             ]
         }
     },
diff --git a/packages/instant/public/index.html b/packages/instant/public/index.html
index f6c809e33..253cbb194 100644
--- a/packages/instant/public/index.html
+++ b/packages/instant/public/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>0x Instant Dev Environment</title>
     <link rel="stylesheet" href="/external.css">
-    <script type="text/javascript" src="/main.bundle.js" charset="utf-8"></script>
+    <script type="text/javascript" src="/instant.js" charset="utf-8"></script>
     <script type="text/javascript" src="https://unpkg.com/jsuri@1.3.1/Uri.js" charset="utf-8"></script>
     <script type="text/javascript" src="https://unpkg.com/bignumber.js@4.1.0/bignumber.js" charset="utf-8"></script>
     <style>
diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index 6a4953bcc..ce4f1672e 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -10,11 +10,15 @@ const GIT_SHA = childProcess
     .execSync('git rev-parse HEAD')
     .toString()
     .trim();
+
+const outputPath = process.env.WEBPACK_OUTPUT_PATH || 'umd';
 const config = {
-    entry: './src/index.umd.ts',
+    entry: {
+        instant: './src/index.umd.ts',
+    },
     output: {
-        filename: '[name].bundle.js',
-        path: path.resolve(__dirname, 'public'),
+        filename: '[name].js',
+        path: path.resolve(__dirname, outputPath),
         library: 'zeroExInstant',
         libraryTarget: 'umd',
     },
diff --git a/packages/website/ts/pages/documentation/docs_home.tsx b/packages/website/ts/pages/documentation/docs_home.tsx
index 9faa930fc..e3328f3fa 100644
--- a/packages/website/ts/pages/documentation/docs_home.tsx
+++ b/packages/website/ts/pages/documentation/docs_home.tsx
@@ -84,6 +84,15 @@ const CATEGORY_TO_PACKAGES: ObjectMap<Package[]> = {
         },
         {
             description:
+                "A Python library for interacting with 0x orders. Generate an orderHash, sign an order, validate it's signature and more.",
+            link: {
+                title: '0x-order-utils.py',
+                to: 'http://0x-order-utils-py.s3-website-us-east-1.amazonaws.com/',
+                shouldOpenInNewTab: true,
+            },
+        },
+        {
+            description:
                 'An http & websocket client for interacting with relayers that have implemented the [Standard Relayer API](https://github.com/0xProject/standard-relayer-api)',
             link: {
                 title: '@0x/connect',
diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx
index e2af40c8d..bb76efe21 100644
--- a/packages/website/ts/pages/landing/landing.tsx
+++ b/packages/website/ts/pages/landing/landing.tsx
@@ -36,8 +36,8 @@ interface Project {
 }
 
 const THROTTLE_TIMEOUT = 100;
-const WHATS_NEW_TITLE = '0x Protocol v2 is Live!';
-const WHATS_NEW_URL = 'https://blog.0xproject.com/0x-protocol-v2-0-is-live-183aac180149';
+const WHATS_NEW_TITLE = 'Introducing the 0x Launch Kit';
+const WHATS_NEW_URL = 'https://blog.0xproject.com/introducing-the-0x-launch-kit-4acdc3453585';
 const TITLE_STYLE: React.CSSProperties = {
     fontFamily: 'Roboto Mono',
     color: colors.grey,