chore: merging TokenWithRefunds with Token

[benesjan]

Now it's clear that we will want to keep partial notes around so there is no reason to have token with refunds separate from standard token.

[benesjan]

• feat: removing redundant key fetching #8043
• chore: merging TokenWithRefunds with Token #8042 👈
• master

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @benesjan and the rest of your teammates on Graphite

[sklppy88]

[AztecBot]

Benchmark results

Metrics with a significant change:

• proof_construction_time_sha256_100_ms (16): 6,704 (+23%)
• avm_simulation_time_ms (Token:mint_public): 74.1 (+68%)
• avm_simulation_time_ms (Token:assert_minter_and_mint): 40.7 (-40%)
• avm_simulation_time_ms (Token:_increase_public_balance): 80.1 (+90%)

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,778	1,563	709	751 (-1%)	768
proof_construction_time_sha256_30_ms	11,911	3,175	1,409	1,432 (-1%)	1,473
proof_construction_time_sha256_100_ms	45,434	12,182 (+1%)	⚠️ 6,704 (+23%)	5,361 (-1%)	5,388 (+1%)
proof_construction_time_poseidon_hash_ms	79.0	34.0	34.0	58.0	90.0 (+1%)
proof_construction_time_poseidon_hash_30_ms	1,533	440 (+4%)	203	229 (+1%)	268 (-3%)
proof_construction_time_poseidon_hash_100_ms	5,665	1,518	688 (+2%)	724 (-1%)	754 (+2%)

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,708	92,440	177,344
l1_rollup_execution_gas	1,383,202	2,130,902	3,957,845
l2_block_processing_time_in_ms	256 (+4%)	441	812 (+1%)
l2_block_building_time_in_ms	9,487 (+2%)	18,183 (+1%)	36,239
l2_block_rollup_simulation_time_in_ms	9,486 (+2%)	18,183 (+1%)	36,239
l2_block_public_tx_process_time_in_ms	8,025 (+2%)	16,635 (+1%)	34,662

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	2,944 (-2%)	3,831 (+2%)
node_database_size_in_bytes	12,648,528	16,744,528
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	97.7 (+1%)	401 (-1%)	21,673	44,858	N/A
private-kernel-inner	164 (+1%)	730	72,309	45,005	N/A
private-kernel-reset-tiny	503 (+1%)	906 (+1%)	65,974	44,844	N/A
private-kernel-tail	208 (+1%)	168	50,728	52,256	N/A
base-parity	5.82 (+5%)	N/A	160	96.0	N/A
root-parity	34.2 (+3%)	N/A	69,084	96.0	N/A
base-rollup	2,862 (+1%)	N/A	187,817	664	N/A
root-rollup	39.8 (+3%)	N/A	54,525	716	N/A
public-kernel-setup	103 (+6%)	N/A	103,760	71,222	N/A
public-kernel-app-logic	105 (+2%)	N/A	103,599	71,222	N/A
public-kernel-tail	584 (+1%)	N/A	409,190	16,414	N/A
private-kernel-reset-small	501	N/A	66,085	45,629	N/A
private-kernel-tail-to-public	1,073	662	492,960	1,697	N/A
public-kernel-teardown	96.0 (+4%)	N/A	104,005	71,222	N/A
merge-rollup	19.1	N/A	35,742	664	N/A
undefined	N/A	N/A	N/A	N/A	66,203

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	348 (+1%)
ContractInstanceDeployer:deploy	1,408	11,731	18.8 (+3%)
MultiCallEntrypoint:entrypoint	1,920	11,731	429 (+1%)
FeeJuice:deploy	1,376	11,731	400 (+3%)
SchnorrAccount:constructor	1,312	11,731	109 (+5%)
SchnorrAccount:entrypoint	2,304	11,731	438 (+1%)
Token:privately_mint_private_note	1,280	11,731	147 (+4%)
FPC:fee_entrypoint_public	1,344	11,731	29.3 (+9%)
Token:transfer	1,312	11,731	287 (+6%)
Benchmarking:create_note	1,344	11,731	104
SchnorrAccount:verify_private_authwit	1,280	11,731	29.3 (+6%)
Token:unshield	1,376	11,731	609 (+9%)
FPC:fee_entrypoint_private	1,376	11,731	806 (+6%)

AVM Simulation

Time to simulate various public functions in the AVM.

Function	time_ms	bytecode_size_in_bytes
FeeJuice:_increase_public_balance	54.8 (+2%)	8,139
FeeJuice:set_portal	11.3 (-4%)	2,362
Token:constructor	91.0 (+14%)	31,107
FPC:constructor	54.9 (+5%)	22,380
FeeJuice:mint_public	39.7 (+3%)	6,150
Token:mint_public	⚠️ 74.1 (+68%)	11,720
Token:assert_minter_and_mint	⚠️ 40.7 (-40%)	8,028
AuthRegistry:set_authorized	46.3 (+27%)	4,537
FPC:prepare_fee	261 (+10%)	8,812
Token:transfer_public	30.6 (+14%)	47,374
FPC:pay_refund	63.4 (+10%)	12,114
Benchmarking:increment_balance	971 (+1%)	7,450
Token:_increase_public_balance	⚠️ 80.1 (+90%)	8,960
FPC:pay_refund_with_shielded_rebate	69.9 (+1%)	12,663

Public DB Access

Time to access various public DBs.

Function	time_ms
get-nullifier-index	0.163 (+2%)

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.21 (+1%)	3.87 (-1%)	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 (+1%)	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.9 (+2%)	17.8 (-1%)	31.7 (+1%)	58.6	115 (+1%)
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.114 (+1%)	0.103 (-1%)	0.103 (+1%)	0.101	0.103
batch_insert_into_indexed_tree_20_depth_ms	N/A	N/A	14.5 (-1%)	25.7 (-1%)	44.8 (+2%)	81.7 (-1%)	166 (+2%)
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.104 (-1%)	0.108 (+2%)	0.101	0.106 (+3%)
batch_insert_into_indexed_tree_40_depth_ms	N/A	N/A	16.5	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.106	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 | |
| - | |