fix: updated control flow around optional callbacks (#124)

GWSzeto · web-flow · commit 318ca00da13a · 2024-07-23T15:13:23.000-07:00
diff --git a/src/ModularCore.sol b/src/ModularCore.sol
@@ -352,13 +352,11 @@ abstract contract ModularCore is IModularCore, OwnableRoles, ReentrancyGuard {
 
         if (callbackFunction.implementation != address(0)) {
             (success, returndata) = address(this).staticcall(_abiEncodedCalldata);
-        } else {
-            if (callbackMode == CallbackMode.REQUIRED) {
-                revert CallbackFunctionRequired();
+            if (!success) {
+                _revert(returndata, CallbackExecutionReverted.selector);
             }
-        }
-        if (!success) {
-            _revert(returndata, CallbackExecutionReverted.selector);
+        } else if (callbackMode == CallbackMode.REQUIRED) {
+            revert CallbackFunctionRequired();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -352,13 +352,11 @@ abstract contract ModularCore is IModularCore, OwnableRoles, ReentrancyGuard {`
`352`	`352`
`353`	`353`	`if (callbackFunction.implementation != address(0)) {`
`354`	`354`	`(success, returndata) = address(this).staticcall(_abiEncodedCalldata);`
`355`		`- } else {`
`356`		`- if (callbackMode == CallbackMode.REQUIRED) {`
`357`		`- revert CallbackFunctionRequired();`
	`355`	`+ if (!success) {`
	`356`	`+ _revert(returndata, CallbackExecutionReverted.selector);`
`358`	`357`	`}`
`359`		`- }`
`360`		`- if (!success) {`
`361`		`- _revert(returndata, CallbackExecutionReverted.selector);`
	`358`	`+ } else if (callbackMode == CallbackMode.REQUIRED) {`
	`359`	`+ revert CallbackFunctionRequired();`
`362`	`360`	`}`
`363`	`361`	`}`
`364`	`362`