chore!: move protocol contracts out of noir-contracts.js (#24998)

With this change, these files are served instead through the protocol
contracts package (where they already existed). I changed the generation
of noir-contracts.js so that only non-protocol non-test contracts go
there, so it is now ready for the noir side of things to also be split.

Author: nventuro

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

@@ -9,6 +9,33 @@ Aztec is in active development. Each version may introduce breaking changes that
 
 ## TBD
 
+### [Aztec.js] Protocol contracts removed from `@aztec/noir-contracts.js`
+
+`@aztec/noir-contracts.js` no longer includes the protocol contracts: the `FeeJuice`, `ContractClassRegistry`, and `ContractInstanceRegistry` artifacts and typed wrappers have been removed from the package, so imports such as `@aztec/noir-contracts.js/FeeJuice` no longer resolve. These names are also no longer available to the `aztec` CLI's contract-name lookup (e.g. in `aztec example-contracts`).
+
+Protocol contracts are distributed via `@aztec/protocol-contracts` (artifacts and canonical deployment data), and typed wrappers for them are exported from `@aztec/aztec.js/protocol`. The `aztec.js` wrappers are bound to the contract's canonical address, so attaching takes only the wallet: there is no address parameter.
+
+**Migration:**
+
+```diff
+- import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
++ import { FeeJuiceContract } from '@aztec/aztec.js/protocol';
+
+- const feeJuice = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
++ const feeJuice = FeeJuiceContract.withWallet(wallet);
+```
+
+### [Aztec.js] Protocol contract wrappers: `at(wallet)` deprecated in favor of `withWallet(wallet)`
+
+The protocol contract wrappers exported from `@aztec/aztec.js/protocol` (`FeeJuiceContract`, `ContractClassRegistryContract`, `ContractInstanceRegistryContract`) rename their static `at(wallet)` to `withWallet(wallet)`. These wrappers are bound to the contract's canonical address, so their only parameter is the wallet to act through; `withWallet` states that directly and matches the existing `withWallet` instance method, whereas the one-argument `at` read as if it took an address. `at(wallet)` still works but is deprecated and will be removed in a future release.
+
+**Migration:**
+
+```diff
+- const feeJuice = FeeJuiceContract.at(wallet);
++ const feeJuice = FeeJuiceContract.withWallet(wallet);
+```
+
 ### [Aztec.nr] Standard contracts re-pinned at new addresses
 
 The canonical `HandshakeRegistry` now protects handshake shared secrets from recipient forgery and includes the owner's address in its `PrivateMutable` initialization nullifiers, keeping the handshake state of accounts that share keys independent. All standard contracts have been re-pinned and move to new addresses. Handshakes established with a previous registry instance are not visible to the new one and must be re-established.

yarn-project/archiver/package.json

@@ -73,7 +73,6 @@
     "@aztec/foundation": "workspace:^",
     "@aztec/kv-store": "workspace:^",
     "@aztec/l1-artifacts": "0.1.0-dummy",
-    "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/standard-contracts": "workspace:^",
     "@aztec/stdlib": "workspace:^",

yarn-project/archiver/tsconfig.json

@@ -27,9 +27,6 @@
     {
       "path": "../kv-store"
     },
-    {
-      "path": "../noir-protocol-circuits-types"
-    },
     {
       "path": "../protocol-contracts"
     },

yarn-project/aztec-node/package.json

@@ -78,7 +78,6 @@
     "@aztec/l1-artifacts": "0.1.0-dummy",
     "@aztec/node-keystore": "workspace:^",
     "@aztec/node-lib": "workspace:^",
-    "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@aztec/p2p": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/prover-client": "workspace:^",
@@ -98,6 +97,7 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
+    "@aztec/noir-protocol-circuits-types": "workspace:^",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

yarn-project/aztec-node/tsconfig.json

@@ -39,9 +39,6 @@
     {
       "path": "../node-lib"
     },
-    {
-      "path": "../noir-protocol-circuits-types"
-    },
     {
       "path": "../p2p"
     },
@@ -80,6 +77,9 @@
     },
     {
       "path": "../world-state"
+    },
+    {
+      "path": "../noir-protocol-circuits-types"
     }
   ],
   "include": ["src"]

yarn-project/aztec.js/src/deployment/publish_class.ts

