Merge branch 'feature/reduce-bytesize-code' into feature/fix-disable-…

…roles * feature/reduce-bytesize-code: FIX: Eliminate overwrite of deepTreeLimit when create a New Root Safe FIX: eliminate useless libraries and code helpers
keyper-labs · Jun 27, 2024 · becba4a · becba4a
2 parents ab79a54 + 04fa7e7
commit becba4a
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 105 deletions.
diff --git a/docs/SigningUtils.md b/docs/SigningUtils.md
@@ -24,44 +24,4 @@ struct Transaction {
   bytes signatures;
 }
 ```
-### _hashTypedDataV4
-
-```solidity
-function _hashTypedDataV4(bytes32 domainSeparator, bytes32 structHash) internal view virtual returns (bytes32)
-```
-
-_Given an already https://eips.ethereum.org/EIPS/eip-712#definition-of-hashstruct[hashed struct], this
-function returns the hash of the fully encoded EIP712 message for this domain.
-
-This hash can be used together with {ECDSA-recover} to obtain the signer of a message. For example:
-
-```solidity
-bytes32 digest = _hashTypedDataV4(keccak256(abi.encode(
-    keccak256("Mail(address to,string contents)"),
-    mailTo,
-    keccak256(bytes(mailContents))
-)));
-address signer = ECDSA.recover(digest, signature);
-```_
-
-### createDigestExecTx
-
-```solidity
-function createDigestExecTx(bytes32 domainSeparatorSafe, struct SigningUtils.Transaction safeTx) public view returns (bytes32)
-```
-
-_Given a transaction, it creates a hash of the transaction that can be signed_
-
-#### Parameters
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| domainSeparatorSafe | bytes32 | Hash of the Safe domain separator |
-| safeTx | struct SigningUtils.Transaction | Safe transaction |
-
-#### Return Values
-
-| Name | Type | Description |
-| ---- | ---- | ----------- |
-| [0] | bytes32 | Hash of the transaction |
 
diff --git a/src/DenyHelper.sol b/src/DenyHelper.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity 0.8.23;
 
-import {GnosisSafeMath} from "@safe-contracts/external/GnosisSafeMath.sol";
 import {Address} from "@openzeppelin/utils/Address.sol";
 import {Context} from "@openzeppelin/utils/Context.sol";
 import {Constants} from "./libraries/Constants.sol";
@@ -27,7 +26,6 @@ abstract contract ValidAddress is Context {
 /// @notice Deny Helpers Methods for the Palmera module
 /// @dev RDeny Helper Palmera Modules
 abstract contract DenyHelper is ValidAddress {
-    using GnosisSafeMath for uint256;
     using Address for address;
 
     /// @dev Deny/Allowlist Flags by Org

diff --git a/src/Helpers.sol b/src/Helpers.sol
@@ -8,7 +8,6 @@ import {
     DenyHelper,
     Address,
     Context,
-    GnosisSafeMath,
     Constants,
     DataTypes,
     Errors,
@@ -24,7 +23,6 @@ import {ReentrancyGuard} from "@openzeppelin/security/ReentrancyGuard.sol";
 /// @notice This contract is a helper contract for the Palmera Module
 /// @dev Helper Methods for the Palmera module
 abstract contract Helpers is DenyHelper, SignatureDecoder, ReentrancyGuard {
-    using GnosisSafeMath for uint256;
     using Address for address;
 
     /// @dev Modifier for Validate if the address is a Safe Smart Account Wallet
@@ -43,7 +41,7 @@ abstract contract Helpers is DenyHelper, SignatureDecoder, ReentrancyGuard {
     /// @return Hash of the domain separator
     function domainSeparator() public view returns (bytes32) {
         return keccak256(
-            abi.encode(Constants.DOMAIN_SEPARATOR_TYPEHASH, getChainId(), this)
+            abi.encode(Constants.DOMAIN_SEPARATOR_TYPEHASH, getChainId(), address(this))
         );
     }
 

diff --git a/src/PalmeraModule.sol b/src/PalmeraModule.sol
@@ -11,15 +11,13 @@ import {
     DataTypes,
     Events,
     Address,
-    GnosisSafeMath,
     Enum,
     ISafe
 } from "./Helpers.sol";
 
 /// @title Palmera Module
 /// @custom:security-contact [email protected]
 contract PalmeraModule is Auth, Helpers {
-    using GnosisSafeMath for uint256;
     using Address for address;
 
     /// @dev Definition of Safe Palmera Module
@@ -334,8 +332,6 @@ contract PalmeraModule is Auth, Helpers {
         bytes32 org = getOrgHashBySafe(caller);
         uint256 newIndex = indexId;
         safeId = _createOrgOrRoot(name, caller, newRootSafe);
-        // Setting level by default
-        depthTreeLimit[org] = 8;
 
         emit Events.RootSafeCreated(org, newIndex, caller, newRootSafe, name);
     }
@@ -727,7 +723,7 @@ contract PalmeraModule is Auth, Helpers {
         address prevUser = getPrevUser(org, user);
         listed[org][prevUser] = listed[org][user];
         listed[org][user] = address(0);
-        listCount[org] = listCount[org] > 1 ? listCount[org].sub(1) : 0;
+        listCount[org] = listCount[org] > 1 ? (listCount[org] - 1) : 0;
         emit Events.DroppedFromList(user);
     }
 

diff --git a/src/SigningUtils.sol b/src/SigningUtils.sol
@@ -21,61 +21,61 @@ abstract contract SigningUtils {
         bytes signatures;
     }
 
-    /**
-     * @dev Given an already https://eips.ethereum.org/EIPS/eip-712#definition-of-hashstruct[hashed struct], this
-     * function returns the hash of the fully encoded EIP712 message for this domain.
-     *
-     * This hash can be used together with {ECDSA-recover} to obtain the signer of a message. For example:
-     *
-     * ```solidity
-     * bytes32 digest = _hashTypedDataV4(keccak256(abi.encode(
-     *     keccak256("Mail(address to,string contents)"),
-     *     mailTo,
-     *     keccak256(bytes(mailContents))
-     * )));
-     * address signer = ECDSA.recover(digest, signature);
-     * ```
-     */
-    function _hashTypedDataV4(bytes32 domainSeparator, bytes32 structHash)
-        internal
-        view
-        virtual
-        returns (bytes32)
-    {
-        return ECDSA.toTypedDataHash(domainSeparator, structHash);
-    }
+    // /**
+    //  * @dev Given an already https://eips.ethereum.org/EIPS/eip-712#definition-of-hashstruct[hashed struct], this
+    //  * function returns the hash of the fully encoded EIP712 message for this domain.
+    //  *
+    //  * This hash can be used together with {ECDSA-recover} to obtain the signer of a message. For example:
+    //  *
+    //  * ```solidity
+    //  * bytes32 digest = _hashTypedDataV4(keccak256(abi.encode(
+    //  *     keccak256("Mail(address to,string contents)"),
+    //  *     mailTo,
+    //  *     keccak256(bytes(mailContents))
+    //  * )));
+    //  * address signer = ECDSA.recover(digest, signature);
+    //  * ```
+    //  */
+    // function _hashTypedDataV4(bytes32 domainSeparator, bytes32 structHash)
+    //     internal
+    //     view
+    //     virtual
+    //     returns (bytes32)
+    // {
+    //     return ECDSA.toTypedDataHash(domainSeparator, structHash);
+    // }
 
