diff --git a/src/policies/TimelockPolicy.sol b/src/policies/TimelockPolicy.sol index ce86996..b88d1e1 100644 --- a/src/policies/TimelockPolicy.sol +++ b/src/policies/TimelockPolicy.sol @@ -10,10 +10,7 @@ import { MODULE_TYPE_POLICY, MODULE_TYPE_STATELESS_VALIDATOR, MODULE_TYPE_STATELESS_VALIDATOR_WITH_SENDER, - SIG_VALIDATION_SUCCESS_UINT, - SIG_VALIDATION_FAILED_UINT, - ERC1271_MAGICVALUE, - ERC1271_INVALID + SIG_VALIDATION_FAILED_UINT } from "src/types/Constants.sol"; /** @@ -24,7 +21,7 @@ import { contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorWithSender { enum ProposalStatus { None, // Proposal doesn't exist - Pending, // Proposal created, waiting for timelock + Pending, // Clock started, waiting for timelock Executed, // Proposal executed Cancelled // Proposal cancelled } @@ -32,18 +29,24 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW struct TimelockConfig { uint48 delay; // Timelock delay in seconds uint48 expirationPeriod; // How long after validAfter the proposal remains valid + uint48 gracePeriod; // Period after validAfter during which only owner can execute/cancel bool initialized; } struct Proposal { ProposalStatus status; - uint48 validAfter; // Timestamp when proposal becomes executable + uint48 validAfter; // Timestamp when timelock passes (grace period starts) + uint48 graceEnd; // Timestamp when grace period ends (public execution allowed) uint48 validUntil; // Timestamp when proposal expires + uint256 epoch; // Epoch when proposal was created } // Storage: id => wallet => config mapping(bytes32 => mapping(address => TimelockConfig)) public timelockConfig; + // Storage: id => wallet => epoch (persists across uninstall/reinstall) + mapping(bytes32 => mapping(address => uint256)) public currentEpoch; + // Storage: userOpKey => id => wallet => proposal // userOpKey = keccak256(abi.encode(account, keccak256(callData), nonce)) mapping(bytes32 => mapping(bytes32 => mapping(address => Proposal))) public proposals; @@ -56,23 +59,23 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW event ProposalCancelled(address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash); - event TimelockConfigUpdated(address indexed wallet, bytes32 indexed id, uint256 delay, uint256 expirationPeriod); + event TimelockConfigUpdated( + address indexed wallet, bytes32 indexed id, uint256 delay, uint256 expirationPeriod, uint256 gracePeriod + ); error InvalidDelay(); error InvalidExpirationPeriod(); - error ProposalNotFound(); - error ProposalAlreadyExists(); - error TimelockNotExpired(uint256 validAfter, uint256 currentTime); - error ProposalExpired(uint256 validUntil, uint256 currentTime); + error InvalidGracePeriod(); error ProposalNotPending(); error OnlyAccount(); + error ParametersTooLarge(); /** * @notice Install the timelock policy - * @param _data Encoded: (uint48 delay, uint48 expirationPeriod) + * @param _data Encoded: (uint48 delay, uint48 expirationPeriod, uint48 gracePeriod) */ function _policyOninstall(bytes32 id, bytes calldata _data) internal override { - (uint48 delay, uint48 expirationPeriod) = abi.decode(_data, (uint48, uint48)); + (uint48 delay, uint48 expirationPeriod, uint48 gracePeriod) = abi.decode(_data, (uint48, uint48, uint48)); if (timelockConfig[id][msg.sender].initialized) { revert IModule.AlreadyInitialized(msg.sender); @@ -80,11 +83,19 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW if (delay == 0) revert InvalidDelay(); if (expirationPeriod == 0) revert InvalidExpirationPeriod(); + if (gracePeriod == 0) revert InvalidGracePeriod(); + // Prevent uint48 overflow: uint48(block.timestamp) + delay + gracePeriod + expirationPeriod + if (uint256(delay) + uint256(gracePeriod) + uint256(expirationPeriod) > type(uint48).max - block.timestamp) { + revert ParametersTooLarge(); + } + + // Increment epoch to invalidate any proposals from previous installations + currentEpoch[id][msg.sender]++; timelockConfig[id][msg.sender] = - TimelockConfig({delay: delay, expirationPeriod: expirationPeriod, initialized: true}); + TimelockConfig({delay: delay, expirationPeriod: expirationPeriod, gracePeriod: gracePeriod, initialized: true}); - emit TimelockConfigUpdated(msg.sender, id, delay, expirationPeriod); + emit TimelockConfigUpdated(msg.sender, id, delay, expirationPeriod, gracePeriod); } /** @@ -107,37 +118,6 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW || moduleTypeId == MODULE_TYPE_STATELESS_VALIDATOR_WITH_SENDER; } - /** - * @notice Create a proposal for time-delayed execution - * @dev Anyone can create a proposal - the timelock delay provides the security - * @param id The policy ID - * @param account The account address - * @param callData The calldata for the future operation - * @param nonce The nonce for the future operation - */ - function createProposal(bytes32 id, address account, bytes calldata callData, uint256 nonce) external { - TimelockConfig storage config = timelockConfig[id][account]; - if (!config.initialized) revert IModule.NotInitialized(account); - - // Calculate proposal timing - uint48 validAfter = uint48(block.timestamp) + config.delay; - uint48 validUntil = validAfter + config.expirationPeriod; - - // Create userOp key for storage lookup - bytes32 userOpKey = keccak256(abi.encode(account, keccak256(callData), nonce)); - - // Check proposal doesn't already exist - if (proposals[userOpKey][id][account].status != ProposalStatus.None) { - revert ProposalAlreadyExists(); - } - - // Create proposal (stored by userOpKey) - proposals[userOpKey][id][account] = - Proposal({status: ProposalStatus.Pending, validAfter: validAfter, validUntil: validUntil}); - - emit ProposalCreated(account, id, userOpKey, validAfter, validUntil); - } - /** * @notice Cancel a pending proposal * @dev Only the account itself can cancel proposals to prevent griefing @@ -187,8 +167,10 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW } /** - * @notice Handle proposal creation from userOp - * @dev Signature format: [callDataLength(32)][callData][nonce(32)][remaining sig data] + * @notice Handle proposal creation from a no-op UserOp + * @dev Called when the session key holder submits a no-op UserOp with proposal data in the signature. + * Creates a new Pending proposal with the timelock clock started. + * Signature format: [callDataLength(32)][callData][nonce(32)][remaining sig data] */ function _handleProposalCreationInternal( bytes32 id, @@ -201,36 +183,38 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW // Format: [callDataLength(32 bytes)][callData][nonce(32 bytes)][...] uint256 callDataLength = uint256(bytes32(sig[0:32])); - // Validate signature has enough data - if (sig.length < 64 + callDataLength) return SIG_VALIDATION_FAILED_UINT; + // Validate signature has enough data (check callDataLength first to prevent overflow) + if (callDataLength > sig.length || sig.length < 64 + callDataLength) return SIG_VALIDATION_FAILED_UINT; bytes calldata proposalCallData = sig[32:32 + callDataLength]; uint256 proposalNonce = uint256(bytes32(sig[32 + callDataLength:64 + callDataLength])); // Calculate proposal timing uint48 validAfter = uint48(block.timestamp) + config.delay; - uint48 validUntil = validAfter + config.expirationPeriod; + uint48 graceEnd = validAfter + config.gracePeriod; + uint48 validUntil = graceEnd + config.expirationPeriod; // Create userOp key for storage lookup (using PROPOSAL calldata and nonce, not current userOp) bytes32 userOpKey = keccak256(abi.encode(userOp.sender, keccak256(proposalCallData), proposalNonce)); - // Check proposal doesn't already exist - if (proposals[userOpKey][id][account].status != ProposalStatus.None) { - return SIG_VALIDATION_FAILED_UINT; // Proposal already exists + Proposal storage proposal = proposals[userOpKey][id][account]; + + if (proposal.status != ProposalStatus.None) { + return SIG_VALIDATION_FAILED_UINT; } - // Create proposal + // Create proposal with current epoch proposals[userOpKey][id][account] = - Proposal({status: ProposalStatus.Pending, validAfter: validAfter, validUntil: validUntil}); + Proposal({status: ProposalStatus.Pending, validAfter: validAfter, graceEnd: graceEnd, validUntil: validUntil, epoch: currentEpoch[id][account]}); emit ProposalCreated(account, id, userOpKey, validAfter, validUntil); - - // Return failure to prevent execution (this was just proposal creation) - return SIG_VALIDATION_FAILED_UINT; + return _packValidationData(0, 0); } /** * @notice Handle proposal execution from userOp + * @dev Returns graceEnd as validAfter to prevent execution during grace period. + * This gives the owner time to cancel proposals without race conditions. */ function _handleProposalExecutionInternal(bytes32 id, PackedUserOperation calldata userOp, address account) internal @@ -244,112 +228,64 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW // Check proposal exists and is pending if (proposal.status != ProposalStatus.Pending) return SIG_VALIDATION_FAILED_UINT; + // Check proposal is from current epoch (not a stale proposal from previous installation) + if (proposal.epoch != currentEpoch[id][account]) return SIG_VALIDATION_FAILED_UINT; + // Mark as executed proposal.status = ProposalStatus.Executed; emit ProposalExecuted(account, id, userOpKey); - // Return validAfter and validUntil for EntryPoint to validate timing - return _packValidationData(proposal.validAfter, proposal.validUntil); + // Return graceEnd (not validAfter) as the earliest execution time + // This prevents race conditions by ensuring the owner has a grace period to cancel + return _packValidationData(proposal.graceEnd, proposal.validUntil); } /** * @notice Check if calldata is a no-op operation - * @dev Valid no-ops: + * @dev Recognizes 4 forms of no-op: * 1. Empty calldata - * 2. ERC-7579 execute(CALL, self, 0, "") - * 3. ERC-7579 execute(CALL, address(0), 0, "") - * 4. executeUserOp with empty calldata + * 2. ERC-7579 execute(mode=0x00, "") — single-call with empty execution data + * 3. executeUserOp + empty inner calldata (just the 4-byte selector) + * 4. executeUserOp + ERC-7579 execute no-op (selector + form 2) */ - function _isNoOpCalldata(bytes calldata callData) internal view returns (bool) { - // 1. Empty calldata is a no-op - if (callData.length == 0) return true; - - // Need at least 4 bytes for selector - if (callData.length < 4) return false; + function _isNoOpCalldata(bytes calldata callData) internal pure returns (bool) { + uint256 len = callData.length; - bytes4 selector = bytes4(callData[0:4]); + // Case 1: Empty calldata + if (len == 0) return true; - // 2. Check for ERC-7579 execute(bytes32 mode, bytes calldata executionCalldata) - if (selector == IERC7579Execution.execute.selector) { - return _isNoOpERC7579Execute(callData); - } + // Case 2: ERC-7579 execute with empty execution data + if (_isNoOpERC7579Execute(callData)) return true; - // 3. Check for executeUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash) - if (selector == IAccountExecute.executeUserOp.selector) { - return _isNoOpExecuteUserOp(callData); + // Cases 3 & 4: executeUserOp wrapper + if (len >= 4 && bytes4(callData[0:4]) == IAccountExecute.executeUserOp.selector) { + // Case 3: executeUserOp + empty (just the selector, no inner data) + if (len == 4) return true; + // Case 4: executeUserOp + ERC-7579 execute no-op + if (_isNoOpERC7579Execute(callData[4:])) return true; } - // Not a recognized no-op return false; } /** - * @notice Check if ERC-7579 execute call is a no-op - * @dev Valid: execute(CALL, self/address(0), 0, "") - */ - function _isNoOpERC7579Execute(bytes calldata callData) internal view returns (bool) { - // execute(bytes32 mode, bytes calldata executionCalldata) - // Need: 4 (selector) + 32 (mode) + 32 (offset) + 32 (length) + data - if (callData.length < 68) return false; - - // Decode the offset to executionCalldata (should be 32) - uint256 offset = uint256(bytes32(callData[36:68])); - if (offset != 32) return false; - - // Decode the length of executionCalldata - if (callData.length < 100) return false; - uint256 execDataLength = uint256(bytes32(callData[68:100])); - - // For single execution mode, executionCalldata format is: - // target (20 bytes) + value (32 bytes) + calldata (variable) - if (execDataLength < 52) return false; - - // Extract target address (first 20 bytes of executionCalldata) - address target = address(bytes20(callData[100:120])); - - // Check if target is self or address(0) - if (target != msg.sender && target != address(0)) return false; - - // Extract value (next 32 bytes) - uint256 value = uint256(bytes32(callData[120:152])); - - // Value must be 0 - if (value != 0) return false; - - // Check calldata length (remaining bytes should indicate empty calldata) - // executionCalldata = target(20) + value(32) + calldataLength(32) + calldata - if (callData.length < 184) { - // If we don't have enough for calldata length field, it's malformed - return false; - } - - uint256 innerCalldataLength = uint256(bytes32(callData[152:184])); - - // Inner calldata must be empty - return innerCalldataLength == 0; - } - - /** - * @notice Check if executeUserOp call is a no-op - * @dev Valid: executeUserOp("", bytes32) + * @notice Check if calldata is an ERC-7579 execute call with empty execution data + * @dev execute(bytes32 mode, bytes calldata executionCalldata) where: + * - mode byte 0 is 0x00 (single call, not batch/delegatecall) + * - executionCalldata is empty + * ABI layout: selector(4) + mode(32) + offset(32) + length(32) = 100 bytes */ - function _isNoOpExecuteUserOp(bytes calldata callData) internal view returns (bool) { - // executeUserOp(bytes calldata userOp, bytes32 userOpHash) - // Format: 4 (selector) + 32 (userOp offset) + 32 (userOpHash) + 32 (userOp length) + userOp data - if (callData.length < 100) return false; - - // Decode offset to userOp data (should be 32) - uint256 offset = uint256(bytes32(callData[4:36])); - if (offset != 32) return false; - - // userOpHash is at bytes 36-68 (we don't validate it) - - // Decode userOp length - uint256 userOpLength = uint256(bytes32(callData[68:100])); - - // UserOp must be empty - return userOpLength == 0; + function _isNoOpERC7579Execute(bytes calldata callData) internal pure returns (bool) { + if (callData.length != 100) return false; + if (bytes4(callData[0:4]) != IERC7579Execution.execute.selector) return false; + // Mode byte must be 0x00 (single call, not delegatecall or batch) + if (callData[4] != 0x00) return false; + // Offset must be 64 (standard ABI encoding for dynamic param after one fixed param) + if (uint256(bytes32(callData[36:68])) != 64) return false; + // Execution data length must be 0 + if (uint256(bytes32(callData[68:100])) != 0) return false; + return true; } /** @@ -368,37 +304,28 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW /** * @notice Check signature against timelock policy (for ERC-1271) - * @param id The policy ID - * @return validationData 0 if valid, 1 if invalid + * @dev TimelockPolicy does not support ERC-1271 signature validation - always reverts */ - function checkSignaturePolicy(bytes32 id, address, bytes32 hash, bytes calldata sig) - external - view - override - returns (uint256) - { - bytes4 result = _validateSignaturePolicy(id, msg.sender, hash, sig); - return result == ERC1271_MAGICVALUE ? 0 : 1; + function checkSignaturePolicy(bytes32, address, bytes32, bytes calldata) external pure override returns (uint256) { + revert("TimelockPolicy: signature validation not supported"); } - function validateSignatureWithData(bytes32, bytes calldata, bytes calldata data) + function validateSignatureWithData(bytes32, bytes calldata, bytes calldata) external pure override(IStatelessValidator) returns (bool) { - (uint48 delay, uint48 expirationPeriod) = abi.decode(data, (uint48, uint48)); - return delay != 0 && expirationPeriod != 0; + revert("TimelockPolicy: stateless signature validation not supported"); } - function validateSignatureWithDataWithSender(address, bytes32, bytes calldata, bytes calldata data) + function validateSignatureWithDataWithSender(address, bytes32, bytes calldata, bytes calldata) external pure override(IStatelessValidatorWithSender) returns (bool) { - (uint48 delay, uint48 expirationPeriod) = abi.decode(data, (uint48, uint48)); - return delay != 0 && expirationPeriod != 0; + revert("TimelockPolicy: stateless signature validation not supported"); } // ==================== Internal Shared Logic ==================== @@ -417,7 +344,6 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW // Check if this is a proposal creation request // Criteria: calldata is a no-op AND signature has proposal data (length >= 65) if (_isNoOpCalldata(userOp.callData) && sig.length >= 65) { - // This is a proposal creation request return _handleProposalCreationInternal(id, userOp, config, sig, account); } @@ -425,23 +351,6 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW return _handleProposalExecutionInternal(id, userOp, account); } - /** - * @notice Internal function to validate signature policy - * @dev Shared logic for both installed and stateless validator modes - */ - function _validateSignaturePolicy(bytes32 id, address account, bytes32 hash, bytes calldata sig) - internal - view - returns (bytes4) - { - TimelockConfig storage config = timelockConfig[id][account]; - if (!config.initialized) return ERC1271_INVALID; - - // For signature validation, we're more permissive - // Timelock is primarily for userOp execution - return ERC1271_MAGICVALUE; - } - /** * @notice Get proposal details * @param account The account address @@ -450,17 +359,18 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW * @param id The policy ID * @param wallet The wallet address * @return status The proposal status - * @return validAfter When the proposal becomes valid + * @return validAfter When the timelock passes (grace period starts) + * @return graceEnd When the grace period ends (public execution allowed) * @return validUntil When the proposal expires */ function getProposal(address account, bytes calldata callData, uint256 nonce, bytes32 id, address wallet) external view - returns (ProposalStatus status, uint256 validAfter, uint256 validUntil) + returns (ProposalStatus status, uint256 validAfter, uint256 graceEnd, uint256 validUntil) { bytes32 userOpKey = keccak256(abi.encode(account, keccak256(callData), nonce)); Proposal storage proposal = proposals[userOpKey][id][wallet]; - return (proposal.status, proposal.validAfter, proposal.validUntil); + return (proposal.status, proposal.validAfter, proposal.graceEnd, proposal.validUntil); } /** diff --git a/test/TimelockPolicy.t.sol b/test/TimelockPolicy.t.sol index 55d7541..5b287bf 100644 --- a/test/TimelockPolicy.t.sol +++ b/test/TimelockPolicy.t.sol @@ -11,6 +11,7 @@ import "forge-std/console.sol"; contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, StatelessValidatorWithSenderTestBase { uint48 delay = 1 days; uint48 expirationPeriod = 1 days; + uint48 gracePeriod = 1 hours; function deployModule() internal virtual override returns (IModule) { return new TimelockPolicy(); @@ -19,7 +20,7 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State function _initializeTest() internal override {} function installData() internal view override returns (bytes memory) { - return abi.encode(delay, expirationPeriod); + return abi.encode(delay, expirationPeriod, gracePeriod); } function validUserOp() internal view virtual override returns (PackedUserOperation memory) { @@ -107,21 +108,33 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State return statelessValidationSignature(bytes32(0), valid); } - // Override stateless validator tests to use proper data parameter + // Override stateless validator tests - TimelockPolicy reverts for stateless validation function testStatlessValidatorFail() external override { IStatelessValidator validatorModule = IStatelessValidator(address(module)); bytes32 message = keccak256(abi.encodePacked("TEST_MESSAGE")); (, bytes memory sig) = statelessValidationSignature(message, false); - // For TimelockPolicy, validation fails if delay or expirationPeriod is 0 - bytes memory invalidData = abi.encode(uint48(0), uint48(0)); + bytes memory data = abi.encode(uint48(0), uint48(0), uint48(0)); vm.startPrank(WALLET); - bool result = validatorModule.validateSignatureWithData(message, sig, invalidData); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + validatorModule.validateSignatureWithData(message, sig, data); vm.stopPrank(); + } + + function testStatelessValidatorSuccess() external override { + IStatelessValidator validatorModule = IStatelessValidator(address(module)); + + bytes32 message = keccak256(abi.encodePacked("TEST_MESSAGE")); + (, bytes memory sig) = statelessValidationSignature(message, true); - assertFalse(result); + bytes memory validData = abi.encode(delay, expirationPeriod); + + vm.startPrank(WALLET); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + validatorModule.validateSignatureWithData(message, sig, validData); + vm.stopPrank(); } function testStatelessValidatorWithSenderFail() external override { @@ -130,14 +143,26 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State bytes32 message = keccak256(abi.encodePacked("TEST_MESSAGE")); (address caller, bytes memory sig) = statelessValidationSignatureWithSender(message, false); - // For TimelockPolicy, validation fails if delay or expirationPeriod is 0 - bytes memory invalidData = abi.encode(uint48(0), uint48(0)); + bytes memory data = abi.encode(uint48(0), uint48(0), uint48(0)); vm.startPrank(WALLET); - bool result = validatorModule.validateSignatureWithDataWithSender(caller, message, sig, invalidData); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + validatorModule.validateSignatureWithDataWithSender(caller, message, sig, data); vm.stopPrank(); + } - assertFalse(result); + function testStatelessValidatorWithSenderSuccess() external override { + IStatelessValidatorWithSender validatorModule = IStatelessValidatorWithSender(address(module)); + + bytes32 message = keccak256(abi.encodePacked("TEST_MESSAGE")); + (address caller, bytes memory sig) = statelessValidationSignatureWithSender(message, true); + + bytes memory validData = abi.encode(delay, expirationPeriod); + + vm.startPrank(WALLET); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + validatorModule.validateSignatureWithDataWithSender(caller, message, sig, validData); + vm.stopPrank(); } // Override the checkUserOpPolicy tests because TimelockPolicy has special behavior @@ -149,13 +174,26 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State PackedUserOperation memory userOp = validUserOp(); - // First create a proposal + // Create proposal via no-op UserOp (creates Pending directly with clock started) + bytes memory sig = + abi.encodePacked(bytes32(userOp.callData.length), userOp.callData, bytes32(userOp.nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); vm.startPrank(WALLET); - policyModule.createProposal(policyId(), WALLET, userOp.callData, userOp.nonce); + policyModule.checkUserOpPolicy(policyId(), noopOp); vm.stopPrank(); - // Fast forward past the delay - vm.warp(block.timestamp + delay + 1); + // Fast forward past the delay AND grace period + vm.warp(block.timestamp + delay + gracePeriod + 1); // Now execute the proposal vm.startPrank(WALLET); @@ -184,22 +222,32 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State assertEq(validationResult, 1); } - // Override signature policy test because TimelockPolicy always passes for installed accounts - function testPolicyCheckSignaturePolicyFail() public payable override { + // Override signature policy tests - TimelockPolicy reverts for signature validation + function testPolicyCheckSignaturePolicySuccess() public payable override { TimelockPolicy policyModule = TimelockPolicy(address(module)); + vm.startPrank(WALLET); + policyModule.onInstall(abi.encodePacked(policyId(), installData())); + vm.stopPrank(); - // Don't install for this wallet - address nonInstalledWallet = address(0xBEEF); + bytes32 testHash = keccak256(abi.encodePacked("TEST_HASH")); + (address sender, bytes memory sigData) = validSignatureData(testHash); + + vm.startPrank(WALLET); + vm.expectRevert("TimelockPolicy: signature validation not supported"); + policyModule.checkSignaturePolicy(policyId(), sender, testHash, sigData); + vm.stopPrank(); + } + + function testPolicyCheckSignaturePolicyFail() public payable override { + TimelockPolicy policyModule = TimelockPolicy(address(module)); bytes32 testHash = keccak256(abi.encodePacked("TEST_HASH")); (address sender, bytes memory sigData) = invalidSignatureData(testHash); - vm.startPrank(nonInstalledWallet); - uint256 result = policyModule.checkSignaturePolicy(policyId(), sender, testHash, sigData); + vm.startPrank(WALLET); + vm.expectRevert("TimelockPolicy: signature validation not supported"); + policyModule.checkSignaturePolicy(policyId(), sender, testHash, sigData); vm.stopPrank(); - - // Should fail for non-installed account - assertFalse(result == 0); } // Additional TimelockPolicy-specific tests @@ -213,17 +261,34 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State bytes memory callData = hex"1234"; uint256 nonce = 1; + // Create proposal via no-op UserOp + bytes memory sig = abi.encodePacked(bytes32(callData.length), callData, bytes32(nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.startPrank(WALLET); - policyModule.createProposal(policyId(), WALLET, callData, nonce); + uint256 result = policyModule.checkUserOpPolicy(policyId(), noopOp); vm.stopPrank(); + assertEq(result, 0); + // Verify proposal was created - (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 validUntil) = + (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 graceEnd, uint256 validUntil) = policyModule.getProposal(WALLET, callData, nonce, policyId(), WALLET); assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); assertEq(validAfter, block.timestamp + delay); - assertEq(validUntil, block.timestamp + delay + expirationPeriod); + assertEq(graceEnd, block.timestamp + delay + gracePeriod); + assertEq(validUntil, block.timestamp + delay + gracePeriod + expirationPeriod); } function testCancelProposal() public { @@ -235,9 +300,22 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State bytes memory callData = hex"1234"; uint256 nonce = 1; - // Create proposal + // Create proposal via no-op UserOp + bytes memory sig = abi.encodePacked(bytes32(callData.length), callData, bytes32(nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.startPrank(WALLET); - policyModule.createProposal(policyId(), WALLET, callData, nonce); + policyModule.checkUserOpPolicy(policyId(), noopOp); vm.stopPrank(); // Cancel proposal @@ -246,7 +324,7 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State vm.stopPrank(); // Verify proposal was cancelled - (TimelockPolicy.ProposalStatus status,,) = policyModule.getProposal(WALLET, callData, nonce, policyId(), WALLET); + (TimelockPolicy.ProposalStatus status,,,) = policyModule.getProposal(WALLET, callData, nonce, policyId(), WALLET); assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Cancelled)); } @@ -284,13 +362,150 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State uint256 result = policyModule.checkUserOpPolicy(policyId(), userOp); vm.stopPrank(); - // Should return failure (1) because this was proposal creation, not execution - assertEq(result, 1); + // Returns success (validationData = 0) for state persistence + assertEq(result, 0); // Verify proposal was created - (TimelockPolicy.ProposalStatus status,,) = + (TimelockPolicy.ProposalStatus status,,,) = policyModule.getProposal(WALLET, proposalCallData, proposalNonce, policyId(), WALLET); assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); } + + // Test that stale proposals from previous installations cannot be executed + function testStaleProposalNotExecutableAfterReinstall() public { + TimelockPolicy policyModule = TimelockPolicy(address(module)); + vm.startPrank(WALLET); + policyModule.onInstall(abi.encodePacked(policyId(), installData())); + vm.stopPrank(); + + PackedUserOperation memory userOp = validUserOp(); + + // Create proposal via no-op UserOp (creates Pending directly) + bytes memory sig = + abi.encodePacked(bytes32(userOp.callData.length), userOp.callData, bytes32(userOp.nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.startPrank(WALLET); + policyModule.checkUserOpPolicy(policyId(), noopOp); + vm.stopPrank(); + + // Fast forward past delay + vm.warp(block.timestamp + delay + 1); + + // Uninstall the policy + vm.startPrank(WALLET); + policyModule.onUninstall(abi.encodePacked(policyId(), "")); + vm.stopPrank(); + + // Reinstall the policy + vm.startPrank(WALLET); + policyModule.onInstall(abi.encodePacked(policyId(), installData())); + vm.stopPrank(); + + // Try to execute the stale proposal - should fail + vm.startPrank(WALLET); + uint256 validationResult = policyModule.checkUserOpPolicy(policyId(), userOp); + vm.stopPrank(); + + // Should fail (return 1 = SIG_VALIDATION_FAILED_UINT) because proposal is from previous epoch + assertEq(validationResult, 1); + } + + // Test that execution cannot happen during grace period (race condition prevention) + function testExecutionBlockedDuringGracePeriod() public { + TimelockPolicy policyModule = TimelockPolicy(address(module)); + vm.startPrank(WALLET); + policyModule.onInstall(abi.encodePacked(policyId(), installData())); + vm.stopPrank(); + + PackedUserOperation memory userOp = validUserOp(); + + // Create a proposal via no-op UserOp + bytes memory sig = + abi.encodePacked(bytes32(userOp.callData.length), userOp.callData, bytes32(userOp.nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.startPrank(WALLET); + policyModule.checkUserOpPolicy(policyId(), noopOp); + vm.stopPrank(); + + // Fast forward past delay but NOT past grace period + vm.warp(block.timestamp + delay + 1); + + // Try to execute the proposal + vm.startPrank(WALLET); + uint256 validationResult = policyModule.checkUserOpPolicy(policyId(), userOp); + vm.stopPrank(); + + // Validation should succeed but with graceEnd as validAfter + // The EntryPoint would reject execution during grace period + assertFalse(validationResult == 1); // Not a failure + + // Extract validAfter from packed validation data + // Format: + uint48 returnedValidAfter = uint48(validationResult >> 208); + + // validAfter should be graceEnd (delay + gracePeriod), not just delay + assertEq(returnedValidAfter, uint48(block.timestamp - 1 + gracePeriod)); + } + + // Test that owner can still cancel during grace period + function testCancelDuringGracePeriod() public { + TimelockPolicy policyModule = TimelockPolicy(address(module)); + vm.startPrank(WALLET); + policyModule.onInstall(abi.encodePacked(policyId(), installData())); + vm.stopPrank(); + + bytes memory callData = hex"1234"; + uint256 nonce = 1; + + // Create proposal via no-op UserOp + bytes memory sig = + abi.encodePacked(bytes32(callData.length), callData, bytes32(nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.startPrank(WALLET); + policyModule.checkUserOpPolicy(policyId(), noopOp); + vm.stopPrank(); + + // Fast forward past delay but still in grace period + vm.warp(block.timestamp + delay + 1); + + // Cancel proposal (should still work during grace period) + vm.startPrank(WALLET); + policyModule.cancelProposal(policyId(), WALLET, callData, nonce); + vm.stopPrank(); + + // Verify proposal was cancelled + (TimelockPolicy.ProposalStatus status,,,) = policyModule.getProposal(WALLET, callData, nonce, policyId(), WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Cancelled)); + } } diff --git a/test/base/PolicyTestBase.sol b/test/base/PolicyTestBase.sol index ca693a2..2daf0f7 100644 --- a/test/base/PolicyTestBase.sol +++ b/test/base/PolicyTestBase.sol @@ -98,7 +98,7 @@ abstract contract PolicyTestBase is ModuleTestBase { assertFalse(validationResult == 0); } - function testPolicyCheckSignaturePolicySuccess() public payable { + function testPolicyCheckSignaturePolicySuccess() public payable virtual { IPolicy policyModule = IPolicy(address(module)); vm.startPrank(WALLET); policyModule.onInstall(abi.encodePacked(policyId(), installData())); diff --git a/test/base/StatelessValidatorTestBase.sol b/test/base/StatelessValidatorTestBase.sol index 48d8239..08bf240 100644 --- a/test/base/StatelessValidatorTestBase.sol +++ b/test/base/StatelessValidatorTestBase.sol @@ -21,7 +21,7 @@ abstract contract StatelessValidatorTestBase is ModuleTestBase { assertTrue(result); } - function testStatelessValidatorSuccess() external { + function testStatelessValidatorSuccess() external virtual { IStatelessValidator validatorModule = IStatelessValidator(address(module)); bytes32 message = keccak256(abi.encodePacked("TEST_MESSAGE")); diff --git a/test/base/StatelessValidatorWithSenderTestBase.sol b/test/base/StatelessValidatorWithSenderTestBase.sol index 920b1b2..5a05801 100644 --- a/test/base/StatelessValidatorWithSenderTestBase.sol +++ b/test/base/StatelessValidatorWithSenderTestBase.sol @@ -21,7 +21,7 @@ abstract contract StatelessValidatorWithSenderTestBase is ModuleTestBase { assertTrue(result); } - function testStatelessValidatorWithSenderSuccess() external { + function testStatelessValidatorWithSenderSuccess() external virtual { IStatelessValidatorWithSender validatorModule = IStatelessValidatorWithSender(address(module)); bytes32 message = keccak256(abi.encodePacked("TEST_MESSAGE")); diff --git a/test/btt/Timelock.t.sol b/test/btt/Timelock.t.sol new file mode 100644 index 0000000..e51f3a5 --- /dev/null +++ b/test/btt/Timelock.t.sol @@ -0,0 +1,884 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.0; + +import {Test} from "forge-std/Test.sol"; +import {TimelockPolicy} from "../../src/policies/TimelockPolicy.sol"; +import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol"; +import {IERC7579Execution} from "openzeppelin-contracts/contracts/interfaces/draft-IERC7579.sol"; +import {IAccountExecute} from "account-abstraction/interfaces/IAccountExecute.sol"; +import {IModule} from "../../src/interfaces/IERC7579Modules.sol"; +import { + MODULE_TYPE_POLICY, + MODULE_TYPE_STATELESS_VALIDATOR, + MODULE_TYPE_STATELESS_VALIDATOR_WITH_SENDER +} from "../../src/types/Constants.sol"; + +/** + * @title TimelockTest + * @notice BTT tests for TimelockPolicy contract + */ +contract TimelockTest is Test { + TimelockPolicy public timelockPolicy; + + address public constant WALLET = address(0x1234); + address public constant ATTACKER = address(0xdead); + bytes32 public constant POLICY_ID = bytes32(uint256(1)); + + uint48 public constant DELAY = 1 hours; + uint48 public constant EXPIRATION = 1 days; + uint48 public constant GRACE_PERIOD = 30 minutes; + + uint256 public constant SIG_VALIDATION_FAILED = 1; + + function setUp() public { + timelockPolicy = new TimelockPolicy(); + + // Install policy for WALLET + bytes memory installData = abi.encode(POLICY_ID, DELAY, EXPIRATION, GRACE_PERIOD); + vm.prank(WALLET); + timelockPolicy.onInstall(installData); + } + + // ============ Helper Functions ============ + + function _createNoopUserOp(address sender, bytes memory signature) + internal + pure + returns (PackedUserOperation memory) + { + return PackedUserOperation({ + sender: sender, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: signature + }); + } + + function _createUserOpWithCalldata(address sender, bytes memory callData, uint256 nonce, bytes memory signature) + internal + pure + returns (PackedUserOperation memory) + { + return PackedUserOperation({ + sender: sender, + nonce: nonce, + initCode: "", + callData: callData, + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: signature + }); + } + + function _createProposalSignature(bytes memory proposalCallData, uint256 proposalNonce) + internal + pure + returns (bytes memory) + { + return + abi.encodePacked(bytes32(proposalCallData.length), proposalCallData, bytes32(proposalNonce), bytes1(0x00)); + } + + function _packValidationData(uint48 validAfter, uint48 validUntil) internal pure returns (uint256) { + return uint256(validAfter) << 208 | uint256(validUntil) << 160; + } + + // ============ onInstall Tests ============ + + modifier whenCallingOnInstall() { + _; + } + + function test_GivenDelayAndExpirationAreValid() external whenCallingOnInstall { + // it should store the config + // it should emit TimelockConfigUpdated + address newWallet = address(0x5555); + bytes32 newId = bytes32(uint256(2)); + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.TimelockConfigUpdated(newWallet, newId, 2 hours, 2 days, 30 minutes); + + bytes memory installData = abi.encode(newId, uint48(2 hours), uint48(2 days), uint48(30 minutes)); + vm.prank(newWallet); + timelockPolicy.onInstall(installData); + + (uint48 delay, uint48 expiration, uint48 gracePeriod_, bool initialized) = timelockPolicy.timelockConfig(newId, newWallet); + assertEq(delay, 2 hours, "Delay should be stored"); + assertEq(expiration, 2 days, "Expiration should be stored"); + assertTrue(initialized, "Should be initialized"); + } + + function test_GivenAlreadyInitialized() external whenCallingOnInstall { + // it should revert with AlreadyInitialized + bytes memory installData = abi.encode(POLICY_ID, DELAY, EXPIRATION, GRACE_PERIOD); + vm.prank(WALLET); + vm.expectRevert(abi.encodeWithSelector(IModule.AlreadyInitialized.selector, WALLET)); + timelockPolicy.onInstall(installData); + } + + function test_GivenDelayIsZero() external whenCallingOnInstall { + // it should revert with InvalidDelay + address newWallet = address(0x6666); + bytes memory installData = abi.encode(POLICY_ID, uint48(0), EXPIRATION, GRACE_PERIOD); + vm.prank(newWallet); + vm.expectRevert(TimelockPolicy.InvalidDelay.selector); + timelockPolicy.onInstall(installData); + } + + function test_GivenExpirationIsZero() external whenCallingOnInstall { + // it should revert with InvalidExpirationPeriod + address newWallet = address(0x7777); + bytes memory installData = abi.encode(POLICY_ID, DELAY, uint48(0), GRACE_PERIOD); + vm.prank(newWallet); + vm.expectRevert(TimelockPolicy.InvalidExpirationPeriod.selector); + timelockPolicy.onInstall(installData); + } + + // ============ onUninstall Tests ============ + + modifier whenCallingOnUninstall() { + _; + } + + function test_GivenInitialized() external whenCallingOnUninstall { + // it should clear the config + vm.prank(WALLET); + timelockPolicy.onUninstall(abi.encode(POLICY_ID)); + + (,,, bool initialized) = timelockPolicy.timelockConfig(POLICY_ID, WALLET); + assertFalse(initialized, "Config should be cleared"); + } + + function test_GivenNotInitialized() external whenCallingOnUninstall { + // it should revert with NotInitialized + address newWallet = address(0x8888); + vm.prank(newWallet); + vm.expectRevert(abi.encodeWithSelector(IModule.NotInitialized.selector, newWallet)); + timelockPolicy.onUninstall(abi.encode(POLICY_ID)); + } + + // ============ isModuleType Tests ============ + + modifier whenCallingIsModuleType() { + _; + } + + function test_GivenTypeIsPolicy() external whenCallingIsModuleType { + // it should return true + assertTrue(timelockPolicy.isModuleType(MODULE_TYPE_POLICY), "Should support policy type"); + } + + function test_GivenTypeIsStatelessValidator() external whenCallingIsModuleType { + // it should return true + assertTrue(timelockPolicy.isModuleType(MODULE_TYPE_STATELESS_VALIDATOR), "Should support stateless validator"); + } + + function test_GivenTypeIsStatelessValidatorWithSender() external whenCallingIsModuleType { + // it should return true + assertTrue( + timelockPolicy.isModuleType(MODULE_TYPE_STATELESS_VALIDATOR_WITH_SENDER), + "Should support stateless validator with sender" + ); + } + + function test_GivenTypeIsInvalid() external whenCallingIsModuleType { + // it should return false + assertFalse(timelockPolicy.isModuleType(999), "Should not support invalid type"); + } + + // ============ cancelProposal Tests ============ + + modifier whenCallingCancelProposal() { + _; + } + + function test_GivenCallerIsAccountAndProposalIsPending() external whenCallingCancelProposal { + // it should set status to cancelled (cancelling a Pending proposal) + // it should emit ProposalCancelled + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 301; + + // Create proposal via no-op UserOp to get Pending status + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory userOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(callData), nonce)); + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.ProposalCancelled(WALLET, POLICY_ID, expectedKey); + + vm.prank(WALLET); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Cancelled), "Status should be Cancelled"); + } + + function test_GivenCallerIsNotAccount() external whenCallingCancelProposal { + // it should revert with OnlyAccount + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 400; + + // Create proposal via no-op UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + vm.prank(ATTACKER); + vm.expectRevert(TimelockPolicy.OnlyAccount.selector); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + } + + function test_GivenNotInitialized_WhenCallingCancelProposal() external whenCallingCancelProposal { + // it should revert with NotInitialized + address uninitWallet = address(0xaaaa); + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + + vm.prank(uninitWallet); + vm.expectRevert(abi.encodeWithSelector(IModule.NotInitialized.selector, uninitWallet)); + timelockPolicy.cancelProposal(POLICY_ID, uninitWallet, callData, 0); + } + + function test_GivenProposalDoesNotExist() external whenCallingCancelProposal { + // it should revert with ProposalNotPending + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 500; + + vm.prank(WALLET); + vm.expectRevert(TimelockPolicy.ProposalNotPending.selector); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + } + + function test_GivenProposalIsAlreadyCancelled() external whenCallingCancelProposal { + // it should revert with ProposalNotPending + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 600; + + // Create proposal via no-op UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + vm.prank(WALLET); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + + vm.prank(WALLET); + vm.expectRevert(TimelockPolicy.ProposalNotPending.selector); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + } + + // ============ checkUserOpPolicy - Proposal Creation Tests ============ + + modifier whenCallingCheckUserOpPolicyToCreateProposal() { + _; + } + + function test_GivenNoopCalldataAndValidSignature() external whenCallingCheckUserOpPolicyToCreateProposal { + // it should create the proposal as Pending with clock started + // it should return zero for state persistence + // it should emit ProposalCreated with timing + bytes memory proposalCallData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 proposalNonce = 700; + bytes memory sig = _createProposalSignature(proposalCallData, proposalNonce); + + PackedUserOperation memory userOp = _createNoopUserOp(WALLET, sig); + + bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(proposalCallData), proposalNonce)); + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.ProposalCreated( + WALLET, + POLICY_ID, + expectedKey, + uint48(block.timestamp) + DELAY, + uint48(block.timestamp) + DELAY + GRACE_PERIOD + EXPIRATION + ); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + // Proposal creation must return 0 for state persistence + assertEq(result, 0, "Should return 0 for state persistence"); + + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, proposalCallData, proposalNonce, POLICY_ID, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be Pending"); + } + + function test_GivenNoopCalldataAndSignatureShorterThan65Bytes() + external + whenCallingCheckUserOpPolicyToCreateProposal + { + // it should return SIG_VALIDATION_FAILED + bytes memory shortSig = new bytes(64); + PackedUserOperation memory userOp = _createNoopUserOp(WALLET, shortSig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail with short signature"); + } + + function test_GivenNoopCalldataAndSignatureClaimsMoreDataThanAvailable() + external + whenCallingCheckUserOpPolicyToCreateProposal + { + // it should return SIG_VALIDATION_FAILED + bytes memory badSig = abi.encodePacked( + bytes32(uint256(1000)), // claims 1000 bytes of calldata + bytes32(0), // nonce + bytes1(0x00) // only 65 bytes total, not enough for claimed calldata + ); + + PackedUserOperation memory userOp = _createNoopUserOp(WALLET, badSig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail when signature claims more data than available"); + } + + function test_GivenNoopCalldataAndProposalAlreadyPending() external whenCallingCheckUserOpPolicyToCreateProposal { + // it should return SIG_VALIDATION_FAILED when proposal is already Pending + bytes memory proposalCallData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 proposalNonce = 800; + bytes memory sig = _createProposalSignature(proposalCallData, proposalNonce); + + PackedUserOperation memory userOp = _createNoopUserOp(WALLET, sig); + + // First call: create -> Pending + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + // Second call: already Pending -> should fail + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail for already Pending proposal"); + } + + // ============ checkUserOpPolicy - Proposal Execution Tests ============ + + modifier whenCallingCheckUserOpPolicyToExecuteProposal() { + _; + } + + function test_GivenProposalIsPendingAndTimelockPassed() external whenCallingCheckUserOpPolicyToExecuteProposal { + // it should mark proposal as executed + // it should return packed validation data with timing + // it should emit ProposalExecuted + bytes memory proposalCallData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "action"); + uint256 proposalNonce = 900; + + // Create proposal via no-op UserOp (creates Pending directly) + bytes memory sig = _createProposalSignature(proposalCallData, proposalNonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + // Get the actual stored proposal values + (, uint256 storedValidAfter, uint256 storedGraceEnd, uint256 storedValidUntil) = + timelockPolicy.getProposal(WALLET, proposalCallData, proposalNonce, POLICY_ID, WALLET); + + vm.warp(block.timestamp + DELAY + 1); + + PackedUserOperation memory executeOp = _createUserOpWithCalldata(WALLET, proposalCallData, proposalNonce, ""); + + bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(proposalCallData), proposalNonce)); + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.ProposalExecuted(WALLET, POLICY_ID, expectedKey); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, executeOp); + + // Extract validAfter and validUntil from packed data + // Note: packed validAfter is actually graceEnd (to prevent execution during grace period) + uint48 validAfter = uint48(result >> 208); + uint48 validUntil = uint48(result >> 160); + assertEq(validAfter, storedGraceEnd, "validAfter in packed data should match graceEnd"); + assertEq(validUntil, storedValidUntil, "validUntil should match proposal"); + + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, proposalCallData, proposalNonce, POLICY_ID, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed), "Proposal should be executed"); + } + + function test_GivenNoProposalExists() external whenCallingCheckUserOpPolicyToExecuteProposal { + // it should return SIG_VALIDATION_FAILED + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "attack"); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail without proposal"); + } + + function test_GivenProposalIsCancelled() external whenCallingCheckUserOpPolicyToExecuteProposal { + // it should return SIG_VALIDATION_FAILED + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 1000; + + // Create proposal via no-op UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + vm.prank(WALLET); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, nonce, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail for cancelled proposal"); + } + + function test_GivenProposalIsAlreadyExecuted() external whenCallingCheckUserOpPolicyToExecuteProposal { + // it should return SIG_VALIDATION_FAILED + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 1100; + + // Create proposal via no-op UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + vm.warp(block.timestamp + DELAY + 1); + + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, nonce, ""); + + // First execution + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + // Second execution attempt + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail for already executed proposal"); + } + + // ============ checkUserOpPolicy - Not Initialized ============ + + function test_WhenCallingCheckUserOpPolicyWithoutInitialization() external { + // it should return SIG_VALIDATION_FAILED + address uninitWallet = address(0xbbbb); + bytes memory sig = _createProposalSignature("test", 0); + PackedUserOperation memory userOp = _createNoopUserOp(uninitWallet, sig); + + vm.prank(uninitWallet); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail when not initialized"); + } + + // ============ checkSignaturePolicy Tests ============ + + modifier whenCallingCheckSignaturePolicy() { + _; + } + + function test_GivenInitialized_WhenCallingCheckSignaturePolicy() external whenCallingCheckSignaturePolicy { + // it should revert (TOB-KERNEL-20: signature validation not supported) + vm.prank(WALLET); + vm.expectRevert("TimelockPolicy: signature validation not supported"); + timelockPolicy.checkSignaturePolicy(POLICY_ID, address(0), bytes32(0), ""); + } + + function test_GivenNotInitialized_WhenCallingCheckSignaturePolicy() external whenCallingCheckSignaturePolicy { + // it should revert (TOB-KERNEL-20: signature validation not supported) + address uninitWallet = address(0xcccc); + vm.prank(uninitWallet); + vm.expectRevert("TimelockPolicy: signature validation not supported"); + timelockPolicy.checkSignaturePolicy(POLICY_ID, address(0), bytes32(0), ""); + } + + // ============ validateSignatureWithData Tests ============ + + modifier whenCallingValidateSignatureWithData() { + _; + } + + function test_GivenDelayAndExpirationAreNonzero() external whenCallingValidateSignatureWithData { + // it should revert (TOB-KERNEL-20: stateless signature validation not supported) + bytes memory data = abi.encode(uint48(1 hours), uint48(1 days)); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithData(bytes32(0), "", data); + } + + function test_GivenDelayIsZero_WhenCallingValidateSignatureWithData() + external + whenCallingValidateSignatureWithData + { + // it should revert (TOB-KERNEL-20: stateless signature validation not supported) + bytes memory data = abi.encode(uint48(0), uint48(1 days)); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithData(bytes32(0), "", data); + } + + function test_GivenExpirationIsZero_WhenCallingValidateSignatureWithData() + external + whenCallingValidateSignatureWithData + { + // it should revert (TOB-KERNEL-20: stateless signature validation not supported) + bytes memory data = abi.encode(uint48(1 hours), uint48(0)); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithData(bytes32(0), "", data); + } + + // ============ validateSignatureWithDataWithSender Tests ============ + + modifier whenCallingValidateSignatureWithDataWithSender() { + _; + } + + function test_GivenDelayAndExpirationAreNonzero_WhenCallingValidateSignatureWithDataWithSender() + external + whenCallingValidateSignatureWithDataWithSender + { + // it should revert (TOB-KERNEL-20: stateless signature validation not supported) + bytes memory data = abi.encode(uint48(1 hours), uint48(1 days)); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithDataWithSender(address(0), bytes32(0), "", data); + } + + function test_GivenDelayIsZero_WhenCallingValidateSignatureWithDataWithSender() + external + whenCallingValidateSignatureWithDataWithSender + { + // it should revert (TOB-KERNEL-20: stateless signature validation not supported) + bytes memory data = abi.encode(uint48(0), uint48(1 days)); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithDataWithSender(address(0), bytes32(0), "", data); + } + + function test_GivenExpirationIsZero_WhenCallingValidateSignatureWithDataWithSender() + external + whenCallingValidateSignatureWithDataWithSender + { + // it should revert (TOB-KERNEL-20: stateless signature validation not supported) + bytes memory data = abi.encode(uint48(1 hours), uint48(0)); + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithDataWithSender(address(0), bytes32(0), "", data); + } + + // ============ getProposal Tests ============ + + modifier whenCallingGetProposal() { + _; + } + + function test_GivenProposalExists() external whenCallingGetProposal { + // it should return status validAfter graceEnd and validUntil + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 1200; + + // Create proposal via no-op UserOp (creates Pending with timing) + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 graceEnd, uint256 validUntil) = + timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); + + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Status should be Pending"); + assertEq(validAfter, block.timestamp + DELAY, "validAfter should be correct"); + assertEq(graceEnd, block.timestamp + DELAY + GRACE_PERIOD, "graceEnd should be correct"); + assertEq(validUntil, block.timestamp + DELAY + GRACE_PERIOD + EXPIRATION, "validUntil should be correct"); + } + + function test_GivenProposalDoesNotExist_WhenCallingGetProposal() external whenCallingGetProposal { + // it should return None status and zeros + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + + (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 graceEnd, uint256 validUntil) = + timelockPolicy.getProposal(WALLET, callData, 9999, POLICY_ID, WALLET); + + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.None), "Status should be None"); + assertEq(validAfter, 0, "validAfter should be 0"); + assertEq(graceEnd, 0, "graceEnd should be 0"); + assertEq(validUntil, 0, "validUntil should be 0"); + } + + // ============ computeUserOpKey Tests ============ + + function test_WhenCallingComputeUserOpKey() external { + // it should match manual keccak256 computation + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 1300; + + bytes32 expected = keccak256(abi.encode(WALLET, keccak256(callData), nonce)); + bytes32 result = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); + + assertEq(result, expected, "computeUserOpKey should match manual computation"); + } + + // ============ _isNoOpCalldata Tests ============ + + modifier whenDetectingNoopCalldata() { + _; + } + + // Case 1: Empty calldata + function test_GivenCalldataIsEmpty() external whenDetectingNoopCalldata { + // it should be detected as noop + bytes memory sig = _createProposalSignature("test", 0); + PackedUserOperation memory userOp = _createNoopUserOp(WALLET, sig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + // If it's a no-op, it goes to creation path and returns 0 + assertEq(result, 0, "Empty calldata should be detected as noop"); + } + + // Case 2: ERC-7579 execute(mode=0x00, "") — single-call with empty execution data + function test_GivenCalldataIsERC7579ExecuteNoop() external whenDetectingNoopCalldata { + // it should be detected as noop + bytes memory noopExecute = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), ""); + bytes memory sig = _createProposalSignature("test", 1); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, noopExecute, 0, sig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, 0, "ERC-7579 execute noop should be detected as noop"); + } + + // Case 3: executeUserOp + empty inner calldata (just the 4-byte selector) + function test_GivenCalldataIsExecuteUserOpEmpty() external whenDetectingNoopCalldata { + // it should be detected as noop + bytes memory executeUserOpNoop = abi.encodePacked(IAccountExecute.executeUserOp.selector); + bytes memory sig = _createProposalSignature("test", 2); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, executeUserOpNoop, 0, sig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, 0, "executeUserOp + empty should be detected as noop"); + } + + // Case 4: executeUserOp + ERC-7579 execute no-op + function test_GivenCalldataIsExecuteUserOpWithERC7579Noop() external whenDetectingNoopCalldata { + // it should be detected as noop + bytes memory noopExecute = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), ""); + bytes memory executeUserOpWrapped = abi.encodePacked(IAccountExecute.executeUserOp.selector, noopExecute); + bytes memory sig = _createProposalSignature("test", 3); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, executeUserOpWrapped, 0, sig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, 0, "executeUserOp + ERC-7579 execute noop should be detected as noop"); + } + + // Negative: non-empty arbitrary calldata + function test_GivenCalldataIsNonEmpty() external whenDetectingNoopCalldata { + // it should not be detected as noop + bytes memory nonEmptyCalldata = hex"aabb"; + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, nonEmptyCalldata, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + // Not a no-op, goes to execution path, no proposal exists + assertEq(result, SIG_VALIDATION_FAILED, "Non-empty calldata should not be noop"); + } + + // Negative: ERC-7579 execute with delegatecall mode + function test_GivenCalldataIsERC7579ExecuteDelegatecall() external whenDetectingNoopCalldata { + // it should not be detected as noop — mode 0xFE is delegatecall + bytes32 delegatecallMode = bytes32(uint256(0xFE) << 248); + bytes memory delegatecallExecute = + abi.encodeWithSelector(IERC7579Execution.execute.selector, delegatecallMode, ""); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, delegatecallExecute, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Delegatecall mode should not be noop"); + } + + // Negative: ERC-7579 execute with batch mode + function test_GivenCalldataIsERC7579ExecuteBatch() external whenDetectingNoopCalldata { + // it should not be detected as noop — mode 0x01 is batch + bytes32 batchMode = bytes32(uint256(0x01) << 248); + bytes memory batchExecute = abi.encodeWithSelector(IERC7579Execution.execute.selector, batchMode, ""); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, batchExecute, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Batch mode should not be noop"); + } + + // Negative: ERC-7579 execute with non-empty execution data + function test_GivenCalldataIsERC7579ExecuteWithData() external whenDetectingNoopCalldata { + // it should not be detected as noop — has execution data + bytes memory executeWithData = + abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "some_execution_data"); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, executeWithData, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Execute with data should not be noop"); + } + + // Negative: executeUserOp wrapping a delegatecall ERC-7579 execute + function test_GivenCalldataIsExecuteUserOpWithDelegatecall() external whenDetectingNoopCalldata { + // it should not be detected as noop + bytes32 delegatecallMode = bytes32(uint256(0xFE) << 248); + bytes memory delegatecallExecute = + abi.encodeWithSelector(IERC7579Execution.execute.selector, delegatecallMode, ""); + bytes memory wrapped = abi.encodePacked(IAccountExecute.executeUserOp.selector, delegatecallExecute); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, wrapped, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "executeUserOp + delegatecall should not be noop"); + } + + // ============ _packValidationData Tests ============ + + function test_WhenPackingValidationData() external { + // it should correctly pack validAfter and validUntil + // Test the packing by creating a proposal and checking the returned validation data + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 1400; + + // Create proposal via no-op UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + // Get the actual stored proposal values + (, uint256 storedValidAfter, uint256 storedGraceEnd, uint256 storedValidUntil) = + timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); + + vm.warp(block.timestamp + DELAY + 1); + + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, nonce, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + uint256 expectedPacked = _packValidationData(uint48(storedGraceEnd), uint48(storedValidUntil)); + + assertEq(result, expectedPacked, "Packed validation data should match expected"); + } + + // ============ Security Tests ============ + + modifier whenTestingSecurityScenarios() { + _; + } + + function test_GivenAttackerTriesToExecuteWithoutProposal() external whenTestingSecurityScenarios { + // it should return SIG_VALIDATION_FAILED + bytes memory maliciousCalldata = + abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "steal_funds"); + + PackedUserOperation memory attackOp = _createUserOpWithCalldata(WALLET, maliciousCalldata, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, attackOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Attack without proposal should fail"); + } + + function test_GivenAttackerTriesToReexecuteAUsedProposal() external whenTestingSecurityScenarios { + // it should return SIG_VALIDATION_FAILED + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "action"); + uint256 nonce = 1600; + + // Create proposal via no-op UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + vm.warp(block.timestamp + DELAY + 1); + + PackedUserOperation memory executeOp = _createUserOpWithCalldata(WALLET, callData, nonce, ""); + + // First execution - should succeed + vm.prank(WALLET); + uint256 firstResult = timelockPolicy.checkUserOpPolicy(POLICY_ID, executeOp); + assertNotEq(firstResult, SIG_VALIDATION_FAILED, "First execution should succeed"); + + // Verify proposal is marked as executed + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed), "Should be executed"); + + // Second execution attempt - should fail + vm.prank(WALLET); + uint256 secondResult = timelockPolicy.checkUserOpPolicy(POLICY_ID, executeOp); + assertEq(secondResult, SIG_VALIDATION_FAILED, "Re-execution should fail"); + } + + function test_GivenProposalCreationReturnsZero() external whenTestingSecurityScenarios { + // it should allow state to persist via EntryPoint + bytes memory proposalCallData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 proposalNonce = 1700; + bytes memory sig = _createProposalSignature(proposalCallData, proposalNonce); + + PackedUserOperation memory userOp = _createNoopUserOp(WALLET, sig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + // Result must be 0 for EntryPoint to not revert + assertEq(result, 0, "Proposal creation must return 0 for state persistence"); + + // Verify the proposal was actually created and persisted + (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 graceEnd, uint256 validUntil) = + timelockPolicy.getProposal(WALLET, proposalCallData, proposalNonce, POLICY_ID, WALLET); + + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal state should persist"); + assertGt(validAfter, 0, "validAfter should be set"); + assertGt(validUntil, validAfter, "validUntil should be after validAfter"); + } + + function test_GivenAttackerTriesToCancelAnotherAccountsProposal() external whenTestingSecurityScenarios { + // it should revert with OnlyAccount + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 1800; + + // Create proposal via no-op UserOp from WALLET + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); + + vm.prank(ATTACKER); + vm.expectRevert(TimelockPolicy.OnlyAccount.selector); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + + // Verify proposal is still pending + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should still be Pending"); + } +} diff --git a/test/btt/Timelock.tree b/test/btt/Timelock.tree new file mode 100644 index 0000000..6d6f7a9 --- /dev/null +++ b/test/btt/Timelock.tree @@ -0,0 +1,146 @@ +TimelockTest +├── when calling onInstall +│ ├── given delay and expiration are valid +│ │ ├── it should store the config +│ │ └── it should emit TimelockConfigUpdated +│ ├── given already initialized +│ │ └── it should revert with AlreadyInitialized +│ ├── given delay is zero +│ │ └── it should revert with InvalidDelay +│ └── given expiration is zero +│ └── it should revert with InvalidExpirationPeriod +├── when calling onUninstall +│ ├── given initialized +│ │ └── it should clear the config +│ └── given not initialized +│ └── it should revert with NotInitialized +├── when calling isModuleType +│ ├── given type is policy +│ │ └── it should return true +│ ├── given type is stateless validator +│ │ └── it should return true +│ ├── given type is stateless validator with sender +│ │ └── it should return true +│ └── given type is invalid +│ └── it should return false +├── when calling createProposal +│ ├── given config is initialized and proposal does not exist +│ │ ├── it should store the proposal with pending status +│ │ ├── it should set correct validAfter and validUntil +│ │ └── it should emit ProposalCreated +│ ├── given not initialized +│ │ └── it should revert with NotInitialized +│ └── given proposal already exists +│ └── it should revert with ProposalAlreadyExists +├── when calling cancelProposal +│ ├── given caller is account and proposal is pending +│ │ ├── it should set status to cancelled +│ │ └── it should emit ProposalCancelled +│ ├── given caller is not account +│ │ └── it should revert with OnlyAccount +│ ├── given not initialized +│ │ └── it should revert with NotInitialized +│ ├── given proposal does not exist +│ │ └── it should revert with ProposalNotPending +│ └── given proposal is already cancelled +│ └── it should revert with ProposalNotPending +├── when calling checkUserOpPolicy to create proposal +│ ├── given noop calldata and valid signature +│ │ ├── it should create the proposal +│ │ ├── it should return zero for state persistence +│ │ └── it should emit ProposalCreated +│ ├── given noop calldata and signature shorter than 65 bytes +│ │ └── it should return SIG_VALIDATION_FAILED +│ ├── given noop calldata and signature claims more data than available +│ │ └── it should return SIG_VALIDATION_FAILED +│ └── given noop calldata and proposal already exists +│ └── it should return SIG_VALIDATION_FAILED +├── when calling checkUserOpPolicy to execute proposal +│ ├── given proposal is pending and timelock passed +│ │ ├── it should mark proposal as executed +│ │ ├── it should return packed validation data with timing +│ │ └── it should emit ProposalExecuted +│ ├── given no proposal exists +│ │ └── it should return SIG_VALIDATION_FAILED +│ ├── given proposal is cancelled +│ │ └── it should return SIG_VALIDATION_FAILED +│ └── given proposal is already executed +│ └── it should return SIG_VALIDATION_FAILED +├── when calling checkUserOpPolicy without initialization +│ └── it should return SIG_VALIDATION_FAILED +├── when calling checkSignaturePolicy +│ ├── given initialized +│ │ └── it should return zero +│ └── given not initialized +│ └── it should return one +├── when calling validateSignatureWithData +│ ├── given delay and expiration are nonzero +│ │ └── it should return true +│ ├── given delay is zero +│ │ └── it should return false +│ └── given expiration is zero +│ └── it should return false +├── when calling validateSignatureWithDataWithSender +│ ├── given delay and expiration are nonzero +│ │ └── it should return true +│ ├── given delay is zero +│ │ └── it should return false +│ └── given expiration is zero +│ └── it should return false +├── when calling getProposal +│ ├── given proposal exists +│ │ └── it should return status validAfter and validUntil +│ └── given proposal does not exist +│ └── it should return None status and zeros +├── when calling computeUserOpKey +│ └── it should match manual keccak256 computation +├── when detecting noop calldata +│ ├── given calldata is empty +│ │ └── it should be detected as noop +│ ├── given calldata is shorter than 4 bytes +│ │ └── it should not be detected as noop +│ └── given selector is unrecognized +│ └── it should not be detected as noop +├── when detecting ERC7579 execute noop +│ ├── given target is self and value is zero and inner calldata is empty +│ │ └── it should be detected as noop +│ ├── given target is zero address and value is zero and inner calldata is empty +│ │ └── it should be detected as noop +│ ├── given calldata is shorter than 68 bytes +│ │ └── it should not be detected as noop +│ ├── given offset is not 32 +│ │ └── it should not be detected as noop +│ ├── given calldata is shorter than 100 bytes +│ │ └── it should not be detected as noop +│ ├── given exec data length is less than 52 +│ │ └── it should not be detected as noop +│ ├── given target is not self or zero +│ │ └── it should not be detected as noop +│ ├── given value is nonzero +│ │ └── it should not be detected as noop +│ ├── given calldata is shorter than 184 bytes +│ │ └── it should not be detected as noop +│ └── given inner calldata length is nonzero +│ └── it should not be detected as noop +├── when detecting executeUserOp noop +│ ├── given userOp data is empty +│ │ └── it should be detected as noop +│ ├── given calldata is shorter than 100 bytes +│ │ └── it should not be detected as noop +│ ├── given offset is not 32 +│ │ └── it should not be detected as noop +│ └── given userOp length is nonzero +│ └── it should not be detected as noop +├── when packing validation data +│ └── it should correctly pack validAfter and validUntil +└── when testing security scenarios + ├── given attacker tries to execute without proposal + │ └── it should return SIG_VALIDATION_FAILED + ├── given attacker tries to execute immediately after creation + │ └── it should return packed data with future validAfter + ├── given attacker tries to reexecute a used proposal + │ └── it should return SIG_VALIDATION_FAILED + ├── given proposal creation returns zero + │ └── it should allow state to persist via EntryPoint + └── given attacker tries to cancel another accounts proposal + └── it should revert with OnlyAccount diff --git a/test/btt/TimelockCancellationRace.t.sol b/test/btt/TimelockCancellationRace.t.sol new file mode 100644 index 0000000..71eb396 --- /dev/null +++ b/test/btt/TimelockCancellationRace.t.sol @@ -0,0 +1,612 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity ^0.8.20; + +import {Test} from "forge-std/Test.sol"; +import {TimelockPolicy} from "src/policies/TimelockPolicy.sol"; +import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol"; +import {IModule} from "src/interfaces/IERC7579Modules.sol"; + +/** + * @title TimelockCancellationRaceTest + * @notice BTT tests for the TimelockPolicy cancellation and grace period fix (TOB-KERNEL-21) + * @dev This test suite verifies that: + * 1. Cancelled proposals cannot be executed + * 2. Grace period prevents race conditions between cancellation and execution + * 3. The owner can cancel during grace period before public execution + */ +contract TimelockCancellationRaceTest is Test { + TimelockPolicy public timelockPolicy; + + address constant WALLET = address(0x1234); + address constant ATTACKER = address(0xBAD); + + uint48 constant DELAY = 1 days; + uint48 constant EXPIRATION_PERIOD = 1 days; + uint48 constant GRACE_PERIOD = 1 hours; + + bytes32 public policyId; + + // Test calldata and nonce for proposals + bytes constant TEST_CALLDATA = hex"1234abcd"; + uint256 constant TEST_NONCE = 1; + + function setUp() public { + timelockPolicy = new TimelockPolicy(); + policyId = keccak256(abi.encodePacked("POLICY_ID_1")); + + // Install policy for WALLET + vm.startPrank(WALLET); + timelockPolicy.onInstall(abi.encodePacked(policyId, abi.encode(DELAY, EXPIRATION_PERIOD, GRACE_PERIOD))); + vm.stopPrank(); + } + + // Helper function to create a proposal via no-op UserOp + function _createProposal(bytes memory callData, uint256 nonce) internal { + bytes memory sig = abi.encodePacked(bytes32(callData.length), callData, bytes32(nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(policyId, noopOp); + } + + // Helper function to cancel a proposal + function _cancelProposal(bytes memory callData, uint256 nonce) internal { + vm.prank(WALLET); + timelockPolicy.cancelProposal(policyId, WALLET, callData, nonce); + } + + // Helper function to create a userOp for execution + function _createUserOp(bytes memory callData, uint256 nonce) internal pure returns (PackedUserOperation memory) { + return PackedUserOperation({ + sender: WALLET, + nonce: nonce, + initCode: "", + callData: callData, + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: "" + }); + } + + // Helper to extract validAfter from packed validation data + function _extractValidAfter(uint256 validationData) internal pure returns (uint48) { + return uint48(validationData >> 208); + } + + // Helper to extract validUntil from packed validation data + function _extractValidUntil(uint256 validationData) internal pure returns (uint48) { + return uint48(validationData >> 160); + } + + // ==================== whenCancellingAProposal ==================== + + modifier whenCancellingAProposal() { + _; + } + + function test_GivenTheProposalIsPending() external whenCancellingAProposal { + // Setup: Create a pending proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Verify proposal is pending before cancellation + (TimelockPolicy.ProposalStatus statusBefore,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + assertEq(uint256(statusBefore), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be pending"); + + // Action: Cancel the proposal and expect event + bytes32 expectedUserOpKey = timelockPolicy.computeUserOpKey(WALLET, TEST_CALLDATA, TEST_NONCE); + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.ProposalCancelled(WALLET, policyId, expectedUserOpKey); + + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Verify: it should set proposal status to Cancelled + (TimelockPolicy.ProposalStatus statusAfter,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + assertEq(uint256(statusAfter), uint256(TimelockPolicy.ProposalStatus.Cancelled), "Proposal should be cancelled"); + + // Verify: it should prevent execution via checkUserOpPolicy returning failure + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + assertEq(validationResult, 1, "Execution should fail for cancelled proposal (SIG_VALIDATION_FAILED)"); + } + + function test_GivenTheProposalDoesNotExist() external whenCancellingAProposal { + // Action & Verify: it should revert with ProposalNotPending + vm.prank(WALLET); + vm.expectRevert(TimelockPolicy.ProposalNotPending.selector); + timelockPolicy.cancelProposal(policyId, WALLET, TEST_CALLDATA, TEST_NONCE); + } + + function test_GivenTheProposalIsAlreadyCancelled() external whenCancellingAProposal { + // Setup: Create and cancel a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Action & Verify: it should revert with ProposalNotPending + vm.prank(WALLET); + vm.expectRevert(TimelockPolicy.ProposalNotPending.selector); + timelockPolicy.cancelProposal(policyId, WALLET, TEST_CALLDATA, TEST_NONCE); + } + + function test_GivenTheProposalIsAlreadyExecuted() external whenCancellingAProposal { + // Setup: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward past delay AND grace period + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execute the proposal + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + assertFalse(validationResult == 1, "Execution should succeed"); + + // Verify proposal is executed + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed), "Proposal should be executed"); + + // Action & Verify: it should revert with ProposalNotPending + vm.prank(WALLET); + vm.expectRevert(TimelockPolicy.ProposalNotPending.selector); + timelockPolicy.cancelProposal(policyId, WALLET, TEST_CALLDATA, TEST_NONCE); + } + + function test_GivenTheCallerIsNotTheAccount() external whenCancellingAProposal { + // Setup: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Action & Verify: it should revert with OnlyAccount when attacker tries to cancel + vm.prank(ATTACKER); + vm.expectRevert(TimelockPolicy.OnlyAccount.selector); + timelockPolicy.cancelProposal(policyId, WALLET, TEST_CALLDATA, TEST_NONCE); + } + + // ==================== whenExecutingAProposalAfterCancellation ==================== + + modifier whenExecutingAProposalAfterCancellation() { + _; + } + + function test_GivenTheProposalWasJustCancelledInTheSameBlock() external whenExecutingAProposalAfterCancellation { + // Setup: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward past delay and grace period (to make it executable normally) + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Cancel in the same block as execution attempt + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Action: Try to execute in the same block + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Verify: it should return SIG_VALIDATION_FAILED because status is Cancelled + assertEq(validationResult, 1, "Should return SIG_VALIDATION_FAILED for cancelled proposal"); + } + + function test_GivenTheCancellationHappenedInAPreviousBlock() external whenExecutingAProposalAfterCancellation { + // Setup: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward past delay and grace period + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Cancel the proposal + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Move to next block + vm.warp(block.timestamp + 1); + vm.roll(block.number + 1); + + // Action: Try to execute in a later block + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Verify: it should return SIG_VALIDATION_FAILED because status is Cancelled + assertEq(validationResult, 1, "Should return SIG_VALIDATION_FAILED for cancelled proposal"); + } + + function test_GivenANewProposalIsCreatedForTheSameCalldataAfterCancellation() + external + whenExecutingAProposalAfterCancellation + { + // Setup: Create and cancel a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Note: Cancelled proposals persist. Attempting to create via no-op UserOp + // for the same calldata/nonce returns SIG_VALIDATION_FAILED. + bytes memory sig = abi.encodePacked(bytes32(TEST_CALLDATA.length), TEST_CALLDATA, bytes32(TEST_NONCE), bytes1(0x00)); + PackedUserOperation memory retryOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.prank(WALLET); + uint256 retryResult = timelockPolicy.checkUserOpPolicy(policyId, retryOp); + assertEq(retryResult, 1, "Should return SIG_VALIDATION_FAILED for cancelled proposal"); + + // However, a proposal with different nonce should work + uint256 newNonce = TEST_NONCE + 1; + _createProposal(TEST_CALLDATA, newNonce); + + // Fast forward past delay and grace period + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execute the new proposal + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, newNonce); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Verify: it should allow execution of the new proposal after grace period + assertFalse(validationResult == 1, "New proposal should be executable"); + + // Verify status is executed + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, newNonce, policyId, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed), "New proposal should be executed"); + } + + // ==================== whenExecutingAProposalDuringTheGracePeriod ==================== + + modifier whenExecutingAProposalDuringTheGracePeriod() { + _; + } + + function test_GivenTheTimelockDelayHasPassedButGracePeriodHasNot() + external + whenExecutingAProposalDuringTheGracePeriod + { + // Setup: Create a proposal + uint256 startTime = block.timestamp; + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Get expected timing - note: packed validAfter uses graceEnd + (,uint256 validAfter, uint256 graceEnd, uint256 validUntil) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + + // Fast forward past delay but NOT past grace period + vm.warp(startTime + DELAY + 1); + + // Verify we are in the grace period window + assertTrue(block.timestamp > validAfter, "Should be past validAfter"); + assertTrue(block.timestamp < graceEnd, "Should be before graceEnd"); + assertTrue(block.timestamp < validUntil, "Should be before validUntil"); + + // Action: Try to execute + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Verify: it should return validation data with graceEnd as validAfter + assertFalse(validationResult == 1, "Should not return failure"); + + uint48 returnedValidAfter = _extractValidAfter(validationResult); + uint48 returnedValidUntil = _extractValidUntil(validationResult); + + // The returned validAfter is graceEnd (not validAfter) + // This is the key fix - prevents execution during grace period + assertEq(returnedValidAfter, uint48(graceEnd), "validAfter should be graceEnd"); + assertEq(returnedValidUntil, uint48(validUntil), "validUntil should match proposal expiration"); + + // Note: The bundler/EntryPoint would reject execution during grace period + // because block.timestamp < returnedValidAfter (graceEnd) + } + + function test_GivenTheGracePeriodHasPassed() external whenExecutingAProposalDuringTheGracePeriod { + // Setup: Create a proposal + uint256 startTime = block.timestamp; + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Get timing info + (,uint256 validAfter,, uint256 validUntil) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + + // Fast forward past delay AND grace period + vm.warp(startTime + DELAY + GRACE_PERIOD + 1); + + // Verify we are past the grace period + assertTrue(block.timestamp > validAfter, "Should be past graceEnd"); + assertTrue(block.timestamp < validUntil, "Should be before validUntil"); + + // Action: Execute + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Verify: it should return validation data allowing execution + assertFalse(validationResult == 1, "Should not return failure"); + + uint48 returnedValidAfter = _extractValidAfter(validationResult); + assertTrue(block.timestamp >= returnedValidAfter, "Should be past validAfter for execution"); + + // Verify: it should set proposal status to Executed + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed), "Proposal should be executed"); + } + + // ==================== whenTheOwnerCancelsDuringGracePeriod ==================== + + modifier whenTheOwnerCancelsDuringGracePeriod() { + _; + } + + function test_GivenTheProposalIsStillPending() external whenTheOwnerCancelsDuringGracePeriod { + // Setup: Create a proposal + uint256 startTime = block.timestamp; + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward to grace period (past delay, but before validUntil) + vm.warp(startTime + DELAY + 1); + + // Verify proposal is still pending + (TimelockPolicy.ProposalStatus statusBefore,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + assertEq(uint256(statusBefore), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should still be pending"); + + // Action: Owner cancels during grace period + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Verify: it should successfully cancel the proposal + (TimelockPolicy.ProposalStatus statusAfter,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + assertEq(uint256(statusAfter), uint256(TimelockPolicy.ProposalStatus.Cancelled), "Proposal should be cancelled"); + } + + function test_GivenAnExecutionAttemptIsPendingInTheMempool() external whenTheOwnerCancelsDuringGracePeriod { + // Setup: Create a proposal + uint256 startTime = block.timestamp; + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward to grace period + vm.warp(startTime + DELAY + 1); + + // Simulate scenario where both cancellation and execution happen in same block + // but cancellation is processed first (wins the race) + + // Owner cancels first + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Then execution attempt comes in the same block + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Verify: it should allow cancellation to win the race (execution fails) + assertEq(validationResult, 1, "Execution should fail because cancellation won the race"); + + // Verify proposal remains cancelled + (TimelockPolicy.ProposalStatus status,,,) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Cancelled), "Proposal should remain cancelled"); + } + + // ==================== whenAttemptingMultipleCancellations ==================== + + modifier whenAttemptingMultipleCancellations() { + _; + } + + function test_GivenTheProposalWasJustCancelled() external whenAttemptingMultipleCancellations { + // Setup: Create and cancel a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Move to next block + vm.warp(block.timestamp + 1); + vm.roll(block.number + 1); + + // Action & Verify: it should revert with ProposalNotPending on second attempt + vm.prank(WALLET); + vm.expectRevert(TimelockPolicy.ProposalNotPending.selector); + timelockPolicy.cancelProposal(policyId, WALLET, TEST_CALLDATA, TEST_NONCE); + } + + function test_GivenTryingToCancelTwiceInTheSameTransaction() external whenAttemptingMultipleCancellations { + // Setup: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Action: First cancellation succeeds + vm.startPrank(WALLET); + timelockPolicy.cancelProposal(policyId, WALLET, TEST_CALLDATA, TEST_NONCE); + + // Verify: it should revert with ProposalNotPending on second call + vm.expectRevert(TimelockPolicy.ProposalNotPending.selector); + timelockPolicy.cancelProposal(policyId, WALLET, TEST_CALLDATA, TEST_NONCE); + vm.stopPrank(); + } + + // ==================== whenCreatingANewProposalAfterGracePeriod ==================== + + modifier whenCreatingANewProposalAfterGracePeriod() { + _; + } + + function test_GivenTheOriginalProposalWasCancelled() external whenCreatingANewProposalAfterGracePeriod { + // Setup: Create and cancel a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + _cancelProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward past when grace period would have ended + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + EXPIRATION_PERIOD + 1); + + // Action & Verify: Attempting to create via no-op UserOp returns SIG_VALIDATION_FAILED + // because cancelled proposals persist in storage + bytes memory sig = abi.encodePacked(bytes32(TEST_CALLDATA.length), TEST_CALLDATA, bytes32(TEST_NONCE), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(policyId, noopOp); + assertEq(result, 1, "Should return SIG_VALIDATION_FAILED because cancelled proposals persist"); + } + + function test_GivenTheOriginalProposalWasExecuted() external whenCreatingANewProposalAfterGracePeriod { + // Setup: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward past delay and grace period + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execute the proposal + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Fast forward more + vm.warp(block.timestamp + EXPIRATION_PERIOD + 1); + + // Action & Verify: Attempting to create via no-op UserOp returns SIG_VALIDATION_FAILED + // because executed proposals persist in storage + bytes memory sig = abi.encodePacked(bytes32(TEST_CALLDATA.length), TEST_CALLDATA, bytes32(TEST_NONCE), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: WALLET, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(policyId, noopOp); + assertEq(result, 1, "Should return SIG_VALIDATION_FAILED because executed proposals persist"); + } + + // ==================== whenValidatingGracePeriodTiming ==================== + + modifier whenValidatingGracePeriodTiming() { + _; + } + + function test_GivenDelayIs1DayAndGracePeriodIs1Hour() external whenValidatingGracePeriodTiming { + // Setup: Record start time + uint256 startTime = block.timestamp; + + // Action: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Get proposal timing + (TimelockPolicy.ProposalStatus status, uint256 validAfter,, uint256 validUntil) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + + // Verify: it should set validAfter to current time plus delay + assertEq(validAfter, startTime + DELAY, "validAfter should be startTime + delay"); + + // Verify: it should set validUntil correctly (validAfter + grace + expiration) + assertEq(validUntil, validAfter + GRACE_PERIOD + EXPIRATION_PERIOD, "validUntil should be validAfter + gracePeriod + expirationPeriod"); + } + + function test_GivenExecutionValidationDataIsReturned() external whenValidatingGracePeriodTiming { + // Setup: Create a proposal + uint256 startTime = block.timestamp; + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Get expected timing - note: packed validAfter uses graceEnd, not validAfter + (,uint256 expectedValidAfter, uint256 expectedGraceEnd, uint256 expectedValidUntil) = + timelockPolicy.getProposal(WALLET, TEST_CALLDATA, TEST_NONCE, policyId, WALLET); + + // Fast forward just past delay but still in grace period + vm.warp(startTime + DELAY + 1); + + // Action: Get validation data by calling checkUserOpPolicy + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // Extract packed values + uint48 packedValidAfter = _extractValidAfter(validationResult); + uint48 packedValidUntil = _extractValidUntil(validationResult); + + // Verify: it should pack graceEnd as validAfter (execution allowed after grace period) + assertEq(packedValidAfter, uint48(expectedGraceEnd), "Packed validAfter should match proposal graceEnd"); + + // Verify: it should pack validUntil as expiration time + assertEq(packedValidUntil, uint48(expectedValidUntil), "Packed validUntil should match proposal expiration"); + } + + // ==================== Additional Edge Case Tests ==================== + + function test_ExecutionFailsForExpiredProposal() external { + // Setup: Create a proposal + _createProposal(TEST_CALLDATA, TEST_NONCE); + + // Fast forward past expiration + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + EXPIRATION_PERIOD + 1); + + // Action: Try to execute + PackedUserOperation memory userOp = _createUserOp(TEST_CALLDATA, TEST_NONCE); + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(policyId, userOp); + + // The proposal would be marked as executed in storage, but the validUntil + // returned would be in the past, causing bundler rejection + uint48 packedValidUntil = _extractValidUntil(validationResult); + assertTrue(block.timestamp > packedValidUntil, "Current time should be past validUntil"); + } + + function test_NonInitializedAccountCannotCancelProposal() external { + address nonInitializedAccount = address(0xDEAD); + + // Try to cancel on non-initialized account + vm.prank(nonInitializedAccount); + vm.expectRevert(abi.encodeWithSelector(IModule.NotInitialized.selector, nonInitializedAccount)); + timelockPolicy.cancelProposal(policyId, nonInitializedAccount, TEST_CALLDATA, TEST_NONCE); + } + + function test_NonInitializedAccountCannotCreateProposal() external { + address nonInitializedAccount = address(0xDEAD); + + // Try to create proposal via no-op UserOp on non-initialized account + bytes memory sig = abi.encodePacked(bytes32(TEST_CALLDATA.length), TEST_CALLDATA, bytes32(TEST_NONCE), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: nonInitializedAccount, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.prank(nonInitializedAccount); + uint256 result = timelockPolicy.checkUserOpPolicy(policyId, noopOp); + assertEq(result, 1, "Should return SIG_VALIDATION_FAILED for non-initialized account"); + } +} diff --git a/test/btt/TimelockCancellationRace.tree b/test/btt/TimelockCancellationRace.tree new file mode 100644 index 0000000..14ec819 --- /dev/null +++ b/test/btt/TimelockCancellationRace.tree @@ -0,0 +1,51 @@ +TimelockCancellationRaceTest +├── when cancelling a proposal +│ ├── given the proposal is pending +│ │ ├── it should set proposal status to Cancelled +│ │ ├── it should emit ProposalCancelled event +│ │ └── it should prevent execution via checkUserOpPolicy returning failure +│ ├── given the proposal does not exist +│ │ └── it should revert with ProposalNotPending +│ ├── given the proposal is already cancelled +│ │ └── it should revert with ProposalNotPending +│ ├── given the proposal is already executed +│ │ └── it should revert with ProposalNotPending +│ └── given the caller is not the account +│ └── it should revert with OnlyAccount +├── when executing a proposal after cancellation +│ ├── given the proposal was just cancelled in the same block +│ │ └── it should return SIG_VALIDATION_FAILED because status is Cancelled +│ ├── given the cancellation happened in a previous block +│ │ └── it should return SIG_VALIDATION_FAILED because status is Cancelled +│ └── given a new proposal is created for the same calldata after cancellation +│ └── it should allow execution of the new proposal after grace period +├── when executing a proposal during the grace period +│ ├── given the timelock delay has passed but grace period has not +│ │ ├── it should return validation data with graceEnd as validAfter +│ │ └── it should prevent immediate execution via bundler rejection +│ └── given the grace period has passed +│ ├── it should return validation data allowing execution +│ └── it should set proposal status to Executed +├── when the owner cancels during grace period +│ ├── given the proposal is still pending +│ │ └── it should successfully cancel the proposal +│ └── given an execution attempt is pending in the mempool +│ └── it should allow cancellation to win the race +├── when attempting multiple cancellations +│ ├── given the proposal was just cancelled +│ │ └── it should revert with ProposalNotPending on second attempt +│ └── given trying to cancel twice in the same transaction +│ └── it should revert with ProposalNotPending on second call +├── when creating a new proposal after grace period +│ ├── given the original proposal was cancelled +│ │ └── it should revert with ProposalAlreadyExists because cancelled proposals persist +│ └── given the original proposal was executed +│ └── it should revert with ProposalAlreadyExists because executed proposals persist +└── when validating grace period timing + ├── given delay is 1 day and gracePeriod is 1 hour + │ ├── it should set validAfter to current time plus delay + │ ├── it should set graceEnd to validAfter plus gracePeriod + │ └── it should set validUntil to graceEnd plus expirationPeriod + └── given execution validation data is returned + ├── it should pack graceEnd not validAfter as execution start time + └── it should pack validUntil as expiration time diff --git a/test/btt/TimelockEpochValidation.t.sol b/test/btt/TimelockEpochValidation.t.sol new file mode 100644 index 0000000..b5ca7c9 --- /dev/null +++ b/test/btt/TimelockEpochValidation.t.sol @@ -0,0 +1,532 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity ^0.8.20; + +import {Test} from "forge-std/Test.sol"; +import {TimelockPolicy} from "src/policies/TimelockPolicy.sol"; +import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol"; + +/** + * @title TimelockEpochValidationTest + * @notice BTT tests for the epoch-based validation fix in TimelockPolicy + * @dev Tests the fix for TOB-KERNEL-2: Stale proposals persisting across reinstalls + */ +contract TimelockEpochValidationTest is Test { + TimelockPolicy public timelockPolicy; + + address constant WALLET = address(0x1234); + address constant WALLET2 = address(0x5678); + address constant ATTACKER = address(0xBAD); + + uint48 constant DELAY = 1 days; + uint48 constant EXPIRATION_PERIOD = 1 days; + uint48 constant GRACE_PERIOD = 1 hours; + + bytes32 constant POLICY_ID_1 = keccak256("POLICY_ID_1"); + bytes32 constant POLICY_ID_2 = keccak256("POLICY_ID_2"); + + uint256 constant SIG_VALIDATION_FAILED_UINT = 1; + + function setUp() public { + timelockPolicy = new TimelockPolicy(); + } + + function _installData() internal pure returns (bytes memory) { + return abi.encode(DELAY, EXPIRATION_PERIOD, GRACE_PERIOD); + } + + function _installPolicy(address wallet, bytes32 policyId) internal { + vm.prank(wallet); + timelockPolicy.onInstall(abi.encodePacked(policyId, _installData())); + } + + function _uninstallPolicy(address wallet, bytes32 policyId) internal { + vm.prank(wallet); + timelockPolicy.onUninstall(abi.encodePacked(policyId, "")); + } + + function _createProposal(address wallet, bytes32 policyId, bytes memory callData, uint256 nonce) internal { + // Create proposal via no-op UserOp (creates Pending directly with clock started) + bytes memory sig = abi.encodePacked(bytes32(callData.length), callData, bytes32(nonce), bytes1(0x00)); + PackedUserOperation memory noopOp = PackedUserOperation({ + sender: wallet, + nonce: 0, + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: sig + }); + vm.prank(wallet); + timelockPolicy.checkUserOpPolicy(policyId, noopOp); + } + + function _createUserOp(address sender, bytes memory callData, uint256 nonce) + internal + pure + returns (PackedUserOperation memory) + { + return PackedUserOperation({ + sender: sender, + nonce: nonce, + initCode: "", + callData: callData, + accountGasLimits: bytes32(abi.encodePacked(uint128(100000), uint128(200000))), + preVerificationGas: 0, + gasFees: bytes32(abi.encodePacked(uint128(1), uint128(1))), + paymasterAndData: "", + signature: "" + }); + } + + // ==================== Installing the Policy ==================== + + modifier whenInstallingThePolicy() { + _; + } + + function test_GivenItIsTheFirstInstallation() external whenInstallingThePolicy { + // Check epoch before installation + uint256 epochBefore = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + assertEq(epochBefore, 0, "Epoch should be 0 before first install"); + + // Install the policy + _installPolicy(WALLET, POLICY_ID_1); + + // it should set currentEpoch to 1 + uint256 epochAfter = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + assertEq(epochAfter, 1, "Epoch should be 1 after first install"); + + // it should initialize the policy config + (uint48 delay, uint48 expirationPeriod, uint48 gracePeriod_, bool initialized) = + timelockPolicy.timelockConfig(POLICY_ID_1, WALLET); + assertTrue(initialized, "Policy should be initialized"); + assertEq(delay, DELAY, "Delay should match"); + assertEq(expirationPeriod, EXPIRATION_PERIOD, "Expiration period should match"); + } + + function test_GivenThePolicyWasPreviouslyUninstalled() external whenInstallingThePolicy { + // First installation + _installPolicy(WALLET, POLICY_ID_1); + uint256 epochAfterFirstInstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + assertEq(epochAfterFirstInstall, 1, "Epoch should be 1 after first install"); + + // Uninstall + _uninstallPolicy(WALLET, POLICY_ID_1); + + // Reinstall + _installPolicy(WALLET, POLICY_ID_1); + + // it should increment the epoch counter + // it should set currentEpoch to previous epoch plus 1 + uint256 epochAfterReinstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + assertEq(epochAfterReinstall, 2, "Epoch should be 2 after reinstall"); + } + + function test_GivenMultipleReinstallCyclesOccur() external whenInstallingThePolicy { + // First installation + _installPolicy(WALLET, POLICY_ID_1); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 1, "Epoch should be 1"); + + // First reinstall cycle + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + // it should increment epoch on each install + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 2, "Epoch should be 2"); + + // Second reinstall cycle + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 3, "Epoch should be 3"); + + // Third reinstall cycle + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + // it should track epoch correctly after 3 reinstalls + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 4, "Epoch should be 4 after 3 reinstalls"); + } + + // ==================== Creating a Proposal ==================== + + modifier whenCreatingAProposal() { + _; + } + + function test_GivenThePolicyIsInstalled() external whenCreatingAProposal { + _installPolicy(WALLET, POLICY_ID_1); + + bytes memory callData = hex"1234"; + uint256 nonce = 1; + + _createProposal(WALLET, POLICY_ID_1, callData, nonce); + + // it should store the current epoch in the proposal + // it should be in Pending status with timing set + bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); + ( + TimelockPolicy.ProposalStatus status, + uint48 validAfter, + uint48 graceEnd, + uint48 validUntil, + uint256 proposalEpoch + ) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); + + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be Pending"); + assertEq(proposalEpoch, 1, "Proposal epoch should match current epoch (1)"); + assertEq(validAfter, block.timestamp + DELAY, "validAfter should be correct"); + assertEq(graceEnd, block.timestamp + DELAY + GRACE_PERIOD, "graceEnd should be correct"); + assertEq(validUntil, block.timestamp + DELAY + GRACE_PERIOD + EXPIRATION_PERIOD, "validUntil should be correct"); + } + + function test_GivenCreatingViaNoOpUserOp() external whenCreatingAProposal { + _installPolicy(WALLET, POLICY_ID_1); + + bytes memory callData = hex"5678"; + uint256 nonce = 42; + + uint256 epoch = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + + _createProposal(WALLET, POLICY_ID_1, callData, nonce); + + // it should record the epoch at creation time (proposal is Pending) + bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); + (TimelockPolicy.ProposalStatus status,,,, uint256 proposalEpoch) = + timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); + + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Should be Pending"); + assertEq(proposalEpoch, epoch, "Proposal epoch should equal current epoch at creation"); + } + + // ==================== Executing a Proposal ==================== + + modifier whenExecutingAProposal() { + _; + } + + modifier givenTheProposalWasCreatedInTheCurrentEpoch() { + _; + } + + function test_GivenTheTimelockHasPassed() + external + whenExecutingAProposal + givenTheProposalWasCreatedInTheCurrentEpoch + { + _installPolicy(WALLET, POLICY_ID_1); + + bytes memory callData = hex"1234"; + uint256 nonce = 1; + + // Create proposal via no-op UserOp (creates Pending directly with clock started) + _createProposal(WALLET, POLICY_ID_1, callData, nonce); + + // Warp past the timelock delay + vm.warp(block.timestamp + DELAY + 1); + + PackedUserOperation memory userOp = _createUserOp(WALLET, callData, nonce); + + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, userOp); + + // it should return success validation data (not SIG_VALIDATION_FAILED_UINT) + assertTrue(validationResult != SIG_VALIDATION_FAILED_UINT, "Validation should succeed"); + + // it should mark proposal as executed + bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); + (TimelockPolicy.ProposalStatus status,,,,) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed), "Proposal should be executed"); + } + + function test_GivenTheProposalWasCreatedBeforeUninstallAndReinstall() external whenExecutingAProposal { + _installPolicy(WALLET, POLICY_ID_1); + + bytes memory callData = hex"1234"; + uint256 nonce = 1; + + // Create proposal via no-op UserOp (Pending with clock started, epoch 1) + _createProposal(WALLET, POLICY_ID_1, callData, nonce); + + // Warp past the timelock delay + vm.warp(block.timestamp + DELAY + 1); + + // Uninstall and reinstall (epoch becomes 2) + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + // Try to execute the stale proposal + PackedUserOperation memory userOp = _createUserOp(WALLET, callData, nonce); + + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, userOp); + + // it should return SIG_VALIDATION_FAILED + assertEq(validationResult, SIG_VALIDATION_FAILED_UINT, "Stale proposal should fail validation"); + + // it should not mark proposal as executed (still Pending from epoch 1) + bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); + (TimelockPolicy.ProposalStatus status,,,,) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should still be Pending"); + } + + function test_GivenTheProposalEpochDoesNotMatchCurrentEpoch() external whenExecutingAProposal { + _installPolicy(WALLET, POLICY_ID_1); + + bytes memory callData = hex"abcd"; + uint256 nonce = 5; + + // Create proposal via no-op UserOp in epoch 1 (Pending with clock started) + _createProposal(WALLET, POLICY_ID_1, callData, nonce); + + bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); + (,,,, uint256 proposalEpoch) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); + assertEq(proposalEpoch, 1, "Proposal should be in epoch 1"); + + // Warp and do multiple reinstalls to get to epoch 3 + vm.warp(block.timestamp + DELAY + 1); + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 3, "Current epoch should be 3"); + + // Try to execute + PackedUserOperation memory userOp = _createUserOp(WALLET, callData, nonce); + + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, userOp); + + // it should reject the stale proposal + assertEq(validationResult, SIG_VALIDATION_FAILED_UINT, "Should reject stale proposal"); + + // it should leave proposal status unchanged + (TimelockPolicy.ProposalStatus statusAfter,,,,) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); + assertEq( + uint256(statusAfter), + uint256(TimelockPolicy.ProposalStatus.Pending), + "Proposal status should remain Pending" + ); + } + + // ==================== Uninstalling and Reinstalling ==================== + + modifier whenUninstallingAndReinstallingThePolicy() { + _; + } + + modifier givenAProposalExistsBeforeUninstall() { + _; + } + + function test_WhenThePolicyIsUninstalled() + external + whenUninstallingAndReinstallingThePolicy + givenAProposalExistsBeforeUninstall + { + _installPolicy(WALLET, POLICY_ID_1); + + bytes memory callData = hex"1234"; + uint256 nonce = 1; + + _createProposal(WALLET, POLICY_ID_1, callData, nonce); + + uint256 epochBeforeUninstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + + // Uninstall + _uninstallPolicy(WALLET, POLICY_ID_1); + + // it should delete the policy config + (,,, bool initialized) = timelockPolicy.timelockConfig(POLICY_ID_1, WALLET); + assertFalse(initialized, "Policy config should be deleted"); + + // it should preserve the epoch counter + uint256 epochAfterUninstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + assertEq(epochAfterUninstall, epochBeforeUninstall, "Epoch should be preserved after uninstall"); + } + + function test_WhenThePolicyIsReinstalled() + external + whenUninstallingAndReinstallingThePolicy + givenAProposalExistsBeforeUninstall + { + _installPolicy(WALLET, POLICY_ID_1); + + bytes memory callData = hex"1234"; + uint256 nonce = 1; + + // Create proposal via no-op UserOp in epoch 1 (Pending with clock started) + _createProposal(WALLET, POLICY_ID_1, callData, nonce); + + uint256 epochBeforeUninstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + + _uninstallPolicy(WALLET, POLICY_ID_1); + + // Reinstall + _installPolicy(WALLET, POLICY_ID_1); + + // it should increment the epoch + uint256 epochAfterReinstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + assertEq(epochAfterReinstall, epochBeforeUninstall + 1, "Epoch should increment on reinstall"); + + // it should invalidate old proposals implicitly + vm.warp(block.timestamp + DELAY + 1); + PackedUserOperation memory userOp = _createUserOp(WALLET, callData, nonce); + + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, userOp); + assertEq(validationResult, SIG_VALIDATION_FAILED_UINT, "Old proposal should be invalid"); + + // it should allow new proposals with new epoch (Pending status) + bytes memory newCallData = hex"5678"; + uint256 newNonce = 2; + + _createProposal(WALLET, POLICY_ID_1, newCallData, newNonce); + + bytes32 newUserOpKey = timelockPolicy.computeUserOpKey(WALLET, newCallData, newNonce); + (TimelockPolicy.ProposalStatus status,,,, uint256 newProposalEpoch) = + timelockPolicy.proposals(newUserOpKey, POLICY_ID_1, WALLET); + + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "New proposal should be Pending"); + assertEq(newProposalEpoch, epochAfterReinstall, "New proposal should have current epoch"); + } + + // ==================== Epoch Storage Per Policy ID ==================== + + modifier whenEpochIsStoredPerPolicyID() { + _; + } + + function test_GivenTwoDifferentPolicyIDsForSameWallet() external whenEpochIsStoredPerPolicyID { + // Install policy 1 + _installPolicy(WALLET, POLICY_ID_1); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 1, "Policy 1 should be epoch 1"); + + // Install policy 2 + _installPolicy(WALLET, POLICY_ID_2); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_2, WALLET), 1, "Policy 2 should be epoch 1"); + + // Reinstall policy 1 twice + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + // it should track separate epochs for each policy ID + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 3, "Policy 1 should be epoch 3"); + + // it should not cross contaminate epochs + assertEq(timelockPolicy.currentEpoch(POLICY_ID_2, WALLET), 1, "Policy 2 should still be epoch 1"); + } + + function test_GivenSamePolicyIDForDifferentWallets() external whenEpochIsStoredPerPolicyID { + // Install for wallet 1 + _installPolicy(WALLET, POLICY_ID_1); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 1, "Wallet 1 should be epoch 1"); + + // Install for wallet 2 + _installPolicy(WALLET2, POLICY_ID_1); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET2), 1, "Wallet 2 should be epoch 1"); + + // Reinstall for wallet 1 multiple times + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + // it should track separate epochs for each wallet + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 3, "Wallet 1 should be epoch 3"); + + // it should not affect other wallets epoch on reinstall + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET2), 1, "Wallet 2 should still be epoch 1"); + } + + // ==================== Full Attack Scenario ==================== + + modifier whenVerifyingFullAttackScenario() { + _; + } + + function test_WhenAttackerCannotCreateProposalsDirectly() external whenVerifyingFullAttackScenario { + // User installs policy + _installPolicy(WALLET, POLICY_ID_1); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 1, "Should start at epoch 1"); + + // Without createProposal, an attacker cannot create proposals for WALLET. + // The only way to create a proposal is via checkUserOpPolicy which requires + // msg.sender == WALLET (the account itself). So there is no external attack vector. + + // Verify that trying to execute a non-existent proposal fails + bytes memory maliciousCallData = hex"deadbeef"; + uint256 maliciousNonce = 666; + + PackedUserOperation memory maliciousUserOp = _createUserOp(WALLET, maliciousCallData, maliciousNonce); + + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, maliciousUserOp); + + // it should fail because no proposal exists + assertEq(validationResult, SIG_VALIDATION_FAILED_UINT, "Non-existent proposal should fail"); + } + + function test_WhenUserCreatesNewProposalAfterReinstall() external whenVerifyingFullAttackScenario { + // User installs policy + _installPolicy(WALLET, POLICY_ID_1); + + // User uninstalls and reinstalls + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + // User creates legitimate proposal via no-op UserOp with new epoch + bytes memory callData = hex"abcd"; + uint256 userNonce = 200; + _createProposal(WALLET, POLICY_ID_1, callData, userNonce); + + vm.warp(block.timestamp + DELAY + 1); + + PackedUserOperation memory userOp = _createUserOp(WALLET, callData, userNonce); + + vm.prank(WALLET); + uint256 validationResult = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, userOp); + + // it should succeed with new epoch + assertTrue(validationResult != SIG_VALIDATION_FAILED_UINT, "User's new proposal should succeed"); + } + + function test_WhenOneUserReinstallsDoesNotAffectOther() external whenVerifyingFullAttackScenario { + // Both users install policy + _installPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET2, POLICY_ID_1); + + // Both users create proposals via no-op UserOp + bytes memory callData1 = hex"1111"; + bytes memory callData2 = hex"2222"; + + _createProposal(WALLET, POLICY_ID_1, callData1, 1); + _createProposal(WALLET2, POLICY_ID_1, callData2, 1); + + vm.warp(block.timestamp + DELAY + 1); + + // WALLET reinstalls + _uninstallPolicy(WALLET, POLICY_ID_1); + _installPolicy(WALLET, POLICY_ID_1); + + // it should only affect that users epoch + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 2, "WALLET should be epoch 2"); + assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET2), 1, "WALLET2 should still be epoch 1"); + + // WALLET's old proposal should fail (epoch mismatch) + PackedUserOperation memory userOp1 = _createUserOp(WALLET, callData1, 1); + vm.prank(WALLET); + uint256 result1 = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, userOp1); + assertEq(result1, SIG_VALIDATION_FAILED_UINT, "WALLET's old proposal should fail"); + + // it should not affect other users proposals + PackedUserOperation memory userOp2 = _createUserOp(WALLET2, callData2, 1); + vm.prank(WALLET2); + uint256 result2 = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, userOp2); + assertTrue(result2 != SIG_VALIDATION_FAILED_UINT, "WALLET2's proposal should still work"); + } +} diff --git a/test/btt/TimelockEpochValidation.tree b/test/btt/TimelockEpochValidation.tree new file mode 100644 index 0000000..db1132f --- /dev/null +++ b/test/btt/TimelockEpochValidation.tree @@ -0,0 +1,75 @@ +TimelockEpochValidationTest +├── when installing the policy +│ ├── given it is the first installation +│ │ ├── it should set currentEpoch to 1 +│ │ └── it should initialize the policy config +│ ├── given the policy was previously uninstalled +│ │ ├── it should increment the epoch counter +│ │ └── it should set currentEpoch to previous epoch plus 1 +│ └── given multiple reinstall cycles occur +│ ├── it should increment epoch on each install +│ └── it should track epoch correctly after 3 reinstalls +├── when creating a proposal +│ ├── given the policy is installed +│ │ ├── it should store the current epoch in the proposal +│ │ └── it should use the epoch from currentEpoch mapping +│ └── given creating via createProposal function +│ └── it should record the epoch at creation time +├── when executing a proposal +│ ├── given the proposal was created in the current epoch +│ │ ├── given the timelock has passed +│ │ │ ├── it should return success validation data +│ │ │ └── it should mark proposal as executed +│ │ └── given the proposal is pending +│ │ └── it should pass epoch validation +│ ├── given the proposal was created before uninstall and reinstall +│ │ ├── it should return SIG_VALIDATION_FAILED +│ │ └── it should not mark proposal as executed +│ └── given the proposal epoch does not match current epoch +│ ├── it should reject the stale proposal +│ └── it should leave proposal status unchanged +├── when uninstalling and reinstalling the policy +│ ├── given a proposal exists before uninstall +│ │ ├── when the policy is uninstalled +│ │ │ ├── it should delete the policy config +│ │ │ └── it should preserve the epoch counter +│ │ └── when the policy is reinstalled +│ │ ├── it should increment the epoch +│ │ ├── it should invalidate old proposals implicitly +│ │ └── it should allow new proposals with new epoch +│ ├── given multiple proposals exist before uninstall +│ │ └── when reinstalled and proposals executed +│ │ ├── it should reject all old proposals +│ │ └── it should accept new proposals created after reinstall +│ └── given an attacker tries to execute stale proposal +│ ├── when proposal was created in epoch 1 and current epoch is 2 +│ │ └── it should fail validation +│ └── when proposal was created in epoch 2 and current epoch is 5 +│ └── it should fail validation +├── when epoch is stored per policy ID +│ ├── given two different policy IDs for same wallet +│ │ ├── it should track separate epochs for each policy ID +│ │ └── it should not cross contaminate epochs +│ └── given same policy ID for different wallets +│ ├── it should track separate epochs for each wallet +│ └── it should not affect other wallets epoch on reinstall +├── when creating new proposals after reinstall +│ ├── given old proposal exists with old epoch +│ │ ├── it should allow creating new proposal with same parameters +│ │ └── it should store new proposal with current epoch +│ └── given the new proposal is executed +│ ├── it should succeed because epoch matches +│ └── it should mark new proposal as executed +└── when verifying full attack scenario + ├── given attacker creates proposal before user uninstalls + │ ├── when user uninstalls and reinstalls + │ │ ├── when attacker tries to execute old proposal + │ │ │ └── it should fail due to epoch mismatch + │ │ └── when user creates new proposal with same calldata + │ │ └── it should succeed with new epoch + │ └── when timelock passes but policy was reinstalled + │ └── it should still reject the stale proposal + └── given multiple users with same policy + └── when one user reinstalls + ├── it should only affect that users epoch + └── it should not affect other users proposals diff --git a/test/btt/TimelockSignaturePolicy.t.sol b/test/btt/TimelockSignaturePolicy.t.sol new file mode 100644 index 0000000..9b405a4 --- /dev/null +++ b/test/btt/TimelockSignaturePolicy.t.sol @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity ^0.8.20; + +import {Test} from "forge-std/Test.sol"; +import {TimelockPolicy} from "src/policies/TimelockPolicy.sol"; + +/** + * @title TimelockSignaturePolicyTest + * @notice BTT tests for ERC-1271 signature validation with timelock + * @dev Tests that TimelockPolicy disables ERC-1271 signature validation (always reverts) + */ +contract TimelockSignaturePolicyTest is Test { + TimelockPolicy public timelockPolicy; + + address constant WALLET = address(0x1234); + + uint48 constant DELAY = 1 days; + uint48 constant EXPIRATION_PERIOD = 1 days; + uint48 constant GRACE_PERIOD = 1 hours; + + bytes32 public policyId; + bytes32 public testHash; + + function setUp() public { + timelockPolicy = new TimelockPolicy(); + policyId = keccak256(abi.encodePacked("POLICY_ID_1")); + testHash = keccak256(abi.encodePacked("TEST_HASH_TO_SIGN")); + } + + /// @notice Helper to install the policy for a wallet + function _installPolicy(address wallet) internal { + bytes memory installData = abi.encode(DELAY, EXPIRATION_PERIOD, GRACE_PERIOD); + vm.prank(wallet); + timelockPolicy.onInstall(abi.encodePacked(policyId, installData)); + } + + // ============================================================ + // Test: checkSignaturePolicy always reverts + // ============================================================ + + function test_WhenCheckingSignaturePolicy() external { + // it should revert because signature validation is not supported + + // Install policy + _installPolicy(WALLET); + + // Try to validate a signature - should always revert + vm.prank(WALLET); + vm.expectRevert("TimelockPolicy: signature validation not supported"); + timelockPolicy.checkSignaturePolicy(policyId, address(0), testHash, ""); + } + + function test_WhenCheckingSignaturePolicyWithoutInstall() external { + // it should revert because signature validation is not supported + + // Do NOT install the policy + + // Try to validate a signature - should always revert + vm.prank(WALLET); + vm.expectRevert("TimelockPolicy: signature validation not supported"); + timelockPolicy.checkSignaturePolicy(policyId, address(0), testHash, ""); + } + + // ============================================================ + // Test: validateSignatureWithData always reverts + // ============================================================ + + function test_WhenValidatingSignatureWithData() external { + // it should revert because stateless signature validation is not supported + + bytes memory data = abi.encode(DELAY, EXPIRATION_PERIOD); + + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithData(testHash, "", data); + } + + // ============================================================ + // Test: validateSignatureWithDataWithSender always reverts + // ============================================================ + + function test_WhenValidatingSignatureWithDataWithSender() external { + // it should revert because stateless signature validation is not supported + + bytes memory data = abi.encode(DELAY, EXPIRATION_PERIOD); + + vm.expectRevert("TimelockPolicy: stateless signature validation not supported"); + timelockPolicy.validateSignatureWithDataWithSender(WALLET, testHash, "", data); + } +} diff --git a/test/btt/TimelockSignaturePolicy.tree b/test/btt/TimelockSignaturePolicy.tree new file mode 100644 index 0000000..9a21572 --- /dev/null +++ b/test/btt/TimelockSignaturePolicy.tree @@ -0,0 +1,9 @@ +TimelockSignaturePolicyTest +├── when checking signature policy +│ └── it should revert because signature validation is not supported +├── when checking signature policy without install +│ └── it should revert because signature validation is not supported +├── when validating signature with data +│ └── it should revert because stateless signature validation is not supported +└── when validating signature with data with sender + └── it should revert because stateless signature validation is not supported diff --git a/test/integration/TimelockEntryPoint.t.sol b/test/integration/TimelockEntryPoint.t.sol new file mode 100644 index 0000000..df87545 --- /dev/null +++ b/test/integration/TimelockEntryPoint.t.sol @@ -0,0 +1,981 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.0; + +import {Test} from "forge-std/Test.sol"; +import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol"; +import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol"; +import {IAccountExecute} from "account-abstraction/interfaces/IAccountExecute.sol"; +import {IERC7579Execution} from "openzeppelin-contracts/contracts/interfaces/draft-IERC7579.sol"; +import {EntryPointLib} from "../utils/EntryPointLib.sol"; +import {MockTimelockAccount} from "../utils/MockTimelockAccount.sol"; +import {TimelockPolicy} from "../../src/policies/TimelockPolicy.sol"; + +/// @title TimelockEntryPointTest +/// @notice Integration tests that exercise TimelockPolicy through the real EntryPoint v0.9. +/// Verifies that validAfter/validUntil returned by the policy are correctly enforced +/// by the EntryPoint's time-range validation. +contract TimelockEntryPointTest is Test { + IEntryPoint public entryPoint; + TimelockPolicy public policy; + MockTimelockAccount public account; + + bytes32 public constant POLICY_ID = bytes32(uint256(1)); + uint48 public constant DELAY = 1 hours; + uint48 public constant EXPIRATION = 1 days; + uint48 public constant GRACE_PERIOD = 30 minutes; + + address payable constant BENEFICIARY = payable(address(0xbeeF)); + address constant BUNDLER = address(0xba5ed); + + function setUp() public { + entryPoint = EntryPointLib.deploy(); + policy = new TimelockPolicy(); + account = new MockTimelockAccount(entryPoint, policy, POLICY_ID); + + // Fund the account for gas + vm.deal(address(account), 100 ether); + + // Install timelock policy (must come from the account) + vm.prank(address(account)); + policy.onInstall(abi.encode(POLICY_ID, DELAY, EXPIRATION, GRACE_PERIOD)); + } + + // ============ Helpers ============ + + /// @dev Build proposal-creation signature: [callDataLen(32)][callData][proposalNonce(32)][0x00] + function _proposalSig(bytes memory proposalCallData, uint256 proposalNonce) + internal + pure + returns (bytes memory) + { + return abi.encodePacked( + bytes32(proposalCallData.length), + proposalCallData, + bytes32(proposalNonce), + bytes1(0x00) + ); + } + + /// @dev Build a no-op UserOp for proposal creation with configurable calldata format. + function _buildCreationOpWithCalldata( + bytes memory noopCallData, + bytes memory proposalCallData, + uint256 proposalNonce, + uint256 epNonce + ) internal view returns (PackedUserOperation memory) { + return PackedUserOperation({ + sender: address(account), + nonce: epNonce, + initCode: "", + callData: noopCallData, + accountGasLimits: bytes32(abi.encodePacked(uint128(500_000), uint128(500_000))), + preVerificationGas: 100_000, + gasFees: bytes32(abi.encodePacked(uint128(1 gwei), uint128(1 gwei))), + paymasterAndData: "", + signature: _proposalSig(proposalCallData, proposalNonce) + }); + } + + /// @dev Build a no-op UserOp for proposal creation (empty calldata). + function _buildCreationOp(bytes memory proposalCallData, uint256 proposalNonce, uint256 epNonce) + internal + view + returns (PackedUserOperation memory) + { + return _buildCreationOpWithCalldata("", proposalCallData, proposalNonce, epNonce); + } + + /// @dev Build an execution UserOp. The nonce must match the proposalNonce used at creation time. + function _buildExecutionOp(bytes memory callData, uint256 nonce) + internal + view + returns (PackedUserOperation memory) + { + return PackedUserOperation({ + sender: address(account), + nonce: nonce, + initCode: "", + callData: callData, + accountGasLimits: bytes32(abi.encodePacked(uint128(500_000), uint128(500_000))), + preVerificationGas: 100_000, + gasFees: bytes32(abi.encodePacked(uint128(1 gwei), uint128(1 gwei))), + paymasterAndData: "", + signature: "" // signature content irrelevant for execution path + }); + } + + function _submitOp(PackedUserOperation memory op) internal { + PackedUserOperation[] memory ops = new PackedUserOperation[](1); + ops[0] = op; + // EntryPoint requires msg.sender == tx.origin (EOA bundler check) + vm.prank(BUNDLER, BUNDLER); + entryPoint.handleOps(ops, BENEFICIARY); + } + + function _submitOps(PackedUserOperation[] memory ops) internal { + vm.prank(BUNDLER, BUNDLER); + entryPoint.handleOps(ops, BENEFICIARY); + } + + function _expectRevertOnOp(PackedUserOperation memory op) internal { + PackedUserOperation[] memory ops = new PackedUserOperation[](1); + ops[0] = op; + vm.prank(BUNDLER, BUNDLER); + vm.expectRevert(); + entryPoint.handleOps(ops, BENEFICIARY); + } + + /// @dev Helper: create a proposal via EntryPoint and return the nonce used + function _createProposal(bytes memory proposalCallData, uint256 proposalNonce) internal { + uint256 epNonce = entryPoint.getNonce(address(account), 0); + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, epNonce)); + } + + /// @dev Helper: get a fresh nonce for a given key + function _getNonce(uint192 key) internal view returns (uint256) { + return entryPoint.getNonce(address(account), key); + } + + // ============ 1. Basic Lifecycle Tests ============ + + /// @notice Proposal creation via no-op UserOp goes through the EntryPoint and persists the proposal. + function testEntryPoint_ProposalCreationViaNoOp() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; // execution will use nonce=1 (next seq for key=0) + + uint256 epNonce = _getNonce(0); + assertEq(epNonce, 0); + + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, epNonce)); + + // Verify proposal was stored + (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 graceEnd, uint256 validUntil) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + assertEq(validAfter, block.timestamp + DELAY); + assertEq(graceEnd, block.timestamp + DELAY + GRACE_PERIOD); + assertEq(validUntil, block.timestamp + DELAY + GRACE_PERIOD + EXPIRATION); + + // EntryPoint nonce should have advanced + assertEq(_getNonce(0), 1); + } + + /// @notice Full lifecycle: create proposal -> wait -> execute -> verify state change. + function testEntryPoint_FullLifecycle() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + // Step 1: Create proposal + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Step 2: Warp past delay + grace period + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Step 3: Execute proposal through EntryPoint + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce)); + + // Step 4: Verify the execution actually happened + assertEq(account.value(), 42); + + // Verify proposal status is Executed + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed)); + } + + /// @notice Execution without a prior proposal fails at validation. + function testEntryPoint_NoProposalRevertsExecution() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + _expectRevertOnOp(_buildExecutionOp(proposalCallData, 0)); + assertEq(account.value(), 0); + } + + // ============ 2. Time Window Enforcement ============ + + /// @notice EntryPoint rejects execution during the grace period (validAfter not yet reached). + function testEntryPoint_GracePeriodBlocksExecution() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Warp past delay but still within grace period + vm.warp(block.timestamp + DELAY + 1); + + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + } + + /// @notice Execution at exactly graceEnd timestamp is still rejected (EntryPoint uses <=). + function testEntryPoint_ExecutionAtExactGraceEndIsRejected() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + uint256 creationTime = block.timestamp; + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Warp to exactly graceEnd: EntryPoint checks block.timestamp <= validAfter, so equal is rejected + vm.warp(creationTime + DELAY + GRACE_PERIOD); + + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + } + + /// @notice Execution at graceEnd + 1 succeeds (first valid timestamp). + function testEntryPoint_ExecutionAtGraceEndPlusOneSucceeds() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + uint256 creationTime = block.timestamp; + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + vm.warp(creationTime + DELAY + GRACE_PERIOD + 1); + + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 42); + } + + /// @notice Execution at exactly validUntil is still accepted (EntryPoint checks >). + function testEntryPoint_ExecutionAtExactValidUntilSucceeds() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + uint256 creationTime = block.timestamp; + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Warp to exactly validUntil: EntryPoint checks block.timestamp > validUntil, so equal is OK + vm.warp(creationTime + DELAY + GRACE_PERIOD + EXPIRATION); + + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 42); + } + + /// @notice EntryPoint rejects execution after the proposal has expired. + function testEntryPoint_ExpirationBlocksExecution() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + uint256 creationTime = block.timestamp; + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Warp 1 second past validUntil + vm.warp(creationTime + DELAY + GRACE_PERIOD + EXPIRATION + 1); + + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + } + + /// @notice Execution before delay has passed is rejected (still in timelock period). + function testEntryPoint_ExecutionBeforeDelayRejected() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Don't warp at all — still at creation time + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + } + + // ============ 3. Cancellation Tests ============ + + /// @notice Cancelled proposal cannot be executed even after the timelock passes. + function testEntryPoint_CancelPreventsExecution() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + vm.prank(address(account)); + policy.cancelProposal(POLICY_ID, address(account), proposalCallData, proposalNonce); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + } + + /// @notice Owner can cancel during grace period (delay passed but grace hasn't ended). + function testEntryPoint_CancelDuringGracePeriod() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Warp into the grace period + vm.warp(block.timestamp + DELAY + GRACE_PERIOD / 2); + + // Cancel should succeed + vm.prank(address(account)); + policy.cancelProposal(POLICY_ID, address(account), proposalCallData, proposalNonce); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Cancelled)); + + // Warp past grace period — execution still fails + vm.warp(block.timestamp + GRACE_PERIOD + 1); + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + } + + /// @notice Owner can cancel before the delay has even passed. + function testEntryPoint_CancelBeforeDelayPasses() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 1; + + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, 0)); + + // Cancel immediately (no warp) + vm.prank(address(account)); + policy.cancelProposal(POLICY_ID, address(account), proposalCallData, proposalNonce); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Cancelled)); + } + + // ============ 4. Replay / Double-Use Prevention ============ + + /// @notice A proposal that was already executed cannot be executed again. + function testEntryPoint_DoubleExecutionFails() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + // Use different nonce keys so execution nonces don't collide + uint256 proposalNonce = _getNonce(1); // key=1, seq=0 + + _createProposal(proposalCallData, proposalNonce); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // First execution succeeds + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 42); + + // Second execution attempt with the same callData+nonce via a different nonce key. + // The EntryPoint nonce for key=1 is now 1 (after first execution), so we'd need + // a new nonce. But the proposal is already Executed, so validation returns 1. + // We use key=2 to get a fresh nonce that equals proposalNonce... but that doesn't + // match the original proposalNonce. The proposal key won't match. + // Instead, verify the proposal status is Executed. + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Executed)); + } + + /// @notice Cannot create the same proposal twice (duplicate creation fails via EntryPoint). + function testEntryPoint_DuplicateCreationFails() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = 100; + + // First creation succeeds + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, _getNonce(0))); + + // Second creation with same proposalCallData and proposalNonce fails at validation + // (status != None) → returns SIG_VALIDATION_FAILED → "AA24 signature error" + _expectRevertOnOp(_buildCreationOp(proposalCallData, proposalNonce, _getNonce(0))); + } + + // ============ 5. Epoch / Reinstall Tests ============ + + /// @notice Proposals from a previous installation cannot be executed after reinstall. + function testEntryPoint_StaleProposalAfterReinstall() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = _getNonce(1); // use key=1 for execution + + // Create proposal + _createProposal(proposalCallData, proposalNonce); + + // Uninstall + vm.prank(address(account)); + policy.onUninstall(abi.encode(POLICY_ID, "")); + + // Reinstall (increments epoch) + vm.prank(address(account)); + policy.onInstall(abi.encode(POLICY_ID, DELAY, EXPIRATION, GRACE_PERIOD)); + + // Warp past delay + grace + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execution fails: proposal epoch doesn't match new epoch + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + } + + /// @notice After reinstall, new proposals can be created and executed normally. + function testEntryPoint_NewProposalAfterReinstall() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (99)); + uint256 proposalNonce = _getNonce(1); + + // Create a proposal in the first installation + _createProposal(proposalCallData, proposalNonce); + + // Uninstall + reinstall + vm.prank(address(account)); + policy.onUninstall(abi.encode(POLICY_ID, "")); + vm.prank(address(account)); + policy.onInstall(abi.encode(POLICY_ID, DELAY, EXPIRATION, GRACE_PERIOD)); + + // Create a NEW proposal with a different nonce + uint256 newProposalNonce = _getNonce(2); // key=2 + _createProposal(abi.encodeCall(MockTimelockAccount.setValue, (77)), newProposalNonce); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // New proposal executes fine + _submitOp(_buildExecutionOp(abi.encodeCall(MockTimelockAccount.setValue, (77)), newProposalNonce)); + assertEq(account.value(), 77); + } + + // ============ 6. No-Op Calldata Variants ============ + + /// @notice Proposal creation with ERC-7579 execute(mode=0x00, "") no-op format. + function testEntryPoint_CreationViaERC7579NoOp() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = _getNonce(1); + + // ERC-7579 no-op: execute(bytes32(0), "") → selector + mode(32) + offset(32) + len(32) = 100 bytes + bytes memory erc7579Noop = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), ""); + + _submitOp(_buildCreationOpWithCalldata(erc7579Noop, proposalCallData, proposalNonce, _getNonce(0))); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + + // Verify lifecycle completes + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 42); + } + + /// @notice Proposal creation with executeUserOp selector-only (4 bytes) no-op format. + function testEntryPoint_CreationViaExecuteUserOpEmpty() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = _getNonce(1); + + // executeUserOp selector only (4 bytes) + bytes memory executeUserOpNoop = abi.encodePacked(IAccountExecute.executeUserOp.selector); + + _submitOp(_buildCreationOpWithCalldata(executeUserOpNoop, proposalCallData, proposalNonce, _getNonce(0))); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + } + + /// @notice Proposal creation with executeUserOp + ERC-7579 execute no-op (wrapped format). + function testEntryPoint_CreationViaExecuteUserOpWrappedERC7579() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = _getNonce(1); + + bytes memory erc7579Noop = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), ""); + bytes memory wrappedNoop = abi.encodePacked(IAccountExecute.executeUserOp.selector, erc7579Noop); + + _submitOp(_buildCreationOpWithCalldata(wrappedNoop, proposalCallData, proposalNonce, _getNonce(0))); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + } + + // ============ 7. Multiple Proposals ============ + + /// @notice Two independent proposals (different callData) can coexist and execute separately. + function testEntryPoint_TwoIndependentProposals() public { + bytes memory callDataA = abi.encodeCall(MockTimelockAccount.setValue, (10)); + bytes memory callDataB = abi.encodeCall(MockTimelockAccount.setValue, (20)); + + // Use separate nonce keys so execution nonces don't collide + uint256 nonceA = _getNonce(1); // key=1, seq=0 + uint256 nonceB = _getNonce(2); // key=2, seq=0 + + // Create both proposals + _createProposal(callDataA, nonceA); + _createProposal(callDataB, nonceB); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execute B first + _submitOp(_buildExecutionOp(callDataB, nonceB)); + assertEq(account.value(), 20); + + // Execute A second (overwrites value) + _submitOp(_buildExecutionOp(callDataA, nonceA)); + assertEq(account.value(), 10); + + // Both are Executed + (TimelockPolicy.ProposalStatus statusA,,,) = + policy.getProposal(address(account), callDataA, nonceA, POLICY_ID, address(account)); + (TimelockPolicy.ProposalStatus statusB,,,) = + policy.getProposal(address(account), callDataB, nonceB, POLICY_ID, address(account)); + assertEq(uint256(statusA), uint256(TimelockPolicy.ProposalStatus.Executed)); + assertEq(uint256(statusB), uint256(TimelockPolicy.ProposalStatus.Executed)); + } + + /// @notice Cancel one proposal while leaving another intact, then execute the other. + function testEntryPoint_CancelOneExecuteAnother() public { + bytes memory callDataA = abi.encodeCall(MockTimelockAccount.setValue, (10)); + bytes memory callDataB = abi.encodeCall(MockTimelockAccount.setValue, (20)); + + uint256 nonceA = _getNonce(1); + uint256 nonceB = _getNonce(2); + + _createProposal(callDataA, nonceA); + _createProposal(callDataB, nonceB); + + // Cancel A + vm.prank(address(account)); + policy.cancelProposal(POLICY_ID, address(account), callDataA, nonceA); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // A fails + _expectRevertOnOp(_buildExecutionOp(callDataA, nonceA)); + + // B succeeds + _submitOp(_buildExecutionOp(callDataB, nonceB)); + assertEq(account.value(), 20); + } + + /// @notice Proposals created at different times have different time windows. + /// @dev Uses explicit warp targets to avoid via_ir optimizer caching block.timestamp + /// across vm.warp boundaries (TIMESTAMP is constant within a real EVM transaction, + /// so the optimizer may legally forward the expression). + function testEntryPoint_SequentialProposalsDifferentWindows() public { + bytes memory callDataA = abi.encodeCall(MockTimelockAccount.setValue, (10)); + bytes memory callDataB = abi.encodeCall(MockTimelockAccount.setValue, (20)); + + uint256 nonceA = _getNonce(1); + uint256 nonceB = _getNonce(2); + + // Set a known start time to avoid depending on Foundry default block.timestamp + uint256 T0 = 10_000; + vm.warp(T0); + + // Create A at T0 + _createProposal(callDataA, nonceA); + // A's graceEnd = T0 + DELAY + GRACE_PERIOD = 10000 + 3600 + 1800 = 15400 + // A's validUntil = 15400 + EXPIRATION = 15400 + 86400 = 101800 + + // Warp 1 hour, create B at T0 + 1h + uint256 T1 = T0 + 1 hours; // 13600 + vm.warp(T1); + _createProposal(callDataB, nonceB); + // B's graceEnd = T1 + DELAY + GRACE_PERIOD = 13600 + 3600 + 1800 = 19000 + // B's validUntil = 19000 + EXPIRATION = 19000 + 86400 = 105400 + + // Warp to T0 + DELAY + GRACE_PERIOD + 1 = 15401 + // A's graceEnd (15400) < 15401 → A is executable + // B's graceEnd (19000) > 15401 → B still in grace + vm.warp(T0 + uint256(DELAY) + uint256(GRACE_PERIOD) + 1); + + // A works + _submitOp(_buildExecutionOp(callDataA, nonceA)); + assertEq(account.value(), 10); + + // B still blocked (B's graceEnd = 19000 > 15401) + _expectRevertOnOp(_buildExecutionOp(callDataB, nonceB)); + + // Warp to B's window: T1 + DELAY + GRACE_PERIOD + 1 = 19001 + vm.warp(T1 + uint256(DELAY) + uint256(GRACE_PERIOD) + 1); + _submitOp(_buildExecutionOp(callDataB, nonceB)); + assertEq(account.value(), 20); + } + + // ============ 8. Batch UserOps in Single handleOps ============ + + /// @notice Two creation UserOps can be batched in a single handleOps call. + function testEntryPoint_BatchCreation() public { + bytes memory callDataA = abi.encodeCall(MockTimelockAccount.setValue, (10)); + bytes memory callDataB = abi.encodeCall(MockTimelockAccount.setValue, (20)); + + uint256 nonceA = _getNonce(1); + uint256 nonceB = _getNonce(2); + + PackedUserOperation[] memory ops = new PackedUserOperation[](2); + ops[0] = _buildCreationOp(callDataA, nonceA, _getNonce(0)); + // The second op uses seq=1 for key=0 (after first op increments it) + ops[1] = _buildCreationOp(callDataB, nonceB, _getNonce(0) + 1); + + _submitOps(ops); + + // Both proposals should exist + (TimelockPolicy.ProposalStatus statusA,,,) = + policy.getProposal(address(account), callDataA, nonceA, POLICY_ID, address(account)); + (TimelockPolicy.ProposalStatus statusB,,,) = + policy.getProposal(address(account), callDataB, nonceB, POLICY_ID, address(account)); + assertEq(uint256(statusA), uint256(TimelockPolicy.ProposalStatus.Pending)); + assertEq(uint256(statusB), uint256(TimelockPolicy.ProposalStatus.Pending)); + } + + /// @notice Two execution UserOps can be batched in a single handleOps call. + function testEntryPoint_BatchExecution() public { + bytes memory callDataA = abi.encodeCall(MockTimelockAccount.setValue, (10)); + bytes memory callDataB = abi.encodeCall(MockTimelockAccount.setValue, (20)); + + uint256 nonceA = _getNonce(1); + uint256 nonceB = _getNonce(2); + + _createProposal(callDataA, nonceA); + _createProposal(callDataB, nonceB); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + PackedUserOperation[] memory ops = new PackedUserOperation[](2); + ops[0] = _buildExecutionOp(callDataA, nonceA); + ops[1] = _buildExecutionOp(callDataB, nonceB); + + _submitOps(ops); + + // Last one wins for the value, both should be Executed + assertEq(account.value(), 20); + + (TimelockPolicy.ProposalStatus statusA,,,) = + policy.getProposal(address(account), callDataA, nonceA, POLICY_ID, address(account)); + (TimelockPolicy.ProposalStatus statusB,,,) = + policy.getProposal(address(account), callDataB, nonceB, POLICY_ID, address(account)); + assertEq(uint256(statusA), uint256(TimelockPolicy.ProposalStatus.Executed)); + assertEq(uint256(statusB), uint256(TimelockPolicy.ProposalStatus.Executed)); + } + + // ============ 9. Nonce Key Separation ============ + + /// @notice Using different EntryPoint nonce keys for creation vs execution. + function testEntryPoint_SeparateNonceKeys() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + + // Use key=5 for execution → proposalNonce = getNonce(account, 5) + uint256 proposalNonce = _getNonce(5); + + // Create using key=0 + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, _getNonce(0))); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execute using key=5 (nonce matches proposalNonce) + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 42); + } + + // ============ 10. Multiple Accounts ============ + + /// @notice Two accounts with the same policy can have independent proposals. + function testEntryPoint_TwoAccountsIndependent() public { + // Deploy a second account + MockTimelockAccount account2 = new MockTimelockAccount(entryPoint, policy, POLICY_ID); + vm.deal(address(account2), 10 ether); + vm.prank(address(account2)); + policy.onInstall(abi.encode(POLICY_ID, DELAY, EXPIRATION, GRACE_PERIOD)); + + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce1 = entryPoint.getNonce(address(account), 1); + uint256 proposalNonce2 = entryPoint.getNonce(address(account2), 1); + + // Create proposal for account 1 + _createProposal(proposalCallData, proposalNonce1); + + // Create proposal for account 2 + PackedUserOperation memory op2 = PackedUserOperation({ + sender: address(account2), + nonce: entryPoint.getNonce(address(account2), 0), + initCode: "", + callData: "", + accountGasLimits: bytes32(abi.encodePacked(uint128(500_000), uint128(500_000))), + preVerificationGas: 100_000, + gasFees: bytes32(abi.encodePacked(uint128(1 gwei), uint128(1 gwei))), + paymasterAndData: "", + signature: _proposalSig(proposalCallData, proposalNonce2) + }); + _submitOp(op2); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execute account 1 + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce1)); + assertEq(account.value(), 42); + + // Execute account 2 + PackedUserOperation memory exec2 = PackedUserOperation({ + sender: address(account2), + nonce: proposalNonce2, + initCode: "", + callData: proposalCallData, + accountGasLimits: bytes32(abi.encodePacked(uint128(500_000), uint128(500_000))), + preVerificationGas: 100_000, + gasFees: bytes32(abi.encodePacked(uint128(1 gwei), uint128(1 gwei))), + paymasterAndData: "", + signature: "" + }); + _submitOp(exec2); + assertEq(account2.value(), 42); + } + + // ============ 11. Edge-Case Calldata ============ + + /// @notice Proposal with empty proposalCallData (legitimate: could be a "send ETH" tx). + function testEntryPoint_EmptyProposalCallData() public { + bytes memory proposalCallData = ""; + uint256 proposalNonce = _getNonce(1); + + // Proposal creation with empty calldata inside signature + // sig = [len=0 (32 bytes)] + [nonce (32 bytes)] + [0x00 (1 byte)] = 65 bytes total ✓ + _createProposal(proposalCallData, proposalNonce); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + } + + /// @notice Proposal with large calldata. + function testEntryPoint_LargeProposalCallData() public { + // Build a large calldata (256 bytes of arbitrary data after the selector) + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (12345)); + // Pad to make it larger + bytes memory largeCallData = abi.encodePacked(proposalCallData, new bytes(256)); + + uint256 proposalNonce = _getNonce(1); + + _createProposal(largeCallData, proposalNonce); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), largeCallData, proposalNonce, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + } + + // ============ 12. Events ============ + + /// @notice ProposalCreated event is emitted during creation through EntryPoint. + function testEntryPoint_ProposalCreatedEvent() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = _getNonce(1); + + bytes32 expectedKey = policy.computeUserOpKey(address(account), proposalCallData, proposalNonce); + uint256 expectedValidAfter = block.timestamp + DELAY; + uint256 expectedValidUntil = block.timestamp + DELAY + GRACE_PERIOD + EXPIRATION; + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.ProposalCreated( + address(account), POLICY_ID, expectedKey, expectedValidAfter, expectedValidUntil + ); + + _submitOp(_buildCreationOp(proposalCallData, proposalNonce, _getNonce(0))); + } + + /// @notice ProposalExecuted event is emitted during execution through EntryPoint. + function testEntryPoint_ProposalExecutedEvent() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = _getNonce(1); + + _createProposal(proposalCallData, proposalNonce); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + bytes32 expectedKey = policy.computeUserOpKey(address(account), proposalCallData, proposalNonce); + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.ProposalExecuted(address(account), POLICY_ID, expectedKey); + + _submitOp(_buildExecutionOp(proposalCallData, proposalNonce)); + } + + // ============ 13. EntryPoint Nonce Accounting ============ + + /// @notice EntryPoint nonce advances correctly across multiple operations. + function testEntryPoint_NonceAccounting() public { + assertEq(_getNonce(0), 0); + + bytes memory cd = abi.encodeCall(MockTimelockAccount.setValue, (1)); + uint256 pNonce = _getNonce(1); + + // Op 1: creation + _submitOp(_buildCreationOp(cd, pNonce, 0)); + assertEq(_getNonce(0), 1); + + // Op 2: another creation with different proposal nonce + bytes memory cd2 = abi.encodeCall(MockTimelockAccount.setValue, (2)); + uint256 pNonce2 = _getNonce(2); + _submitOp(_buildCreationOp(cd2, pNonce2, 1)); + assertEq(_getNonce(0), 2); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Op 3: execution of first proposal (key=1) + _submitOp(_buildExecutionOp(cd, pNonce)); + assertEq(_getNonce(1), pNonce + 1); + } + + /// @notice Reverted handleOps does NOT advance the EntryPoint nonce. + function testEntryPoint_RevertedOpDoesNotAdvanceNonce() public { + uint256 nonceBefore = _getNonce(0); + + // Try execution without proposal → revert + _expectRevertOnOp(_buildExecutionOp(abi.encodeCall(MockTimelockAccount.setValue, (1)), 0)); + + // Nonce unchanged + assertEq(_getNonce(0), nonceBefore); + } + + // ============ 14. Gas / Balance Tests ============ + + /// @notice Account pays gas to EntryPoint from its balance. + function testEntryPoint_AccountPaysGas() public { + uint256 balBefore = address(account).balance; + + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + _submitOp(_buildCreationOp(proposalCallData, _getNonce(1), _getNonce(0))); + + // Account balance should have decreased (gas was paid) + assertTrue(address(account).balance < balBefore); + } + + /// @notice Beneficiary receives collected gas fees. + function testEntryPoint_BeneficiaryReceivesFees() public { + uint256 balBefore = BENEFICIARY.balance; + + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + _submitOp(_buildCreationOp(proposalCallData, _getNonce(1), _getNonce(0))); + + // Beneficiary should have received fees + assertTrue(BENEFICIARY.balance > balBefore); + } + + // ============ 15. Full Grace Period Race-Condition Scenario ============ + + /// @notice Simulate the race condition the grace period is designed to prevent: + /// 1. Session key creates proposal + /// 2. Delay passes, session key submits execution + /// 3. Owner sees it and cancels during grace period + /// 4. Execution fails because EntryPoint rejects (validAfter = graceEnd) + function testEntryPoint_GracePeriodRaceCondition() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (999)); + uint256 proposalNonce = _getNonce(1); + + // Step 1: Session key creates proposal + _createProposal(proposalCallData, proposalNonce); + + // Step 2: Warp to delay + 1 second (within grace period) + vm.warp(block.timestamp + DELAY + 1); + + // Step 3: Session key tries to execute but EntryPoint blocks it + // (validAfter = graceEnd which is in the future) + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + + // Step 4: Owner cancels during grace period + vm.prank(address(account)); + policy.cancelProposal(POLICY_ID, address(account), proposalCallData, proposalNonce); + + // Step 5: Even after grace period, execution fails (cancelled) + vm.warp(block.timestamp + GRACE_PERIOD + 1); + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + assertEq(account.value(), 0); + } + + // ============ 16. Policy Not Installed ============ + + /// @notice Operations on an account with uninstalled policy fail. + function testEntryPoint_UninstalledPolicyRevertsAll() public { + // Uninstall + vm.prank(address(account)); + policy.onUninstall(abi.encode(POLICY_ID, "")); + + // Creation fails + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + _expectRevertOnOp(_buildCreationOp(proposalCallData, 100, _getNonce(0))); + } + + // ============ 17. EntryPoint Deposit Tests ============ + + /// @notice Account can prefund via EntryPoint deposit, reducing per-op gas drain. + function testEntryPoint_DepositThenOperate() public { + // Deposit into EntryPoint on behalf of account + entryPoint.depositTo{value: 1 ether}(address(account)); + + uint256 balBefore = address(account).balance; + + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + _submitOp(_buildCreationOp(proposalCallData, _getNonce(1), _getNonce(0))); + + // Account's direct balance should not have decreased because deposit covers gas + assertEq(address(account).balance, balBefore); + } + + // ============ 18. Create-Cancel-Recreate Cycle ============ + + /// @notice After cancellation, a new proposal with different nonce for the same calldata works. + function testEntryPoint_CreateCancelRecreateWithDifferentNonce() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 nonce1 = _getNonce(1); + + // Create + _createProposal(proposalCallData, nonce1); + + // Cancel + vm.prank(address(account)); + policy.cancelProposal(POLICY_ID, address(account), proposalCallData, nonce1); + + // Recreate with different nonce + uint256 nonce2 = _getNonce(2); + _createProposal(proposalCallData, nonce2); + + (TimelockPolicy.ProposalStatus status,,,) = + policy.getProposal(address(account), proposalCallData, nonce2, POLICY_ID, address(account)); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + + // Execute the new proposal + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + _submitOp(_buildExecutionOp(proposalCallData, nonce2)); + assertEq(account.value(), 42); + } + + // ============ 19. Exact Boundary: Delay Not Passed ============ + + /// @notice At exactly delay (no grace period overlap), execution is still blocked. + function testEntryPoint_AtExactDelayStillBlocked() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + uint256 proposalNonce = _getNonce(1); + + uint256 t0 = block.timestamp; + _createProposal(proposalCallData, proposalNonce); + + // At exactly validAfter (= t0 + DELAY): this is start of grace period, not end + // graceEnd = t0 + DELAY + GRACE_PERIOD, so block.timestamp <= graceEnd + vm.warp(t0 + DELAY); + _expectRevertOnOp(_buildExecutionOp(proposalCallData, proposalNonce)); + } + + // ============ 20. Same Calldata Different Nonces ============ + + /// @notice Same callData can be proposed with different nonces independently. + function testEntryPoint_SameCallDataDifferentNonces() public { + bytes memory proposalCallData = abi.encodeCall(MockTimelockAccount.setValue, (42)); + + uint256 nonceA = _getNonce(1); + uint256 nonceB = _getNonce(2); + + _createProposal(proposalCallData, nonceA); + _createProposal(proposalCallData, nonceB); + + // Both exist + (TimelockPolicy.ProposalStatus statusA,,,) = + policy.getProposal(address(account), proposalCallData, nonceA, POLICY_ID, address(account)); + (TimelockPolicy.ProposalStatus statusB,,,) = + policy.getProposal(address(account), proposalCallData, nonceB, POLICY_ID, address(account)); + assertEq(uint256(statusA), uint256(TimelockPolicy.ProposalStatus.Pending)); + assertEq(uint256(statusB), uint256(TimelockPolicy.ProposalStatus.Pending)); + + vm.warp(block.timestamp + DELAY + GRACE_PERIOD + 1); + + // Execute A, cancel B + _submitOp(_buildExecutionOp(proposalCallData, nonceA)); + assertEq(account.value(), 42); + + vm.prank(address(account)); + policy.cancelProposal(POLICY_ID, address(account), proposalCallData, nonceB); + + (statusA,,,) = policy.getProposal(address(account), proposalCallData, nonceA, POLICY_ID, address(account)); + (statusB,,,) = policy.getProposal(address(account), proposalCallData, nonceB, POLICY_ID, address(account)); + assertEq(uint256(statusA), uint256(TimelockPolicy.ProposalStatus.Executed)); + assertEq(uint256(statusB), uint256(TimelockPolicy.ProposalStatus.Cancelled)); + } +} diff --git a/test/utils/MockTimelockAccount.sol b/test/utils/MockTimelockAccount.sol new file mode 100644 index 0000000..ba17609 --- /dev/null +++ b/test/utils/MockTimelockAccount.sol @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.0; + +import {IAccount} from "account-abstraction/interfaces/IAccount.sol"; +import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol"; +import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol"; +import {TimelockPolicy} from "../../src/policies/TimelockPolicy.sol"; + +/// @title MockTimelockAccount +/// @notice Minimal IAccount that delegates validation to TimelockPolicy. +/// Used for integration testing with the real EntryPoint. +contract MockTimelockAccount is IAccount { + IEntryPoint public immutable entryPoint; + TimelockPolicy public immutable policy; + bytes32 public immutable policyId; + + uint256 public value; + + constructor(IEntryPoint _entryPoint, TimelockPolicy _policy, bytes32 _policyId) { + entryPoint = _entryPoint; + policy = _policy; + policyId = _policyId; + } + + function validateUserOp(PackedUserOperation calldata userOp, bytes32, uint256 missingAccountFunds) + external + returns (uint256 validationData) + { + require(msg.sender == address(entryPoint), "only entrypoint"); + + if (missingAccountFunds > 0) { + (bool ok,) = payable(msg.sender).call{value: missingAccountFunds}(""); + require(ok); + } + + return policy.checkUserOpPolicy(policyId, userOp); + } + + function setValue(uint256 _value) external { + value = _value; + } + + receive() external payable {} +}