stable mainnet deploys

okwme · okwme · commit 07645cfe9e07 · 2019-08-25T11:32:20.000+02:00
diff --git a/build/contracts/Clovers.json b/build/contracts/Clovers.json
@@ -18340,4 +18340,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.756Z"
-}
+}
diff --git a/build/contracts/CloversController.json b/build/contracts/CloversController.json
@@ -45591,4 +45591,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.891Z"
-}
+}
diff --git a/build/contracts/CloversMetadata.json b/build/contracts/CloversMetadata.json
@@ -3835,4 +3835,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.640Z"
-}
+}
diff --git a/build/contracts/ClubToken.json b/build/contracts/ClubToken.json
@@ -8340,4 +8340,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.653Z"
-}
+}
diff --git a/build/contracts/ClubTokenController.json b/build/contracts/ClubTokenController.json
@@ -14166,4 +14166,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.729Z"
-}
+}
diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json
@@ -1396,4 +1396,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.604Z"
-}
+}
diff --git a/build/contracts/Reversi.json b/build/contracts/Reversi.json
@@ -51227,4 +51227,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.953Z"
-}
+}
diff --git a/build/contracts/SimpleCloversMarket.json b/build/contracts/SimpleCloversMarket.json
@@ -11377,4 +11377,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.715Z"
-}
+}
diff --git a/build/contracts/Support.json b/build/contracts/Support.json
@@ -9709,4 +9709,4 @@
   },
   "schemaVersion": "2.0.1",
   "updatedAt": "2019-08-24T12:45:28.682Z"
-}
+}
diff --git a/conf/network-restore.js b/conf/network-restore.js
@@ -0,0 +1,11 @@
+const path = require('path')
+
+const BASE_DIR = path.join(__dirname, '..')
+const BUILD_DIR = path.join(BASE_DIR, 'build/contracts')
+const NETWORKS_FILE_PATH = path.join(BASE_DIR, 'networks.json')
+
+module.exports = {
+  buildPath: BUILD_DIR,
+  networkFilePath: NETWORKS_FILE_PATH,
+  buildDirDependencies: []
+}
diff --git a/contracts/CloversController.sol b/contracts/CloversController.sol
@@ -34,7 +34,7 @@ contract CloversController is HasNoEther, HasNoTokens {
 
     uint256 public fastGasPrice;
     uint256 public averageGasPrice;
-    uint256 public slowGasPrice;
+    uint256 public slowSafeGasPrice;
 
     uint256 public basePrice;
     uint256 public priceMultiplier;
@@ -194,10 +194,10 @@ contract CloversController is HasNoEther, HasNoTokens {
         return basePrice.add(calculateReward(_symmetries));
     }
 
-    function setGasPrices(uint256 _slowGasPrice, uint256 _averageGasPrice, uint256 _fastGasPrice) public onlyOwnerOrOracle {
+    function setGasPrices(uint256 _slowSafeGasPrice, uint256 _averageGasPrice, uint256 _fastGasPrice) public onlyOwnerOrOracle {
         fastGasPrice = _fastGasPrice;
         averageGasPrice = _averageGasPrice;
-        slowGasPrice = _slowGasPrice;
+        slowSafeGasPrice = _slowSafeGasPrice;
     }
 
     /**
@@ -318,7 +318,7 @@ contract CloversController is HasNoEther, HasNoTokens {
     * @param _tokenId The board which holds the stake.
     * @return A boolean representing whether or not the retrieval was successful.
     */
-    function retrieveStake(uint256 _tokenId, uint256 _fastGasPrice, uint256 _averageGasPrice, uint256 _slowGasPrice) public payable returns (bool) {
+    function retrieveStake(uint256 _tokenId, uint256 _fastGasPrice, uint256 _averageGasPrice, uint256 _slowSafeGasPrice) public payable returns (bool) {
         bytes28[2] memory moves = Clovers(clovers).getCloverMoves(_tokenId);
         bytes32 movesHash = keccak256(moves);
 
@@ -354,7 +354,7 @@ contract CloversController is HasNoEther, HasNoTokens {
         emit stakeRetrieved(_tokenId, msg.sender, stake);
 
         if (msg.sender == owner || msg.sender == oracle) {
-            setGasPrices(_fastGasPrice, _averageGasPrice, _slowGasPrice);
+            setGasPrices(_fastGasPrice, _averageGasPrice, _slowSafeGasPrice);
         }
 
         return true;
@@ -377,7 +377,7 @@ contract CloversController is HasNoEther, HasNoTokens {
     * @param _tokenId The board being challenged.
     * @return A boolean representing whether or not the challenge was successful.
     */
-    function challengeClover(uint256 _tokenId, uint256 _fastGasPrice, uint256 _averageGasPrice, uint256 _slowGasPrice) public returns (bool) {
+    function challengeClover(uint256 _tokenId, uint256 _fastGasPrice, uint256 _averageGasPrice, uint256 _slowSafeGasPrice) public returns (bool) {
         bool valid = true;
         bytes28[2] memory moves = Clovers(clovers).getCloverMoves(_tokenId);
 
@@ -413,7 +413,7 @@ contract CloversController is HasNoEther, HasNoTokens {
         Clovers(clovers).deleteClover(_tokenId);
         deleteCommit(movesHash);
         if (msg.sender == owner || msg.sender == oracle) {
-            setGasPrices(_fastGasPrice, _averageGasPrice, _slowGasPrice);
+            setGasPrices(_fastGasPrice, _averageGasPrice, _slowSafeGasPrice);
         }
         return true;
     }
diff --git a/extract_network_info.js b/extract_network_info.js
@@ -0,0 +1,8 @@
+const extractNetworks = require('@gnosis.pm/util-contracts/src/util/extractNetworks')
+const path = require('path')
+
+const DEFAULT_CONF_FILE = path.join(__dirname, './conf/network-restore')
+
+const confFile = process.env.CONF_FILE || DEFAULT_CONF_FILE
+extractNetworks(confFile)
+  .catch(console.error)
diff --git a/inject_network_info.js b/inject_network_info.js
@@ -0,0 +1,8 @@
+const injectNetworks = require('@gnosis.pm/util-contracts/src/util/injectNetworks')
+const path = require('path')
+
+const DEFAULT_CONF_FILE = path.join(__dirname, './conf/network-restore')
+
+const confFile = process.env.CONF_FILE || DEFAULT_CONF_FILE
+injectNetworks(confFile)
+  .catch(console.error)
diff --git a/networks.json b/networks.json
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
