fix: I3

rhinestonewtf · kopy-kat · Jul 8, 2024 · Jun 17, 2024 · Jun 17, 2024 · Jun 17, 2024
commit f76e42f37f463ca3364042d933223d248cd08bf4
diff --git a/src/ISafe7579.sol b/src/ISafe7579.sol
@@ -204,8 +204,8 @@ interface ISafe7579 is IERC7579Account {
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                   Query Account Details                    */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-    function getValidatorPaginated(
-        address start,
+    function getValidatorsPaginated(
+        address cursor,
         uint256 pageSize
     )
         external

diff --git a/src/Safe7579.sol b/src/Safe7579.sol
@@ -87,12 +87,12 @@ contract Safe7579 is ISafe7579, ISafeOp, AccessControl, Initializer {
         /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
         ISafe safe = ISafe(msg.sender);
         if (execType == EXECTYPE_DEFAULT) {
-            // DEFAULT EXEC & SINGLE CALL
+            // DEFAULT EXEC & BATCH CALL
             if (callType == CALLTYPE_BATCH) {
                 Execution[] calldata executions = executionCalldata.decodeBatch();
                 _exec(safe, executions);
             }
-            // DEFAULT EXEC & BATCH CALL
+            // DEFAULT EXEC & SINGLE CALL
             else if (callType == CALLTYPE_SINGLE) {
                 (address target, uint256 value, bytes calldata callData) =
                     executionCalldata.decodeSingle();
@@ -171,7 +171,7 @@ contract Safe7579 is ISafe7579, ISafeOp, AccessControl, Initializer {
 
     /**
      * Internal function that will be solely called by executeFromExecutor. Not super uniform code,
-     * but we need need the JUMPI to avoid stack too deep, due to the modifiers in the
+     * but we need the JUMPI to avoid stack too deep, due to the modifiers in the
      * executeFromExecutor function
      */
     function _executeReturn(
@@ -187,12 +187,12 @@ contract Safe7579 is ISafe7579, ISafeOp, AccessControl, Initializer {
         /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
         if (execType == EXECTYPE_DEFAULT) {
-            // DEFAULT EXEC & SINGLE CALL
+            // DEFAULT EXEC & BATCH CALL
             if (callType == CALLTYPE_BATCH) {
                 Execution[] calldata executions = executionCalldata.decodeBatch();
                 returnDatas = _execReturn(ISafe(msg.sender), executions);
             }
-            // DEFAULT EXEC & BATCH CALL
+            // DEFAULT EXEC & SINGLE CALL
             else if (callType == CALLTYPE_SINGLE) {
                 (address target, uint256 value, bytes calldata callData) =
                     executionCalldata.decodeSingle();
@@ -215,12 +215,12 @@ contract Safe7579 is ISafe7579, ISafeOp, AccessControl, Initializer {
         /*                           TRY EXEC                         */
         /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
         else if (execType == EXECTYPE_TRY) {
-            // TRY EXEC & SINGLE CALL
+            // TRY EXEC & BATCH CALL
             if (callType == CALLTYPE_BATCH) {
                 Execution[] calldata executions = executionCalldata.decodeBatch();
                 (, returnDatas) = _tryExecReturn(ISafe(msg.sender), executions);
             }
-            // TRY EXEC & BATCH CALL
+            // TRY EXEC & SINGLE CALL
             else if (callType == CALLTYPE_SINGLE) {
                 (address target, uint256 value, bytes calldata callData) =
                     executionCalldata.decodeSingle();
@@ -383,7 +383,7 @@ contract Safe7579 is ISafe7579, ISafeOp, AccessControl, Initializer {
         withHook(IERC7579Account.installModule.selector)
         onlyEntryPointOrSelf
     {
-        // internal install functions will decode the initData param, and return sanitzied
+        // internal install functions will decode the initData param, and return sanitized
         // moduleInitData. This is the initData that will be passed to Module.onInstall()
         bytes memory moduleInitData;
         if (moduleType == MODULE_TYPE_VALIDATOR) {
@@ -423,7 +423,7 @@ contract Safe7579 is ISafe7579, ISafeOp, AccessControl, Initializer {
         withHook(IERC7579Account.uninstallModule.selector)
         onlyEntryPointOrSelf
     {
-        // internal uninstall functions will decode the deInitData param, and return sanitzied
+        // internal uninstall functions will decode the deInitData param, and return sanitized
         // moduleDeInitData. This is the initData that will be passed to Module.onUninstall()
         bytes memory moduleDeInitData;
         if (moduleType == MODULE_TYPE_VALIDATOR) {

diff --git a/src/core/ModuleManager.sol b/src/core/ModuleManager.sol
@@ -97,8 +97,8 @@ abstract contract ModuleManager is ISafe7579, AccessControl, Receiver, RegistryA
     /**
      * Get paginated list of installed validators
      */
-    function getValidatorPaginated(
-        address start,
+    function getValidatorsPaginated(
+        address cursor,
         uint256 pageSize
     )
         external
@@ -108,7 +108,7 @@ abstract contract ModuleManager is ISafe7579, AccessControl, Receiver, RegistryA
     {
         return $validators.getEntriesPaginated({
             account: msg.sender,
-            start: start,
+            start: cursor,
             pageSize: pageSize
         });
     }
@@ -492,7 +492,7 @@ abstract contract ModuleManager is ISafe7579, AccessControl, Receiver, RegistryA
     /**
      * To make it easier to install multiple modules at once, this function will
      * install multiple modules at once. The init data is expected to be a abi encoded tuple
-     * of (uint[] types, bytes[] contexts, bytes[] moduleInitData)
+     * of (uint[] types, bytes[] contexts, bytes moduleInitData)
      * @dev Install multiple modules at once
      * @param module address of the module
      * @param initData initialization data for the module