maybe ready to deploy

Author: okwme

contracts/CloversController.sol

@@ -33,16 +33,14 @@ contract CloversController is HasNoEther, HasNoTokens {
     address public curationMarket;
 
     uint256 public gasLastUpdated_fastGasPrice_averageGasPrice_safeLowGasPrice;
-    // uint256 memory public gasLastUpdated;
-    // uint256 memory public fastGasPrice;
-    // uint256 memory public averageGasPrice;
-    // uint256 memory public safeLowGasPrice;
 
     uint256 public basePrice;
     uint256 public priceMultiplier;
     uint256 public payMultiplier;
     uint256 public stakeAmount;
     uint256 public stakePeriod;
+    uint256 public constant oneGwei = 1000000000;
+    uint256 public gasBlockMargin = 240; // ~1 hour at 15 second blocks
 
     struct Commit {
         bool collected;
@@ -196,6 +194,10 @@ contract CloversController is HasNoEther, HasNoTokens {
         return basePrice.add(calculateReward(_symmetries));
     }
 
+    function updateGasBlockMargin(uint256 _gasBlockMargin) public onlyOwnerOrOracle {
+        gasBlockMargin = _gasBlockMargin;
+    }
+
     function updateGasPrices(uint256 _fastGasPrice, uint256 _averageGasPrice, uint256 _safeLowGasPrice) public onlyOwnerOrOracle {
         uint256 gasLastUpdated = block.number << 192;
         uint256 fastGasPrice = _fastGasPrice << 128;
@@ -205,7 +207,6 @@ contract CloversController is HasNoEther, HasNoTokens {
     }
 
     function gasLastUpdated() public view returns(uint256) {
-
         return uint256(uint64(gasLastUpdated_fastGasPrice_averageGasPrice_safeLowGasPrice >> 192));
     }
     function fastGasPrice() public view returns(uint256) {
@@ -217,6 +218,13 @@ contract CloversController is HasNoEther, HasNoTokens {
     function safeLowGasPrice() public view returns(uint256) {
         return uint256(uint64(gasLastUpdated_fastGasPrice_averageGasPrice_safeLowGasPrice));
     }
+    function getGasPriceForApp() public view returns(uint256) {
+        if (block.number.sub(gasLastUpdated()) > gasBlockMargin) {
+            return oneGwei.mul(10);
+        } else {
+            return fastGasPrice();
+        }
+    }
 
     /**
     * @dev Claim the Clover without a commit or reveal. Payable so you can attach enough for the stake,
@@ -233,8 +241,7 @@ contract CloversController is HasNoEther, HasNoTokens {
 
         bytes32 movesHash = keccak256(moves);
 
-        uint256 fastGasPrice = uint256(uint64(gasLastUpdated_fastGasPrice_averageGasPrice_safeLowGasPrice >> 128));
-        uint256 stakeWithGas = stakeAmount.mul(fastGasPrice);
+        uint256 stakeWithGas = stakeAmount.mul(getGasPriceForApp());
         require(msg.value >= stakeWithGas);
         require(getCommit(movesHash) == 0);
 

helpers/migVals.js

@@ -3,7 +3,7 @@ const utils = require('web3-utils')
 const oneGwei = 1000000000
 var vals = (module.exports = {
   // stakeAmount: new BigNumber(529271).mul(1000000000).mul(40), // gasPrice * 1GWEI * 40 (normal person price)
-  stakeAmount: new BigNumber(190621).mul(5000000000).mul(1), // gasPrice * 10GWEI (oracle price)
+  stakeAmount: new BigNumber(190621), // gasPrice * 10GWEI (oracle price)
   fastGasPrice: new BigNumber(10).mul(oneGwei),
   averageGasPrice: new BigNumber(5).mul(oneGwei),
   safeLowGasPrice: new BigNumber(1).mul(oneGwei),

migrations/2_deploy_contracts.js

@@ -13,7 +13,7 @@ const overwrites = {
   Support: false,
   Clovers: false,
   CloversMetadata: false,
-  CloversController: false,
+  CloversController: true,
   ClubTokenController: false,
   SimpleCloversMarket: false,
   // CurationMarket: false,

test/CloversController.test.js

@@ -981,7 +981,7 @@ contract('Clovers', async function(accounts) {
     })
 
     it('should make sure claimClover (_keep = false) is successful using valid game w/ invalid symmetries', async function() {
-      var gasPrice = await cloversController.fastGasPrice()
+      var gasPrice = await cloversController.getGasPriceForApp()
       var stakeWithGas = gasPrice.mul(stakeAmount) 
       try {
         let options = [
@@ -1016,7 +1016,7 @@ contract('Clovers', async function(accounts) {
     it('should make sure stake amount was removed from your account', async function() {
       let gasCost = gasSpent * parseInt(globalGasPrice)
       _balance = web3.eth.getBalance(accounts[0])
-      var gasPrice = await cloversController.fastGasPrice()
+      var gasPrice = await cloversController.getGasPriceForApp()
       var stakeWithGas = gasPrice.mul(stakeAmount)
       assert(
         balance
@@ -1202,7 +1202,7 @@ contract('Clovers', async function(accounts) {
 
     let symmetries = rev.returnSymmetriesAsBN()
     let stakeAmount = await cloversController.stakeAmount()
-    let gasPrice = await cloversController.fastGasPrice()
+    let gasPrice = await cloversController.getGasPriceForApp()
     console.log(`fastGasPrice = ${utils.fromWei(gasPrice.toString(10))} (${gasPrice.toString(10)} wei)`)
     console.log(`stakeAmount = ${utils.fromWei(stakeAmount.toString(10))} (${stakeAmount.toString(10)} wei)`)