Skip to content

Refactor campaign management functions in CampaignInfo contract #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mahabubAlahi wants to merge 2 commits into
base: oz-audit-fixes
Choose a base branch
from
Open

Refactor campaign management functions in CampaignInfo contract #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3212f21
Refactor campaign management functions in CampaignInfo contract
mahabubAlahi Mar 2, 2026
5d8ec12
Refactor campaign management function calls in unit tests
mahabubAlahi Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/CampaignInfo.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,21 +599,21 @@ contract CampaignInfo is
/**
* @dev External function to pause the campaign.
*/
function _pauseCampaign(bytes32 message) external onlyProtocolAdmin {
function pauseCampaign(bytes32 message) external onlyProtocolAdmin {
_pause(message);
}

/**
* @dev External function to unpause the campaign.
*/
function _unpauseCampaign(bytes32 message) external onlyProtocolAdmin {
function unpauseCampaign(bytes32 message) external onlyProtocolAdmin {
_unpause(message);
}

/**
* @dev External function to cancel the campaign.
*/
function _cancelCampaign(bytes32 message) external {
function cancelCampaign(bytes32 message) external {
if (_msgSender() != getProtocolAdminAddress() && _msgSender() != owner()) {
revert CampaignInfoUnauthorized();
}
Expand Down Expand Up @@ -670,7 +670,7 @@ contract CampaignInfo is
* @param platformHash The bytes32 identifier of the platform.
* @param platformTreasuryAddress The address of the platform's treasury.
*/
function _setPlatformInfo(bytes32 platformHash, address platformTreasuryAddress) external whenNotPaused {
function setPlatformInfo(bytes32 platformHash, address platformTreasuryAddress) external whenNotPaused {
Config memory config = getCampaignConfig();
if (_msgSender() != config.treasuryFactory) {
revert CampaignInfoUnauthorized();
Expand Down
2 changes: 1 addition & 1 deletion src/TreasuryFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ contract TreasuryFactory is Initializable, ITreasuryFactory, AdminAccessChecker,
if (!success) {
revert TreasuryFactoryTreasuryInitializationFailed();
}
(success,) = infoAddress.call(abi.encodeWithSignature("_setPlatformInfo(bytes32,address)", platformHash, clone));
(success,) = infoAddress.call(abi.encodeWithSignature("setPlatformInfo(bytes32,address)", platformHash, clone));
if (!success) {
revert TreasuryFactorySettingPlatformInfoFailed();
}
Expand Down
30 changes: 15 additions & 15 deletions test/foundry/unit/CampaignInfo.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
function test_TransferOwnership_WhenPaused_Reverts() public {
// Pause the campaign
vm.startPrank(admin);
campaignInfo._pauseCampaign(keccak256("test"));
campaignInfo.pauseCampaign(keccak256("test"));
vm.stopPrank();

vm.startPrank(campaignOwner);
Expand All @@ -495,7 +495,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
function test_TransferOwnership_WhenCancelled_Reverts() public {
// Cancel the campaign
vm.startPrank(admin);
campaignInfo._cancelCampaign(keccak256("test"));
campaignInfo.cancelCampaign(keccak256("test"));
vm.stopPrank();

vm.startPrank(campaignOwner);
Expand All @@ -510,7 +510,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
vm.startPrank(admin);

bytes32 message = keccak256("test pause");
campaignInfo._pauseCampaign(message);
campaignInfo.pauseCampaign(message);

assertTrue(campaignInfo.paused());
vm.stopPrank();
Expand All @@ -519,13 +519,13 @@ contract CampaignInfo_UnitTest is Test, Defaults {
function test_UnpauseCampaign_Success() public {
// First pause
vm.startPrank(admin);
campaignInfo._pauseCampaign(keccak256("test pause"));
campaignInfo.pauseCampaign(keccak256("test pause"));
vm.stopPrank();

// Then unpause
vm.startPrank(admin);
bytes32 message = keccak256("test unpause");
campaignInfo._unpauseCampaign(message);
campaignInfo.unpauseCampaign(message);

assertFalse(campaignInfo.paused());
vm.stopPrank();
Expand All @@ -535,7 +535,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
vm.startPrank(admin);

bytes32 message = keccak256("test cancel");
campaignInfo._cancelCampaign(message);
campaignInfo.cancelCampaign(message);

assertTrue(campaignInfo.cancelled());
vm.stopPrank();
Expand All @@ -545,7 +545,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
vm.startPrank(campaignOwner);

bytes32 message = keccak256("test cancel");
campaignInfo._cancelCampaign(message);
campaignInfo.cancelCampaign(message);

assertTrue(campaignInfo.cancelled());
vm.stopPrank();
Expand All @@ -556,7 +556,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {

vm.startPrank(unauthorizedUser);
vm.expectRevert(CampaignInfo.CampaignInfoUnauthorized.selector);
campaignInfo._cancelCampaign(keccak256("test cancel"));
campaignInfo.cancelCampaign(keccak256("test cancel"));
vm.stopPrank();
}

Expand Down Expand Up @@ -653,7 +653,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
// Verify campaign is not locked initially
assertFalse(campaignInfo.isLocked());

// Deploy a treasury using the treasury factory - this will call _setPlatformInfo
// Deploy a treasury using the treasury factory - this will call setPlatformInfo
vm.startPrank(admin);
address treasury = treasuryFactory.deploy(
platformHash1,
Expand Down Expand Up @@ -770,7 +770,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
// Pausing should still work when locked
vm.startPrank(admin);
bytes32 message = keccak256("test pause");
campaignInfo._pauseCampaign(message);
campaignInfo.pauseCampaign(message);

assertTrue(campaignInfo.paused());
vm.stopPrank();
Expand All @@ -782,13 +782,13 @@ contract CampaignInfo_UnitTest is Test, Defaults {

// First pause
vm.startPrank(admin);
campaignInfo._pauseCampaign(keccak256("test pause"));
campaignInfo.pauseCampaign(keccak256("test pause"));
vm.stopPrank();

// Then unpause - should still work when locked
vm.startPrank(admin);
bytes32 message = keccak256("test unpause");
campaignInfo._unpauseCampaign(message);
campaignInfo.unpauseCampaign(message);

assertFalse(campaignInfo.paused());
vm.stopPrank();
Expand All @@ -801,7 +801,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
// Cancelling should still work when locked
vm.startPrank(admin);
bytes32 message = keccak256("test cancel");
campaignInfo._cancelCampaign(message);
campaignInfo.cancelCampaign(message);

assertTrue(campaignInfo.cancelled());
vm.stopPrank();
Expand All @@ -814,7 +814,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {
// Cancelling should still work when locked
vm.startPrank(campaignOwner);
bytes32 message = keccak256("test cancel");
campaignInfo._cancelCampaign(message);
campaignInfo.cancelCampaign(message);

assertTrue(campaignInfo.cancelled());
vm.stopPrank();
Expand Down Expand Up @@ -890,7 +890,7 @@ contract CampaignInfo_UnitTest is Test, Defaults {

// Approve the platform (this locks the campaign)
vm.startPrank(address(treasuryFactory));
campaignInfo._setPlatformInfo(platformHash1, address(0x1234));
campaignInfo.setPlatformInfo(platformHash1, address(0x1234));
vm.stopPrank();

// Now try to select the already approved platform again - should revert
Expand Down
2 changes: 1 addition & 1 deletion test/foundry/unit/PaymentTreasury.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ contract PaymentTreasury_UnitTest is Test, PaymentTreasury_Integration_Shared_Te
// Pause the campaign
CampaignInfo actualCampaignInfo = CampaignInfo(campaignAddress);
vm.prank(users.protocolAdminAddress);
actualCampaignInfo._pauseCampaign(keccak256("Pause"));
actualCampaignInfo.pauseCampaign(keccak256("Pause"));

vm.expectRevert();
vm.prank(users.platform1AdminAddress);
Expand Down