Skip to content

Commit dc32a13

Browse files
committed
Remove temporary sender variable (gas savings)
1 parent 6dbc718 commit dc32a13

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/Paymaster.sol

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ contract Paymaster is BasePaymaster {
4040
function getHash(UserOperation calldata userOp, uint48 validUntil, uint48 validAfter)
4141
public view returns (bytes32) {
4242
// can't use userOp.hash(), since it contains also the paymasterAndData itself.
43-
address sender = userOp.getSender();
4443
return keccak256(
4544
abi.encode(
46-
sender,
45+
userOp.getSender(),
4746
userOp.nonce,
4847
keccak256(userOp.initCode),
4948
keccak256(userOp.callData),

test/Paymaster.t.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ contract PaymasterTest is Test {
5959
UserOperation memory userOp = createUserOp();
6060
signUserOp(userOp);
6161

62-
vm.expectRevert(createEncodedValidationResult(false, 57198));
62+
vm.expectRevert(createEncodedValidationResult(false, 57193));
6363
entrypoint.simulateValidation(userOp);
6464
}
6565

@@ -71,7 +71,7 @@ contract PaymasterTest is Test {
7171
userOp.paymasterAndData = abi.encodePacked(address(paymaster), abi.encode(MOCK_VALID_UNTIL, MOCK_VALID_AFTER), r, s, v);
7272
signUserOp(userOp);
7373

74-
vm.expectRevert(createEncodedValidationResult(false, 55198));
74+
vm.expectRevert(createEncodedValidationResult(false, 55193));
7575
entrypoint.simulateValidation(userOp);
7676
}
7777

@@ -81,7 +81,7 @@ contract PaymasterTest is Test {
8181
userOp.paymasterAndData = abi.encodePacked(address(paymaster), abi.encode(MOCK_VALID_UNTIL, MOCK_VALID_AFTER), r, s, v);
8282
signUserOp(userOp);
8383

84-
vm.expectRevert(createEncodedValidationResult(true, 57204));
84+
vm.expectRevert(createEncodedValidationResult(true, 57199));
8585
entrypoint.simulateValidation(userOp);
8686
}
8787

0 commit comments

Comments
 (0)