Add 'nonceKey' field to the 'RIP7560Transaction' struct; rename

eth-infinitism · Aug 18, 2024 · 0feebee · 0feebee
1 parent c2bcda1
commit 0feebee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/contracts/interfaces/IRip7560Transaction.sol b/contracts/interfaces/IRip7560Transaction.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.23;
 
-struct RIP7560TransactionStruct {
+struct RIP7560Transaction {
     address sender;
+    uint256 nonceKey;
     uint256 nonce;
     uint256 validationGasLimit;
     uint256 paymasterValidationGasLimit;

diff --git a/contracts/utils/RIP7560Utils.sol b/contracts/utils/RIP7560Utils.sol
@@ -11,9 +11,9 @@ library RIP7560Utils {
     //struct version, as defined in RIP-7560
     uint constant VERSION = 0;
 
-    function decodeTransaction(uint256 version, bytes calldata transaction) internal pure returns (RIP7560TransactionStruct memory) {
+    function decodeTransaction(uint256 version, bytes calldata transaction) internal pure returns (RIP7560Transaction memory) {
         require(version == VERSION, "RIP7560Utils: unsupported version");
-        return abi.decode(transaction, (RIP7560TransactionStruct));
+        return abi.decode(transaction, (RIP7560Transaction));
     }
 
     function accountAcceptTransaction(