Skip to content

Commit

Permalink
Split the 'nonce' field into 'nonceKey' and 'nonceSequence'
Browse files Browse the repository at this point in the history
  • Loading branch information
forshtat committed Sep 12, 2024
1 parent efd2337 commit 4ad2977
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
19 changes: 12 additions & 7 deletions contracts/interfaces/IRip7560EntryPoint.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,49 @@ interface IRip7560EntryPoint {
* @param sender - The account that generates this request.
* @param paymaster - If non-null, the paymaster that pays for this request.
* @param deployer - If non-null, the deployer that creates the sender contract.
* @param nonce - The nonce value from the request.
* @param nonceKey - The nonce key value from the request.
* @param nonceSequence - The nonce sequence value from the request.
* @param success - True if the sender transaction succeeded, false if reverted.
* @param actualGasCost - Actual amount paid (by account or paymaster) for this UserOperation.
* @param actualGasUsed - Total gas used by this UserOperation (including preVerification, creation,
* validation and execution).
*/

event RIP7560TransactionEvent(
address indexed sender,
address indexed paymaster,
address indexed deployer,
uint256 nonce,
uint256 nonceKey,
uint256 nonceSequence,
uint256 executionStatus
);

/**
* An event emitted if the RIP-7560 transaction "executionData" reverted with non-zero length.
* @param sender - The sender of this request.
* @param nonce - The nonce used in the request.
* @param nonceKey - The nonce key value from the request.
* @param nonceSequence - The nonce sequence value from the request.
* @param revertReason - The return bytes from the reverted "executionData" call.
*/
event RIP7560TransactionRevertReason(
address indexed sender,
uint256 nonce,
uint256 nonceKey,
uint256 nonceSequence,
bytes revertReason
);

/**
* An event emitted if the RIP-7560 transaction Paymaster's "postOp" call reverted with non-zero length.
* @param sender - The sender of this request.
* @param paymaster - The paymaster that pays for this request.
* @param nonce - The nonce used in the request.
* @param nonceKey - The nonce key value from the request.
* @param nonceSequence - The nonce sequence value from the request.
* @param revertReason - The return bytes from the reverted call to "postOp".
*/
event RIP7560TransactionPostOpRevertReason(
address indexed sender,
address indexed paymaster,
uint256 nonce,
uint256 nonceKey,
uint256 nonceSequence,
bytes revertReason
);
}
2 changes: 1 addition & 1 deletion contracts/interfaces/IRip7560Transaction.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.23;
struct RIP7560Transaction {
address sender;
uint256 nonceKey;
uint256 nonce;
uint256 nonceSequence;
uint256 validationGasLimit;
uint256 paymasterValidationGasLimit;
uint256 postOpGasLimit;
Expand Down

0 comments on commit 4ad2977

Please sign in to comment.