feat: pse evm tests (#48)

* add nargo contract command to nargo tests * verifier contract tests passing * commit latests * remove calldata print line * change fr::from_raw() to fr::from() * add second public input test with array * update pse to acvm v 0.22 * pse uses new circuit api input to compute number of public inputs * zcash updated to acm 0.22 * axiom (all) updated to acvm v0.22 * fmt/clippy * update test utilities & programs to be compatible with newest noir/ acvm * bump down to acvm 0.18.1 with cherrypicked commit 2bc7d25 to support eth_contract_from_vk without changing memory opcodes (breaks functions and arrays) * integration tests for pse working except for evm * all unit tests working except for evm tests >:( * remove if false for failing tests * update wasm * should pass all actions * fix if * add solc install to action * add poseidon * crs * downgrade solc in ci to compatible version with snark verifier * ci should pass now --------- Co-authored-by: Ian-Bright <[email protected]>
Ethan-000 · Aug 10, 2023 · 6374c93 · 6374c93
1 parent 6c76a1f
commit 6374c93
Show file tree

Hide file tree

Showing 44 changed files with 415 additions and 193 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,5 +75,8 @@ jobs:
       - name: Install latest nextest release
         uses: taiki-e/install-action@nextest
 
+      - name: Install solc
+        run: (hash svm 2>/dev/null || cargo install --version 0.2.23 svm-rs) && svm install 0.8.19 && solc --version
+
       - name: run pse test
         run: cargo nextest run --package noir_halo2_backend_pse --test-threads=1
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
-acvm = "0.15.0"
+acvm = "0.18.1"
 rand = "0.8"
 reqwest = { version = "0.11.16", default-features = false, features = [
     "stream",

diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 This is a [halo2](https://zcash.github.io/halo2/) backend for the [Noir Programming Language](https://noir-lang.org/)
 
+Get [detailed documentation on this repository!](https://mach-34.github.io/halo2_backend_docs)
+
 **WARNING: This crate is experimental and under development. Expect bugs and unoptimized circuits.**
 
 ## Acknowledgement
@@ -17,7 +19,7 @@ This crate will not be possible without
 ## Installtion
 
 ```text
-git clone https://github.com/Ethan-000/noir --branch demo-0.1.2
+git clone https://github.com/Mach-34/noir --branch demo-0.1.3
 ```
 
 ```text

diff --git a/crates/noir_halo2_backend_axiom/src/acvm_interop/proof_system.rs b/crates/noir_halo2_backend_axiom/src/acvm_interop/proof_system.rs
@@ -101,11 +101,7 @@ impl ProofSystemCompiler for AxiomHalo2 {
     fn supports_opcode(&self, opcode: &acvm::acir::circuit::Opcode) -> bool {
         match opcode {
             Opcode::Arithmetic(_) => true,
-            Opcode::Directive(_) => false,
-            Opcode::Block(_) => false,
-            Opcode::ROM(_) => false,
-            Opcode::RAM(_) => false,
-            Opcode::Oracle(_) => false,
+            Opcode::Directive(_) | Opcode::Brillig(_) => true,
             Opcode::BlackBoxFuncCall(func) => match func.get_black_box_func() {
                 BlackBoxFunc::AND | BlackBoxFunc::RANGE => true,
 
@@ -115,12 +111,13 @@ impl ProofSystemCompiler for AxiomHalo2 {
                 | BlackBoxFunc::Pedersen
                 | BlackBoxFunc::HashToField128Security
                 | BlackBoxFunc::EcdsaSecp256k1
+                | BlackBoxFunc::EcdsaSecp256r1
                 | BlackBoxFunc::Keccak256
                 | BlackBoxFunc::FixedBaseScalarMul
                 | BlackBoxFunc::RecursiveAggregation
                 | BlackBoxFunc::SchnorrVerify => false,
             },
-            Opcode::Brillig(_) => todo!(),
+            Opcode::Block(_) | Opcode::ROM(_) | Opcode::RAM(_) => false,
         }
     }
 

diff --git a/crates/noir_halo2_backend_axiom/src/acvm_interop/pwg.rs b/crates/noir_halo2_backend_axiom/src/acvm_interop/pwg.rs
@@ -1,35 +1,30 @@
+use acvm::{acir::FieldElement, BlackBoxFunctionSolver, BlackBoxResolutionError};
+
 use crate::AxiomHalo2;
-use acvm::{acir::native_types::Witness, pwg::OpcodeResolutionError, PartialWitnessGenerator};
 
-impl PartialWitnessGenerator for AxiomHalo2 {
+impl BlackBoxFunctionSolver for AxiomHalo2 {
     fn schnorr_verify(
         &self,
-        _initial_witness: &mut acvm::acir::native_types::WitnessMap,
-        _public_key_x: &acvm::acir::circuit::opcodes::FunctionInput,
-        _public_key_y: &acvm::acir::circuit::opcodes::FunctionInput,
-        _signature: &[acvm::acir::circuit::opcodes::FunctionInput],
-        _message: &[acvm::acir::circuit::opcodes::FunctionInput],
-        _output: &Witness,
-    ) -> Result<acvm::pwg::OpcodeResolution, OpcodeResolutionError> {
-        todo!()
+        _public_key_x: &FieldElement,
+        _public_key_y: &FieldElement,
+        _signature: &[u8],
+        _message: &[u8],
+    ) -> Result<bool, BlackBoxResolutionError> {
+        Err(BlackBoxResolutionError::Unsupported(acvm::acir::BlackBoxFunc::SchnorrVerify))
     }
 
     fn pedersen(
         &self,
-        _initial_witness: &mut acvm::acir::native_types::WitnessMap,
-        _inputs: &[acvm::acir::circuit::opcodes::FunctionInput],
+        _inputs: &[FieldElement],
         _domain_separator: u32,
-        _outputs: &[Witness],
-    ) -> Result<acvm::pwg::OpcodeResolution, OpcodeResolutionError> {
-        todo!()
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+        Err(BlackBoxResolutionError::Unsupported(acvm::acir::BlackBoxFunc::Pedersen))
     }
 
     fn fixed_base_scalar_mul(
         &self,
-        _initial_witness: &mut acvm::acir::native_types::WitnessMap,
-        _input: &acvm::acir::circuit::opcodes::FunctionInput,
-        _outputs: &[Witness],
-    ) -> Result<acvm::pwg::OpcodeResolution, OpcodeResolutionError> {
-        todo!()
+        _input: &FieldElement,
+    ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
+        Err(BlackBoxResolutionError::Unsupported(acvm::acir::BlackBoxFunc::FixedBaseScalarMul))
     }
 }
diff --git a/crates/noir_halo2_backend_axiom/src/acvm_interop/smart_contract.rs b/crates/noir_halo2_backend_axiom/src/acvm_interop/smart_contract.rs
@@ -1,5 +1,5 @@
 use crate::{circuit_translator::NoirHalo2Translator, AxiomHalo2};
-use acvm::SmartContract;
+use acvm::{acir::circuit::Circuit, SmartContract};
 use halo2_base::halo2_proofs::{
     halo2curves::bn256::{Bn256, Fq, Fr, G1Affine},
     plonk::VerifyingKey,
@@ -40,6 +40,7 @@ impl SmartContract for AxiomHalo2 {
     fn eth_contract_from_vk(
         &self,
         common_reference_string: &[u8],
+        circuit: &Circuit,
         verification_key: &[u8],
     ) -> Result<String, Self::Error> {
         let params = ParamsKZG::<Bn256>::read_custom(
@@ -54,6 +55,9 @@ impl SmartContract for AxiomHalo2 {
         )
         .unwrap();
 
-        Ok(gen_evm_verifier(&params, &vk, vec![0]))
+        // get number of public inputs used in circuit
+        let num_instance = circuit.public_inputs().0.len();
+
+        Ok(gen_evm_verifier(&params, &vk, vec![num_instance]))
     }
 }
diff --git a/crates/noir_halo2_backend_axiom/src/circuit_translator.rs b/crates/noir_halo2_backend_axiom/src/circuit_translator.rs
@@ -152,6 +152,9 @@ impl Halo2PlonkCircuit<Fr> for NoirHalo2Translator<Fr> {
                                 &config,
                             );
                         }
+                        BlackBoxFuncCall::EcdsaSecp256r1 { .. } => {
+                            todo!()
+                        }
                         BlackBoxFuncCall::FixedBaseScalarMul { .. } => {
                             todo!()
                         }
@@ -173,16 +176,12 @@ impl Halo2PlonkCircuit<Fr> for NoirHalo2Translator<Fr> {
                         } => todo!(),
                     };
                 }
-                Opcode::Directive(_) | Opcode::Oracle(_) => {
+                Opcode::Directive(_) | Opcode::Brillig(_) => {
                     // Directives are only needed by the pwg
                 }
-                Opcode::Block(_) => {
-                    // Block is managed by ACVM
-                }
-                Opcode::RAM(_) | Opcode::ROM(_) => {
+                Opcode::Block(_) | Opcode::ROM(_) | Opcode::RAM(_) => {
                     todo!()
                 }
-                Opcode::Brillig(_) => todo!(),
             }
         }
         Ok(())