mirror of
git://holbrook.no/erc20-demurrage-token
synced 2024-11-25 01:16:45 +01:00
Rename divider to nano, expand supply value bit length
This commit is contained in:
parent
81ec2198aa
commit
1b1419c03b
File diff suppressed because one or more lines are too long
@ -17,7 +17,7 @@ settings.symbol = 'SIM'
|
|||||||
settings.decimals = 6
|
settings.decimals = 6
|
||||||
settings.demurrage_level = int(decay_per_minute*(10**38))
|
settings.demurrage_level = int(decay_per_minute*(10**38))
|
||||||
#settings.period_minutes = 1 # 1 week in minutes
|
#settings.period_minutes = 1 # 1 week in minutes
|
||||||
settings.period_minutes = 60*24*7
|
settings.period_minutes = 60*24*7*4
|
||||||
chain = 'evm:foochain:42'
|
chain = 'evm:foochain:42'
|
||||||
cap = (10 ** 6) * (10 ** 12)
|
cap = (10 ** 6) * (10 ** 12)
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
uint8 constant shiftRedistributionValue = 32;
|
uint8 constant shiftRedistributionValue = 32;
|
||||||
uint256 constant maskRedistributionValue = 0x00000000000000000000000000000000000000ffffffffffffffffff00000000; // ((1 << 72) - 1) << 32
|
uint256 constant maskRedistributionValue = 0x00000000000000000000000000000000000000ffffffffffffffffff00000000; // ((1 << 72) - 1) << 32
|
||||||
uint8 constant shiftRedistributionDemurrage = 140;
|
uint8 constant shiftRedistributionDemurrage = 140;
|
||||||
uint256 constant maskRedistributionDemurrage = 0x000000000000000000000000fffff00000000000000000000000000000000000; // ((1 << 20) - 1) << 140
|
uint256 constant maskRedistributionDemurrage = 0x000000000000000000000ffffffff00000000000000000000000000000000000; // ((1 << 20) - 1) << 140
|
||||||
|
|
||||||
// Account balances
|
// Account balances
|
||||||
mapping (address => uint256) account;
|
mapping (address => uint256) account;
|
||||||
@ -50,7 +50,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
|
|
||||||
// 128 bit resolution of the demurrage divisor
|
// 128 bit resolution of the demurrage divisor
|
||||||
// (this constant x 1000000 is contained within 128 bits)
|
// (this constant x 1000000 is contained within 128 bits)
|
||||||
uint256 constant ppmDivider = 100000000000000000000000000; // now nanodivider, 6 zeros less
|
uint256 constant nanoDivider = 100000000000000000000000000; // now nanodivider, 6 zeros less
|
||||||
|
|
||||||
// Timestamp of start of periods (time which contract constructor was called)
|
// Timestamp of start of periods (time which contract constructor was called)
|
||||||
uint256 public immutable periodStart;
|
uint256 public immutable periodStart;
|
||||||
@ -108,10 +108,10 @@ contract DemurrageTokenSingleCap {
|
|||||||
demurrageTimestamp = block.timestamp;
|
demurrageTimestamp = block.timestamp;
|
||||||
periodStart = demurrageTimestamp;
|
periodStart = demurrageTimestamp;
|
||||||
periodDuration = _periodMinutes * 60;
|
periodDuration = _periodMinutes * 60;
|
||||||
demurrageAmount = uint128(ppmDivider * 1000000000000); // Represents 38 decimal places
|
demurrageAmount = uint128(nanoDivider * 1000000000000); // Represents 38 decimal places
|
||||||
//demurragePeriod = 1;
|
//demurragePeriod = 1;
|
||||||
taxLevel = _taxLevelMinute; // Represents 38 decimal places
|
taxLevel = _taxLevelMinute; // Represents 38 decimal places
|
||||||
bytes32 initialRedistribution = toRedistribution(0, 1000000, 0, 1);
|
bytes32 initialRedistribution = toRedistribution(0, 10000000000000000000, 0, 1);
|
||||||
redistributions.push(initialRedistribution);
|
redistributions.push(initialRedistribution);
|
||||||
|
|
||||||
// Misc settings
|
// Misc settings
|
||||||
@ -147,7 +147,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
|
|
||||||
currentDemurragedAmount = uint128(decayBy(demurrageAmount, periodCount));
|
currentDemurragedAmount = uint128(decayBy(demurrageAmount, periodCount));
|
||||||
|
|
||||||
return (baseBalance * currentDemurragedAmount) / (ppmDivider * 1000000000000);
|
return (baseBalance * currentDemurragedAmount) / (nanoDivider * 1000000000000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Balance unmodified by demurrage
|
/// Balance unmodified by demurrage
|
||||||
@ -271,7 +271,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getDistribution(uint256 _supply, uint256 _demurrageAmount) public view returns (uint256) {
|
function getDistribution(uint256 _supply, uint256 _demurrageAmount) public view returns (uint256) {
|
||||||
return _supply * (ppmDivider - (_demurrageAmount / 1000000000000));
|
return _supply * (nanoDivider - (_demurrageAmount / 1000000000000));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the amount sent to the sink address
|
// Returns the amount sent to the sink address
|
||||||
@ -281,7 +281,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
|
|
||||||
redistributionSupply = toRedistributionSupply(_redistribution);
|
redistributionSupply = toRedistributionSupply(_redistribution);
|
||||||
unit = getDistribution(redistributionSupply, demurrageAmount);
|
unit = getDistribution(redistributionSupply, demurrageAmount);
|
||||||
increaseBaseBalance(sinkAddress, toBaseAmount(unit / ppmDivider));
|
increaseBaseBalance(sinkAddress, toBaseAmount(unit / nanoDivider));
|
||||||
return unit;
|
return unit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -346,9 +346,9 @@ contract DemurrageTokenSingleCap {
|
|||||||
|
|
||||||
demurrageCounts = demurrageCycles(periodTimestamp);
|
demurrageCounts = demurrageCycles(periodTimestamp);
|
||||||
if (demurrageCounts > 0) {
|
if (demurrageCounts > 0) {
|
||||||
nextRedistributionDemurrage = growBy(currentDemurrageAmount, demurrageCounts) / ppmDivider;
|
nextRedistributionDemurrage = growBy(currentDemurrageAmount, demurrageCounts) / nanoDivider;
|
||||||
} else {
|
} else {
|
||||||
nextRedistributionDemurrage = currentDemurrageAmount / ppmDivider;
|
nextRedistributionDemurrage = currentDemurrageAmount / nanoDivider;
|
||||||
}
|
}
|
||||||
|
|
||||||
nextRedistribution = toRedistribution(0, nextRedistributionDemurrage, totalSupply, nextPeriod);
|
nextRedistribution = toRedistribution(0, nextRedistributionDemurrage, totalSupply, nextPeriod);
|
||||||
@ -365,7 +365,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
uint256 truncatedTaxLevel;
|
uint256 truncatedTaxLevel;
|
||||||
|
|
||||||
valueFactor = 1000000;
|
valueFactor = 1000000;
|
||||||
truncatedTaxLevel = taxLevel / (ppmDivider * 1000000);
|
truncatedTaxLevel = taxLevel / (nanoDivider * 1000000);
|
||||||
|
|
||||||
for (uint256 i = 0; i < _period; i++) {
|
for (uint256 i = 0; i < _period; i++) {
|
||||||
valueFactor = valueFactor + ((valueFactor * truncatedTaxLevel) / 1000000);
|
valueFactor = valueFactor + ((valueFactor * truncatedTaxLevel) / 1000000);
|
||||||
@ -380,7 +380,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
uint256 truncatedTaxLevel;
|
uint256 truncatedTaxLevel;
|
||||||
|
|
||||||
valueFactor = 1000000;
|
valueFactor = 1000000;
|
||||||
truncatedTaxLevel = taxLevel / (ppmDivider * 1000000);
|
truncatedTaxLevel = taxLevel / (nanoDivider * 1000000);
|
||||||
|
|
||||||
for (uint256 i = 0; i < _period; i++) {
|
for (uint256 i = 0; i < _period; i++) {
|
||||||
valueFactor = valueFactor - ((valueFactor * truncatedTaxLevel) / 1000000);
|
valueFactor = valueFactor - ((valueFactor * truncatedTaxLevel) / 1000000);
|
||||||
@ -390,7 +390,7 @@ contract DemurrageTokenSingleCap {
|
|||||||
|
|
||||||
// Inflates the given amount according to the current demurrage modifier
|
// Inflates the given amount according to the current demurrage modifier
|
||||||
function toBaseAmount(uint256 _value) public view returns (uint256) {
|
function toBaseAmount(uint256 _value) public view returns (uint256) {
|
||||||
return (_value * ppmDivider * 1000000000000) / demurrageAmount;
|
return (_value * nanoDivider * 1000000000000) / demurrageAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Implements ERC20, triggers tax and/or redistribution
|
// Implements ERC20, triggers tax and/or redistribution
|
||||||
|
Loading…
Reference in New Issue
Block a user