Compile contracts on CI too

.github/workflows/rust.yml

@@ -19,19 +19,24 @@ jobs:
         uses: actions/cache@v3
         with:
           path: circuits/
-          key: cache-circuits-${{ hashFiles('**/out') }}
+          key: cache-circuits-${{ hashFiles('**/*.zok') }}
       - name: Compile circuit
         if: steps.cache-circuits.outputs.cache-hit != 'true'
-        run: cd circuits && zokrates compile -i fusion.zok
+        run: cd circuits && make
       - name: Compute trusted setup
         if: steps.cache-circuits.outputs.cache-hit != 'true'
-        run: cd circuits && zokrates setup
+        run: cd circuits && make setup
+      - name: Generate Solidity verifier
+        if: steps.cache-circuits.outputs.cache-hit != 'true'
+        run: cd circuits && make verifier
 
   build:
     needs: build_circuit
     runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: recursive
       - name: ⚡ Cache Cargo
         uses: actions/cache@v3
         with:
@@ -51,11 +56,15 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: circuits/
-          key: cache-circuits-${{ hashFiles('**/out') }}
+          key: cache-circuits-${{ hashFiles('**/*.zok') }}
+      - name: Compile contracts
+        run: cd l1-verifier && make
+      - name: Format contract Rust bindings
+        run: cd l1-verifier/out/bindings && cargo fmt
       - name: Build
-        run: cargo build
+        run: cargo build --release
       - name: Run tests
-        run: cargo test
+        run: cargo test --release -- --nocapture
       - name: Lint
         run: cargo clippy --all --all-features -- -D warnings
       - name: Format

circuits/Makefile

@@ -6,6 +6,7 @@ setup:
 
 verifier:
 	zokrates export-verifier
+	sed -i -e '204,217d' verifier.sol
 
 clean:
 	rm abi.json out out.r1cs out.wtns witness verification.key proof.json verifier.sol

fusion-sequencer/src/sequencer.rs

@@ -233,7 +233,6 @@ mod test {
         assert_eq!(acc_2.nonce, 3.into());
     }
 
-    #[ignore]
     #[tokio::test(flavor = "multi_thread")]
     async fn end_to_end_simple() {
         let anvil_config = NodeConfig::test();
@@ -297,7 +296,6 @@ mod test {
         assert_eq!(contract.root().call().await.unwrap(), state.root());
     }
 
-    #[ignore]
     #[tokio::test(flavor = "multi_thread")]
     async fn deposit() {
         let anvil_config = NodeConfig::test();
@@ -384,7 +382,6 @@ mod test {
         assert_eq!(contract.root().call().await.unwrap(), state.root());
     }
 
-    #[ignore]
     #[tokio::test(flavor = "multi_thread")]
     async fn deposit_partial_claim() {
         let anvil_config = NodeConfig::test();
@@ -473,7 +470,6 @@ mod test {
         assert_eq!(contract.root().call().await.unwrap(), state.root());
     }
 
-    #[ignore]
     #[tokio::test(flavor = "multi_thread")]
     async fn deposit_transfer_withdraw_flow() {
         let anvil_config = NodeConfig::test();

l1-verifier/Makefile

@@ -0,0 +1,7 @@
+all:
+	cp ../circuits/verifier.sol ./src/Verifier.sol
+	forge clean
+	forge bind --select Fusion --crate-name "fusion-l1"
+
+clean:
+	forge clean