merge base branch

5 files changed, 70 insertions, 35 deletions

diff --git a/packages/website/ts/containers/smart_contracts_documentation.ts b/packages/website/ts/containers/smart_contracts_documentation.ts
index 8d69afe71..05b2a50c3 100644
--- a/packages/website/ts/containers/smart_contracts_documentation.ts
+++ b/packages/website/ts/containers/smart_contracts_documentation.ts
@@ -37,28 +37,56 @@ const docsInfoConfig: DocsInfoConfig = {
     contractsByVersionByNetworkId: {
         '1.0.0': {
             [Networks.Mainnet]: {
-                [Sections.Exchange]: '0x12459c951127e0c374ff9105dda097662a027093',
-                [Sections.TokenTransferProxy]: '0x8da0d80f5007ef1e431dd2127178d224e32c2ef4',
-                [Sections.ZRXToken]: '0xe41d2489571d322189246dafa5ebde1f4699f498',
-                [Sections.TokenRegistry]: '0x926a74c5c36adf004c87399e65f75628b0f98d2c',
+                Exchange_v1: '0x12459c951127e0c374ff9105dda097662a027093',
+                TokenTransferProxy_v1: '0x8da0d80f5007ef1e431dd2127178d224e32c2ef4',
+                TokenRegistry: '0x926a74c5c36adf004c87399e65f75628b0f98d2c',
             },
             [Networks.Ropsten]: {
-                [Sections.Exchange]: '0x479cc461fecd078f766ecc58533d6f69580cf3ac',
-                [Sections.TokenTransferProxy]: '0x4e9aad8184de8833365fea970cd9149372fdf1e6',
-                [Sections.ZRXToken]: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
-                [Sections.TokenRegistry]: '0x6b1a50f0bb5a7995444bd3877b22dc89c62843ed',
+                Exchange_v1: '0x479cc461fecd078f766ecc58533d6f69580cf3ac',
+                TokenTransferProxy_v1: '0x4e9aad8184de8833365fea970cd9149372fdf1e6',
+                TokenRegistry: '0x6b1a50f0bb5a7995444bd3877b22dc89c62843ed',
             },
             [Networks.Kovan]: {
-                [Sections.Exchange]: '0x90fe2af704b34e0224bf2299c838e04d4dcf1364',
-                [Sections.TokenTransferProxy]: '0x087Eed4Bc1ee3DE49BeFbd66C662B434B15d49d4',
-                [Sections.ZRXToken]: '0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570',
-                [Sections.TokenRegistry]: '0xf18e504561f4347bea557f3d4558f559dddbae7f',
+                Exchange_v1: '0x90fe2af704b34e0224bf2299c838e04d4dcf1364',
+                TokenTransferProxy_v1: '0x087Eed4Bc1ee3DE49BeFbd66C662B434B15d49d4',
+                TokenRegistry: '0xf18e504561f4347bea557f3d4558f559dddbae7f',
             },
             [Networks.Rinkeby]: {
-                [Sections.Exchange]: '0x1d16ef40fac01cec8adac2ac49427b9384192c05',
-                [Sections.TokenTransferProxy]: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
-                [Sections.ZRXToken]: '0x00f58d6d585f84b2d7267940cede30ce2fe6eae8',
-                [Sections.TokenRegistry]: '0x4e9aad8184de8833365fea970cd9149372fdf1e6',
+                Exchange_v1: '0x1d16ef40fac01cec8adac2ac49427b9384192c05',
+                TokenTransferProxy_v1: '0xa8e9fa8f91e5ae138c74648c9c304f1c75003a8d',
+                TokenRegistry: '0x4e9aad8184de8833365fea970cd9149372fdf1e6',
+            },
+        },
+        '2.0.0': {
+            [Networks.Mainnet]: {
+                AssetProxyOwner: '0x17992e4ffb22730138e4b62aaa6367fa9d3699a6',
+                ERC20Proxy: '0x2240dab907db71e64d3e0dba4800c83b5c502d4e',
+                ERC721Proxy: '0x208e41fb445f1bb1b6780d58356e81405f3e6127',
+                Exchange: '0x4f833a24e1f95d70f028921e27040ca56e09ab0b',
+                Forwarder: '0x7afc2d5107af94c462a194d2c21b5bdd238709d6',
+                OrderValidator: '0x9463e518dea6810309563c81d5266c1b1d149138',
+                WETH9: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                ZRXToken: '0xe41d2489571d322189246dafa5ebde1f4699f498',
+            },
+            [Networks.Ropsten]: {
+                AssetProxyOwner: '0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b',
+                ERC20Proxy: '0xb1408f4c245a23c31b98d2c626777d4c0d766caa',
+                ERC721Proxy: '0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4',
+                Exchange: '0x4530c0483a1633c7a1c97d2c53721caff2caaaaf',
+                Forwarder: '0x3983e204b12b3c02fb0638caf2cd406a62e0ead3',
+                OrderValidator: '0x90431a90516ab49af23a0530e04e8c7836e7122f',
+                WETH9: '0xc778417e063141139fce010982780140aa0cd5ab',
+                ZRXToken: '0xff67881f8d12f372d91baae9752eb3631ff0ed00',
+            },
+            [Networks.Kovan]: {
+                AssetProxyOwner: '0x2c824d2882baa668e0d5202b1e7f2922278703f8',
+                ERC20Proxy: '0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e',
+                ERC721Proxy: '0x2a9127c745688a165106c11cd4d647d2220af821',
+                Exchange: '0x35dd2932454449b14cee11a94d3674a936d5d7b2',
+                Forwarder: '0xd85e2fa7e7e252b27b01bf0d65c946959d2f45b8',
+                OrderValidator: '0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d',
+                WETH9: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
+                ZRXToken: '0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa',
             },
         },
     },
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index c476f2358..4f0a12f20 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -27,47 +27,47 @@ import 'less/all.less';
 
 // We pass modulePromise returning lambda instead of module promise,
 // cause we only want to import the module when the user navigates to the page.
-// At the same time webpack statically parses for System.import() to determine bundle chunk split points
-// so each lazy import needs it's own `System.import()` declaration.
+// At the same time webpack statically parses for import() to determine bundle chunk split points
+// so each lazy import needs it's own `import()` declaration.
 
 const LazyPortal = createLazyComponent('Portal', async () =>
-    System.import<any>(/* webpackChunkName: "portal" */ 'ts/containers/portal'),
+    import(/* webpackChunkName: "portal" */ 'ts/containers/portal'),
 );
 const LazyZeroExJSDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "zeroExDocs" */ 'ts/containers/zero_ex_js_documentation'),
