prover node has no claims or bonds

Author: just-mitch

yarn-project/archiver/src/archiver/data_retrieval.ts

@@ -417,7 +417,8 @@ export async function getProofFromSubmitProofTx(
   if (functionName === 'submitEpochRootProof') {
     const [decodedArgs] = args as readonly [
       {
-        epochSize: bigint;
+        start: bigint;
+        end: bigint;
         args: readonly [Hex, Hex, Hex, Hex, Hex, Hex, Hex];
         fees: readonly Hex[];
         aggregationObject: Hex;

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

@@ -4,7 +4,6 @@ import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-
 import {
   type AztecNode,
   type ClientProtocolCircuitVerifier,
-  type EpochProofQuote,
   type GetContractClassLogsResponse,
   type GetPublicLogsResponse,
   type InBlock,
@@ -123,14 +122,6 @@ export class AztecNodeService implements AztecNode, Traceable {
     this.log.info(`Aztec Node started on chain 0x${l1ChainId.toString(16)}`, config.l1Contracts);
   }
 
-  public addEpochProofQuote(quote: EpochProofQuote): Promise<void> {
-    return Promise.resolve(this.p2pClient.addEpochProofQuote(quote));
-  }
-
-  public getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]> {
-    return this.p2pClient.getEpochProofQuotes(epoch);
-  }
-
   public getL2Tips() {
     return this.blockSource.getL2Tips();
   }

yarn-project/aztec.js/src/api/cheat_codes.ts

@@ -2,8 +2,8 @@ import { type PXE } from '@aztec/circuit-types';
 import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
 import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 
-import { RollupCheatCodes } from '../index.js';
 import { AztecCheatCodes } from '../utils/aztec_cheatcodes.js';
+import { RollupCheatCodes } from './ethereum/cheat_codes.js';
 
 /**
  * A class that provides utility functions for interacting with the chain.

yarn-project/aztec.js/src/api/ethereum/cheat_codes.ts

@@ -1,5 +1,3 @@
-import { type EpochProofClaim } from '@aztec/circuit-types';
-import { EthAddress } from '@aztec/circuits.js';
 import { EthCheatCodes } from '@aztec/ethereum/eth-cheatcodes';
 import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import { createLogger } from '@aztec/foundation/log';
@@ -107,33 +105,6 @@ export class RollupCheatCodes {
     this.logger.warn(`Advanced ${howMany} slots up to slot ${slot} in epoch ${epoch}`);
   }
 
-  /** Returns the current proof claim (if any) */
-  public async getProofClaim(): Promise<EpochProofClaim | undefined> {
-    // REFACTOR: This code is duplicated from l1-publisher
-    const {
-      epochToProve,
-      basisPointFee,
-      bondAmount,
-      bondProvider: bondProviderHex,
-      proposerClaimant: proposerClaimantHex,
-    } = await this.rollup.read.getProofClaim();
-
-    const bondProvider = EthAddress.fromString(bondProviderHex);
-    const proposerClaimant = EthAddress.fromString(proposerClaimantHex);
-
-    if (bondProvider.isZero() && proposerClaimant.isZero() && epochToProve === 0n) {
-      return undefined;
-    }
-
-    return {
-      epochToProve,
-      basisPointFee,
-      bondAmount,
-      bondProvider,
-      proposerClaimant,
-    };
-  }
-
   /**
    * Marks the specified block (or latest if none) as proven
    * @param maybeBlockNumber - The block number to mark as proven (defaults to latest pending)

yarn-project/aztec.js/src/index.ts

@@ -41,14 +41,14 @@ export {
   EthAddress,
   Fq,
   Fr,
+  getContractClassFromArtifact,
+  getContractInstanceFromDeployParams,
   GlobalVariables,
   GrumpkinScalar,
   INITIAL_L2_BLOCK_NUM,
   NodeInfo,
   Point,
   PublicKeys,
-  getContractClassFromArtifact,
-  getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
 
 export { computeSecretHash } from '@aztec/circuits.js/hash';
@@ -68,12 +68,12 @@ export {
   Comparator,
   ContractClass2BlockL2Logs,
   EncryptedLogPayload,
-  EpochProofQuote,
-  EpochProofQuotePayload,
   EventMetadata,
   EventType,
   ExtendedNote,
   FunctionCall,
+  getTimestampRangeForEpoch,
+  HashedValues,
   L1Actor,
   L1EventPayload,
   L1NotePayload,
@@ -82,8 +82,9 @@ export {
   L2Block,
   LogId,
   MerkleTreeId,
+  merkleTreeIds,
+  mockTx,
   Note,
-  HashedValues,
   SiblingPath,
   Tx,
   TxExecutionRequest,
@@ -92,14 +93,10 @@ export {
   TxStatus,
   UnencryptedL2Log,
   UniqueNote,
-  getTimestampRangeForEpoch,
-  merkleTreeIds,
-  mockEpochProofQuote,
-  mockTx,
   type LogFilter,
-  type PXE,
   type PartialAddress,
   type PublicKey,
+  type PXE,
 } from '@aztec/circuit-types';
 
 // TODO: These kinds of things have no place on our public api.
@@ -120,10 +117,10 @@ export { fileURLToPath } from '@aztec/foundation/url';
 // Here you *can* do `export *` as the granular api defacto exports things explicitly.
 // This entire index file will be deprecated at some point after we're satisfied.
 export * from './api/abi.js';
-export * from './api/cheat_codes.js';
-export * from './api/fee.js';
 export * from './api/addresses.js';
+export * from './api/cheat_codes.js';
 export * from './api/ethereum/index.js';
+export * from './api/fee.js';
 export * from './api/log.js';
 // Granular export, even if not in the api folder
 export * from './contract/index.js';

yarn-project/circuit-types/src/index.ts

@@ -1,8 +1,11 @@
 export { CompleteAddress, GrumpkinScalar, type PartialAddress, type PublicKey } from '@aztec/circuits.js';
 export * from './auth_witness.js';
 export * from './body.js';
+export * from './epoch-helpers/index.js';
 export * from './function_call.js';
 export * from './global_variable_builder.js';
+export * from './hashed_values.js';
+export * from './in_block.js';
 export * from './interfaces/index.js';
 export * from './l2_block.js';
 export * from './l2_block_downloader/index.js';
@@ -12,18 +15,14 @@ export * from './merkle_tree_id.js';
 export * from './messaging/index.js';
 export * from './mocks.js';
 export * from './notes/index.js';
+export * from './nullifier_with_block_source.js';
 export * from './p2p/index.js';
-export * from './hashed_values.js';
-export * from './prover_coordination/index.js';
+export * from './proving_error.js';
 export * from './public_data_witness.js';
 export * from './public_execution_request.js';
 export * from './sibling_path/index.js';
 export * from './simulation_error.js';
 export * from './tx/index.js';
 export * from './tx_effect.js';
 export * from './tx_execution_request.js';
-export * from './in_block.js';
-export * from './nullifier_with_block_source.js';
-export * from './proving_error.js';
-export * from './epoch-helpers/index.js';
 export * from './versioning.js';

yarn-project/circuit-types/src/interfaces/aztec-node.test.ts

@@ -41,7 +41,6 @@ import {
 } from '../logs/get_logs_response.js';
 import { type LogFilter } from '../logs/log_filter.js';
 import { MerkleTreeId } from '../merkle_tree_id.js';
-import { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
 import { PublicDataWitness } from '../public_data_witness.js';
 import { SiblingPath } from '../sibling_path/sibling_path.js';
 import { type TxValidationResult } from '../tx/index.js';
@@ -347,15 +346,6 @@ describe('AztecNodeApiSchema', () => {
     expect(response).toBe('enr:-');
   });
 
-  it('addEpochProofQuote', async () => {
-    await context.client.addEpochProofQuote(EpochProofQuote.random());
-  });
-
-  it('getEpochProofQuotes', async () => {
-    const response = await context.client.getEpochProofQuotes(1n);
-    expect(response).toEqual([expect.any(EpochProofQuote)]);
-  });
-
   it('addContractClass', async () => {
     const contractClass = await getContractClassFromArtifact(artifact);
     await context.client.addContractClass({ ...contractClass, unconstrainedFunctions: [], privateFunctions: [] });
@@ -612,14 +602,6 @@ class MockAztecNode implements AztecNode {
   getEncodedEnr(): Promise<string | undefined> {
     return Promise.resolve('enr:-');
   }
-  addEpochProofQuote(quote: EpochProofQuote): Promise<void> {
-    expect(quote).toBeInstanceOf(EpochProofQuote);
-    return Promise.resolve();
-  }
-  getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]> {
-    expect(epoch).toEqual(1n);
-    return Promise.resolve([EpochProofQuote.random()]);
-  }
   addContractClass(_contractClass: ContractClassPublic): Promise<void> {
     return Promise.resolve();
   }

yarn-project/circuit-types/src/interfaces/aztec-node.ts

@@ -37,7 +37,6 @@ import {
   TxScopedL2Log,
 } from '../logs/index.js';
 import { MerkleTreeId } from '../merkle_tree_id.js';
-import { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
 import { PublicDataWitness } from '../public_data_witness.js';
 import { SiblingPath } from '../sibling_path/index.js';
 import {
@@ -440,18 +439,6 @@ export interface AztecNode
    */
   getEncodedEnr(): Promise<string | undefined>;
 
-  /**
-   * Receives a quote for an epoch proof and stores it in its EpochProofQuotePool
-   * @param quote - The quote to store
-   */
-  addEpochProofQuote(quote: EpochProofQuote): Promise<void>;
-
-  /**
-   * Returns the received quotes for a given epoch
-   * @param epoch - The epoch for which to get the quotes
-   */
-  getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]>;
-
   /**
    * Adds a contract class bypassing the registerer.
    * TODO(#10007): Remove this method.
@@ -594,10 +581,6 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
 
   getEncodedEnr: z.function().returns(z.string().optional()),
 
-  addEpochProofQuote: z.function().args(EpochProofQuote.schema).returns(z.void()),
-
-  getEpochProofQuotes: z.function().args(schemas.BigInt).returns(z.array(EpochProofQuote.schema)),
-
   // TODO(#10007): Remove this method
   addContractClass: z.function().args(ContractClassPublicSchema).returns(z.void()),
 };

yarn-project/circuit-types/src/interfaces/p2p.test.ts

@@ -1,7 +1,6 @@
 import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
 
 import { BlockAttestation } from '../p2p/block_attestation.js';
-import { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
 import { Tx } from '../tx/tx.js';
 import { type P2PApi, P2PApiSchema, type PeerInfo } from './p2p.js';
 
@@ -32,12 +31,6 @@ describe('P2PApiSchema', () => {
     expect(attestations[0]).toBeInstanceOf(BlockAttestation);
   });
 
-  it('getEpochProofQuotes', async () => {
-    const quotes = await context.client.getEpochProofQuotes(BigInt(1));
-    expect(quotes).toEqual([EpochProofQuote.empty()]);
-    expect(quotes[0]).toBeInstanceOf(EpochProofQuote);
-  });
-
   it('getPendingTxs', async () => {
     const txs = await context.client.getPendingTxs();
     expect(txs[0]).toBeInstanceOf(Tx);
@@ -71,16 +64,15 @@ class MockP2P implements P2PApi {
     expect(proposalId).toEqual('proposalId');
     return Promise.resolve([BlockAttestation.empty()]);
   }
-  getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]> {
-    expect(epoch).toEqual(1n);
-    return Promise.resolve([EpochProofQuote.empty()]);
-  }
+
   async getPendingTxs(): Promise<Tx[]> {
     return [await Tx.random()];
   }
+
   getEncodedEnr(): Promise<string | undefined> {
     return Promise.resolve('enr');
   }
+
   getPeers(includePending?: boolean): Promise<PeerInfo[]> {
     expect(includePending === undefined || includePending === true).toBeTruthy();
     return Promise.resolve(peers);

yarn-project/circuit-types/src/interfaces/p2p.ts

@@ -4,7 +4,6 @@ import { z } from 'zod';
 
 import { BlockAttestation } from '../p2p/block_attestation.js';
 import { type P2PClientType } from '../p2p/client_type.js';
-import { EpochProofQuote } from '../prover_coordination/epoch_proof_quote.js';
 import { Tx } from '../tx/tx.js';
 
 export type PeerInfo =
@@ -26,14 +25,6 @@ const PeerInfoSchema = z.discriminatedUnion('status', [
 
 /** Exposed API to the P2P module. */
 export interface P2PApiWithoutAttestations {
-  /**
-   * Queries the EpochProofQuote pool for quotes for the given epoch
-   *
-   * @param epoch - the epoch to query
-   * @returns EpochProofQuotes
-   */
-  getEpochProofQuotes(epoch: bigint): Promise<EpochProofQuote[]>;
-
   /**
    * Returns all pending transactions in the transaction pool.
    * @returns An array of Txs.
@@ -71,7 +62,6 @@ export const P2PApiSchema: ApiSchemaFor<P2PApi> = {
     .function()
     .args(schemas.BigInt, optional(z.string()))
     .returns(z.array(BlockAttestation.schema)),
-  getEpochProofQuotes: z.function().args(schemas.BigInt).returns(z.array(EpochProofQuote.schema)),
   getPendingTxs: z.function().returns(z.array(Tx.schema)),
   getEncodedEnr: z.function().returns(z.string().optional()),
   getPeers: z.function().args(optional(z.boolean())).returns(z.array(PeerInfoSchema)),

yarn-project/circuit-types/src/interfaces/prover-coordination.ts

@@ -2,7 +2,6 @@ import { type ApiSchemaFor } from '@aztec/foundation/schemas';
 
 import { z } from 'zod';
 
-import { EpochProofQuote } from '../prover_coordination/index.js';
 import { Tx } from '../tx/tx.js';
 import { TxHash } from '../tx/tx_hash.js';
 
@@ -21,16 +20,9 @@ export interface ProverCoordination {
    * @returns The transactions, if found, 'undefined' otherwise.
    */
   getTxsByHash(txHashes: TxHash[]): Promise<Tx[]>;
-
-  /**
-   * Receives a quote for an epoch proof and stores it in its EpochProofQuotePool
-   * @param quote - The quote to store
-   */
-  addEpochProofQuote(quote: EpochProofQuote): Promise<void>;
 }
 
 export const ProverCoordinationApiSchema: ApiSchemaFor<ProverCoordination> = {
   getTxByHash: z.function().args(TxHash.schema).returns(Tx.schema.optional()),
   getTxsByHash: z.function().args(z.array(TxHash.schema)).returns(z.array(Tx.schema)),
-  addEpochProofQuote: z.function().args(EpochProofQuote.schema).returns(z.void()),
 };