feat: switch to using an external noir implementation of Schnorr

noir-projects/noir-contracts/contracts/schnorr_account_contract/Nargo.toml

@@ -7,3 +7,4 @@ type = "contract"
 [dependencies]
 aztec = { path = "../../../aztec-nr/aztec" }
 authwit = { path = "../../../aztec-nr/authwit" }
+schnorr = { tag = "v0.1.0", git = "https://github.com/noir-lang/schnorr" }

noir-projects/noir-contracts/contracts/schnorr_account_contract/src/main.nr

@@ -6,8 +6,6 @@ use dep::aztec::macros::aztec;
 
 #[aztec]
 contract SchnorrAccount {
-    use dep::std;
-
     use dep::authwit::{
         account::AccountActions,
         auth::{compute_authwit_message_hash, compute_authwit_nullifier},
@@ -24,6 +22,7 @@ contract SchnorrAccount {
     use dep::aztec::prelude::{AztecAddress, PrivateContext, PrivateImmutable};
 
     use crate::public_key_note::PublicKeyNote;
+    use std::embedded_curve_ops::EmbeddedCurvePoint;
 
     #[storage]
     struct Storage<Context> {
@@ -78,9 +77,12 @@ contract SchnorrAccount {
         }
 
         // Verify signature of the payload bytes
-        std::schnorr::verify_signature(
-            public_key.x,
-            public_key.y,
+        schnorr::verify_signature(
+            std::embedded_curve_ops::EmbeddedCurvePoint {
+                x: public_key.x,
+                y: public_key.y,
+                is_infinite: false,
+            },
             signature,
             outer_hash.to_be_bytes::<32>(),
         )

noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/Nargo.toml

@@ -7,3 +7,4 @@ type = "contract"
 [dependencies]
 aztec = { path = "../../../aztec-nr/aztec" }
 authwit = { path = "../../../aztec-nr/authwit" }
+schnorr = { tag = "v0.1.0", git = "https://github.com/noir-lang/schnorr" }

noir-projects/noir-contracts/contracts/schnorr_hardcoded_account_contract/src/main.nr

@@ -41,9 +41,12 @@ contract SchnorrHardcodedAccount {
         }
 
         // Verify signature using hardcoded public key
-        std::schnorr::verify_signature(
-            public_key_x,
-            public_key_y,
+        schnorr::verify_signature(
+            std::embedded_curve_ops::EmbeddedCurvePoint {
+                x: public_key_x,
+                y: public_key_y,
+                is_infinite: false,
+            },
             signature,
             outer_hash.to_be_bytes::<32>(),
         )

noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/Nargo.toml

@@ -7,3 +7,4 @@ type = "contract"
 [dependencies]
 aztec = { path = "../../../aztec-nr/aztec" }
 authwit = { path = "../../../aztec-nr/authwit" }
+schnorr = { tag = "v0.1.0", git = "https://github.com/noir-lang/schnorr" }

noir-projects/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr

@@ -1,17 +1,19 @@
 use crate::auth_oracle::AuthWitness;
 use dep::aztec::prelude::AztecAddress;
-use std::schnorr::verify_signature;
 
 pub fn recover_address(message_hash: Field, witness: AuthWitness) -> AztecAddress {
     let message_bytes: [u8; 32] = message_hash.to_be_bytes();
     // In a single key account contract we re-used ivpk_m as signing key
-    let verification = verify_signature(
-        witness.keys.ivpk_m.inner.x,
-        witness.keys.ivpk_m.inner.y,
+
+    schnorr::assert_valid_signature(
+        std::embedded_curve_ops::EmbeddedCurvePoint {
+            x: witness.keys.ivpk_m.inner.x,
+            y: witness.keys.ivpk_m.inner.y,
+            is_infinite: false,
+        },
         witness.signature,
         message_bytes,
     );
-    assert(verification == true);
 
     AztecAddress::compute(witness.keys, witness.partial_address)
 }