From 17f78f7874ed650b575e952c6fe5634aab668e2d Mon Sep 17 00:00:00 2001 From: taek Date: Mon, 9 Feb 2026 13:18:03 +0900 Subject: [PATCH 1/7] fix(TimelockPolicy): make permissionless proposals inert until session key approval --- src/policies/TimelockPolicy.sol | 78 +++++---- test/TimelockPolicy.t.sol | 57 +++++-- test/btt/Timelock.t.sol | 226 ++++++++++++++++++++----- test/btt/TimelockEpochValidation.t.sol | 66 ++++++-- 4 files changed, 329 insertions(+), 98 deletions(-) diff --git a/src/policies/TimelockPolicy.sol b/src/policies/TimelockPolicy.sol index f1340ca..7fdf64d 100644 --- a/src/policies/TimelockPolicy.sol +++ b/src/policies/TimelockPolicy.sol @@ -21,7 +21,8 @@ import { contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorWithSender { enum ProposalStatus { None, // Proposal doesn't exist - Pending, // Proposal created, waiting for timelock + Proposed, // Proposal created but not yet approved (inert, no clock) + Pending, // Proposal approved, clock started, waiting for timelock Executed, // Proposal executed Cancelled // Proposal cancelled } @@ -53,6 +54,10 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash, uint256 validAfter, uint256 validUntil ); + event ProposalApproved( + address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash, uint256 validAfter, uint256 validUntil + ); + event ProposalExecuted(address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash); event ProposalCancelled(address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash); @@ -119,7 +124,9 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW /** * @notice Create a proposal for time-delayed execution - * @dev Anyone can create a proposal - the timelock delay provides the security + * @dev Anyone can create a proposal. The proposal is inert until approved by the + * session key holder via a no-op UserOp. The timelock clock does not start + * until approval, so spam proposals can be safely ignored. * @param id The policy ID * @param account The account address * @param callData The calldata for the future operation @@ -129,10 +136,6 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW 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)); @@ -141,11 +144,11 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW revert ProposalAlreadyExists(); } - // Create proposal (stored by userOpKey) with current epoch + // Create INERT proposal — clock does NOT start until approved via UserOp proposals[userOpKey][id][account] = - Proposal({status: ProposalStatus.Pending, validAfter: validAfter, validUntil: validUntil, epoch: currentEpoch[id][account]}); + Proposal({status: ProposalStatus.Proposed, validAfter: 0, validUntil: 0, epoch: currentEpoch[id][account]}); - emit ProposalCreated(account, id, userOpKey, validAfter, validUntil); + emit ProposalCreated(account, id, userOpKey, 0, 0); } /** @@ -167,7 +170,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW bytes32 userOpKey = keccak256(abi.encode(account, keccak256(callData), nonce)); Proposal storage proposal = proposals[userOpKey][id][account]; - if (proposal.status != ProposalStatus.Pending) { + if (proposal.status != ProposalStatus.Pending && proposal.status != ProposalStatus.Proposed) { revert ProposalNotPending(); } @@ -197,10 +200,13 @@ 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 approval (or create+approve) from userOp + * @dev Called when the session key holder submits a no-op UserOp. + * If a matching inert proposal exists (Proposed status), approves it and starts the clock. + * If no proposal exists, creates and approves in one step. + * Signature format: [callDataLength(32)][callData][nonce(32)][remaining sig data] */ - function _handleProposalCreationInternal( + function _handleProposalApprovalInternal( bytes32 id, PackedUserOperation calldata userOp, TimelockConfig storage config, @@ -217,27 +223,40 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW bytes calldata proposalCallData = sig[32:32 + callDataLength]; uint256 proposalNonce = uint256(bytes32(sig[32 + callDataLength:64 + callDataLength])); - // Calculate proposal timing + // Calculate proposal timing (clock starts NOW) uint48 validAfter = uint48(block.timestamp) + config.delay; uint48 validUntil = validAfter + 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 - } - - // Create proposal with current epoch - proposals[userOpKey][id][account] = - Proposal({status: ProposalStatus.Pending, validAfter: validAfter, validUntil: validUntil, epoch: currentEpoch[id][account]}); - - emit ProposalCreated(account, id, userOpKey, validAfter, validUntil); + Proposal storage proposal = proposals[userOpKey][id][account]; - // Return success (validationData = 0) to allow the proposal creation to persist - // EntryPoint treats validationData == 0 as valid (no time range check) - return _packValidationData(0, 0); + if (proposal.status == ProposalStatus.Proposed) { + // Approve existing inert proposal — start the clock + if (proposal.epoch != currentEpoch[id][account]) return SIG_VALIDATION_FAILED_UINT; + + proposal.status = ProposalStatus.Pending; + proposal.validAfter = validAfter; + proposal.validUntil = validUntil; + + emit ProposalApproved(account, id, userOpKey, validAfter, validUntil); + return _packValidationData(0, 0); + } else if (proposal.status == ProposalStatus.None) { + // Create + approve in one step (session key holder creating directly) + proposals[userOpKey][id][account] = Proposal({ + status: ProposalStatus.Pending, + validAfter: validAfter, + validUntil: validUntil, + epoch: currentEpoch[id][account] + }); + + emit ProposalCreated(account, id, userOpKey, validAfter, validUntil); + return _packValidationData(0, 0); + } else { + // Proposal exists in wrong state (Pending, Executed, Cancelled) + return SIG_VALIDATION_FAILED_UINT; + } } /** @@ -414,11 +433,10 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW TimelockConfig storage config = timelockConfig[id][account]; if (!config.initialized) return SIG_VALIDATION_FAILED_UINT; - // Check if this is a proposal creation request + // Check if this is a proposal approval (or create+approve) 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); + return _handleProposalApprovalInternal(id, userOp, config, sig, account); } // Otherwise, this is a proposal execution request diff --git a/test/TimelockPolicy.t.sol b/test/TimelockPolicy.t.sol index 2df90c2..71423c5 100644 --- a/test/TimelockPolicy.t.sol +++ b/test/TimelockPolicy.t.sol @@ -173,11 +173,30 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State PackedUserOperation memory userOp = validUserOp(); - // First create a proposal + // First create a proposal (inert) vm.startPrank(WALLET); policyModule.createProposal(policyId(), WALLET, userOp.callData, userOp.nonce); vm.stopPrank(); + // Approve the proposal via no-op UserOp (starts the clock) + bytes memory sig = abi.encodePacked( + bytes32(userOp.callData.length), userOp.callData, bytes32(userOp.nonce), bytes1(0x00) + ); + PackedUserOperation memory approveOp = 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(), approveOp); + vm.stopPrank(); + // Fast forward past the delay vm.warp(block.timestamp + delay + 1); @@ -251,13 +270,13 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State policyModule.createProposal(policyId(), WALLET, callData, nonce); vm.stopPrank(); - // Verify proposal was created + // Verify proposal was created as inert (Proposed) (TimelockPolicy.ProposalStatus status, uint256 validAfter, 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(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed)); + assertEq(validAfter, 0); + assertEq(validUntil, 0); } function testCancelProposal() public { @@ -291,7 +310,7 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State policyModule.onInstall(abi.encodePacked(policyId(), installData())); vm.stopPrank(); - // Create a proposal via checkUserOpPolicy with no-op calldata + // Create+approve a proposal via checkUserOpPolicy with no-op calldata bytes memory proposalCallData = hex"1234"; uint256 proposalNonce = 1; @@ -318,11 +337,10 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State uint256 result = policyModule.checkUserOpPolicy(policyId(), userOp); vm.stopPrank(); - // Returns success (validationData = 0) - valid indefinitely per ERC-4337 - // This allows proposal creation via UserOp without external caller + // Returns success (validationData = 0) for state persistence assertEq(result, 0); - // Verify proposal was created + // Verify proposal was created+approved (Pending with timing) (TimelockPolicy.ProposalStatus status,,) = policyModule.getProposal(WALLET, proposalCallData, proposalNonce, policyId(), WALLET); @@ -338,11 +356,30 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State PackedUserOperation memory userOp = validUserOp(); - // Create a proposal + // Create and approve a proposal vm.startPrank(WALLET); policyModule.createProposal(policyId(), WALLET, userOp.callData, userOp.nonce); vm.stopPrank(); + // Approve via no-op UserOp + bytes memory sig = abi.encodePacked( + bytes32(userOp.callData.length), userOp.callData, bytes32(userOp.nonce), bytes1(0x00) + ); + PackedUserOperation memory approveOp = 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(), approveOp); + vm.stopPrank(); + // Fast forward past delay vm.warp(block.timestamp + delay + 1); diff --git a/test/btt/Timelock.t.sol b/test/btt/Timelock.t.sol index 04ec804..f48f842 100644 --- a/test/btt/Timelock.t.sol +++ b/test/btt/Timelock.t.sol @@ -199,28 +199,25 @@ contract TimelockTest is Test { } function test_GivenConfigIsInitializedAndProposalDoesNotExist() external whenCallingCreateProposal { - // it should store the proposal with pending status - // it should set correct validAfter and validUntil - // it should emit ProposalCreated + // it should store the proposal with Proposed (inert) status + // it should NOT set timing (validAfter = 0, validUntil = 0) + // it should emit ProposalCreated with zero timing bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 100; - uint256 createTime = block.timestamp; bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(callData), nonce)); vm.expectEmit(true, true, true, true); - emit TimelockPolicy.ProposalCreated( - WALLET, POLICY_ID, expectedKey, uint48(createTime) + DELAY, uint48(createTime) + DELAY + EXPIRATION - ); + emit TimelockPolicy.ProposalCreated(WALLET, POLICY_ID, expectedKey, 0, 0); timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 validUntil) = timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Status should be Pending"); - assertEq(validAfter, createTime + DELAY, "validAfter should be timestamp + delay"); - assertEq(validUntil, createTime + DELAY + EXPIRATION, "validUntil should be validAfter + expiration"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Status should be Proposed"); + assertEq(validAfter, 0, "validAfter should be 0 (inert)"); + assertEq(validUntil, 0, "validUntil should be 0 (inert)"); } function test_GivenNotInitialized_WhenCallingCreateProposal() external whenCallingCreateProposal { @@ -249,8 +246,8 @@ contract TimelockTest is Test { _; } - function test_GivenCallerIsAccountAndProposalIsPending() external whenCallingCancelProposal { - // it should set status to cancelled + function test_GivenCallerIsAccountAndProposalIsProposed() external whenCallingCancelProposal { + // it should set status to cancelled (cancelling an inert Proposed proposal) // it should emit ProposalCancelled bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 300; @@ -270,6 +267,31 @@ contract TimelockTest is Test { assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Cancelled), "Status should be Cancelled"); } + function test_GivenCallerIsAccountAndProposalIsPending() external whenCallingCancelProposal { + // it should set status to cancelled (cancelling an approved Pending proposal) + // it should emit ProposalCancelled + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 301; + + // Create and approve via 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"); @@ -324,9 +346,9 @@ contract TimelockTest is Test { } function test_GivenNoopCalldataAndValidSignature() external whenCallingCheckUserOpPolicyToCreateProposal { - // it should create the proposal + // it should create+approve the proposal in one step (no prior external proposal) // it should return zero for state persistence - // it should emit ProposalCreated + // 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); @@ -352,7 +374,7 @@ contract TimelockTest is Test { (TimelockPolicy.ProposalStatus status,,) = timelockPolicy.getProposal(WALLET, proposalCallData, proposalNonce, POLICY_ID, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be created"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be Pending (created+approved)"); } function test_GivenNoopCalldataAndSignatureShorterThan65Bytes() @@ -388,23 +410,23 @@ contract TimelockTest is Test { assertEq(result, SIG_VALIDATION_FAILED, "Should fail when signature claims more data than available"); } - function test_GivenNoopCalldataAndProposalAlreadyExists() external whenCallingCheckUserOpPolicyToCreateProposal { - // it should return SIG_VALIDATION_FAILED + 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 creation should succeed + // First call: create+approve → Pending vm.prank(WALLET); timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - // Second creation should fail + // Second call: already Pending → should fail vm.prank(WALLET); uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - assertEq(result, SIG_VALIDATION_FAILED, "Should fail for duplicate proposal"); + assertEq(result, SIG_VALIDATION_FAILED, "Should fail for already Pending proposal"); } // ============ checkUserOpPolicy - Proposal Execution Tests ============ @@ -420,10 +442,16 @@ contract TimelockTest is Test { bytes memory proposalCallData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "action"); uint256 proposalNonce = 900; - uint256 createTime = block.timestamp; + // Create inert proposal timelockPolicy.createProposal(POLICY_ID, WALLET, proposalCallData, proposalNonce); - // Get the actual stored proposal values + // Approve the proposal via no-op UserOp (starts the clock) + bytes memory sig = _createProposalSignature(proposalCallData, proposalNonce); + PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + + // Get the actual stored proposal values (now has timing) (, uint256 storedValidAfter, uint256 storedValidUntil) = timelockPolicy.getProposal(WALLET, proposalCallData, proposalNonce, POLICY_ID, WALLET); @@ -484,7 +512,11 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 1100; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // Create and approve via UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); vm.warp(block.timestamp + DELAY + 1); @@ -616,15 +648,14 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 1200; - uint256 createTime = block.timestamp; timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 validUntil) = timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Status should be Pending"); - assertEq(validAfter, createTime + DELAY, "validAfter should be correct"); - assertEq(validUntil, createTime + DELAY + EXPIRATION, "validUntil should be correct"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Status should be Proposed"); + assertEq(validAfter, 0, "validAfter should be 0 (inert)"); + assertEq(validUntil, 0, "validUntil should be 0 (inert)"); } function test_GivenProposalDoesNotExist_WhenCallingGetProposal() external whenCallingGetProposal { @@ -923,11 +954,15 @@ contract TimelockTest is Test { function test_WhenPackingValidationData() external { // it should correctly pack validAfter and validUntil - // Test the packing by creating a proposal and checking the returned validation data + // Test the packing by creating+approving a proposal and checking the returned validation data bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 1400; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // Create and approve via UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); // Get the actual stored proposal values (, uint256 storedValidAfter, uint256 storedValidUntil) = @@ -964,24 +999,20 @@ contract TimelockTest is Test { assertEq(result, SIG_VALIDATION_FAILED, "Attack without proposal should fail"); } - function test_GivenAttackerTriesToExecuteImmediatelyAfterCreation() external whenTestingSecurityScenarios { - // it should return packed data with future validAfter + function test_GivenAttackerTriesToExecuteUnapprovedProposal() external whenTestingSecurityScenarios { + // it should return SIG_VALIDATION_FAILED because proposal is inert (Proposed, not Pending) bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "action"); uint256 nonce = 1500; - uint256 createTime = block.timestamp; timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - // Try to execute immediately (before timelock) + // Try to execute without approval PackedUserOperation memory executeOp = _createUserOpWithCalldata(WALLET, callData, nonce, ""); vm.prank(WALLET); uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, executeOp); - // Extract validAfter - it should be in the future - uint48 validAfter = uint48(result >> 208); - assertGt(validAfter, block.timestamp, "validAfter should be in the future"); - assertEq(validAfter, uint48(createTime) + DELAY, "validAfter should be createTime + DELAY"); + assertEq(result, SIG_VALIDATION_FAILED, "Unapproved proposal should fail execution"); } function test_GivenAttackerTriesToReexecuteAUsedProposal() external whenTestingSecurityScenarios { @@ -989,7 +1020,11 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "action"); uint256 nonce = 1600; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // Create and approve via UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); vm.warp(block.timestamp + DELAY + 1); @@ -1034,6 +1069,117 @@ contract TimelockTest is Test { assertGt(validUntil, validAfter, "validUntil should be after validAfter"); } + // ============ Proposal Approval Tests ============ + + modifier whenCallingCheckUserOpPolicyToApproveProposal() { + _; + } + + function test_ApproveExistingProposal() external whenCallingCheckUserOpPolicyToApproveProposal { + // it should transition Proposed → Pending and start the clock + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "approve_test"); + uint256 nonce = 2000; + + // Create inert proposal externally + timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + + // Verify it's Proposed with no timing + (TimelockPolicy.ProposalStatus statusBefore, uint256 vaBefore, uint256 vuBefore) = + timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); + assertEq(uint256(statusBefore), uint256(TimelockPolicy.ProposalStatus.Proposed), "Should be Proposed"); + assertEq(vaBefore, 0, "validAfter should be 0 before approval"); + assertEq(vuBefore, 0, "validUntil should be 0 before approval"); + + // Approve via no-op UserOp + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + + bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(callData), nonce)); + uint48 expectedValidAfter = uint48(block.timestamp) + DELAY; + uint48 expectedValidUntil = expectedValidAfter + EXPIRATION; + + vm.expectEmit(true, true, true, true); + emit TimelockPolicy.ProposalApproved(WALLET, POLICY_ID, expectedKey, expectedValidAfter, expectedValidUntil); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + + assertEq(result, 0, "Approval should return 0 for state persistence"); + + // Verify it's now Pending with timing set + (TimelockPolicy.ProposalStatus statusAfter, uint256 vaAfter, uint256 vuAfter) = + timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); + assertEq(uint256(statusAfter), uint256(TimelockPolicy.ProposalStatus.Pending), "Should be Pending after approval"); + assertEq(vaAfter, expectedValidAfter, "validAfter should be set"); + assertEq(vuAfter, expectedValidUntil, "validUntil should be set"); + } + + function test_CannotApproveAlreadyPendingProposal() external whenCallingCheckUserOpPolicyToApproveProposal { + // it should return SIG_VALIDATION_FAILED + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 2100; + + // Create and approve in one step + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + + // Try to approve again + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail for already Pending proposal"); + } + + function test_CannotApproveCancelledProposal() external whenCallingCheckUserOpPolicyToApproveProposal { + // it should return SIG_VALIDATION_FAILED + bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); + uint256 nonce = 2200; + + // Create and cancel + timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + vm.prank(WALLET); + timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); + + // Try to approve + bytes memory sig = _createProposalSignature(callData, nonce); + PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Should fail for cancelled proposal"); + } + + function test_SpamProposalsAreInert() external whenTestingSecurityScenarios { + // it should demonstrate that spam proposals cannot be executed without approval + bytes memory callData1 = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "approve_usdc"); + bytes memory callData2 = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "approve_weth"); + bytes memory callData3 = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "transfer_all"); + + // Attacker creates many proposals + vm.startPrank(ATTACKER); + timelockPolicy.createProposal(POLICY_ID, WALLET, callData1, 0); + timelockPolicy.createProposal(POLICY_ID, WALLET, callData2, 0); + timelockPolicy.createProposal(POLICY_ID, WALLET, callData3, 0); + vm.stopPrank(); + + // Wait past timelock + vm.warp(block.timestamp + DELAY + 1); + + // None can be executed because they're all in Proposed (inert) status + PackedUserOperation memory op1 = _createUserOpWithCalldata(WALLET, callData1, 0, ""); + PackedUserOperation memory op2 = _createUserOpWithCalldata(WALLET, callData2, 0, ""); + PackedUserOperation memory op3 = _createUserOpWithCalldata(WALLET, callData3, 0, ""); + + vm.prank(WALLET); + assertEq(timelockPolicy.checkUserOpPolicy(POLICY_ID, op1), SIG_VALIDATION_FAILED, "Spam proposal 1 should fail"); + vm.prank(WALLET); + assertEq(timelockPolicy.checkUserOpPolicy(POLICY_ID, op2), SIG_VALIDATION_FAILED, "Spam proposal 2 should fail"); + vm.prank(WALLET); + assertEq(timelockPolicy.checkUserOpPolicy(POLICY_ID, op3), SIG_VALIDATION_FAILED, "Spam proposal 3 should fail"); + } + function test_GivenAttackerTriesToCancelAnotherAccountsProposal() external whenTestingSecurityScenarios { // it should revert with OnlyAccount bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); @@ -1045,9 +1191,9 @@ contract TimelockTest is Test { vm.expectRevert(TimelockPolicy.OnlyAccount.selector); timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); - // Verify proposal is still pending + // Verify proposal is still Proposed (inert) (TimelockPolicy.ProposalStatus status,,) = timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should still be pending"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Proposal should still be Proposed"); } } diff --git a/test/btt/TimelockEpochValidation.t.sol b/test/btt/TimelockEpochValidation.t.sol index 6abe651..9e28484 100644 --- a/test/btt/TimelockEpochValidation.t.sol +++ b/test/btt/TimelockEpochValidation.t.sol @@ -66,6 +66,23 @@ contract TimelockEpochValidationTest is Test { }); } + function _approveProposal(address wallet, bytes32 policyId, 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); + } + // ==================== Installing the Policy ==================== modifier whenInstallingThePolicy() { @@ -150,7 +167,7 @@ contract TimelockEpochValidationTest is Test { _createProposal(WALLET, POLICY_ID_1, callData, nonce); // it should store the current epoch in the proposal - // it should use the epoch from currentEpoch mapping + // it should be in Proposed (inert) status with no timing bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); ( TimelockPolicy.ProposalStatus status, @@ -159,10 +176,10 @@ contract TimelockEpochValidationTest is Test { uint256 proposalEpoch ) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be pending"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Proposal should be Proposed (inert)"); assertEq(proposalEpoch, 1, "Proposal epoch should match current epoch (1)"); - assertEq(validAfter, block.timestamp + DELAY, "validAfter should be correct"); - assertEq(validUntil, block.timestamp + DELAY + EXPIRATION_PERIOD, "validUntil should be correct"); + assertEq(validAfter, 0, "validAfter should be 0 (inert)"); + assertEq(validUntil, 0, "validUntil should be 0 (inert)"); } function test_GivenCreatingViaCreateProposalFunction() external whenCreatingAProposal { @@ -171,15 +188,16 @@ contract TimelockEpochValidationTest is Test { bytes memory callData = hex"5678"; uint256 nonce = 42; - uint256 currentEpoch = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); + uint256 epoch = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); _createProposal(WALLET, POLICY_ID_1, callData, nonce); - // it should record the epoch at creation time + // it should record the epoch at creation time (proposal is inert) bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); - (,,, uint256 proposalEpoch) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); + (TimelockPolicy.ProposalStatus status,,, uint256 proposalEpoch) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); - assertEq(proposalEpoch, currentEpoch, "Proposal epoch should equal current epoch at creation"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Should be Proposed"); + assertEq(proposalEpoch, epoch, "Proposal epoch should equal current epoch at creation"); } // ==================== Executing a Proposal ==================== @@ -204,6 +222,9 @@ contract TimelockEpochValidationTest is Test { _createProposal(WALLET, POLICY_ID_1, callData, nonce); + // Approve the proposal (starts the clock) + _approveProposal(WALLET, POLICY_ID_1, callData, nonce); + // Warp past the timelock delay vm.warp(block.timestamp + DELAY + 1); @@ -227,9 +248,12 @@ contract TimelockEpochValidationTest is Test { bytes memory callData = hex"1234"; uint256 nonce = 1; - // Create proposal in epoch 1 + // Create proposal in epoch 1 (inert) _createProposal(WALLET, POLICY_ID_1, callData, nonce); + // Approve the proposal (starts the clock, epoch 1) + _approveProposal(WALLET, POLICY_ID_1, callData, nonce); + // Warp past the timelock delay vm.warp(block.timestamp + DELAY + 1); @@ -246,10 +270,10 @@ contract TimelockEpochValidationTest is Test { // it should return SIG_VALIDATION_FAILED assertEq(validationResult, SIG_VALIDATION_FAILED_UINT, "Stale proposal should fail validation"); - // it should not mark proposal as executed + // 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"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should still be Pending"); } function test_GivenTheProposalEpochDoesNotMatchCurrentEpoch() external whenExecutingAProposal { @@ -258,8 +282,9 @@ contract TimelockEpochValidationTest is Test { bytes memory callData = hex"abcd"; uint256 nonce = 5; - // Create proposal in epoch 1 + // Create and approve proposal in epoch 1 _createProposal(WALLET, POLICY_ID_1, callData, nonce); + _approveProposal(WALLET, POLICY_ID_1, callData, nonce); bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); (,,, uint256 proposalEpoch) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); @@ -288,7 +313,7 @@ contract TimelockEpochValidationTest is Test { assertEq( uint256(statusAfter), uint256(TimelockPolicy.ProposalStatus.Pending), - "Proposal status should remain pending" + "Proposal status should remain Pending" ); } @@ -338,7 +363,9 @@ contract TimelockEpochValidationTest is Test { bytes memory callData = hex"1234"; uint256 nonce = 1; + // Create and approve in epoch 1 _createProposal(WALLET, POLICY_ID_1, callData, nonce); + _approveProposal(WALLET, POLICY_ID_1, callData, nonce); uint256 epochBeforeUninstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); @@ -359,7 +386,7 @@ contract TimelockEpochValidationTest is Test { 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 + // it should allow new proposals with new epoch (Proposed status) bytes memory newCallData = hex"5678"; uint256 newNonce = 2; @@ -369,7 +396,7 @@ contract TimelockEpochValidationTest is Test { (TimelockPolicy.ProposalStatus status,,, uint256 newProposalEpoch) = timelockPolicy.proposals(newUserOpKey, POLICY_ID_1, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "New proposal should be created"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "New proposal should be Proposed"); assertEq(newProposalEpoch, epochAfterReinstall, "New proposal should have current epoch"); } @@ -468,10 +495,11 @@ contract TimelockEpochValidationTest is Test { _uninstallPolicy(WALLET, POLICY_ID_1); _installPolicy(WALLET, POLICY_ID_1); - // User creates legitimate proposal with new epoch + // User creates and approves legitimate proposal with new epoch bytes memory callData = hex"abcd"; uint256 userNonce = 200; _createProposal(WALLET, POLICY_ID_1, callData, userNonce); + _approveProposal(WALLET, POLICY_ID_1, callData, userNonce); vm.warp(block.timestamp + DELAY + 1); @@ -489,12 +517,14 @@ contract TimelockEpochValidationTest is Test { _installPolicy(WALLET, POLICY_ID_1); _installPolicy(WALLET2, POLICY_ID_1); - // Both users create proposals + // Both users create and approve proposals bytes memory callData1 = hex"1111"; bytes memory callData2 = hex"2222"; _createProposal(WALLET, POLICY_ID_1, callData1, 1); + _approveProposal(WALLET, POLICY_ID_1, callData1, 1); _createProposal(WALLET2, POLICY_ID_1, callData2, 1); + _approveProposal(WALLET2, POLICY_ID_1, callData2, 1); vm.warp(block.timestamp + DELAY + 1); @@ -506,7 +536,7 @@ contract TimelockEpochValidationTest is Test { 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 + // 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); From 4b66879afc6f79b1c7c7c84934895dd2e737415a Mon Sep 17 00:00:00 2001 From: taek Date: Mon, 9 Feb 2026 13:19:49 +0900 Subject: [PATCH 2/7] feat(TimelockPolicy): add proposer to ProposalCreated event --- src/policies/TimelockPolicy.sol | 6 +++--- test/btt/Timelock.t.sol | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/policies/TimelockPolicy.sol b/src/policies/TimelockPolicy.sol index 7fdf64d..d261120 100644 --- a/src/policies/TimelockPolicy.sol +++ b/src/policies/TimelockPolicy.sol @@ -51,7 +51,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW mapping(bytes32 => mapping(bytes32 => mapping(address => Proposal))) public proposals; event ProposalCreated( - address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash, uint256 validAfter, uint256 validUntil + address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash, address proposer, uint256 validAfter, uint256 validUntil ); event ProposalApproved( @@ -148,7 +148,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW proposals[userOpKey][id][account] = Proposal({status: ProposalStatus.Proposed, validAfter: 0, validUntil: 0, epoch: currentEpoch[id][account]}); - emit ProposalCreated(account, id, userOpKey, 0, 0); + emit ProposalCreated(account, id, userOpKey, msg.sender, 0, 0); } /** @@ -251,7 +251,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW epoch: currentEpoch[id][account] }); - emit ProposalCreated(account, id, userOpKey, validAfter, validUntil); + emit ProposalCreated(account, id, userOpKey, account, validAfter, validUntil); return _packValidationData(0, 0); } else { // Proposal exists in wrong state (Pending, Executed, Cancelled) diff --git a/test/btt/Timelock.t.sol b/test/btt/Timelock.t.sol index f48f842..e52bcd1 100644 --- a/test/btt/Timelock.t.sol +++ b/test/btt/Timelock.t.sol @@ -208,7 +208,7 @@ contract TimelockTest is Test { bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(callData), nonce)); vm.expectEmit(true, true, true, true); - emit TimelockPolicy.ProposalCreated(WALLET, POLICY_ID, expectedKey, 0, 0); + emit TimelockPolicy.ProposalCreated(WALLET, POLICY_ID, expectedKey, address(this), 0, 0); timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); @@ -362,6 +362,7 @@ contract TimelockTest is Test { WALLET, POLICY_ID, expectedKey, + WALLET, uint48(block.timestamp) + DELAY, uint48(block.timestamp) + DELAY + EXPIRATION ); From 17d950e221653a743bcf586a7cde5b145178b00b Mon Sep 17 00:00:00 2001 From: taek Date: Mon, 9 Feb 2026 23:24:57 +0900 Subject: [PATCH 3/7] fix(TimelockPolicy): remove createProposal, proposals only via no-op UserOp --- src/policies/TimelockPolicy.sol | 99 ++------- test/TimelockPolicy.t.sol | 79 ++++--- test/btt/Timelock.t.sol | 282 +++++-------------------- test/btt/TimelockEpochValidation.t.sol | 113 ++++------ 4 files changed, 167 insertions(+), 406 deletions(-) diff --git a/src/policies/TimelockPolicy.sol b/src/policies/TimelockPolicy.sol index d261120..4ef4b86 100644 --- a/src/policies/TimelockPolicy.sol +++ b/src/policies/TimelockPolicy.sol @@ -21,8 +21,7 @@ import { contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorWithSender { enum ProposalStatus { None, // Proposal doesn't exist - Proposed, // Proposal created but not yet approved (inert, no clock) - Pending, // Proposal approved, clock started, waiting for timelock + Pending, // Clock started, waiting for timelock Executed, // Proposal executed Cancelled // Proposal cancelled } @@ -51,10 +50,6 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW mapping(bytes32 => mapping(bytes32 => mapping(address => Proposal))) public proposals; event ProposalCreated( - address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash, address proposer, uint256 validAfter, uint256 validUntil - ); - - event ProposalApproved( address indexed wallet, bytes32 indexed id, bytes32 indexed proposalHash, uint256 validAfter, uint256 validUntil ); @@ -67,7 +62,6 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW error InvalidDelay(); error InvalidExpirationPeriod(); error ProposalNotFound(); - error ProposalAlreadyExists(); error TimelockNotExpired(uint256 validAfter, uint256 currentTime); error ProposalExpired(uint256 validUntil, uint256 currentTime); error ProposalNotPending(); @@ -122,35 +116,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 proposal is inert until approved by the - * session key holder via a no-op UserOp. The timelock clock does not start - * until approval, so spam proposals can be safely ignored. - * @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); - - // 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 INERT proposal — clock does NOT start until approved via UserOp - proposals[userOpKey][id][account] = - Proposal({status: ProposalStatus.Proposed, validAfter: 0, validUntil: 0, epoch: currentEpoch[id][account]}); - - emit ProposalCreated(account, id, userOpKey, msg.sender, 0, 0); - } - /** * @notice Cancel a pending proposal * @dev Only the account itself can cancel proposals to prevent griefing @@ -170,7 +135,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW bytes32 userOpKey = keccak256(abi.encode(account, keccak256(callData), nonce)); Proposal storage proposal = proposals[userOpKey][id][account]; - if (proposal.status != ProposalStatus.Pending && proposal.status != ProposalStatus.Proposed) { + if (proposal.status != ProposalStatus.Pending) { revert ProposalNotPending(); } @@ -200,13 +165,12 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW } /** - * @notice Handle proposal approval (or create+approve) from userOp - * @dev Called when the session key holder submits a no-op UserOp. - * If a matching inert proposal exists (Proposed status), approves it and starts the clock. - * If no proposal exists, creates and approves in one step. + * @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 _handleProposalApprovalInternal( + function _handleProposalCreationInternal( bytes32 id, PackedUserOperation calldata userOp, TimelockConfig storage config, @@ -223,40 +187,28 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW bytes calldata proposalCallData = sig[32:32 + callDataLength]; uint256 proposalNonce = uint256(bytes32(sig[32 + callDataLength:64 + callDataLength])); - // Calculate proposal timing (clock starts NOW) - uint48 validAfter = uint48(block.timestamp) + config.delay; - uint48 validUntil = validAfter + 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)); Proposal storage proposal = proposals[userOpKey][id][account]; - if (proposal.status == ProposalStatus.Proposed) { - // Approve existing inert proposal — start the clock - if (proposal.epoch != currentEpoch[id][account]) return SIG_VALIDATION_FAILED_UINT; - - proposal.status = ProposalStatus.Pending; - proposal.validAfter = validAfter; - proposal.validUntil = validUntil; - - emit ProposalApproved(account, id, userOpKey, validAfter, validUntil); - return _packValidationData(0, 0); - } else if (proposal.status == ProposalStatus.None) { - // Create + approve in one step (session key holder creating directly) - proposals[userOpKey][id][account] = Proposal({ - status: ProposalStatus.Pending, - validAfter: validAfter, - validUntil: validUntil, - epoch: currentEpoch[id][account] - }); - - emit ProposalCreated(account, id, userOpKey, account, validAfter, validUntil); - return _packValidationData(0, 0); - } else { - // Proposal exists in wrong state (Pending, Executed, Cancelled) + if (proposal.status != ProposalStatus.None) { return SIG_VALIDATION_FAILED_UINT; } + + // Calculate proposal timing (clock starts NOW) + uint48 validAfter = uint48(block.timestamp) + config.delay; + uint48 validUntil = validAfter + config.expirationPeriod; + + proposals[userOpKey][id][account] = Proposal({ + status: ProposalStatus.Pending, + validAfter: validAfter, + validUntil: validUntil, + epoch: currentEpoch[id][account] + }); + + emit ProposalCreated(account, id, userOpKey, validAfter, validUntil); + return _packValidationData(0, 0); } /** @@ -393,12 +345,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW * @notice Check signature against timelock policy (for ERC-1271) * @dev TimelockPolicy does not support ERC-1271 signature validation - always reverts */ - function checkSignaturePolicy(bytes32, address, bytes32, bytes calldata) - external - pure - override - returns (uint256) - { + function checkSignaturePolicy(bytes32, address, bytes32, bytes calldata) external pure override returns (uint256) { revert("TimelockPolicy: signature validation not supported"); } @@ -436,7 +383,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW // Check if this is a proposal approval (or create+approve) request // Criteria: calldata is a no-op AND signature has proposal data (length >= 65) if (_isNoOpCalldata(userOp.callData) && sig.length >= 65) { - return _handleProposalApprovalInternal(id, userOp, config, sig, account); + return _handleProposalCreationInternal(id, userOp, config, sig, account); } // Otherwise, this is a proposal execution request diff --git a/test/TimelockPolicy.t.sol b/test/TimelockPolicy.t.sol index 71423c5..951f6b9 100644 --- a/test/TimelockPolicy.t.sol +++ b/test/TimelockPolicy.t.sol @@ -173,16 +173,10 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State PackedUserOperation memory userOp = validUserOp(); - // First create a proposal (inert) - vm.startPrank(WALLET); - policyModule.createProposal(policyId(), WALLET, userOp.callData, userOp.nonce); - vm.stopPrank(); - - // Approve the proposal via no-op UserOp (starts the clock) - bytes memory sig = abi.encodePacked( - bytes32(userOp.callData.length), userOp.callData, bytes32(userOp.nonce), bytes1(0x00) - ); - PackedUserOperation memory approveOp = PackedUserOperation({ + // 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: "", @@ -194,7 +188,7 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State signature: sig }); vm.startPrank(WALLET); - policyModule.checkUserOpPolicy(policyId(), approveOp); + policyModule.checkUserOpPolicy(policyId(), noopOp); vm.stopPrank(); // Fast forward past the delay @@ -266,17 +260,33 @@ 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(); - // Verify proposal was created as inert (Proposed) + assertEq(result, 0); + + // Verify proposal was created as Pending with timing (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 validUntil) = policyModule.getProposal(WALLET, callData, nonce, policyId(), WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed)); - assertEq(validAfter, 0); - assertEq(validUntil, 0); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending)); + assertGt(validAfter, 0); + assertGt(validUntil, validAfter); } function testCancelProposal() public { @@ -288,9 +298,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 @@ -310,7 +333,7 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State policyModule.onInstall(abi.encodePacked(policyId(), installData())); vm.stopPrank(); - // Create+approve a proposal via checkUserOpPolicy with no-op calldata + // Create a proposal via checkUserOpPolicy with no-op calldata bytes memory proposalCallData = hex"1234"; uint256 proposalNonce = 1; @@ -340,7 +363,7 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State // Returns success (validationData = 0) for state persistence assertEq(result, 0); - // Verify proposal was created+approved (Pending with timing) + // Verify proposal was created as Pending with timing (TimelockPolicy.ProposalStatus status,,) = policyModule.getProposal(WALLET, proposalCallData, proposalNonce, policyId(), WALLET); @@ -356,16 +379,10 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State PackedUserOperation memory userOp = validUserOp(); - // Create and approve a proposal - vm.startPrank(WALLET); - policyModule.createProposal(policyId(), WALLET, userOp.callData, userOp.nonce); - vm.stopPrank(); - - // Approve via no-op UserOp - bytes memory sig = abi.encodePacked( - bytes32(userOp.callData.length), userOp.callData, bytes32(userOp.nonce), bytes1(0x00) - ); - PackedUserOperation memory approveOp = PackedUserOperation({ + // 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: "", @@ -377,7 +394,7 @@ contract TimelockPolicyTest is PolicyTestBase, StatelessValidatorTestBase, State signature: sig }); vm.startPrank(WALLET); - policyModule.checkUserOpPolicy(policyId(), approveOp); + policyModule.checkUserOpPolicy(policyId(), noopOp); vm.stopPrank(); // Fast forward past delay diff --git a/test/btt/Timelock.t.sol b/test/btt/Timelock.t.sol index e52bcd1..739ab31 100644 --- a/test/btt/Timelock.t.sol +++ b/test/btt/Timelock.t.sol @@ -192,88 +192,19 @@ contract TimelockTest is Test { assertFalse(timelockPolicy.isModuleType(999), "Should not support invalid type"); } - // ============ createProposal Tests ============ - - modifier whenCallingCreateProposal() { - _; - } - - function test_GivenConfigIsInitializedAndProposalDoesNotExist() external whenCallingCreateProposal { - // it should store the proposal with Proposed (inert) status - // it should NOT set timing (validAfter = 0, validUntil = 0) - // it should emit ProposalCreated with zero timing - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); - uint256 nonce = 100; - - bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(callData), nonce)); - - vm.expectEmit(true, true, true, true); - emit TimelockPolicy.ProposalCreated(WALLET, POLICY_ID, expectedKey, address(this), 0, 0); - - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - - (TimelockPolicy.ProposalStatus status, uint256 validAfter, uint256 validUntil) = - timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Status should be Proposed"); - assertEq(validAfter, 0, "validAfter should be 0 (inert)"); - assertEq(validUntil, 0, "validUntil should be 0 (inert)"); - } - - function test_GivenNotInitialized_WhenCallingCreateProposal() external whenCallingCreateProposal { - // it should revert with NotInitialized - address uninitWallet = address(0x9999); - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); - - vm.expectRevert(abi.encodeWithSelector(IModule.NotInitialized.selector, uninitWallet)); - timelockPolicy.createProposal(POLICY_ID, uninitWallet, callData, 0); - } - - function test_GivenProposalAlreadyExists() external whenCallingCreateProposal { - // it should revert with ProposalAlreadyExists - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); - uint256 nonce = 200; - - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - - vm.expectRevert(TimelockPolicy.ProposalAlreadyExists.selector); - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - } - // ============ cancelProposal Tests ============ modifier whenCallingCancelProposal() { _; } - function test_GivenCallerIsAccountAndProposalIsProposed() external whenCallingCancelProposal { - // it should set status to cancelled (cancelling an inert Proposed proposal) - // it should emit ProposalCancelled - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); - uint256 nonce = 300; - - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - - 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_GivenCallerIsAccountAndProposalIsPending() external whenCallingCancelProposal { - // it should set status to cancelled (cancelling an approved Pending proposal) + // 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 and approve via UserOp to get Pending status + // 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); @@ -297,7 +228,11 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 400; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // 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); @@ -329,7 +264,11 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 600; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // 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); @@ -346,7 +285,7 @@ contract TimelockTest is Test { } function test_GivenNoopCalldataAndValidSignature() external whenCallingCheckUserOpPolicyToCreateProposal { - // it should create+approve the proposal in one step (no prior external proposal) + // 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"); @@ -362,7 +301,6 @@ contract TimelockTest is Test { WALLET, POLICY_ID, expectedKey, - WALLET, uint48(block.timestamp) + DELAY, uint48(block.timestamp) + DELAY + EXPIRATION ); @@ -375,7 +313,7 @@ contract TimelockTest is Test { (TimelockPolicy.ProposalStatus status,,) = timelockPolicy.getProposal(WALLET, proposalCallData, proposalNonce, POLICY_ID, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be Pending (created+approved)"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should be Pending"); } function test_GivenNoopCalldataAndSignatureShorterThan65Bytes() @@ -419,11 +357,11 @@ contract TimelockTest is Test { PackedUserOperation memory userOp = _createNoopUserOp(WALLET, sig); - // First call: create+approve → Pending + // First call: create -> Pending vm.prank(WALLET); timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - // Second call: already Pending → should fail + // Second call: already Pending -> should fail vm.prank(WALLET); uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); @@ -443,14 +381,11 @@ contract TimelockTest is Test { bytes memory proposalCallData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "action"); uint256 proposalNonce = 900; - // Create inert proposal - timelockPolicy.createProposal(POLICY_ID, WALLET, proposalCallData, proposalNonce); - - // Approve the proposal via no-op UserOp (starts the clock) + // Create proposal via no-op UserOp (creates Pending directly) bytes memory sig = _createProposalSignature(proposalCallData, proposalNonce); - PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); vm.prank(WALLET); - timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); // Get the actual stored proposal values (now has timing) (, uint256 storedValidAfter, uint256 storedValidUntil) = @@ -495,7 +430,11 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 1000; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // 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); @@ -513,11 +452,11 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 1100; - // Create and approve via UserOp + // Create proposal via no-op UserOp bytes memory sig = _createProposalSignature(callData, nonce); - PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); vm.prank(WALLET); - timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); vm.warp(block.timestamp + DELAY + 1); @@ -649,14 +588,22 @@ contract TimelockTest is Test { bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 1200; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // 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 validUntil) = timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Status should be Proposed"); - assertEq(validAfter, 0, "validAfter should be 0 (inert)"); - assertEq(validUntil, 0, "validUntil should be 0 (inert)"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Status should be Pending"); + assertEq(validAfter, uint256(uint48(block.timestamp) + DELAY), "validAfter should be block.timestamp + DELAY"); + assertEq( + validUntil, + uint256(uint48(block.timestamp) + DELAY + EXPIRATION), + "validUntil should be validAfter + EXPIRATION" + ); } function test_GivenProposalDoesNotExist_WhenCallingGetProposal() external whenCallingGetProposal { @@ -955,15 +902,15 @@ contract TimelockTest is Test { function test_WhenPackingValidationData() external { // it should correctly pack validAfter and validUntil - // Test the packing by creating+approving a proposal and checking the returned validation data + // 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 and approve via UserOp + // Create proposal via no-op UserOp bytes memory sig = _createProposalSignature(callData, nonce); - PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); vm.prank(WALLET); - timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); // Get the actual stored proposal values (, uint256 storedValidAfter, uint256 storedValidUntil) = @@ -1000,32 +947,16 @@ contract TimelockTest is Test { assertEq(result, SIG_VALIDATION_FAILED, "Attack without proposal should fail"); } - function test_GivenAttackerTriesToExecuteUnapprovedProposal() external whenTestingSecurityScenarios { - // it should return SIG_VALIDATION_FAILED because proposal is inert (Proposed, not Pending) - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "action"); - uint256 nonce = 1500; - - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - - // Try to execute without approval - PackedUserOperation memory executeOp = _createUserOpWithCalldata(WALLET, callData, nonce, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, executeOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Unapproved proposal should fail execution"); - } - 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 and approve via UserOp + // Create proposal via no-op UserOp bytes memory sig = _createProposalSignature(callData, nonce); - PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); + PackedUserOperation memory noopOp = _createNoopUserOp(WALLET, sig); vm.prank(WALLET); - timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); + timelockPolicy.checkUserOpPolicy(POLICY_ID, noopOp); vm.warp(block.timestamp + DELAY + 1); @@ -1070,131 +1001,24 @@ contract TimelockTest is Test { assertGt(validUntil, validAfter, "validUntil should be after validAfter"); } - // ============ Proposal Approval Tests ============ - - modifier whenCallingCheckUserOpPolicyToApproveProposal() { - _; - } - - function test_ApproveExistingProposal() external whenCallingCheckUserOpPolicyToApproveProposal { - // it should transition Proposed → Pending and start the clock - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "approve_test"); - uint256 nonce = 2000; - - // Create inert proposal externally - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - - // Verify it's Proposed with no timing - (TimelockPolicy.ProposalStatus statusBefore, uint256 vaBefore, uint256 vuBefore) = - timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - assertEq(uint256(statusBefore), uint256(TimelockPolicy.ProposalStatus.Proposed), "Should be Proposed"); - assertEq(vaBefore, 0, "validAfter should be 0 before approval"); - assertEq(vuBefore, 0, "validUntil should be 0 before approval"); - - // Approve via no-op UserOp - bytes memory sig = _createProposalSignature(callData, nonce); - PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); - - bytes32 expectedKey = keccak256(abi.encode(WALLET, keccak256(callData), nonce)); - uint48 expectedValidAfter = uint48(block.timestamp) + DELAY; - uint48 expectedValidUntil = expectedValidAfter + EXPIRATION; - - vm.expectEmit(true, true, true, true); - emit TimelockPolicy.ProposalApproved(WALLET, POLICY_ID, expectedKey, expectedValidAfter, expectedValidUntil); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); - - assertEq(result, 0, "Approval should return 0 for state persistence"); - - // Verify it's now Pending with timing set - (TimelockPolicy.ProposalStatus statusAfter, uint256 vaAfter, uint256 vuAfter) = - timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - assertEq(uint256(statusAfter), uint256(TimelockPolicy.ProposalStatus.Pending), "Should be Pending after approval"); - assertEq(vaAfter, expectedValidAfter, "validAfter should be set"); - assertEq(vuAfter, expectedValidUntil, "validUntil should be set"); - } - - function test_CannotApproveAlreadyPendingProposal() external whenCallingCheckUserOpPolicyToApproveProposal { - // it should return SIG_VALIDATION_FAILED - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); - uint256 nonce = 2100; - - // Create and approve in one step - bytes memory sig = _createProposalSignature(callData, nonce); - PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); - vm.prank(WALLET); - timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); - - // Try to approve again - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Should fail for already Pending proposal"); - } - - function test_CannotApproveCancelledProposal() external whenCallingCheckUserOpPolicyToApproveProposal { - // it should return SIG_VALIDATION_FAILED - bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); - uint256 nonce = 2200; - - // Create and cancel - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); - vm.prank(WALLET); - timelockPolicy.cancelProposal(POLICY_ID, WALLET, callData, nonce); - - // Try to approve - bytes memory sig = _createProposalSignature(callData, nonce); - PackedUserOperation memory approveOp = _createNoopUserOp(WALLET, sig); - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, approveOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Should fail for cancelled proposal"); - } - - function test_SpamProposalsAreInert() external whenTestingSecurityScenarios { - // it should demonstrate that spam proposals cannot be executed without approval - bytes memory callData1 = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "approve_usdc"); - bytes memory callData2 = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "approve_weth"); - bytes memory callData3 = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "transfer_all"); - - // Attacker creates many proposals - vm.startPrank(ATTACKER); - timelockPolicy.createProposal(POLICY_ID, WALLET, callData1, 0); - timelockPolicy.createProposal(POLICY_ID, WALLET, callData2, 0); - timelockPolicy.createProposal(POLICY_ID, WALLET, callData3, 0); - vm.stopPrank(); - - // Wait past timelock - vm.warp(block.timestamp + DELAY + 1); - - // None can be executed because they're all in Proposed (inert) status - PackedUserOperation memory op1 = _createUserOpWithCalldata(WALLET, callData1, 0, ""); - PackedUserOperation memory op2 = _createUserOpWithCalldata(WALLET, callData2, 0, ""); - PackedUserOperation memory op3 = _createUserOpWithCalldata(WALLET, callData3, 0, ""); - - vm.prank(WALLET); - assertEq(timelockPolicy.checkUserOpPolicy(POLICY_ID, op1), SIG_VALIDATION_FAILED, "Spam proposal 1 should fail"); - vm.prank(WALLET); - assertEq(timelockPolicy.checkUserOpPolicy(POLICY_ID, op2), SIG_VALIDATION_FAILED, "Spam proposal 2 should fail"); - vm.prank(WALLET); - assertEq(timelockPolicy.checkUserOpPolicy(POLICY_ID, op3), SIG_VALIDATION_FAILED, "Spam proposal 3 should fail"); - } - function test_GivenAttackerTriesToCancelAnotherAccountsProposal() external whenTestingSecurityScenarios { // it should revert with OnlyAccount bytes memory callData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), "test"); uint256 nonce = 1800; - timelockPolicy.createProposal(POLICY_ID, WALLET, callData, nonce); + // 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 Proposed (inert) + // Verify proposal is still Pending (TimelockPolicy.ProposalStatus status,,) = timelockPolicy.getProposal(WALLET, callData, nonce, POLICY_ID, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Proposal should still be Proposed"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Proposal should still be Pending"); } } diff --git a/test/btt/TimelockEpochValidation.t.sol b/test/btt/TimelockEpochValidation.t.sol index 9e28484..92a049a 100644 --- a/test/btt/TimelockEpochValidation.t.sol +++ b/test/btt/TimelockEpochValidation.t.sol @@ -44,8 +44,21 @@ contract TimelockEpochValidationTest is Test { } 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.createProposal(policyId, wallet, callData, nonce); + timelockPolicy.checkUserOpPolicy(policyId, noopOp); } function _createUserOp(address sender, bytes memory callData, uint256 nonce) @@ -66,23 +79,6 @@ contract TimelockEpochValidationTest is Test { }); } - function _approveProposal(address wallet, bytes32 policyId, 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); - } - // ==================== Installing the Policy ==================== modifier whenInstallingThePolicy() { @@ -102,8 +98,7 @@ contract TimelockEpochValidationTest is Test { assertEq(epochAfter, 1, "Epoch should be 1 after first install"); // it should initialize the policy config - (uint48 delay, uint48 expirationPeriod, bool initialized) = - timelockPolicy.timelockConfig(POLICY_ID_1, WALLET); + (uint48 delay, uint48 expirationPeriod, 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"); @@ -167,22 +162,18 @@ contract TimelockEpochValidationTest is Test { _createProposal(WALLET, POLICY_ID_1, callData, nonce); // it should store the current epoch in the proposal - // it should be in Proposed (inert) status with no timing + // it should be in Pending status with timing set bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); - ( - TimelockPolicy.ProposalStatus status, - uint48 validAfter, - uint48 validUntil, - uint256 proposalEpoch - ) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); - - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Proposal should be Proposed (inert)"); + (TimelockPolicy.ProposalStatus status, uint48 validAfter, 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, 0, "validAfter should be 0 (inert)"); - assertEq(validUntil, 0, "validUntil should be 0 (inert)"); + assertGt(validAfter, 0, "validAfter should be set"); + assertGt(validUntil, validAfter, "validUntil should be after validAfter"); } - function test_GivenCreatingViaCreateProposalFunction() external whenCreatingAProposal { + function test_GivenCreatingViaNoOpUserOp() external whenCreatingAProposal { _installPolicy(WALLET, POLICY_ID_1); bytes memory callData = hex"5678"; @@ -192,11 +183,12 @@ contract TimelockEpochValidationTest is Test { _createProposal(WALLET, POLICY_ID_1, callData, nonce); - // it should record the epoch at creation time (proposal is inert) + // 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); + (TimelockPolicy.ProposalStatus status,,, uint256 proposalEpoch) = + timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "Should be Proposed"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "Should be Pending"); assertEq(proposalEpoch, epoch, "Proposal epoch should equal current epoch at creation"); } @@ -220,11 +212,9 @@ contract TimelockEpochValidationTest is Test { 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); - // Approve the proposal (starts the clock) - _approveProposal(WALLET, POLICY_ID_1, callData, nonce); - // Warp past the timelock delay vm.warp(block.timestamp + DELAY + 1); @@ -248,12 +238,9 @@ contract TimelockEpochValidationTest is Test { bytes memory callData = hex"1234"; uint256 nonce = 1; - // Create proposal in epoch 1 (inert) + // Create proposal via no-op UserOp (Pending with clock started, epoch 1) _createProposal(WALLET, POLICY_ID_1, callData, nonce); - // Approve the proposal (starts the clock, epoch 1) - _approveProposal(WALLET, POLICY_ID_1, callData, nonce); - // Warp past the timelock delay vm.warp(block.timestamp + DELAY + 1); @@ -282,9 +269,8 @@ contract TimelockEpochValidationTest is Test { bytes memory callData = hex"abcd"; uint256 nonce = 5; - // Create and approve proposal in epoch 1 + // Create proposal via no-op UserOp in epoch 1 (Pending with clock started) _createProposal(WALLET, POLICY_ID_1, callData, nonce); - _approveProposal(WALLET, POLICY_ID_1, callData, nonce); bytes32 userOpKey = timelockPolicy.computeUserOpKey(WALLET, callData, nonce); (,,, uint256 proposalEpoch) = timelockPolicy.proposals(userOpKey, POLICY_ID_1, WALLET); @@ -363,9 +349,8 @@ contract TimelockEpochValidationTest is Test { bytes memory callData = hex"1234"; uint256 nonce = 1; - // Create and approve in epoch 1 + // Create proposal via no-op UserOp in epoch 1 (Pending with clock started) _createProposal(WALLET, POLICY_ID_1, callData, nonce); - _approveProposal(WALLET, POLICY_ID_1, callData, nonce); uint256 epochBeforeUninstall = timelockPolicy.currentEpoch(POLICY_ID_1, WALLET); @@ -386,7 +371,7 @@ contract TimelockEpochValidationTest is Test { 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 (Proposed status) + // it should allow new proposals with new epoch (Pending status) bytes memory newCallData = hex"5678"; uint256 newNonce = 2; @@ -396,7 +381,7 @@ contract TimelockEpochValidationTest is Test { (TimelockPolicy.ProposalStatus status,,, uint256 newProposalEpoch) = timelockPolicy.proposals(newUserOpKey, POLICY_ID_1, WALLET); - assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Proposed), "New proposal should be Proposed"); + assertEq(uint256(status), uint256(TimelockPolicy.ProposalStatus.Pending), "New proposal should be Pending"); assertEq(newProposalEpoch, epochAfterReinstall, "New proposal should have current epoch"); } @@ -456,35 +441,26 @@ contract TimelockEpochValidationTest is Test { _; } - function test_WhenAttackerTriesToExecuteOldProposal() external 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"); - // Attacker creates malicious proposal + // 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; - vm.prank(ATTACKER); - timelockPolicy.createProposal(POLICY_ID_1, WALLET, maliciousCallData, maliciousNonce); - - // Time passes, timelock expires - vm.warp(block.timestamp + DELAY + 1); - - // User decides to uninstall and reinstall - _uninstallPolicy(WALLET, POLICY_ID_1); - _installPolicy(WALLET, POLICY_ID_1); - - assertEq(timelockPolicy.currentEpoch(POLICY_ID_1, WALLET), 2, "Should be at epoch 2"); - - // Attacker tries to execute the old proposal PackedUserOperation memory maliciousUserOp = _createUserOp(WALLET, maliciousCallData, maliciousNonce); vm.prank(WALLET); uint256 validationResult = timelockPolicy.checkUserOpPolicy(POLICY_ID_1, maliciousUserOp); - // it should fail due to epoch mismatch - assertEq(validationResult, SIG_VALIDATION_FAILED_UINT, "Attack should be thwarted by epoch check"); + // it should fail because no proposal exists + assertEq(validationResult, SIG_VALIDATION_FAILED_UINT, "Non-existent proposal should fail"); } function test_WhenUserCreatesNewProposalAfterReinstall() external whenVerifyingFullAttackScenario { @@ -495,11 +471,10 @@ contract TimelockEpochValidationTest is Test { _uninstallPolicy(WALLET, POLICY_ID_1); _installPolicy(WALLET, POLICY_ID_1); - // User creates and approves legitimate proposal with new epoch + // 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); - _approveProposal(WALLET, POLICY_ID_1, callData, userNonce); vm.warp(block.timestamp + DELAY + 1); @@ -517,14 +492,12 @@ contract TimelockEpochValidationTest is Test { _installPolicy(WALLET, POLICY_ID_1); _installPolicy(WALLET2, POLICY_ID_1); - // Both users create and approve proposals + // 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); - _approveProposal(WALLET, POLICY_ID_1, callData1, 1); _createProposal(WALLET2, POLICY_ID_1, callData2, 1); - _approveProposal(WALLET2, POLICY_ID_1, callData2, 1); vm.warp(block.timestamp + DELAY + 1); From 28ee229897e667aaabc629b3817fa8c130e33e01 Mon Sep 17 00:00:00 2001 From: taek Date: Mon, 9 Feb 2026 23:36:16 +0900 Subject: [PATCH 4/7] fix(TimelockPolicy): remove dead code and add callDataLength overflow guard --- src/policies/TimelockPolicy.sol | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/policies/TimelockPolicy.sol b/src/policies/TimelockPolicy.sol index 4ef4b86..56d330e 100644 --- a/src/policies/TimelockPolicy.sol +++ b/src/policies/TimelockPolicy.sol @@ -61,12 +61,8 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW error InvalidDelay(); error InvalidExpirationPeriod(); - error ProposalNotFound(); - error TimelockNotExpired(uint256 validAfter, uint256 currentTime); - error ProposalExpired(uint256 validUntil, uint256 currentTime); error ProposalNotPending(); error OnlyAccount(); - error ProposalFromPreviousEpoch(); error ParametersTooLarge(); /** @@ -82,7 +78,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW if (delay == 0) revert InvalidDelay(); if (expirationPeriod == 0) revert InvalidExpirationPeriod(); - // Prevent uint48 overflow in createProposal: uint48(block.timestamp) + delay + expirationPeriod + // Prevent uint48 overflow: uint48(block.timestamp) + delay + expirationPeriod if (uint256(delay) + uint256(expirationPeriod) > type(uint48).max - block.timestamp) { revert ParametersTooLarge(); } @@ -181,8 +177,8 @@ 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])); @@ -380,7 +376,7 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW TimelockConfig storage config = timelockConfig[id][account]; if (!config.initialized) return SIG_VALIDATION_FAILED_UINT; - // Check if this is a proposal approval (or create+approve) request + // 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) { return _handleProposalCreationInternal(id, userOp, config, sig, account); From 4a83f3f66f8893019123e253ac7dae4f71023a80 Mon Sep 17 00:00:00 2001 From: taek Date: Tue, 10 Feb 2026 00:13:58 +0900 Subject: [PATCH 5/7] fix(TimelockPolicy): add mode check and fix executeUserOp offset in no-op detection --- src/policies/TimelockPolicy.sol | 10 ++++--- test/btt/Timelock.t.sol | 46 ++++++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/policies/TimelockPolicy.sol b/src/policies/TimelockPolicy.sol index 88bfcdb..be4103e 100644 --- a/src/policies/TimelockPolicy.sol +++ b/src/policies/TimelockPolicy.sol @@ -281,6 +281,10 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW // ABI layout: 4 (selector) + 32 (mode) + 32 (offset) + 32 (length) + data if (callData.length < 100) return false; + // Only accept single call mode (callType = first byte of mode must be 0x00). + // Prevents delegatecall (0xFE) or batch (0x01) payloads from being treated as no-ops. + if (callData[4] != 0x00) return false; + // Offset to executionCalldata: 2 head slots (mode + offset) = 64 uint256 offset = uint256(bytes32(callData[36:68])); if (offset != 64) return false; @@ -314,12 +318,12 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW */ function _isNoOpExecuteUserOp(bytes calldata callData) internal pure returns (bool) { // executeUserOp(bytes calldata userOp, bytes32 userOpHash) - // Format: 4 (selector) + 32 (userOp offset) + 32 (userOpHash) + 32 (userOp length) + userOp data + // Format: 4 (selector) + 32 (userOp offset=64) + 32 (userOpHash) + 32 (userOp length) + userOp data if (callData.length < 100) return false; - // Decode offset to userOp data (should be 32) + // Decode offset to userOp data (should be 64: past 2 head slots) uint256 offset = uint256(bytes32(callData[4:36])); - if (offset != 32) return false; + if (offset != 64) return false; // userOpHash is at bytes 36-68 (we don't validate it) diff --git a/test/btt/Timelock.t.sol b/test/btt/Timelock.t.sol index a52af49..ec254a8 100644 --- a/test/btt/Timelock.t.sol +++ b/test/btt/Timelock.t.sol @@ -825,6 +825,40 @@ contract TimelockTest is Test { assertEq(result, SIG_VALIDATION_FAILED, "Non-empty inner calldata should not be noop"); } + function test_GivenModeIsDelegatecall() external whenDetectingERC7579ExecuteNoop { + // it should not be detected as noop (delegatecall mode 0xFE) + // Mode with callType=0xFE (delegatecall) should be rejected + bytes32 delegatecallMode = bytes32(uint256(0xFE) << 248); + bytes memory executionCalldata = abi.encodePacked(bytes20(WALLET), uint256(0)); + + bytes memory callData = + abi.encodeWithSelector(IERC7579Execution.execute.selector, delegatecallMode, executionCalldata); + + bytes memory sig = _createProposalSignature("proposal", 3); + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, sig); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Delegatecall mode should not be noop"); + } + + function test_GivenModeIsBatch() external whenDetectingERC7579ExecuteNoop { + // it should not be detected as noop (batch mode 0x01) + bytes32 batchMode = bytes32(uint256(0x01) << 248); + bytes memory executionCalldata = abi.encodePacked(bytes20(WALLET), uint256(0)); + + bytes memory callData = + abi.encodeWithSelector(IERC7579Execution.execute.selector, batchMode, executionCalldata); + + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); + + vm.prank(WALLET); + uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); + + assertEq(result, SIG_VALIDATION_FAILED, "Batch mode should not be noop"); + } + // ============ _isNoOpExecuteUserOp Tests ============ modifier whenDetectingExecuteUserOpNoop() { @@ -833,11 +867,11 @@ contract TimelockTest is Test { function test_GivenUserOpDataIsEmpty() external whenDetectingExecuteUserOpNoop { // it should be detected as noop - bytes memory callData = abi.encodePacked( + // Use encodeWithSelector to guarantee proper ABI encoding + bytes memory callData = abi.encodeWithSelector( IAccountExecute.executeUserOp.selector, - bytes32(uint256(32)), // offset to userOp - bytes32(0), // userOpHash - bytes32(uint256(0)) // userOp length = 0 + "", // empty bytes userOp + bytes32(0) // userOpHash ); bytes memory sig = _createProposalSignature("proposal", 2); @@ -864,11 +898,11 @@ contract TimelockTest is Test { assertEq(result, SIG_VALIDATION_FAILED, "Too short executeUserOp should not be noop"); } - function test_GivenOffsetIsNot32_WhenDetectingExecuteUserOpNoop() external whenDetectingExecuteUserOpNoop { + function test_GivenOffsetIsNot64_WhenDetectingExecuteUserOpNoop() external whenDetectingExecuteUserOpNoop { // it should not be detected as noop bytes memory callData = abi.encodePacked( IAccountExecute.executeUserOp.selector, - bytes32(uint256(64)), // wrong offset + bytes32(uint256(32)), // wrong offset (should be 64) bytes32(0), bytes32(uint256(0)) ); From 810bc68bd431e72c495ed64b9e837b4f0515a6d8 Mon Sep 17 00:00:00 2001 From: taek Date: Tue, 10 Feb 2026 01:22:19 +0900 Subject: [PATCH 6/7] fix(TimelockPolicy): correct ERC-7579 no-op detection encoding --- src/policies/TimelockPolicy.sol | 106 ++++-------- test/btt/Timelock.t.sol | 280 ++++++-------------------------- 2 files changed, 83 insertions(+), 303 deletions(-) diff --git a/src/policies/TimelockPolicy.sol b/src/policies/TimelockPolicy.sol index be4103e..b88d1e1 100644 --- a/src/policies/TimelockPolicy.sol +++ b/src/policies/TimelockPolicy.sol @@ -243,95 +243,49 @@ contract TimelockPolicy is PolicyBase, IStatelessValidator, IStatelessValidatorW /** * @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; + function _isNoOpCalldata(bytes calldata callData) internal pure returns (bool) { + uint256 len = callData.length; - // Need at least 4 bytes for selector - if (callData.length < 4) return false; + // Case 1: Empty calldata + if (len == 0) return true; - bytes4 selector = bytes4(callData[0:4]); + // Case 2: ERC-7579 execute with empty execution data + if (_isNoOpERC7579Execute(callData)) return true; - // 2. Check for ERC-7579 execute(bytes32 mode, bytes calldata executionCalldata) - if (selector == IERC7579Execution.execute.selector) { - return _isNoOpERC7579Execute(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; } - // 3. Check for executeUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash) - if (selector == IAccountExecute.executeUserOp.selector) { - return _isNoOpExecuteUserOp(callData); - } - - // 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, "") + * @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 _isNoOpERC7579Execute(bytes calldata callData) internal view returns (bool) { - // execute(bytes32 mode, bytes calldata executionCalldata) - // ABI layout: 4 (selector) + 32 (mode) + 32 (offset) + 32 (length) + data - if (callData.length < 100) return false; - - // Only accept single call mode (callType = first byte of mode must be 0x00). - // Prevents delegatecall (0xFE) or batch (0x01) payloads from being treated as no-ops. + 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 to executionCalldata: 2 head slots (mode + offset) = 64 - uint256 offset = uint256(bytes32(callData[36:68])); - if (offset != 64) return false; - - // Decode the length of executionCalldata - uint256 execDataLength = uint256(bytes32(callData[68:100])); - - // ERC-7579 single execution uses compact format (no length prefix): - // executionCalldata = abi.encodePacked(target, value, calldata) - // target (20 bytes) + value (32 bytes) = 52 bytes with no inner calldata - if (execDataLength != 52) return false; - - if (callData.length < 152) 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 - return value == 0; - } - - /** - * @notice Check if executeUserOp call is a no-op - * @dev Valid: executeUserOp("", bytes32) - */ - function _isNoOpExecuteUserOp(bytes calldata callData) internal pure returns (bool) { - // executeUserOp(bytes calldata userOp, bytes32 userOpHash) - // Format: 4 (selector) + 32 (userOp offset=64) + 32 (userOpHash) + 32 (userOp length) + userOp data - if (callData.length < 100) return false; - - // Decode offset to userOp data (should be 64: past 2 head slots) - uint256 offset = uint256(bytes32(callData[4:36])); - if (offset != 64) 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; + // 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; } /** diff --git a/test/btt/Timelock.t.sol b/test/btt/Timelock.t.sol index ec254a8..e51f3a5 100644 --- a/test/btt/Timelock.t.sol +++ b/test/btt/Timelock.t.sol @@ -637,6 +637,7 @@ contract TimelockTest is Test { _; } + // Case 1: Empty calldata function test_GivenCalldataIsEmpty() external whenDetectingNoopCalldata { // it should be detected as noop bytes memory sig = _createProposalSignature("test", 0); @@ -649,193 +650,66 @@ contract TimelockTest is Test { assertEq(result, 0, "Empty calldata should be detected as noop"); } - function test_GivenCalldataIsShorterThan4Bytes() external whenDetectingNoopCalldata { - // it should not be detected as noop - bytes memory shortCalldata = hex"aabb"; - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, shortCalldata, 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, "Short calldata should not be noop"); - } - - function test_GivenSelectorIsUnrecognized() external whenDetectingNoopCalldata { - // it should not be detected as noop - bytes memory unknownCalldata = abi.encodeWithSelector(bytes4(0xdeadbeef), "test"); - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, unknownCalldata, 0, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Unknown selector should not be noop"); - } - - // ============ _isNoOpERC7579Execute Tests ============ - - modifier whenDetectingERC7579ExecuteNoop() { - _; - } - - function test_GivenTargetIsSelfAndValueIsZeroAndInnerCalldataIsEmpty() external whenDetectingERC7579ExecuteNoop { + // Case 2: ERC-7579 execute(mode=0x00, "") — single-call with empty execution data + function test_GivenCalldataIsERC7579ExecuteNoop() external whenDetectingNoopCalldata { // it should be detected as noop - // ERC-7579 compact format: abi.encodePacked(target, value) = 52 bytes - bytes memory executionCalldata = abi.encodePacked(bytes20(WALLET), uint256(0)); - - bytes memory callData = - abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), executionCalldata); - - bytes memory sig = _createProposalSignature("proposal", 0); - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, sig); + 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, "ERC7579 execute to self with zero value should be noop"); + assertEq(result, 0, "ERC-7579 execute noop should be detected as noop"); } - function test_GivenTargetIsZeroAddressAndValueIsZeroAndInnerCalldataIsEmpty() - external - whenDetectingERC7579ExecuteNoop - { + // Case 3: executeUserOp + empty inner calldata (just the 4-byte selector) + function test_GivenCalldataIsExecuteUserOpEmpty() external whenDetectingNoopCalldata { // it should be detected as noop - // ERC-7579 compact format: abi.encodePacked(target, value) = 52 bytes - bytes memory executionCalldata = abi.encodePacked(bytes20(address(0)), uint256(0)); - - bytes memory callData = - abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), executionCalldata); - - bytes memory sig = _createProposalSignature("proposal", 1); - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, sig); + 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, "ERC7579 execute to zero address with zero value should be noop"); + assertEq(result, 0, "executeUserOp + empty should be detected as noop"); } - function test_GivenCalldataIsShorterThan68Bytes() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop - bytes memory shortCallData = abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0)); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, shortCallData, 0, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Too short for offset should not be noop"); - } - - function test_GivenOffsetIsNot64() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop - bytes memory callData = abi.encodePacked( - IERC7579Execution.execute.selector, - bytes32(0), // mode - bytes32(uint256(32)), // wrong offset (should be 64) - bytes32(uint256(52)), // length - bytes20(WALLET), - uint256(0) - ); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Wrong offset should not be noop"); - } - - function test_GivenCalldataIsShorterThan100Bytes() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop - bytes memory callData = abi.encodePacked( - IERC7579Execution.execute.selector, - bytes32(0), // mode - bytes32(uint256(64)) // offset - // missing length and data - ); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Too short for length should not be noop"); - } - - function test_GivenExecDataLengthIsNot52() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop (length 20 != 52) - bytes memory callData = abi.encodePacked( - IERC7579Execution.execute.selector, - bytes32(0), // mode - bytes32(uint256(64)), // offset - bytes32(uint256(20)) // length only 20 (must be exactly 52) - ); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Exec data length != 52 should not be noop"); - } - - function test_GivenTargetIsNotSelfOrZero() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop - bytes memory executionCalldata = abi.encodePacked(bytes20(ATTACKER), uint256(0)); - - bytes memory callData = - abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), executionCalldata); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); + // 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, SIG_VALIDATION_FAILED, "Wrong target should not be noop"); + assertEq(result, 0, "executeUserOp + ERC-7579 execute noop should be detected as noop"); } - function test_GivenValueIsNonzero() external whenDetectingERC7579ExecuteNoop { + // Negative: non-empty arbitrary calldata + function test_GivenCalldataIsNonEmpty() external whenDetectingNoopCalldata { // it should not be detected as noop - bytes memory executionCalldata = abi.encodePacked(bytes20(WALLET), uint256(1 ether)); - - bytes memory callData = - abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), executionCalldata); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); + bytes memory nonEmptyCalldata = hex"aabb"; + PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, nonEmptyCalldata, 0, ""); vm.prank(WALLET); uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - assertEq(result, SIG_VALIDATION_FAILED, "Non-zero value should not be noop"); - } - - function test_GivenExecDataLengthGreaterThan52() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop (has inner calldata) - bytes memory executionCalldata = abi.encodePacked(bytes20(WALLET), uint256(0), hex"deadbeef"); - - bytes memory callData = - abi.encodeWithSelector(IERC7579Execution.execute.selector, bytes32(0), executionCalldata); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Non-empty inner calldata should not be noop"); + // Not a no-op, goes to execution path, no proposal exists + assertEq(result, SIG_VALIDATION_FAILED, "Non-empty calldata should not be noop"); } - function test_GivenModeIsDelegatecall() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop (delegatecall mode 0xFE) - // Mode with callType=0xFE (delegatecall) should be rejected + // 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 executionCalldata = abi.encodePacked(bytes20(WALLET), uint256(0)); - - bytes memory callData = - abi.encodeWithSelector(IERC7579Execution.execute.selector, delegatecallMode, executionCalldata); - - bytes memory sig = _createProposalSignature("proposal", 3); - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, sig); + 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); @@ -843,15 +717,12 @@ contract TimelockTest is Test { assertEq(result, SIG_VALIDATION_FAILED, "Delegatecall mode should not be noop"); } - function test_GivenModeIsBatch() external whenDetectingERC7579ExecuteNoop { - // it should not be detected as noop (batch mode 0x01) + // 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 executionCalldata = abi.encodePacked(bytes20(WALLET), uint256(0)); - - bytes memory callData = - abi.encodeWithSelector(IERC7579Execution.execute.selector, batchMode, executionCalldata); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); + 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); @@ -859,77 +730,32 @@ contract TimelockTest is Test { assertEq(result, SIG_VALIDATION_FAILED, "Batch mode should not be noop"); } - // ============ _isNoOpExecuteUserOp Tests ============ - - modifier whenDetectingExecuteUserOpNoop() { - _; - } - - function test_GivenUserOpDataIsEmpty() external whenDetectingExecuteUserOpNoop { - // it should be detected as noop - // Use encodeWithSelector to guarantee proper ABI encoding - bytes memory callData = abi.encodeWithSelector( - IAccountExecute.executeUserOp.selector, - "", // empty bytes userOp - bytes32(0) // userOpHash - ); - - bytes memory sig = _createProposalSignature("proposal", 2); - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, sig); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, 0, "executeUserOp with empty userOp should be noop"); - } - - function test_GivenCalldataIsShorterThan100Bytes_WhenDetectingExecuteUserOpNoop() - external - whenDetectingExecuteUserOpNoop - { - // it should not be detected as noop - bytes memory callData = abi.encodePacked(IAccountExecute.executeUserOp.selector, bytes32(uint256(32))); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); + // 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, "Too short executeUserOp should not be noop"); + assertEq(result, SIG_VALIDATION_FAILED, "Execute with data should not be noop"); } - function test_GivenOffsetIsNot64_WhenDetectingExecuteUserOpNoop() external whenDetectingExecuteUserOpNoop { + // Negative: executeUserOp wrapping a delegatecall ERC-7579 execute + function test_GivenCalldataIsExecuteUserOpWithDelegatecall() external whenDetectingNoopCalldata { // it should not be detected as noop - bytes memory callData = abi.encodePacked( - IAccountExecute.executeUserOp.selector, - bytes32(uint256(32)), // wrong offset (should be 64) - bytes32(0), - bytes32(uint256(0)) - ); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); - - vm.prank(WALLET); - uint256 result = timelockPolicy.checkUserOpPolicy(POLICY_ID, userOp); - - assertEq(result, SIG_VALIDATION_FAILED, "Wrong offset in executeUserOp should not be noop"); - } - - function test_GivenUserOpLengthIsNonzero() external whenDetectingExecuteUserOpNoop { - // it should not be detected as noop - bytes memory callData = abi.encodePacked( - IAccountExecute.executeUserOp.selector, - bytes32(uint256(32)), - bytes32(0), - bytes32(uint256(10)) // non-empty userOp - ); - - PackedUserOperation memory userOp = _createUserOpWithCalldata(WALLET, callData, 0, ""); + 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, "Non-empty userOp should not be noop"); + assertEq(result, SIG_VALIDATION_FAILED, "executeUserOp + delegatecall should not be noop"); } // ============ _packValidationData Tests ============ From d0bbbb19408315bcde4d835a13a95543587b3c65 Mon Sep 17 00:00:00 2001 From: taek Date: Wed, 11 Feb 2026 14:44:25 +0900 Subject: [PATCH 7/7] test: add EntryPoint integration tests for TimelockPolicy --- test/integration/TimelockEntryPoint.t.sol | 981 ++++++++++++++++++++++ test/utils/MockTimelockAccount.sol | 44 + 2 files changed, 1025 insertions(+) create mode 100644 test/integration/TimelockEntryPoint.t.sol create mode 100644 test/utils/MockTimelockAccount.sol 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 {} +}