From 7309da4d34abf90c1e88163f399850571382dcd3 Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Sun, 15 Sep 2024 09:21:39 +0900 Subject: [PATCH 1/2] chore: patch v0.7 entrypoint --- src/MagicSpend.sol | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/MagicSpend.sol b/src/MagicSpend.sol index f49df08..23c32f1 100644 --- a/src/MagicSpend.sol +++ b/src/MagicSpend.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity ^0.8.23; import {Ownable} from "solady/src/auth/Ownable.sol"; import {SignatureCheckerLib} from "solady/src/utils/SignatureCheckerLib.sol"; import {SafeTransferLib} from "solady/src/utils/SafeTransferLib.sol"; -import {UserOperation} from "account-abstraction/interfaces/UserOperation.sol"; +import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol"; import {IPaymaster} from "account-abstraction/interfaces/IPaymaster.sol"; import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol"; @@ -118,7 +118,7 @@ contract MagicSpend is Ownable, IPaymaster { receive() external payable {} /// @inheritdoc IPaymaster - function validatePaymasterUserOp(UserOperation calldata userOp, bytes32, uint256 maxCost) + function validatePaymasterUserOp(PackedUserOperation calldata userOp, bytes32, uint256 maxCost) external onlyEntryPoint returns (bytes memory context, uint256 validationData) @@ -145,10 +145,12 @@ contract MagicSpend is Ownable, IPaymaster { } /// @inheritdoc IPaymaster - function postOp(IPaymaster.PostOpMode mode, bytes calldata context, uint256 actualGasCost) - external - onlyEntryPoint - { + function postOp( + IPaymaster.PostOpMode mode, + bytes calldata context, + uint256 actualGasCost, + uint256 actualUserOpFeePerGas + ) external onlyEntryPoint { // `PostOpMode.postOpReverted` should never happen. // The flow here can only revert if there are > maxWithdrawDenominator // withdraws in the same transaction, which should be highly unlikely. From 4ce136f80e66bd287d32df4d4cf165c7dff7486b Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Mon, 14 Oct 2024 18:51:05 +0900 Subject: [PATCH 2/2] chore: update solady path --- src/MagicSpend.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MagicSpend.sol b/src/MagicSpend.sol index 23c32f1..a9e4156 100644 --- a/src/MagicSpend.sol +++ b/src/MagicSpend.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.23; -import {Ownable} from "solady/src/auth/Ownable.sol"; -import {SignatureCheckerLib} from "solady/src/utils/SignatureCheckerLib.sol"; -import {SafeTransferLib} from "solady/src/utils/SafeTransferLib.sol"; +import {Ownable} from "solady/auth/Ownable.sol"; +import {SignatureCheckerLib} from "solady/utils/SignatureCheckerLib.sol"; +import {SafeTransferLib} from "solady/utils/SafeTransferLib.sol"; import {PackedUserOperation} from "account-abstraction/interfaces/PackedUserOperation.sol"; import {IPaymaster} from "account-abstraction/interfaces/IPaymaster.sol"; import {IEntryPoint} from "account-abstraction/interfaces/IEntryPoint.sol";