chore: use soldeer

Author: johnson86tw

.gitignore

@@ -12,3 +12,7 @@ docs/
 
 # Dotenv file
 .env
+
+
+# Soldeer
+/dependencies

README.md

@@ -1,6 +1,6 @@
 # Modular7702
 
-Using OpenZeppelin, create a contract account that complies with ERC-4337 and ERC-7579 and is compatible with 7702.
+A modular contract account designed for delegation by EOAs and compatible with EntryPoint v0.8.
 
 ## Foundry
 

foundry.toml

@@ -1,6 +1,12 @@
 [profile.default]
 src = "src"
 out = "out"
-libs = ["lib"]
+libs = ["lib", "dependencies"]
+
+[dependencies]
+forge-std = "1.11.0"
+"oz-5.3" = { version = "5.3", git = "https://github.com/OpenZeppelin/openzeppelin-contracts", tag = "v5.3.0" }
+"oz-5.4" = { version = "5.4", git = "https://github.com/OpenZeppelin/openzeppelin-contracts", tag = "v5.4.0" }
+aa = { version = "0.8", git = "https://github.com/eth-infinitism/account-abstraction.git", tag = "v0.8.0" }
 
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

lib/account-abstraction

@@ -1,2 +1,4 @@
-aa-0.8=lib/account-abstraction/contracts
-oz-5.3=lib/openzeppelin-contracts/contracts
+aa-0.8/=dependencies/aa-0.8/contracts/
+forge-std/=dependencies/forge-std-1.11.0/src/
+oz-5.3/=dependencies/oz-5.3-5.3/contracts/
+oz-5.4/=dependencies/oz-5.4-5.4/contracts/

lib/forge-std

@@ -0,0 +1,24 @@
+[[dependencies]]
+name = "aa"
+version = "0.8"
+git = "https://github.com/eth-infinitism/account-abstraction.git"
+rev = "4cbc06072cdc19fd60f285c5997f4f7f57a588de"
+
+[[dependencies]]
+name = "forge-std"
+version = "1.11.0"
+url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_11_0_09-10-2025_06:23:22_forge-std-1.11.zip"
+checksum = "0290ef84c693dc9086f98f6a9b4a69dc5c2b6aa1cfe10a989bd1def1a456c099"
+integrity = "84aa7d32f8c7329468cf16f31f0f74e68072e634fdbde98f3bb00c6b136103b2"
+
+[[dependencies]]
+name = "oz-5.3"
+version = "5.3"
+git = "https://github.com/OpenZeppelin/openzeppelin-contracts"
+rev = "e4f70216d759d8e6a64144a9e1f7bbeed78e7079"
+
+[[dependencies]]
+name = "oz-5.4"
+version = "5.4"
+git = "https://github.com/OpenZeppelin/openzeppelin-contracts"
+rev = "c64a1edb67b6e3f4a15cca8909c9482ad33a02b0"

lib/openzeppelin-contracts

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.30;
+
+import {AccountERC7579, IERC7579AccountConfig} from "oz-5.4/account/extensions/draft-AccountERC7579.sol";
+// import {ERC7821} from "oz-5.4/account/extensions/draft-ERC7821.sol";
+
+contract Modular7702 is AccountERC7579 {
+     /// @inheritdoc IERC7579AccountConfig
+    function accountId() public pure override returns (string memory) {
+        // vendorname.accountname.semver
+        return "ethaccount.Modular7702.v0.0.1";
+    }
+}