diff --git a/contracts/interfaces/PackedUserOperation.sol b/contracts/interfaces/PackedUserOperation.sol index 355f646a..fe20de56 100644 --- a/contracts/interfaces/PackedUserOperation.sol +++ b/contracts/interfaces/PackedUserOperation.sol @@ -10,7 +10,7 @@ pragma solidity >=0.7.5; * @param accountGasLimits - Packed gas limits for validateUserOp and gas limit passed to the callData method call. * @param preVerificationGas - Gas not calculated by the handleOps method, but added to the gas paid. * Covers batch overhead. - * @param gasFees - packed gas fields maxFeePerGas and maxPriorityFeePerGas - Same as EIP-1559 gas parameter. + * @param gasFees - packed gas fields maxPriorityFeePerGas and maxFeePerGas - Same as EIP-1559 gas parameters. * @param paymasterAndData - If set, this field holds the paymaster address, verification gas limit, postOp gas limit and paymaster-specific extra data * The paymaster will pay for the transaction instead of the sender. * @param signature - Sender-verified signature over the entire request, the EntryPoint address and the chain ID. @@ -22,7 +22,7 @@ struct PackedUserOperation { bytes callData; bytes32 accountGasLimits; uint256 preVerificationGas; - bytes32 gasFees; //maxPriorityFee and maxFeePerGas; + bytes32 gasFees; bytes paymasterAndData; bytes signature; } diff --git a/reports/gas-checker.txt b/reports/gas-checker.txt index 0db74a13..16e5f434 100644 --- a/reports/gas-checker.txt +++ b/reports/gas-checker.txt @@ -4,7 +4,7 @@ ╔══════════════════════════╤════════╗ ║ gas estimate "simple" │ 28979 ║ ╟──────────────────────────┼────────╢ -║ gas estimate "big tx 5k" │ 125212 ║ +║ gas estimate "big tx 5k" │ 125224 ║ ╚══════════════════════════╧════════╝ ╔════════════════════════════════╤═══════╤═══════════════╤════════════════╤═════════════════════╗ @@ -12,44 +12,44 @@ ║ │ │ │ (delta for │ (compared to ║ ║ │ │ │ one UserOp) │ account.exec()) ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ simple │ 1 │ 79970 │ │ ║ +║ simple │ 1 │ 79994 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ ║ simple - diff from previous │ 2 │ │ 42192 │ 13213 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ simple │ 10 │ 459825 │ │ ║ +║ simple │ 10 │ 459909 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ ║ simple - diff from previous │ 11 │ │ 42295 │ 13316 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ simple paymaster │ 1 │ 86125 │ │ ║ +║ simple paymaster │ 1 │ 86113 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ simple paymaster with diff │ 2 │ │ 41060 │ 12081 ║ +║ simple paymaster with diff │ 2 │ │ 41072 │ 12093 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ simple paymaster │ 10 │ 455660 │ │ ║ +║ simple paymaster │ 10 │ 455732 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ simple paymaster with diff │ 11 │ │ 41136 │ 12157 ║ +║ simple paymaster with diff │ 11 │ │ 41040 │ 12061 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ big tx 5k │ 1 │ 181014 │ │ ║ +║ big tx 5k │ 1 │ 181038 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ big tx - diff from previous │ 2 │ │ 142702 │ 17490 ║ +║ big tx - diff from previous │ 2 │ │ 142678 │ 17454 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ big tx 5k │ 10 │ 1465359 │ │ ║ +║ big tx 5k │ 10 │ 1465467 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ big tx - diff from previous │ 11 │ │ 142758 │ 17546 ║ +║ big tx - diff from previous │ 11 │ │ 142686 │ 17462 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ paymaster+postOp │ 1 │ 87748 │ │ ║ +║ paymaster+postOp │ 1 │ 87736 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ paymaster+postOp with diff │ 2 │ │ 42647 │ 13668 ║ +║ paymaster+postOp with diff │ 2 │ │ 42659 │ 13680 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ paymaster+postOp │ 10 │ 471838 │ │ ║ +║ paymaster+postOp │ 10 │ 471826 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ paymaster+postOp with diff │ 11 │ │ 42644 │ 13665 ║ +║ paymaster+postOp with diff │ 11 │ │ 42692 │ 13713 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ token paymaster │ 1 │ 128753 │ │ ║ +║ token paymaster │ 1 │ 128765 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ token paymaster with diff │ 2 │ │ 66410 │ 37431 ║ +║ token paymaster with diff │ 2 │ │ 66398 │ 37419 ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ token paymaster │ 10 │ 726456 │ │ ║ +║ token paymaster │ 10 │ 726504 │ │ ║ ╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢ -║ token paymaster with diff │ 11 │ │ 66442 │ 37463 ║ +║ token paymaster with diff │ 11 │ │ 66454 │ 37475 ║ ╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