fix: Deploy L1 rollup contract using salt if provided

[spalladino]

Fixes a bad merge that disabled the usage of deployment salt for rollup contract.

[AztecBot]

Benchmark results

Metrics with a significant change:

• protocol_circuit_simulation_time_in_ms (private-kernel-tail-to-public): 1,035 (+58%)
• avm_simulation_time_ms (FeeJuice:set_portal): 12.2 (+31%)
• avm_simulation_time_ms (Token:transfer_public): 21.4 (-36%)

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.

Proof generation

Each column represents the number of threads used in proof generation.

Metric	1 threads	4 threads	16 threads	32 threads	64 threads
proof_construction_time_sha256_ms	5,760 (+1%)	1,552 (+1%)	705 (+1%)	775 (+2%)	771 (+1%)
proof_construction_time_sha256_30_ms	11,811 (+1%)	3,162 (+2%)	1,404 (+1%)	1,440 (+1%)	1,470 (+1%)
proof_construction_time_sha256_100_ms	45,228 (+2%)	11,972	5,429 (+1%)	5,377	5,358 (+1%)
proof_construction_time_poseidon_hash_ms	78.0	34.0	34.0	58.0 (-2%)	88.0
proof_construction_time_poseidon_hash_30_ms	1,532 (+1%)	421	202	224 (-4%)	270 (+2%)
proof_construction_time_poseidon_hash_100_ms	5,637 (+1%)	1,511 (+1%)	675 (+1%)	735 (+4%)	749 (+1%)

L2 block published to L1

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

Metric	4 txs	8 txs	16 txs
l1_rollup_calldata_size_in_bytes	4,324	7,844	14,852
l1_rollup_calldata_gas	49,696	92,520	177,668
l1_rollup_execution_gas	1,373,724	2,107,444	3,892,648
l2_block_processing_time_in_ms	256 (-2%)	457 (+2%)	840 (+3%)
l2_block_building_time_in_ms	9,054 (+2%)	17,843 (+2%)	34,770
l2_block_rollup_simulation_time_in_ms	9,053 (+2%)	17,842 (+2%)	34,770
l2_block_public_tx_process_time_in_ms	7,635 (+1%)	16,303 (+2%)	33,208

L2 chain processing

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

Metric	3 blocks	5 blocks
node_history_sync_time_in_ms	3,001 (+2%)	3,920 (+1%)
node_database_size_in_bytes	12,587,088	16,699,472
pxe_database_size_in_bytes	16,254	26,813

Circuits stats

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

Circuit	simulation_time_in_ms	witness_generation_time_in_ms	input_size_in_bytes	output_size_in_bytes	proving_time_in_ms
private-kernel-init	89.6 (+8%)	397	21,500	44,858	N/A
private-kernel-inner	153 (-4%)	708	72,061	45,005	N/A
private-kernel-reset-tiny	469 (+2%)	864	65,424	44,844	N/A
private-kernel-tail	196 (-3%)	157	50,432	52,256	N/A
base-parity	5.60	N/A	160	96.0	N/A
root-parity	33.5 (-1%)	N/A	69,084	96.0	N/A
base-rollup	2,775 (+1%)	N/A	187,817	664	N/A
root-rollup	39.0 (+1%)	N/A	54,525	716	N/A
public-kernel-setup	83.2	N/A	103,760	71,222	N/A
public-kernel-app-logic	95.9 (+1%)	N/A	103,599	71,222	N/A
public-kernel-tail	561 (+1%)	N/A	409,190	16,414	N/A
private-kernel-reset-small	455	N/A	66,085	45,629	N/A
private-kernel-tail-to-public	⚠️ 1,035 (+58%)	647	460,826	1,697	N/A
public-kernel-teardown	81.8	N/A	104,005	71,222	N/A
merge-rollup	19.8 (+4%)	N/A	35,742	664	N/A
undefined	N/A	N/A	N/A	N/A	65,693 (+2%)

Stats on running time collected for app circuits

