Saving bytecode by moving moduleOnly access modifier into authorize f…

…unction
gnosisguild · Oct 30, 2023 · edf3d97 · edf3d97
1 parent b0f8d47
commit edf3d97
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/packages/evm/contracts/AllowanceTracker.sol b/packages/evm/contracts/AllowanceTracker.sol
@@ -28,8 +28,8 @@ abstract contract AllowanceTracker is Core {
             return (allowance.balance, allowance.timestamp);
         }
 
-        uint64 elapsedIntervals = (blockTimestamp -
-            allowance.timestamp) / allowance.period;
+        uint64 elapsedIntervals = (blockTimestamp - allowance.timestamp) /
+            allowance.period;
 
         if (allowance.balance < allowance.maxRefill) {
             balance = allowance.balance + allowance.refill * elapsedIntervals;

diff --git a/packages/evm/contracts/PermissionChecker.sol b/packages/evm/contracts/PermissionChecker.sol
@@ -24,7 +24,7 @@ abstract contract PermissionChecker is Core, Periphery {
         uint256 value,
         bytes calldata data,
         Enum.Operation operation
-    ) internal view returns (Consumption[] memory) {
+    ) internal moduleOnly returns (Consumption[] memory) {
         // We never authorize the zero role, as it could clash with the
         // unassigned default role
         if (roleKey == 0) {

diff --git a/packages/evm/contracts/Roles.sol b/packages/evm/contracts/Roles.sol
@@ -105,7 +105,7 @@ contract Roles is
         uint256 value,
         bytes calldata data,
         Enum.Operation operation
-    ) public override moduleOnly returns (bool success) {
+    ) public override returns (bool success) {
         Consumption[] memory consumptions = _authorize(
             defaultRoles[msg.sender],
             to,
@@ -129,12 +129,7 @@ contract Roles is
         uint256 value,
         bytes calldata data,
         Enum.Operation operation
-    )
-        public
-        override
-        moduleOnly
-        returns (bool success, bytes memory returnData)
-    {
+    ) public override returns (bool success, bytes memory returnData) {
         Consumption[] memory consumptions = _authorize(
             defaultRoles[msg.sender],
             to,
@@ -162,7 +157,7 @@ contract Roles is
         Enum.Operation operation,
         bytes32 roleKey,
         bool shouldRevert
-    ) public moduleOnly returns (bool success) {
+    ) public returns (bool success) {
         Consumption[] memory consumptions = _authorize(
             roleKey,
             to,
@@ -193,7 +188,7 @@ contract Roles is
         Enum.Operation operation,
         bytes32 roleKey,
         bool shouldRevert
-    ) public moduleOnly returns (bool success, bytes memory returnData) {
+    ) public returns (bool success, bytes memory returnData) {
         Consumption[] memory consumptions = _authorize(
             roleKey,
             to,

diff --git a/packages/evm/contracts/WriteOnce.sol b/packages/evm/contracts/WriteOnce.sol
@@ -23,26 +23,22 @@ library WriteOnce {
   */
     function store(bytes memory data) internal returns (address pointer) {
         bytes memory creationBytecode = creationBytecodeFor(data);
-        address calculatedAddress = addressFor(creationBytecode);
+        pointer = addressFor(creationBytecode);
 
         uint256 size;
         assembly {
-            size := extcodesize(calculatedAddress)
+            size := extcodesize(pointer)
         }
 
-        address actualAddress;
         if (size == 0) {
-            actualAddress = ISingletonFactory(SINGLETON_FACTORY).deploy(
-                creationBytecode,
-                SALT
+            assert(
+                pointer ==
+                    ISingletonFactory(SINGLETON_FACTORY).deploy(
+                        creationBytecode,
+                        SALT
+                    )
             );
-        } else {
-            actualAddress = calculatedAddress;
         }
-
-        assert(calculatedAddress == actualAddress);
-
-        pointer = calculatedAddress;
     }
 
     /**