fix(port): block #24580 — decisions: align aztec-nr + fairies contracts to the v5 tip

#24580 builds on v5 refactors that arrived via UNLABELLED v5 trains this driver never received
(notably #24369 'reimplement partial notes on FactStore' — deletes
messages/{discovery/partial_notes.nr,processing/message_context.nr}, adds partial_notes/{fsm,mod}.nr
and the ResolvedTx processing shape — and #24508 'keep handshake secrets internal to
TagSecretSource'). Without them the stack's aztec-nr/contract surfaces were an incoherent mix of
eras (obtain_secrets/MessageContext/get_all_discovered_handshakes resolution failures).

Aligned byte-identically to the v5 tip a455b9a:
- noir-projects/aztec-nr (EXCEPT context/private_context.nr + context/inputs/private_context_inputs.nr,
  which keep next-only tx_request_salt; verify: git diff a455b9a -- noir-projects/aztec-nr)
- contracts/standard/handshake_registry_contract (whole dir)
- contracts/test/{onchain_delivery_test_contract,custom_message_contract}

aztec-nr + all noir-contracts compile clean.

Author: AztecBot

noir-projects/aztec-nr/aztec/src/lib.nr

@@ -45,6 +45,7 @@ pub mod transient;
 pub mod event;
 pub mod facts;
 pub mod messages;
+pub(crate) mod partial_notes;
 pub use protocol_types as protocol;
 pub(crate) mod logging;
 pub mod utils;

noir-projects/aztec-nr/aztec/src/messages/delivery/tag.nr

@@ -4,7 +4,6 @@
 
 use crate::context::PrivateContext;
 use crate::messages::delivery::{
-    constrained_delivery::emit_sequence_nullifier,
     OnchainDeliveryMode,
     tag_derivation::{existing_handshake_secrets_or_else, TagDerivation},
     tag_secret_source::TagSecretSource,
@@ -28,15 +27,17 @@ pub(crate) fn derive_log_tag(
     recipient: AztecAddress,
     tag_derivation: Option<TagDerivation>,
 ) -> Field {
-    let source = tag_derivation.map_or_else(|| default_tag_secret_source(sender, recipient, mode), |derivation| {
-        derivation.into_tag_secret_source(sender, recipient)
-    });
+    let source = tag_derivation.map_or_else(
+        || default_tag_secret_source(context, sender, recipient, mode),
+        |derivation| derivation.into_tag_secret_source(context, sender, recipient),
+    );
     tag_with(source, context, mode, sender, recipient)
 }
 
 /// The wallet-resolved default: reuse a handshake already registered for the pair, otherwise let the wallet resolve
 /// the tagging secret strategy.
 fn default_tag_secret_source(
+    context: &mut PrivateContext,
     sender: AztecAddress,
     recipient: AztecAddress,
     mode: OnchainDeliveryMode,
@@ -49,7 +50,7 @@ fn default_tag_secret_source(
             // secret before a constrained tag is emitted, so an untrusted strategy can't produce a valid unbacked
             // constrained tag.
             let strategy = unsafe { resolve_tagging_strategy(sender, recipient, mode) };
-            strategy.into()
+            strategy.into_tag_secret_source(context, sender, recipient)
         },
     )
 }
@@ -61,19 +62,18 @@ fn tag_with(
     sender: AztecAddress,
     recipient: AztecAddress,
 ) -> Field {
-    let secrets = source.obtain_secrets(context, sender, recipient);
+    let secret = source.tag_secret();
 
     // Safety: the index is untrusted. Constrained delivery constrains it below before emitting the tag; unconstrained
     // discovery tolerates gaps, so a wrong index only yields an undiscoverable tag.
-    let index = unsafe { get_next_tagging_index(secrets.shared, mode) };
+    let index = unsafe { get_next_tagging_index(secret, mode) };
 
     if mode == OnchainDeliveryMode::onchain_constrained() {
-        source.constrain_secrets(context, sender, recipient, secrets, index);
-        emit_sequence_nullifier(context, sender, recipient, secrets, index);
+        source.constrain_tag_secret(context, sender, recipient, index);
     }
 
-    // The discovery tag stays derived from the shared secret only, so the recipient still finds every message.
-    tag_from_secret_and_index(secrets.shared, index, mode)
+    // The discovery tag stays derived from the tag secret only, so the recipient still finds every message.
+    tag_from_secret_and_index(secret, index, mode)
 }
 
 fn tag_domain_separator(mode: OnchainDeliveryMode) -> u32 {

noir-projects/aztec-nr/aztec/src/messages/discovery/mod.nr

@@ -4,10 +4,10 @@ use crate::messages::{
     delivery::handshake::{get_handshake_secrets, PROVIDED_SECRETS_ARRAY_BASE_SLOT},
     processing::provided_secret::ProvidedSecret,
 };
+use crate::partial_notes;
 use crate::protocol::address::AztecAddress;
 
 pub(crate) mod nonce_discovery;
-pub(crate) mod partial_notes;
 pub(crate) mod private_events;
 pub mod private_notes;
 pub mod process_message;
@@ -18,8 +18,8 @@ use crate::{
         encoding::MAX_MESSAGE_CONTENT_LEN,
         logs::note::MAX_NOTE_PACKED_LEN,
         processing::{
-            MessageContext, offchain::OffchainInboxSync, OffchainMessageWithContext,
-            pending_tagged_log::PendingTaggedLog, validate_and_store_enqueued_notes_and_events,
+            offchain::OffchainInboxSync, OffchainMessageWithTx, pending_tagged_log::PendingTaggedLog, ResolvedTx,
+            validate_and_store_enqueued_notes_and_events,
         },
     },
     oracle::message_processing,
@@ -108,7 +108,7 @@ pub type CustomMessageHandler = unconstrained fn(
 /* msg_type_id */ u64,
 /* msg_metadata */ u64,
 /* msg_content */ BoundedVec<Field, MAX_MESSAGE_CONTENT_LEN>,
-/* message_context */ MessageContext,
+/* resolved_tx */ ResolvedTx,
 /* scope */ AztecAddress);
 
 /// Custom state synchronization handler.
@@ -209,22 +209,22 @@ unconstrained fn sync_state_with_secrets(
 
     if offchain_inbox_sync.is_some() {
         let msgs = offchain_inbox_sync.unwrap()(contract_address, scope);
-        msgs.for_each(|_i, msg: OffchainMessageWithContext| {
+        msgs.for_each(|_i, msg: OffchainMessageWithTx| {
             process_message_ciphertext(
                 contract_address,
                 compute_note_hash,
                 compute_note_nullifier,
                 process_custom_message,
                 msg.message_ciphertext,
-                msg.message_context,
+                msg.resolved_tx,
                 scope,
             );
         });
     }
 
     // Then we process all pending partial notes, regardless of whether they were found in the current or previous
     // executions.
-    partial_notes::fetch_and_process_partial_note_completion_logs(
+    partial_notes::sync(
         contract_address,
         compute_note_hash,
         compute_note_nullifier,
@@ -264,7 +264,7 @@ mod test {
             // Mock the oracle call to return a known base slot, then populate an ephemeral
             // array at that slot so do_sync_state processes a non-empty log list.
             let base_slot = 42;
-            let mock = std::test::OracleMock::mock("aztec_utl_getPendingTaggedLogs");
+            let mock = std::test::OracleMock::mock("aztec_utl_getPendingTaggedLogsV2");
             let _ = mock.returns(base_slot);
 
             let logs: EphemeralArray<PendingTaggedLog> = EphemeralArray::at(base_slot);
@@ -281,6 +281,10 @@ mod test {
                 no_inbox_sync,
                 scope,
             );
+
+            // Guards against the mocked oracle name going stale: if sync stops calling it, the crafted empty log
+            // above is never consumed and the test silently stops covering the empty-payload path.
+            assert_eq(mock.times_called(), 1);
         });
     }