Merge pull request #1 from colinnielsen/colinnielsen/conference-prep

.github/workflows/e2e.yml

@@ -0,0 +1,55 @@
+name: End to end 🎉
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install Nargo
+        uses: noir-lang/[email protected]
+        with:
+          toolchain: v0.25.0
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      - name: Install node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20.14.0
+
+      - name: Install Dependencies
+        run: yarn
+
+      - name: Generate input data
+        run: yarn build --signers 8 --threshold 4
+
+      - name: Generate Noir Proof
+        run: |
+          cd circuits && nargo prove
+
+      - name: Run Forge build
+        run: |
+          forge install
+          forge --version
+          forge build --sizes
+        id: build
+
+      - name: Run Forge tests
+        run: |
+          forge test -vvv
+        id: test

.gitmodules

@@ -1,13 +1,16 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/solmate"]
-	path = lib/solmate
-	url = https://github.com/transmissions11/solmate
 [submodule "lib/zodiac"]
 	path = lib/zodiac
 	url = https://github.com/gnosis/zodiac
 	branch = v3.2.0
 [submodule "lib/safe-contracts"]
 	path = lib/safe-contracts
 	url = https://github.com/safe-global/safe-contracts
+[submodule "lib/safe-tools"]
+	path = lib/safe-tools
+	url = https://github.com/colinnielsen/safe-tools
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/solady"]
+	path = lib/solady
+	url = https://github.com/vectorized/solady

README.md

@@ -17,3 +17,18 @@
 ```
 
 </details>
+
+## Setup
+
+```bash
+yarn && yarn build
+```
+
+## Run tests
+```bash
+yarn && yarn build
+
+cd circuits/ && nargo prove
+
+forge test
+```

circuits/Verifier.toml

@@ -1,2 +1,2 @@
-polynomial_commitment = "0x1cfc1a47f685254dc823b19b42f242b7a3fb46309ec46133375cf3dce305a07d"
-safe_message_hash = ["0x000000000000000000000000000000000000000000000000000000000000004a", "0x000000000000000000000000000000000000000000000000000000000000005c", "0x000000000000000000000000000000000000000000000000000000000000005d", "0x0000000000000000000000000000000000000000000000000000000000000045", "0x0000000000000000000000000000000000000000000000000000000000000047", "0x0000000000000000000000000000000000000000000000000000000000000021", "0x00000000000000000000000000000000000000000000000000000000000000bb", "0x00000000000000000000000000000000000000000000000000000000000000bb", "0x0000000000000000000000000000000000000000000000000000000000000025", "0x0000000000000000000000000000000000000000000000000000000000000054", "0x000000000000000000000000000000000000000000000000000000000000000c", "0x0000000000000000000000000000000000000000000000000000000000000033", "0x0000000000000000000000000000000000000000000000000000000000000017", "0x0000000000000000000000000000000000000000000000000000000000000052", "0x000000000000000000000000000000000000000000000000000000000000001e", "0x0000000000000000000000000000000000000000000000000000000000000071", "0x00000000000000000000000000000000000000000000000000000000000000c3", "0x0000000000000000000000000000000000000000000000000000000000000073", "0x00000000000000000000000000000000000000000000000000000000000000ae", "0x0000000000000000000000000000000000000000000000000000000000000036", "0x0000000000000000000000000000000000000000000000000000000000000045", "0x000000000000000000000000000000000000000000000000000000000000008f", "0x0000000000000000000000000000000000000000000000000000000000000096", "0x000000000000000000000000000000000000000000000000000000000000000d", "0x000000000000000000000000000000000000000000000000000000000000002a", "0x00000000000000000000000000000000000000000000000000000000000000d4", "0x000000000000000000000000000000000000000000000000000000000000006e", "0x00000000000000000000000000000000000000000000000000000000000000f0", "0x0000000000000000000000000000000000000000000000000000000000000088", "0x0000000000000000000000000000000000000000000000000000000000000011", "0x000000000000000000000000000000000000000000000000000000000000000e", "0x0000000000000000000000000000000000000000000000000000000000000095"]
+polynomial_hash = "0x1c0f77c14180093bedc9799e658832ba2310436d96d4aad45ed5f98148abfec2"
+safe_message_hash = ["0x000000000000000000000000000000000000000000000000000000000000004e", "0x00000000000000000000000000000000000000000000000000000000000000b2", "0x0000000000000000000000000000000000000000000000000000000000000081", "0x00000000000000000000000000000000000000000000000000000000000000e3", "0x000000000000000000000000000000000000000000000000000000000000004a", "0x00000000000000000000000000000000000000000000000000000000000000cf", "0x0000000000000000000000000000000000000000000000000000000000000015", "0x0000000000000000000000000000000000000000000000000000000000000036", "0x0000000000000000000000000000000000000000000000000000000000000072", "0x00000000000000000000000000000000000000000000000000000000000000ba", "0x0000000000000000000000000000000000000000000000000000000000000005", "0x0000000000000000000000000000000000000000000000000000000000000018", "0x00000000000000000000000000000000000000000000000000000000000000ed", "0x0000000000000000000000000000000000000000000000000000000000000017", "0x00000000000000000000000000000000000000000000000000000000000000e3", "0x0000000000000000000000000000000000000000000000000000000000000023", "0x0000000000000000000000000000000000000000000000000000000000000087", "0x00000000000000000000000000000000000000000000000000000000000000dc", "0x000000000000000000000000000000000000000000000000000000000000006b", "0x0000000000000000000000000000000000000000000000000000000000000064", "0x000000000000000000000000000000000000000000000000000000000000000f", "0x0000000000000000000000000000000000000000000000000000000000000008", "0x0000000000000000000000000000000000000000000000000000000000000035", "0x00000000000000000000000000000000000000000000000000000000000000fa", "0x00000000000000000000000000000000000000000000000000000000000000fc", "0x00000000000000000000000000000000000000000000000000000000000000a9", "0x00000000000000000000000000000000000000000000000000000000000000dc", "0x0000000000000000000000000000000000000000000000000000000000000052", "0x00000000000000000000000000000000000000000000000000000000000000e6", "0x0000000000000000000000000000000000000000000000000000000000000036", "0x00000000000000000000000000000000000000000000000000000000000000ac", "0x0000000000000000000000000000000000000000000000000000000000000079"]