Deploy matic

bakaoh · Sep 6, 2019 · b14a401 · b14a401
1 parent 3c49e7c
commit b14a401
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 64 deletions.
diff --git a/packages/augur-artifacts/src/addresses.json b/packages/augur-artifacts/src/addresses.json
@@ -173,22 +173,24 @@
   "ZeroXTradeToken": "0x204cDD1689c8A4da426894C150a0fa672a2eab4C"
  },
  "8995": {
-  "Controller": "0xfcaf25bf38e7c86612a25ff18cb8e09ab07c9885",
-  "Universe": "0x077c4f7463824c0461c0be9b4af270a14aea16f4",
-  "Augur": "0x25ff5dc79a7c4e34254ff0f4a19d69e491201dd3",
-  "LegacyReputationToken": "0xf5f22562ec76f33a9f114e0ca9e3916c383df041",
-  "CancelOrder": "0xce77d3c706e0fe6da5d71b1249756b5ea0d77202",
-  "Cash": "0x575f3c652894360f4b7655379ea1eae53381e012",
-  "ClaimTradingProceeds": "0x635c8ef61a07dfe49b683d1a34da3547b0d6705e",
-  "CompleteSets": "0x257b56115544e9519fb2de5b7b99c3c2150528fb",
-  "CreateOrder": "0x8bdad8ee0b47e2e7294a5b8b8b74ea3968f4a177",
-  "FillOrder": "0xdd1c4919217e409abeb699e8171a5e92c2e506fa",
-  "Order": "0x905419e7a1f96a973ab8988ba19c84135c6f7122",
-  "Orders": "0xee7ec8baf44d90535adecfc652ef05925404e6ea",
-  "OrdersFetcher": "0xf3bcabd8fae29f75be271ebe2499edb4c7c139b7",
-  "ShareToken": "0x80f8daa435a9ab4b1802ba56fe7e0abd0f8ab3d3",
-  "Trade": "0xb03cf72bc5a9a344aac43534d664917927367487",
-  "TradingEscapeHatch": "0xdfef677bf5f66f3eeff481a587c04cb58e95b92a"
+  "Augur": "0xEe04eA1D7A5910844Eb7073Efba4F74885f64814",
+  "Universe": "0xeDd33734f0323e60c5E57fE821A2E811489b41eB",
+  "LegacyReputationToken": "0xe6994C7BF2c4a0B8bf6754767cbB25f569057489",
+  "Cash": "0x0a9e53dB7805eb28e73b44a0E1972d7198c7E6B2",
+  "ProxyFactory": "0x18B436d7eD6DDC38C98110bD66B3FC476BFDd0Ee",
+  "GnosisSafe": "0x8068D746129b43aa22642cAe4BFE56a9B1dd6Bb5",
+  "CancelOrder": "0x9264D47e31D7bEAbcAD3A900cD72BFe0083d9527",
+  "ClaimTradingProceeds": "0xA09Da42Ed05C80BBabDDda8Bbda9FD44bcE53D6B",
+  "CompleteSets": "0xBf32613197ad542D4E4C71E431006810B4B6C634",
+  "CreateOrder": "0xa706f7C0cB090b5EcEB10aB49162bDFF67FB179A",
+  "FillOrder": "0x6Ec11F087a874d491e6C051ff829E0fB61bd950A",
+  "OICash": "0x131b8CA33870013f3e44B6Ad2A69e42D3547cEea",
+  "Orders": "0x62f92754305Be6F4A0C46f48d29F3e513Ca83B27",
+  "ProfitLoss": "0x9a32A8c4c0a3b3203206c61d360B9B8Cdaa0F169",
+  "ShareToken": "0x3a2C4F09C949bF8B730662bf31C12f623f6Ed319",
+  "SimulateTrade": "0xa2ef337469De832a64c7906d41799F94CCF23CD9",
+  "Trade": "0x3d3A4642EeFC4fAEE11F2576391e6FbBc49431F1",
+  "ZeroXTradeToken": "0x39C51d6b184099b319A5dC68eaa1cfE594e97E59"
  },
  "12346": {
   "Augur": "0xFCaf25bF38E7C86612a25ff18CB8e09aB07c9885",

diff --git a/packages/augur-artifacts/src/contracts.json b/packages/augur-artifacts/src/contracts.json
diff --git a/packages/augur-core/source/libraries/NetworkConfiguration.ts b/packages/augur-core/source/libraries/NetworkConfiguration.ts
@@ -19,6 +19,7 @@ export const NETWORKS = [
   'thunder',
   'testrpc',
   "mainnet",
+  'matic',
 ] as const;
 
 export type NETWORKS = typeof NETWORKS[number];
@@ -91,6 +92,12 @@ const networks: NetworksToOptions = {
             ? new ethers.utils.BigNumber(20)
             : new ethers.utils.BigNumber(process.env.ETHEREUM_GAS_PRICE_IN_NANOETH!)).mul(new ethers.utils.BigNumber(1e9)),
     },
+    matic: {
+        isProduction: false,
+        http: "https://testnet2.matic.network",
+        privateKey: process.env.ETHEREUM_PRIVATE_KEY || "fae42052f82bed612a724fec3632f325f377120592c75bb78adfcceae6470c5a",
+        gasPrice: new ethers.utils.BigNumber(0)
+    },
 };
 
 export class NetworkConfiguration {

diff --git a/packages/augur-ui/package.json b/packages/augur-ui/package.json
@@ -19,6 +19,7 @@
     "build": "genversion --es6 --semi src/version.js && node scripts/build.js",
     "build:kovan": "genversion --es6 --semi src/version.js && ETHEREUM_NETWORK=kovan node scripts/build.js",
     "build:mainnet": "genversion --es6 --semi src/version.js && ETHEREUM_NETWORK=mainnet node scripts/build.js",
+    "build:matic": "genversion --es6 --semi src/version.js && ETHEREUM_NETWORK=matic node scripts/build.js",
     "start": "node server.js",
     "__": "",
     "integration:headless": "AUGUR_URL='http://localhost:8080/' jest --runInBand --detectOpenHandles --forceExit",

diff --git a/packages/augur-ui/src/config/network.json b/packages/augur-ui/src/config/network.json
@@ -138,5 +138,19 @@
       "connect": true,
       "broadcast": false
     }
+  },
+  "matic": {
+    "ethereum-node": {
+        "http": "https://testnet2.matic.network",
+        "ws": null,
+        "pollingIntervalMilliseconds": 10000,
+        "blockRetention": 100,
+        "connectionTimeout": 60000
+    },
+    "universe": null,
+    "debug": {
+        "connect": true,
+        "broadcast": false
+    }
   }
 }
diff --git a/packages/augur-ui/src/modules/common/constants.ts b/packages/augur-ui/src/modules/common/constants.ts
@@ -37,6 +37,7 @@ export const NETWORK_NAMES = {
   3: 'Ropsten',
   4: 'Rinkeby',
   42: 'Kovan',
+  8995: 'Matic',
   123456: 'Private',
 };
 // network name to id map
@@ -45,6 +46,7 @@ export const NETWORK_IDS = {
   Ropsten: '3',
   Rinkeby: '4',
   Kovan: '42',
+  Matic: '8995',
   Private1: '101',
   Private2: '102',
   Private3: '103',