Merge branch 'develop' into feat/btpm-new-deployment-scripts

bcnmy · Jan 31, 2024 · f7825c8 · f7825c8
2 parents 2544456 + 61152d7
commit f7825c8
Show file tree

Hide file tree

Showing 57 changed files with 422 additions and 4,336 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,11 @@
-[submodule "lib/account-abstraction"]
-	path = lib/account-abstraction
-	url = https://github.com/eth-infinitism/account-abstraction
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/scw-contracts"]
 	path = lib/scw-contracts
 	url = https://github.com/bcnmy/scw-contracts
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = develop
+[submodule "lib/account-abstraction"]
+	path = lib/account-abstraction
+	url = https://github.com/eth-infinitism/account-abstraction
+	tag = v0.6.0
diff --git a/.solhint.json b/.solhint.json
@@ -1,7 +1,7 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "compiler-version": ["error", "0.8.20"],
+    "compiler-version": ["error", "0.8.23"],
     "func-visibility": ["warn", { "ignoreConstructors": true }],
     "reentrancy": "error",
     "state-visibility": "error",

diff --git a/contracts/BasePaymaster.sol b/contracts/BasePaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /* solhint-disable reason-string */
 

diff --git a/contracts/common/Errors.sol b/contracts/common/Errors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 contract BasePaymasterErrors {
     /**

diff --git a/contracts/deployer/Create3.sol b/contracts/deployer/Create3.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * @title A library for deploying contracts EIP-3171 style.

diff --git a/contracts/deployer/Deployer.sol b/contracts/deployer/Deployer.sol
@@ -1,5 +1,5 @@
 //SPDX-License-Identifier: Unlicense
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "./Create3.sol";
 

diff --git a/contracts/interfaces/IWETH9.sol b/contracts/interfaces/IWETH9.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/interfaces/paymasters/IBiconomyTokenPaymaster.sol b/contracts/interfaces/paymasters/IBiconomyTokenPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface IBiconomyTokenPaymaster {
     /**

diff --git a/contracts/interfaces/paymasters/ISponsorshipPaymaster.sol b/contracts/interfaces/paymasters/ISponsorshipPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 interface ISponsorshipPaymaster {
     event EPGasOverheadChanged(uint256 indexed _oldValue, uint256 indexed _newValue);

diff --git a/contracts/libs/AddressUtils.sol b/contracts/libs/AddressUtils.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 /**
  * Utility library of inline functions on addresses

diff --git a/contracts/libs/CalldataHelper.sol b/contracts/libs/CalldataHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 library CalldataHelper {
     function calldataKeccak(bytes calldata data) internal pure returns (bytes32 ret) {

diff --git a/contracts/libs/MathLib.sol b/contracts/libs/MathLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.23;
 
 library MathLib {
     function minuint256(uint256 a, uint256 b) internal pure returns (uint256 result) {

diff --git a/contracts/references/AdvancedVerifyingPaymaster.sol b/contracts/references/AdvancedVerifyingPaymaster.sol