chore: isolate contracts in single directory (#5)

ithacaxyz · Oct 10, 2024 · 56639cb · 56639cb
1 parent 787564f
commit 56639cb
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "chapter1/contracts/lib/forge-std"]
+	path = chapter1/contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/chapter1/.gitmodules b/chapter1/.gitmodules
diff --git a/chapter1/README.md b/chapter1/README.md
@@ -0,0 +1,9 @@
+# Chapter 1
+
+## Structure
+
+- [contracts](./contracts): Solidity smart contracts powering the examples
+- [bls-multisig](./bls-multisig): Multisig based on BLS signatures verified through precompiles from EIP-2537
+- [eof](./eof): Introduction to EOF
+- [simple-7702](./simple-7702): Demo of full EIP-7702 flow with cast and forge
+- [delegate-p256](./delegate-p256): Account controlled by a P256 key through EIP-7702 and EIP-7212
diff --git a/chapter1/.gitignore → chapter1/contracts/.gitignore b/chapter1/.gitignore → chapter1/contracts/.gitignore
@@ -1,3 +1,2 @@
 cache/
 out/
-*.pem
diff --git a/chapter1/contracts/lib/forge-std b/chapter1/contracts/lib/forge-std
diff --git a/chapter1/contracts/BLSMultisig.sol → chapter1/contracts/src/BLSMultisig.sol b/chapter1/contracts/BLSMultisig.sol → chapter1/contracts/src/BLSMultisig.sol
diff --git a/chapter1/contracts/P256Delegation.sol → chapter1/contracts/src/P256Delegation.sol b/chapter1/contracts/P256Delegation.sol → chapter1/contracts/src/P256Delegation.sol
diff --git a/chapter1/contracts/Secp256r1.sol → chapter1/contracts/src/Secp256r1.sol b/chapter1/contracts/Secp256r1.sol → chapter1/contracts/src/Secp256r1.sol
diff --git a/...ter1/contracts/SimpleDelegateContract.sol → .../contracts/src/SimpleDelegateContract.sol b/...ter1/contracts/SimpleDelegateContract.sol → .../contracts/src/SimpleDelegateContract.sol
diff --git a/chapter1/contracts/libraries/BLS.sol → chapter1/contracts/src/libraries/BLS.sol b/chapter1/contracts/libraries/BLS.sol → chapter1/contracts/src/libraries/BLS.sol
diff --git a/chapter1/contracts/libraries/Secp256r1.sol → ...er1/contracts/src/libraries/Secp256r1.sol b/chapter1/contracts/libraries/Secp256r1.sol → ...er1/contracts/src/libraries/Secp256r1.sol
diff --git a/chapter1/test/P256.t.sol → chapter1/contracts/test/P256.t.sol b/chapter1/test/P256.t.sol → chapter1/contracts/test/P256.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.23;
 
 import {Test, console} from "forge-std/Test.sol";
-import {Secp256r1} from "../contracts/Secp256r1.sol";
+import {Secp256r1} from "../src/Secp256r1.sol";
 
 /// @notice A simple test demonstrating P256 signature verification.
 contract BLSTest is Test {

diff --git a/chapter1/foundry.toml b/chapter1/foundry.toml
@@ -1,7 +1,9 @@
 [profile.default]
-src = "contracts"
-out = "out"
-libs = ["lib"]
+src = "contracts/src"
+test = "contracts/test"
+out = "contracts/out"
+cache_path = "contracts/cache"
+libs = ["contracts/lib"]
 
 eof = true
 odyssey = true
diff --git a/chapter1/simple-7702/README.md b/chapter1/simple-7702/README.md
@@ -26,7 +26,7 @@ export BOB_PK="0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365
 - Deploy a contract which delegates calls from the user and executes on their behalf. The contract itself is very basic, it will delegate the call and emit an `Executed` event for debugging purposes:
 
 ```bash
-forge create contracts/SimpleDelegateContract.sol:SimpleDelegateContract --private-key $BOB_PK
+forge create SimpleDelegateContract --private-key $BOB_PK
 
 export SIMPLE_DELEGATE_ADDRESS="<enter-contract-address>"
 ```