cr fixes

Author: RafalMagrys

script/Deploy.s.sol

@@ -30,8 +30,6 @@ contract Deploy is Script, DeployUtils {
     error InvalidEnv();
 
     function run() external {
-        _ensureEnvsExist();
-
         admin = vm.addr(vm.envUint("PRIVATE_KEY_TEST"));
         allocator = vm.envAddress("ALLOCATOR");
         terminationOracle = vm.envAddress("TERMINATION_ORACLE");
@@ -57,16 +55,6 @@ contract Deploy is Script, DeployUtils {
         _serializeAndSaveArtifact();
     }
 
-    function _ensureEnvsExist() internal view {
-        if (
-            !vm.envExists("RPC_TEST") || !vm.envExists("PRIVATE_KEY_TEST") || !vm.envExists("FILECOIN_PAY")
-                || !vm.envExists("SP_REGISTRY") || !vm.envExists("ALLOCATOR") || !vm.envExists("TERMINATION_ORACLE")
-                || !vm.envExists("ORACLE")
-        ) {
-            revert InvalidEnv();
-        }
-    }
-
     function _deployValidatorFactory(address _admin) internal returns (address proxy) {
         Validator validatorImpl = new Validator();
         ValidatorFactory impl = new ValidatorFactory();

src/PoRepMarket.sol

@@ -134,6 +134,7 @@ contract PoRepMarket is Initializable, AccessControlUpgradeable, UUPSUpgradeable
     error ValidatorAlreadySet(uint256 dealId);
     error InvalidRetrievabilityPct(uint8 value);
     error InvalidIndexingPct(uint8 value);
+    error InvalidClientSmartContractAddress();
 
     /**
      * @notice Constructor
@@ -166,6 +167,7 @@ contract PoRepMarket is Initializable, AccessControlUpgradeable, UUPSUpgradeable
      * @param _clientSmartContract The address of the client smart contract
      */
     function setClientSmartContract(address _clientSmartContract) public onlyRole(DEFAULT_ADMIN_ROLE) {
+        if (_clientSmartContract == address(0)) revert InvalidClientSmartContractAddress();
         DealProposalsStorage storage $ = _getDealProposalsStorage();
         $._clientSmartContract = _clientSmartContract;
         emit ClientSmartContractUpdated(_clientSmartContract);

src/ValidatorFactory.sol

@@ -58,6 +58,9 @@ contract ValidatorFactory is UUPSUpgradeable, AccessControlUpgradeable {
     error InvalidAdminAddress();
     error InvalidClientAddress();
     error InvalidSlcAddress();
+    error InvalidPoRepMarketAddress();
+    error InvalidClientSmartContractAddress();
+    error InvalidFilecoinPayAddress();
 
     /**
      * @notice Emitted when a new proxy is successfully created
@@ -92,6 +95,10 @@ contract ValidatorFactory is UUPSUpgradeable, AccessControlUpgradeable {
         external
         reinitializer(2)
     {
+        if (_poRepMarket == address(0)) revert InvalidPoRepMarketAddress();
+        if (_clientSmartContract == address(0)) revert InvalidClientSmartContractAddress();
+        if (_filecoinPay == address(0)) revert InvalidFilecoinPayAddress();
+
         ValidatorFactoryStorage storage $ = s();
         $._poRepMarket = _poRepMarket;
         $._clientSmartContract = _clientSmartContract;

test/PoRepMarket.t.sol

@@ -347,4 +347,10 @@ contract PoRepMarketTest is Test {
         vm.expectRevert(abi.encodeWithSelector(PoRepMarket.InvalidIndexingPct.selector, uint8(101)));
         poRepMarket.proposeDeal(badRequirements, defaultTerms);
     }
+
+    function testSetClientSmartContractRevertsWhenAddressIsZero() public {
+        vm.prank(adminAddress);
+        vm.expectRevert(abi.encodeWithSelector(PoRepMarket.InvalidClientSmartContractAddress.selector));
+        poRepMarket.setClientSmartContract(address(0));
+    }
 }

test/ValidatorFactory.t.sol

@@ -161,4 +161,22 @@ contract ValidatorFactoryTest is Test {
         vm.prank(incorrectClient);
         factory.create(admin, slcAddress, provider, params);
     }
+
+    function testInitialize2RevertsWhenPoRepMarketIsZero() public {
+        ValidatorFactory f = ValidatorFactory(address(new ERC1967Proxy(address(factoryImpl), initData)));
+        vm.expectRevert(abi.encodeWithSelector(ValidatorFactory.InvalidPoRepMarketAddress.selector));
+        f.initialize2(address(0), clientSmartContract, filecoinPay);
+    }
+
+    function testInitialize2RevertsWhenClientSmartContractIsZero() public {
+        ValidatorFactory f = ValidatorFactory(address(new ERC1967Proxy(address(factoryImpl), initData)));
+        vm.expectRevert(abi.encodeWithSelector(ValidatorFactory.InvalidClientSmartContractAddress.selector));
+        f.initialize2(poRepMarket, address(0), filecoinPay);
+    }
+
+    function testInitialize2RevertsWhenFilecoinPayIsZero() public {
+        ValidatorFactory f = ValidatorFactory(address(new ERC1967Proxy(address(factoryImpl), initData)));
+        vm.expectRevert(abi.encodeWithSelector(ValidatorFactory.InvalidFilecoinPayAddress.selector));
+        f.initialize2(poRepMarket, clientSmartContract, address(0));
+    }
 }