burn clover coin when seller is contract

Author: okwme

contracts/ClubTokenController.sol

@@ -142,6 +142,11 @@ contract ClubTokenController is IClubTokenController, BancorFormula, HasNoTokens
         clubToken.transfer(msg.value);
     }
 
+    function burn(address from, uint256 amount) public {
+        require(msg.sender == simpleCloversMarket);
+        IClubToken(clubToken).burn(from, amount);
+    }
+
     function transferFrom(address from, address to, uint256 amount) public {
         require(msg.sender == simpleCloversMarket || msg.sender == curationMarket);
         IClubToken(clubToken).transferFrom(from, to, amount);

contracts/SimpleCloversMarket.sol

@@ -70,7 +70,12 @@ contract SimpleCloversMarket is Ownable {
         if(IClubToken(clubToken).balanceOf(msg.sender) < sellPrice) {
             IClubTokenController(clubTokenController).buy.value(msg.value)(msg.sender);
         }
-        IClubTokenController(clubTokenController).transferFrom(msg.sender, sellFrom, sellPrice);
+        // if seller is Clovers Contract, burn the money
+        if (sellFrom == clovers) {
+            IClubTokenController(clubTokenController).burn(msg.sender, sellPrice);
+        } else {
+            IClubTokenController(clubTokenController).transferFrom(msg.sender, sellFrom, sellPrice);
+        }
         ICloversController(cloversController).transferFrom(sellFrom, msg.sender, _tokenId);
         delete(sells[_tokenId]);
         updatePrice(_tokenId, 0);

helpers/migVals.js

@@ -16,9 +16,9 @@ var vals = (module.exports = {
 
   decimals: '18',
   oracle: '0xb20fbdc70c19d0ebcee204d32e1828fca9c2fb09',
-  reserveRatio: '333333', // parts per million 500000 / 1000000 = 1/2
-  virtualBalance: utils.toWei('33'),
-  virtualSupply: utils.toWei('100000'),
+  reserveRatio: '750000', // parts per million 500000 / 1000000 = 1/2
+  virtualBalance: utils.toWei('10'),
+  virtualSupply: utils.toWei('10000'),
   virtualBalanceCM: utils.toWei('33333'),
   virtualSupplyCM: utils.toWei('100000'),
   updateCloversController,

migrations/12_migrate_from_new_contract.js

@@ -7,6 +7,9 @@ var start = 0
 // var Web3 = require('web3')
 var fs = require('fs');
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
+
+const badAccounts = ['0x5899c1651653E1e4A110Cd45C7f4E9F576dE0670', '0x35b701E4550f0FCC45d854040562e35A4600e4Ee', '0x284bAAE3a186f6272309f7cc955AA76f21cF5375', ]
+const goodOwner = '0x45e25795A72881a4D80C59B5c60120655215a053' // clovers "goodPlayer" account
 module.exports = async function(deployer, network, accounts) {
   if (network === 'test') return
   var doFors = (n, i = 0, func) => {
@@ -66,6 +69,10 @@ module.exports = async function(deployer, network, accounts) {
             var tokenId = await clovers.tokenByIndex(i)
 
             let owner = await clovers.ownerOf(tokenId)
+            if (badAccounts.map( a => a.replace("0x", "").toLowerCase()).includes(owner.toLowerCase().replace("0x", ""))) {
+              owner = goodOwner
+            }
+
             let keep = await clovers.getKeep( tokenId)
             let blockMinted = await clovers.getBlockMinted(tokenId)
             let cloverMoves = await clovers.getCloverMoves(tokenId)