Use contributorId instead or address for reimbursements

This commit is contained in:
2020-06-12 00:29:59 +02:00
parent 9b4a95f375
commit 2c567fa71a
5 changed files with 16 additions and 13 deletions

View File

@@ -8,7 +8,8 @@ contract Reimbursement is AragonApp {
bytes32 public constant VETO_REIMBURSEMENT_ROLE = keccak256("VETO_REIMBURSEMENT_ROLE");
struct ReimbursementData {
address recipient;
address requestedBy;
uint32 contributorId;
uint256 amount;
address token;
bytes32 hashDigest;
@@ -43,12 +44,13 @@ contract Reimbursement is AragonApp {
}
}
function get(uint32 reimbursementId) public view returns (uint32 id, address recipient, uint256 amount, address token, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
function get(uint32 reimbursementId) public view returns (uint32 id, address requestedBy, uint32 contributorId, uint256 amount, address token, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool exists, bool vetoed) {
id = reimbursementId;
ReimbursementData storage r = reimbursements[id];
return (
id,
r.recipient,
r.requestedBy,
r.contributorId,
r.amount,
r.token,
r.hashDigest,
@@ -60,13 +62,14 @@ contract Reimbursement is AragonApp {
);
}
function add(uint256 amount, address token, address recipient, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_REIMBURSEMENT_ROLE) {
function add(uint256 amount, address token, uint32 contributorId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public isInitialized auth(ADD_REIMBURSEMENT_ROLE) {
uint32 reimbursementId = reimbursementsCount + 1;
ReimbursementData storage r = reimbursements[reimbursementId];
r.requestedBy = msg.sender;
r.exists = true;
r.amount = amount;
r.token = token;
r.recipient = recipient;
r.contributorId = contributorId;
r.hashDigest = hashDigest;
r.hashFunction = hashFunction;
r.hashSize = hashSize;