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

rename to decaylevel

Browse Source
This commit is contained in:
lash 2023-02-19 10:41:54 +00:00
parent f9cd542e74
commit 4ec1ea8b45
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 14 additions and 14 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

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

File diff suppressed because one or more lines are too long

6
python/erc20_demurrage_token/token.py
View File

@ -487,8 +487,8 @@ class DemurrageToken(ERC20, SealedContract, ExpiryContract):
return tx return tx
def tax_level(self, contract_address, sender_address=ZERO_ADDRESS): def decay_level(self, contract_address, sender_address=ZERO_ADDRESS):
return self.call_noarg('taxLevel', contract_address, sender_address=sender_address) return self.call_noarg('decayLevel', contract_address, sender_address=sender_address)
def resolution_factor(self, contract_address, sender_address=ZERO_ADDRESS): def resolution_factor(self, contract_address, sender_address=ZERO_ADDRESS):
@ -669,7 +669,7 @@ class DemurrageToken(ERC20, SealedContract, ExpiryContract):
@classmethod @classmethod
def parse_tax_level(self, v): def parse_decay_level(self, v):
return abi_decode_single(ABIContractType.UINT256, v) return abi_decode_single(ABIContractType.UINT256, v)

18
solidity/DemurrageTokenSingleNocap.sol
View File

@ -67,9 +67,9 @@ contract DemurrageTokenSingleNocap {
uint256 public immutable periodDuration; uint256 public immutable periodDuration;
// Demurrage in ppm per minute // Demurrage in ppm per minute
//uint256 public immutable taxLevel; //uint256 public immutable decayLevel;
// 64x64 // 64x64
int128 public immutable taxLevel; int128 public immutable decayLevel;
// Addresses allowed to mint new tokens // Addresses allowed to mint new tokens
mapping (address => bool) minter; mapping (address => bool) minter;
@ -129,11 +129,11 @@ contract DemurrageTokenSingleNocap {
event SealStateChange(bool indexed _final, uint256 _sealState); event SealStateChange(bool indexed _final, uint256 _sealState);
constructor(string memory _name, string memory _symbol, uint8 _decimals, int128 _taxLevel, uint256 _periodMinutes, address _defaultSinkAddress) { constructor(string memory _name, string memory _symbol, uint8 _decimals, int128 _decayLevel, uint256 _periodMinutes, address _defaultSinkAddress) {
require(_taxLevel < (1 << 64)); require(_decayLevel < (1 << 64));
redistributionItem memory initialRedistribution; redistributionItem memory initialRedistribution;
//require(ABDKMath64x64.toUInt(_taxLevel) == 0); //require(ABDKMath64x64.toUInt(_decayLevel) == 0);
// ACL setup // ACL setup
owner = msg.sender; owner = msg.sender;
@ -149,7 +149,7 @@ contract DemurrageTokenSingleNocap {
periodDuration = _periodMinutes * 60; periodDuration = _periodMinutes * 60;
demurrageAmount = ABDKMath64x64.fromUInt(1); demurrageAmount = ABDKMath64x64.fromUInt(1);
taxLevel = ABDKMath64x64.ln(_taxLevel); decayLevel = ABDKMath64x64.ln(_decayLevel);
initialRedistribution = toRedistribution(0, demurrageAmount, 0, 1); initialRedistribution = toRedistribution(0, demurrageAmount, 0, 1);
redistributions.push(initialRedistribution); redistributions.push(initialRedistribution);
@ -448,7 +448,7 @@ contract DemurrageTokenSingleNocap {
lastDemurrageAmount = toRedistributionDemurrageModifier(lastRedistribution); lastDemurrageAmount = toRedistributionDemurrageModifier(lastRedistribution);
demurrageCounts = (periodDuration * currentPeriod) / 60; demurrageCounts = (periodDuration * currentPeriod) / 60;
// TODO refactor decayby to take int128 then DRY with it // TODO refactor decayby to take int128 then DRY with it
nextRedistributionDemurrage = ABDKMath64x64.exp(ABDKMath64x64.mul(taxLevel, ABDKMath64x64.fromUInt(demurrageCounts))); nextRedistributionDemurrage = ABDKMath64x64.exp(ABDKMath64x64.mul(decayLevel, ABDKMath64x64.fromUInt(demurrageCounts)));
nextRedistribution = toRedistribution(0, nextRedistributionDemurrage, totalSupply(), nextPeriod); nextRedistribution = toRedistribution(0, nextRedistributionDemurrage, totalSupply(), nextPeriod);
redistributions.push(nextRedistribution); redistributions.push(nextRedistribution);
@ -491,7 +491,7 @@ contract DemurrageTokenSingleNocap {
} }
periodPoint = ABDKMath64x64.fromUInt(periodCount); periodPoint = ABDKMath64x64.fromUInt(periodCount);
v = ABDKMath64x64.mul(taxLevel, periodPoint); v = ABDKMath64x64.mul(decayLevel, periodPoint);
v = ABDKMath64x64.exp(v); v = ABDKMath64x64.exp(v);
demurrageAmount = ABDKMath64x64.mul(demurrageAmount, v); demurrageAmount = ABDKMath64x64.mul(demurrageAmount, v);
@ -533,7 +533,7 @@ contract DemurrageTokenSingleNocap {
valuePoint = ABDKMath64x64.fromUInt(_value); valuePoint = ABDKMath64x64.fromUInt(_value);
periodPoint = ABDKMath64x64.fromUInt(_period); periodPoint = ABDKMath64x64.fromUInt(_period);
v = ABDKMath64x64.mul(taxLevel, periodPoint); v = ABDKMath64x64.mul(decayLevel, periodPoint);
v = ABDKMath64x64.exp(v); v = ABDKMath64x64.exp(v);
v = ABDKMath64x64.mul(valuePoint, v); v = ABDKMath64x64.mul(valuePoint, v);
return ABDKMath64x64.toUInt(v); return ABDKMath64x64.toUInt(v);