chore: removing noir bug workaround

AztecProtocol · Dec 9, 2024 · 5fdb0ad · 5fdb0ad
1 parent cc8bd80
commit 5fdb0ad
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 37 deletions.
diff --git a/noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_note_emission.nr b/noir-projects/aztec-nr/aztec/src/encrypted_logs/encrypted_note_emission.nr
@@ -60,9 +60,6 @@ where
     compute_payload(context, note, ovsk_app, ovpk, recipient, sender)
 }
 
-// This function seems to be affected by the following Noir bug:
-// https://github.com/noir-lang/noir/issues/5771
-// If you get weird behavior it might be because of it.
 pub fn encode_and_encrypt_note<Note, let N: u32>(
     context: &mut PrivateContext,
     ovpk: OvpkM,

diff --git a/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr b/noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr
@@ -14,7 +14,9 @@ use dep::aztec::macros::aztec;
 contract TokenBlacklist {
     // Libs
     use dep::aztec::{
-        encrypted_logs::encrypted_note_emission::encode_and_encrypt_note_unconstrained,
+        encrypted_logs::encrypted_note_emission::{
+            encode_and_encrypt_note, encode_and_encrypt_note_unconstrained,
+        },
         hash::compute_secret_hash,
         keys::getters::get_public_keys,
         macros::{functions::{initializer, internal, private, public, view}, storage::storage},
@@ -188,16 +190,12 @@ contract TokenBlacklist {
 
         // Add the token note to user's balances set
         let msg_sender_ovpk_m = get_public_keys(context.msg_sender()).ovpk_m;
-        // TODO: constrain encryption below - we are using unconstrained here only becuase of the following Noir issue
-        // https://github.com/noir-lang/noir/issues/5771
-        storage.balances.add(to, U128::from_integer(amount)).emit(
-            encode_and_encrypt_note_unconstrained(
-                &mut context,
-                msg_sender_ovpk_m,
-                to,
-                context.msg_sender(),
-            ),
-        );
+        storage.balances.add(to, U128::from_integer(amount)).emit(encode_and_encrypt_note(
+            &mut context,
+            msg_sender_ovpk_m,
+            to,
+            context.msg_sender(),
+        ));
     }
 
     #[private]
@@ -214,11 +212,12 @@ contract TokenBlacklist {
         }
 
         let from_ovpk_m = get_public_keys(from).ovpk_m;
-        // TODO: constrain encryption below - we are using unconstrained here only becuase of the following Noir issue
-        // https://github.com/noir-lang/noir/issues/5771
-        storage.balances.sub(from, U128::from_integer(amount)).emit(
-            encode_and_encrypt_note_unconstrained(&mut context, from_ovpk_m, from, from),
-        );
+        storage.balances.sub(from, U128::from_integer(amount)).emit(encode_and_encrypt_note(
+            &mut context,
+            from_ovpk_m,
+            from,
+            from,
+        ));
 
         TokenBlacklist::at(context.this_address())._increase_public_balance(to, amount).enqueue(
             &mut context,
@@ -268,11 +267,12 @@ contract TokenBlacklist {
         }
 
         let from_ovpk_m = get_public_keys(from).ovpk_m;
-        // TODO: constrain encryption below - we are using unconstrained here only becuase of the following Noir issue
-        // https://github.com/noir-lang/noir/issues/5771
-        storage.balances.sub(from, U128::from_integer(amount)).emit(
-            encode_and_encrypt_note_unconstrained(&mut context, from_ovpk_m, from, from),
-        );
+        storage.balances.sub(from, U128::from_integer(amount)).emit(encode_and_encrypt_note(
+            &mut context,
+            from_ovpk_m,
+            from,
+            from,
+        ));
 
         TokenBlacklist::at(context.this_address())._reduce_total_supply(amount).enqueue(&mut context);
     }

diff --git a/noir-projects/noir-contracts/contracts/token_contract/src/main.nr b/noir-projects/noir-contracts/contracts/token_contract/src/main.nr
@@ -22,7 +22,9 @@ contract Token {
         context::{PrivateCallInterface, PrivateContext},
         encrypted_logs::{
             encrypted_event_emission::encode_and_encrypt_event_unconstrained,
-            encrypted_note_emission::encode_and_encrypt_note_unconstrained,
+            encrypted_note_emission::{
+                encode_and_encrypt_note, encode_and_encrypt_note_unconstrained,
+            },
         },
         keys::getters::get_public_keys,
         macros::{
@@ -252,10 +254,8 @@ contract Token {
         }
 
         let from_ovpk_m = get_public_keys(from).ovpk_m;
-        // TODO: constrain encryption below - we are using unconstrained here only because of the following Noir issue
-        // https://github.com/noir-lang/noir/issues/5771
         storage.balances.at(from).sub(from, U128::from_integer(amount)).emit(
-            encode_and_encrypt_note_unconstrained(&mut context, from_ovpk_m, from, from),
+            encode_and_encrypt_note(&mut context, from_ovpk_m, from, from),
         );
         Token::at(context.this_address())._increase_public_balance(to, amount).enqueue(&mut context);
     }
@@ -383,19 +383,15 @@ contract Token {
         let amount = U128::from_integer(amount);
         // docs:start:increase_private_balance
         // docs:start:encrypted
-        // TODO: constrain encryption below - we are using unconstrained here only becuase of the following Noir issue
-        // https://github.com/noir-lang/noir/issues/5771
-        storage.balances.at(from).sub(from, amount).emit(encode_and_encrypt_note_unconstrained(
+        storage.balances.at(from).sub(from, amount).emit(encode_and_encrypt_note(
             &mut context,
             from_ovpk_m,
             from,
             from,
         ));
         // docs:end:encrypted
         // docs:end:increase_private_balance
-        // TODO: constrain encryption below - we are using unconstrained here only becuase of the following Noir issue
-        // https://github.com/noir-lang/noir/issues/5771
-        storage.balances.at(to).add(to, amount).emit(encode_and_encrypt_note_unconstrained(
+        storage.balances.at(to).add(to, amount).emit(encode_and_encrypt_note(
             &mut context,
             from_ovpk_m,
             to,
@@ -413,10 +409,8 @@ contract Token {
             assert(nonce == 0, "invalid nonce");
         }
         let from_ovpk_m = get_public_keys(from).ovpk_m;
-        // TODO: constrain encryption below - we are using unconstrained here only becuase of the following Noir issue
-        // https://github.com/noir-lang/noir/issues/5771
         storage.balances.at(from).sub(from, U128::from_integer(amount)).emit(
-            encode_and_encrypt_note_unconstrained(&mut context, from_ovpk_m, from, from),
+            encode_and_encrypt_note(&mut context, from_ovpk_m, from, from),
         );
         Token::at(context.this_address())._reduce_total_supply(amount).enqueue(&mut context);
     }