refactor: verifiers

rsksmart · Apr 16, 2024 · de10baf · de10baf
1 parent c1ad3c9
commit de10baf
Show file tree

Hide file tree

Showing 11 changed files with 237 additions and 517 deletions.
diff --git a/contracts/DestinationContractHandler.sol b/contracts/DestinationContractHandler.sol
@@ -15,11 +15,8 @@ abstract contract DestinationContractHandler is Ownable {
 
     function acceptContract(address destinationContract) external onlyOwner {
         require(
-            destinationContract != address(0),
-            "Contract cannot be zero address"
-        );
-        require(
-            ContractValidator.isContract(destinationContract),
+            destinationContract == address(0) ||
+                ContractValidator.isContract(destinationContract),
             "Address is not a contract"
         );
         require(
@@ -34,10 +31,6 @@ abstract contract DestinationContractHandler is Ownable {
         address destinationContract,
         uint256 index
     ) external onlyOwner {
-        require(
-            destinationContract != address(0),
-            "Contract cannot be zero address"
-        );
         require(contracts[destinationContract], "Contract is not accepted");
         require(
             destinationContract == acceptedContracts[index],
@@ -59,4 +52,13 @@ abstract contract DestinationContractHandler is Ownable {
     ) external view returns (bool) {
         return contracts[destinationContract];
     }
+
+    function destinationContractValidation(
+        address destinationContract
+    ) public view {
+        require(
+            contracts[destinationContract],
+            "Destination contract not allowed"
+        );
+    }
 }
diff --git a/contracts/utils/BoltzValidator.sol b/contracts/utils/BoltzValidator.sol
@@ -15,7 +15,7 @@ library BoltzValidator {
     function validate(
         EnvelopingTypes.DeployRequest calldata relayRequest,
         address contractAddr
-    ) internal {
+    ) internal returns (NativeSwap.PublicClaimInfo memory) {
         bytes4 method = bytes4(keccak256(bytes(relayRequest.request.data[:4])));
         NativeSwap.PublicClaimInfo memory claim;
 
@@ -40,11 +40,6 @@ library BoltzValidator {
             revert("Method not allowed");
         }
 
-        require(
-            relayRequest.request.tokenAmount <= claim.amount,
-            "Claiming value lower than fees"
-        );
-
         NativeSwap swap = NativeSwap(relayRequest.request.to);
 
         bytes32 preimageHash = sha256(abi.encodePacked(claim.preimage));
@@ -58,5 +53,7 @@ library BoltzValidator {
         );
 
         require(swap.swaps(hashValue), "Verifier: swap has no RBTC");
+
+        return claim;
     }
 }
diff --git a/contracts/utils/ContractValidator.sol b/contracts/utils/ContractValidator.sol
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier:MIT
 pragma solidity ^0.6.12;
 
+import "../interfaces/ISmartWalletFactory.sol";
+import "../interfaces/EnvelopingTypes.sol";
+
 library ContractValidator {
     /**
      * Check if a contract has code in it
@@ -22,4 +25,26 @@ library ContractValidator {
             codeHash := extcodehash(addr)
         }
     }
+
+    function deployValidation(
+        EnvelopingTypes.DeployRequest calldata relayRequest,
+        address factory
+    ) internal view returns (address) {
+        require(
+            relayRequest.relayData.callForwarder == factory,
+            "Invalid factory"
+        );
+
+        address contractAddr = ISmartWalletFactory(
+            relayRequest.relayData.callForwarder
+        ).getSmartWalletAddress(
+                relayRequest.request.from,
+                relayRequest.request.recoverer,
+                relayRequest.request.index
+            );
+
+        require(!isContract(contractAddr), "Address already created");
+
+        return contractAddr;
+    }
 }
diff --git a/contracts/verifier/BoltzDeployVerifier.sol b/contracts/verifier/BoltzDeployVerifier.sol
@@ -43,55 +43,41 @@ contract BoltzDeployVerifier is
         EnvelopingTypes.DeployRequest calldata relayRequest,
         bytes calldata signature
     ) external virtual override returns (bytes memory context) {
-        require(
-            relayRequest.relayData.callForwarder == _factory,
-            "Invalid factory"
+        address contractAddr = ContractValidator.deployValidation(
+            relayRequest,
+            _factory
         );
 
-        address contractAddr = BoltzSmartWalletFactory(
-            relayRequest.relayData.callForwarder
-        ).getSmartWalletAddress(
-                relayRequest.request.from,
-                relayRequest.request.recoverer,
-                relayRequest.request.index
-            );
-
-        require(
-            !ContractValidator.isContract(contractAddr),
-            "Address already created"
-        );
+        destinationContractValidation(relayRequest.request.to);
 
-        require(
-            relayRequest.request.to == address(0) ||
-                contracts[relayRequest.request.to],
-            "Destination contract not allowed"
-        );
+        uint256 amount = 0;
+        if (relayRequest.request.to != address(0)) {
+            NativeSwap.PublicClaimInfo memory claim = BoltzValidator.validate(
+                relayRequest,
+                contractAddr
+            );
+            amount = claim.amount;
+        }
 
-        if (relayRequest.request.tokenAmount > 0) {
-            if (relayRequest.request.tokenContract != address(0)) {
-                require(
-                    tokens[relayRequest.request.tokenContract],
-                    "Token contract not allowed"
-                );
+        if (relayRequest.request.tokenContract != address(0)) {
+            require(
+                tokens[relayRequest.request.tokenContract],
+                "Token contract not allowed"
+            );
 
-                require(
-                    relayRequest.request.tokenAmount <=
-                        IERC20(relayRequest.request.tokenContract).balanceOf(
-                            contractAddr
-                        ),
-                    "Token balance too low"
-                );
-            } else {
-                if (relayRequest.request.to != address(0)) {
-                    BoltzValidator.validate(relayRequest, contractAddr);
-                } else {
-                    require(
-                        relayRequest.request.tokenAmount <=
-                            address(contractAddr).balance,
-                        "Native balance too low"
-                    );
-                }
-            }
+            require(
+                relayRequest.request.tokenAmount <=
+                    IERC20(relayRequest.request.tokenContract).balanceOf(
+                        contractAddr
+                    ),
+                "Token balance too low"
+            );
+        } else {
+            require(
+                relayRequest.request.tokenAmount <=
+                    address(contractAddr).balance + amount,
+                "Native balance too low"
+            );
         }
 
         return (

diff --git a/contracts/verifier/BoltzRelayVerifier.sol b/contracts/verifier/BoltzRelayVerifier.sol
@@ -61,26 +61,22 @@ contract BoltzRelayVerifier is
             "Destination contract not allowed"
         );
 
-        if (relayRequest.request.tokenAmount > 0) {
-            if (relayRequest.request.tokenContract != address(0)) {
-                require(
-                    tokens[relayRequest.request.tokenContract],
-                    "Token contract not allowed"
-                );
+        if (relayRequest.request.tokenContract != address(0)) {
+            require(
+                tokens[relayRequest.request.tokenContract],
+                "Token contract not allowed"
+            );
 
-                require(
-                    relayRequest.request.tokenAmount <=
-                        IERC20(relayRequest.request.tokenContract).balanceOf(
-                            payer
-                        ),
-                    "Token balance too low"
-                );
-            } else {
-                require(
-                    relayRequest.request.tokenAmount <= address(payer).balance,
-                    "Native balance too low"
-                );
-            }
+            require(
+                relayRequest.request.tokenAmount <=
+                    IERC20(relayRequest.request.tokenContract).balanceOf(payer),
+                "Token balance too low"
+            );
+        } else {
+            require(
+                relayRequest.request.tokenAmount <= address(payer).balance,
+                "Native balance too low"
+            );
         }
 
         return (

diff --git a/contracts/verifier/DeployVerifier.sol b/contracts/verifier/DeployVerifier.sol
@@ -40,22 +40,10 @@ contract DeployVerifier is IDeployVerifier, TokenHandler {
             tokens[relayRequest.request.tokenContract],
             "Token contract not allowed"
         );
-        require(
-            relayRequest.relayData.callForwarder == _factory,
-            "Invalid factory"
-        );
 
-        address contractAddr = SmartWalletFactory(
-            relayRequest.relayData.callForwarder
-        ).getSmartWalletAddress(
-                relayRequest.request.from,
-                relayRequest.request.recoverer,
-                relayRequest.request.index
-            );
-
-        require(
-            !ContractValidator.isContract(contractAddr),
-            "Address already created"
+        address contractAddr = ContractValidator.deployValidation(
+            relayRequest,
+            _factory
         );
 
         if (relayRequest.request.tokenContract != address(0)) {

diff --git a/contracts/verifier/MinimalBoltzDeployVerifier.sol b/contracts/verifier/MinimalBoltzDeployVerifier.sol
@@ -41,43 +41,34 @@ contract MinimalBoltzDeployVerifier is
         EnvelopingTypes.DeployRequest calldata relayRequest,
         bytes calldata signature
     ) external virtual override returns (bytes memory context) {
+        address contractAddr = ContractValidator.deployValidation(
+            relayRequest,
+            _factory
+        );
+
         require(
-            relayRequest.relayData.callForwarder == _factory,
-            "Invalid factory"
+            relayRequest.request.to != address(0),
+            "SW needs a contract execution"
         );
 
-        address contractAddr = MinimalBoltzSmartWalletFactory(
-            relayRequest.relayData.callForwarder
-        ).getSmartWalletAddress(
-                relayRequest.request.from,
-                relayRequest.request.recoverer,
-                relayRequest.request.index
-            );
+        destinationContractValidation(relayRequest.request.to);
 
-        require(
-            !ContractValidator.isContract(contractAddr),
-            "Address already created"
+        NativeSwap.PublicClaimInfo memory claim = BoltzValidator.validate(
+            relayRequest,
+            contractAddr
         );
 
         require(
-            relayRequest.request.to != address(0),
-            "SW needs a contract execution"
+            relayRequest.request.tokenContract == address(0),
+            "RBTC necessary for payment"
         );
 
         require(
-            contracts[relayRequest.request.to],
-            "Destination contract not allowed"
+            relayRequest.request.tokenAmount <=
+                address(contractAddr).balance + claim.amount,
+            "Native balance too low"
         );
 
-        if (relayRequest.request.tokenAmount > 0) {
-            require(
-                relayRequest.request.tokenContract == address(0),
-                "RBTC necessary for payment"
-            );
-
-            BoltzValidator.validate(relayRequest, contractAddr);
-        }
-
         return (
             abi.encode(
                 contractAddr,