Skip to content

Add ERC7821 support for optional opData #56

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add ERC7821 support for optional opData #56

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
63 changes: 55 additions & 8 deletions contracts/account/extensions/AccountERC7821.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,67 @@ import {AccountCore} from "../AccountCore.sol";
abstract contract AccountERC7821 is AccountCore, IERC7821 {
using ERC7579Utils for *;

ModeSelector private constant SIMPLE_MODE_SELECTOR = ModeSelector.wrap(0x00000000);
ModeSelector private constant OPTIONAL_OPDATA_MODE_SELECTOR = ModeSelector.wrap(0x78210001);

error UnsupportedExecutionMode();

/// @inheritdoc IERC7821
function execute(bytes32 mode, bytes calldata executionData) public payable virtual onlyEntryPointOrSelf {
if (!supportsExecutionMode(mode)) revert UnsupportedExecutionMode();
executionData.execBatch(ERC7579Utils.EXECTYPE_DEFAULT);
(ModeSelector modeSelector, bool supported) = _supportsExecutionMode(mode);
require(supported, UnsupportedExecutionMode());
if (modeSelector == SIMPLE_MODE_SELECTOR) executionData.execBatch(ERC7579Utils.EXECTYPE_DEFAULT);
else {
bytes calldata opData;
(executionData, opData) = _decodeExecutionOpData(executionData);
_verifyOpData(executionData, opData);
executionData.execBatch(ERC7579Utils.EXECTYPE_DEFAULT);
}
}

function _verifyOpData(bytes calldata executionData, bytes calldata opData) internal view virtual {
// NO-OP by default
}

/// @inheritdoc IERC7821
function supportsExecutionMode(bytes32 mode) public view virtual returns (bool result) {
(CallType callType, ExecType execType, ModeSelector modeSelector, ) = Mode.wrap(mode).decodeMode();
return
callType == ERC7579Utils.CALLTYPE_BATCH &&
execType == ERC7579Utils.EXECTYPE_DEFAULT &&
modeSelector == ModeSelector.wrap(0x00000000);
function supportsExecutionMode(bytes32 mode) public view virtual returns (bool) {
(, bool result) = _supportsExecutionMode(mode);
return result;
}

function _supportsExecutionMode(bytes32 mode) internal pure returns (ModeSelector modeSelector, bool supported) {
(CallType callType, ExecType execType, ModeSelector selector, ) = Mode.wrap(mode).decodeMode();
bool isSupportedSelector = selector == SIMPLE_MODE_SELECTOR || selector == OPTIONAL_OPDATA_MODE_SELECTOR;
return (
selector,
(isSupportedSelector &&
callType == ERC7579Utils.CALLTYPE_BATCH &&
execType == ERC7579Utils.EXECTYPE_DEFAULT)
);
}

function _decodeExecutionOpData(
bytes calldata executionData
) internal pure returns (bytes calldata calls, bytes calldata opData) {
// There should be at least 2 elements in the executionData (i.e. a tuple of 2 pointers)
if (executionData.length < 64) return (executionData, _emptyCalldataBytes());

assembly ("memory-safe") {
let callsPtr := add(executionData.offset, calldataload(executionData.offset))
calls.offset := add(callsPtr, 32)
calls.length := calldataload(callsPtr)

let opDataPtr := add(executionData.offset, calldataload(add(executionData.offset, 32)))
opData.offset := add(opDataPtr, 32)
opData.length := calldataload(opDataPtr)
}
}

// slither-disable-next-line write-after-write
function _emptyCalldataBytes() private pure returns (bytes calldata result) {
assembly ("memory-safe") {
result.offset := 0
result.length := 0
}
}
}
Loading