chore: resolve handshake registry port conflicts

Author: spalladino

docs/docs-developers/docs/resources/migration_notes.md

@@ -9,25 +9,7 @@ Aztec is in active development. Each version may introduce breaking changes that
 
 ## TBD
 
-<<<<<<< HEAD
 ## 5.0.1
-=======
-### [Aztec.nr] Canonical HandshakeRegistry re-pinned at a new address
-
-The canonical `HandshakeRegistry` has been re-pinned so that it includes the owner's address in its `PrivateMutable` initialization nullifiers, keeping the handshake state of accounts that share keys independent. The registry moves to a new address. Handshakes established with the previous registry instance are not visible to the new one and must be re-established. The other standard contracts keep their addresses.
-
-### [Aztec.nr] Note property selectors are typed and use packed-layout indices
-
-The selectors in the generated `properties()` used the field's position in the note struct declaration, which pointed at the wrong packed field for any note with an earlier field packing to more than one `Field` (a `Point`, an array, a nested struct). Selector indices are now the field's offset in the note's packed representation, so `select`/`sort` criteria constrain the field they name.
-
-Breaking changes:
-
-- `PropertySelector<T>` carries the selected property's type. Hand-constructed literals need a type annotation, e.g. `let selector: PropertySelector<Field> = PropertySelector { index: 0, offset: 0, length: 32 };`.
-- `select`/`sort` reject properties that pack to more than one `Field` at compile time.
-- `select` takes its value typed as the property's type. Cast the value if a mixed-type comparison was intentional.
-- `properties()` cannot be used with a custom `Packable` layout. Define property selectors manually for such notes.
-- Every note field type must implement `Packable`, even when the note's own `Packable` is hand-written.
->>>>>>> c3a2a8512c6 (chore: re-pin handshake registry with owner-bound nullifiers (#24893))
 
 ### [Aztec.nr] History note nullification helpers renamed and restricted to own-contract notes
 

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

@@ -14,9 +14,5 @@ pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_fie
 );
 
 pub global STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
-<<<<<<< HEAD
     0x090d0f9525c99184e3741290b2695c5e3af23f51e96061b74b953111b0d4f59d,
-=======
-    0x06127814dca78709650de6629637194f7381d2e05b35eb9d53a4746636c9aa9d,
->>>>>>> c3a2a8512c6 (chore: re-pin handshake registry with owner-bound nullifiers (#24893))
 );

yarn-project/standard-contracts/src/standard_contract_data.ts

@@ -26,26 +26,15 @@ export const StandardContractAddress: Record<StandardContractName, AztecAddress>
   ),
   PublicChecks: AztecAddress.fromStringUnsafe('0x2f96c5a68fc1d04b13b76167a254f0a1a906c2dc0b571fcbca107254f064b045'),
   HandshakeRegistry: AztecAddress.fromStringUnsafe(
-<<<<<<< HEAD
     '0x090d0f9525c99184e3741290b2695c5e3af23f51e96061b74b953111b0d4f59d',
-=======
-    '0x06127814dca78709650de6629637194f7381d2e05b35eb9d53a4746636c9aa9d',
->>>>>>> c3a2a8512c6 (chore: re-pin handshake registry with owner-bound nullifiers (#24893))
   ),
 };
 
 export const StandardContractClassId: Record<StandardContractName, Fr> = {
-<<<<<<< HEAD
   AuthRegistry: Fr.fromString('0x1d203dfe82143b105c236b42c42ede91728d4590e7c541f7d2423edeb68c31ae'),
   MultiCallEntrypoint: Fr.fromString('0x127ebfb260048794535198012df8e2f7599a46651efbf738c406f4baa3b960ca'),
   PublicChecks: Fr.fromString('0x087cada0973aa4e162f0830a61aed5a3f03d1e9578ce953aba213f2508d579a7'),
   HandshakeRegistry: Fr.fromString('0x041a88db4c2b65a224ad9c9d96c8365d972a98f47e2549a1841ac9897b8b7dc0'),
-=======
-  AuthRegistry: Fr.fromString('0x04182c4b482c8e60c386e473f6dbb6bb3e2ef18e5156f7c9db5ac46af81abdcf'),
-  MultiCallEntrypoint: Fr.fromString('0x2f20566eaff9091697f8f5c43a19041267c7591d54074b57043eae90fca8ea64'),
-  PublicChecks: Fr.fromString('0x04bc93d415c4d48acab6063b6410f74e1cc257ba8e519020f8773b4ce8ccd31e'),
-  HandshakeRegistry: Fr.fromString('0x2e04c07c83ee8107e921c3ae4ade010ee183860a89b7534ea3367efb561d2c3b'),
->>>>>>> c3a2a8512c6 (chore: re-pin handshake registry with owner-bound nullifiers (#24893))
 };
 
 export const StandardContractClassIdPreimage: Record<
@@ -68,13 +57,8 @@ export const StandardContractClassIdPreimage: Record<
     publicBytecodeCommitment: Fr.fromString('0x013c4f854a5c87c9daf86c5f9bc07a42c2a061f1d924a5b3564ec7edc8e18cb7'),
   },
   HandshakeRegistry: {
-<<<<<<< HEAD
     artifactHash: Fr.fromString('0x062da141c4114bcc93ac6cbe2fe30f0e8cbf820780b2225e958fe806d0e347a9'),
     privateFunctionsRoot: Fr.fromString('0x16c4666c93705b44b4a164ec6bcbfd7ec0ff593922f4a0e3bc158b9e3a1f95c1'),
-=======
-    artifactHash: Fr.fromString('0x005a9c5db229999895a873e4c2bcaf6ca2523522b5c520c52c39b1bdb1b5faee'),
-    privateFunctionsRoot: Fr.fromString('0x1bb83fa540ba6654ffe4a4c75ec9349180a2f0ecd0d3851ca28d665ab2926c73'),
->>>>>>> c3a2a8512c6 (chore: re-pin handshake registry with owner-bound nullifiers (#24893))
     publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
   },
 };
@@ -112,21 +96,13 @@ export const StandardContractPrivateFunctions: Record<
       selector: FunctionSelector.fromField(
         Fr.fromString('0x0000000000000000000000000000000000000000000000000000000019f8b409'),
       ),
-<<<<<<< HEAD
       vkHash: Fr.fromString('0x0f230529c03e4877eeabfc0c659a1133e53f2d954b1d0f6092558cb02952da3e'),
-=======
-      vkHash: Fr.fromString('0x195d78c4fa1f3f8accaa2dcc45115c5b0536e68cdd4c06f5999185554f7b73e4'),
->>>>>>> c3a2a8512c6 (chore: re-pin handshake registry with owner-bound nullifiers (#24893))
     },
     {
       selector: FunctionSelector.fromField(
         Fr.fromString('0x00000000000000000000000000000000000000000000000000000000db548fcf'),
       ),
-<<<<<<< HEAD
       vkHash: Fr.fromString('0x2aa20cf767e6af6f99f4ceedcbdda34c2cd8a8e0763fb273810cf5abd7873b70'),
-=======
-      vkHash: Fr.fromString('0x06ea812f1c792a864a36003312327d78995fdd894fbf48d54928a315e84df342'),
->>>>>>> c3a2a8512c6 (chore: re-pin handshake registry with owner-bound nullifiers (#24893))
     },
     {
       selector: FunctionSelector.fromField(