Merge pull request #76 from FilOzone/feat/fix-foundry-structure

Fix Foundry project structure

Author: aarshkshah1992

.github/workflows/makefile.yml

@@ -2,28 +2,26 @@ name: Makefile CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-
-    - name: configure
-      run: ./configure
+      - uses: actions/checkout@v4
 
-    - name: Run build
-      run: |
-        export PATH="/home/runner/.config/.foundry/bin:$PATH";
-        make build;
+      - name: configure
+        run: ./configure
 
+      - name: Run build
+        run: |
+          export PATH="/home/runner/.config/.foundry/bin:$PATH";
+          make build;
 
-    - name: Run tests
-      run: |
-        export PATH="/home/runner/.config/.foundry/bin:$PATH";
-        make test;
+      - name: Run tests
+        run: |
+          export PATH="/home/runner/.config/.foundry/bin:$PATH";
+          make test;

.gitignore

@@ -1,2 +1,12 @@
-# Visual Studio Code local configuration
+# IDE
 .vscode
+
+# Foundry
+cache/
+out/
+
+# System files
+.DS_Store
+
+# Configuration backups
+configure.backup

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "contracts/lib/forge-std"]
-	path = contracts/lib/forge-std
+[submodule "lib/forge-std"]
+	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "contracts/lib/openzeppelin-contracts"]
-	path = contracts/lib/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "contracts/lib/openzeppelin-contracts-upgradeable"]
-	path = contracts/lib/openzeppelin-contracts-upgradeable
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable

Makefile

@@ -1,23 +1,30 @@
 # Makefile for PDP Contracts
 
 # Variables
-RPC_URL ?= 
-KEYSTORE_PATH ?= 
-PASSWORD ?= 
-CHALLENGE_FINALITY ?= 
+RPC_URL ?=
+KEYSTORE_PATH ?=
+PASSWORD ?=
+CHALLENGE_FINALITY ?=
 
-# Targets
+# Default target
+.PHONY: all
+all: build test
+
+# Build target
+.PHONY: build
 build:
-	cd contracts && forge build
+	forge build
 
+# Test target
+.PHONY: test
 test:
-	cd contracts && forge test -vv
+	forge test -vv
 
+# Deployment targets
+.PHONY: deploy-calibnet
 deploy-calibnet:
-	cd contracts && ../tools/deploy-calibnet.sh
+	./tools/deploy-calibnet.sh
 
+.PHONY: deploy-devnet
 deploy-devnet:
-	cd contracts && ../tools/deploy-devnet.sh
-
-testBurnFee:
-	cd tools && ./testBurnFee.sh
+	./tools/deploy-devnet.sh