kredits/contracts
kredits/contracts
9
1
Fork 0
Code Issues 21 Pull Requests Actions Projects 1 Releases 8 Activity

Remove claims, add withdrawals #225

Merged
raucao merged 4 commits from feature/184-remove_kredits_claims into feature/export-import 2022-08-30 08:53:55 +00:00
Conversation 3 Commits 4 Files Changed 10 +4 -6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5da710cc14 - Show all commits

6
contracts/Contributor.sol
View File

@ -22,7 +22,7 @@ contract Contributor is Initializable {
uint8 hashFunction;
uint8 hashSize;
bool exists;
uint256 kreditsWithdrawn;
uint32 kreditsWithdrawn;
}
mapping (address => uint32) public contributorIds;
@ -160,8 +160,8 @@ contract Contributor is Initializable {
Contributor storage c = contributors[id];
// TODO check if we need a failsafe for unconfirmed or malicious txs
uint256 confirmedKredits = contributionContract.totalKreditsEarnedByContributor(id, true);
uint256 amountWithdrawable = confirmedKredits - c.kreditsWithdrawn;
uint32 confirmedKredits = contributionContract.totalKreditsEarnedByContributor(id, true);
uint32 amountWithdrawable = confirmedKredits - c.kreditsWithdrawn;
require (amountWithdrawable > 0, "No kredits available");
c.kreditsWithdrawn += amountWithdrawable;
bumi commented 2022-08-30 10:10:12 +00:00
Review
Copy Link

wondering if we should add an assert(c.kreditsWithdrawn <= confirmedKredits) ?

wondering if we should add an `assert(c.kreditsWithdrawn <= confirmedKredits)` ?
raucao commented 2022-08-30 11:25:36 +00:00
Review
Copy Link

That's just the same as the line above, where confirmedKredits - c.kreditsWithdrawn is required to be > 0, no?

That's just the same as the line above, where `confirmedKredits - c.kreditsWithdrawn` is required to be `> 0`, no?

4
test/contracts/Contributor.js
View File

@ -95,10 +95,8 @@ describe("Contributor contract", async function () {
expect(c['balance']).to.equal(0);
await Contributor.connect(addr1).withdraw();
c = await Contributor.getContributorById(2);
// TODO Are we required to use Wei for ERC20 tokens?
expect(c['balance'].toString()).to.equal("6500000000000000000000");
// FIXME This is also a BigNumber (uint256), but stored at Wei reolution
expect(c['kreditsWithdrawn'].toString()).to.equal('6500');
expect(c['kreditsWithdrawn']).to.equal(6500);
});
it("requires the withdrawable amount to be larger than 0", async function () {