Skip to content

fix: encode success flag in EXECTYPE_TRY return data #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhicris wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: encode success flag in EXECTYPE_TRY return data #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/MSAAdvanced.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ contract MSAAdvanced is
}
// TODO: implement event emission for tryExecute singleCall
else if (execType == EXECTYPE_TRY) {
(success, returnData[0]) = _tryExecute(target, value, callData);
if (!success) emit TryExecuteUnsuccessful(0, returnData[0]);
bytes memory innerResult;
(success, innerResult) = _tryExecute(target, value, callData);
if (!success) emit TryExecuteUnsuccessful(0, innerResult);
returnData[0] = abi.encode(success, innerResult);
} else {
revert UnsupportedExecType(execType);
}
Expand Down
6 changes: 4 additions & 2 deletions src/core/ExecutionHelper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ contract ExecutionHelper {
for (uint256 i; i < length; i++) {
Execution calldata _exec = executions[i];
bool success;
(success, result[i]) = _tryExecute(_exec.target, _exec.value, _exec.callData);
if (!success) emit TryExecuteUnsuccessful(i, result[i]);
bytes memory returnData;
(success, returnData) = _tryExecute(_exec.target, _exec.value, _exec.callData);
if (!success) emit TryExecuteUnsuccessful(i, returnData);
result[i] = abi.encode(success, returnData);
}
}

Expand Down