Merge branch 'v5-next' into merge-train/fairies-v5

Author: nchamo

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "6.0.0"
+  ".": "5.0.0"
 }

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

@@ -959,6 +959,22 @@ The empire slashing model has been removed. Only the tally-based slashing model
 
 ## Unreleased (v5)
 
+### [Aztec Node] `getTxByHash`, `getTxsByHash` and `getPendingTxs` no longer return tx proofs by default
+
+`AztecNode.getTxByHash`, `AztecNode.getTxsByHash` and `AztecNode.getPendingTxs` (also exposed on the P2P API) now take an optional `GetTxByHashOptions` argument with an `includeProof` flag. The proof is stripped from returned txs unless `includeProof: true` is passed, cutting roughly 35-52KB per tx over the wire.
+
+**Migration:**
+
+```diff
+- const tx = await node.getTxByHash(txHash);
++ const tx = await node.getTxByHash(txHash, { includeProof: true });
+
+- const txs = await node.getPendingTxs(limit, after);
++ const txs = await node.getPendingTxs(limit, after, { includeProof: true });
+```
+
+**Impact**: Callers that read the proof off returned txs (eg to re-broadcast or validate them) must now pass `{ includeProof: true }` explicitly; by default the returned txs carry an empty proof.
+
 ### [aztec.js] `DeployMethod.send()` always returns `{ contract, receipt, instance }`
 
 The `returnReceipt` option in deploy wait options has been removed. `DeployMethod.send()` now always returns an object with `contract`, `receipt`, and `instance` at the top level, provided the user waits for the transaction to be included.

noir-projects/mock-protocol-circuits/pinned-build.tar.gz

