refactor(blocks tree): remove historic roots trees

circuits/cpp/src/aztec3/circuits/abis/packers.hpp

@@ -68,7 +68,7 @@ struct ConstantsPacker {
                  MAX_NOTES_PER_PAGE,
                  VIEW_NOTE_ORACLE_RETURN_LENGTH,
                  CALL_CONTEXT_LENGTH,
-                 BLOCK_HASH_DATA_LENGTH,
+                 BLOCK_DATA_LENGTH,
                  FUNCTION_DATA_LENGTH,
                  CONTRACT_DEPLOYMENT_DATA_LENGTH,
                  PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH,

circuits/cpp/src/aztec3/constants.hpp

@@ -220,7 +220,7 @@ constexpr size_t MAX_NOTES_PER_PAGE = 10;
 constexpr size_t VIEW_NOTE_ORACLE_RETURN_LENGTH = MAX_NOTES_PER_PAGE * (MAX_NOTE_FIELDS_LENGTH + 1) + 2;
 
 constexpr size_t CALL_CONTEXT_LENGTH = 6;
-constexpr size_t BLOCK_HASH_DATA_LENGTH = 7;
+constexpr size_t BLOCK_DATA_LENGTH = 7;
 constexpr size_t FUNCTION_DATA_LENGTH = 4;
 constexpr size_t CONTRACT_DEPLOYMENT_DATA_LENGTH = 6;
 
@@ -232,14 +232,14 @@ constexpr size_t PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH =
     + RETURN_VALUES_LENGTH + MAX_READ_REQUESTS_PER_CALL + MAX_NEW_COMMITMENTS_PER_CALL +
     2 * MAX_NEW_NULLIFIERS_PER_CALL + MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_L2_TO_L1_MSGS_PER_CALL + NUM_FIELDS_PER_SHA256 + NUM_FIELDS_PER_SHA256 + 2  // + 2 for logs preimage lengths
-    + BLOCK_HASH_DATA_LENGTH + CONTRACT_DEPLOYMENT_DATA_LENGTH + 2;                     // + 2 for chain_id and version
+    + BLOCK_DATA_LENGTH + CONTRACT_DEPLOYMENT_DATA_LENGTH + 2;                          // + 2 for chain_id and version
 
 constexpr size_t PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH =
     1 + 1  // call_context_hash + args_hash
     + RETURN_VALUES_LENGTH + MAX_READ_REQUESTS_PER_CALL + MAX_NEW_COMMITMENTS_PER_CALL +
     2 * MAX_NEW_NULLIFIERS_PER_CALL + MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_L2_TO_L1_MSGS_PER_CALL + NUM_FIELDS_PER_SHA256 + NUM_FIELDS_PER_SHA256 + 2  // + 2 for logs preimage lengths
-    + BLOCK_HASH_DATA_LENGTH + 3;  // + 3 for contract_deployment_data.hash(), chain_id, version
+    + BLOCK_DATA_LENGTH + 3;  // + 3 for contract_deployment_data.hash(), chain_id, version
 
 constexpr size_t CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 3;
 constexpr size_t CONTRACT_STORAGE_READ_LENGTH = 2;
@@ -251,7 +251,7 @@ constexpr size_t PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH =
     MAX_PUBLIC_DATA_READS_PER_CALL * CONTRACT_STORAGE_READ_LENGTH + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL +
     MAX_NEW_COMMITMENTS_PER_CALL + MAX_NEW_NULLIFIERS_PER_CALL + MAX_NEW_L2_TO_L1_MSGS_PER_CALL +
     NUM_FIELDS_PER_SHA256 + 1 +  // + 1 for unencrypted logs preimage length
-    BLOCK_HASH_DATA_LENGTH + 2;  // + 2 for chain_id and version
+    BLOCK_DATA_LENGTH + 2;       // + 2 for chain_id and version
 
 constexpr size_t PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH =
     2 + RETURN_VALUES_LENGTH +  // + 1 for args_hash + 1 call_context.hash

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -65,7 +65,7 @@ library Constants {
   uint256 internal constant MAX_NOTES_PER_PAGE = 10;
   uint256 internal constant VIEW_NOTE_ORACLE_RETURN_LENGTH = 212;
   uint256 internal constant CALL_CONTEXT_LENGTH = 6;
-  uint256 internal constant BLOCK_HASH_DATA_LENGTH = 7;
+  uint256 internal constant BLOCK_DATA_LENGTH = 7;
   uint256 internal constant FUNCTION_DATA_LENGTH = 4;
   uint256 internal constant CONTRACT_DEPLOYMENT_DATA_LENGTH = 6;
   uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 58;

yarn-project/acir-simulator/src/client/private_execution.test.ts

@@ -59,7 +59,7 @@ describe('Private Execution test suite', () => {
   let circuitsWasm: CircuitsWasm;
   let oracle: MockProxy<DBOracle>;
   let acirSimulator: AcirSimulator;
-  let blockHashData = ConstantHistoricBlockData.empty();
+  let blockData = ConstantHistoricBlockData.empty();
   let logger: DebugLogger;
 
   const defaultContractAddress = AztecAddress.random();
@@ -108,7 +108,7 @@ describe('Private Execution test suite', () => {
       abi,
       functionData.isConstructor ? AztecAddress.ZERO : contractAddress,
       EthAddress.ZERO,
-      blockHashData,
+      blockData,
     );
   };
 
@@ -125,10 +125,10 @@ describe('Private Execution test suite', () => {
 
     // Update root.
     const newRoot = trees[name].getRoot(false);
-    const prevRoots = blockHashData.toBuffer();
+    const prevRoots = blockData.toBuffer();
     const rootIndex = name === 'privateData' ? 0 : 32 * 3;
     const newRoots = Buffer.concat([prevRoots.subarray(0, rootIndex), newRoot, prevRoots.subarray(rootIndex + 32)]);
-    blockHashData = ConstantHistoricBlockData.fromBuffer(newRoots);
+    blockData = ConstantHistoricBlockData.fromBuffer(newRoots);
 
     return trees[name];
   };

yarn-project/acir-simulator/src/client/simulator.ts

@@ -92,7 +92,7 @@ export class AcirSimulator {
    * @param contractAddress - The address of the contract.
    * @param portalContractAddress - The address of the portal contract.
    * @param constantHistoricBlockData - Block data containing historic roots.
-   * @returns The return values of the function.
+   * @param aztecNode - The AztecNode instance.
    */
   public async runUnconstrained(
     request: FunctionCall,
@@ -101,6 +101,7 @@ export class AcirSimulator {
     contractAddress: AztecAddress,
     portalContractAddress: EthAddress,
     constantHistoricBlockData: ConstantHistoricBlockData,
+    aztecNode?: AztecNode,
   ) {
     if (entryPointABI.functionType !== FunctionType.UNCONSTRAINED) {
       throw new Error(`Cannot run ${entryPointABI.functionType} function as constrained`);

yarn-project/acir-simulator/src/public/db.ts

@@ -1,4 +1,4 @@
-import { ConstantHistoricBlockData, EthAddress } from '@aztec/circuits.js';
+import { EthAddress } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -71,10 +71,4 @@ export interface CommitmentsDB {
    * @returns - The Commitment data oracle object
    */
   getCommitmentOracle(address: AztecAddress, commitment: Fr): Promise<CommitmentDataOracleInputs>;
-
-  /**
-   * Gets the current historic block data from the merkle db.
-   * @returns the previous blocks roots and global variables hash.
-   */
-  getHistoricBlockData(): ConstantHistoricBlockData;
 }

yarn-project/acir-simulator/src/public/executor.ts

@@ -41,7 +41,7 @@ export class PublicExecutor {
     private readonly stateDb: PublicStateDB,
     private readonly contractsDb: PublicContractsDB,
     private readonly commitmentsDb: CommitmentsDB,
-    private readonly blockHashData: ConstantHistoricBlockData,
+    private readonly blockData: ConstantHistoricBlockData,
 
     private log = createDebugLogger('aztec:simulator:public-executor'),
   ) {}
@@ -60,12 +60,7 @@ export class PublicExecutor {
     const acir = await this.contractsDb.getBytecode(execution.contractAddress, selector);
     if (!acir) throw new Error(`Bytecode not found for ${execution.contractAddress.toString()}:${selectorHex}`);
 
-    const initialWitness = getInitialWitness(
-      execution.args,
-      execution.callContext,
-      this.blockHashData,
-      globalVariables,
-    );
+    const initialWitness = getInitialWitness(execution.args, execution.callContext, this.blockData, globalVariables);
     const storageActions = new ContractStorageActionsCollector(this.stateDb, execution.contractAddress);
     const newCommitments: Fr[] = [];
     const newL2ToL1Messages: Fr[] = [];
@@ -87,14 +82,14 @@ export class PublicExecutor {
       },
       getL1ToL2Message: async ([msgKey]) => {
         const messageInputs = await this.commitmentsDb.getL1ToL2Message(fromACVMField(msgKey));
-        return toAcvmL1ToL2MessageLoadOracleInputs(messageInputs, this.blockHashData.l1ToL2MessagesTreeRoot);
+        return toAcvmL1ToL2MessageLoadOracleInputs(messageInputs, this.blockData.l1ToL2MessagesTreeRoot);
       }, // l1 to l2 messages in public contexts TODO: https://github.com/AztecProtocol/aztec-packages/issues/616
       getCommitment: async ([commitment]) => {
         const commitmentInputs = await this.commitmentsDb.getCommitmentOracle(
           execution.contractAddress,
           fromACVMField(commitment),
         );
-        return toAcvmCommitmentLoadOracleInputs(commitmentInputs, this.blockHashData.privateDataTreeRoot);
+        return toAcvmCommitmentLoadOracleInputs(commitmentInputs, this.blockData.privateDataTreeRoot);
       },
       storageRead: async ([slot], [numberOfElements]) => {
         const startStorageSlot = fromACVMField(slot);

yarn-project/acir-simulator/src/public/index.test.ts

@@ -37,7 +37,7 @@ describe('ACIR public execution simulator', () => {
   let publicContracts: MockProxy<PublicContractsDB>;
   let commitmentsDb: MockProxy<CommitmentsDB>;
   let executor: PublicExecutor;
-  let blockHashData: ConstantHistoricBlockData;
+  let blockData: ConstantHistoricBlockData;
 
   beforeAll(async () => {
     circuitsWasm = await CircuitsWasm.get();
@@ -48,8 +48,8 @@ describe('ACIR public execution simulator', () => {
     publicContracts = mock<PublicContractsDB>();
     commitmentsDb = mock<CommitmentsDB>();
 
-    blockHashData = ConstantHistoricBlockData.empty();
-    executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, blockHashData);
+    blockData = ConstantHistoricBlockData.empty();
+    executor = new PublicExecutor(publicState, publicContracts, commitmentsDb, blockData);
   }, 10000);
 
   describe('PublicToken contract', () => {

yarn-project/aztec-rpc/src/aztec_rpc_server/aztec_rpc_server.ts

@@ -394,6 +394,7 @@ export class AztecRPCServer implements AztecRPC {
       contractAddress,
       portalContract,
       constantHistoricBlockData,
+      this.node,
     );
     this.log('Unconstrained simulation completed!');
 

yarn-project/aztec-rpc/src/simulator_oracle/index.ts

@@ -2,7 +2,6 @@ import { CommitmentDataOracleInputs, DBOracle, MessageLoadOracleInputs } from '@
 import {
   AztecAddress,
   CircuitsWasm,
-  ConstantHistoricBlockData,
   EthAddress,
   Fr,
   PartialContractAddress,
@@ -11,7 +10,7 @@ import {
 } from '@aztec/circuits.js';
 import { siloCommitment } from '@aztec/circuits.js/abis';
 import { FunctionAbi } from '@aztec/foundation/abi';
-import { DataCommitmentProvider, KeyStore, L1ToL2MessageProvider, MerkleTreeId } from '@aztec/types';
+import { DataCommitmentProvider, KeyStore, L1ToL2MessageProvider } from '@aztec/types';
 
 import { ContractDataOracle } from '../contract_data_oracle/index.js';
 import { Database } from '../database/index.js';
@@ -101,20 +100,4 @@ export class SimulatorOracle implements DBOracle {
       index,
     });
   }
-
-  getHistoricBlockData(): ConstantHistoricBlockData {
-    const roots = this.db.getTreeRoots();
-
-    return ConstantHistoricBlockData.from({
-      privateKernelVkTreeRoot: Fr.ZERO,
-      // TODO: work out how to get the previous globals hash in here
-      prevGlobalVariablesHash: Fr.ZERO,
-      privateDataTreeRoot: roots[MerkleTreeId.PRIVATE_DATA_TREE],
-      contractTreeRoot: roots[MerkleTreeId.CONTRACT_TREE],
-      nullifierTreeRoot: roots[MerkleTreeId.NULLIFIER_TREE],
-      l1ToL2MessagesTreeRoot: roots[MerkleTreeId.L1_TO_L2_MESSAGES_TREE],
-      blocksTreeRoot: roots[MerkleTreeId.BLOCKS_TREE],
-      publicDataTreeRoot: roots[MerkleTreeId.PUBLIC_DATA_TREE],
-    });
-  }
 }

yarn-project/circuits.js/src/cbind/constants.gen.ts

@@ -51,7 +51,7 @@ export const GET_NOTE_ORACLE_RETURN_LENGTH = 23;
 export const MAX_NOTES_PER_PAGE = 10;
 export const VIEW_NOTE_ORACLE_RETURN_LENGTH = 212;
 export const CALL_CONTEXT_LENGTH = 6;
-export const BLOCK_HASH_DATA_LENGTH = 7;
+export const BLOCK_DATA_LENGTH = 7;
 export const FUNCTION_DATA_LENGTH = 4;
 export const CONTRACT_DEPLOYMENT_DATA_LENGTH = 6;
 export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 58;

yarn-project/end-to-end/src/integration_l1_publisher.test.ts

@@ -25,9 +25,9 @@ import {
   L1Publisher,
   SoloBlockBuilder,
   WasmRollupCircuitSimulator,
+  getConstantHistoricBlockData,
   getL1Publisher,
   getVerificationKeys,
-  getconstantHistoricBlockData,
   makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricTreeRoots,
   makeProcessedTx,
 } from '@aztec/sequencer-client';
@@ -155,7 +155,7 @@ describe('L1Publisher integration', () => {
   }, 100_000);
 
   const makeEmptyProcessedTx = async () => {
-    const historicTreeRoots = await getconstantHistoricBlockData(builderDb, prevGlobals);
+    const historicTreeRoots = await getConstantHistoricBlockData(builderDb, prevGlobals);
     const tx = await makeEmptyProcessedTxFromHistoricTreeRoots(
       historicTreeRoots,
       new Fr(config.chainId),
@@ -169,7 +169,7 @@ describe('L1Publisher integration', () => {
     const kernelOutput = KernelCircuitPublicInputs.empty();
     kernelOutput.constants.txContext.chainId = fr(config.chainId);
     kernelOutput.constants.txContext.version = fr(config.version);
-    kernelOutput.constants.blockData = await getconstantHistoricBlockData(builderDb, prevGlobals);
+    kernelOutput.constants.blockData = await getConstantHistoricBlockData(builderDb, prevGlobals);
     kernelOutput.end.publicDataUpdateRequests = makeTuple(
       MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
       i => new PublicDataUpdateRequest(fr(i), fr(0), fr(i + 10)),

yarn-project/noir-libs/noir-aztec/src/abi.nr

@@ -10,7 +10,7 @@ use crate::constants_gen::{
     MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_CALL,
     MAX_PUBLIC_DATA_READS_PER_CALL,
     GENERATOR_INDEX__FUNCTION_ARGS,
-    BLOCK_HASH_DATA_LENGTH,
+    BLOCK_DATA_LENGTH,
     CONTRACT_DEPLOYMENT_DATA_LENGTH,
     CALL_CONTEXT_LENGTH,
     PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH,
@@ -84,7 +84,7 @@ impl ContractDeploymentData {
 // PrivateContextInputs are expected to be provided to each private function
 struct PrivateContextInputs {
     call_context : CallContext,
-    block_hash_data: BlockHashData,
+    block_data: ConstantBlockData,
 
     contract_deployment_data: ContractDeploymentData,
 
@@ -94,7 +94,7 @@ struct PrivateContextInputs {
 // PublicContextInputs are expected to be provided to each public function
 struct PublicContextInputs {
     call_context: CallContext,
-    block_hash_data: BlockHashData,
+    block_data: ConstantBlockData,
 
     public_global_variables: PublicGlobalVariables,
 }
@@ -126,7 +126,7 @@ impl CallContext {
     }
 }
 
-struct BlockHashData {
+struct ConstantBlockData {
     private_data_tree_root : Field,
     nullifier_tree_root : Field,
     contract_tree_root : Field,
@@ -136,9 +136,9 @@ struct BlockHashData {
     public_data_tree_root: Field,
 }
 
-impl BlockHashData {
+impl ConstantBlockData {
     // NOTE: this order must match the order in `private_circuit_public_inputs.hpp`
-    fn serialize(self) -> [Field; BLOCK_HASH_DATA_LENGTH] {
+    fn serialize(self) -> [Field; BLOCK_DATA_LENGTH] {
         [
             self.private_data_tree_root,
             self.nullifier_tree_root,
@@ -151,8 +151,8 @@ impl BlockHashData {
     }
 }
 
-fn empty_block_hash_data() -> BlockHashData {
-    BlockHashData{ private_data_tree_root: 0, nullifier_tree_root: 0, contract_tree_root: 0, l1_to_l2_messages_tree_root: 0, blocks_tree_root: 0, prev_global_variables_hash: 0, public_data_tree_root: 0 }
+fn empty_block_data() -> ConstantBlockData {
+    ConstantBlockData{ private_data_tree_root: 0, nullifier_tree_root: 0, contract_tree_root: 0, l1_to_l2_messages_tree_root: 0, blocks_tree_root: 0, prev_global_variables_hash: 0, public_data_tree_root: 0 }
 }
 
 struct FunctionData {
@@ -190,7 +190,7 @@ struct PrivateCircuitPublicInputs {
     unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
     encrypted_log_preimages_length: Field,
     unencrypted_log_preimages_length: Field,
-    block_hash_data: BlockHashData,
+    block_data: ConstantBlockData,
     contract_deployment_data: ContractDeploymentData,
     chain_id: Field,
     version: Field,
@@ -213,7 +213,7 @@ impl PrivateCircuitPublicInputs {
         fields.push_array(self.unencrypted_logs_hash);
         fields.push(self.encrypted_log_preimages_length);
         fields.push(self.unencrypted_log_preimages_length);
-        fields.push_array(self.block_hash_data.serialize());
+        fields.push_array(self.block_data.serialize());
         fields.push(self.contract_deployment_data.hash());
         fields.push(self.chain_id);
         fields.push(self.version);
@@ -236,7 +236,7 @@ impl PrivateCircuitPublicInputs {
         fields.push_array(self.unencrypted_logs_hash);
         fields.push(self.encrypted_log_preimages_length);
         fields.push(self.unencrypted_log_preimages_length);
-        fields.push_array(self.block_hash_data.serialize());
+        fields.push_array(self.block_data.serialize());
         fields.push_array(self.contract_deployment_data.serialize());
         fields.push(self.chain_id);
         fields.push(self.version);
@@ -296,7 +296,7 @@ struct PublicCircuitPublicInputs {
     new_l2_to_l1_msgs: [Field; crate::abi::MAX_NEW_L2_TO_L1_MSGS_PER_CALL],
     unencrypted_logs_hash: [Field; NUM_FIELDS_PER_SHA256],
     unencrypted_log_preimages_length: Field,
-    block_hash_data: BlockHashData, // TODO: This is not present in cpp or ts, do we need to include it?
+    block_data: ConstantBlockData, // TODO: This is not present in cpp or ts, do we need to include it?
     historic_public_data_tree_root: Field,
     prover_address: Field,
 }
@@ -319,8 +319,8 @@ impl PublicCircuitPublicInputs {
         inputs.push_array(self.new_nullifiers);
         inputs.push_array(self.new_l2_to_l1_msgs);
 
-        // We do not include block_hash_data since it's not in the cpp hash
-        // inputs.push(self.block_hash_data.hash());
+        // We do not include block_data since it's not in the cpp hash
+        // inputs.push(self.block_data.hash());
 
         inputs.push_array(self.unencrypted_logs_hash);
         inputs.push(self.unencrypted_log_preimages_length);
@@ -347,7 +347,7 @@ impl PublicCircuitPublicInputs {
         fields.push_array(self.new_l2_to_l1_msgs);
         fields.push_array(self.unencrypted_logs_hash);
         fields.push(self.unencrypted_log_preimages_length);
-        fields.push_array(self.block_hash_data.serialize());
+        fields.push_array(self.block_data.serialize());
         fields.push(self.historic_public_data_tree_root);
         fields.push(self.prover_address);
         fields.storage

yarn-project/noir-libs/noir-aztec/src/constants_gen.nr

@@ -50,7 +50,7 @@ global GET_NOTE_ORACLE_RETURN_LENGTH: comptime Field = 23;
 global MAX_NOTES_PER_PAGE: comptime Field = 10;
 global VIEW_NOTE_ORACLE_RETURN_LENGTH: comptime Field = 212;
 global CALL_CONTEXT_LENGTH: comptime Field = 6;
-global BLOCK_HASH_DATA_LENGTH: comptime Field = 7;
+global BLOCK_DATA_LENGTH: comptime Field = 7;
 global FUNCTION_DATA_LENGTH: comptime Field = 4;
 global CONTRACT_DEPLOYMENT_DATA_LENGTH: comptime Field = 6;
 global PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH: comptime Field = 58;