Skip to content

Commit

Permalink
Merge branch 'develop' into AA-521-ep-7702
Browse files Browse the repository at this point in the history
  • Loading branch information
drortirosh committed Jan 29, 2025
2 parents 146dbbe + ee7fc8c commit 0860e41
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 1,832 deletions.
3 changes: 1 addition & 2 deletions contracts/core/BaseAccount.sol
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ abstract contract BaseAccount is IAccount {
function _payPrefund(uint256 missingAccountFunds) internal virtual {
if (missingAccountFunds != 0) {
(bool success, ) = payable(msg.sender).call{
value: missingAccountFunds,
gas: type(uint256).max
value: missingAccountFunds
}("");
(success);
//ignore failure (its EntryPoint's job to verify, not account.)
Expand Down
14 changes: 7 additions & 7 deletions contracts/interfaces/IAggregator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ import "./PackedUserOperation.sol";
*/
interface IAggregator {
/**
* Validate aggregated signature.
* Revert if the aggregated signature does not match the given list of operations.
* @param userOps - Array of UserOperations to validate the signature for.
* Validate an aggregated signature.
* Reverts if the aggregated signature does not match the given list of operations.
* @param userOps - An array of UserOperations to validate the signature for.
* @param signature - The aggregated signature.
*/
function validateSignatures(
PackedUserOperation[] calldata userOps,
bytes calldata signature
) external view;
) external;

/**
* Validate signature of a single userOp.
* Validate the signature of a single userOp.
* This method should be called by bundler after EntryPointSimulation.simulateValidation() returns
* the aggregator this account uses.
* First it validates the signature over the userOp. Then it returns data to be used when creating the handleOps.
Expand All @@ -34,8 +34,8 @@ interface IAggregator {
/**
* Aggregate multiple signatures into a single value.
* This method is called off-chain to calculate the signature to pass with handleOps()
* bundler MAY use optimized custom code perform this aggregation.
* @param userOps - Array of UserOperations to collect the signatures from.
* bundler MAY use optimized custom code to perform this aggregation.
* @param userOps - An array of UserOperations to collect the signatures from.
* @return aggregatedSignature - The aggregated signature.
*/
function aggregateSignatures(
Expand Down
4 changes: 2 additions & 2 deletions contracts/interfaces/IEntryPoint.sol
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ interface IEntryPoint is IStakeManager, INonceManager {
* @param userOpHash - The request unique identifier.
* @param sender - The sender of this request.
* @param nonce - The nonce used in the request.
* @param revertReason - The return bytes from the (reverted) call to "callData".
* @param revertReason - The return bytes from the reverted "callData" call.
*/
event UserOperationRevertReason(
bytes32 indexed userOpHash,
Expand All @@ -70,7 +70,7 @@ interface IEntryPoint is IStakeManager, INonceManager {
* @param userOpHash - The request unique identifier.
* @param sender - The sender of this request.
* @param nonce - The nonce used in the request.
* @param revertReason - The return bytes from the (reverted) call to "callData".
* @param revertReason - The return bytes from the reverted call to "postOp".
*/
event PostOpRevertReason(
bytes32 indexed userOpHash,
Expand Down
115 changes: 0 additions & 115 deletions contracts/samples/LegacyTokenPaymaster.sol

This file was deleted.

217 changes: 0 additions & 217 deletions contracts/samples/TokenPaymaster.sol

This file was deleted.

Loading

0 comments on commit 0860e41

Please sign in to comment.