bcnmy · livingrockrises · Jul 11, 2024 · Jun 26, 2024 · Jun 27, 2024 · Jun 27, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "lib/nexus"]
+	path = lib/nexus
+	url = https://github.com/bcnmy/nexus
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/.solhint.json b/.solhint.json
@@ -1,7 +1,7 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "compiler-version": ["error", "^0.8.24"],
+    "compiler-version": ["error", "^0.8.26"],
     "func-visibility": ["warn", { "ignoreConstructors": true }],
     "reentrancy": "error",
     "state-visibility": "error",

diff --git a/contracts/base/BasePaymaster.sol b/contracts/base/BasePaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.24;
+pragma solidity ^0.8.26;
 
 /* 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.24;
+pragma solidity ^0.8.26;
 
 contract BiconomySponsorshipPaymasterErrors {
 

diff --git a/contracts/interfaces/IBiconomySponsorshipPaymaster.sol b/contracts/interfaces/IBiconomySponsorshipPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.24;
+pragma solidity ^0.8.26;
 
 interface IBiconomySponsorshipPaymaster {
     event PostopCostChanged(uint256 indexed _oldValue, uint256 indexed _newValue);

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

diff --git a/contracts/mocks/MockValidator.sol b/contracts/mocks/MockValidator.sol
@@ -1,3 +1,3 @@
-pragma solidity ^0.8.24;
+pragma solidity ^0.8.26;
 
 import "@biconomy-devx/erc7579-msa/test/foundry/mocks/MockValidator.sol";
diff --git a/contracts/references/SampleVerifyingPaymaster.sol b/contracts/references/SampleVerifyingPaymaster.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity ^0.8.24;
+pragma solidity ^0.8.26;
 
 /* solhint-disable reason-string */
 /* solhint-disable no-inline-assembly */

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

diff --git a/contracts/test/Foo.sol b/contracts/test/Foo.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.26;
 
 /**
  * @title Foo

diff --git a/contracts/test/Lock.sol b/contracts/test/Lock.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.24;
+pragma solidity ^0.8.26;
 
 /**
  * @title Lock

diff --git a/contracts/utils/SoladyOwnable.sol b/contracts/utils/SoladyOwnable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.24;
+pragma solidity ^0.8.26;
 
 import {Ownable} from "solady/src/auth/Ownable.sol";
 

diff --git a/foundry.toml b/foundry.toml
@@ -11,7 +11,7 @@
   optimizer_runs = 1_000_000
   out = "out"
   script = "scripts"
-  solc = "0.8.24"
+  solc = "0.8.26"
   src = "contracts"
   test = "test"
   cache_path  = "cache_forge"

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -5,7 +5,7 @@ import "@bonadocs/docgen";
 
 const config: HardhatUserConfig = {
   solidity: {
-    version: "0.8.24",
+    version: "0.8.26",
     settings: {
       optimizer: {
         enabled: true,

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/nexus b/lib/nexus
diff --git a/package.json b/package.json
@@ -31,7 +31,6 @@
     "chai": "^4.3.7",
     "codecov": "^3.8.3",
     "ethers": "^6.11.1",
-    "forge-std": "github:foundry-rs/forge-std#v1.7.6",
     "hardhat-deploy": "^0.11.45",
     "hardhat-deploy-ethers": "^0.4.1",
     "hardhat-gas-reporter": "^1.0.10",

diff --git a/remappings.txt b/remappings.txt
@@ -1,7 +1,8 @@
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
 @prb/test/=node_modules/@prb/test/
-forge-std/=node_modules/forge-std/
+nexus/=lib/nexus/
+forge-std/=lib/forge-std/
 account-abstraction=node_modules/account-abstraction/
 modulekit/=node_modules/modulekit/src/
 sentinellist/=node_modules/sentinellist/
-solady/=node_modules/solady
+solady/=node_modules/solady
diff --git a/test/foundry/Lock.t.sol b/test/foundry/Lock.t.sol