@aztec/standard-contracts 0.0.1-commit.e57c76e → 0.0.1-commit.f5a9928

package/dest/standard_contract_data.js

@@ -15,36 +15,36 @@ export const StandardContractSalt = {
     HandshakeRegistry: new Fr(1)
 };
 export const StandardContractAddress = {
-    AuthRegistry: AztecAddress.fromString('0x2e1c8ae9471649da39ea42c4abb17ecb7028ae1e5e23bd35fd4251a69658a2e1'),
-    MultiCallEntrypoint: AztecAddress.fromString('0x0e169f6f6864aadf1eeafdef9af209f951f997f0b5187af191af7b271334aa20'),
-    PublicChecks: AztecAddress.fromString('0x106479f2993a73b878821b4cd0098c9bd48164b32e9b567df009732dabaa65e2'),
-    HandshakeRegistry: AztecAddress.fromString('0x04ee9dc0b25d393c804ab6a6fc34223f3ca914a9a9043bdc6cd877efc9067383')
+    AuthRegistry: AztecAddress.fromStringUnsafe('0x1e8e7e73c592a1b1c9199b4b655ddc7a16fa8a8488df595610b71d3dc1cc666c'),
+    MultiCallEntrypoint: AztecAddress.fromStringUnsafe('0x246d60af8b79a5dceece7d2388921203401c0df02ce674c5781c6c2162922986'),
+    PublicChecks: AztecAddress.fromStringUnsafe('0x031b75e2c220f6a6f27da5d61f7b2a12756a127fd25b95fad5da1c5520994b18'),
+    HandshakeRegistry: AztecAddress.fromStringUnsafe('0x06127814dca78709650de6629637194f7381d2e05b35eb9d53a4746636c9aa9d')
 };
 export const StandardContractClassId = {
-    AuthRegistry: Fr.fromString('0x09f06345b8e37c037d622f668d380018d2e013d04a31cbebaa9e7c23f7cc7a7d'),
-    MultiCallEntrypoint: Fr.fromString('0x239cdcd8464627acdf64f352b0a71b4b3cb2c27e8582ff4f273faff87a33ba65'),
-    PublicChecks: Fr.fromString('0x24ce4becc7cb6bf880726dc4358b09ada12fb0f7015c32b971822033fc5844f2'),
-    HandshakeRegistry: Fr.fromString('0x2453d20a9e6e312567b7c088c669ae376b13773971dd055af99251c86bcc59f3')
+    AuthRegistry: Fr.fromString('0x04182c4b482c8e60c386e473f6dbb6bb3e2ef18e5156f7c9db5ac46af81abdcf'),
+    MultiCallEntrypoint: Fr.fromString('0x2f20566eaff9091697f8f5c43a19041267c7591d54074b57043eae90fca8ea64'),
+    PublicChecks: Fr.fromString('0x04bc93d415c4d48acab6063b6410f74e1cc257ba8e519020f8773b4ce8ccd31e'),
+    HandshakeRegistry: Fr.fromString('0x2e04c07c83ee8107e921c3ae4ade010ee183860a89b7534ea3367efb561d2c3b')
 };
 export const StandardContractClassIdPreimage = {
     AuthRegistry: {
-        artifactHash: Fr.fromString('0x294cf57741ec175652921fd6fbd5ac8bcfe592ad761a5711b66a23b60ba8fbc0'),
-        privateFunctionsRoot: Fr.fromString('0x17b584350f4c3ccafd8f688729afb9feab8976114fb40012e9dee65022c072a4'),
-        publicBytecodeCommitment: Fr.fromString('0x2545f39893766508ce37bb5cea5e4dcab04c6f7f79f3089b1c076876e9d268b2')
+        artifactHash: Fr.fromString('0x0f050d2517afac6974e02937314e095569f4c7bb70d98cea097c562313872c8c'),
+        privateFunctionsRoot: Fr.fromString('0x1b16157ab0b322bcaf3de5cb197b276c5e29ca3668a0c440668ca56aa7dfff77'),
+        publicBytecodeCommitment: Fr.fromString('0x0c7984b020afc901da3b5898b8f94d1d9a09ea2b37d6e0043409abc0b0332906')
     },
     MultiCallEntrypoint: {
-        artifactHash: Fr.fromString('0x16a1c11f78386c8e1ff3d413e05e068a81f88b2659b66b909f7215226553fa60'),
-        privateFunctionsRoot: Fr.fromString('0x0e68dfbb256e80b08b3aef47aca1f2669e97a9c6259787893c1223ac083ad5d5'),
+        artifactHash: Fr.fromString('0x2c0df1970a0307e54c4445670a7f915a77ed57650ffd37a76c47e512c88e0302'),
+        privateFunctionsRoot: Fr.fromString('0x10228bc99b6715f15c866a1df0d9cb63c31920cb8e61a6b79058bf98658d7f39'),
         publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e')
     },
     PublicChecks: {
-        artifactHash: Fr.fromString('0x12c44e639e8a6c994c94c913eaf37c7809b1d97ea30d2c527474b09d4367c87d'),
+        artifactHash: Fr.fromString('0x0e6f595db5f0830c2f52f1a5aec5cc85193b89a47408cfbbb2d6ad8f3a7c8a52'),
         privateFunctionsRoot: Fr.fromString('0x202860adb1b8975971eeaf571aaaa88a27f4035290d58532ae7d60b0dfaad54c'),
         publicBytecodeCommitment: Fr.fromString('0x013c4f854a5c87c9daf86c5f9bc07a42c2a061f1d924a5b3564ec7edc8e18cb7')
     },
     HandshakeRegistry: {
-        artifactHash: Fr.fromString('0x16dc423d685d565f0713936fa5acec94daefe82d92c4306354c4eec35ae8aca6'),
-        privateFunctionsRoot: Fr.fromString('0x22071f2bef1999fe9698359ef95acfeb9cd7c473d04207ed160715c81292c6b3'),
+        artifactHash: Fr.fromString('0x005a9c5db229999895a873e4c2bcaf6ca2523522b5c520c52c39b1bdb1b5faee'),
+        privateFunctionsRoot: Fr.fromString('0x1bb83fa540ba6654ffe4a4c75ec9349180a2f0ecd0d3851ca28d665ab2926c73'),
         publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e')
     }
 };
