OpenZeppelin audit remediations: payment/pledge hardening, lifecycle enforcement, accounting fixes, and error-code cleanup

README.md

@@ -179,7 +179,7 @@ Before contributing, please read our detailed [Contributing Guidelines](./CONTRI
 
 ### Community
 
-Join our community on [Discord](https://discord.gg/tnBhVxSDDS) for questions and discussions.
+Join our community on [Discord](https://discord.gg/NnPKaB2Qdr) for questions and discussions.
 
 Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectful.
 

docs/src/src/TestUSD.sol/contract.TestUSD.md

@@ -1,9 +1,5 @@
 # TestUSD
-<<<<<<< Updated upstream
-[Git Source](https://github.com/ccprotocol/reference-client-sc/blob/32b7b1617200d0c6f3248845ef972180411f1f65/src/TestUSD.sol)
-=======
 [Git Source](https://github.com/ccprotocol/ccprotocol-contracts-internal/blob/4245ef0ad7914158999986aa0d8b5d2614efc6c2/src/TestUSD.sol)
->>>>>>> Stashed changes
 
 **Inherits:**
 [ERC20](/src/.deps/npm/@openzeppelin/contracts/token/ERC20/ERC20.sol/abstract.ERC20.md), [Ownable](/src/.deps/npm/@openzeppelin/contracts/access/Ownable.sol/abstract.Ownable.md)

script/DeployAll.s.sol

@@ -80,7 +80,6 @@ contract DeployAll is DeployBase {
         // Prepare initialization data for CampaignInfoFactory
         bytes memory campaignFactoryInitData = abi.encodeWithSelector(
             CampaignInfoFactory.initialize.selector,
-            deployerAddress,
             IGlobalParams(address(globalParamsProxy)),
             address(campaignInfoImplementation),
             address(treasuryFactoryProxy)
@@ -90,6 +89,9 @@ contract DeployAll is DeployBase {
         ERC1967Proxy campaignFactoryProxy = new ERC1967Proxy(address(campaignFactoryImpl), campaignFactoryInitData);
         console2.log("CampaignInfoFactory proxy deployed at:", address(campaignFactoryProxy));
 
+        // Wire CampaignInfoFactory into TreasuryFactory so deploy() validation passes
+        TreasuryFactory(address(treasuryFactoryProxy)).setCampaignInfoFactory(address(campaignFactoryProxy));
+
         // Configure registry values
         uint256 bufferTime = vm.envOr("BUFFER_TIME", uint256(0));
         uint256 campaignLaunchBuffer = vm.envOr("CAMPAIGN_LAUNCH_BUFFER", uint256(0));

script/DeployAllAndSetupAllOrNothing.s.sol

@@ -202,7 +202,6 @@ contract DeployAllAndSetupAllOrNothing is DeployBase {
             campaignInfoFactoryImplementation = address(campaignFactoryImpl);
             bytes memory campaignFactoryInitData = abi.encodeWithSelector(
                 CampaignInfoFactory.initialize.selector,
-                deployerAddress,
                 IGlobalParams(globalParams),
                 campaignInfoImplementation,
                 treasuryFactory
@@ -216,6 +215,14 @@ contract DeployAllAndSetupAllOrNothing is DeployBase {
             console2.log("Reusing CampaignInfoFactory at:", campaignInfoFactory);
         }
 
+        // Wire CampaignInfoFactory into TreasuryFactory so deploy() validation passes.
+        // Must run when either contract is freshly deployed: a new TF needs initial wiring,
+        // and a new CIF deployed against a reused TF must update the existing proxy.
+        if (treasuryFactoryDeployed || campaignInfoFactoryDeployed) {
+            TreasuryFactory(treasuryFactory).setCampaignInfoFactory(campaignInfoFactory);
+            console2.log("CampaignInfoFactory wired into TreasuryFactory");
+        }
+
         // Deploy or reuse AllOrNothing implementation
         if (allOrNothingImplementation == address(0)) {
             allOrNothingImplementation = address(new AllOrNothing());
@@ -350,13 +357,7 @@ contract DeployAllAndSetupAllOrNothing is DeployBase {
             console2.log("Transferring protocol admin rights to:", finalProtocolAdmin);
             GlobalParams(globalParams).updateProtocolAdminAddress(finalProtocolAdmin);
 
-            //Transfer admin rights to the final protocol admin
-            GlobalParams(globalParams).transferOwnership(finalProtocolAdmin);
-            console2.log("GlobalParams transferred to:", finalProtocolAdmin);
-            if (campaignInfoFactoryDeployed) {
-                CampaignInfoFactory(campaignInfoFactory).transferOwnership(finalProtocolAdmin);
-                console2.log("CampaignInfoFactory transferred to:", finalProtocolAdmin);
-            }
+            // CampaignInfoFactory reads admin from GlobalParams, no separate transfer needed
         }
 
         if (simulate) {
@@ -428,8 +429,7 @@ contract DeployAllAndSetupAllOrNothing is DeployBase {
         console2.log("Protocol Admin:", finalProtocolAdmin);
         console2.log("Platform Admin:", finalPlatformAdmin);
         console2.log("Platform Adapter (Trusted Forwarder):", platformAdapter);
-        console2.log("GlobalParams owner:", GlobalParams(globalParams).owner());
-        console2.log("CampaignInfoFactory owner:", CampaignInfoFactory(campaignInfoFactory).owner());
+        console2.log("Protocol Admin (GlobalParams):", GlobalParams(globalParams).getProtocolAdminAddress());
 
         console2.log("\n--- Supported Currencies & Tokens ---");
         string memory currenciesConfig = vm.envOr("CURRENCIES", string(""));

script/DeployAllAndSetupKeepWhatsRaised.s.sol

@@ -198,7 +198,6 @@ contract DeployAllAndSetupKeepWhatsRaised is DeployBase {
             campaignInfoFactoryImplementation = address(campaignFactoryImpl);
             bytes memory campaignFactoryInitData = abi.encodeWithSelector(
                 CampaignInfoFactory.initialize.selector,
-                deployerAddress,
                 IGlobalParams(globalParams),
                 campaignInfo,
                 treasuryFactory
@@ -212,6 +211,14 @@ contract DeployAllAndSetupKeepWhatsRaised is DeployBase {
             console2.log("Reusing CampaignInfoFactory at:", campaignInfoFactory);
         }
 
+        // Wire CampaignInfoFactory into TreasuryFactory so deploy() validation passes.
+        // Must run when either contract is freshly deployed: a new TF needs initial wiring,
+        // and a new CIF deployed against a reused TF must update the existing proxy.
+        if (treasuryFactoryDeployed || campaignInfoFactoryDeployed) {
+            TreasuryFactory(treasuryFactory).setCampaignInfoFactory(campaignInfoFactory);
+            console2.log("CampaignInfoFactory wired into TreasuryFactory");
+        }
+
         // Deploy or reuse KeepWhatsRaised implementation
         if (keepWhatsRaisedImplementation == address(0)) {
             keepWhatsRaisedImplementation = address(new KeepWhatsRaised());
@@ -346,13 +353,7 @@ contract DeployAllAndSetupKeepWhatsRaised is DeployBase {
             console2.log("Transferring protocol admin rights to:", finalProtocolAdmin);
             GlobalParams(globalParams).updateProtocolAdminAddress(finalProtocolAdmin);
 
-            //Transfer admin rights to the final protocol admin
-            GlobalParams(globalParams).transferOwnership(finalProtocolAdmin);
-            console2.log("GlobalParams transferred to:", finalProtocolAdmin);
-            if (campaignInfoFactoryDeployed) {
-                CampaignInfoFactory(campaignInfoFactory).transferOwnership(finalProtocolAdmin);
-                console2.log("CampaignInfoFactory transferred to:", finalProtocolAdmin);
-            }
+            // CampaignInfoFactory reads admin from GlobalParams, no separate transfer needed
         }
 
         if (simulate) {
@@ -424,8 +425,7 @@ contract DeployAllAndSetupKeepWhatsRaised is DeployBase {
         console2.log("Protocol Admin:", finalProtocolAdmin);
         console2.log("Platform Admin:", finalPlatformAdmin);
         console2.log("Platform Adapter (Trusted Forwarder):", platformAdapter);
-        console2.log("GlobalParams owner:", GlobalParams(globalParams).owner());
-        console2.log("CampaignInfoFactory owner:", CampaignInfoFactory(campaignInfoFactory).owner());
+        console2.log("Protocol Admin (GlobalParams):", GlobalParams(globalParams).getProtocolAdminAddress());
 
         console2.log("\n--- Supported Currencies & Tokens ---");
         string memory currenciesConfig = vm.envOr("CURRENCIES", string(""));

script/DeployAllAndSetupPaymentTreasury.s.sol

@@ -233,7 +233,6 @@ contract DeployAllAndSetupPaymentTreasury is DeployBase {
             campaignInfoFactoryImplementation = address(campaignFactoryImpl);
             bytes memory campaignFactoryInitData = abi.encodeWithSelector(
                 CampaignInfoFactory.initialize.selector,
-                deployerAddress,
                 IGlobalParams(globalParams),
                 campaignInfoImplementation,
                 treasuryFactory
@@ -247,6 +246,14 @@ contract DeployAllAndSetupPaymentTreasury is DeployBase {
             console2.log("Reusing CampaignInfoFactory at:", campaignInfoFactory);
         }
 
+        // Wire CampaignInfoFactory into TreasuryFactory so deploy() validation passes.
+        // Must run when either contract is freshly deployed: a new TF needs initial wiring,
+        // and a new CIF deployed against a reused TF must update the existing proxy.
+        if (treasuryFactoryDeployed || campaignInfoFactoryDeployed) {
+            TreasuryFactory(treasuryFactory).setCampaignInfoFactory(campaignInfoFactory);
+            console2.log("CampaignInfoFactory wired into TreasuryFactory");
+        }
+
         // Deploy or reuse PaymentTreasury implementation
         if (paymentTreasuryImplementation == address(0)) {
             paymentTreasuryImplementation = address(new PaymentTreasury());
@@ -381,13 +388,7 @@ contract DeployAllAndSetupPaymentTreasury is DeployBase {
             console2.log("Transferring protocol admin rights to:", finalProtocolAdmin);
             GlobalParams(globalParams).updateProtocolAdminAddress(finalProtocolAdmin);
 
-            //Transfer admin rights to the final protocol admin
-            GlobalParams(globalParams).transferOwnership(finalProtocolAdmin);
-            console2.log("GlobalParams transferred to:", finalProtocolAdmin);
-            if (campaignInfoFactoryDeployed) {
-                CampaignInfoFactory(campaignInfoFactory).transferOwnership(finalProtocolAdmin);
-                console2.log("CampaignInfoFactory transferred to:", finalProtocolAdmin);
-            }
+            // CampaignInfoFactory reads admin from GlobalParams, no separate transfer needed
         }
 
         if (simulate) {
@@ -460,8 +461,7 @@ contract DeployAllAndSetupPaymentTreasury is DeployBase {
         console2.log("Protocol Admin:", finalProtocolAdmin);
         console2.log("Platform Admin:", finalPlatformAdmin);
         console2.log("Platform Adapter (Trusted Forwarder):", platformAdapter);
-        console2.log("GlobalParams owner:", GlobalParams(globalParams).owner());
-        console2.log("CampaignInfoFactory owner:", CampaignInfoFactory(campaignInfoFactory).owner());
+        console2.log("Protocol Admin (GlobalParams):", GlobalParams(globalParams).getProtocolAdminAddress());
 
         console2.log("\n--- Supported Currencies & Tokens ---");
         string memory currenciesConfig = vm.envOr("CURRENCIES", string(""));

script/DeployAllAndSetupTimeConstrainedPaymentTreasury.s.sol

@@ -234,7 +234,6 @@ contract DeployAllAndSetupTimeConstrainedPaymentTreasury is DeployBase {
             campaignInfoFactoryImplementation = address(campaignFactoryImpl);
             bytes memory campaignFactoryInitData = abi.encodeWithSelector(
                 CampaignInfoFactory.initialize.selector,
-                deployerAddress,
                 IGlobalParams(globalParams),
                 campaignInfoImplementation,
                 treasuryFactory
@@ -248,6 +247,14 @@ contract DeployAllAndSetupTimeConstrainedPaymentTreasury is DeployBase {
             console2.log("Reusing CampaignInfoFactory at:", campaignInfoFactory);
         }
 
+        // Wire CampaignInfoFactory into TreasuryFactory so deploy() validation passes.
+        // Must run when either contract is freshly deployed: a new TF needs initial wiring,
+        // and a new CIF deployed against a reused TF must update the existing proxy.
+        if (treasuryFactoryDeployed || campaignInfoFactoryDeployed) {
+            TreasuryFactory(treasuryFactory).setCampaignInfoFactory(campaignInfoFactory);
+            console2.log("CampaignInfoFactory wired into TreasuryFactory");
+        }
+
         // Deploy or reuse TimeConstrainedPaymentTreasury implementation
         if (timeConstrainedPaymentTreasuryImplementation == address(0)) {
             timeConstrainedPaymentTreasuryImplementation = address(new TimeConstrainedPaymentTreasury());
@@ -388,13 +395,7 @@ contract DeployAllAndSetupTimeConstrainedPaymentTreasury is DeployBase {
             console2.log("Transferring protocol admin rights to:", finalProtocolAdmin);
             GlobalParams(globalParams).updateProtocolAdminAddress(finalProtocolAdmin);
 
-            //Transfer admin rights to the final protocol admin
-            GlobalParams(globalParams).transferOwnership(finalProtocolAdmin);
-            console2.log("GlobalParams transferred to:", finalProtocolAdmin);
-            if (campaignInfoFactoryDeployed) {
-                CampaignInfoFactory(campaignInfoFactory).transferOwnership(finalProtocolAdmin);
-                console2.log("CampaignInfoFactory transferred to:", finalProtocolAdmin);
-            }
+            // CampaignInfoFactory reads admin from GlobalParams, no separate transfer needed
         }
 
         if (simulate) {
@@ -467,8 +468,7 @@ contract DeployAllAndSetupTimeConstrainedPaymentTreasury is DeployBase {
         console2.log("Protocol Admin:", finalProtocolAdmin);
         console2.log("Platform Admin:", finalPlatformAdmin);
         console2.log("Platform Adapter (Trusted Forwarder):", platformAdapter);
-        console2.log("GlobalParams owner:", GlobalParams(globalParams).owner());
-        console2.log("CampaignInfoFactory owner:", CampaignInfoFactory(campaignInfoFactory).owner());
+        console2.log("Protocol Admin (GlobalParams):", GlobalParams(globalParams).getProtocolAdminAddress());
 
         console2.log("\n--- Supported Currencies & Tokens ---");
         string memory currenciesConfig = vm.envOr("CURRENCIES", string(""));

script/DeployCampaignInfoFactory.s.sol

@@ -28,7 +28,6 @@ contract DeployCampaignInfoFactory is DeployBase {
         // Prepare initialization data
         bytes memory initData = abi.encodeWithSelector(
             CampaignInfoFactory.initialize.selector,
-            deployer,
             IGlobalParams(globalParams),
             campaignInfo,
             treasuryFactory

script/UpgradeTreasuryFactory.s.sol

@@ -14,8 +14,10 @@ contract UpgradeTreasuryFactory is Script {
     function run() external {
         uint256 deployerKey = vm.envUint("PRIVATE_KEY");
         address proxyAddress = vm.envAddress("TREASURY_FACTORY_ADDRESS");
+        address campaignInfoFactoryAddress = vm.envAddress("CAMPAIGN_INFO_FACTORY_ADDRESS");
 
         require(proxyAddress != address(0), "Proxy address must be set");
+        require(campaignInfoFactoryAddress != address(0), "CAMPAIGN_INFO_FACTORY_ADDRESS must be set");
 
         vm.startBroadcast(deployerKey);
 
@@ -31,6 +33,10 @@ contract UpgradeTreasuryFactory is Script {
         console2.log("Proxy address:", proxyAddress);
         console2.log("New implementation address:", address(newImplementation));
 
+        // Wire in CampaignInfoFactory so the new validation guard does not brick deploy()
+        proxy.setCampaignInfoFactory(campaignInfoFactoryAddress);
+        console2.log("CampaignInfoFactory wired into TreasuryFactory:", campaignInfoFactoryAddress);
+
         vm.stopBroadcast();
     }
 }