+    import(/* webpackChunkName: "zeroExDocs" */ 'ts/containers/zero_ex_js_documentation'),
 );
 const LazyContractWrappersDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "contractWrapperDocs" */ 'ts/containers/contract_wrappers_documentation'),
+    import(/* webpackChunkName: "contractWrapperDocs" */ 'ts/containers/contract_wrappers_documentation'),
 );
 const LazyOrderWatcherDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "orderWatcherDocs" */ 'ts/containers/order_watcher_documentation'),
+    import(/* webpackChunkName: "orderWatcherDocs" */ 'ts/containers/order_watcher_documentation'),
 );
 const LazySmartContractsDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "smartContractDocs" */ 'ts/containers/smart_contracts_documentation'),
+    import(/* webpackChunkName: "smartContractDocs" */ 'ts/containers/smart_contracts_documentation'),
 );
 const LazyConnectDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "connectDocs" */ 'ts/containers/connect_documentation'),
+    import(/* webpackChunkName: "connectDocs" */ 'ts/containers/connect_documentation'),
 );
 const LazyWeb3WrapperDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "web3WrapperDocs" */ 'ts/containers/web3_wrapper_documentation'),
+    import(/* webpackChunkName: "web3WrapperDocs" */ 'ts/containers/web3_wrapper_documentation'),
 );
 const LazySolCompilerDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "solCompilerDocs" */ 'ts/containers/sol_compiler_documentation'),
+    import(/* webpackChunkName: "solCompilerDocs" */ 'ts/containers/sol_compiler_documentation'),
 );
 const LazyJSONSchemasDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "jsonSchemasDocs" */ 'ts/containers/json_schemas_documentation'),
