Skip to content

ContinuousLocking4Reputation: use safemath #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 28, 2019
Merged

ContinuousLocking4Reputation: use safemath #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d721da9
continuoslocking4reputsation: safemath .
Sep 25, 2019
40ff3c3
bump v to rc.28
Sep 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions contracts/schemes/ContinuousLockingToken4Reputation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ contract ContinuousLocking4Reputation is Agreement {
require(_batchTime > 15, "batchTime should be > 15");
require(_maxLockingBatches <= MAX_LOCKING_BATCHES_HARDCAP,
"maxLockingBatches should be <= MAX_LOCKING_BATCHES_HARDCAP");
require(_redeemEnableTime >= _startTime+_batchTime,
require(_redeemEnableTime >= _startTime.add(_batchTime),
"_redeemEnableTime >= _startTime+_batchTime");
require(_batchesIndexCap <= BATCHES_INDEX_HARDCAP, "_batchesIndexCap > BATCHES_INDEX_HARDCAP");
token = _token;
Expand Down Expand Up @@ -129,10 +129,11 @@ contract ContinuousLocking4Reputation is Agreement {
// solhint-disable-next-line not-rely-on-time
require(now > redeemEnableTime, "now > redeemEnableTime");
Lock storage locker = lockers[_beneficiary][_lockingId];
require(locker.lockingTime != 0, "_lockingId does not exist");
uint256 batchIndexToRedeemFrom = (locker.lockingTime - startTime) / batchTime;
// solhint-disable-next-line not-rely-on-time
uint256 currentBatch = (now - startTime) / batchTime;
uint256 lastBatchIndexToRedeem = currentBatch.min(batchIndexToRedeemFrom + locker.period);
uint256 lastBatchIndexToRedeem = currentBatch.min(batchIndexToRedeemFrom.add(locker.period));
for (batchIndexToRedeemFrom; batchIndexToRedeemFrom < lastBatchIndexToRedeem; batchIndexToRedeemFrom++) {
Batch storage locking = batches[batchIndexToRedeemFrom];
uint256 score = locking.scores[_lockingId];
Expand Down Expand Up @@ -172,7 +173,7 @@ contract ContinuousLocking4Reputation is Agreement {
require(now >= startTime, "locking is not enabled yet (it starts at startTime)");
require(_period <= maxLockingBatches, "_period exceed the maximum allowed");
require(_period > 0, "_period must be > 0");
require((_batchIndexToLockIn + _period) <= batchesIndexCap,
require((_batchIndexToLockIn.add(_period)) <= batchesIndexCap,
"_batchIndexToLockIn + _period exceed max allowed batches");
lockCounter = lockCounter.add(1);
lockingId = lockCounter;
Expand All @@ -191,7 +192,7 @@ contract ContinuousLocking4Reputation is Agreement {
//fill in the next batches scores.
for (uint256 p = 0; p < _period; p++) {
Batch storage batch = batches[batchIndexToLockIn + p];
uint256 score = (_period - p) * _amount;
uint256 score = (_period - p).mul(_amount);
batch.totalScore = batch.totalScore.add(score);
batch.scores[lockingId] = score;
}
Expand All @@ -218,23 +219,23 @@ contract ContinuousLocking4Reputation is Agreement {
require(locker.lockingTime != 0, "_lockingId does not exist");
// remainBatchs is the number of future batches that are part of the currently active lock
uint256 remainBatches =
((locker.lockingTime + (locker.period*batchTime) - startTime)/batchTime).sub(_batchIndexToLockIn);
uint256 batchesCountFromCurrent = remainBatches + _extendPeriod;
((locker.lockingTime.add(locker.period*batchTime).sub(startTime))/batchTime).sub(_batchIndexToLockIn);
uint256 batchesCountFromCurrent = remainBatches.add(_extendPeriod);
require(batchesCountFromCurrent <= maxLockingBatches, "locking period exceeds the maximum allowed");
require(_extendPeriod > 0, "_extendPeriod must be > 0");
require((_batchIndexToLockIn + batchesCountFromCurrent) <= batchesIndexCap,
require((_batchIndexToLockIn.add(batchesCountFromCurrent)) <= batchesIndexCap,
"_extendPeriod exceed max allowed batches");
// solhint-disable-next-line not-rely-on-time
uint256 batchIndexToLockIn = (now - startTime) / batchTime;
require(batchIndexToLockIn == _batchIndexToLockIn, "locking is not active");
//fill in the next batch scores.
for (uint256 p = 0; p < batchesCountFromCurrent; p++) {
Batch storage batch = batches[batchIndexToLockIn + p];
uint256 score = (batchesCountFromCurrent - p) * locker.amount;
uint256 score = (batchesCountFromCurrent - p).mul(locker.amount);
batch.totalScore = batch.totalScore.add(score).sub(batch.scores[_lockingId]);
batch.scores[_lockingId] = score;
}
locker.period = locker.period + _extendPeriod;
locker.period = locker.period.add(_extendPeriod);
emit ExtendLocking(msg.sender, _lockingId, _extendPeriod);
}

Expand All @@ -250,7 +251,7 @@ contract ContinuousLocking4Reputation is Agreement {
amount = locker.amount;
locker.amount = 0;
// solhint-disable-next-line not-rely-on-time
require(block.timestamp > locker.lockingTime + (locker.period*batchTime),
require(block.timestamp > locker.lockingTime.add(locker.period*batchTime),
"locking period is still active");
totalLockedLeft = totalLockedLeft.sub(amount);
address(token).safeTransfer(_beneficiary, amount);
Expand Down
53 changes: 26 additions & 27 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@daostack/arc",
"version": "0.0.1-rc.27",
"version": "0.0.1-rc.28",
"description": "A platform for building DAOs",
"files": [
"contracts/",
Expand Down