cicnet/erc20-demurrage-token
5
0
Fork 0
mirror of git://holbrook.no/erc20-demurrage-token synced 2024-12-22 11:57:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove potentially boundless iteration in changePeriod in contract

Browse Source
This commit is contained in:
lash 2022-12-11 09:41:56 +00:00
parent 2f4f8bb7b9
commit ef294eaec2
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/erc20_demurrage_token/data/DemurrageTokenSingleNocap.bin
View File

File diff suppressed because one or more lines are too long

28
solidity/DemurrageTokenSingleNocap.sol
View File

@ -269,7 +269,7 @@ contract DemurrageTokenSingleCap {
return uint128((block.timestamp - periodStart) / periodDuration + 1); return uint128((block.timestamp - periodStart) / periodDuration + 1);
} }
// Add an entered demurrage period to the redistribution array // Retrieve next redistribution if the period threshold has been crossed
function checkPeriod() private view returns (bytes32) { function checkPeriod() private view returns (bytes32) {
bytes32 lastRedistribution; bytes32 lastRedistribution;
uint256 currentPeriod; uint256 currentPeriod;
@ -359,10 +359,12 @@ contract DemurrageTokenSingleCap {
bytes32 currentRedistribution; bytes32 currentRedistribution;
bytes32 nextRedistribution; bytes32 nextRedistribution;
uint256 currentPeriod; uint256 currentPeriod;
uint256 currentDemurrageAmount; //uint256 currentDemurrageAmount;
uint256 lastDemurrageAmount;
bytes32 lastRedistribution;
uint256 nextRedistributionDemurrage; uint256 nextRedistributionDemurrage;
uint256 demurrageCounts; uint256 demurrageCounts;
uint256 periodTimestamp; //uint256 periodTimestamp;
uint256 nextPeriod; uint256 nextPeriod;
applyDemurrage(); applyDemurrage();
@ -371,18 +373,22 @@ contract DemurrageTokenSingleCap {
return false; return false;
} }
lastRedistribution = redistributions[lastPeriod];
currentPeriod = toRedistributionPeriod(currentRedistribution); currentPeriod = toRedistributionPeriod(currentRedistribution);
nextPeriod = currentPeriod + 1; nextPeriod = currentPeriod + 1;
periodTimestamp = getPeriodTimeDelta(currentPeriod); //periodTimestamp = getPeriodTimeDelta(currentPeriod);
currentDemurrageAmount = demurrageAmount; //currentDemurrageAmount = demurrageAmount;
demurrageCounts = demurrageCycles(periodTimestamp); //demurrageCounts = demurrageCycles(periodTimestamp);
if (demurrageCounts > 0) { //if (demurrageCounts > 0) {
nextRedistributionDemurrage = growBy(currentDemurrageAmount, demurrageCounts); // nextRedistributionDemurrage = growBy(currentDemurrageAmount, demurrageCounts);
} else { //} else {
nextRedistributionDemurrage = currentDemurrageAmount; // nextRedistributionDemurrage = currentDemurrageAmount;
} //}
lastDemurrageAmount = toRedistributionDemurrageModifier(lastRedistribution);
demurrageCounts = periodDuration / 60;
nextRedistributionDemurrage = decayBy(lastDemurrageAmount, demurrageCounts);
nextRedistribution = toRedistribution(0, nextRedistributionDemurrage, totalSupply(), nextPeriod); nextRedistribution = toRedistribution(0, nextRedistributionDemurrage, totalSupply(), nextPeriod);
redistributions.push(nextRedistribution); redistributions.push(nextRedistribution);