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

We do not need the appIds in the reimbursement app

Browse Source 
this might make it easier to deploy?
This commit is contained in:
bumi 2020-12-01 13:26:38 +01:00
parent 6bc6bcb7f6
commit b22d16e61e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/reimbursement/contracts/Reimbursement.sol
View File

@ -6,6 +6,7 @@ import "@aragon/os/contracts/kernel/IKernel.sol";
contract Reimbursement is AragonApp { contract Reimbursement is AragonApp {
bytes32 public constant ADD_REIMBURSEMENT_ROLE = keccak256("ADD_REIMBURSEMENT_ROLE"); bytes32 public constant ADD_REIMBURSEMENT_ROLE = keccak256("ADD_REIMBURSEMENT_ROLE");
bytes32 public constant VETO_REIMBURSEMENT_ROLE = keccak256("VETO_REIMBURSEMENT_ROLE"); bytes32 public constant VETO_REIMBURSEMENT_ROLE = keccak256("VETO_REIMBURSEMENT_ROLE");
// bytes32 public constant MANAGE_APPS_ROLE = keccak256("MANAGE_APPS_ROLE");
struct ReimbursementData { struct ReimbursementData {
uint32 recipientId; uint32 recipientId;
@ -27,13 +28,14 @@ contract Reimbursement is AragonApp {
event ReimbursementAdded(uint32 id, address indexed addedByAccount, uint256 amount); event ReimbursementAdded(uint32 id, address indexed addedByAccount, uint256 amount);
event ReimbursementVetoed(uint32 id, address vetoedByAccount); event ReimbursementVetoed(uint32 id, address vetoedByAccount);
// TODO: remove _appIds when those are removed from the kreditskit function initialize() public onlyInit {
// using the appids to find other apps is wrong according to aragon
function initialize(bytes32[5] _appIds) public onlyInit {
blocksToWait = 40320; // 7 days; 15 seconds block time blocksToWait = 40320; // 7 days; 15 seconds block time
initialized(); initialized();
} }
// function setApps() public isInitialized auth(MANAGE_APPS_ROLE) {
// }
function totalAmount(bool confirmedOnly) public view returns (uint256 amount) { function totalAmount(bool confirmedOnly) public view returns (uint256 amount) {
for (uint32 i = 1; i <= reimbursementsCount; i++) { for (uint32 i = 1; i <= reimbursementsCount; i++) {
ReimbursementData memory r = reimbursements[i]; ReimbursementData memory r = reimbursements[i];

2
contracts/KreditsKit.sol
View File

@ -50,7 +50,7 @@ contract KreditsKit is KitBase {
proposal.initialize(appIds); proposal.initialize(appIds);
Reimbursement reimbursement = Reimbursement(_installApp(dao, appIds[uint8(Apps.Reimbursement)])); Reimbursement reimbursement = Reimbursement(_installApp(dao, appIds[uint8(Apps.Reimbursement)]));
reimbursement.initialize(appIds); reimbursement.initialize();
acl.createPermission(root, reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE(), this); acl.createPermission(root, reimbursement, reimbursement.ADD_REIMBURSEMENT_ROLE(), this);
acl.createPermission(root, reimbursement, reimbursement.VETO_REIMBURSEMENT_ROLE(), this); acl.createPermission(root, reimbursement, reimbursement.VETO_REIMBURSEMENT_ROLE(), this);