@@ -19,7 +19,7 @@ export async function publishContractClass(
 ): Promise<ContractFunctionInteraction> {
   const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment, packedBytecode } =
     await getContractClassFromArtifact(artifact);
-  const classRegistry = ContractClassRegistryContract.at(wallet);
+  const classRegistry = ContractClassRegistryContract.withWallet(wallet);
 
   const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
   return classRegistry.methods.publish(artifactHash, privateFunctionsRoot, publicBytecodeCommitment).with({

yarn-project/aztec.js/src/deployment/publish_instance.ts

@@ -10,7 +10,7 @@ import type { Wallet } from '../wallet/wallet.js';
  * @param instance - The instance to publish.
  */
 export function publishInstance(wallet: Wallet, instance: ContractInstanceWithAddress): ContractFunctionInteraction {
-  const contractInstanceRegistry = ContractInstanceRegistryContract.at(wallet);
+  const contractInstanceRegistry = ContractInstanceRegistryContract.withWallet(wallet);
   const { salt, currentContractClassId: contractClassId, publicKeys, deployer: instanceDeployer } = instance;
   const isUniversalDeploy = instanceDeployer.isZero();
   return contractInstanceRegistry.methods.publish_for_public_execution(

yarn-project/aztec.js/src/scripts/generate_protocol_contract_types.ts

@@ -112,10 +112,16 @@ export class ${contractName} extends ContractBase {
     super(ProtocolContractAddress.${protocolContractName}, ${contractName}Artifact, wallet);
   }
 
-  public static at(wallet: Wallet): ${contractName} {
+  /** Returns an interface to the canonical ${contractName} instance, bound to the given wallet. */
+  public static withWallet(wallet: Wallet): ${contractName} {
     return new ${contractName}(wallet);
   }
 
+  /** @deprecated Use \`withWallet\` instead. */
+  public static at(wallet: Wallet): ${contractName} {
+    return ${contractName}.withWallet(wallet);
+  }
+
   public declare methods: {${methodsMatch[1]}
   };
 }

yarn-project/end-to-end/src/bench/client_flows/client_flows_benchmark.ts

@@ -4,6 +4,7 @@ import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
 import { type FeePaymentMethod, PrivateFeePaymentMethod, SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
 import { type Logger, createLogger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
+import { FeeJuiceContract } from '@aztec/aztec.js/protocol';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import { CheatCodes, getTokenAllowedSetupFunctions } from '@aztec/aztec/testing';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
@@ -19,11 +20,8 @@ import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
-import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TestTokenContract as BananaCoin, TestTokenContract } from '@aztec/noir-test-contracts.js/TestToken';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { Gas, GasSettings } from '@aztec/stdlib/gas';
@@ -218,8 +216,7 @@ export class ClientFlowsBenchmark {
     this.adminAddress = adminAddress;
     this.sequencerAddress = sequencerAddress;
 
-    const canonicalFeeJuice = await getCanonicalFeeJuice();
-    this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
+    this.feeJuiceContract = FeeJuiceContract.withWallet(this.adminWallet);
     this.coinbase = EthAddress.random();
 
     const userPXEConfig = getPXEConfig();
@@ -250,7 +247,7 @@ export class ClientFlowsBenchmark {
 
   async applySetupFeeJuice() {
     this.logger.info('Applying fee juice setup');
-    this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
+    this.feeJuiceContract = FeeJuiceContract.withWallet(this.adminWallet);
 
     this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
       aztecNode: this.context.aztecNodeService,

yarn-project/end-to-end/src/shared/gas_portal_test_harness.ts

@@ -3,11 +3,10 @@ import { L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim } from
 import { Fr } from '@aztec/aztec.js/fields';
 import type { Logger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
+import { FeeJuiceContract } from '@aztec/aztec.js/protocol';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { retryUntil } from '@aztec/foundation/retry';
-import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import type { AztecNodeAdmin, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
 
 import { testSpan } from '../fixtures/timing.js';
@@ -49,7 +48,7 @@ export class FeeJuicePortalTestingHarnessFactory {
       throw new Error('Fee Juice portal not deployed on L1');
     }
 
-    const gasL2 = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
+    const gasL2 = FeeJuiceContract.withWallet(wallet);
 
     return new GasBridgingTestHarness(
       aztecNode,