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

Merge branch 'lash/use-timestamps' into 'master'

Browse Source 
Correct base amount on mint

See merge request grassrootseconomics/sarafu-token!5
This commit is contained in:
Louis Holbrook 2021-02-06 14:48:40 +00:00
commit 0f816ebdc5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/tests/test_redistribution.py
View File

@ -147,7 +147,7 @@ class Test(unittest.TestCase):
r = self.w3.eth.getTransactionReceipt(tx_hash) r = self.w3.eth.getTransactionReceipt(tx_hash)
# No cheating! # No cheating!
self.contract.functions.transfer(self.w3.eth.accounts[3], spend_amount).transact({'from': self.w3.eth.accounts[3]}) self.contract.functions.transfer(self.w3.eth.accounts[3], spend_amount).transact({'from': self.w3.eth.accounts[3]})
# Cheapskate! # No cheapskating!
self.contract.functions.transfer(external_address, spend_amount-1).transact({'from': self.w3.eth.accounts[4]}) self.contract.functions.transfer(external_address, spend_amount-1).transact({'from': self.w3.eth.accounts[4]})
self.assertEqual(r.status, 1) self.assertEqual(r.status, 1)

5
solidity/RedistributedDemurrageToken.sol
View File

@ -117,12 +117,15 @@ contract RedistributedDemurrageToken {
// Creates new tokens out of thin air, and allocates them to the given address // Creates new tokens out of thin air, and allocates them to the given address
// Triggers tax // Triggers tax
function mintTo(address _beneficiary, uint256 _amount) external returns (bool) { function mintTo(address _beneficiary, uint256 _amount) external returns (bool) {
uint256 baseAmount;
require(minter[msg.sender]); require(minter[msg.sender]);
applyDemurrage(); applyDemurrage();
changePeriod(); changePeriod();
baseAmount = _amount;
totalSupply += _amount; totalSupply += _amount;
increaseBaseBalance(_beneficiary, _amount); increaseBaseBalance(_beneficiary, baseAmount);
emit Mint(msg.sender, _beneficiary, _amount); emit Mint(msg.sender, _beneficiary, _amount);
saveRedistributionSupply(); saveRedistributionSupply();
return true; return true;