Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump #2

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: bump #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7309da4
chore: patch v0.7 entrypoint
shunkakinoki Sep 15, 2024
4ce136f
chore: update solady path
shunkakinoki Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/MagicSpend.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {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";

Expand Down Expand Up @@ -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)
Expand All @@ -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.
Expand Down