Skip to content

Commit

Permalink
Merge pull request #77 from endaoment/audit-c01-addendum
Browse files Browse the repository at this point in the history 
Audit Item C01 Addendum
  • Loading branch information
@rheeger
rheeger authored Aug 8, 2020
2 parents d5860cb + fb42a7c commit f5c32d2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 23 deletions.
13 changes: 6 additions & 7 deletions contracts/Fund.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,18 @@ contract Fund is Administratable {
* @param description The address of the Owner.
* @param value The value of the grant in base units.
* @param recipient The address of the recieving organization's contract.
* @param orgFactoryContractAddress Address of the orgFactory Contract.
*/
function createGrant(
string calldata grantId,
string calldata description,
uint256 value,
address recipient,
address orgFactoryContractAddress
address recipient
) public onlyAddressOrAdminOrRole(manager, fundFactoryContract.endaomentAdmin(), IEndaomentAdmin.Role.REVIEWER) {
require(!isEqual(grantId, ""), "Fund: Must provide a grantId");
require(!isEqual(description, ""), "Fund: Must provide a description");
EndaomentAdmin endaomentAdmin = EndaomentAdmin(fundFactoryContract.endaomentAdmin());
require(
checkRecipient(recipient, orgFactoryContractAddress) == true,
checkRecipient(recipient, endaomentAdmin.getRoleAddress(IEndaomentAdmin.Role.ORG_FACTORY)) == true,
"Fund: Recipient contract was not created by the OrgFactory and is not allowed."
);
require(
Expand Down Expand Up @@ -154,13 +153,13 @@ contract Fund is Administratable {
string calldata grantId,
string calldata description,
uint256 value,
address recipient,
address orgFactoryContractAddress
address recipient
) public onlyAddressOrAdminOrRole(manager, fundFactoryContract.endaomentAdmin(), IEndaomentAdmin.Role.REVIEWER) {
require(!isEqual(grantId, ""), "Fund: Must provide a grantId");
require(!isEqual(description, ""), "Fund: Must provide a description");
EndaomentAdmin endaomentAdmin = EndaomentAdmin(fundFactoryContract.endaomentAdmin());
require(
checkRecipient(recipient, orgFactoryContractAddress) == true,
checkRecipient(recipient, endaomentAdmin.getRoleAddress(IEndaomentAdmin.Role.ORG_FACTORY)) == true,
"Fund: Recipient contract was not created by the OrgFactory and is not allowed."
);
require(
Expand Down
24 changes: 8 additions & 16 deletions test/Fund.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ describe("Fund", function () {
"test grant",
1,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
);

Expand Down Expand Up @@ -222,16 +221,16 @@ describe("Fund", function () {

// Should revert if anyone besides the manager, admin, or reviewer calls the function
await expectRevert(
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, orgFactory.address, { from: pauser } ),
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, { from: pauser } ),
"Administratable: only REVIEWER can access"
);
await expectRevert(
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, orgFactory.address, { from: newManager } ),
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, { from: newManager } ),
"Administratable: only REVIEWER can access"
);
// Should revert if no description is given
await expectRevert(
this.fund.createGrant(grantId, "", 1, org.logs[0].args.newAddress, orgFactory.address, { from: manager } ),
this.fund.createGrant(grantId, "", 1, org.logs[0].args.newAddress, { from: manager } ),
"Fund: Must provide a description"
);
});
Expand All @@ -257,7 +256,6 @@ describe("Fund", function () {
"test grant",
1,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
);

Expand All @@ -267,7 +265,6 @@ describe("Fund", function () {
"update to grant",
3,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
)

Expand Down Expand Up @@ -299,16 +296,16 @@ describe("Fund", function () {

// Should revert if anyone besides the manager calls the function
await expectRevert(
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, orgFactory.address, { from: pauser } ),
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, { from: pauser } ),
"Administratable: only REVIEWER can access"
);
await expectRevert(
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, orgFactory.address, { from: newManager } ),
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, { from: newManager } ),
"Administratable: only REVIEWER can access"
);
// Should revert if no description is given
await expectRevert(
this.fund.updateGrant(grantId, "", 1, org.logs[0].args.newAddress, orgFactory.address, { from: manager } ),
this.fund.updateGrant(grantId, "", 1, org.logs[0].args.newAddress, { from: manager } ),
"Fund: Must provide a description"
);
});
Expand All @@ -333,7 +330,6 @@ describe("Fund", function () {
"test grant",
1,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
);

Expand Down Expand Up @@ -361,11 +357,11 @@ describe("Fund", function () {

// Should revert if anyone besides the manager calls the function
await expectRevert(
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, orgFactory.address, { from: pauser } ),
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, { from: pauser } ),
"Administratable: only REVIEWER can access"
);
await expectRevert(
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, orgFactory.address, { from: newManager } ),
this.fund.createGrant(grantId, "test grant", 1, org.logs[0].args.newAddress, { from: newManager } ),
"Administratable: only REVIEWER can access"
);
});
Expand All @@ -384,7 +380,6 @@ describe("Fund", function () {
"test grant",
100,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
);

Expand Down Expand Up @@ -420,7 +415,6 @@ describe("Fund", function () {
"test grant",
100,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
);

Expand Down Expand Up @@ -458,7 +452,6 @@ describe("Fund", function () {
"test grant",
100,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
);

Expand All @@ -480,7 +473,6 @@ describe("Fund", function () {
"test grant",
100,
org.logs[0].args.newAddress,
orgFactory.address,
{ from: manager }
);
const badUuid = uuidv4();
Expand Down

0 comments on commit f5c32d2

Please sign in to comment.