Merge pull request #74 from rhinestonewtf/feature/monorepo

Feature/monorepo

.github/ISSUE_TEMPLATE/Safe7579_issue_template.md

@@ -0,0 +1,6 @@
+---
+name: Safe7579 Issue Template
+about: Use this template to report a bug in the Safe7579 module
+title: "[Safe7579]: [TITLE OF THE ISSUE]"
+labels: safe7579, modulekit
+---

.github/workflows/ci.yaml

@@ -0,0 +1,50 @@
+on:
+  - push
+  - pull_request
+
+jobs:
+  lint-modulekit:
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-lint-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/modulekit"
+
+  build-modulekit:
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-test-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/modulekit"
+
+  lint-safe7579:
+    needs: ["lint-modulekit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-lint-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/safe7579"
+
+  test-safe7579:
+    needs: ["build-modulekit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-test-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/safe7579"
+
+  lint-sessionkeymanager:
+    needs: ["lint-modulekit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-lint-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/sessionkeymanager"
+
+  test-sessionkeymanager:
+    needs: ["build-modulekit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-test-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/sessionkeymanager"
+
+  lint-modulekit-examples:
+    needs: ["lint-modulekit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-lint-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/modulekit-examples"
+
+  test-modulekit-examples:
+    needs: ["build-modulekit"]
+    uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-test-workspaces.yaml@main"
+    with:
+      match-workspace: "@rhinestone/modulekit-examples"

.gitignore

@@ -7,7 +7,7 @@ out/
 /broadcast/*/31337/
 /broadcast/**/dry-run/
 
-gas_calculations/*.json
+packages/modulekit/gas_calculations/*.json
 
 # Docs
 docs/

CHANGELOG.md

@@ -4,10 +4,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Common Changelog](https://common-changelog.org/).
 
+[0.3.1]: https://github.com/rhinestonewtf/modulekit/releases/tag/v0.3.1
 [0.3.0]: https://github.com/rhinestonewtf/modulekit/releases/tag/v0.3.0
 [0.2.0]: https://github.com/rhinestonewtf/modulekit/releases/tag/v0.2.0
 [0.1.0]: https://github.com/rhinestonewtf/modulekit/releases/tag/v0.1.0
 
+## [0.3.1] - 23-02-2024
+
+### Changed
+
+- File structure:
+  - `packages` now includes the core components
+  - `examples` now includes the example modules
+  - `accounts` includes the account integrations (the ERC-7579 reference implementation is currently inside the `packages/modulekit` package)
+- Support for the latest version of ERC-7579
+- Entrypoint address is now the official v0.7 EntryPoint address
+
+### Added
+
+- Module Examples are now in the `examples` folder
+
 ## [0.3.0] - 01-02-2024
 
 ### Changed

README.md

@@ -83,6 +83,26 @@ For feature or change requests, feel free to open a PR, start a discussion or ge
 
 For guidance on how to create PRs, see the [CONTRIBUTING](./CONTRIBUTING.md) guide.
 
+## Using this repo
+
+To install dependencies, run:
+
+```bash
+pnpm install
+```
+
+To build the project, run:
+
+```bash
+pnpm build
+```
+
+To run tests, run:
+
+```bash
+pnpm test -r
+```
+
 ## Credits
 
 - [Safe{Core} Protocol](https://github.com/safe-global/safe-core-protocol/): ExecutorManager.sol is heavily insprired by Safe's SafeProtocolManager but is compatible across all supported accounts

accounts/safe7579/.solhintignore

@@ -0,0 +1,2 @@
+node_modules/
+test/

src/accounts/safe/package.json → accounts/safe7579/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@rhinestone/safe-erc7579",
+  "name": "@rhinestone/safe7579",
   "description": "Safe ERC7579 implementation",
   "license": "MIT",
   "version": "0.1.0",
@@ -8,23 +8,26 @@
     "url": "https://rhinestone.wtf"
   },
   "bugs": {
-    "url": "https://github.com/rhinestonewtf/safe-erc7579/issues"
+    "url": "https://github.com/rhinestonewtf/modulekit/issues"
   },
   "devDependencies": {
-    "@openzeppelin/contracts": "5.0.1",
-    "@rhinestone/modulekit": "github:rhinestonewtf/modulekit",
+    "@rhinestone/modulekit": "workspace:*",
+    "@rhinestone/sessionkeymanager": "workspace:*",
     "@safe-global/safe-contracts": "^1.4.1",
-    "@rhinestone/sessionkeymanager": "github:rhinestonewtf/sessionkeymanager",
-    "account-abstraction": "github:eth-infinitism/account-abstraction#develop",
-    "ds-test": "github:dapphub/ds-test",
+    "@openzeppelin/contracts": "5.0.1",
+    "@ERC4337/account-abstraction": "github:kopy-kat/account-abstraction#develop",
+    "@ERC4337/account-abstraction-v0.6": "github:eth-infinitism/account-abstraction#v0.6.0",
+    "erc4337-validation": "github:rhinestonewtf/erc4337-validation",
+    "@prb/math": "^4.0.2",
     "forge-std": "github:foundry-rs/forge-std",
+    "ds-test": "github:dapphub/ds-test",
     "erc7579": "github:erc7579/erc7579-implementation",
-    "prettier": "^2.8.8",
     "sentinellist": "github:zeroknots/sentinellist",
     "solady": "github:vectorized/solady",
     "solarray": "github:sablier-labs/solarray",
+    "solmate": "github:transmissions11/solmate",
     "solhint": "^4.1.1",
-    "solmate": "github:transmissions11/solmate"
+    "prettier": "^2.8.8"
   },
   "files": [
     "artifacts",
@@ -33,7 +36,6 @@
     "CHANGELOG.md",
     "LICENSE-GPL.md"
   ],
-  "homepage": "https://github.com/rhinestonewtf/safe-erc7579/#readme",
   "keywords": [
     "blockchain",
     "ethereum",
@@ -45,8 +47,9 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": "github.com/rhinestonewtf/modulekit-examples",
+  "repository": "github.com/rhinestonewtf/modulekit",
   "scripts": {
+    "fmt": "forge fmt",
     "build": "forge build",
     "build:optimized": "FOUNDRY_PROFILE=optimized forge build",
     "build:smt": "FOUNDRY_PROFILE=smt forge build",

accounts/safe7579/remappings.txt

@@ -0,0 +1,15 @@
+ds-test/=node_modules/ds-test/src/
+forge-std/=node_modules/forge-std/src/
+account-abstraction/=node_modules/@ERC4337/account-abstraction/contracts/
+account-abstraction-v0.6/=node_modules/@ERC4337/account-abstraction-v0.6/contracts/
+erc7579/=node_modules/erc7579/src/
+sentinellist/=node_modules/sentinellist/src/
+solmate/=node_modules/solmate/src/
+solady/=node_modules/solady/
+solarray/=node_modules/solarray/src/
+@rhinestone/=node_modules/@rhinestone/
+@safe-global/=node_modules/@safe-global/
+@ERC4337/=node_modules/@ERC4337/
+@openzeppelin/=node_modules/@openzeppelin/
+@prb/math/=node_modules/@prb/math/
+erc4337-validation/=node_modules/erc4337-validation/src/