Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/project build #2

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Fix/project build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c20eb
forge install: nexus
livingrockrises Jul 1, 2024
d01ace0
build dep fixes
livingrockrises Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions lib/forge-std
Open in desktop
Submodule forge-std added at 8948d4
1 change: 1 addition & 0 deletions lib/nexus
Open in desktop
Submodule nexus added at ab9616
1 change: 0 additions & 1 deletion lib/nexus.git
Open in desktop
Submodule nexus.git deleted from 5d81e5
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
26 changes: 13 additions & 13 deletions test/foundry/base/NexusTestBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion test/foundry/unit/concrete/TestSponsorshipPaymasterWithPremiumTest.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading