Merge pull request #2 from bcnmy/fix/project-build

Fix/project build

.gitmodules

@@ -1,3 +1,6 @@
-[submodule "lib/nexus.git"]
-	path = lib/nexus.git
-	url = https://github.com/bcnmy/nexus.git
+[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

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",

remappings.txt

@@ -1,9 +1,8 @@
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
 @prb/test/=node_modules/@prb/test/
-@nexus/=lib/nexus.git/
-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
-ds-test/=node_modules/ds-test/src/

test/foundry/base/NexusTestBase.sol

@@ -13,14 +13,14 @@ import { EntryPoint } from "account-abstraction/contracts/core/EntryPoint.sol";
 import { IEntryPoint } from "account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import { PackedUserOperation } from "account-abstraction/contracts/interfaces/PackedUserOperation.sol";
 
-import { Nexus } from "@nexus/contracts/Nexus.sol";
-import { NexusAccountFactory } from "@nexus/contracts/factory/NexusAccountFactory.sol";
-import { BiconomyMetaFactory } from "@nexus/contracts/factory/BiconomyMetaFactory.sol";
-import { MockValidator } from "@nexus/contracts/mocks/MockValidator.sol";
-import { MockHook } from "@nexus/contracts/mocks/MockHook.sol";
-// import { MockExecutor } from "@nexus/contracts/mocks/MockExecutor.sol";
-import { MockHandler } from "@nexus/contracts/mocks/MockHandler.sol";
-import { BootstrapLib } from "@nexus/contracts/lib/BootstrapLib.sol";
+import { Nexus } from "nexus/contracts/Nexus.sol";
+import { NexusAccountFactory } from "nexus/contracts/factory/NexusAccountFactory.sol";
+import { BiconomyMetaFactory } from "nexus/contracts/factory/BiconomyMetaFactory.sol";
+import { MockValidator } from "nexus/contracts/mocks/MockValidator.sol";
+import { MockHook } from "nexus/contracts/mocks/MockHook.sol";
+// import { MockExecutor } from "nexus/contracts/mocks/MockExecutor.sol";
+import { MockHandler } from "nexus/contracts/mocks/MockHandler.sol";
+import { BootstrapLib } from "nexus/contracts/lib/BootstrapLib.sol";
 import {
     ModeLib,
     ExecutionMode,
@@ -30,11 +30,11 @@ import {
     CALLTYPE_SINGLE,
     EXECTYPE_DEFAULT,
     EXECTYPE_TRY
-} from "@nexus/contracts/lib/ModeLib.sol";
-// import { ExecLib, Execution } from "@nexus/contracts/lib/ExecLib.sol";
-import { Bootstrap, BootstrapConfig } from "@nexus/contracts/utils/Bootstrap.sol";
-import { CheatCodes } from "@nexus/test/foundry/utils/CheatCodes.sol";
-import { EventsAndErrors } from "@nexus/test/foundry/utils/EventsAndErrors.sol";
+} from "nexus/contracts/lib/ModeLib.sol";
+// import { ExecLib, Execution } from "nexus/contracts/lib/ExecLib.sol";
+import { Bootstrap, BootstrapConfig } from "nexus/contracts/utils/Bootstrap.sol";
+import { CheatCodes } from "nexus/test/foundry/utils/CheatCodes.sol";
+import { EventsAndErrors } from "nexus/test/foundry/utils/EventsAndErrors.sol";
 
 import { BiconomySponsorshipPaymaster } from "../../../contracts/sponsorship/SponsorshipPaymasterWithPremium.sol";
 

test/foundry/unit/concrete/TestSponsorshipPaymasterWithPremiumTest.t.sol

@@ -28,7 +28,7 @@ contract TestSponsorshipPaymasterWithPremium is NexusTestBase {
         assertEq(testArtifact.feeCollector(), PAYMASTER_FEE_COLLECTOR.addr);
     }
 
-    function test_CheckInitialPaymasterState() external {
+    function test_CheckInitialPaymasterState() external view {
         assertEq(bicoPaymaster.owner(), PAYMASTER_OWNER.addr);
         assertEq(address(bicoPaymaster.entryPoint()), ENTRYPOINT_ADDRESS);
         assertEq(bicoPaymaster.verifyingSigner(), PAYMASTER_SIGNER.addr);