status-im
/
status-network-token
mirror of https://github.com/status-im/status-network-token.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #88 from status-im/revert-80-sgtLimit 

Revert "First Ceiling SGT Holders up to limit"
This commit is contained in:
Jarrad 2017-06-15 11:34:27 +08:00 committed by GitHub
parent 2e7913d576 6f1a01184a
commit a27d9d4baf
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/StatusContribution.sol
View File

@ -40,7 +40,6 @@ contract StatusContribution is Owned, TokenController {
uint256 constant public failSafe = 300000 ether;
uint256 constant public exchangeRate = 10000;
uint256 constant public maxGasPrice = 50000000000;
uint256 constant public limitSGT = 30 ether;
MiniMeToken public SGT;
MiniMeToken public SNT;
@ -59,7 +58,6 @@ contract StatusContribution is Owned, TokenController {
mapping (address => uint256) public guaranteedBuyersLimit;
mapping (address => uint256) public guaranteedBuyersBought;
mapping (address => uint256) public sgtCollected;
uint256 public totalGuaranteedCollected;
uint256 public totalNormalCollected;
@ -216,15 +214,6 @@ contract StatusContribution is Owned, TokenController {
toFund = toCollect;
}
uint256 currentIndex = dynamicCeiling.currentIndex();
if (currentIndex == 0) {
require(SGT.balanceOf(_th) > 0);
if (sgtCollected[_th].add(toFund) > limitSGT) {
toFund = limitSGT.sub(sgtCollected[_th]);
}
sgtCollected[_th] = sgtCollected[_th].add(toFund);
}
totalNormalCollected = totalNormalCollected.add(toFund);
doBuy(_th, toFund, false);
}

2
test/dynamicCeiling.js
View File

@ -193,7 +193,7 @@ contract("DynamicCeiling", (accounts) => {
web3.sha3("pwd0"),
web3.sha3("pwd1"),
web3.sha3("pwd2"),
]
],
);
assert.equal(await dynamicCeiling.currentIndex(), 0);