@@ -152,9 +152,12 @@ function build {
   # If pinned-build.tar.gz exists, use it instead of compiling.
   if [ -f pinned-build.tar.gz ]; then
     echo_stderr "Using pinned-build.tar.gz instead of compiling."
+    # The archive holds project-root-relative paths (target/ plus the reset-circuit variant
+    # manifest, which generate_variants would normally produce but is skipped here), so it
+    # unpacks straight into place: target/ and private_kernel_reset_dimensions.json land where
+    # downstream codegen (noir-protocol-circuits-types) expects them.
     rm -rf target
-    mkdir -p target
-    tar xzf pinned-build.tar.gz -C target
+    tar xzf pinned-build.tar.gz
     return
   fi
 
@@ -257,7 +260,14 @@ function pin-build {
   rm -f pinned-build.tar.gz
   build
   echo_stderr "Creating pinned-build.tar.gz from target..."
-  tar czf pinned-build.tar.gz -C target .
+  # Archive project-root-relative paths so the build can unpack straight into place. We bundle
+  # the reset-circuit variant manifest alongside target/ because generate_variants (which
+  # produces it) is skipped when a pinned build is consumed, yet downstream codegen
+  # (noir-protocol-circuits-types) requires it. The manifest only exists for the real circuits,
+  # so it is included conditionally (mock-protocol-circuits has none).
+  pin_paths=(target)
+  [ -f private_kernel_reset_dimensions.json ] && pin_paths+=(private_kernel_reset_dimensions.json)
+  tar czf pinned-build.tar.gz "${pin_paths[@]}"
   echo_stderr "Done. pinned-build.tar.gz created. Commit it to pin these artifacts."
 }
 

noir-projects/noir-protocol-circuits/bootstrap.sh

@@ -1639,7 +1639,9 @@ describe('aztec node', () => {
       p2p.getTxStatus.mockResolvedValue('pending');
       l2BlockSource.getTxEffect.mockResolvedValue(undefined);
       const pendingTx = await mockTx();
-      p2p.getTxByHashFromPool.mockResolvedValue(pendingTx);
+      p2p.getTxByHashFromPool.mockImplementation((_h, opts) =>
+        Promise.resolve(opts?.includeProof === false ? pendingTx.withoutProof() : pendingTx),
+      );
 
       const receipt = await node.getTxReceipt(txHash, { includePendingTx: true });
       expect(receipt).toBeInstanceOf(PendingTxReceipt);
@@ -1650,6 +1652,24 @@ describe('aztec node', () => {
       expect(receipt.tx!.chonkProof).toEqual(pendingTx.withoutProof().chonkProof);
     });
 
+    it('attaches the pending tx with its proof when includePendingTx and includeProof are set', async () => {
+      const txHash = TxHash.random();
+      p2p.getTxStatus.mockResolvedValue('pending');
+      l2BlockSource.getTxEffect.mockResolvedValue(undefined);
+      const pendingTx = await mockTx();
+      p2p.getTxByHashFromPool.mockImplementation((_h, opts) =>
+        Promise.resolve(opts?.includeProof === false ? pendingTx.withoutProof() : pendingTx),
+      );
+
+      const receipt = await node.getTxReceipt(txHash, { includePendingTx: true, includeProof: true });
+      expect(receipt).toBeInstanceOf(PendingTxReceipt);
+      if (!receipt.isPending()) {
+        throw new Error('expected a pending receipt');
+      }
+      expect(receipt.tx).toBeDefined();
+      expect(receipt.tx!.chonkProof).toEqual(pendingTx.chonkProof);
+    });
+
     it('returns a dropped receipt when the tx is unknown to the pool and not mined', async () => {
       const txHash = TxHash.random();
       p2p.getTxStatus.mockResolvedValue(undefined);

noir-projects/noir-protocol-circuits/pinned-build.tar.gz

@@ -98,6 +98,7 @@ import type {
   CheckpointIncludeOptions,
   CheckpointParameter,
   CheckpointResponse,
+  GetTxByHashOptions,
 } from '@aztec/stdlib/interfaces/client';
 import { AztecNodeAdminConfigSchema } from '@aztec/stdlib/interfaces/client';
 import {
@@ -1114,7 +1115,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
   }
 
   public async getMaxPriorityFees(): Promise<GasFees> {
-    for await (const tx of this.p2pClient.iteratePendingTxs()) {
+    for await (const tx of this.p2pClient.iteratePendingTxs({ includeProof: false })) {
       return tx.getGasSettings().maxPriorityFeesPerGas;
     }
 
@@ -1216,8 +1217,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
       if (options?.includePendingTx) {
         // The tx may have left the pool since we checked its status (mined or dropped); in that case we
         // leave `tx` unset and still return a pending receipt.
-        const pendingTx = await this.p2pClient.getTxByHashFromPool(txHash);
-        tx = pendingTx && !options.includeProof ? pendingTx.withoutProof() : pendingTx;
+        tx = await this.p2pClient.getTxByHashFromPool(txHash, { includeProof: !!options.includeProof });
       }
       receipt = new PendingTxReceipt(txHash, tx);
     } else {
@@ -1305,30 +1305,35 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, AztecNodeDeb
    * @param after - The last known pending tx. Used for pagination
    * @returns - The pending txs.
    */
-  public getPendingTxs(limit?: number, after?: TxHash): Promise<Tx[]> {
-    return this.p2pClient!.getPendingTxs(limit, after);
+  public getPendingTxs(limit?: number, after?: TxHash, options?: GetTxByHashOptions): Promise<Tx[]> {
+    return this.p2pClient!.getPendingTxs(limit, after, options);
   }
 
   public getPendingTxCount(): Promise<number> {
     return this.p2pClient!.getPendingTxCount();
   }
 
   /**
-   * Method to retrieve a single tx from the mempool or unfinalized chain.
+   * Method to retrieve a single tx from the mempool or unfinalized chain. The tx's proof is only loaded and returned
+   * when `includeProof` is set.
    * @param txHash - The transaction hash to return.
+   * @param options - Options for the returned tx (eg whether to include its proof).
    * @returns - The tx if it exists.
    */
-  public getTxByHash(txHash: TxHash): Promise<Tx | undefined> {
-    return Promise.resolve(this.p2pClient!.getTxByHashFromPool(txHash));
+  public getTxByHash(txHash: TxHash, options?: GetTxByHashOptions): Promise<Tx | undefined> {
+    return this.p2pClient!.getTxByHashFromPool(txHash, { includeProof: !!options?.includeProof });
   }
 
   /**
-   * Method to retrieve txs from the mempool or unfinalized chain.
+   * Method to retrieve txs from the mempool or unfinalized chain. The txs' proofs are only loaded and returned when
+   * `includeProof` is set.
    * @param txHash - The transaction hash to return.
+   * @param options - Options for the returned txs (eg whether to include their proofs).
    * @returns - The txs if it exists.
    */
-  public async getTxsByHash(txHashes: TxHash[]): Promise<Tx[]> {
-    return compactArray(await Promise.all(txHashes.map(txHash => this.getTxByHash(txHash))));
+  public async getTxsByHash(txHashes: TxHash[], options?: GetTxByHashOptions): Promise<Tx[]> {
+    const txs = await this.p2pClient!.getTxsByHashFromPool(txHashes, { includeProof: !!options?.includeProof });
+    return compactArray(txs);
   }
 
   public async findLeavesIndexes(

yarn-project/aztec-node/src/aztec-node/server.test.ts

@@ -7,7 +7,10 @@ import { getGenesisValues } from '@aztec/world-state/testing';
  * This test suit makes sure that the code in the monorepo is still compatible with the latest version of mainnet
  * Only update these values after a governance update that changes the protocol is enacted
  */
-describe('Mainnet compatibility', () => {
+// TODO: temporarily skipped on v5-next, which carries unreleased protocol circuit changes that
+// shift the VK tree root, protocol contracts hash and genesis roots away from the live mainnet
+// values. Re-enable (and refresh the expected values) once we cut the first RC.
+describe.skip('Mainnet compatibility', () => {
   it('has expected VK tree root', () => {
     const expectedRoots = [Fr.fromHexString('0x18e358ea5367f6069a4c1c08a2e0628fbb1b25c00b0b98160072d4ad397bae7c')];
     expect(expectedRoots).toContainEqual(getVKTreeRoot());

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -9,7 +9,10 @@ import { getGenesisValues } from '@aztec/world-state/testing';
  * This test suit makes sure that the code in the monorepo is still compatible with the latest version of testnet
  * Only update these values after a governance update that changes the protocol is enacted
  */
-describe('Testnet compatibility', () => {
+// TODO: temporarily skipped on v5-next, which carries unreleased protocol circuit changes that
+// shift the VK tree root, protocol contracts hash and genesis roots away from the live testnet
+// values. Re-enable (and refresh the expected values) once we cut the first RC.
+describe.skip('Testnet compatibility', () => {
   it('has expected VK tree root', () => {
     const expectedRoots = [Fr.fromHexString('0x18e358ea5367f6069a4c1c08a2e0628fbb1b25c00b0b98160072d4ad397bae7c')];
     expect(expectedRoots).toContainEqual(getVKTreeRoot());

yarn-project/aztec/src/mainnet_compatibility.test.ts

@@ -75,7 +75,8 @@ export async function createP2PClient(
   }
 
   const bindings = logger.getBindings();
-  const store = deps.store ?? (await createStore(P2P_STORE_NAME, 2, config, bindings));
+  // Schema version 3: tx proofs are stored in a separate map from the tx data (see TxPoolV2Impl).
+  const store = deps.store ?? (await createStore(P2P_STORE_NAME, 3, config, bindings));
   const archive = await createStore(P2P_ARCHIVE_STORE_NAME, 1, config, bindings);
   const peerStore = await createStore(P2P_PEER_STORE_NAME, 1, config, bindings);
   const attestationStore = await createStore(P2P_ATTESTATION_STORE_NAME, 2, config, bindings);