Skip to content
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

test: finish test cases for per hook data #157

Merged
merged 1 commit into from
Aug 23, 2024
Merged

test: finish test cases for per hook data #157

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
125 changes: 113 additions & 12 deletions test/account/PerHookData.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import {PackedUserOperation} from "@eth-infinitism/account-abstraction/interface
import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";

import {ReferenceModularAccount} from "../../src/account/ReferenceModularAccount.sol";

import {HookConfigLib} from "../../src/helpers/HookConfigLib.sol";
import {ModuleEntity, ModuleEntityLib} from "../../src/helpers/ModuleEntityLib.sol";
import {SparseCalldataSegmentLib} from "../../src/helpers/SparseCalldataSegmentLib.sol";
import {ValidationConfigLib} from "../../src/helpers/ValidationConfigLib.sol";

import {Counter} from "../mocks/Counter.sol";
import {MockAccessControlHookModule} from "../mocks/modules/MockAccessControlHookModule.sol";
Expand All @@ -22,6 +22,10 @@ contract PerHookDataTest is CustomValidationTestBase {

Counter internal _counter;

uint32 internal constant _VALIDATION_ENTITY_ID = 0;
uint32 internal constant _PRE_HOOK_ENTITY_ID_1 = 0;
uint32 internal constant _PRE_HOOK_ENTITY_ID_2 = 1;

function setUp() public {
_counter = new Counter();

Expand Down Expand Up @@ -127,7 +131,58 @@ contract PerHookDataTest is CustomValidationTestBase {
entryPoint.handleOps(userOps, beneficiary);
}

// todo: index out of order failure case with 2 pre hooks
function test_passAccessControl_twoHooks_userOp() public {
_installSecondPreHook();

assertEq(_counter.number(), 0);

(PackedUserOperation memory userOp, bytes32 userOpHash) = _getCounterUserOP();

(uint8 v, bytes32 r, bytes32 s) = vm.sign(owner1Key, userOpHash.toEthSignedMessageHash());

PreValidationHookData[] memory preValidationHookData = new PreValidationHookData[](2);
preValidationHookData[0] = PreValidationHookData({index: 0, validationData: abi.encodePacked(_counter)});
preValidationHookData[1] = PreValidationHookData({index: 1, validationData: abi.encodePacked(_counter)});

userOp.signature = _encodeSignature(
_signerValidation, GLOBAL_VALIDATION, preValidationHookData, abi.encodePacked(r, s, v)
);

PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
userOps[0] = userOp;

entryPoint.handleOps(userOps, beneficiary);

assertEq(_counter.number(), 1);
}

function test_failAccessControl_indexOutOfOrder_userOp() public {
_installSecondPreHook();

(PackedUserOperation memory userOp, bytes32 userOpHash) = _getCounterUserOP();
(uint8 v, bytes32 r, bytes32 s) = vm.sign(owner1Key, userOpHash.toEthSignedMessageHash());

PreValidationHookData[] memory preValidationHookData = new PreValidationHookData[](3);
preValidationHookData[0] = PreValidationHookData({index: 0, validationData: abi.encodePacked(_counter)});
preValidationHookData[1] = PreValidationHookData({index: 0, validationData: abi.encodePacked(_counter)});

userOp.signature = _encodeSignature(
_signerValidation, GLOBAL_VALIDATION, preValidationHookData, abi.encodePacked(r, s, v)
);

PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
userOps[0] = userOp;

vm.expectRevert(
abi.encodeWithSelector(
IEntryPoint.FailedOpWithRevert.selector,
0,
"AA23 reverted",
abi.encodeWithSelector(SparseCalldataSegmentLib.SegmentOutOfOrder.selector)
)
);
entryPoint.handleOps(userOps, beneficiary);
}

function test_failAccessControl_badTarget_userOp() public {
PackedUserOperation memory userOp = PackedUserOperation({
Expand Down Expand Up @@ -248,7 +303,7 @@ contract PerHookDataTest is CustomValidationTestBase {
abi.encodeWithSelector(
ReferenceModularAccount.PreRuntimeValidationHookFailed.selector,
_accessControlHookModule,
uint32(MockAccessControlHookModule.EntityId.PRE_VALIDATION_HOOK),
_PRE_HOOK_ENTITY_ID_1,
abi.encodeWithSignature("Error(string)", "Proof doesn't match target")
)
);
Expand All @@ -266,7 +321,7 @@ contract PerHookDataTest is CustomValidationTestBase {
abi.encodeWithSelector(
ReferenceModularAccount.PreRuntimeValidationHookFailed.selector,
_accessControlHookModule,
uint32(MockAccessControlHookModule.EntityId.PRE_VALIDATION_HOOK),
_PRE_HOOK_ENTITY_ID_1,
abi.encodeWithSignature("Error(string)", "Proof doesn't match target")
)
);
Expand Down Expand Up @@ -295,7 +350,42 @@ contract PerHookDataTest is CustomValidationTestBase {
);
}

//todo: index out of order failure case with 2 pre hooks
function test_passAccessControl_twoHooks_runtime() public {
_installSecondPreHook();

assertEq(_counter.number(), 0);

PreValidationHookData[] memory preValidationHookData = new PreValidationHookData[](2);
preValidationHookData[0] = PreValidationHookData({index: 0, validationData: abi.encodePacked(_counter)});
preValidationHookData[1] = PreValidationHookData({index: 1, validationData: abi.encodePacked(_counter)});

vm.prank(owner1);
account1.executeWithAuthorization(
abi.encodeCall(
ReferenceModularAccount.execute, (address(_counter), 0 wei, abi.encodeCall(Counter.increment, ()))
),
_encodeSignature(_signerValidation, GLOBAL_VALIDATION, preValidationHookData, "")
);

assertEq(_counter.number(), 1);
}

function test_failAccessControl_indexOutOfOrder_runtime() public {
_installSecondPreHook();

PreValidationHookData[] memory preValidationHookData = new PreValidationHookData[](3);
preValidationHookData[0] = PreValidationHookData({index: 0, validationData: abi.encodePacked(_counter)});
preValidationHookData[1] = PreValidationHookData({index: 0, validationData: abi.encodePacked(_counter)});

vm.prank(owner1);
vm.expectRevert(abi.encodeWithSelector(SparseCalldataSegmentLib.SegmentOutOfOrder.selector));
account1.executeWithAuthorization(
abi.encodeCall(
ReferenceModularAccount.execute, (address(_counter), 0 wei, abi.encodeCall(Counter.increment, ()))
),
_encodeSignature(_signerValidation, GLOBAL_VALIDATION, preValidationHookData, "")
);
}

function test_failAccessControl_badTarget_runtime() public {
PreValidationHookData[] memory preValidationHookData = new PreValidationHookData[](1);
Expand All @@ -306,7 +396,7 @@ contract PerHookDataTest is CustomValidationTestBase {
abi.encodeWithSelector(
ReferenceModularAccount.PreRuntimeValidationHookFailed.selector,
_accessControlHookModule,
uint32(MockAccessControlHookModule.EntityId.PRE_VALIDATION_HOOK),
_PRE_HOOK_ENTITY_ID_1,
abi.encodeWithSignature("Error(string)", "Target not allowed")
)
);
Expand Down Expand Up @@ -394,6 +484,19 @@ contract PerHookDataTest is CustomValidationTestBase {
account1.isValidSignature(messageHash, _encode1271Signature(_signerValidation, abi.encodePacked(r, s, v)));
}

function _installSecondPreHook() internal {
// depends on the ability of `installValidation` to append hooks
bytes[] memory hooks = new bytes[](1);
hooks[0] = abi.encodePacked(
HookConfigLib.packValidationHook(address(_accessControlHookModule), _PRE_HOOK_ENTITY_ID_2),
abi.encode(_PRE_HOOK_ENTITY_ID_2, _counter)
);
vm.prank(address(entryPoint));
account1.installValidation(
ValidationConfigLib.pack(_signerValidation, true, false), new bytes4[](0), "", hooks
);
}

function _getCounterUserOP() internal view returns (PackedUserOperation memory, bytes32) {
PackedUserOperation memory userOp = PackedUserOperation({
sender: address(account1),
Expand Down Expand Up @@ -424,13 +527,11 @@ contract PerHookDataTest is CustomValidationTestBase {
{
bytes[] memory hooks = new bytes[](1);
hooks[0] = abi.encodePacked(
HookConfigLib.packValidationHook(
address(_accessControlHookModule), uint32(MockAccessControlHookModule.EntityId.PRE_VALIDATION_HOOK)
),
abi.encode(_counter)
HookConfigLib.packValidationHook(address(_accessControlHookModule), _PRE_HOOK_ENTITY_ID_1),
abi.encode(_PRE_HOOK_ENTITY_ID_1, _counter)
);
// patched to also work during SMA tests by differentiating the validation
_signerValidation = ModuleEntityLib.pack(address(singleSignerValidationModule), type(uint32).max - 1);
return (_signerValidation, true, true, new bytes4[](0), abi.encode(type(uint32).max - 1, owner1), hooks);
_signerValidation = ModuleEntityLib.pack(address(singleSignerValidationModule), _VALIDATION_ENTITY_ID);
return (_signerValidation, true, true, new bytes4[](0), abi.encode(_VALIDATION_ENTITY_ID, owner1), hooks);
}
}
60 changes: 27 additions & 33 deletions test/mocks/modules/MockAccessControlHookModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@ import {BaseModule} from "../../../src/modules/BaseModule.sol";
// This is just a mock - it does not enforce this over `executeBatch` and other methods of making calls, and should
// not be used in production..
contract MockAccessControlHookModule is IValidationHookModule, BaseModule {
enum EntityId {
PRE_VALIDATION_HOOK
}

mapping(address account => address allowedTarget) public allowedTargets;
mapping(uint32 entityId => mapping(address account => address allowedTarget)) public allowedTargets;

function onInstall(bytes calldata data) external override {
address allowedTarget = abi.decode(data, (address));
allowedTargets[msg.sender] = allowedTarget;
(uint32 entityId, address allowedTarget) = abi.decode(data, (uint32, address));
allowedTargets[entityId][msg.sender] = allowedTarget;
}

function onUninstall(bytes calldata) external override {
delete allowedTargets[msg.sender];
function onUninstall(bytes calldata data) external override {
uint32 entityId = abi.decode(data, (uint32));
delete allowedTargets[entityId][msg.sender];
}

function preUserOpValidationHook(uint32 entityId, PackedUserOperation calldata userOp, bytes32)
Expand All @@ -34,18 +31,17 @@ contract MockAccessControlHookModule is IValidationHookModule, BaseModule {
override
returns (uint256)
{
if (entityId == uint32(EntityId.PRE_VALIDATION_HOOK)) {
if (bytes4(userOp.callData[:4]) == IModularAccount.execute.selector) {
address target = abi.decode(userOp.callData[4:36], (address));

// Simulate a merkle proof - require that the target address is also provided in the signature
address proof = address(bytes20(userOp.signature));
require(proof == target, "Proof doesn't match target");
require(target == allowedTargets[msg.sender], "Target not allowed");
return 0;
}
if (bytes4(userOp.callData[:4]) == IModularAccount.execute.selector) {
address target = abi.decode(userOp.callData[4:36], (address));

// Simulate a merkle proof - require that the target address is also provided in the signature
address proof = address(bytes20(userOp.signature));
require(proof == target, "Proof doesn't match target");
require(target == allowedTargets[entityId][msg.sender], "Target not allowed");
return 0;
}
revert NotImplemented();

revert("Unsupported method");
}

function preRuntimeValidationHook(
Expand All @@ -55,21 +51,19 @@ contract MockAccessControlHookModule is IValidationHookModule, BaseModule {
bytes calldata data,
bytes calldata authorization
) external view override {
if (entityId == uint32(EntityId.PRE_VALIDATION_HOOK)) {
if (bytes4(data[:4]) == IModularAccount.execute.selector) {
address target = abi.decode(data[4:36], (address));

// Simulate a merkle proof - require that the target address is also provided in the authorization
// data
address proof = address(bytes20(authorization));
require(proof == target, "Proof doesn't match target");
require(target == allowedTargets[msg.sender], "Target not allowed");

return;
}
if (bytes4(data[:4]) == IModularAccount.execute.selector) {
address target = abi.decode(data[4:36], (address));

// Simulate a merkle proof - require that the target address is also provided in the authorization
// data
address proof = address(bytes20(authorization));
require(proof == target, "Proof doesn't match target");
require(target == allowedTargets[entityId][msg.sender], "Target not allowed");

return;
}

revert NotImplemented();
revert("Unsupported method");
}

function preSignatureValidationHook(uint32, address, bytes32 hash, bytes calldata signature)
Expand Down
Loading