-    /**
-     * @dev Given a transaction, it creates a hash of the transaction that can be signed
-     * @param domainSeparatorSafe Hash of the Safe domain separator
-     * @param safeTx Safe transaction
-     * @return Hash of the transaction
-     */
-    function createDigestExecTx(
-        bytes32 domainSeparatorSafe,
-        Transaction memory safeTx
-    ) public view returns (bytes32) {
-        bytes32 digest = _hashTypedDataV4(
-            domainSeparatorSafe,
-            keccak256(
-                abi.encode(
-                    keccak256(
-                        "execTransaction(address to,uint256 value,bytes data,Enum.Operation operation,uint256 safeTxGas,uint256 baseGas,uint256 gasPrice,address gasToken,address refundReceiver,bytes signatures)"
-                    ),
-                    safeTx.to,
-                    safeTx.value,
-                    safeTx.data,
-                    safeTx.operation,
-                    safeTx.safeTxGas,
-                    safeTx.baseGas,
-                    safeTx.gasPrice,
-                    safeTx.gasToken,
-                    safeTx.refundReceiver,
-                    safeTx.signatures
-                )
-            )
-        );
+    // /**
+    //  * @dev Given a transaction, it creates a hash of the transaction that can be signed
+    //  * @param domainSeparatorSafe Hash of the Safe domain separator
+    //  * @param safeTx Safe transaction
+    //  * @return Hash of the transaction
+    //  */
+    // function createDigestExecTx(
+    //     bytes32 domainSeparatorSafe,
+    //     Transaction memory safeTx
+    // ) public view returns (bytes32) {
+    //     bytes32 digest = _hashTypedDataV4(
+    //         domainSeparatorSafe,
+    //         keccak256(
+    //             abi.encode(
+    //                 keccak256(
+    //                     "execTransaction(address to,uint256 value,bytes data,Enum.Operation operation,uint256 safeTxGas,uint256 baseGas,uint256 gasPrice,address gasToken,address refundReceiver,bytes signatures)"
+    //                 ),
+    //                 safeTx.to,
+    //                 safeTx.value,
+    //                 safeTx.data,
+    //                 safeTx.operation,
+    //                 safeTx.safeTxGas,
+    //                 safeTx.baseGas,
+    //                 safeTx.gasPrice,
+    //                 safeTx.gasToken,
+    //                 safeTx.refundReceiver,
+    //                 safeTx.signatures
+    //             )
+    //         )
+    //     );
 
-        return digest;
-    }
+    //     return digest;
+    // }
 }