Skip to content

ContinuousLocking4Reputation: score is per lockingId #664

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 19, 2019
Merged

ContinuousLocking4Reputation: score is per lockingId #664

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
a409de0
score is per lockingid (not per address)
Sep 18, 2019
b5aa91b
bump v to 0.0.1-rc.25
Sep 19, 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
4 changes: 0 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,3 @@ jobs:
- stage: tests
name: "JS Lint"
script: npm run lint


notifications:
slack: daostack:fGuaFPsiQiV5mgmzRcSzbYqw
48 changes: 30 additions & 18 deletions contracts/schemes/ContinuousLockingToken4Reputation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ contract ContinuousLocking4Reputation is Agreement {

struct Batch {
uint256 totalScore;
// A mapping from locker addresses to their locking score.
mapping(address=>uint256) scores;
// A mapping from lockingId to its score.
mapping(bytes32=>uint) scores;
}

struct Lock {
Expand Down Expand Up @@ -134,10 +134,10 @@ contract ContinuousLocking4Reputation is Agreement {
uint256 lastBatchIndexToRedeem = currentBatch.min(batchIndexToRedeemFrom + locker.period);
for (batchIndexToRedeemFrom; batchIndexToRedeemFrom < lastBatchIndexToRedeem; batchIndexToRedeemFrom++) {
Batch storage locking = batches[batchIndexToRedeemFrom];
uint256 score = locking.scores[_beneficiary];
uint256 score = locking.scores[_lockingId];
if (score > 0) {
locking.scores[_beneficiary] = 0;
uint256 batchReputationReward = repRewardPerBatch(batchIndexToRedeemFrom);
locking.scores[_lockingId] = 0;
uint256 batchReputationReward = getRepRewardPerBatch(batchIndexToRedeemFrom);
uint256 repRelation = mul(toReal(uint216(score)), batchReputationReward);
reputation = reputation.add(div(repRelation, toReal(uint216(locking.totalScore))));
}
Expand Down Expand Up @@ -170,6 +170,15 @@ contract ContinuousLocking4Reputation is Agreement {
require(_period <= maxLockingBatches, "period exceed the maximum allowed");
require(_period > 0, "period equal to zero");
require((_batchIndexToLockIn + _period) <= batchesIndexCap, "exceed max allowed batches");
lockingId = keccak256(abi.encodePacked(address(this), batchesCounter));
batchesCounter = batchesCounter.add(1);

Lock storage locker = lockers[msg.sender][lockingId];
locker.amount = _amount;
locker.period = _period;
// solhint-disable-next-line not-rely-on-time
locker.lockingTime = now;

address(token).safeTransferFrom(msg.sender, address(this), _amount);
// solhint-disable-next-line not-rely-on-time
uint256 batchIndexToLockIn = (now - startTime) / batchTime;
Expand All @@ -181,17 +190,9 @@ contract ContinuousLocking4Reputation is Agreement {
uint256 score = (_period - j + 1) * _amount;
j--;
batch.totalScore = batch.totalScore.add(score);
batch.scores[msg.sender] = score;
batch.scores[lockingId] = score;
}

lockingId = keccak256(abi.encodePacked(address(this), batchesCounter));
batchesCounter = batchesCounter.add(1);

Lock storage locker = lockers[msg.sender][lockingId];
locker.amount = _amount;
locker.period = _period;
// solhint-disable-next-line not-rely-on-time
locker.lockingTime = now;
totalLockedLeft = totalLockedLeft.add(_amount);
emit LockToken(msg.sender, lockingId, _amount, _period);
}
Expand Down Expand Up @@ -230,8 +231,8 @@ contract ContinuousLocking4Reputation is Agreement {
Batch storage batch = batches[uint256(i)];
uint256 score = (batchesCountFromCurrent - j + 1) * locker.amount;
j--;
batch.totalScore = batch.totalScore.add(score).sub(batch.scores[msg.sender]);
batch.scores[msg.sender] = score;
batch.totalScore = batch.totalScore.add(score).sub(batch.scores[_lockingId]);
batch.scores[_lockingId] = score;
}
locker.period = locker.period + _extendPeriod;
emit ExtendLocking(msg.sender, _lockingId, _extendPeriod);
Expand All @@ -257,18 +258,29 @@ contract ContinuousLocking4Reputation is Agreement {
}

/**
* @dev repRewardPerBatch function
* @dev getRepRewardPerBatch function
* the calculation is done the following formula:
* RepReward = repRewardConstA * (repRewardConstB**_batchIndex)
* @param _batchIndex the batch number to calc rep reward of
* @return repReward
*/
function repRewardPerBatch(uint256 _batchIndex) public view returns(uint256 repReward) {
function getRepRewardPerBatch(uint256 _batchIndex) public view returns(uint256 repReward) {
if (_batchIndex <= batchesIndexCap) {
repReward = mul(repRewardConstA, repRewardConstB.pow(_batchIndex));
}
}

/**
* @dev getLockingIdScore function
* return score of lockingId at specific bach index
* @param _batchIndex batch index
* @param _lockingId lockingId
* @return score
*/
function getLockingIdScore(uint256 _batchIndex, bytes32 _lockingId) public view returns(uint256) {
return batches[_batchIndex].scores[_lockingId];
}

/**
* Multiply one real by another. Truncates overflows.
*/
Expand Down
Loading