fix: Align block structs w/ yp #3868

[sklppy88]

Resolves #3868 and #4635

[AztecBot]

Benchmark results

No metrics with a significant change found.

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 aad45b3b 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	46,020	181,668	724,260
l1_rollup_calldata_gas	227,124	888,744	3,535,392
l1_rollup_execution_gas	321,310	1,008,192	3,756,793
l2_block_processing_time_in_ms	1,196 (-1%)	4,858 (+8%)	17,762
note_successful_decrypting_time_in_ms	218 (+1%)	627 (+3%)	2,179 (+1%)
note_trial_decrypting_time_in_ms	30.2 (+21%)	67.8 (+35%)	179 (+4%)
l2_block_building_time_in_ms	18,891 (-1%)	74,806	302,041
l2_block_rollup_simulation_time_in_ms	13,757 (-1%)	54,500	220,670 (+1%)
l2_block_public_tx_process_time_in_ms	5,105 (-1%)	20,230	81,122

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	15,048 (-3%)	29,746 (+3%)
note_history_successful_decrypting_time_in_ms	1,464 (+3%)	2,798 (+1%)
note_history_trial_decrypting_time_in_ms	174	236 (+9%)
node_database_size_in_bytes	17,322,064	33,288,272
pxe_database_size_in_bytes	29,923	59,478

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	330	44,664	25,409
private-kernel-ordering	212	43,729	14,627
base-rollup	1,494	128,080	933
root-rollup	84.2	4,192	825
private-kernel-inner	433	71,051	25,409
public-kernel-app-logic	261	32,126	25,251
merge-rollup	7.84	2,712	933

Tree insertion stats

The duration to insert a fixed batch of leaves into each tree type.

Metric	1 leaves	2 leaves	8 leaves	16 leaves	32 leaves	128 leaves	64 leaves	512 leaves	1024 leaves	2048 leaves	8192 leaves
batch_insert_into_append_only_tree_16_depth_ms	10.3	11.4 (+4%)	12.7	16.9	26.4 (+15%)	64.7	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_16_depth_hash_count	16.9	17.5	23.0	31.6	47.0	143	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_16_depth_hash_ms	0.593	0.631 (+4%)	0.538	0.521	0.551 (+15%)	0.444	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_32_depth_ms	N/A	N/A	N/A	N/A	N/A	75.4 (-1%)	47.5	240	469	905	3,562
batch_insert_into_append_only_tree_32_depth_hash_count	N/A	N/A	N/A	N/A	N/A	159	96.0	543	1,055	2,079	8,223
batch_insert_into_append_only_tree_32_depth_hash_ms	N/A	N/A	N/A	N/A	N/A	0.465 (-1%)	0.486	0.437	0.438	0.430	0.428
batch_insert_into_indexed_tree_20_depth_ms	N/A	N/A	N/A	N/A	N/A	104 (-2%)	57.0	351	692	1,373	5,431
batch_insert_into_indexed_tree_20_depth_hash_count	N/A	N/A	N/A	N/A	N/A	197	104	691	1,363	2,707	10,771
batch_insert_into_indexed_tree_20_depth_hash_ms	N/A	N/A	N/A	N/A	N/A	0.492 (-1%)	0.497	0.477	0.473	0.475	0.471
batch_insert_into_indexed_tree_40_depth_ms	N/A	N/A	N/A	57.1	N/A	N/A	N/A	N/A	N/A	N/A	N/A
batch_insert_into_indexed_tree_40_depth_hash_count	N/A	N/A	N/A	94.1	N/A	N/A	N/A	N/A	N/A	N/A	N/A
batch_insert_into_indexed_tree_40_depth_hash_ms	N/A	N/A	N/A	0.578	N/A	N/A	N/A	N/A	N/A	N/A	N/A

Miscellaneous

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

Metric	0 deployed contracts	1 deployed contracts
tx_size_in_bytes	15,388	36,001

Transaction processing duration by data writes.

Metric	0 new commitments	1 new commitments
tx_pxe_processing_time_ms	571	1,493

Metric	0 public data writes	1 public data writes
tx_sequencer_processing_time_ms	0.0346 (+8%)	629

[LHerskind]

A lot of the hashing is done in the block and we could do it in the lower level components to make the block itself a lot cleaner. If you look at the block, a lot of computations are relying only on the values that are in a lower level component, so it could just be moved down to have a hash() in there that is a lot easier to follow 👀

[benesjan]

LGTM

Stale review