refactor(aztec-nr): drop unused HandshakeNote fields (#24595)

Author: nchamo

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

@@ -2,17 +2,17 @@
 use protocol_types::{address::AztecAddress, traits::FromField};
 
 pub global STANDARD_AUTH_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x0bbe366bb57059b03929228f7e886b17210cf268e021608392f58cb8f2574f43,
+    0x0292b01f4e566555534c40ed729eb023cc08afaca647b8c3642738449673480c,
 );
 
 pub global STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x252e4f53e6bef46e70a37168c52a9eba7501944a40c63f0aa807cf2f823260d9,
+    0x18470168ca7a775b442cde110b668732f7b6390a505f3784b50f39993c5f3dce,
 );
 
 pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x05c207d39f7a51de9de6cfd37ab7764bbc9d0434481c4448fc6ddbeac2f67636,
+    0x2d7745526508f5ceb278bb773a49f776842d1d2f0854c4a385bb661a2fabb9a8,
 );
 
 pub global STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-    0x0fe4285eada74ef13ea09468db7fcb69861161276f81f24a99e152e5871c5081,
+    0x0bd62e76a9a3a103dae2e73040e05d3970ac900baff5637ae9f183396745ec7e,
 );

noir-projects/noir-contracts/contracts/standard/handshake_registry_contract/src/handshake_note.nr

