Merge branch 'DEV-3779'

.github/workflows/build.yml

@@ -8,16 +8,18 @@ on:
 
     workflow_dispatch:
 
-env:
-  DCAP_RISCZERO_IMAGE_ID: "0x83613a8beec226d1f29714530f1df791fa16c2c4dfcf22c50ab7edac59ca637f"
-
 jobs:
   check:
     strategy:
       fail-fast: true
 
     name: Foundry project
     runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: evm
+
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/slither.yml

@@ -18,6 +18,10 @@ jobs:
     env:
       commit_url: ${{ github.server_url }}/${{ github.repository }}/blob/${{ github.event.pull_request.head.sha }}/
 
+    defaults:
+      run:
+        working-directory: evm
+
     steps:
       - uses: actions/checkout@v3
 
@@ -32,16 +36,4 @@ jobs:
       - name: Upload SARIF file
         uses: github/codeql-action/upload-sarif@v3
         with:
-          sarif_file: ${{ steps.slither.outputs.sarif }}
-
-      # - name: Create/update checklist as PR comment
-      #   uses: actions/github-script@v7
-      #   if: github.event_name == 'pull_request'
-      #   env:
-      #     REPORT: ${{ steps.slither.outputs.stdout }}
-      #   with:
-      #     script: |
-      #       const script = require('.github/scripts/slither-comment')
-      #       const header = '# Slither report'
-      #       const body = process.env.REPORT
-      #       await script({ github, context, header, body })
+          sarif_file: ${{ steps.slither.outputs.sarif }}

.gitignore

@@ -1,13 +1,3 @@
-artifacts/
-cache*/
-node_modules/
-typechain-types/
 **/.DS_Store
-out/
-**/.env
-
-# Ignores development broadcast logs
-broadcast/**/31337/
-broadcast/**/run-*.json
-broadcast/**/dry-run/
-!broadcast/**/*-latest.json
+**/target
+**/.env

.gitmodules

@@ -1,13 +1,13 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
+[submodule "evm/lib/forge-std"]
+	path = evm/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/sp1-contracts"]
-	path = lib/sp1-contracts
-	url = https://github.com/succinctlabs/sp1-contracts
-[submodule "lib/risc0-ethereum"]
-	path = lib/risc0-ethereum
-	url = https://github.com/risc0/risc0-ethereum
-[submodule "lib/automata-on-chain-pccs"]
-	path = lib/automata-on-chain-pccs
+[submodule "evm/lib/automata-on-chain-pccs"]
+	path = evm/lib/automata-on-chain-pccs
 	url = https://github.com/automata-network/automata-on-chain-pccs
 	branch = main
+[submodule "evm/lib/sp1-contracts"]
+	path = evm/lib/sp1-contracts
+	url = https://github.com/succinctlabs/sp1-contracts
+[submodule "evm/lib/risc0-ethereum"]
+	path = evm/lib/risc0-ethereum
+	url = https://github.com/risc0/risc0-ethereum