fix: noir mirror merge strat

[ludamad]

This should be prioritizing manual changes in noir's aztec-packages

[AztecBot]

Benchmark results

Metrics with a significant change:

• circuit_simulation_time_in_ms (private-kernel-inner): 359 (-43%)
• circuit_simulation_time_in_ms (public-kernel-app-logic): 183 (-58%)
• tx_pxe_processing_time_ms (0): 3,166 (-20%)
• tx_pxe_processing_time_ms (1): 1,426 (-18%)
• tx_sequencer_processing_time_ms (1): 710 (-42%)
• l2_block_building_time_in_ms (8): 12,823 (-25%)
• l2_block_building_time_in_ms (32): 51,084 (-25%)
• l2_block_building_time_in_ms (64): 101,465 (-25%)
• l2_block_public_tx_process_time_in_ms (8): 5,870 (-41%)
• l2_block_public_tx_process_time_in_ms (32): 23,135 (-42%)
• l2_block_public_tx_process_time_in_ms (64): 45,926 (-42%)
• note_trial_decrypting_time_in_ms (32): 88.9 (+91%)

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 58e15edf 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,052	238,672	469,400
l1_rollup_execution_gas	666,684	953,533	1,336,708
l2_block_processing_time_in_ms	1,210 (-8%)	4,779 (-1%)	8,951 (-1%)
note_successful_decrypting_time_in_ms	136 (-3%)	475 (-11%)	933 (-2%)
note_trial_decrypting_time_in_ms	40.5 (-8%)	⚠️ 88.9 (+91%)	65.4 (-26%)
l2_block_building_time_in_ms	⚠️ 12,823 (-25%)	⚠️ 51,084 (-25%)	⚠️ 101,465 (-25%)
l2_block_rollup_simulation_time_in_ms	6,926 (-2%)	27,892 (-1%)	55,436 (-1%)
l2_block_public_tx_process_time_in_ms	⚠️ 5,870 (-41%)	⚠️ 23,135 (-42%)	⚠️ 45,926 (-42%)

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	14,034 (+1%)	26,586 (+2%)
note_history_successful_decrypting_time_in_ms	1,197 (+1%)	2,360 (-2%)
note_history_trial_decrypting_time_in_ms	65.3 (-3%)	117 (-4%)
node_database_size_in_bytes	19,054,672	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	271 (-3%)	44,338	27,700
private-kernel-ordering	205 (-6%)	52,324	14,326
base-rollup	622 (-2%)	177,083	925
root-rollup	69.0 (+1%)	4,176	789
private-kernel-inner	⚠️ 359 (-43%)	73,197	27,700
public-kernel-app-logic	⚠️ 183 (-58%)	35,198	28,215
public-kernel-tail	175 (-1%)	40,926	28,215
merge-rollup	8.32 (+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.85 (-2%)	15.7 (-1%)	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.575 (-2%)	0.488 (-1%)	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.7	71.1 (-2%)	230	435 (-2%)	862 (-1%)	1,711	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	0.440 (-1%)	0.419	0.407 (-2%)	0.411	0.411	N/A
batch_insert_into_indexed_tree_20_depth_ms	N/A	N/A	52.6 (-2%)	106	336 (+1%)	646 (-2%)	1,303 (-1%)	2,597 (-1%)	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.470 (-1%)	0.477 (-1%)	0.456	0.446 (-2%)	0.452 (-1%)	0.451 (-1%)	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.0 (-2%)
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.526 (-2%)

Miscellaneous

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

Metric	0 registered classes
tx_size_in_bytes	22,014

Transaction processing duration by data writes.

Metric	0 new note hashes	1 new note hashes
tx_pxe_processing_time_ms	⚠️ 3,166 (-20%)	⚠️ 1,426 (-18%)

Metric	0 public data writes	1 public data writes
tx_sequencer_processing_time_ms	12.9 (-1%)	⚠️ 710 (-42%)

[github-actions]

Changes to circuit sizes

Generated at commit: 48f8c6dc69f946c46c30ecd86e6cee153a103d82, compared to commit: a84ed21dd0b475720c89051d13be8061ce6ad889

🧾 Summary (100% most significant diffs)

Program	ACIR opcodes (+/-)	%	Circuit size (+/-)	%
private_kernel_tail	+49,354 ❌	+13.23%	+49,739 ❌	+5.93%
private_kernel_init	+2,211 ❌	+4.76%	+2,211 ❌	+0.63%
rollup_base	+10,496 ❌	+6.52%	+10,496 ❌	+0.61%
private_kernel_inner	+2,214 ❌	+2.36%	+2,214 ❌	+0.43%
public_kernel_tail	+824 ❌	+0.65%	+824 ❌	+0.23%
public_kernel_app_logic	+593 ❌	+1.08%	+593 ❌	+0.19%
public_kernel_setup	+191 ❌	+0.70%	+191 ❌	+0.11%
public_kernel_teardown	+191 ❌	+0.65%	+191 ❌	+0.11%

---

Full diff report 👇

Program	ACIR opcodes (+/-)	%	Circuit size (+/-)	%
private_kernel_tail	422,493 (+49,354)	+13.23%	888,984 (+49,739)	+5.93%
private_kernel_init	48,685 (+2,211)	+4.76%	350,742 (+2,211)	+0.63%
rollup_base	171,586 (+10,496)	+6.52%	1,730,898 (+10,496)	+0.61%
private_kernel_inner	95,968 (+2,214)	+2.36%	521,696 (+2,214)	+0.43%
public_kernel_tail	127,111 (+824)	+0.65%	365,170 (+824)	+0.23%
public_kernel_app_logic	55,521 (+593)	+1.08%	313,315 (+593)	+0.19%
public_kernel_setup	27,607 (+191)	+0.70%	179,676 (+191)	+0.11%
public_kernel_teardown	29,353 (+191)	+0.65%	181,423 (+191)	+0.11%