@@ -19,12 +19,6 @@ use aztec::{
 #[derive(Deserialize, Eq, Packable, Serialize)]
 #[note]
 pub struct HandshakeNote {
-    /// Stored so contracts can constrain the kind of handshake they accept (e.g. an app may want to require interactive
-    /// handshakes only).
-    handshake_type: u8,
-    /// The recipient this handshake authorizes. Part of the note preimage so a contract proving note
-    /// existence can bind the proof to the intended recipient.
-    recipient: AztecAddress,
     /// The raw ECDH shared-secret point `S = eph_sk * recipient_address_point`. Only this module can read it for
     /// siloing, and it is never returned by an external function.
     secret: EmbeddedCurvePoint,
@@ -36,13 +30,8 @@ pub struct HandshakeNote {
 }
 
 impl HandshakeNote {
-    pub(crate) fn new(
-        shared_secret: EmbeddedCurvePoint,
-        handshake_type: u8,
-        recipient: AztecAddress,
-        sender_secret: Field,
-    ) -> Self {
-        Self { handshake_type, recipient, secret: shared_secret, sender_secret }
+    pub(crate) fn new(shared_secret: EmbeddedCurvePoint, sender_secret: Field) -> Self {
+        Self { secret: shared_secret, sender_secret }
     }
 
     /// Returns the [app-siloed handshake secrets][AppSiloedHandshakeSecrets] for `caller`: the shared secret (via

noir-projects/noir-contracts/contracts/standard/handshake_registry_contract/src/main.nr

@@ -6,14 +6,6 @@ mod test;
 
 use sync::handshake_registry_sync;
 
-/// Handshake type identifier for non-interactive handshakes (sender-generated random shared secret, no recipient
-/// signature). See [`HandshakeRegistry::non_interactive_handshake`].
-global NON_INTERACTIVE_HANDSHAKE: u8 = 1;
-
-/// Handshake type identifier for interactive handshakes (recipient-signed). See
-/// [`HandshakeRegistry::interactive_handshake`].
-global INTERACTIVE_HANDSHAKE: u8 = 2;
-
 /// Registry for the message-delivery handshake protocol.
 ///
 /// The registry establishes a master shared-secret point `S` between a sender and a recipient and stores one current
@@ -34,8 +26,8 @@ global INTERACTIVE_HANDSHAKE: u8 = 2;
 #[aztec(::aztec::macros::AztecConfig::new().custom_sync_state(crate::handshake_registry_sync))]
 pub contract HandshakeRegistry {
     use crate::{
-        handshake_note::HandshakeNote, INTERACTIVE_HANDSHAKE, NON_INTERACTIVE_HANDSHAKE,
-        recipient_signature::RecipientSignature, sync::discovered_handshakes::get_all_discovered_handshakes,
+        handshake_note::HandshakeNote, recipient_signature::RecipientSignature,
+        sync::discovered_handshakes::get_all_discovered_handshakes,
     };
     use aztec::{
         keys::{ecdh_shared_secret::derive_ecdh_shared_secret, ephemeral::generate_positive_ephemeral_key_pair},
@@ -86,7 +78,7 @@ pub contract HandshakeRegistry {
     #[external("private")]
     fn non_interactive_handshake(sender: AztecAddress, recipient: AztecAddress) -> AppSiloedHandshakeSecrets {
         let (eph_pk, s_raw) = self.internal._generate_shared_secret(recipient);
-        let secrets = self.internal._store(sender, recipient, s_raw, NON_INTERACTIVE_HANDSHAKE);
+        let secrets = self.internal._store(sender, recipient, s_raw);
 
         // Announce the handshake: an encrypted private log under the recipient-keyed tag carrying `[eph_pk.x]`, so
         // the recipient can discover the handshake by scanning their tag and recover `S` via their own ECDH.
@@ -118,7 +110,7 @@ pub contract HandshakeRegistry {
     fn interactive_handshake(sender: AztecAddress, recipient: AztecAddress) -> AppSiloedHandshakeSecrets {
         let (eph_pk, s_raw) = self.internal._generate_shared_secret(recipient);
         self.internal._request_and_verify_signature(recipient, eph_pk);
-        self.internal._store(sender, recipient, s_raw, INTERACTIVE_HANDSHAKE)
+        self.internal._store(sender, recipient, s_raw)
     }
 
     /// Asserts that `secrets` match the stored handshake from `sender` to `recipient`, for the caller (`msg_sender()`).
@@ -211,17 +203,12 @@ pub contract HandshakeRegistry {
     /// Inserts or replaces the current [`HandshakeNote`] owned by `sender` for `recipient` and returns the
     /// app-siloed secrets for the caller (`msg_sender()`).
     #[internal("private")]
-    fn _store(
-        sender: AztecAddress,
-        recipient: AztecAddress,
-        s_raw: EmbeddedCurvePoint,
-        handshake_type: u8,
-    ) -> AppSiloedHandshakeSecrets {
+    fn _store(sender: AztecAddress, recipient: AztecAddress, s_raw: EmbeddedCurvePoint) -> AppSiloedHandshakeSecrets {
         // Safety: an uncooperative sender could pick a non-random value, but the sender-only secret only protects
         // the sender's own ability to advance their sequence, so a bad value only harms themselves. It is a fresh
         // random secret known only to the sender, which will be folded into constrained-delivery nullifiers.
         let sender_secret = unsafe { random() };
-        let note = HandshakeNote::new(s_raw, handshake_type, recipient, sender_secret);
+        let note = HandshakeNote::new(s_raw, sender_secret);
 
         // We deliver onchain unconstrained rather than offchain so the note is discoverable via normal PXE sync. This
         // is a self-send (the note is owned by and delivered to `sender`), so the wallet would resolve to an

noir-projects/noir-contracts/pinned-standard-contracts.tar.gz

@@ -20,45 +20,45 @@ export const StandardContractSalt: Record<StandardContractName, Fr> = {
 };
 
 export const StandardContractAddress: Record<StandardContractName, AztecAddress> = {
-  AuthRegistry: AztecAddress.fromStringUnsafe('0x0bbe366bb57059b03929228f7e886b17210cf268e021608392f58cb8f2574f43'),
+  AuthRegistry: AztecAddress.fromStringUnsafe('0x0292b01f4e566555534c40ed729eb023cc08afaca647b8c3642738449673480c'),
   MultiCallEntrypoint: AztecAddress.fromStringUnsafe(
-    '0x252e4f53e6bef46e70a37168c52a9eba7501944a40c63f0aa807cf2f823260d9',
+    '0x18470168ca7a775b442cde110b668732f7b6390a505f3784b50f39993c5f3dce',
   ),
-  PublicChecks: AztecAddress.fromStringUnsafe('0x05c207d39f7a51de9de6cfd37ab7764bbc9d0434481c4448fc6ddbeac2f67636'),
+  PublicChecks: AztecAddress.fromStringUnsafe('0x2d7745526508f5ceb278bb773a49f776842d1d2f0854c4a385bb661a2fabb9a8'),
   HandshakeRegistry: AztecAddress.fromStringUnsafe(
-    '0x0fe4285eada74ef13ea09468db7fcb69861161276f81f24a99e152e5871c5081',
+    '0x0bd62e76a9a3a103dae2e73040e05d3970ac900baff5637ae9f183396745ec7e',
   ),
 };
 
 export const StandardContractClassId: Record<StandardContractName, Fr> = {
-  AuthRegistry: Fr.fromString('0x2f4a272a86482af67aa5beb9db9ea648080f0e140baf55a0af153421ab19e12d'),
-  MultiCallEntrypoint: Fr.fromString('0x2b2d3d423944a96cc01b3d332ba25e8a53aa486740d68047ca4df1b1c849a8e5'),
-  PublicChecks: Fr.fromString('0x1c14245c8afceb64326b033fd1841e78e844124e40c49a36712f57dfffd258d6'),
-  HandshakeRegistry: Fr.fromString('0x250d9a5696197bc0aaa73bd6fe01b89e33a796d91b18b847cc419e433a5cfaf9'),
+  AuthRegistry: Fr.fromString('0x1f8810cff8690ef53281da87fcda9d4820154d6dcd76012c90bf459b3ba3ab7a'),
+  MultiCallEntrypoint: Fr.fromString('0x282930170063677f616bcf9dc9fbfd4968a577dbbcdec0ea3c06283a44bcc743'),
+  PublicChecks: Fr.fromString('0x2a0f1592c7f4c979b328ed030039a4e9a469aab30afa3a036735c338067abbcd'),
+  HandshakeRegistry: Fr.fromString('0x10fbd0602fe72a04c86e25728c8c2b94a359c684738768cbe4e44fb05f6a908c'),
 };
 
 export const StandardContractClassIdPreimage: Record<
   StandardContractName,
   { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }
 > = {
   AuthRegistry: {
-    artifactHash: Fr.fromString('0x01f4d890c55a73e9164007dfe9833d7fc9daaf29f49886d412188ba02b4c4b81'),
+    artifactHash: Fr.fromString('0x1bfa3469d2f70892f9ba54117abcf4ca52bb758e66be19b5d0ab86600202ab73'),
     privateFunctionsRoot: Fr.fromString('0x17b584350f4c3ccafd8f688729afb9feab8976114fb40012e9dee65022c072a4'),
     publicBytecodeCommitment: Fr.fromString('0x2545f39893766508ce37bb5cea5e4dcab04c6f7f79f3089b1c076876e9d268b2'),
   },
   MultiCallEntrypoint: {
-    artifactHash: Fr.fromString('0x158b25c22e41ecc134945b6f7fed7b0d523841a6e0ac78be1bdac989eb1ae6c0'),
+    artifactHash: Fr.fromString('0x05d7e89374f90684063f132a79de9b0f9553508de9ec1b83b8f6110d6ebbc21f'),
     privateFunctionsRoot: Fr.fromString('0x0e68dfbb256e80b08b3aef47aca1f2669e97a9c6259787893c1223ac083ad5d5'),
     publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
   },
   PublicChecks: {
-    artifactHash: Fr.fromString('0x18fbef2f3a4f54681c07f1eb9474851e43d5dce9a52cf1ebc0ca4bbebb96527f'),
+    artifactHash: Fr.fromString('0x0636977743e164f84fbd38ca408ad33794768c994f28dd8609729a8406d352dc'),
     privateFunctionsRoot: Fr.fromString('0x202860adb1b8975971eeaf571aaaa88a27f4035290d58532ae7d60b0dfaad54c'),
     publicBytecodeCommitment: Fr.fromString('0x013c4f854a5c87c9daf86c5f9bc07a42c2a061f1d924a5b3564ec7edc8e18cb7'),
   },
   HandshakeRegistry: {
-    artifactHash: Fr.fromString('0x0e781457b14303befa6080e70bcec27e82a0081191063b9128561a4183722c59'),
-    privateFunctionsRoot: Fr.fromString('0x02a4dba36389845b8ef0108562f7536d3284f07ca678558fc3c3bce3b24ee821'),
+    artifactHash: Fr.fromString('0x2fc28e54f5f227307378f4620d793db72a4e1a7937e8cb31396b61a48ea7abef'),
+    privateFunctionsRoot: Fr.fromString('0x14f4bfbedd0d76e9b66d1f836a71457cb0f5b4f40280eec4a3ed40439440e252'),
     publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
   },
 };
@@ -96,19 +96,19 @@ export const StandardContractPrivateFunctions: Record<
       selector: FunctionSelector.fromField(
         Fr.fromString('0x0000000000000000000000000000000000000000000000000000000019f8b409'),
       ),
-      vkHash: Fr.fromString('0x25d87da668c7c52b9c521579f191bb02486b3598d1ec0063927d5c0af2608daf'),
+      vkHash: Fr.fromString('0x0b9ec5c76f08f8025800691659d7ba1432ddb8a30e40fdbd4d8f5c398b8c9ab7'),
     },
     {
       selector: FunctionSelector.fromField(
         Fr.fromString('0x00000000000000000000000000000000000000000000000000000000db548fcf'),
       ),
-      vkHash: Fr.fromString('0x0f59fe525df9ff4a400e33dec33fd1dc07e25d95f860734a35b909085cf07809'),
+      vkHash: Fr.fromString('0x1c0f79ad358fc72c0f8cbac535d2d67f49dcea2f7d6c658eb38c7669f8ae2f93'),
     },
     {
       selector: FunctionSelector.fromField(
         Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f1ff839b'),
       ),
-      vkHash: Fr.fromString('0x12f43f384aa64661b012b52b1d80eb1d2202b8e459b50f56cfe270b0672c16ff'),
+      vkHash: Fr.fromString('0x2c2961a5e83daa909242c9ce441526c0a95379fda0976877acba4ffe7be949f3'),
     },
   ],
 };