refactor: Renaming blockstree to archive #3569

LHerskind · 2023-12-05T13:31:05Z

Fixes #3572 from #3533.

Checklist:

Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge.

If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag.
I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code.
Every change is related to the PR description.
I have linked this pull request to relevant issues (if any exist).

AztecBot · 2023-12-05T18:43:16Z

Benchmark results

Metrics with a significant change:

note_trial_decrypting_time_in_ms (32): 65.2 (+68%)

Detailed results

All benchmarks are run on txs on the Benchmarking contract on the repository. Each tx consists of a batch call to create_note and increment_balance, which guarantees that each tx has a private call, a nested private call, a public call, and a nested public call, as well as an emitted private note, an unencrypted log, and public storage read and write.

This benchmark source data is available in JSON format on S3 here.

Values are compared against data from master at commit ff893b23 and shown if the difference exceeds 1%.

L2 block published to L1

Each column represents the number of txs on an L2 block published to L1.

Metric	8 txs	32 txs	128 txs
l1_rollup_calldata_size_in_bytes	45,444	179,588	716,132
l1_rollup_calldata_gas	222,948	868,196	3,447,884
l1_rollup_execution_gas	842,035	3,595,304	22,203,253
l2_block_processing_time_in_ms	2,206	8,489	35,363 (+1%)
note_successful_decrypting_time_in_ms	315 (+1%)	938 (+3%)	3,396 (+2%)
note_trial_decrypting_time_in_ms	24.6 (+16%)	⚠️ 65.2 (+68%)	202 (+1%)
l2_block_building_time_in_ms	20,196	80,546	322,326
l2_block_rollup_simulation_time_in_ms	16,656	66,627	266,301
l2_block_public_tx_process_time_in_ms	3,509	13,845	55,776 (+1%)

L2 chain processing

Each column represents the number of blocks on the L2 chain where each block has 16 txs.

Metric	5 blocks	10 blocks
node_history_sync_time_in_ms	25,301 (+3%)	48,489 (+2%)
note_history_successful_decrypting_time_in_ms	2,291 (+8%)	4,430 (+7%)
note_history_trial_decrypting_time_in_ms	164 (+1%)	238 (+5%)
node_database_size_in_bytes	3,621,509	3,917,737
pxe_database_size_in_bytes	29,748	59,307

Circuits stats

Stats on running time and I/O sizes collected for every circuit run across all benchmarks.

Circuit	circuit_simulation_time_in_ms	circuit_input_size_in_bytes	circuit_output_size_in_bytes
private-kernel-init	200 (+1%)	43,109	20,441
private-kernel-ordering	115 (+1%)	25,833	9,689
base-rollup	2,963	667,692	873
root-rollup	84.7 (-4%)	4,072	881
private-kernel-inner	261	64,516	20,441
public-kernel-private-input	172 (+1%)	25,203	20,441
public-kernel-non-first-iteration	169 (+1%)	25,245	20,441
merge-rollup	10.9 (+1%)	2,592	873

Miscellaneous

Transaction sizes based on how many contracts are deployed in the tx.

Metric	0 deployed contracts	1 deployed contracts
tx_size_in_bytes	10,323	25,938

benesjan

Just few suggestions. Feel free to merge once addressed.

benesjan · 2023-12-05T19:04:37Z

noir/tooling/noir_js/src/witness_generation.ts