+    import(/* webpackChunkName: "jsonSchemasDocs" */ 'ts/containers/json_schemas_documentation'),
 );
 const LazySolCovDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "solCovDocs" */ 'ts/containers/sol_cov_documentation'),
+    import(/* webpackChunkName: "solCovDocs" */ 'ts/containers/sol_cov_documentation'),
 );
 const LazySubprovidersDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "subproviderDocs" */ 'ts/containers/subproviders_documentation'),
+    import(/* webpackChunkName: "subproviderDocs" */ 'ts/containers/subproviders_documentation'),
 );
 const LazyOrderUtilsDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "orderUtilsDocs" */ 'ts/containers/order_utils_documentation'),
+    import(/* webpackChunkName: "orderUtilsDocs" */ 'ts/containers/order_utils_documentation'),
 );
 const LazyEthereumTypesDocumentation = createLazyComponent('Documentation', async () =>
-    System.import<any>(/* webpackChunkName: "ethereumTypesDocs" */ 'ts/containers/ethereum_types_documentation'),
+    import(/* webpackChunkName: "ethereumTypesDocs" */ 'ts/containers/ethereum_types_documentation'),
 );
 
 const DOCUMENT_TITLE = '0x: The Protocol for Trading Tokens';
diff --git a/packages/website/ts/lazy_component.tsx b/packages/website/ts/lazy_component.tsx
index dce06ed8d..9d3b9944a 100644
--- a/packages/website/ts/lazy_component.tsx
+++ b/packages/website/ts/lazy_component.tsx
@@ -49,7 +49,7 @@ export class LazyComponent extends React.Component<LazyComponentProps, LazyCompo
  * @param  componentName    name of exported component
  * @param  lazyImport       lambda returning module promise
  *                          we pass a lambda because we only want to require a module if it's used
- * @example `const LazyPortal = createLazyComponent('Portal', () => System.import<any>('ts/containers/portal'));``
+ * @example `const LazyPortal = createLazyComponent('Portal', () => import<any>('ts/containers/portal'));``
  */
 export const createLazyComponent = (componentName: string, lazyImport: () => Promise<any>) => {
     return (props: any) => {
diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx
index efdf631b2..f9d7456c1 100644
--- a/packages/website/ts/pages/about/about.tsx
+++ b/packages/website/ts/pages/about/about.tsx
@@ -230,6 +230,13 @@ const teamRow8: ProfileInfo[] = [
         image: 'images/team/rahul.png',
         linkedIn: 'https://www.linkedin.com/in/rahul-singireddy-3037908a/',
     },
+    {
+        name: 'Jason Somensatto',
+        title: 'Strategic Legal Counsel',
+        description: `Legal. Previously head of blockchain and crypto practice at Orrick. JD from George Washington University and undergrad at UVA.`,
+        image: 'images/team/jason.png',
+        linkedIn: 'https://www.linkedin.com/in/jasonsomensatto/',
+    },
 ];
 
 const advisors1: ProfileInfo[] = [
diff --git a/packages/website/ts/pages/documentation/doc_page.tsx b/packages/website/ts/pages/documentation/doc_page.tsx
index 9092a5cde..c64751f65 100644
--- a/packages/website/ts/pages/documentation/doc_page.tsx
+++ b/packages/website/ts/pages/documentation/doc_page.tsx
@@ -146,9 +146,9 @@ export class DocPage extends React.Component<DocPageProps, DocPageState> {
             docAgnosticFormat = versionDocObj as DocAgnosticFormat;
             // HACK: need to modify docsInfo like convertToDocAgnosticFormat() would do
             this.props.docsInfo.menu.Contracts = [];
-            _.each(docAgnosticFormat, (docObj, contractName) => {
-                this.props.docsInfo.sections[contractName] = contractName;
-                this.props.docsInfo.menu.Contracts.push(contractName);
+            _.each(docAgnosticFormat, (_docObj, sectionName) => {
+                this.props.docsInfo.sections[sectionName] = sectionName;
+                this.props.docsInfo.menu.Contracts.push(sectionName);
             });
         }