chore(noir): remove oracle hacks in light of stepwise ACIR execution

yarn-project/noir-contracts/src/contracts/pending_commitments_contract/src/main.nr

@@ -66,15 +66,8 @@ contract PendingCommitments {
         // Insert note and emit encrypted note preimage via oracle call
         context = owner_balance.insert(context, note);
 
-        // Hack: we add the return value from `notifyCreatedNote` oracle call
-        // to the sort option to `getNotes` oracle call to force a dependency
-        // and therefore ordering between these two oracles
-        // TODO(https://github.com/noir-lang/noir/pull/1729): remove when stepwise execution of acir is complete
-        // replace with `let options = NoteGetterOptions::with_filter(get_2_notes, 0);`
-        let mut sorting = [Sort::nada(); VALUE_NOTE_LEN];
-        sorting[0] = Sort::new(0, context.oracle_connector as u8);
-        let options = NoteGetterOptions::new(get_2_notes, 0, sorting , 0);
-
+        let options = NoteGetterOptions::with_filter(get_2_notes, 0);
+        // get note inserted above
         let (context_tmp, got_notes) = owner_balance.get_notes(context, options);
         context = context_tmp;
 
@@ -102,15 +95,7 @@ contract PendingCommitments {
 
         let owner_balance = storage.balances.at(owner);
 
-        // Hack: we add the return value from `notifyCreatedNote` oracle call
-        // to the sort option to `getNotes` oracle call to force a dependency
-        // and therefore ordering between these two oracles
-        // TODO(https://github.com/noir-lang/noir/pull/1729): remove when stepwise execution of acir is complete
-        // replace with `let options = NoteGetterOptions::with_filter(get_2_notes, 0);`
-        let mut sorting = [Sort::nada(); VALUE_NOTE_LEN];
-        sorting[0] = Sort::new(0, context.oracle_connector as u8);
-        let options = NoteGetterOptions::new(get_2_notes, 0, sorting , 0);
-
+        let options = NoteGetterOptions::with_filter(get_2_notes, 0);
         // get note (note inserted at bottom of function shouldn't exist yet)
         let (context_tmp, got_notes) = owner_balance.get_notes(context, options);
         context = context_tmp;
@@ -163,15 +148,7 @@ contract PendingCommitments {
 
         let owner_balance = storage.balances.at(owner);
 
-        // Hack: we add the return value from `notifyCreatedNote` oracle call
-        // to the sort option to `getNotes` oracle call to force a dependency
-        // and therefore ordering between these two oracles
-        // TODO(https://github.com/noir-lang/noir/pull/1729): remove when stepwise execution of acir is complete
-        // replace with `let options = NoteGetterOptions::with_filter(get_2_notes, 0);`
-        let mut sorting = [Sort::nada(); VALUE_NOTE_LEN];
-        sorting[0] = Sort::new(0, context.oracle_connector as u8);
-        let options = NoteGetterOptions::new(get_2_notes, 0, sorting , 0);
-
+        let options = NoteGetterOptions::with_filter(get_2_notes, 0);
         let (context_tmp, got_notes) = owner_balance.get_notes(context, options);
         context = context_tmp;
 

yarn-project/noir-libs/noir-aztec/src/context.nr

@@ -21,8 +21,6 @@ use crate::messaging::process_l1_to_l2_message;
 // When finished, one can call .finish() to convert back to the abi
 struct Context {
     inputs: abi::PrivateContextInputs,
-    // TODO(https://github.com/noir-lang/noir/pull/1729): remove when stepwise execution of acir is complete
-    oracle_connector: Field,  // for forcing dependencies between oracle calls
 
     args_hash : Field,
     return_values : BoundedVec<Field, RETURN_VALUES_LENGTH>,
@@ -46,8 +44,6 @@ impl Context {
     fn new(inputs: abi::PrivateContextInputs, args_hash: Field) -> Context {
         Context {
             inputs: inputs,
-            // TODO(https://github.com/noir-lang/noir/pull/1729): remove when stepwise execution of acir is complete
-            oracle_connector: 0,
 
             args_hash: args_hash,
             return_values: BoundedVec::new(0),

yarn-project/noir-libs/noir-aztec/src/note/lifecycle.nr

@@ -15,7 +15,6 @@ fn create_note<Note, N>(
 ) -> Context {
     let mut inner_note_hash = 0;
     let is_dummy = note_interface.is_dummy;
-    let mut notify_result = 0; // TODO(https://github.com/noir-lang/noir/pull/1729): remove me (more below)
     if is_dummy(note) == false {
         let contract_address = context.inputs.call_context.storage_contract_address;
         let header = NoteHeader { contract_address, storage_slot, nonce: 0 };
@@ -25,13 +24,8 @@ fn create_note<Note, N>(
 
         let serialise = note_interface.serialise;
         let preimage = serialise(note);
-
-        notify_result = notify_created_note(storage_slot, preimage, inner_note_hash);
-        assert(notify_result == 0); // TODO(https://github.com/noir-lang/noir/pull/1729): combine with above line (more below)
+        assert(notify_created_note(storage_slot, preimage, inner_note_hash) == 0);
     }
-    // TODO(https://github.com/noir-lang/noir/pull/1729): remove when stepwise execution of acir is complete
-    // replace with: `assert(notify_created_note(storage_slot, preimage) == 0);`
-    context.oracle_connector = notify_result; // to force dependency/ordering between oracle calls
 
     context.push_new_note_hash(inner_note_hash)
 }