@@ -58,24 +58,28 @@ export const StandardContractPrivateFunctions = {
     AuthRegistry: [
         {
             selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000079a3d418')),
-            vkHash: Fr.fromString('0x06a5c1b3a636c954a90be43cb56a4bdd9dc8aec764151a012e0018753694ff54')
+            vkHash: Fr.fromString('0x2d46cdec4cc2afd813ba2b50106dba455821e4c7b3c10f1c7293bbc759dccf64')
         }
     ],
     MultiCallEntrypoint: [
         {
             selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f04908a9')),
-            vkHash: Fr.fromString('0x0b19b2f937f2581922c2ead5411ad9ff4ed9710efe9849bde494d9a0f94812ec')
+            vkHash: Fr.fromString('0x0699bae67183ce084da1cd76ce05d18f45f796237f2baafaf7d4bfbf9663c433')
         }
     ],
     PublicChecks: [],
     HandshakeRegistry: [
         {
-            selector: FunctionSelector.fromField(Fr.fromString('0x000000000000000000000000000000000000000000000000000000005d4db100')),
-            vkHash: Fr.fromString('0x035db3173b6dc6305d989fe910690cc0a556bf30261c6b4235144403e5378635')
+            selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000019f8b409')),
+            vkHash: Fr.fromString('0x195d78c4fa1f3f8accaa2dcc45115c5b0536e68cdd4c06f5999185554f7b73e4')
         },
         {
-            selector: FunctionSelector.fromField(Fr.fromString('0x000000000000000000000000000000000000000000000000000000005fa93894')),
-            vkHash: Fr.fromString('0x0ed3c8564b7f78e1dd558a0e38719c7056b27ae7f48aed795ffa2d6d84bae85d')
+            selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000db548fcf')),
+            vkHash: Fr.fromString('0x06ea812f1c792a864a36003312327d78995fdd894fbf48d54928a315e84df342')
+        },
+        {
+            selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f1ff839b')),
+            vkHash: Fr.fromString('0x049120d4c9a12a2286c83df31064637b53746ea13868b0756174dcb3e036bb9d')
         }
     ]
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aztec/standard-contracts",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/standard-contracts",
   "description": "Standard non-protocol contracts for the Aztec Network",
-  "version": "0.0.1-commit.e57c76e",
+  "version": "0.0.1-commit.f5a9928",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -74,8 +74,8 @@
     ]
   },
   "dependencies": {
-    "@aztec/foundation": "0.0.1-commit.e57c76e",
-    "@aztec/stdlib": "0.0.1-commit.e57c76e",
+    "@aztec/foundation": "0.0.1-commit.f5a9928",
+    "@aztec/stdlib": "0.0.1-commit.f5a9928",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
@@ -95,6 +95,7 @@
     "src",
     "!*.test.*",
     "artifacts",
+    "artifacts-historical",
     "!src/scripts/*"
   ],
   "engines": {

package/src/auth-registry/constants.ts

@@ -1,8 +1,10 @@
 // Address-only leaf export for browser bundles: importing from
 // `@aztec/standard-contracts/auth-registry/constants` avoids dragging in the
 // `AuthRegistry.json` static import.
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
 import { StandardContractAddress, StandardContractClassId, StandardContractSalt } from '../standard_contract_data.js';
 
-export const STANDARD_AUTH_REGISTRY_ADDRESS = StandardContractAddress.AuthRegistry;
+export const STANDARD_AUTH_REGISTRY_ADDRESS: AztecAddress = StandardContractAddress.AuthRegistry;
 export const STANDARD_AUTH_REGISTRY_CLASS_ID = StandardContractClassId.AuthRegistry;
 export const STANDARD_AUTH_REGISTRY_SALT = StandardContractSalt.AuthRegistry;

package/src/contract_data.ts

@@ -32,13 +32,10 @@ export const NOIR_ARTIFACTS_SRC_PATH = path.join(NOIR_CONTRACTS_ROOT, './target'
 export const STANDARD_ARTIFACTS_DEST_DIR = './artifacts';
 /** Path of the generated TS data file (addresses, class IDs, etc.). */
 export const STANDARD_CONTRACT_DATA_OUTPUT_PATH = './src/standard_contract_data.ts';
-// Both consumers (aztec-nr's `aztec` crate and noir-contracts' `aztec_sublib`) need an identical
-// twin of the generated addresses module. `aztec_sublib` cannot depend on `aztec`, so we stamp the
-// same file into both locations rather than introducing a shared crate.
-export const NOIR_STANDARD_ADDRESSES_PATHS = [
-  '../../noir-projects/aztec-nr/aztec/src/standard_addresses.nr',
-  '../../noir-projects/noir-contracts/contracts/protocol/aztec_sublib/src/standard_addresses.nr',
-];
+// The `aztec` crate in aztec-nr needs a twin of the generated addresses module stamped into its
+// source so circuits can reference standard-contract addresses at compile time (e.g. authwit and
+// public_checks) without re-hashing at runtime.
+export const NOIR_STANDARD_ADDRESSES_PATHS = ['../../noir-projects/aztec-nr/aztec/src/standard_addresses.nr'];
 
 /** The deployment salt baked into every standard contract instance. */
 export const STANDARD_CONTRACT_SALT = new Fr(1);

package/src/drift.ts

@@ -37,7 +37,7 @@ function generateSalts(names: string[]) {
 function generateAddresses(names: string[], contractData: ContractData[]) {
   return `
     export const StandardContractAddress: Record<StandardContractName, AztecAddress> = {
-      ${contractData.map((d, i) => `${names[i]}: AztecAddress.fromString('${d.address.toString()}')`).join(',\n')}
+      ${contractData.map((d, i) => `${names[i]}: AztecAddress.fromStringUnsafe('${d.address.toString()}')`).join(',\n')}
     };
   `;
 }

package/src/handshake-registry/constants.ts

@@ -1,8 +1,25 @@
 // Lightweight metadata leaf export for browser bundles: importing from
 // `@aztec/standard-contracts/handshake-registry/constants` avoids dragging in the
 // `HandshakeRegistry.json` static import.
+import { sha256ToField } from '@aztec/foundation/crypto/sha256';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
 import { StandardContractAddress, StandardContractClassId, StandardContractSalt } from '../standard_contract_data.js';
 
-export const STANDARD_HANDSHAKE_REGISTRY_ADDRESS = StandardContractAddress.HandshakeRegistry;
+export { HISTORICAL_STANDARD_HANDSHAKE_REGISTRY_ADDRESSES } from './historical.js';
+
+export const STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = StandardContractAddress.HandshakeRegistry;
 export const STANDARD_HANDSHAKE_REGISTRY_CLASS_ID = StandardContractClassId.HandshakeRegistry;
 export const STANDARD_HANDSHAKE_REGISTRY_SALT = StandardContractSalt.HandshakeRegistry;
+
+/**
+ * Request kind under which the HandshakeRegistry asks for a recipient's interactive-handshake signature through the
+ * `resolveCustomRequest` hook. Mirrors `INTERACTIVE_HANDSHAKE_REQUEST_KIND` in the registry contract.
+ */
+// TODO: remove this mirrored constant and read the value from the HandshakeRegistry artifact once the contract
+// global can be `#[abi]`-exported. Fixed upstream but not yet released:
+// https://github.com/noir-lang/noir/pull/12714 and https://github.com/noir-lang/noir/issues/12620.
+export const INTERACTIVE_HANDSHAKE_REQUEST_KIND: Fr = sha256ToField([
+  Buffer.from('HANDSHAKE_REGISTRY::INTERACTIVE_HANDSHAKE_REQUEST'),
+]);

package/src/handshake-registry/historical.ts

@@ -0,0 +1,44 @@
+// Deployment data of superseded standard HandshakeRegistry versions. When a release changes the registry (and thus
+// its canonical address), contracts compiled against earlier releases keep the old address baked into their
+// bytecode, and the old instance stays live onchain. Archiving the retired deployment here (data below, trimmed
+// artifact under `artifacts-historical/`) lets PXE keep registering and authorizing it, so apps built on older
+// releases keep working against newer aztec.js versions.
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+import type { StandardContractData } from '../make_standard_contract.js';
+
+/** Deployment data of the standard HandshakeRegistry released in v5.0.1 and superseded in v5.1.0. */
+export const HANDSHAKE_REGISTRY_V5_0_1_DATA: StandardContractData = {
+  address: AztecAddress.fromStringUnsafe('0x086c3c67589e1141c70ed0ed8ae324c51d3bf7c5637043fd84c424ffb625831d'),
+  salt: new Fr(1),
+  classId: Fr.fromString('0x020ec1998d06036ddab4ba170e9b0d9b96e52beb58aa5ea83d72b22f589cbe6c'),
+  artifactHash: Fr.fromString('0x2dd01b80cabc352f7d01799a6e5dd6255cc0d7f01fe42d270760d0bf0a0b5daf'),
+  privateFunctionsRoot: Fr.fromString('0x0c80100ee31d91778c8f3d4453d056a58467b50f86d446f3209b96d87acb354e'),
+  publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
+  initializationHash: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+  privateFunctions: [
+    {
+      selector: FunctionSelector.fromField(new Fr(0x19f8b409)),
+      vkHash: Fr.fromString('0x033a99c31fd390e320398efa03eb1a34d0db2f2e0201fbb0062aa915f406f3d7'),
+    },
+    {
+      selector: FunctionSelector.fromField(new Fr(0xdb548fcf)),
+      vkHash: Fr.fromString('0x12964f25be85fded4079591a3871e85d15967c75fd70f3d0edf10d72abfea59c'),
+    },
+    {
+      selector: FunctionSelector.fromField(new Fr(0xf1ff839b)),
+      vkHash: Fr.fromString('0x049120d4c9a12a2286c83df31064637b53746ea13868b0756174dcb3e036bb9d'),
+    },
+  ],
+};
+
+/**
+ * Addresses of superseded standard HandshakeRegistry deployments that remain live onchain. PXE registers these
+ * alongside the current deployment and authorizes their read functions, so contracts compiled against older
+ * releases can still reach the registry version they were built for.
+ */
+export const HISTORICAL_STANDARD_HANDSHAKE_REGISTRY_ADDRESSES: AztecAddress[] = [
+  HANDSHAKE_REGISTRY_V5_0_1_DATA.address,
+];

package/src/handshake-registry/index.ts

@@ -1,11 +1,15 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
+import HandshakeRegistryV501Json from '../../artifacts-historical/HandshakeRegistry-5.0.1.json' with { type: 'json' };
 import HandshakeRegistryJson from '../../artifacts/HandshakeRegistry.json' with { type: 'json' };
-import { makeStandardContract } from '../make_standard_contract.js';
+import { makeStandardContract, makeStandardContractFromData } from '../make_standard_contract.js';
 import type { StandardContract } from '../standard_contract.js';
+import { HANDSHAKE_REGISTRY_V5_0_1_DATA } from './historical.js';
 
 export {
+  HISTORICAL_STANDARD_HANDSHAKE_REGISTRY_ADDRESSES,
+  INTERACTIVE_HANDSHAKE_REQUEST_KIND,
   STANDARD_HANDSHAKE_REGISTRY_ADDRESS,
   STANDARD_HANDSHAKE_REGISTRY_CLASS_ID,
   STANDARD_HANDSHAKE_REGISTRY_SALT,
@@ -22,3 +26,18 @@ export function getStandardHandshakeRegistry(): Promise<StandardContract> {
   }
   return Promise.resolve(standardContract);
 }
+
+let historicalStandardContracts: StandardContract[];
+
+/** Returns superseded standard deployments of the handshake registry that remain live onchain. */
+export function getHistoricalStandardHandshakeRegistries(): Promise<StandardContract[]> {
+  if (!historicalStandardContracts) {
+    historicalStandardContracts = [
+      makeStandardContractFromData(
+        HANDSHAKE_REGISTRY_V5_0_1_DATA,
+        loadContractArtifact(HandshakeRegistryV501Json as NoirCompiledContract),
+      ),
+    ];
+  }
+  return Promise.resolve(historicalStandardContracts);
+}

package/src/handshake-registry/lazy.ts

@@ -1,9 +1,11 @@
 import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
 
-import { makeStandardContract } from '../make_standard_contract.js';
+import { makeStandardContract, makeStandardContractFromData } from '../make_standard_contract.js';
 import type { StandardContract } from '../standard_contract.js';
+import { HANDSHAKE_REGISTRY_V5_0_1_DATA } from './historical.js';
 
 export {
+  HISTORICAL_STANDARD_HANDSHAKE_REGISTRY_ADDRESSES,
   STANDARD_HANDSHAKE_REGISTRY_ADDRESS,
   STANDARD_HANDSHAKE_REGISTRY_CLASS_ID,
   STANDARD_HANDSHAKE_REGISTRY_SALT,
@@ -33,3 +35,19 @@ export async function getStandardHandshakeRegistry(): Promise<StandardContract>
   }
   return standardContract;
 }
+
+let historicalStandardContracts: StandardContract[];
+
+/** Returns superseded standard deployments of the handshake registry that remain live onchain. */
+export async function getHistoricalStandardHandshakeRegistries(): Promise<StandardContract[]> {
+  if (!historicalStandardContracts) {
+    // Same bundler-compatible lazy import as `getHandshakeRegistryArtifact` above.
+    const { default: handshakeRegistryV501Json } = await import(
+      '../../artifacts-historical/HandshakeRegistry-5.0.1.json'
+    );
+    historicalStandardContracts = [
+      makeStandardContractFromData(HANDSHAKE_REGISTRY_V5_0_1_DATA, loadContractArtifact(handshakeRegistryV501Json)),
+    ];
+  }
+  return historicalStandardContracts;
+}

package/src/index.ts

@@ -1,4 +1,6 @@
 export * from './auth-registry/index.js';
 export * from './handshake-registry/index.js';
 export * from './multi-call-entrypoint/index.js';
+export * from './preloaded/index.js';
 export * from './public-checks/index.js';
+export * from './publishable_standard_contracts.js';

package/src/make_standard_contract.ts

@@ -3,6 +3,7 @@ import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicKeys } from '@aztec/stdlib/keys';
 
+import type { ContractData } from './contract_data.js';
 import type { StandardContract } from './standard_contract.js';
 import {
   StandardContractAddress,
@@ -14,16 +15,38 @@ import {
   StandardContractSalt,
 } from './standard_contract_data.js';
 
+/** Precomputed deployment values of a standard contract, enough to reconstruct it without any hash computations. */
+export type StandardContractData = ContractData & { salt: Fr };
+
 /**
  * Reconstructs a StandardContract from precomputed data without performing any hash computations.
  * Internal to the standard-contracts package — not part of the public API.
  */
 export function makeStandardContract(name: StandardContractName, artifact: ContractArtifact): StandardContract {
-  const address = StandardContractAddress[name];
-  const salt = StandardContractSalt[name];
-  const classId = StandardContractClassId[name];
   const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment } = StandardContractClassIdPreimage[name];
-  const initializationHash = StandardContractInitializationHash[name];
+  return makeStandardContractFromData(
+    {
+      address: StandardContractAddress[name],
+      salt: StandardContractSalt[name],
+      classId: StandardContractClassId[name],
+      artifactHash,
+      privateFunctionsRoot,
+      publicBytecodeCommitment,
+      initializationHash: StandardContractInitializationHash[name],
+      privateFunctions: StandardContractPrivateFunctions[name],
+    },
+    artifact,
+  );
+}
+
+/**
+ * Reconstructs a StandardContract from explicit precomputed data, for deployments not covered by the generated
+ * `standard_contract_data.ts` records (namely historical deployments from previous releases).
+ * Internal to the standard-contracts package, not part of the public API.
+ */
+export function makeStandardContractFromData(data: StandardContractData, artifact: ContractArtifact): StandardContract {
+  const { address, salt, classId, artifactHash, privateFunctionsRoot, publicBytecodeCommitment, initializationHash } =
+    data;
 
   const contractClass = {
     id: classId,
@@ -32,7 +55,7 @@ export function makeStandardContract(name: StandardContractName, artifact: Contr
     privateFunctionsRoot,
     publicBytecodeCommitment,
     packedBytecode: artifact.functions.find(f => f.name === 'public_dispatch')?.bytecode ?? Buffer.alloc(0),
-    privateFunctions: StandardContractPrivateFunctions[name],
+    privateFunctions: data.privateFunctions,
   };
 
   const instance = {

package/src/multi-call-entrypoint/constants.ts

@@ -1,8 +1,10 @@
 // Lightweight metadata leaf export for browser bundles: importing from
 // `@aztec/standard-contracts/multi-call-entrypoint/constants` avoids dragging in the
 // `MultiCallEntrypoint.json` static import.
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
 import { StandardContractAddress, StandardContractClassId, StandardContractSalt } from '../standard_contract_data.js';
 
-export const STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS = StandardContractAddress.MultiCallEntrypoint;
+export const STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = StandardContractAddress.MultiCallEntrypoint;
 export const STANDARD_MULTI_CALL_ENTRYPOINT_CLASS_ID = StandardContractClassId.MultiCallEntrypoint;
 export const STANDARD_MULTI_CALL_ENTRYPOINT_SALT = StandardContractSalt.MultiCallEntrypoint;

package/src/preloaded/index.ts

@@ -0,0 +1,19 @@
+import { getStandardAuthRegistry } from '../auth-registry/index.js';
+import { getHistoricalStandardHandshakeRegistries, getStandardHandshakeRegistry } from '../handshake-registry/index.js';
+import { getStandardMultiCallEntrypoint } from '../multi-call-entrypoint/index.js';
+import type { StandardContract } from '../standard_contract.js';
+
+/**
+ * Returns the standard contracts every PXE registers by default: the MultiCallEntrypoint, the AuthRegistry, and the
+ * HandshakeRegistry, plus superseded HandshakeRegistry deployments that remain live onchain so contracts compiled
+ * against older releases keep resolving the registry version they were built for.
+ */
+export async function getDefaultStandardPreloadedContracts(): Promise<StandardContract[]> {
+  const [multiCallEntrypoint, authRegistry, handshakeRegistry, historicalHandshakeRegistries] = await Promise.all([
+    getStandardMultiCallEntrypoint(),
+    getStandardAuthRegistry(),
+    getStandardHandshakeRegistry(),
+    getHistoricalStandardHandshakeRegistries(),
+  ]);
+  return [multiCallEntrypoint, authRegistry, handshakeRegistry, ...historicalHandshakeRegistries];
+}

package/src/preloaded/lazy.ts

@@ -0,0 +1,19 @@
+import { getStandardAuthRegistry } from '../auth-registry/lazy.js';
+import { getHistoricalStandardHandshakeRegistries, getStandardHandshakeRegistry } from '../handshake-registry/lazy.js';
+import { getStandardMultiCallEntrypoint } from '../multi-call-entrypoint/lazy.js';
+import type { StandardContract } from '../standard_contract.js';
+
+/**
+ * Returns the standard contracts every PXE registers by default: the MultiCallEntrypoint, the AuthRegistry, and the
+ * HandshakeRegistry, plus superseded HandshakeRegistry deployments that remain live onchain so contracts compiled
+ * against older releases keep resolving the registry version they were built for.
+ */
+export async function getDefaultStandardPreloadedContracts(): Promise<StandardContract[]> {
+  const [multiCallEntrypoint, authRegistry, handshakeRegistry, historicalHandshakeRegistries] = await Promise.all([
+    getStandardMultiCallEntrypoint(),
+    getStandardAuthRegistry(),
+    getStandardHandshakeRegistry(),
+    getHistoricalStandardHandshakeRegistries(),
+  ]);
+  return [multiCallEntrypoint, authRegistry, handshakeRegistry, ...historicalHandshakeRegistries];
+}

package/src/public-checks/constants.ts

@@ -1,8 +1,10 @@
 // Lightweight metadata leaf export for browser bundles: importing from
 // `@aztec/standard-contracts/public-checks/constants` avoids dragging in the
 // `PublicChecks.json` static import.
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
 import { StandardContractAddress, StandardContractClassId, StandardContractSalt } from '../standard_contract_data.js';
 
-export const STANDARD_PUBLIC_CHECKS_ADDRESS = StandardContractAddress.PublicChecks;
+export const STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = StandardContractAddress.PublicChecks;
 export const STANDARD_PUBLIC_CHECKS_CLASS_ID = StandardContractClassId.PublicChecks;
 export const STANDARD_PUBLIC_CHECKS_SALT = StandardContractSalt.PublicChecks;

package/src/publishable_standard_contracts.ts

@@ -0,0 +1,22 @@
+import { getStandardAuthRegistry } from './auth-registry/index.js';
+import { getStandardHandshakeRegistry } from './handshake-registry/index.js';
+import { getStandardPublicChecks } from './public-checks/index.js';
+import type { StandardContract } from './standard_contract.js';
+
+/**
+ * Returns the standard contracts that are published on-chain (class registration + instance
+ * publication) before their public functions can be called: AuthRegistry, PublicChecks, and
+ * HandshakeRegistry. These are exactly the contracts guarded by the `ensure*Published` e2e setup
+ * helpers.
+ *
+ * MultiCallEntrypoint is deliberately excluded: it is a client-side entrypoint used to encode
+ * batched private calls and is never published for public execution.
+ *
+ * This is the single source of truth for the set of standard contracts that test environments seed
+ * at genesis (registration/deployment nullifiers) and preload into the archiver contract store, so
+ * the two stay consistent — preloading a class whose nullifier is not seeded would recreate the
+ * publish-collision bug that genesis seeding avoids.
+ */
+export function getPublishableStandardContracts(): Promise<StandardContract[]> {
+  return Promise.all([getStandardAuthRegistry(), getStandardPublicChecks(), getStandardHandshakeRegistry()]);
+}

package/src/standard_contract_data.ts

@@ -20,17 +20,21 @@ export const StandardContractSalt: Record<StandardContractName, Fr> = {
 };
 
 export const StandardContractAddress: Record<StandardContractName, AztecAddress> = {
-  AuthRegistry: AztecAddress.fromString('0x2e1c8ae9471649da39ea42c4abb17ecb7028ae1e5e23bd35fd4251a69658a2e1'),
-  MultiCallEntrypoint: AztecAddress.fromString('0x0e169f6f6864aadf1eeafdef9af209f951f997f0b5187af191af7b271334aa20'),
-  PublicChecks: AztecAddress.fromString('0x106479f2993a73b878821b4cd0098c9bd48164b32e9b567df009732dabaa65e2'),
-  HandshakeRegistry: AztecAddress.fromString('0x04ee9dc0b25d393c804ab6a6fc34223f3ca914a9a9043bdc6cd877efc9067383'),
+  AuthRegistry: AztecAddress.fromStringUnsafe('0x1e8e7e73c592a1b1c9199b4b655ddc7a16fa8a8488df595610b71d3dc1cc666c'),
+  MultiCallEntrypoint: AztecAddress.fromStringUnsafe(
+    '0x246d60af8b79a5dceece7d2388921203401c0df02ce674c5781c6c2162922986',
+  ),
+  PublicChecks: AztecAddress.fromStringUnsafe('0x031b75e2c220f6a6f27da5d61f7b2a12756a127fd25b95fad5da1c5520994b18'),
+  HandshakeRegistry: AztecAddress.fromStringUnsafe(
+    '0x06127814dca78709650de6629637194f7381d2e05b35eb9d53a4746636c9aa9d',
+  ),
 };
 
 export const StandardContractClassId: Record<StandardContractName, Fr> = {
-  AuthRegistry: Fr.fromString('0x09f06345b8e37c037d622f668d380018d2e013d04a31cbebaa9e7c23f7cc7a7d'),
-  MultiCallEntrypoint: Fr.fromString('0x239cdcd8464627acdf64f352b0a71b4b3cb2c27e8582ff4f273faff87a33ba65'),
-  PublicChecks: Fr.fromString('0x24ce4becc7cb6bf880726dc4358b09ada12fb0f7015c32b971822033fc5844f2'),
-  HandshakeRegistry: Fr.fromString('0x2453d20a9e6e312567b7c088c669ae376b13773971dd055af99251c86bcc59f3'),
+  AuthRegistry: Fr.fromString('0x04182c4b482c8e60c386e473f6dbb6bb3e2ef18e5156f7c9db5ac46af81abdcf'),
+  MultiCallEntrypoint: Fr.fromString('0x2f20566eaff9091697f8f5c43a19041267c7591d54074b57043eae90fca8ea64'),
+  PublicChecks: Fr.fromString('0x04bc93d415c4d48acab6063b6410f74e1cc257ba8e519020f8773b4ce8ccd31e'),
+  HandshakeRegistry: Fr.fromString('0x2e04c07c83ee8107e921c3ae4ade010ee183860a89b7534ea3367efb561d2c3b'),
 };
 
 export const StandardContractClassIdPreimage: Record<
@@ -38,23 +42,23 @@ export const StandardContractClassIdPreimage: Record<
   { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }
 > = {
   AuthRegistry: {
-    artifactHash: Fr.fromString('0x294cf57741ec175652921fd6fbd5ac8bcfe592ad761a5711b66a23b60ba8fbc0'),
-    privateFunctionsRoot: Fr.fromString('0x17b584350f4c3ccafd8f688729afb9feab8976114fb40012e9dee65022c072a4'),
-    publicBytecodeCommitment: Fr.fromString('0x2545f39893766508ce37bb5cea5e4dcab04c6f7f79f3089b1c076876e9d268b2'),
+    artifactHash: Fr.fromString('0x0f050d2517afac6974e02937314e095569f4c7bb70d98cea097c562313872c8c'),
+    privateFunctionsRoot: Fr.fromString('0x1b16157ab0b322bcaf3de5cb197b276c5e29ca3668a0c440668ca56aa7dfff77'),
+    publicBytecodeCommitment: Fr.fromString('0x0c7984b020afc901da3b5898b8f94d1d9a09ea2b37d6e0043409abc0b0332906'),
   },
   MultiCallEntrypoint: {
-    artifactHash: Fr.fromString('0x16a1c11f78386c8e1ff3d413e05e068a81f88b2659b66b909f7215226553fa60'),
-    privateFunctionsRoot: Fr.fromString('0x0e68dfbb256e80b08b3aef47aca1f2669e97a9c6259787893c1223ac083ad5d5'),
+    artifactHash: Fr.fromString('0x2c0df1970a0307e54c4445670a7f915a77ed57650ffd37a76c47e512c88e0302'),
+    privateFunctionsRoot: Fr.fromString('0x10228bc99b6715f15c866a1df0d9cb63c31920cb8e61a6b79058bf98658d7f39'),
     publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
   },
   PublicChecks: {
-    artifactHash: Fr.fromString('0x12c44e639e8a6c994c94c913eaf37c7809b1d97ea30d2c527474b09d4367c87d'),
+    artifactHash: Fr.fromString('0x0e6f595db5f0830c2f52f1a5aec5cc85193b89a47408cfbbb2d6ad8f3a7c8a52'),
     privateFunctionsRoot: Fr.fromString('0x202860adb1b8975971eeaf571aaaa88a27f4035290d58532ae7d60b0dfaad54c'),
     publicBytecodeCommitment: Fr.fromString('0x013c4f854a5c87c9daf86c5f9bc07a42c2a061f1d924a5b3564ec7edc8e18cb7'),
   },
   HandshakeRegistry: {
-    artifactHash: Fr.fromString('0x16dc423d685d565f0713936fa5acec94daefe82d92c4306354c4eec35ae8aca6'),
-    privateFunctionsRoot: Fr.fromString('0x22071f2bef1999fe9698359ef95acfeb9cd7c473d04207ed160715c81292c6b3'),
+    artifactHash: Fr.fromString('0x005a9c5db229999895a873e4c2bcaf6ca2523522b5c520c52c39b1bdb1b5faee'),
+    privateFunctionsRoot: Fr.fromString('0x1bb83fa540ba6654ffe4a4c75ec9349180a2f0ecd0d3851ca28d665ab2926c73'),
     publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
   },
 };
@@ -75,7 +79,7 @@ export const StandardContractPrivateFunctions: Record<
       selector: FunctionSelector.fromField(
         Fr.fromString('0x0000000000000000000000000000000000000000000000000000000079a3d418'),
       ),
-      vkHash: Fr.fromString('0x06a5c1b3a636c954a90be43cb56a4bdd9dc8aec764151a012e0018753694ff54'),
+      vkHash: Fr.fromString('0x2d46cdec4cc2afd813ba2b50106dba455821e4c7b3c10f1c7293bbc759dccf64'),
     },
   ],
   MultiCallEntrypoint: [
@@ -83,22 +87,28 @@ export const StandardContractPrivateFunctions: Record<
       selector: FunctionSelector.fromField(
         Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f04908a9'),
       ),
-      vkHash: Fr.fromString('0x0b19b2f937f2581922c2ead5411ad9ff4ed9710efe9849bde494d9a0f94812ec'),
+      vkHash: Fr.fromString('0x0699bae67183ce084da1cd76ce05d18f45f796237f2baafaf7d4bfbf9663c433'),
     },
   ],
   PublicChecks: [],
   HandshakeRegistry: [
     {
       selector: FunctionSelector.fromField(
-        Fr.fromString('0x000000000000000000000000000000000000000000000000000000005d4db100'),
+        Fr.fromString('0x0000000000000000000000000000000000000000000000000000000019f8b409'),
       ),
-      vkHash: Fr.fromString('0x035db3173b6dc6305d989fe910690cc0a556bf30261c6b4235144403e5378635'),
+      vkHash: Fr.fromString('0x195d78c4fa1f3f8accaa2dcc45115c5b0536e68cdd4c06f5999185554f7b73e4'),
     },
     {
       selector: FunctionSelector.fromField(
-        Fr.fromString('0x000000000000000000000000000000000000000000000000000000005fa93894'),
+        Fr.fromString('0x00000000000000000000000000000000000000000000000000000000db548fcf'),
       ),
-      vkHash: Fr.fromString('0x0ed3c8564b7f78e1dd558a0e38719c7056b27ae7f48aed795ffa2d6d84bae85d'),
+      vkHash: Fr.fromString('0x06ea812f1c792a864a36003312327d78995fdd894fbf48d54928a315e84df342'),
+    },
+    {
+      selector: FunctionSelector.fromField(
+        Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f1ff839b'),
+      ),
+      vkHash: Fr.fromString('0x049120d4c9a12a2286c83df31064637b53746ea13868b0756174dcb3e036bb9d'),
     },
   ],
 };