@@ -14,6 +14,7 @@ export async function generateWitness(
  foreignCallHandler: ForeignCallHandler = defaultForeignCallHandler,
 ): Promise<WitnessMap> {
  // Throws on ABI encoding error
+  console.log(inputs);


Suggested change

console.log(inputs);

Forgotten log. Surprised linter didn't catch this.

benesjan · 2023-12-05T19:12:56Z

yarn-project/types/src/l2_block.ts

@@ -279,7 +279,7 @@ export class L2Block {
      /**
       * The tree snapshot of the blocks tree at the start of the rollup.


Suggested change

* The tree snapshot of the blocks tree at the start of the rollup.

* The tree snapshot of archive at the start of the rollup.

benesjan · 2023-12-05T19:13:13Z

yarn-project/types/src/l2_block.ts

@@ -303,7 +303,7 @@ export class L2Block {
      /**
       * The tree snapshot of the blocks tree at the end of the rollup.


Suggested change

* The tree snapshot of the blocks tree at the end of the rollup.

* The tree snapshot of archive at the end of the rollup.

benesjan · 2023-12-05T19:13:47Z

yarn-project/types/src/l2_block.ts

@@ -88,7 +88,7 @@ export class L2Block {
    /**
     * The tree snapshot of the blocks tree at the start of the rollup.


Suggested change

* The tree snapshot of the blocks tree at the start of the rollup.

* The tree snapshot of archive at the start of the rollup.

benesjan · 2023-12-05T19:14:01Z

yarn-project/types/src/l2_block.ts

@@ -112,7 +112,7 @@ export class L2Block {
    /**
     * The tree snapshot of the blocks tree at the end of the rollup.


Suggested change

* The tree snapshot of the blocks tree at the end of the rollup.

* The tree snapshot of archive at the end of the rollup.

benesjan · 2023-12-05T19:15:33Z

yarn-project/world-state/src/merkle-tree/merkle_tree_operations_facade.ts

@@ -129,8 +129,8 @@ export class MerkleTreeOperationsFacade implements MerkleTreeOperations {
   * @param globalVariablesHash - The hash of the current global variables to include in the block hash.


Can you please update the tsdoc here ^? It's stale

benesjan · 2023-12-05T19:16:04Z

yarn-project/world-state/src/world-state-db/merkle_tree_db.ts

@@ -75,7 +75,7 @@ export type CurrentTreeRoots = {
  /** Nullifier data tree root. */
  nullifierTreeRoot: Buffer;
  /** Blocks tree root. */


Suggested change

/** Blocks tree root. */

/** Archive root. */

benesjan · 2023-12-05T19:16:36Z

yarn-project/world-state/src/world-state-db/merkle_tree_db.ts

@@ -185,7 +185,7 @@ export interface MerkleTreeOperations {
   * This includes all of the current roots of all of the data trees and the current blocks global vars.


Stale TSDoc ^

The statelness being that it is referring to blocks tree?

benesjan · 2023-12-05T19:17:04Z

yarn-project/world-state/src/world-state-db/merkle_trees.ts

@@ -189,8 +189,8 @@ export class MerkleTrees implements MerkleTreeDb {
   * @param globalsHash - The current global variables hash.


Stale TSDoc ^

benesjan · 2023-12-05T19:21:31Z

yellow-paper/docs/public-vm/gen/_InstructionSet.mdx

@@ -362,7 +362,7 @@ Click on an instruction name to jump to its section.
 	<td><Markdown>Get the historical blocks tree root as of the specified block number.</Markdown></td>


Naming in this file is stale. But I am not really sure what this file is doing so maybe it's ok to ignore. (it's in gen folder so it could be just some generated thing)

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.16.5</summary> ## [0.16.5](aztec-packages-v0.16.4...aztec-packages-v0.16.5) (2023-12-06) ### Features * Add EFS file storage to devnet nodes ([#3584](#3584)) ([5b590eb](5b590eb)) ### Bug Fixes * **ci:** Aztec node devnet healthchecks ([#3598](#3598)) ([1a9d742](1a9d742)) * **ci:** Count for EFS AZ2 ([#3597](#3597)) ([d427bca](d427bca)) * **ci:** L1-contracts npm release ([#3596](#3596)) ([008df50](008df50)) * **ci:** Node health-check + contract address env vars ([#3578](#3578)) ([fffc700](fffc700)) ### Miscellaneous * Make noir-circuit independent of aztec-nr ([#3591](#3591)) ([3013354](3013354)) * Remove foundation and types deps from boxes ([#3389](#3389)) ([eade352](eade352)) * Renaming blockstree to archive ([#3569](#3569)) ([6c200e9](6c200e9)) * Trivial change roundup ([#3556](#3556)) ([ff893b2](ff893b2)) ### Documentation * Add libstdc++-12-dev to setup instructions ([#3585](#3585)) ([9773e8c](9773e8c)) </details> <details><summary>barretenberg.js: 0.16.5</summary> ## [0.16.5](barretenberg.js-v0.16.4...barretenberg.js-v0.16.5) (2023-12-06) ### Miscellaneous * **barretenberg.js:** Synchronize aztec-packages versions </details> <details><summary>barretenberg: 0.16.5</summary> ## [0.16.5](barretenberg-v0.16.4...barretenberg-v0.16.5) (2023-12-06) ### Miscellaneous * Trivial change roundup ([#3556](#3556)) ([ff893b2](ff893b2)) ### Documentation * Add libstdc++-12-dev to setup instructions ([#3585](#3585)) ([9773e8c](9773e8c)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.16.5</summary> ## [0.16.5](AztecProtocol/aztec-packages@aztec-packages-v0.16.4...aztec-packages-v0.16.5) (2023-12-06) ### Features * Add EFS file storage to devnet nodes ([#3584](AztecProtocol/aztec-packages#3584)) ([5b590eb](AztecProtocol/aztec-packages@5b590eb)) ### Bug Fixes * **ci:** Aztec node devnet healthchecks ([#3598](AztecProtocol/aztec-packages#3598)) ([1a9d742](AztecProtocol/aztec-packages@1a9d742)) * **ci:** Count for EFS AZ2 ([#3597](AztecProtocol/aztec-packages#3597)) ([d427bca](AztecProtocol/aztec-packages@d427bca)) * **ci:** L1-contracts npm release ([#3596](AztecProtocol/aztec-packages#3596)) ([008df50](AztecProtocol/aztec-packages@008df50)) * **ci:** Node health-check + contract address env vars ([#3578](AztecProtocol/aztec-packages#3578)) ([fffc700](AztecProtocol/aztec-packages@fffc700)) ### Miscellaneous * Make noir-circuit independent of aztec-nr ([#3591](AztecProtocol/aztec-packages#3591)) ([3013354](AztecProtocol/aztec-packages@3013354)) * Remove foundation and types deps from boxes ([#3389](AztecProtocol/aztec-packages#3389)) ([eade352](AztecProtocol/aztec-packages@eade352)) * Renaming blockstree to archive ([#3569](AztecProtocol/aztec-packages#3569)) ([6c200e9](AztecProtocol/aztec-packages@6c200e9)) * Trivial change roundup ([#3556](AztecProtocol/aztec-packages#3556)) ([ff893b2](AztecProtocol/aztec-packages@ff893b2)) ### Documentation * Add libstdc++-12-dev to setup instructions ([#3585](AztecProtocol/aztec-packages#3585)) ([9773e8c](AztecProtocol/aztec-packages@9773e8c)) </details> <details><summary>barretenberg.js: 0.16.5</summary> ## [0.16.5](AztecProtocol/aztec-packages@barretenberg.js-v0.16.4...barretenberg.js-v0.16.5) (2023-12-06) ### Miscellaneous * **barretenberg.js:** Synchronize aztec-packages versions </details> <details><summary>barretenberg: 0.16.5</summary> ## [0.16.5](AztecProtocol/aztec-packages@barretenberg-v0.16.4...barretenberg-v0.16.5) (2023-12-06) ### Miscellaneous * Trivial change roundup ([#3556](AztecProtocol/aztec-packages#3556)) ([ff893b2](AztecProtocol/aztec-packages@ff893b2)) ### Documentation * Add libstdc++-12-dev to setup instructions ([#3585](AztecProtocol/aztec-packages#3585)) ([9773e8c](AztecProtocol/aztec-packages@9773e8c)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

LHerskind changed the title ~~refactor: Refactoring block structure~~ refactor: Renaming blockstree to archive Dec 5, 2023

LHerskind force-pushed the lh/3533-types branch from 65370bc to 5ed7e7b Compare December 5, 2023 18:16

benesjan approved these changes Dec 5, 2023

View reviewed changes

LHerskind added 3 commits December 5, 2023 20:04

chore: rename blocks_tree to archive

e716154

chore: more renaming

d46cc1a

chore: address comments

8dc0507

LHerskind force-pushed the lh/3533-types branch from 5ed7e7b to 8dc0507 Compare December 5, 2023 20:10

LHerskind marked this pull request as ready for review December 5, 2023 20:12

LHerskind enabled auto-merge (squash) December 5, 2023 20:12

LHerskind merged commit 6c200e9 into master Dec 5, 2023
74 of 76 checks passed

LHerskind deleted the lh/3533-types branch December 5, 2023 20:33

AztecBot mentioned this pull request Dec 5, 2023

chore(master): Release 0.16.5 #3586

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Renaming blockstree to archive #3569

refactor: Renaming blockstree to archive #3569

LHerskind commented Dec 5, 2023 •

edited

Loading

AztecBot commented Dec 5, 2023 •

edited

Loading

L2 block published to L1

L2 chain processing

Circuits stats

Miscellaneous

benesjan left a comment

benesjan Dec 5, 2023

benesjan Dec 5, 2023

benesjan Dec 5, 2023

benesjan Dec 5, 2023

benesjan Dec 5, 2023

benesjan Dec 5, 2023

benesjan Dec 5, 2023

benesjan Dec 5, 2023

LHerskind Dec 5, 2023

benesjan Dec 5, 2023

benesjan Dec 5, 2023

		@@ -279,7 +279,7 @@ export class L2Block {
		/**
		* The tree snapshot of the blocks tree at the start of the rollup.

	* The tree snapshot of the blocks tree at the start of the rollup.
	* The tree snapshot of archive at the start of the rollup.

		@@ -303,7 +303,7 @@ export class L2Block {
		/**
		* The tree snapshot of the blocks tree at the end of the rollup.

	* The tree snapshot of the blocks tree at the end of the rollup.
	* The tree snapshot of archive at the end of the rollup.

		@@ -88,7 +88,7 @@ export class L2Block {
		/**
		* The tree snapshot of the blocks tree at the start of the rollup.

		@@ -112,7 +112,7 @@ export class L2Block {
		/**
		* The tree snapshot of the blocks tree at the end of the rollup.

		@@ -129,8 +129,8 @@ export class MerkleTreeOperationsFacade implements MerkleTreeOperations {
		* @param globalVariablesHash - The hash of the current global variables to include in the block hash.

		@@ -185,7 +185,7 @@ export interface MerkleTreeOperations {
		* This includes all of the current roots of all of the data trees and the current blocks global vars.

		@@ -189,8 +189,8 @@ export class MerkleTrees implements MerkleTreeDb {
		* @param globalsHash - The current global variables hash.

		@@ -362,7 +362,7 @@ Click on an instruction name to jump to its section.
		<td><Markdown>Get the historical blocks tree root as of the specified block number.</Markdown></td>

refactor: Renaming blockstree to archive #3569

refactor: Renaming blockstree to archive #3569

Conversation

LHerskind commented Dec 5, 2023 • edited Loading

Checklist:

AztecBot commented Dec 5, 2023 • edited Loading

Benchmark results

L2 block published to L1

L2 chain processing

Circuits stats

Miscellaneous

benesjan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LHerskind commented Dec 5, 2023 •

edited

Loading

AztecBot commented Dec 5, 2023 •

edited

Loading