chore: addressed Noir TODO

AztecProtocol · Aug 23, 2023 · c1eea87 · c1eea87
1 parent fe04cfe
commit c1eea87
Show file tree

Hide file tree

Showing 8 changed files with 1,889 additions and 1,899 deletions.
diff --git a/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json b/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json
diff --git a/yarn-project/aztec.js/src/abis/schnorr_account_contract.json b/yarn-project/aztec.js/src/abis/schnorr_account_contract.json
diff --git a/...-project/noir-contracts/src/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr b/...-project/noir-contracts/src/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr
@@ -3,7 +3,6 @@ use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::note::utils::compute_unique_siloed_note_hash;
 use dep::aztec::oracle::get_secret_key::get_secret_key;
-use dep::aztec::oracle::get_public_key::get_public_key;
 
 global ECDSA_PUBLIC_KEY_NOTE_LEN: Field = 5;
 
@@ -54,8 +53,7 @@ impl EcdsaPublicKeyNote {
 
     fn compute_nullifier(self) -> Field {
         let unique_siloed_note_hash = compute_unique_siloed_note_hash(EcdsaPublicKeyNoteInterface, self);
-        let owner_nullifying_public_key = get_public_key(self.owner);
-        let secret = get_secret_key(owner_nullifying_public_key);
+        let secret = get_secret_key(self.owner);
         dep::std::hash::pedersen([
             unique_siloed_note_hash,
             secret,

diff --git a/yarn-project/noir-contracts/src/contracts/escrow_contract/src/address_note.nr b/yarn-project/noir-contracts/src/contracts/escrow_contract/src/address_note.nr
@@ -2,7 +2,6 @@ use dep::std::hash::pedersen;
 use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::oracle::get_secret_key::get_secret_key;
-use dep::aztec::oracle::get_public_key::get_public_key;
 use dep::aztec::note::utils::compute_siloed_note_hash;
 
 global ADDRESS_NOTE_LEN: Field = 2;
@@ -29,8 +28,7 @@ impl AddressNote {
 
     fn compute_nullifier(self) -> Field {
         let siloed_note_hash = compute_siloed_note_hash(AddressNoteMethods, self);
-        let owner_nullifying_public_key = get_public_key(self.owner);
-        let secret = get_secret_key(owner_nullifying_public_key);
+        let secret = get_secret_key(self.owner);
         dep::std::hash::pedersen([
             siloed_note_hash,
             secret,

diff --git a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/src/address_note.nr b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/src/address_note.nr
@@ -3,7 +3,6 @@ use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::note::utils::compute_unique_siloed_note_hash;
 use dep::aztec::oracle::get_secret_key::get_secret_key;
-use dep::aztec::oracle::get_public_key::get_public_key;
 
 global ADDRESS_NOTE_LEN: Field = 1;
 
@@ -28,8 +27,7 @@ impl AddressNote {
 
     fn compute_nullifier(self) -> Field {
         let unique_siloed_note_hash = compute_unique_siloed_note_hash(AddressNoteMethods, self);
-        let owner_nullifying_public_key = get_public_key(self.address);
-        let secret = get_secret_key(owner_nullifying_public_key);
+        let secret = get_secret_key(self.address);
         dep::std::hash::pedersen([
             unique_siloed_note_hash,
             secret,

diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/src/public_key_note.nr b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/src/public_key_note.nr
@@ -2,7 +2,6 @@ use dep::std::hash::pedersen;
 use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::oracle::get_secret_key::get_secret_key;
-use dep::aztec::oracle::get_public_key::get_public_key;
 use dep::aztec::note::utils::compute_unique_siloed_note_hash;
 
 global PUBLIC_KEY_NOTE_LEN: Field = 3;
@@ -33,8 +32,7 @@ impl PublicKeyNote {
 
     fn compute_nullifier(self) -> Field {
         let unique_siloed_note_hash = compute_unique_siloed_note_hash(PublicKeyNoteMethods, self);
-        let owner_nullifying_public_key = get_public_key(self.owner);
-        let secret = get_secret_key(owner_nullifying_public_key);
+        let secret = get_secret_key(self.owner);
         dep::std::hash::pedersen([
             unique_siloed_note_hash,
             secret,

diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr b/yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr
@@ -1,8 +1,10 @@
 use crate::types::point::Point;
+use crate::oracle::get_public_key::get_public_key;
 
 #[oracle(getSecretKey)]
 fn get_secret_key_oracle(_owner: Point) -> Field {}
 
-unconstrained fn get_secret_key(owner: Point) -> Field {
-    get_secret_key_oracle(owner)
+unconstrained fn get_secret_key(owner: Field) -> Field {
+    let owner_nullifying_public_key = get_public_key(owner);
+    get_secret_key_oracle(owner_nullifying_public_key)
 }
diff --git a/yarn-project/noir-libs/value-note/src/value_note.nr b/yarn-project/noir-libs/value-note/src/value_note.nr
@@ -6,7 +6,6 @@ use dep::aztec::note::{
 use dep::aztec::oracle::{
     rand::rand,
     get_secret_key::get_secret_key,
-    get_public_key::get_public_key,
 };
 
 global VALUE_NOTE_LEN: Field = 3; // 3 plus a header.
@@ -55,10 +54,7 @@ impl ValueNote {
 
     fn compute_nullifier(self) -> Field {
         let note_hash_for_nullify = compute_note_hash_for_read_or_nullify(ValueNoteMethods, self);
-        let owner_nullifying_public_key = get_public_key(self.owner);
-        // TODO: get_secret_key should just accept an address
-        // TODO!
-        let secret = get_secret_key(owner_nullifying_public_key);
+        let secret = get_secret_key(self.owner);
         dep::std::hash::pedersen([
             note_hash_for_nullify,
             secret,