Function	input_size_in_bytes	output_size_in_bytes	witness_generation_time_in_ms
ContractClassRegisterer:register	1,344	11,731	343 (+1%)
ContractInstanceDeployer:deploy	1,408	11,731	18.5 (+1%)
MultiCallEntrypoint:entrypoint	1,920	11,731	408 (+1%)
FeeJuice:deploy	1,376	11,731	390
SchnorrAccount:constructor	1,312	11,731	75.6
SchnorrAccount:entrypoint	2,304	11,731	416 (+1%)
Token:privately_mint_private_note	1,280	11,731	108 (+4%)
FPC:fee_entrypoint_public	1,344	11,731	27.5 (-1%)
Token:transfer	1,312	11,731	230
Benchmarking:create_note	1,344	11,731	89.4 (+2%)
SchnorrAccount:verify_private_authwit	1,280	11,731	27.1 (-1%)
Token:unshield	1,376	11,731	523 (-1%)
FPC:fee_entrypoint_private	1,376	11,731	704

AVM Simulation

Time to simulate various public functions in the AVM.

Function	time_ms	bytecode_size_in_bytes
FeeJuice:_increase_public_balance	54.3 (+2%)	7,739
FeeJuice:set_portal	⚠️ 12.2 (+31%)	2,354
Token:constructor	81.3 (-5%)	26,051
FPC:constructor	51.8 (+1%)	18,001
FeeJuice:mint_public	38.9 (+2%)	5,877
Token:mint_public	69.4 (+2%)	10,917
Token:assert_minter_and_mint	40.6 (+1%)	7,512
AuthRegistry:set_authorized	36.5 (-18%)	4,391
FPC:prepare_fee	229 (-1%)	7,043
Token:transfer_public	⚠️ 21.4 (-36%)	39,426
FPC:pay_refund	52.2 (-9%)	10,234
Benchmarking:increment_balance	944 (+1%)	6,563
Token:_increase_public_balance	39.6	8,433
FPC:pay_refund_with_shielded_rebate	62.2 (-2%)	10,783

Public DB Access

Time to access various public DBs.

Function	time_ms
get-nullifier-index	0.162 (+4%)

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	256 leaves	512 leaves	1024 leaves
batch_insert_into_append_only_tree_16_depth_ms	2.23 (+1%)	3.87 (-2%)	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_16_depth_hash_count	16.8	31.7	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_16_depth_hash_ms	0.115	0.109 (-1%)	N/A	N/A	N/A	N/A	N/A
batch_insert_into_append_only_tree_32_depth_ms	N/A	N/A	11.8 (+1%)	17.9	30.8 (-2%)	61.1 (+3%)	115
batch_insert_into_append_only_tree_32_depth_hash_count	N/A	N/A	95.9	159	287	543	1,055
batch_insert_into_append_only_tree_32_depth_hash_ms	N/A	N/A	0.113	0.104	0.100 (-1%)	0.105 (+3%)	0.103 (+1%)
batch_insert_into_indexed_tree_20_depth_ms	N/A	N/A	14.5	26.6 (+1%)	43.7 (-3%)	85.2 (+2%)	164 (+1%)
batch_insert_into_indexed_tree_20_depth_hash_count	N/A	N/A	109	207	355	691	1,363
batch_insert_into_indexed_tree_20_depth_hash_ms	N/A	N/A	0.110 (-1%)	0.107 (+1%)	0.106 (-2%)	0.105 (+2%)	0.103
batch_insert_into_indexed_tree_40_depth_ms	N/A	N/A	16.8 (+1%)	N/A	N/A	N/A	N/A
batch_insert_into_indexed_tree_40_depth_hash_count	N/A	N/A	132	N/A	N/A	N/A	N/A
batch_insert_into_indexed_tree_40_depth_hash_ms	N/A	N/A	0.108 (+1%)	N/A	N/A	N/A	N/A

Miscellaneous

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

Metric	0 registered classes	1 registered classes
tx_size_in_bytes	64,779	668,997

Transaction size based on fee payment method

| Metric | |
| - | |