@0x/sol-compiler: Fix CompilerOptions schema.

`@0x/contract-addresses`: Add `exchangeProxyGovernor`. `@0x/migrations`: Add `exchangeProxyGovernor`.
0xProject · Jun 11, 2020 · ba13de8 · ba13de8
1 parent 2c371d0
commit ba13de8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 31 deletions.
diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json
@@ -31,13 +31,14 @@
         "curveBridge": "0x6dc7950423ada9f56fb2c93a23edb787f1e29088",
         "maximumGasPrice": "0xe2bfd35306495d11e3c9db0d8de390cda24563cf",
         "dexForwarderBridge": "0x5591360f8c7640fea5771c9682d6b5ecb776e1f8",
-        "exchangeProxy": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyAllowanceTarget": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyTransformerDeployer": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb",
+        "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da",
         "transformers": {
-            "wethTransformer": "0x0000000000000000000000000000000000000000",
-            "payTakerTransformer": "0x0000000000000000000000000000000000000000",
-            "fillQuoteTransformer": "0x0000000000000000000000000000000000000000"
+            "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8",
+            "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841",
+            "fillQuoteTransformer": "0x9b81a08ef144e7aa4925f7fd77da1e1b3990e59a"
         }
     },
     "3": {
@@ -72,13 +73,14 @@
         "curveBridge": "0x0000000000000000000000000000000000000000",
         "maximumGasPrice": "0x407b4128e9ecad8769b2332312a9f655cb9f5f3a",
         "dexForwarderBridge": "0x3be8e59038d8c4e8d8776ca40ef2f024bad95ad1",
-        "exchangeProxy": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyAllowanceTarget": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyTransformerDeployer": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb",
+        "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da",
         "transformers": {
-            "wethTransformer": "0x0000000000000000000000000000000000000000",
-            "payTakerTransformer": "0x0000000000000000000000000000000000000000",
-            "fillQuoteTransformer": "0x0000000000000000000000000000000000000000"
+            "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8",
+            "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841",
+            "fillQuoteTransformer": "0x9b81a08ef144e7aa4925f7fd77da1e1b3990e59a"
         }
     },
     "4": {
@@ -113,13 +115,14 @@
         "curveBridge": "0x0000000000000000000000000000000000000000",
         "maximumGasPrice": "0x47697b44bd89051e93b4d5857ba8e024800a74ac",
         "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
-        "exchangeProxy": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyAllowanceTarget": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyTransformerDeployer": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb",
+        "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da",
         "transformers": {
-            "wethTransformer": "0x0000000000000000000000000000000000000000",
-            "payTakerTransformer": "0x0000000000000000000000000000000000000000",
-            "fillQuoteTransformer": "0x0000000000000000000000000000000000000000"
+            "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8",
+            "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841",
+            "fillQuoteTransformer": "0x9b81a08ef144e7aa4925f7fd77da1e1b3990e59a"
         }
     },
     "42": {
@@ -154,13 +157,14 @@
         "curveBridge": "0x90c62c91a9f655f4f739e6cee85c84f9ccf47323",
         "maximumGasPrice": "0x67a094cf028221ffdd93fc658f963151d05e2a74",
         "dexForwarderBridge": "0x6cce442a48ab07635462a40594054f34f44195ff",
-        "exchangeProxy": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyAllowanceTarget": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyTransformerDeployer": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb",
+        "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da",
         "transformers": {
-            "wethTransformer": "0x0000000000000000000000000000000000000000",
-            "payTakerTransformer": "0x0000000000000000000000000000000000000000",
-            "fillQuoteTransformer": "0x0000000000000000000000000000000000000000"
+            "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8",
+            "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841",
+            "fillQuoteTransformer": "0x9b81a08ef144e7aa4925f7fd77da1e1b3990e59a"
         }
     },
     "1337": {
@@ -195,13 +199,14 @@
         "curveBridge": "0x0000000000000000000000000000000000000000",
         "maximumGasPrice": "0x0000000000000000000000000000000000000000",
         "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
-        "exchangeProxy": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyAllowanceTarget": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyTransformerDeployer": "0x0000000000000000000000000000000000000000",
+        "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e",
+        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        "exchangeProxyAllowanceTarget": "0xf740b67da229f2f10bcbd38a7979992fcc71b8eb",
+        "exchangeProxyTransformerDeployer": "0x80a36559ab9a497fb658325ed771a584eb0f13da",
         "transformers": {
-            "wethTransformer": "0x0000000000000000000000000000000000000000",
-            "payTakerTransformer": "0x0000000000000000000000000000000000000000",
-            "fillQuoteTransformer": "0x0000000000000000000000000000000000000000"
+            "wethTransformer": "0x7bab5f7299e1ca123bb44eb71e6c89be7e558cc8",
+            "payTakerTransformer": "0xe8c07a119452b55eee2f999478aab97f3656d841",
+            "fillQuoteTransformer": "0x9b81a08ef144e7aa4925f7fd77da1e1b3990e59a"
         }
     }
 }
diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts
@@ -32,6 +32,7 @@ export interface ContractAddresses {
     chainlinkStopLimit: string;
     maximumGasPrice: string;
     dexForwarderBridge: string;
+    exchangeProxyGovernor: string;
     exchangeProxy: string;
     exchangeProxyAllowanceTarget: string;
     exchangeProxyTransformerDeployer: string;

diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts
@@ -324,6 +324,7 @@ export async function runMigrationsAsync(
         chainlinkStopLimit: NULL_ADDRESS,
         maximumGasPrice: NULL_ADDRESS,
         dexForwarderBridge: NULL_ADDRESS,
+        exchangeProxyGovernor: NULL_ADDRESS,
         exchangeProxy: NULL_ADDRESS,
         exchangeProxyAllowanceTarget: NULL_ADDRESS,
         exchangeProxyTransformerDeployer: NULL_ADDRESS,

diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
@@ -9,6 +9,10 @@
             {
                 "note": "Filter `receive` functions from 0.6 ABIs",
                 "pr": 2540
+            },
+            {
+                "note": "Fix `CompilerOptions` schema",
+                "pr": 2591
             }
         ]
     },

diff --git a/packages/sol-compiler/src/schemas/compiler_options_schema.ts b/packages/sol-compiler/src/schemas/compiler_options_schema.ts
@@ -3,7 +3,7 @@ export const compilerOptionsSchema = {
     properties: {
         contractsDir: { type: 'string' },
         artifactsDir: { type: 'string' },
-        solcVersion: { type: 'string', pattern: '^\\d+.\\d+.\\d+$' },
+        solcVersion: { type: 'string', pattern: '^\\d+.\\d+.\\d+\\+commit\\.[a-f0-9]{8}$' },
         compilerSettings: { type: 'object' },
         contracts: {
             oneOf: [