fix: Revert "fix: noir mirror merge strat"

[ludamad]

This caused bigger problems than -Xtheirs did, oops. Sometimes merges will just get stuck, c'est la vie

[AztecBot]

Benchmark results

Metrics with a significant change:

• note_trial_decrypting_time_in_ms (8): 58.8 (+205%)
• note_trial_decrypting_time_in_ms (32): 114 (+97%)

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 56e8451b 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	64 txs
l1_rollup_calldata_size_in_bytes	5,668	18,820	36,356
l1_rollup_calldata_gas	66,352	238,372	469,052
l1_rollup_execution_gas	659,675	940,956	1,317,459
l2_block_processing_time_in_ms	1,290 (-1%)	4,813 (-4%)	8,907 (-5%)
note_successful_decrypting_time_in_ms	153 (-2%)	490 (-10%)	1,060 (+7%)
note_trial_decrypting_time_in_ms	⚠️ 58.8 (+205%)	⚠️ 114 (+97%)	91.2 (-29%)
l2_block_building_time_in_ms	18,431	68,622 (-1%)	135,994
l2_block_rollup_simulation_time_in_ms	8,123 (-1%)	28,763 (-1%)	56,295
l2_block_public_tx_process_time_in_ms	10,286 (+2%)	39,808	79,595

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	13,928 (+5%)	27,282 (+1%)
note_history_successful_decrypting_time_in_ms	1,190 (-6%)	2,482 (+1%)
note_history_trial_decrypting_time_in_ms	65.8 (-34%)	154 (-2%)
node_database_size_in_bytes	19,083,344	35,659,856
pxe_database_size_in_bytes	29,859	59,414

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	282	44,366	28,244
private-kernel-ordering	216 (-1%)	52,868	14,326
base-parity	1,900 (+6%)	128	311
base-rollup	720	165,787	925
root-parity	1,426 (-8%)	1,244	311
root-rollup	68.6 (-1%)	4,487	789
private-kernel-inner	641	73,771	28,244
public-kernel-app-logic	444 (-1%)	35,260	28,215
public-kernel-tail	172 (-1%)	40,926	28,215
merge-rollup	8.24 (-1%)	2,696	925

Tree insertion stats

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

Metric	1 leaves	16 leaves	64 leaves	128 leaves	512 leaves	1024 leaves	2048 leaves	4096 leaves	32 leaves
batch_insert_into_append_only_tree_16_depth_ms	9.92 (-3%)	16.2	N/A	N/A	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_16_depth_hash_count	16.8	31.6	N/A	N/A	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_16_depth_hash_ms	0.580 (-2%)	0.499	N/A	N/A	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_32_depth_ms	N/A	N/A	45.8 (-1%)	71.7 (-1%)	230 (-1%)	442 (-1%)	867 (-1%)	1,727	N/A
batch_insert_into_append_only_tree_32_depth_hash_count	N/A	N/A	96.0	159	543	1,055	2,079	4,127	N/A
batch_insert_into_append_only_tree_32_depth_hash_ms	N/A	N/A	0.470 (-1%)	0.443	0.420	0.414 (-1%)	0.413 (-1%)	0.414	N/A
batch_insert_into_indexed_tree_20_depth_ms	N/A	N/A	53.3 (-2%)	106	334 (-1%)	659	1,301 (-1%)	2,605	N/A
batch_insert_into_indexed_tree_20_depth_hash_count	N/A	N/A	104	207	691	1,363	2,707	5,395	N/A
batch_insert_into_indexed_tree_20_depth_hash_ms	N/A	N/A	0.476 (-2%)	0.478	0.456	0.455	0.452 (-1%)	0.452	N/A
batch_insert_into_indexed_tree_40_depth_ms	N/A	N/A	N/A	N/A	N/A	N/A	N/A	N/A	60.8 (-1%)
batch_insert_into_indexed_tree_40_depth_hash_count	N/A	N/A	N/A	N/A	N/A	N/A	N/A	N/A	109
batch_insert_into_indexed_tree_40_depth_hash_ms	N/A	N/A	N/A	N/A	N/A	N/A	N/A	N/A	0.533

Miscellaneous

Transaction sizes based on how many contract classes are registered in the tx.

Metric	0 registered classes
tx_size_in_bytes	22,012

Transaction processing duration by data writes.

Metric	0 new note hashes	1 new note hashes
tx_pxe_processing_time_ms	3,269 (-1%)	1,751 (-1%)

Metric	0 public data writes	1 public data writes
tx_sequencer_processing_time_ms	13.0 (+8%)	1,240 (-1%)