event to emit userOpHash

bcnmy · Nov 9, 2023 · b55d847 · b55d847
1 parent 827877c
commit b55d847
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 112 deletions.
diff --git a/contracts/interfaces/paymasters/IVerifyingSingletonPaymaster.sol b/contracts/interfaces/paymasters/IVerifyingSingletonPaymaster.sol
@@ -31,7 +31,8 @@ interface IVerifyingSingletonPaymaster {
     );
     event GasBalanceDeducted(
         address indexed _paymasterId,
-        uint256 indexed _charge
+        uint256 indexed _charge,
+        bytes32 indexed userOpHash
     );
     event PremiumCollected(
         address indexed _paymasterId,

diff --git a/contracts/verifying/VerifyingSingletonPaymasterV2.sol b/contracts/verifying/VerifyingSingletonPaymasterV2.sol
@@ -234,7 +234,7 @@ contract VerifyingSingletonPaymasterV2 is
      */
     function _validatePaymasterUserOp(
         UserOperation calldata userOp,
-        bytes32 /*userOpHash*/,
+        bytes32 userOpHash,
         uint256 requiredPreFund
     ) internal override returns (bytes memory context, uint256 validationData) {
         (
@@ -281,7 +281,8 @@ contract VerifyingSingletonPaymasterV2 is
             paymasterId,
             dynamicMarkup,
             userOp.maxFeePerGas,
-            userOp.maxPriorityFeePerGas
+            userOp.maxPriorityFeePerGas,
+            userOpHash
         );
 
         return (context, _packValidationData(false, validUntil, validAfter));
@@ -323,8 +324,9 @@ contract VerifyingSingletonPaymasterV2 is
             address paymasterId,
             uint32 dynamicMarkup,
             uint256 maxFeePerGas,
-            uint256 maxPriorityFeePerGas
-        ) = abi.decode(context, (address, uint32, uint256, uint256));
+            uint256 maxPriorityFeePerGas,
+            bytes32 userOpHash
+        ) = abi.decode(context, (address, uint32, uint256, uint256, bytes32));
 
         uint256 effectiveGasPrice = getGasPrice(
             maxFeePerGas,
@@ -345,7 +347,7 @@ contract VerifyingSingletonPaymasterV2 is
         // "collect" premium
         paymasterIdBalances[feeCollector] += actualPremium;
 
-        emit GasBalanceDeducted(paymasterId, costIncludingPremium);
+        emit GasBalanceDeducted(paymasterId, costIncludingPremium, userOpHash);
         emit PremiumCollected(paymasterId, actualPremium);
     }
 }