Skip to content

Commit

Permalink
Fix missing @openzeppelin/contracts dependecy in contracts package, u…
Browse files Browse the repository at this point in the history 
…pdate its imports in the entrypoint contract (#445)

* Fix missing @openzeppelin/contracts dependecy in contracts package, update its imports in the entrypoint contract
  • Loading branch information
@mmv08
mmv08 authored Feb 8, 2024
1 parent 12898d4 commit c1c2aab
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
7 changes: 3 additions & 4 deletions contracts/core/EntryPoint.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import "./Helpers.sol";
import "./NonceManager.sol";
import "./UserOperationLib.sol";

// we also require '@gnosis.pm/safe-contracts' and both libraries have 'IERC165.sol', leading to conflicts
import "@openzeppelin/contracts/utils/introspection/ERC165.sol" as OpenZeppelin;
import "@openzeppelin/contracts/utils/introspection/ERC165.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";

/*
Expand All @@ -25,7 +24,7 @@ import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
*/

/// @custom:security-contact https://bounty.ethereum.org
contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuard, OpenZeppelin.ERC165 {
contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuard, ERC165 {

using UserOperationLib for PackedUserOperation;

Expand All @@ -45,7 +44,7 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuard,
uint256 private constant REVERT_REASON_MAX_LEN = 2048;
uint256 private constant PENALTY_PERCENT = 10;

/// @inheritdoc OpenZeppelin.IERC165
/// @inheritdoc IERC165
function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
// note: solidity "type(IEntryPoint).interfaceId" is without inherited methods but we want to check everything
return interfaceId == (type(IEntryPoint).interfaceId ^ type(IStakeManager).interfaceId ^ type(INonceManager).interfaceId) ||
Expand Down
1 change: 1 addition & 0 deletions contracts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"url": "https://github.com/eth-infinitism/account-abstraction/issues"
},
"devDependencies": {
"@openzeppelin/contracts": "^5.0.0",
"@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1",
"@uniswap/v3-periphery": "^1.4.3"
Expand Down
26 changes: 13 additions & 13 deletions reports/gas-checker.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,42 +14,42 @@
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple │ 1 │ 79958 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple - diff from previous │ 2 │ │ 42144 │ 13165 ║
║ simple - diff from previous │ 2 │ │ 42156 │ 13177 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple │ 10 │ 459513 │ │ ║
║ simple │ 10 │ 459549 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple - diff from previous │ 11 │ │ 42259 │ 13280 ║
║ simple - diff from previous │ 11 │ │ 42211 │ 13232 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster │ 1 │ 86060 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster with diff │ 2 │ │ 40971 │ 11992 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster │ 10 │ 454950 │ │ ║
║ simple paymaster │ 10 │ 454974 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ simple paymaster with diff │ 11 │ │ 41011 │ 12032 ║
║ simple paymaster with diff │ 11 │ │ 40975 │ 11996 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx 5k │ 1 │ 181002 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx - diff from previous │ 2 │ │ 142630 │ 17406 ║
║ big tx - diff from previous │ 2 │ │ 142666 │ 17442 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx 5k │ 10 │ 1465059 │ │ ║
║ big tx 5k │ 10 │ 1465047 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ big tx - diff from previous │ 11 │ │ 142698 │ 17474 ║
║ big tx - diff from previous │ 11 │ │ 142710 │ 17486 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ paymaster+postOp │ 1 │ 87689 │ │ ║
║ paymaster+postOp │ 1 │ 87725 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ paymaster+postOp with diff │ 2 │ │ 42648 │ 13669 ║
║ paymaster+postOp with diff │ 2 │ │ 42636 │ 13657 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ paymaster+postOp │ 10 │ 471608 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ paymaster+postOp with diff │ 11 │ │ 42681 │ 13702 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ token paymaster │ 1 │ 128754 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ token paymaster with diff │ 2 │ │ 66363 │ 37384 ║
║ token paymaster with diff │ 2 │ │ 66351 │ 37372 ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ token paymaster │ 10 │ 726286 │ │ ║
║ token paymaster │ 10 │ 726214 │ │ ║
╟────────────────────────────────┼───────┼───────────────┼────────────────┼─────────────────────╢
║ token paymaster with diff │ 11 │ │ 66371 │ 37392 ║
║ token paymaster with diff │ 11 │ │ 66467 │ 37488 ║
╚════════════════════════════════╧═══════╧═══════════════╧════════════════╧═════════════════════╝

0 comments on commit c1c2aab

Please sign in to comment.