From 81b2173d6df682bc9d00b4e61515ef3138a77ebc Mon Sep 17 00:00:00 2001 From: IlyasRidhuan Date: Sat, 28 Sep 2024 22:58:48 +0000 Subject: [PATCH] feat: trace class id and instance --- barretenberg/cpp/pil/avm/bytecode.pil | 33 +- barretenberg/cpp/src/barretenberg/bb/main.cpp | 1 + .../vm/avm/generated/circuit_builder.cpp | 11 + .../barretenberg/vm/avm/generated/flavor.cpp | 1365 +++++++++-------- .../barretenberg/vm/avm/generated/flavor.hpp | 8 +- .../vm/avm/generated/full_row.cpp | 22 + .../vm/avm/generated/full_row.hpp | 13 +- .../vm/avm/generated/relations/bytecode.hpp | 42 + .../vm/avm/trace/bytecode_trace.cpp | 87 +- .../vm/avm/trace/bytecode_trace.hpp | 24 +- .../barretenberg/vm/avm/trace/execution.cpp | 22 +- .../vm/avm/trace/execution_hints.hpp | 4 +- .../src/barretenberg/vm/avm/trace/trace.cpp | 12 +- .../src/barretenberg/vm/aztec_constants.hpp | 2 +- .../crates/types/src/constants.nr | 2 +- .../bb-prover/src/avm_proving.test.ts | 47 +- yarn-project/circuits.js/src/constants.gen.ts | 2 +- .../circuits.js/src/tests/factories.ts | 53 +- .../src/avm_integration.test.ts | 46 +- .../simulator/src/avm/fixtures/index.ts | 7 + .../simulator/src/avm/journal/journal.ts | 7 +- .../simulator/src/public/side_effect_trace.ts | 34 +- 22 files changed, 1083 insertions(+), 761 deletions(-) create mode 100644 barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp diff --git a/barretenberg/cpp/pil/avm/bytecode.pil b/barretenberg/cpp/pil/avm/bytecode.pil index 9a8444187a97..f54f5506c4e7 100644 --- a/barretenberg/cpp/pil/avm/bytecode.pil +++ b/barretenberg/cpp/pil/avm/bytecode.pil @@ -1,13 +1,40 @@ namespace bytecode(256); + // Raw bytes + pol commit bytes; + pol commit bytes_pc; + + // Decomposed into 35 byte chunks to parse into instructions + pol commit decomposed; + + // =============== BYTECODE HASHING + ADDRESS DERIVATION ================================================= + // Bytes packed into 31 byte chunks pol commit packed; pol commit length_remaining; + + // Bytecode public commitment hash pol commit running_hash; + // When this is 1, it represents when reached the end of a contract bytecode pol commit end_latch; + end_latch * (1 - end_latch) = 0; - // TODO: Come back to this; - // pol commit class_id; - // pol commit contract_address; + /* Derive Class Id */ + pol CONTRACT_LEAF = 16; + pol commit arifact_hash; + pol commit private_fn_root; + // class_id = H(CONTRACT_LEAF, artifact_hash, private_fn_root, running_hash) + pol commit class_id; + /* Derive Contract Addr*/ + pol CONTRACT_ADDRESS_V1 = 15; + pol PARTIAL_ADDRESS = 27; + // pol SALTED_INIT_HASH = H(PARTIAL_ADDR, salt, init_hash, deployer_addr); + // pol PARTIAL_ADDR = H(PARTIAL_ADDR, class_id, SALTED_INIT_HASH); + pol commit salt; + pol commit initialization_hash; + pol commit deployer_addr; + pol commit public_key_hash; + // contract_address = H(CONTRACT_ADDRESS_V1, public_key_hash, partial_address) + pol commit contract_address; diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp index b4221357fd34..eebe8d6595a0 100644 --- a/barretenberg/cpp/src/barretenberg/bb/main.cpp +++ b/barretenberg/cpp/src/barretenberg/bb/main.cpp @@ -958,6 +958,7 @@ void avm_prove(const std::filesystem::path& calldata_path, vinfo("hints.l1_to_l2_message_exists_hints size: ", avm_hints.l1_to_l2_message_exists_hints.size()); vinfo("hints.externalcall_hints size: ", avm_hints.externalcall_hints.size()); vinfo("hints.contract_instance_hints size: ", avm_hints.contract_instance_hints.size()); + vinfo("hints.contrate_bytecode_hints size: ", avm_hints.all_contract_bytecode.size()); vinfo("initializing crs with size: ", avm_trace::Execution::SRS_SIZE); init_bn254_crs(avm_trace::Execution::SRS_SIZE); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp index 2e9601a7f5da..5b6a4aed6d3e 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp @@ -129,10 +129,21 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co polys.binary_op_id.set_if_valid_index(i, rows[i].binary_op_id); polys.binary_sel_bin.set_if_valid_index(i, rows[i].binary_sel_bin); polys.binary_start.set_if_valid_index(i, rows[i].binary_start); + polys.bytecode_arifact_hash.set_if_valid_index(i, rows[i].bytecode_arifact_hash); + polys.bytecode_bytes.set_if_valid_index(i, rows[i].bytecode_bytes); + polys.bytecode_bytes_pc.set_if_valid_index(i, rows[i].bytecode_bytes_pc); + polys.bytecode_class_id.set_if_valid_index(i, rows[i].bytecode_class_id); + polys.bytecode_contract_address.set_if_valid_index(i, rows[i].bytecode_contract_address); + polys.bytecode_decomposed.set_if_valid_index(i, rows[i].bytecode_decomposed); + polys.bytecode_deployer_addr.set_if_valid_index(i, rows[i].bytecode_deployer_addr); polys.bytecode_end_latch.set_if_valid_index(i, rows[i].bytecode_end_latch); + polys.bytecode_initialization_hash.set_if_valid_index(i, rows[i].bytecode_initialization_hash); polys.bytecode_length_remaining.set_if_valid_index(i, rows[i].bytecode_length_remaining); polys.bytecode_packed.set_if_valid_index(i, rows[i].bytecode_packed); + polys.bytecode_private_fn_root.set_if_valid_index(i, rows[i].bytecode_private_fn_root); + polys.bytecode_public_key_hash.set_if_valid_index(i, rows[i].bytecode_public_key_hash); polys.bytecode_running_hash.set_if_valid_index(i, rows[i].bytecode_running_hash); + polys.bytecode_salt.set_if_valid_index(i, rows[i].bytecode_salt); polys.cmp_a_hi.set_if_valid_index(i, rows[i].cmp_a_hi); polys.cmp_a_lo.set_if_valid_index(i, rows[i].cmp_a_lo); polys.cmp_b_hi.set_if_valid_index(i, rows[i].cmp_b_hi); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp index a2cb5d16712a..16eb0ef2df47 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp @@ -88,672 +88,683 @@ AvmFlavor::AllConstRefValues::AllConstRefValues( , binary_op_id(il[80]) , binary_sel_bin(il[81]) , binary_start(il[82]) - , bytecode_end_latch(il[83]) - , bytecode_length_remaining(il[84]) - , bytecode_packed(il[85]) - , bytecode_running_hash(il[86]) - , cmp_a_hi(il[87]) - , cmp_a_lo(il[88]) - , cmp_b_hi(il[89]) - , cmp_b_lo(il[90]) - , cmp_borrow(il[91]) - , cmp_clk(il[92]) - , cmp_cmp_rng_ctr(il[93]) - , cmp_input_a(il[94]) - , cmp_input_b(il[95]) - , cmp_op_eq(il[96]) - , cmp_op_eq_diff_inv(il[97]) - , cmp_op_gt(il[98]) - , cmp_p_a_borrow(il[99]) - , cmp_p_b_borrow(il[100]) - , cmp_p_sub_a_hi(il[101]) - , cmp_p_sub_a_lo(il[102]) - , cmp_p_sub_b_hi(il[103]) - , cmp_p_sub_b_lo(il[104]) - , cmp_range_chk_clk(il[105]) - , cmp_res_hi(il[106]) - , cmp_res_lo(il[107]) - , cmp_result(il[108]) - , cmp_sel_cmp(il[109]) - , cmp_sel_rng_chk(il[110]) - , cmp_shift_sel(il[111]) - , conversion_clk(il[112]) - , conversion_input(il[113]) - , conversion_num_limbs(il[114]) - , conversion_output_bits(il[115]) - , conversion_radix(il[116]) - , conversion_sel_to_radix_le(il[117]) - , keccakf1600_clk(il[118]) - , keccakf1600_input(il[119]) - , keccakf1600_output(il[120]) - , keccakf1600_sel_keccakf1600(il[121]) - , main_abs_da_rem_gas(il[122]) - , main_abs_l2_rem_gas(il[123]) - , main_alu_in_tag(il[124]) - , main_base_da_gas_op_cost(il[125]) - , main_base_l2_gas_op_cost(il[126]) - , main_bin_op_id(il[127]) - , main_call_ptr(il[128]) - , main_da_gas_remaining(il[129]) - , main_da_out_of_gas(il[130]) - , main_dyn_da_gas_op_cost(il[131]) - , main_dyn_gas_multiplier(il[132]) - , main_dyn_l2_gas_op_cost(il[133]) - , main_emit_l2_to_l1_msg_write_offset(il[134]) - , main_emit_note_hash_write_offset(il[135]) - , main_emit_nullifier_write_offset(il[136]) - , main_emit_unencrypted_log_write_offset(il[137]) - , main_ia(il[138]) - , main_ib(il[139]) - , main_ic(il[140]) - , main_id(il[141]) - , main_id_zero(il[142]) - , main_ind_addr_a(il[143]) - , main_ind_addr_b(il[144]) - , main_ind_addr_c(il[145]) - , main_ind_addr_d(il[146]) - , main_internal_return_ptr(il[147]) - , main_inv(il[148]) - , main_kernel_in_offset(il[149]) - , main_kernel_out_offset(il[150]) - , main_l1_to_l2_msg_exists_write_offset(il[151]) - , main_l2_gas_remaining(il[152]) - , main_l2_out_of_gas(il[153]) - , main_mem_addr_a(il[154]) - , main_mem_addr_b(il[155]) - , main_mem_addr_c(il[156]) - , main_mem_addr_d(il[157]) - , main_note_hash_exist_write_offset(il[158]) - , main_nullifier_exists_write_offset(il[159]) - , main_nullifier_non_exists_write_offset(il[160]) - , main_op_err(il[161]) - , main_opcode_val(il[162]) - , main_pc(il[163]) - , main_r_in_tag(il[164]) - , main_rwa(il[165]) - , main_rwb(il[166]) - , main_rwc(il[167]) - , main_rwd(il[168]) - , main_sel_alu(il[169]) - , main_sel_bin(il[170]) - , main_sel_calldata(il[171]) - , main_sel_execution_row(il[172]) - , main_sel_kernel_inputs(il[173]) - , main_sel_kernel_out(il[174]) - , main_sel_last(il[175]) - , main_sel_mem_op_a(il[176]) - , main_sel_mem_op_b(il[177]) - , main_sel_mem_op_c(il[178]) - , main_sel_mem_op_d(il[179]) - , main_sel_mov_ia_to_ic(il[180]) - , main_sel_mov_ib_to_ic(il[181]) - , main_sel_op_add(il[182]) - , main_sel_op_address(il[183]) - , main_sel_op_and(il[184]) - , main_sel_op_block_number(il[185]) - , main_sel_op_calldata_copy(il[186]) - , main_sel_op_cast(il[187]) - , main_sel_op_chain_id(il[188]) - , main_sel_op_cmov(il[189]) - , main_sel_op_dagasleft(il[190]) - , main_sel_op_div(il[191]) - , main_sel_op_ecadd(il[192]) - , main_sel_op_emit_l2_to_l1_msg(il[193]) - , main_sel_op_emit_note_hash(il[194]) - , main_sel_op_emit_nullifier(il[195]) - , main_sel_op_emit_unencrypted_log(il[196]) - , main_sel_op_eq(il[197]) - , main_sel_op_external_call(il[198]) - , main_sel_op_external_return(il[199]) - , main_sel_op_external_revert(il[200]) - , main_sel_op_fdiv(il[201]) - , main_sel_op_fee_per_da_gas(il[202]) - , main_sel_op_fee_per_l2_gas(il[203]) - , main_sel_op_function_selector(il[204]) - , main_sel_op_get_contract_instance(il[205]) - , main_sel_op_internal_call(il[206]) - , main_sel_op_internal_return(il[207]) - , main_sel_op_is_static_call(il[208]) - , main_sel_op_jump(il[209]) - , main_sel_op_jumpi(il[210]) - , main_sel_op_keccak(il[211]) - , main_sel_op_l1_to_l2_msg_exists(il[212]) - , main_sel_op_l2gasleft(il[213]) - , main_sel_op_lt(il[214]) - , main_sel_op_lte(il[215]) - , main_sel_op_mov(il[216]) - , main_sel_op_msm(il[217]) - , main_sel_op_mul(il[218]) - , main_sel_op_not(il[219]) - , main_sel_op_note_hash_exists(il[220]) - , main_sel_op_nullifier_exists(il[221]) - , main_sel_op_or(il[222]) - , main_sel_op_pedersen(il[223]) - , main_sel_op_pedersen_commit(il[224]) - , main_sel_op_poseidon2(il[225]) - , main_sel_op_radix_le(il[226]) - , main_sel_op_sender(il[227]) - , main_sel_op_set(il[228]) - , main_sel_op_sha256(il[229]) - , main_sel_op_shl(il[230]) - , main_sel_op_shr(il[231]) - , main_sel_op_sload(il[232]) - , main_sel_op_sstore(il[233]) - , main_sel_op_static_call(il[234]) - , main_sel_op_storage_address(il[235]) - , main_sel_op_sub(il[236]) - , main_sel_op_timestamp(il[237]) - , main_sel_op_transaction_fee(il[238]) - , main_sel_op_version(il[239]) - , main_sel_op_xor(il[240]) - , main_sel_q_kernel_lookup(il[241]) - , main_sel_q_kernel_output_lookup(il[242]) - , main_sel_resolve_ind_addr_a(il[243]) - , main_sel_resolve_ind_addr_b(il[244]) - , main_sel_resolve_ind_addr_c(il[245]) - , main_sel_resolve_ind_addr_d(il[246]) - , main_sel_returndata(il[247]) - , main_sel_rng_16(il[248]) - , main_sel_rng_8(il[249]) - , main_sel_slice_gadget(il[250]) - , main_side_effect_counter(il[251]) - , main_sload_write_offset(il[252]) - , main_space_id(il[253]) - , main_sstore_write_offset(il[254]) - , main_tag_err(il[255]) - , main_w_in_tag(il[256]) - , mem_addr(il[257]) - , mem_clk(il[258]) - , mem_diff(il[259]) - , mem_glob_addr(il[260]) - , mem_last(il[261]) - , mem_lastAccess(il[262]) - , mem_one_min_inv(il[263]) - , mem_r_in_tag(il[264]) - , mem_rw(il[265]) - , mem_sel_mem(il[266]) - , mem_sel_mov_ia_to_ic(il[267]) - , mem_sel_mov_ib_to_ic(il[268]) - , mem_sel_op_a(il[269]) - , mem_sel_op_b(il[270]) - , mem_sel_op_c(il[271]) - , mem_sel_op_cmov(il[272]) - , mem_sel_op_d(il[273]) - , mem_sel_op_poseidon_read_a(il[274]) - , mem_sel_op_poseidon_read_b(il[275]) - , mem_sel_op_poseidon_read_c(il[276]) - , mem_sel_op_poseidon_read_d(il[277]) - , mem_sel_op_poseidon_write_a(il[278]) - , mem_sel_op_poseidon_write_b(il[279]) - , mem_sel_op_poseidon_write_c(il[280]) - , mem_sel_op_poseidon_write_d(il[281]) - , mem_sel_op_slice(il[282]) - , mem_sel_resolve_ind_addr_a(il[283]) - , mem_sel_resolve_ind_addr_b(il[284]) - , mem_sel_resolve_ind_addr_c(il[285]) - , mem_sel_resolve_ind_addr_d(il[286]) - , mem_sel_rng_chk(il[287]) - , mem_skip_check_tag(il[288]) - , mem_space_id(il[289]) - , mem_tag(il[290]) - , mem_tag_err(il[291]) - , mem_tsp(il[292]) - , mem_val(il[293]) - , mem_w_in_tag(il[294]) - , pedersen_clk(il[295]) - , pedersen_input(il[296]) - , pedersen_output(il[297]) - , pedersen_sel_pedersen(il[298]) - , poseidon2_B_10_0(il[299]) - , poseidon2_B_10_1(il[300]) - , poseidon2_B_10_2(il[301]) - , poseidon2_B_10_3(il[302]) - , poseidon2_B_11_0(il[303]) - , poseidon2_B_11_1(il[304]) - , poseidon2_B_11_2(il[305]) - , poseidon2_B_11_3(il[306]) - , poseidon2_B_12_0(il[307]) - , poseidon2_B_12_1(il[308]) - , poseidon2_B_12_2(il[309]) - , poseidon2_B_12_3(il[310]) - , poseidon2_B_13_0(il[311]) - , poseidon2_B_13_1(il[312]) - , poseidon2_B_13_2(il[313]) - , poseidon2_B_13_3(il[314]) - , poseidon2_B_14_0(il[315]) - , poseidon2_B_14_1(il[316]) - , poseidon2_B_14_2(il[317]) - , poseidon2_B_14_3(il[318]) - , poseidon2_B_15_0(il[319]) - , poseidon2_B_15_1(il[320]) - , poseidon2_B_15_2(il[321]) - , poseidon2_B_15_3(il[322]) - , poseidon2_B_16_0(il[323]) - , poseidon2_B_16_1(il[324]) - , poseidon2_B_16_2(il[325]) - , poseidon2_B_16_3(il[326]) - , poseidon2_B_17_0(il[327]) - , poseidon2_B_17_1(il[328]) - , poseidon2_B_17_2(il[329]) - , poseidon2_B_17_3(il[330]) - , poseidon2_B_18_0(il[331]) - , poseidon2_B_18_1(il[332]) - , poseidon2_B_18_2(il[333]) - , poseidon2_B_18_3(il[334]) - , poseidon2_B_19_0(il[335]) - , poseidon2_B_19_1(il[336]) - , poseidon2_B_19_2(il[337]) - , poseidon2_B_19_3(il[338]) - , poseidon2_B_20_0(il[339]) - , poseidon2_B_20_1(il[340]) - , poseidon2_B_20_2(il[341]) - , poseidon2_B_20_3(il[342]) - , poseidon2_B_21_0(il[343]) - , poseidon2_B_21_1(il[344]) - , poseidon2_B_21_2(il[345]) - , poseidon2_B_21_3(il[346]) - , poseidon2_B_22_0(il[347]) - , poseidon2_B_22_1(il[348]) - , poseidon2_B_22_2(il[349]) - , poseidon2_B_22_3(il[350]) - , poseidon2_B_23_0(il[351]) - , poseidon2_B_23_1(il[352]) - , poseidon2_B_23_2(il[353]) - , poseidon2_B_23_3(il[354]) - , poseidon2_B_24_0(il[355]) - , poseidon2_B_24_1(il[356]) - , poseidon2_B_24_2(il[357]) - , poseidon2_B_24_3(il[358]) - , poseidon2_B_25_0(il[359]) - , poseidon2_B_25_1(il[360]) - , poseidon2_B_25_2(il[361]) - , poseidon2_B_25_3(il[362]) - , poseidon2_B_26_0(il[363]) - , poseidon2_B_26_1(il[364]) - , poseidon2_B_26_2(il[365]) - , poseidon2_B_26_3(il[366]) - , poseidon2_B_27_0(il[367]) - , poseidon2_B_27_1(il[368]) - , poseidon2_B_27_2(il[369]) - , poseidon2_B_27_3(il[370]) - , poseidon2_B_28_0(il[371]) - , poseidon2_B_28_1(il[372]) - , poseidon2_B_28_2(il[373]) - , poseidon2_B_28_3(il[374]) - , poseidon2_B_29_0(il[375]) - , poseidon2_B_29_1(il[376]) - , poseidon2_B_29_2(il[377]) - , poseidon2_B_29_3(il[378]) - , poseidon2_B_30_0(il[379]) - , poseidon2_B_30_1(il[380]) - , poseidon2_B_30_2(il[381]) - , poseidon2_B_30_3(il[382]) - , poseidon2_B_31_0(il[383]) - , poseidon2_B_31_1(il[384]) - , poseidon2_B_31_2(il[385]) - , poseidon2_B_31_3(il[386]) - , poseidon2_B_32_0(il[387]) - , poseidon2_B_32_1(il[388]) - , poseidon2_B_32_2(il[389]) - , poseidon2_B_32_3(il[390]) - , poseidon2_B_33_0(il[391]) - , poseidon2_B_33_1(il[392]) - , poseidon2_B_33_2(il[393]) - , poseidon2_B_33_3(il[394]) - , poseidon2_B_34_0(il[395]) - , poseidon2_B_34_1(il[396]) - , poseidon2_B_34_2(il[397]) - , poseidon2_B_34_3(il[398]) - , poseidon2_B_35_0(il[399]) - , poseidon2_B_35_1(il[400]) - , poseidon2_B_35_2(il[401]) - , poseidon2_B_35_3(il[402]) - , poseidon2_B_36_0(il[403]) - , poseidon2_B_36_1(il[404]) - , poseidon2_B_36_2(il[405]) - , poseidon2_B_36_3(il[406]) - , poseidon2_B_37_0(il[407]) - , poseidon2_B_37_1(il[408]) - , poseidon2_B_37_2(il[409]) - , poseidon2_B_37_3(il[410]) - , poseidon2_B_38_0(il[411]) - , poseidon2_B_38_1(il[412]) - , poseidon2_B_38_2(il[413]) - , poseidon2_B_38_3(il[414]) - , poseidon2_B_39_0(il[415]) - , poseidon2_B_39_1(il[416]) - , poseidon2_B_39_2(il[417]) - , poseidon2_B_39_3(il[418]) - , poseidon2_B_40_0(il[419]) - , poseidon2_B_40_1(il[420]) - , poseidon2_B_40_2(il[421]) - , poseidon2_B_40_3(il[422]) - , poseidon2_B_41_0(il[423]) - , poseidon2_B_41_1(il[424]) - , poseidon2_B_41_2(il[425]) - , poseidon2_B_41_3(il[426]) - , poseidon2_B_42_0(il[427]) - , poseidon2_B_42_1(il[428]) - , poseidon2_B_42_2(il[429]) - , poseidon2_B_42_3(il[430]) - , poseidon2_B_43_0(il[431]) - , poseidon2_B_43_1(il[432]) - , poseidon2_B_43_2(il[433]) - , poseidon2_B_43_3(il[434]) - , poseidon2_B_44_0(il[435]) - , poseidon2_B_44_1(il[436]) - , poseidon2_B_44_2(il[437]) - , poseidon2_B_44_3(il[438]) - , poseidon2_B_45_0(il[439]) - , poseidon2_B_45_1(il[440]) - , poseidon2_B_45_2(il[441]) - , poseidon2_B_45_3(il[442]) - , poseidon2_B_46_0(il[443]) - , poseidon2_B_46_1(il[444]) - , poseidon2_B_46_2(il[445]) - , poseidon2_B_46_3(il[446]) - , poseidon2_B_47_0(il[447]) - , poseidon2_B_47_1(il[448]) - , poseidon2_B_47_2(il[449]) - , poseidon2_B_47_3(il[450]) - , poseidon2_B_48_0(il[451]) - , poseidon2_B_48_1(il[452]) - , poseidon2_B_48_2(il[453]) - , poseidon2_B_48_3(il[454]) - , poseidon2_B_49_0(il[455]) - , poseidon2_B_49_1(il[456]) - , poseidon2_B_49_2(il[457]) - , poseidon2_B_49_3(il[458]) - , poseidon2_B_4_0(il[459]) - , poseidon2_B_4_1(il[460]) - , poseidon2_B_4_2(il[461]) - , poseidon2_B_4_3(il[462]) - , poseidon2_B_50_0(il[463]) - , poseidon2_B_50_1(il[464]) - , poseidon2_B_50_2(il[465]) - , poseidon2_B_50_3(il[466]) - , poseidon2_B_51_0(il[467]) - , poseidon2_B_51_1(il[468]) - , poseidon2_B_51_2(il[469]) - , poseidon2_B_51_3(il[470]) - , poseidon2_B_52_0(il[471]) - , poseidon2_B_52_1(il[472]) - , poseidon2_B_52_2(il[473]) - , poseidon2_B_52_3(il[474]) - , poseidon2_B_53_0(il[475]) - , poseidon2_B_53_1(il[476]) - , poseidon2_B_53_2(il[477]) - , poseidon2_B_53_3(il[478]) - , poseidon2_B_54_0(il[479]) - , poseidon2_B_54_1(il[480]) - , poseidon2_B_54_2(il[481]) - , poseidon2_B_54_3(il[482]) - , poseidon2_B_55_0(il[483]) - , poseidon2_B_55_1(il[484]) - , poseidon2_B_55_2(il[485]) - , poseidon2_B_55_3(il[486]) - , poseidon2_B_56_0(il[487]) - , poseidon2_B_56_1(il[488]) - , poseidon2_B_56_2(il[489]) - , poseidon2_B_56_3(il[490]) - , poseidon2_B_57_0(il[491]) - , poseidon2_B_57_1(il[492]) - , poseidon2_B_57_2(il[493]) - , poseidon2_B_57_3(il[494]) - , poseidon2_B_58_0(il[495]) - , poseidon2_B_58_1(il[496]) - , poseidon2_B_58_2(il[497]) - , poseidon2_B_58_3(il[498]) - , poseidon2_B_59_0(il[499]) - , poseidon2_B_59_1(il[500]) - , poseidon2_B_59_2(il[501]) - , poseidon2_B_59_3(il[502]) - , poseidon2_B_5_0(il[503]) - , poseidon2_B_5_1(il[504]) - , poseidon2_B_5_2(il[505]) - , poseidon2_B_5_3(il[506]) - , poseidon2_B_6_0(il[507]) - , poseidon2_B_6_1(il[508]) - , poseidon2_B_6_2(il[509]) - , poseidon2_B_6_3(il[510]) - , poseidon2_B_7_0(il[511]) - , poseidon2_B_7_1(il[512]) - , poseidon2_B_7_2(il[513]) - , poseidon2_B_7_3(il[514]) - , poseidon2_B_8_0(il[515]) - , poseidon2_B_8_1(il[516]) - , poseidon2_B_8_2(il[517]) - , poseidon2_B_8_3(il[518]) - , poseidon2_B_9_0(il[519]) - , poseidon2_B_9_1(il[520]) - , poseidon2_B_9_2(il[521]) - , poseidon2_B_9_3(il[522]) - , poseidon2_EXT_LAYER_4(il[523]) - , poseidon2_EXT_LAYER_5(il[524]) - , poseidon2_EXT_LAYER_6(il[525]) - , poseidon2_EXT_LAYER_7(il[526]) - , poseidon2_T_0_4(il[527]) - , poseidon2_T_0_5(il[528]) - , poseidon2_T_0_6(il[529]) - , poseidon2_T_0_7(il[530]) - , poseidon2_T_1_4(il[531]) - , poseidon2_T_1_5(il[532]) - , poseidon2_T_1_6(il[533]) - , poseidon2_T_1_7(il[534]) - , poseidon2_T_2_4(il[535]) - , poseidon2_T_2_5(il[536]) - , poseidon2_T_2_6(il[537]) - , poseidon2_T_2_7(il[538]) - , poseidon2_T_3_4(il[539]) - , poseidon2_T_3_5(il[540]) - , poseidon2_T_3_6(il[541]) - , poseidon2_T_3_7(il[542]) - , poseidon2_T_60_4(il[543]) - , poseidon2_T_60_5(il[544]) - , poseidon2_T_60_6(il[545]) - , poseidon2_T_60_7(il[546]) - , poseidon2_T_61_4(il[547]) - , poseidon2_T_61_5(il[548]) - , poseidon2_T_61_6(il[549]) - , poseidon2_T_61_7(il[550]) - , poseidon2_T_62_4(il[551]) - , poseidon2_T_62_5(il[552]) - , poseidon2_T_62_6(il[553]) - , poseidon2_T_62_7(il[554]) - , poseidon2_T_63_4(il[555]) - , poseidon2_T_63_5(il[556]) - , poseidon2_T_63_6(il[557]) - , poseidon2_T_63_7(il[558]) - , poseidon2_a_0(il[559]) - , poseidon2_a_1(il[560]) - , poseidon2_a_2(il[561]) - , poseidon2_a_3(il[562]) - , poseidon2_b_0(il[563]) - , poseidon2_b_1(il[564]) - , poseidon2_b_2(il[565]) - , poseidon2_b_3(il[566]) - , poseidon2_clk(il[567]) - , poseidon2_input_addr(il[568]) - , poseidon2_mem_addr_read_a(il[569]) - , poseidon2_mem_addr_read_b(il[570]) - , poseidon2_mem_addr_read_c(il[571]) - , poseidon2_mem_addr_read_d(il[572]) - , poseidon2_mem_addr_write_a(il[573]) - , poseidon2_mem_addr_write_b(il[574]) - , poseidon2_mem_addr_write_c(il[575]) - , poseidon2_mem_addr_write_d(il[576]) - , poseidon2_output_addr(il[577]) - , poseidon2_sel_poseidon_perm(il[578]) - , range_check_alu_rng_chk(il[579]) - , range_check_clk(il[580]) - , range_check_cmp_hi_bits_rng_chk(il[581]) - , range_check_cmp_lo_bits_rng_chk(il[582]) - , range_check_dyn_diff(il[583]) - , range_check_dyn_rng_chk_bits(il[584]) - , range_check_dyn_rng_chk_pow_2(il[585]) - , range_check_gas_da_rng_chk(il[586]) - , range_check_gas_l2_rng_chk(il[587]) - , range_check_is_lte_u112(il[588]) - , range_check_is_lte_u128(il[589]) - , range_check_is_lte_u16(il[590]) - , range_check_is_lte_u32(il[591]) - , range_check_is_lte_u48(il[592]) - , range_check_is_lte_u64(il[593]) - , range_check_is_lte_u80(il[594]) - , range_check_is_lte_u96(il[595]) - , range_check_mem_rng_chk(il[596]) - , range_check_rng_chk_bits(il[597]) - , range_check_sel_lookup_0(il[598]) - , range_check_sel_lookup_1(il[599]) - , range_check_sel_lookup_2(il[600]) - , range_check_sel_lookup_3(il[601]) - , range_check_sel_lookup_4(il[602]) - , range_check_sel_lookup_5(il[603]) - , range_check_sel_lookup_6(il[604]) - , range_check_sel_rng_chk(il[605]) - , range_check_u16_r0(il[606]) - , range_check_u16_r1(il[607]) - , range_check_u16_r2(il[608]) - , range_check_u16_r3(il[609]) - , range_check_u16_r4(il[610]) - , range_check_u16_r5(il[611]) - , range_check_u16_r6(il[612]) - , range_check_u16_r7(il[613]) - , range_check_value(il[614]) - , sha256_clk(il[615]) - , sha256_input(il[616]) - , sha256_output(il[617]) - , sha256_sel_sha256_compression(il[618]) - , sha256_state(il[619]) - , slice_addr(il[620]) - , slice_clk(il[621]) - , slice_cnt(il[622]) - , slice_col_offset(il[623]) - , slice_one_min_inv(il[624]) - , slice_sel_cd_cpy(il[625]) - , slice_sel_mem_active(il[626]) - , slice_sel_return(il[627]) - , slice_sel_start(il[628]) - , slice_space_id(il[629]) - , slice_val(il[630]) - , lookup_rng_chk_pow_2_counts(il[631]) - , lookup_rng_chk_diff_counts(il[632]) - , lookup_rng_chk_0_counts(il[633]) - , lookup_rng_chk_1_counts(il[634]) - , lookup_rng_chk_2_counts(il[635]) - , lookup_rng_chk_3_counts(il[636]) - , lookup_rng_chk_4_counts(il[637]) - , lookup_rng_chk_5_counts(il[638]) - , lookup_rng_chk_6_counts(il[639]) - , lookup_rng_chk_7_counts(il[640]) - , lookup_pow_2_0_counts(il[641]) - , lookup_pow_2_1_counts(il[642]) - , lookup_byte_lengths_counts(il[643]) - , lookup_byte_operations_counts(il[644]) - , lookup_opcode_gas_counts(il[645]) - , kernel_output_lookup_counts(il[646]) - , lookup_into_kernel_counts(il[647]) - , lookup_cd_value_counts(il[648]) - , lookup_ret_value_counts(il[649]) - , incl_main_tag_err_counts(il[650]) - , incl_mem_tag_err_counts(il[651]) - , perm_rng_mem_inv(il[652]) - , perm_rng_cmp_lo_inv(il[653]) - , perm_rng_cmp_hi_inv(il[654]) - , perm_rng_alu_inv(il[655]) - , perm_cmp_alu_inv(il[656]) - , perm_rng_gas_l2_inv(il[657]) - , perm_rng_gas_da_inv(il[658]) - , perm_pos_mem_read_a_inv(il[659]) - , perm_pos_mem_read_b_inv(il[660]) - , perm_pos_mem_read_c_inv(il[661]) - , perm_pos_mem_read_d_inv(il[662]) - , perm_pos_mem_write_a_inv(il[663]) - , perm_pos_mem_write_b_inv(il[664]) - , perm_pos_mem_write_c_inv(il[665]) - , perm_pos_mem_write_d_inv(il[666]) - , perm_slice_mem_inv(il[667]) - , perm_main_alu_inv(il[668]) - , perm_main_bin_inv(il[669]) - , perm_main_conv_inv(il[670]) - , perm_main_pos2_perm_inv(il[671]) - , perm_main_pedersen_inv(il[672]) - , perm_main_slice_inv(il[673]) - , perm_main_mem_a_inv(il[674]) - , perm_main_mem_b_inv(il[675]) - , perm_main_mem_c_inv(il[676]) - , perm_main_mem_d_inv(il[677]) - , perm_main_mem_ind_addr_a_inv(il[678]) - , perm_main_mem_ind_addr_b_inv(il[679]) - , perm_main_mem_ind_addr_c_inv(il[680]) - , perm_main_mem_ind_addr_d_inv(il[681]) - , lookup_rng_chk_pow_2_inv(il[682]) - , lookup_rng_chk_diff_inv(il[683]) - , lookup_rng_chk_0_inv(il[684]) - , lookup_rng_chk_1_inv(il[685]) - , lookup_rng_chk_2_inv(il[686]) - , lookup_rng_chk_3_inv(il[687]) - , lookup_rng_chk_4_inv(il[688]) - , lookup_rng_chk_5_inv(il[689]) - , lookup_rng_chk_6_inv(il[690]) - , lookup_rng_chk_7_inv(il[691]) - , lookup_pow_2_0_inv(il[692]) - , lookup_pow_2_1_inv(il[693]) - , lookup_byte_lengths_inv(il[694]) - , lookup_byte_operations_inv(il[695]) - , lookup_opcode_gas_inv(il[696]) - , kernel_output_lookup_inv(il[697]) - , lookup_into_kernel_inv(il[698]) - , lookup_cd_value_inv(il[699]) - , lookup_ret_value_inv(il[700]) - , incl_main_tag_err_inv(il[701]) - , incl_mem_tag_err_inv(il[702]) - , binary_acc_ia_shift(il[703]) - , binary_acc_ib_shift(il[704]) - , binary_acc_ic_shift(il[705]) - , binary_mem_tag_ctr_shift(il[706]) - , binary_op_id_shift(il[707]) - , cmp_a_hi_shift(il[708]) - , cmp_a_lo_shift(il[709]) - , cmp_b_hi_shift(il[710]) - , cmp_b_lo_shift(il[711]) - , cmp_cmp_rng_ctr_shift(il[712]) - , cmp_op_gt_shift(il[713]) - , cmp_p_sub_a_hi_shift(il[714]) - , cmp_p_sub_a_lo_shift(il[715]) - , cmp_p_sub_b_hi_shift(il[716]) - , cmp_p_sub_b_lo_shift(il[717]) - , cmp_sel_rng_chk_shift(il[718]) - , main_da_gas_remaining_shift(il[719]) - , main_emit_l2_to_l1_msg_write_offset_shift(il[720]) - , main_emit_note_hash_write_offset_shift(il[721]) - , main_emit_nullifier_write_offset_shift(il[722]) - , main_emit_unencrypted_log_write_offset_shift(il[723]) - , main_internal_return_ptr_shift(il[724]) - , main_l1_to_l2_msg_exists_write_offset_shift(il[725]) - , main_l2_gas_remaining_shift(il[726]) - , main_note_hash_exist_write_offset_shift(il[727]) - , main_nullifier_exists_write_offset_shift(il[728]) - , main_nullifier_non_exists_write_offset_shift(il[729]) - , main_pc_shift(il[730]) - , main_sel_execution_row_shift(il[731]) - , main_sload_write_offset_shift(il[732]) - , main_sstore_write_offset_shift(il[733]) - , mem_glob_addr_shift(il[734]) - , mem_rw_shift(il[735]) - , mem_sel_mem_shift(il[736]) - , mem_tag_shift(il[737]) - , mem_tsp_shift(il[738]) - , mem_val_shift(il[739]) - , slice_addr_shift(il[740]) - , slice_clk_shift(il[741]) - , slice_cnt_shift(il[742]) - , slice_col_offset_shift(il[743]) - , slice_sel_cd_cpy_shift(il[744]) - , slice_sel_mem_active_shift(il[745]) - , slice_sel_return_shift(il[746]) - , slice_sel_start_shift(il[747]) - , slice_space_id_shift(il[748]) + , bytecode_arifact_hash(il[83]) + , bytecode_bytes(il[84]) + , bytecode_bytes_pc(il[85]) + , bytecode_class_id(il[86]) + , bytecode_contract_address(il[87]) + , bytecode_decomposed(il[88]) + , bytecode_deployer_addr(il[89]) + , bytecode_end_latch(il[90]) + , bytecode_initialization_hash(il[91]) + , bytecode_length_remaining(il[92]) + , bytecode_packed(il[93]) + , bytecode_private_fn_root(il[94]) + , bytecode_public_key_hash(il[95]) + , bytecode_running_hash(il[96]) + , bytecode_salt(il[97]) + , cmp_a_hi(il[98]) + , cmp_a_lo(il[99]) + , cmp_b_hi(il[100]) + , cmp_b_lo(il[101]) + , cmp_borrow(il[102]) + , cmp_clk(il[103]) + , cmp_cmp_rng_ctr(il[104]) + , cmp_input_a(il[105]) + , cmp_input_b(il[106]) + , cmp_op_eq(il[107]) + , cmp_op_eq_diff_inv(il[108]) + , cmp_op_gt(il[109]) + , cmp_p_a_borrow(il[110]) + , cmp_p_b_borrow(il[111]) + , cmp_p_sub_a_hi(il[112]) + , cmp_p_sub_a_lo(il[113]) + , cmp_p_sub_b_hi(il[114]) + , cmp_p_sub_b_lo(il[115]) + , cmp_range_chk_clk(il[116]) + , cmp_res_hi(il[117]) + , cmp_res_lo(il[118]) + , cmp_result(il[119]) + , cmp_sel_cmp(il[120]) + , cmp_sel_rng_chk(il[121]) + , cmp_shift_sel(il[122]) + , conversion_clk(il[123]) + , conversion_input(il[124]) + , conversion_num_limbs(il[125]) + , conversion_output_bits(il[126]) + , conversion_radix(il[127]) + , conversion_sel_to_radix_le(il[128]) + , keccakf1600_clk(il[129]) + , keccakf1600_input(il[130]) + , keccakf1600_output(il[131]) + , keccakf1600_sel_keccakf1600(il[132]) + , main_abs_da_rem_gas(il[133]) + , main_abs_l2_rem_gas(il[134]) + , main_alu_in_tag(il[135]) + , main_base_da_gas_op_cost(il[136]) + , main_base_l2_gas_op_cost(il[137]) + , main_bin_op_id(il[138]) + , main_call_ptr(il[139]) + , main_da_gas_remaining(il[140]) + , main_da_out_of_gas(il[141]) + , main_dyn_da_gas_op_cost(il[142]) + , main_dyn_gas_multiplier(il[143]) + , main_dyn_l2_gas_op_cost(il[144]) + , main_emit_l2_to_l1_msg_write_offset(il[145]) + , main_emit_note_hash_write_offset(il[146]) + , main_emit_nullifier_write_offset(il[147]) + , main_emit_unencrypted_log_write_offset(il[148]) + , main_ia(il[149]) + , main_ib(il[150]) + , main_ic(il[151]) + , main_id(il[152]) + , main_id_zero(il[153]) + , main_ind_addr_a(il[154]) + , main_ind_addr_b(il[155]) + , main_ind_addr_c(il[156]) + , main_ind_addr_d(il[157]) + , main_internal_return_ptr(il[158]) + , main_inv(il[159]) + , main_kernel_in_offset(il[160]) + , main_kernel_out_offset(il[161]) + , main_l1_to_l2_msg_exists_write_offset(il[162]) + , main_l2_gas_remaining(il[163]) + , main_l2_out_of_gas(il[164]) + , main_mem_addr_a(il[165]) + , main_mem_addr_b(il[166]) + , main_mem_addr_c(il[167]) + , main_mem_addr_d(il[168]) + , main_note_hash_exist_write_offset(il[169]) + , main_nullifier_exists_write_offset(il[170]) + , main_nullifier_non_exists_write_offset(il[171]) + , main_op_err(il[172]) + , main_opcode_val(il[173]) + , main_pc(il[174]) + , main_r_in_tag(il[175]) + , main_rwa(il[176]) + , main_rwb(il[177]) + , main_rwc(il[178]) + , main_rwd(il[179]) + , main_sel_alu(il[180]) + , main_sel_bin(il[181]) + , main_sel_calldata(il[182]) + , main_sel_execution_row(il[183]) + , main_sel_kernel_inputs(il[184]) + , main_sel_kernel_out(il[185]) + , main_sel_last(il[186]) + , main_sel_mem_op_a(il[187]) + , main_sel_mem_op_b(il[188]) + , main_sel_mem_op_c(il[189]) + , main_sel_mem_op_d(il[190]) + , main_sel_mov_ia_to_ic(il[191]) + , main_sel_mov_ib_to_ic(il[192]) + , main_sel_op_add(il[193]) + , main_sel_op_address(il[194]) + , main_sel_op_and(il[195]) + , main_sel_op_block_number(il[196]) + , main_sel_op_calldata_copy(il[197]) + , main_sel_op_cast(il[198]) + , main_sel_op_chain_id(il[199]) + , main_sel_op_cmov(il[200]) + , main_sel_op_dagasleft(il[201]) + , main_sel_op_div(il[202]) + , main_sel_op_ecadd(il[203]) + , main_sel_op_emit_l2_to_l1_msg(il[204]) + , main_sel_op_emit_note_hash(il[205]) + , main_sel_op_emit_nullifier(il[206]) + , main_sel_op_emit_unencrypted_log(il[207]) + , main_sel_op_eq(il[208]) + , main_sel_op_external_call(il[209]) + , main_sel_op_external_return(il[210]) + , main_sel_op_external_revert(il[211]) + , main_sel_op_fdiv(il[212]) + , main_sel_op_fee_per_da_gas(il[213]) + , main_sel_op_fee_per_l2_gas(il[214]) + , main_sel_op_function_selector(il[215]) + , main_sel_op_get_contract_instance(il[216]) + , main_sel_op_internal_call(il[217]) + , main_sel_op_internal_return(il[218]) + , main_sel_op_is_static_call(il[219]) + , main_sel_op_jump(il[220]) + , main_sel_op_jumpi(il[221]) + , main_sel_op_keccak(il[222]) + , main_sel_op_l1_to_l2_msg_exists(il[223]) + , main_sel_op_l2gasleft(il[224]) + , main_sel_op_lt(il[225]) + , main_sel_op_lte(il[226]) + , main_sel_op_mov(il[227]) + , main_sel_op_msm(il[228]) + , main_sel_op_mul(il[229]) + , main_sel_op_not(il[230]) + , main_sel_op_note_hash_exists(il[231]) + , main_sel_op_nullifier_exists(il[232]) + , main_sel_op_or(il[233]) + , main_sel_op_pedersen(il[234]) + , main_sel_op_pedersen_commit(il[235]) + , main_sel_op_poseidon2(il[236]) + , main_sel_op_radix_le(il[237]) + , main_sel_op_sender(il[238]) + , main_sel_op_set(il[239]) + , main_sel_op_sha256(il[240]) + , main_sel_op_shl(il[241]) + , main_sel_op_shr(il[242]) + , main_sel_op_sload(il[243]) + , main_sel_op_sstore(il[244]) + , main_sel_op_static_call(il[245]) + , main_sel_op_storage_address(il[246]) + , main_sel_op_sub(il[247]) + , main_sel_op_timestamp(il[248]) + , main_sel_op_transaction_fee(il[249]) + , main_sel_op_version(il[250]) + , main_sel_op_xor(il[251]) + , main_sel_q_kernel_lookup(il[252]) + , main_sel_q_kernel_output_lookup(il[253]) + , main_sel_resolve_ind_addr_a(il[254]) + , main_sel_resolve_ind_addr_b(il[255]) + , main_sel_resolve_ind_addr_c(il[256]) + , main_sel_resolve_ind_addr_d(il[257]) + , main_sel_returndata(il[258]) + , main_sel_rng_16(il[259]) + , main_sel_rng_8(il[260]) + , main_sel_slice_gadget(il[261]) + , main_side_effect_counter(il[262]) + , main_sload_write_offset(il[263]) + , main_space_id(il[264]) + , main_sstore_write_offset(il[265]) + , main_tag_err(il[266]) + , main_w_in_tag(il[267]) + , mem_addr(il[268]) + , mem_clk(il[269]) + , mem_diff(il[270]) + , mem_glob_addr(il[271]) + , mem_last(il[272]) + , mem_lastAccess(il[273]) + , mem_one_min_inv(il[274]) + , mem_r_in_tag(il[275]) + , mem_rw(il[276]) + , mem_sel_mem(il[277]) + , mem_sel_mov_ia_to_ic(il[278]) + , mem_sel_mov_ib_to_ic(il[279]) + , mem_sel_op_a(il[280]) + , mem_sel_op_b(il[281]) + , mem_sel_op_c(il[282]) + , mem_sel_op_cmov(il[283]) + , mem_sel_op_d(il[284]) + , mem_sel_op_poseidon_read_a(il[285]) + , mem_sel_op_poseidon_read_b(il[286]) + , mem_sel_op_poseidon_read_c(il[287]) + , mem_sel_op_poseidon_read_d(il[288]) + , mem_sel_op_poseidon_write_a(il[289]) + , mem_sel_op_poseidon_write_b(il[290]) + , mem_sel_op_poseidon_write_c(il[291]) + , mem_sel_op_poseidon_write_d(il[292]) + , mem_sel_op_slice(il[293]) + , mem_sel_resolve_ind_addr_a(il[294]) + , mem_sel_resolve_ind_addr_b(il[295]) + , mem_sel_resolve_ind_addr_c(il[296]) + , mem_sel_resolve_ind_addr_d(il[297]) + , mem_sel_rng_chk(il[298]) + , mem_skip_check_tag(il[299]) + , mem_space_id(il[300]) + , mem_tag(il[301]) + , mem_tag_err(il[302]) + , mem_tsp(il[303]) + , mem_val(il[304]) + , mem_w_in_tag(il[305]) + , pedersen_clk(il[306]) + , pedersen_input(il[307]) + , pedersen_output(il[308]) + , pedersen_sel_pedersen(il[309]) + , poseidon2_B_10_0(il[310]) + , poseidon2_B_10_1(il[311]) + , poseidon2_B_10_2(il[312]) + , poseidon2_B_10_3(il[313]) + , poseidon2_B_11_0(il[314]) + , poseidon2_B_11_1(il[315]) + , poseidon2_B_11_2(il[316]) + , poseidon2_B_11_3(il[317]) + , poseidon2_B_12_0(il[318]) + , poseidon2_B_12_1(il[319]) + , poseidon2_B_12_2(il[320]) + , poseidon2_B_12_3(il[321]) + , poseidon2_B_13_0(il[322]) + , poseidon2_B_13_1(il[323]) + , poseidon2_B_13_2(il[324]) + , poseidon2_B_13_3(il[325]) + , poseidon2_B_14_0(il[326]) + , poseidon2_B_14_1(il[327]) + , poseidon2_B_14_2(il[328]) + , poseidon2_B_14_3(il[329]) + , poseidon2_B_15_0(il[330]) + , poseidon2_B_15_1(il[331]) + , poseidon2_B_15_2(il[332]) + , poseidon2_B_15_3(il[333]) + , poseidon2_B_16_0(il[334]) + , poseidon2_B_16_1(il[335]) + , poseidon2_B_16_2(il[336]) + , poseidon2_B_16_3(il[337]) + , poseidon2_B_17_0(il[338]) + , poseidon2_B_17_1(il[339]) + , poseidon2_B_17_2(il[340]) + , poseidon2_B_17_3(il[341]) + , poseidon2_B_18_0(il[342]) + , poseidon2_B_18_1(il[343]) + , poseidon2_B_18_2(il[344]) + , poseidon2_B_18_3(il[345]) + , poseidon2_B_19_0(il[346]) + , poseidon2_B_19_1(il[347]) + , poseidon2_B_19_2(il[348]) + , poseidon2_B_19_3(il[349]) + , poseidon2_B_20_0(il[350]) + , poseidon2_B_20_1(il[351]) + , poseidon2_B_20_2(il[352]) + , poseidon2_B_20_3(il[353]) + , poseidon2_B_21_0(il[354]) + , poseidon2_B_21_1(il[355]) + , poseidon2_B_21_2(il[356]) + , poseidon2_B_21_3(il[357]) + , poseidon2_B_22_0(il[358]) + , poseidon2_B_22_1(il[359]) + , poseidon2_B_22_2(il[360]) + , poseidon2_B_22_3(il[361]) + , poseidon2_B_23_0(il[362]) + , poseidon2_B_23_1(il[363]) + , poseidon2_B_23_2(il[364]) + , poseidon2_B_23_3(il[365]) + , poseidon2_B_24_0(il[366]) + , poseidon2_B_24_1(il[367]) + , poseidon2_B_24_2(il[368]) + , poseidon2_B_24_3(il[369]) + , poseidon2_B_25_0(il[370]) + , poseidon2_B_25_1(il[371]) + , poseidon2_B_25_2(il[372]) + , poseidon2_B_25_3(il[373]) + , poseidon2_B_26_0(il[374]) + , poseidon2_B_26_1(il[375]) + , poseidon2_B_26_2(il[376]) + , poseidon2_B_26_3(il[377]) + , poseidon2_B_27_0(il[378]) + , poseidon2_B_27_1(il[379]) + , poseidon2_B_27_2(il[380]) + , poseidon2_B_27_3(il[381]) + , poseidon2_B_28_0(il[382]) + , poseidon2_B_28_1(il[383]) + , poseidon2_B_28_2(il[384]) + , poseidon2_B_28_3(il[385]) + , poseidon2_B_29_0(il[386]) + , poseidon2_B_29_1(il[387]) + , poseidon2_B_29_2(il[388]) + , poseidon2_B_29_3(il[389]) + , poseidon2_B_30_0(il[390]) + , poseidon2_B_30_1(il[391]) + , poseidon2_B_30_2(il[392]) + , poseidon2_B_30_3(il[393]) + , poseidon2_B_31_0(il[394]) + , poseidon2_B_31_1(il[395]) + , poseidon2_B_31_2(il[396]) + , poseidon2_B_31_3(il[397]) + , poseidon2_B_32_0(il[398]) + , poseidon2_B_32_1(il[399]) + , poseidon2_B_32_2(il[400]) + , poseidon2_B_32_3(il[401]) + , poseidon2_B_33_0(il[402]) + , poseidon2_B_33_1(il[403]) + , poseidon2_B_33_2(il[404]) + , poseidon2_B_33_3(il[405]) + , poseidon2_B_34_0(il[406]) + , poseidon2_B_34_1(il[407]) + , poseidon2_B_34_2(il[408]) + , poseidon2_B_34_3(il[409]) + , poseidon2_B_35_0(il[410]) + , poseidon2_B_35_1(il[411]) + , poseidon2_B_35_2(il[412]) + , poseidon2_B_35_3(il[413]) + , poseidon2_B_36_0(il[414]) + , poseidon2_B_36_1(il[415]) + , poseidon2_B_36_2(il[416]) + , poseidon2_B_36_3(il[417]) + , poseidon2_B_37_0(il[418]) + , poseidon2_B_37_1(il[419]) + , poseidon2_B_37_2(il[420]) + , poseidon2_B_37_3(il[421]) + , poseidon2_B_38_0(il[422]) + , poseidon2_B_38_1(il[423]) + , poseidon2_B_38_2(il[424]) + , poseidon2_B_38_3(il[425]) + , poseidon2_B_39_0(il[426]) + , poseidon2_B_39_1(il[427]) + , poseidon2_B_39_2(il[428]) + , poseidon2_B_39_3(il[429]) + , poseidon2_B_40_0(il[430]) + , poseidon2_B_40_1(il[431]) + , poseidon2_B_40_2(il[432]) + , poseidon2_B_40_3(il[433]) + , poseidon2_B_41_0(il[434]) + , poseidon2_B_41_1(il[435]) + , poseidon2_B_41_2(il[436]) + , poseidon2_B_41_3(il[437]) + , poseidon2_B_42_0(il[438]) + , poseidon2_B_42_1(il[439]) + , poseidon2_B_42_2(il[440]) + , poseidon2_B_42_3(il[441]) + , poseidon2_B_43_0(il[442]) + , poseidon2_B_43_1(il[443]) + , poseidon2_B_43_2(il[444]) + , poseidon2_B_43_3(il[445]) + , poseidon2_B_44_0(il[446]) + , poseidon2_B_44_1(il[447]) + , poseidon2_B_44_2(il[448]) + , poseidon2_B_44_3(il[449]) + , poseidon2_B_45_0(il[450]) + , poseidon2_B_45_1(il[451]) + , poseidon2_B_45_2(il[452]) + , poseidon2_B_45_3(il[453]) + , poseidon2_B_46_0(il[454]) + , poseidon2_B_46_1(il[455]) + , poseidon2_B_46_2(il[456]) + , poseidon2_B_46_3(il[457]) + , poseidon2_B_47_0(il[458]) + , poseidon2_B_47_1(il[459]) + , poseidon2_B_47_2(il[460]) + , poseidon2_B_47_3(il[461]) + , poseidon2_B_48_0(il[462]) + , poseidon2_B_48_1(il[463]) + , poseidon2_B_48_2(il[464]) + , poseidon2_B_48_3(il[465]) + , poseidon2_B_49_0(il[466]) + , poseidon2_B_49_1(il[467]) + , poseidon2_B_49_2(il[468]) + , poseidon2_B_49_3(il[469]) + , poseidon2_B_4_0(il[470]) + , poseidon2_B_4_1(il[471]) + , poseidon2_B_4_2(il[472]) + , poseidon2_B_4_3(il[473]) + , poseidon2_B_50_0(il[474]) + , poseidon2_B_50_1(il[475]) + , poseidon2_B_50_2(il[476]) + , poseidon2_B_50_3(il[477]) + , poseidon2_B_51_0(il[478]) + , poseidon2_B_51_1(il[479]) + , poseidon2_B_51_2(il[480]) + , poseidon2_B_51_3(il[481]) + , poseidon2_B_52_0(il[482]) + , poseidon2_B_52_1(il[483]) + , poseidon2_B_52_2(il[484]) + , poseidon2_B_52_3(il[485]) + , poseidon2_B_53_0(il[486]) + , poseidon2_B_53_1(il[487]) + , poseidon2_B_53_2(il[488]) + , poseidon2_B_53_3(il[489]) + , poseidon2_B_54_0(il[490]) + , poseidon2_B_54_1(il[491]) + , poseidon2_B_54_2(il[492]) + , poseidon2_B_54_3(il[493]) + , poseidon2_B_55_0(il[494]) + , poseidon2_B_55_1(il[495]) + , poseidon2_B_55_2(il[496]) + , poseidon2_B_55_3(il[497]) + , poseidon2_B_56_0(il[498]) + , poseidon2_B_56_1(il[499]) + , poseidon2_B_56_2(il[500]) + , poseidon2_B_56_3(il[501]) + , poseidon2_B_57_0(il[502]) + , poseidon2_B_57_1(il[503]) + , poseidon2_B_57_2(il[504]) + , poseidon2_B_57_3(il[505]) + , poseidon2_B_58_0(il[506]) + , poseidon2_B_58_1(il[507]) + , poseidon2_B_58_2(il[508]) + , poseidon2_B_58_3(il[509]) + , poseidon2_B_59_0(il[510]) + , poseidon2_B_59_1(il[511]) + , poseidon2_B_59_2(il[512]) + , poseidon2_B_59_3(il[513]) + , poseidon2_B_5_0(il[514]) + , poseidon2_B_5_1(il[515]) + , poseidon2_B_5_2(il[516]) + , poseidon2_B_5_3(il[517]) + , poseidon2_B_6_0(il[518]) + , poseidon2_B_6_1(il[519]) + , poseidon2_B_6_2(il[520]) + , poseidon2_B_6_3(il[521]) + , poseidon2_B_7_0(il[522]) + , poseidon2_B_7_1(il[523]) + , poseidon2_B_7_2(il[524]) + , poseidon2_B_7_3(il[525]) + , poseidon2_B_8_0(il[526]) + , poseidon2_B_8_1(il[527]) + , poseidon2_B_8_2(il[528]) + , poseidon2_B_8_3(il[529]) + , poseidon2_B_9_0(il[530]) + , poseidon2_B_9_1(il[531]) + , poseidon2_B_9_2(il[532]) + , poseidon2_B_9_3(il[533]) + , poseidon2_EXT_LAYER_4(il[534]) + , poseidon2_EXT_LAYER_5(il[535]) + , poseidon2_EXT_LAYER_6(il[536]) + , poseidon2_EXT_LAYER_7(il[537]) + , poseidon2_T_0_4(il[538]) + , poseidon2_T_0_5(il[539]) + , poseidon2_T_0_6(il[540]) + , poseidon2_T_0_7(il[541]) + , poseidon2_T_1_4(il[542]) + , poseidon2_T_1_5(il[543]) + , poseidon2_T_1_6(il[544]) + , poseidon2_T_1_7(il[545]) + , poseidon2_T_2_4(il[546]) + , poseidon2_T_2_5(il[547]) + , poseidon2_T_2_6(il[548]) + , poseidon2_T_2_7(il[549]) + , poseidon2_T_3_4(il[550]) + , poseidon2_T_3_5(il[551]) + , poseidon2_T_3_6(il[552]) + , poseidon2_T_3_7(il[553]) + , poseidon2_T_60_4(il[554]) + , poseidon2_T_60_5(il[555]) + , poseidon2_T_60_6(il[556]) + , poseidon2_T_60_7(il[557]) + , poseidon2_T_61_4(il[558]) + , poseidon2_T_61_5(il[559]) + , poseidon2_T_61_6(il[560]) + , poseidon2_T_61_7(il[561]) + , poseidon2_T_62_4(il[562]) + , poseidon2_T_62_5(il[563]) + , poseidon2_T_62_6(il[564]) + , poseidon2_T_62_7(il[565]) + , poseidon2_T_63_4(il[566]) + , poseidon2_T_63_5(il[567]) + , poseidon2_T_63_6(il[568]) + , poseidon2_T_63_7(il[569]) + , poseidon2_a_0(il[570]) + , poseidon2_a_1(il[571]) + , poseidon2_a_2(il[572]) + , poseidon2_a_3(il[573]) + , poseidon2_b_0(il[574]) + , poseidon2_b_1(il[575]) + , poseidon2_b_2(il[576]) + , poseidon2_b_3(il[577]) + , poseidon2_clk(il[578]) + , poseidon2_input_addr(il[579]) + , poseidon2_mem_addr_read_a(il[580]) + , poseidon2_mem_addr_read_b(il[581]) + , poseidon2_mem_addr_read_c(il[582]) + , poseidon2_mem_addr_read_d(il[583]) + , poseidon2_mem_addr_write_a(il[584]) + , poseidon2_mem_addr_write_b(il[585]) + , poseidon2_mem_addr_write_c(il[586]) + , poseidon2_mem_addr_write_d(il[587]) + , poseidon2_output_addr(il[588]) + , poseidon2_sel_poseidon_perm(il[589]) + , range_check_alu_rng_chk(il[590]) + , range_check_clk(il[591]) + , range_check_cmp_hi_bits_rng_chk(il[592]) + , range_check_cmp_lo_bits_rng_chk(il[593]) + , range_check_dyn_diff(il[594]) + , range_check_dyn_rng_chk_bits(il[595]) + , range_check_dyn_rng_chk_pow_2(il[596]) + , range_check_gas_da_rng_chk(il[597]) + , range_check_gas_l2_rng_chk(il[598]) + , range_check_is_lte_u112(il[599]) + , range_check_is_lte_u128(il[600]) + , range_check_is_lte_u16(il[601]) + , range_check_is_lte_u32(il[602]) + , range_check_is_lte_u48(il[603]) + , range_check_is_lte_u64(il[604]) + , range_check_is_lte_u80(il[605]) + , range_check_is_lte_u96(il[606]) + , range_check_mem_rng_chk(il[607]) + , range_check_rng_chk_bits(il[608]) + , range_check_sel_lookup_0(il[609]) + , range_check_sel_lookup_1(il[610]) + , range_check_sel_lookup_2(il[611]) + , range_check_sel_lookup_3(il[612]) + , range_check_sel_lookup_4(il[613]) + , range_check_sel_lookup_5(il[614]) + , range_check_sel_lookup_6(il[615]) + , range_check_sel_rng_chk(il[616]) + , range_check_u16_r0(il[617]) + , range_check_u16_r1(il[618]) + , range_check_u16_r2(il[619]) + , range_check_u16_r3(il[620]) + , range_check_u16_r4(il[621]) + , range_check_u16_r5(il[622]) + , range_check_u16_r6(il[623]) + , range_check_u16_r7(il[624]) + , range_check_value(il[625]) + , sha256_clk(il[626]) + , sha256_input(il[627]) + , sha256_output(il[628]) + , sha256_sel_sha256_compression(il[629]) + , sha256_state(il[630]) + , slice_addr(il[631]) + , slice_clk(il[632]) + , slice_cnt(il[633]) + , slice_col_offset(il[634]) + , slice_one_min_inv(il[635]) + , slice_sel_cd_cpy(il[636]) + , slice_sel_mem_active(il[637]) + , slice_sel_return(il[638]) + , slice_sel_start(il[639]) + , slice_space_id(il[640]) + , slice_val(il[641]) + , lookup_rng_chk_pow_2_counts(il[642]) + , lookup_rng_chk_diff_counts(il[643]) + , lookup_rng_chk_0_counts(il[644]) + , lookup_rng_chk_1_counts(il[645]) + , lookup_rng_chk_2_counts(il[646]) + , lookup_rng_chk_3_counts(il[647]) + , lookup_rng_chk_4_counts(il[648]) + , lookup_rng_chk_5_counts(il[649]) + , lookup_rng_chk_6_counts(il[650]) + , lookup_rng_chk_7_counts(il[651]) + , lookup_pow_2_0_counts(il[652]) + , lookup_pow_2_1_counts(il[653]) + , lookup_byte_lengths_counts(il[654]) + , lookup_byte_operations_counts(il[655]) + , lookup_opcode_gas_counts(il[656]) + , kernel_output_lookup_counts(il[657]) + , lookup_into_kernel_counts(il[658]) + , lookup_cd_value_counts(il[659]) + , lookup_ret_value_counts(il[660]) + , incl_main_tag_err_counts(il[661]) + , incl_mem_tag_err_counts(il[662]) + , perm_rng_mem_inv(il[663]) + , perm_rng_cmp_lo_inv(il[664]) + , perm_rng_cmp_hi_inv(il[665]) + , perm_rng_alu_inv(il[666]) + , perm_cmp_alu_inv(il[667]) + , perm_rng_gas_l2_inv(il[668]) + , perm_rng_gas_da_inv(il[669]) + , perm_pos_mem_read_a_inv(il[670]) + , perm_pos_mem_read_b_inv(il[671]) + , perm_pos_mem_read_c_inv(il[672]) + , perm_pos_mem_read_d_inv(il[673]) + , perm_pos_mem_write_a_inv(il[674]) + , perm_pos_mem_write_b_inv(il[675]) + , perm_pos_mem_write_c_inv(il[676]) + , perm_pos_mem_write_d_inv(il[677]) + , perm_slice_mem_inv(il[678]) + , perm_main_alu_inv(il[679]) + , perm_main_bin_inv(il[680]) + , perm_main_conv_inv(il[681]) + , perm_main_pos2_perm_inv(il[682]) + , perm_main_pedersen_inv(il[683]) + , perm_main_slice_inv(il[684]) + , perm_main_mem_a_inv(il[685]) + , perm_main_mem_b_inv(il[686]) + , perm_main_mem_c_inv(il[687]) + , perm_main_mem_d_inv(il[688]) + , perm_main_mem_ind_addr_a_inv(il[689]) + , perm_main_mem_ind_addr_b_inv(il[690]) + , perm_main_mem_ind_addr_c_inv(il[691]) + , perm_main_mem_ind_addr_d_inv(il[692]) + , lookup_rng_chk_pow_2_inv(il[693]) + , lookup_rng_chk_diff_inv(il[694]) + , lookup_rng_chk_0_inv(il[695]) + , lookup_rng_chk_1_inv(il[696]) + , lookup_rng_chk_2_inv(il[697]) + , lookup_rng_chk_3_inv(il[698]) + , lookup_rng_chk_4_inv(il[699]) + , lookup_rng_chk_5_inv(il[700]) + , lookup_rng_chk_6_inv(il[701]) + , lookup_rng_chk_7_inv(il[702]) + , lookup_pow_2_0_inv(il[703]) + , lookup_pow_2_1_inv(il[704]) + , lookup_byte_lengths_inv(il[705]) + , lookup_byte_operations_inv(il[706]) + , lookup_opcode_gas_inv(il[707]) + , kernel_output_lookup_inv(il[708]) + , lookup_into_kernel_inv(il[709]) + , lookup_cd_value_inv(il[710]) + , lookup_ret_value_inv(il[711]) + , incl_main_tag_err_inv(il[712]) + , incl_mem_tag_err_inv(il[713]) + , binary_acc_ia_shift(il[714]) + , binary_acc_ib_shift(il[715]) + , binary_acc_ic_shift(il[716]) + , binary_mem_tag_ctr_shift(il[717]) + , binary_op_id_shift(il[718]) + , cmp_a_hi_shift(il[719]) + , cmp_a_lo_shift(il[720]) + , cmp_b_hi_shift(il[721]) + , cmp_b_lo_shift(il[722]) + , cmp_cmp_rng_ctr_shift(il[723]) + , cmp_op_gt_shift(il[724]) + , cmp_p_sub_a_hi_shift(il[725]) + , cmp_p_sub_a_lo_shift(il[726]) + , cmp_p_sub_b_hi_shift(il[727]) + , cmp_p_sub_b_lo_shift(il[728]) + , cmp_sel_rng_chk_shift(il[729]) + , main_da_gas_remaining_shift(il[730]) + , main_emit_l2_to_l1_msg_write_offset_shift(il[731]) + , main_emit_note_hash_write_offset_shift(il[732]) + , main_emit_nullifier_write_offset_shift(il[733]) + , main_emit_unencrypted_log_write_offset_shift(il[734]) + , main_internal_return_ptr_shift(il[735]) + , main_l1_to_l2_msg_exists_write_offset_shift(il[736]) + , main_l2_gas_remaining_shift(il[737]) + , main_note_hash_exist_write_offset_shift(il[738]) + , main_nullifier_exists_write_offset_shift(il[739]) + , main_nullifier_non_exists_write_offset_shift(il[740]) + , main_pc_shift(il[741]) + , main_sel_execution_row_shift(il[742]) + , main_sload_write_offset_shift(il[743]) + , main_sstore_write_offset_shift(il[744]) + , mem_glob_addr_shift(il[745]) + , mem_rw_shift(il[746]) + , mem_sel_mem_shift(il[747]) + , mem_tag_shift(il[748]) + , mem_tsp_shift(il[749]) + , mem_val_shift(il[750]) + , slice_addr_shift(il[751]) + , slice_clk_shift(il[752]) + , slice_cnt_shift(il[753]) + , slice_col_offset_shift(il[754]) + , slice_sel_cd_cpy_shift(il[755]) + , slice_sel_mem_active_shift(il[756]) + , slice_sel_return_shift(il[757]) + , slice_sel_start_shift(il[758]) + , slice_space_id_shift(il[759]) {} AvmFlavor::ProverPolynomials::ProverPolynomials(ProvingKey& proving_key) @@ -853,10 +864,21 @@ AvmFlavor::AllConstRefValues AvmFlavor::ProverPolynomials::get_row(size_t row_id binary_op_id[row_idx], binary_sel_bin[row_idx], binary_start[row_idx], + bytecode_arifact_hash[row_idx], + bytecode_bytes[row_idx], + bytecode_bytes_pc[row_idx], + bytecode_class_id[row_idx], + bytecode_contract_address[row_idx], + bytecode_decomposed[row_idx], + bytecode_deployer_addr[row_idx], bytecode_end_latch[row_idx], + bytecode_initialization_hash[row_idx], bytecode_length_remaining[row_idx], bytecode_packed[row_idx], + bytecode_private_fn_root[row_idx], + bytecode_public_key_hash[row_idx], bytecode_running_hash[row_idx], + bytecode_salt[row_idx], cmp_a_hi[row_idx], cmp_a_lo[row_idx], cmp_b_hi[row_idx], @@ -1606,10 +1628,21 @@ AvmFlavor::CommitmentLabels::CommitmentLabels() Base::binary_op_id = "BINARY_OP_ID"; Base::binary_sel_bin = "BINARY_SEL_BIN"; Base::binary_start = "BINARY_START"; + Base::bytecode_arifact_hash = "BYTECODE_ARIFACT_HASH"; + Base::bytecode_bytes = "BYTECODE_BYTES"; + Base::bytecode_bytes_pc = "BYTECODE_BYTES_PC"; + Base::bytecode_class_id = "BYTECODE_CLASS_ID"; + Base::bytecode_contract_address = "BYTECODE_CONTRACT_ADDRESS"; + Base::bytecode_decomposed = "BYTECODE_DECOMPOSED"; + Base::bytecode_deployer_addr = "BYTECODE_DEPLOYER_ADDR"; Base::bytecode_end_latch = "BYTECODE_END_LATCH"; + Base::bytecode_initialization_hash = "BYTECODE_INITIALIZATION_HASH"; Base::bytecode_length_remaining = "BYTECODE_LENGTH_REMAINING"; Base::bytecode_packed = "BYTECODE_PACKED"; + Base::bytecode_private_fn_root = "BYTECODE_PRIVATE_FN_ROOT"; + Base::bytecode_public_key_hash = "BYTECODE_PUBLIC_KEY_HASH"; Base::bytecode_running_hash = "BYTECODE_RUNNING_HASH"; + Base::bytecode_salt = "BYTECODE_SALT"; Base::cmp_a_hi = "CMP_A_HI"; Base::cmp_a_lo = "CMP_A_LO"; Base::cmp_b_hi = "CMP_B_HI"; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp index 34f4c8b0771d..8d38e3003a4d 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp @@ -18,6 +18,7 @@ // Relations #include "barretenberg/vm/avm/generated/relations/alu.hpp" #include "barretenberg/vm/avm/generated/relations/binary.hpp" +#include "barretenberg/vm/avm/generated/relations/bytecode.hpp" #include "barretenberg/vm/avm/generated/relations/cmp.hpp" #include "barretenberg/vm/avm/generated/relations/conversion.hpp" #include "barretenberg/vm/avm/generated/relations/gas.hpp" @@ -90,7 +91,7 @@ template using tuple_cat_t = decltype(std::tuple_cat(std:: // The entities that will be used in the flavor. // clang-format off #define PRECOMPUTED_ENTITIES byte_lookup_sel_bin, byte_lookup_table_byte_lengths, byte_lookup_table_in_tags, byte_lookup_table_input_a, byte_lookup_table_input_b, byte_lookup_table_op_id, byte_lookup_table_output, gas_base_da_gas_fixed_table, gas_base_l2_gas_fixed_table, gas_dyn_da_gas_fixed_table, gas_dyn_l2_gas_fixed_table, gas_sel_gas_cost, main_clk, main_sel_first, main_zeroes, powers_power_of_2 -#define WIRE_ENTITIES main_kernel_inputs, main_kernel_value_out, main_kernel_side_effect_out, main_kernel_metadata_out, main_calldata, main_returndata, alu_a_hi, alu_a_lo, alu_b_hi, alu_b_lo, alu_b_pow, alu_c_hi, alu_c_lo, alu_cf, alu_clk, alu_cmp_gadget_gt, alu_cmp_gadget_input_a, alu_cmp_gadget_input_b, alu_cmp_gadget_result, alu_cmp_gadget_sel, alu_ff_tag, alu_ia, alu_ib, alu_ic, alu_in_tag, alu_max_bits_sub_b_bits, alu_max_bits_sub_b_pow, alu_op_add, alu_op_cast, alu_op_div, alu_op_eq, alu_op_lt, alu_op_lte, alu_op_mul, alu_op_not, alu_op_shl, alu_op_shr, alu_op_sub, alu_partial_prod_hi, alu_partial_prod_lo, alu_range_check_input_value, alu_range_check_num_bits, alu_range_check_sel, alu_remainder, alu_sel_alu, alu_sel_cmp, alu_sel_shift_which, alu_u128_tag, alu_u16_tag, alu_u1_tag, alu_u32_tag, alu_u64_tag, alu_u8_tag, alu_zero_shift, binary_acc_ia, binary_acc_ib, binary_acc_ic, binary_clk, binary_ia_bytes, binary_ib_bytes, binary_ic_bytes, binary_in_tag, binary_mem_tag_ctr, binary_mem_tag_ctr_inv, binary_op_id, binary_sel_bin, binary_start, bytecode_end_latch, bytecode_length_remaining, bytecode_packed, bytecode_running_hash, cmp_a_hi, cmp_a_lo, cmp_b_hi, cmp_b_lo, cmp_borrow, cmp_clk, cmp_cmp_rng_ctr, cmp_input_a, cmp_input_b, cmp_op_eq, cmp_op_eq_diff_inv, cmp_op_gt, cmp_p_a_borrow, cmp_p_b_borrow, cmp_p_sub_a_hi, cmp_p_sub_a_lo, cmp_p_sub_b_hi, cmp_p_sub_b_lo, cmp_range_chk_clk, cmp_res_hi, cmp_res_lo, cmp_result, cmp_sel_cmp, cmp_sel_rng_chk, cmp_shift_sel, conversion_clk, conversion_input, conversion_num_limbs, conversion_output_bits, conversion_radix, conversion_sel_to_radix_le, keccakf1600_clk, keccakf1600_input, keccakf1600_output, keccakf1600_sel_keccakf1600, main_abs_da_rem_gas, main_abs_l2_rem_gas, main_alu_in_tag, main_base_da_gas_op_cost, main_base_l2_gas_op_cost, main_bin_op_id, main_call_ptr, main_da_gas_remaining, main_da_out_of_gas, main_dyn_da_gas_op_cost, main_dyn_gas_multiplier, main_dyn_l2_gas_op_cost, main_emit_l2_to_l1_msg_write_offset, main_emit_note_hash_write_offset, main_emit_nullifier_write_offset, main_emit_unencrypted_log_write_offset, main_ia, main_ib, main_ic, main_id, main_id_zero, main_ind_addr_a, main_ind_addr_b, main_ind_addr_c, main_ind_addr_d, main_internal_return_ptr, main_inv, main_kernel_in_offset, main_kernel_out_offset, main_l1_to_l2_msg_exists_write_offset, main_l2_gas_remaining, main_l2_out_of_gas, main_mem_addr_a, main_mem_addr_b, main_mem_addr_c, main_mem_addr_d, main_note_hash_exist_write_offset, main_nullifier_exists_write_offset, main_nullifier_non_exists_write_offset, main_op_err, main_opcode_val, main_pc, main_r_in_tag, main_rwa, main_rwb, main_rwc, main_rwd, main_sel_alu, main_sel_bin, main_sel_calldata, main_sel_execution_row, main_sel_kernel_inputs, main_sel_kernel_out, main_sel_last, main_sel_mem_op_a, main_sel_mem_op_b, main_sel_mem_op_c, main_sel_mem_op_d, main_sel_mov_ia_to_ic, main_sel_mov_ib_to_ic, main_sel_op_add, main_sel_op_address, main_sel_op_and, main_sel_op_block_number, main_sel_op_calldata_copy, main_sel_op_cast, main_sel_op_chain_id, main_sel_op_cmov, main_sel_op_dagasleft, main_sel_op_div, main_sel_op_ecadd, main_sel_op_emit_l2_to_l1_msg, main_sel_op_emit_note_hash, main_sel_op_emit_nullifier, main_sel_op_emit_unencrypted_log, main_sel_op_eq, main_sel_op_external_call, main_sel_op_external_return, main_sel_op_external_revert, main_sel_op_fdiv, main_sel_op_fee_per_da_gas, main_sel_op_fee_per_l2_gas, main_sel_op_function_selector, main_sel_op_get_contract_instance, main_sel_op_internal_call, main_sel_op_internal_return, main_sel_op_is_static_call, main_sel_op_jump, main_sel_op_jumpi, main_sel_op_keccak, main_sel_op_l1_to_l2_msg_exists, main_sel_op_l2gasleft, main_sel_op_lt, main_sel_op_lte, main_sel_op_mov, main_sel_op_msm, main_sel_op_mul, main_sel_op_not, main_sel_op_note_hash_exists, main_sel_op_nullifier_exists, main_sel_op_or, main_sel_op_pedersen, main_sel_op_pedersen_commit, main_sel_op_poseidon2, main_sel_op_radix_le, main_sel_op_sender, main_sel_op_set, main_sel_op_sha256, main_sel_op_shl, main_sel_op_shr, main_sel_op_sload, main_sel_op_sstore, main_sel_op_static_call, main_sel_op_storage_address, main_sel_op_sub, main_sel_op_timestamp, main_sel_op_transaction_fee, main_sel_op_version, main_sel_op_xor, main_sel_q_kernel_lookup, main_sel_q_kernel_output_lookup, main_sel_resolve_ind_addr_a, main_sel_resolve_ind_addr_b, main_sel_resolve_ind_addr_c, main_sel_resolve_ind_addr_d, main_sel_returndata, main_sel_rng_16, main_sel_rng_8, main_sel_slice_gadget, main_side_effect_counter, main_sload_write_offset, main_space_id, main_sstore_write_offset, main_tag_err, main_w_in_tag, mem_addr, mem_clk, mem_diff, mem_glob_addr, mem_last, mem_lastAccess, mem_one_min_inv, mem_r_in_tag, mem_rw, mem_sel_mem, mem_sel_mov_ia_to_ic, mem_sel_mov_ib_to_ic, mem_sel_op_a, mem_sel_op_b, mem_sel_op_c, mem_sel_op_cmov, mem_sel_op_d, mem_sel_op_poseidon_read_a, mem_sel_op_poseidon_read_b, mem_sel_op_poseidon_read_c, mem_sel_op_poseidon_read_d, mem_sel_op_poseidon_write_a, mem_sel_op_poseidon_write_b, mem_sel_op_poseidon_write_c, mem_sel_op_poseidon_write_d, mem_sel_op_slice, mem_sel_resolve_ind_addr_a, mem_sel_resolve_ind_addr_b, mem_sel_resolve_ind_addr_c, mem_sel_resolve_ind_addr_d, mem_sel_rng_chk, mem_skip_check_tag, mem_space_id, mem_tag, mem_tag_err, mem_tsp, mem_val, mem_w_in_tag, pedersen_clk, pedersen_input, pedersen_output, pedersen_sel_pedersen, poseidon2_B_10_0, poseidon2_B_10_1, poseidon2_B_10_2, poseidon2_B_10_3, poseidon2_B_11_0, poseidon2_B_11_1, poseidon2_B_11_2, poseidon2_B_11_3, poseidon2_B_12_0, poseidon2_B_12_1, poseidon2_B_12_2, poseidon2_B_12_3, poseidon2_B_13_0, poseidon2_B_13_1, poseidon2_B_13_2, poseidon2_B_13_3, poseidon2_B_14_0, poseidon2_B_14_1, poseidon2_B_14_2, poseidon2_B_14_3, poseidon2_B_15_0, poseidon2_B_15_1, poseidon2_B_15_2, poseidon2_B_15_3, poseidon2_B_16_0, poseidon2_B_16_1, poseidon2_B_16_2, poseidon2_B_16_3, poseidon2_B_17_0, poseidon2_B_17_1, poseidon2_B_17_2, poseidon2_B_17_3, poseidon2_B_18_0, poseidon2_B_18_1, poseidon2_B_18_2, poseidon2_B_18_3, poseidon2_B_19_0, poseidon2_B_19_1, poseidon2_B_19_2, poseidon2_B_19_3, poseidon2_B_20_0, poseidon2_B_20_1, poseidon2_B_20_2, poseidon2_B_20_3, poseidon2_B_21_0, poseidon2_B_21_1, poseidon2_B_21_2, poseidon2_B_21_3, poseidon2_B_22_0, poseidon2_B_22_1, poseidon2_B_22_2, poseidon2_B_22_3, poseidon2_B_23_0, poseidon2_B_23_1, poseidon2_B_23_2, poseidon2_B_23_3, poseidon2_B_24_0, poseidon2_B_24_1, poseidon2_B_24_2, poseidon2_B_24_3, poseidon2_B_25_0, poseidon2_B_25_1, poseidon2_B_25_2, poseidon2_B_25_3, poseidon2_B_26_0, poseidon2_B_26_1, poseidon2_B_26_2, poseidon2_B_26_3, poseidon2_B_27_0, poseidon2_B_27_1, poseidon2_B_27_2, poseidon2_B_27_3, poseidon2_B_28_0, poseidon2_B_28_1, poseidon2_B_28_2, poseidon2_B_28_3, poseidon2_B_29_0, poseidon2_B_29_1, poseidon2_B_29_2, poseidon2_B_29_3, poseidon2_B_30_0, poseidon2_B_30_1, poseidon2_B_30_2, poseidon2_B_30_3, poseidon2_B_31_0, poseidon2_B_31_1, poseidon2_B_31_2, poseidon2_B_31_3, poseidon2_B_32_0, poseidon2_B_32_1, poseidon2_B_32_2, poseidon2_B_32_3, poseidon2_B_33_0, poseidon2_B_33_1, poseidon2_B_33_2, poseidon2_B_33_3, poseidon2_B_34_0, poseidon2_B_34_1, poseidon2_B_34_2, poseidon2_B_34_3, poseidon2_B_35_0, poseidon2_B_35_1, poseidon2_B_35_2, poseidon2_B_35_3, poseidon2_B_36_0, poseidon2_B_36_1, poseidon2_B_36_2, poseidon2_B_36_3, poseidon2_B_37_0, poseidon2_B_37_1, poseidon2_B_37_2, poseidon2_B_37_3, poseidon2_B_38_0, poseidon2_B_38_1, poseidon2_B_38_2, poseidon2_B_38_3, poseidon2_B_39_0, poseidon2_B_39_1, poseidon2_B_39_2, poseidon2_B_39_3, poseidon2_B_40_0, poseidon2_B_40_1, poseidon2_B_40_2, poseidon2_B_40_3, poseidon2_B_41_0, poseidon2_B_41_1, poseidon2_B_41_2, poseidon2_B_41_3, poseidon2_B_42_0, poseidon2_B_42_1, poseidon2_B_42_2, poseidon2_B_42_3, poseidon2_B_43_0, poseidon2_B_43_1, poseidon2_B_43_2, poseidon2_B_43_3, poseidon2_B_44_0, poseidon2_B_44_1, poseidon2_B_44_2, poseidon2_B_44_3, poseidon2_B_45_0, poseidon2_B_45_1, poseidon2_B_45_2, poseidon2_B_45_3, poseidon2_B_46_0, poseidon2_B_46_1, poseidon2_B_46_2, poseidon2_B_46_3, poseidon2_B_47_0, poseidon2_B_47_1, poseidon2_B_47_2, poseidon2_B_47_3, poseidon2_B_48_0, poseidon2_B_48_1, poseidon2_B_48_2, poseidon2_B_48_3, poseidon2_B_49_0, poseidon2_B_49_1, poseidon2_B_49_2, poseidon2_B_49_3, poseidon2_B_4_0, poseidon2_B_4_1, poseidon2_B_4_2, poseidon2_B_4_3, poseidon2_B_50_0, poseidon2_B_50_1, poseidon2_B_50_2, poseidon2_B_50_3, poseidon2_B_51_0, poseidon2_B_51_1, poseidon2_B_51_2, poseidon2_B_51_3, poseidon2_B_52_0, poseidon2_B_52_1, poseidon2_B_52_2, poseidon2_B_52_3, poseidon2_B_53_0, poseidon2_B_53_1, poseidon2_B_53_2, poseidon2_B_53_3, poseidon2_B_54_0, poseidon2_B_54_1, poseidon2_B_54_2, poseidon2_B_54_3, poseidon2_B_55_0, poseidon2_B_55_1, poseidon2_B_55_2, poseidon2_B_55_3, poseidon2_B_56_0, poseidon2_B_56_1, poseidon2_B_56_2, poseidon2_B_56_3, poseidon2_B_57_0, poseidon2_B_57_1, poseidon2_B_57_2, poseidon2_B_57_3, poseidon2_B_58_0, poseidon2_B_58_1, poseidon2_B_58_2, poseidon2_B_58_3, poseidon2_B_59_0, poseidon2_B_59_1, poseidon2_B_59_2, poseidon2_B_59_3, poseidon2_B_5_0, poseidon2_B_5_1, poseidon2_B_5_2, poseidon2_B_5_3, poseidon2_B_6_0, poseidon2_B_6_1, poseidon2_B_6_2, poseidon2_B_6_3, poseidon2_B_7_0, poseidon2_B_7_1, poseidon2_B_7_2, poseidon2_B_7_3, poseidon2_B_8_0, poseidon2_B_8_1, poseidon2_B_8_2, poseidon2_B_8_3, poseidon2_B_9_0, poseidon2_B_9_1, poseidon2_B_9_2, poseidon2_B_9_3, poseidon2_EXT_LAYER_4, poseidon2_EXT_LAYER_5, poseidon2_EXT_LAYER_6, poseidon2_EXT_LAYER_7, poseidon2_T_0_4, poseidon2_T_0_5, poseidon2_T_0_6, poseidon2_T_0_7, poseidon2_T_1_4, poseidon2_T_1_5, poseidon2_T_1_6, poseidon2_T_1_7, poseidon2_T_2_4, poseidon2_T_2_5, poseidon2_T_2_6, poseidon2_T_2_7, poseidon2_T_3_4, poseidon2_T_3_5, poseidon2_T_3_6, poseidon2_T_3_7, poseidon2_T_60_4, poseidon2_T_60_5, poseidon2_T_60_6, poseidon2_T_60_7, poseidon2_T_61_4, poseidon2_T_61_5, poseidon2_T_61_6, poseidon2_T_61_7, poseidon2_T_62_4, poseidon2_T_62_5, poseidon2_T_62_6, poseidon2_T_62_7, poseidon2_T_63_4, poseidon2_T_63_5, poseidon2_T_63_6, poseidon2_T_63_7, poseidon2_a_0, poseidon2_a_1, poseidon2_a_2, poseidon2_a_3, poseidon2_b_0, poseidon2_b_1, poseidon2_b_2, poseidon2_b_3, poseidon2_clk, poseidon2_input_addr, poseidon2_mem_addr_read_a, poseidon2_mem_addr_read_b, poseidon2_mem_addr_read_c, poseidon2_mem_addr_read_d, poseidon2_mem_addr_write_a, poseidon2_mem_addr_write_b, poseidon2_mem_addr_write_c, poseidon2_mem_addr_write_d, poseidon2_output_addr, poseidon2_sel_poseidon_perm, range_check_alu_rng_chk, range_check_clk, range_check_cmp_hi_bits_rng_chk, range_check_cmp_lo_bits_rng_chk, range_check_dyn_diff, range_check_dyn_rng_chk_bits, range_check_dyn_rng_chk_pow_2, range_check_gas_da_rng_chk, range_check_gas_l2_rng_chk, range_check_is_lte_u112, range_check_is_lte_u128, range_check_is_lte_u16, range_check_is_lte_u32, range_check_is_lte_u48, range_check_is_lte_u64, range_check_is_lte_u80, range_check_is_lte_u96, range_check_mem_rng_chk, range_check_rng_chk_bits, range_check_sel_lookup_0, range_check_sel_lookup_1, range_check_sel_lookup_2, range_check_sel_lookup_3, range_check_sel_lookup_4, range_check_sel_lookup_5, range_check_sel_lookup_6, range_check_sel_rng_chk, range_check_u16_r0, range_check_u16_r1, range_check_u16_r2, range_check_u16_r3, range_check_u16_r4, range_check_u16_r5, range_check_u16_r6, range_check_u16_r7, range_check_value, sha256_clk, sha256_input, sha256_output, sha256_sel_sha256_compression, sha256_state, slice_addr, slice_clk, slice_cnt, slice_col_offset, slice_one_min_inv, slice_sel_cd_cpy, slice_sel_mem_active, slice_sel_return, slice_sel_start, slice_space_id, slice_val, lookup_rng_chk_pow_2_counts, lookup_rng_chk_diff_counts, lookup_rng_chk_0_counts, lookup_rng_chk_1_counts, lookup_rng_chk_2_counts, lookup_rng_chk_3_counts, lookup_rng_chk_4_counts, lookup_rng_chk_5_counts, lookup_rng_chk_6_counts, lookup_rng_chk_7_counts, lookup_pow_2_0_counts, lookup_pow_2_1_counts, lookup_byte_lengths_counts, lookup_byte_operations_counts, lookup_opcode_gas_counts, kernel_output_lookup_counts, lookup_into_kernel_counts, lookup_cd_value_counts, lookup_ret_value_counts, incl_main_tag_err_counts, incl_mem_tag_err_counts +#define WIRE_ENTITIES main_kernel_inputs, main_kernel_value_out, main_kernel_side_effect_out, main_kernel_metadata_out, main_calldata, main_returndata, alu_a_hi, alu_a_lo, alu_b_hi, alu_b_lo, alu_b_pow, alu_c_hi, alu_c_lo, alu_cf, alu_clk, alu_cmp_gadget_gt, alu_cmp_gadget_input_a, alu_cmp_gadget_input_b, alu_cmp_gadget_result, alu_cmp_gadget_sel, alu_ff_tag, alu_ia, alu_ib, alu_ic, alu_in_tag, alu_max_bits_sub_b_bits, alu_max_bits_sub_b_pow, alu_op_add, alu_op_cast, alu_op_div, alu_op_eq, alu_op_lt, alu_op_lte, alu_op_mul, alu_op_not, alu_op_shl, alu_op_shr, alu_op_sub, alu_partial_prod_hi, alu_partial_prod_lo, alu_range_check_input_value, alu_range_check_num_bits, alu_range_check_sel, alu_remainder, alu_sel_alu, alu_sel_cmp, alu_sel_shift_which, alu_u128_tag, alu_u16_tag, alu_u1_tag, alu_u32_tag, alu_u64_tag, alu_u8_tag, alu_zero_shift, binary_acc_ia, binary_acc_ib, binary_acc_ic, binary_clk, binary_ia_bytes, binary_ib_bytes, binary_ic_bytes, binary_in_tag, binary_mem_tag_ctr, binary_mem_tag_ctr_inv, binary_op_id, binary_sel_bin, binary_start, bytecode_arifact_hash, bytecode_bytes, bytecode_bytes_pc, bytecode_class_id, bytecode_contract_address, bytecode_decomposed, bytecode_deployer_addr, bytecode_end_latch, bytecode_initialization_hash, bytecode_length_remaining, bytecode_packed, bytecode_private_fn_root, bytecode_public_key_hash, bytecode_running_hash, bytecode_salt, cmp_a_hi, cmp_a_lo, cmp_b_hi, cmp_b_lo, cmp_borrow, cmp_clk, cmp_cmp_rng_ctr, cmp_input_a, cmp_input_b, cmp_op_eq, cmp_op_eq_diff_inv, cmp_op_gt, cmp_p_a_borrow, cmp_p_b_borrow, cmp_p_sub_a_hi, cmp_p_sub_a_lo, cmp_p_sub_b_hi, cmp_p_sub_b_lo, cmp_range_chk_clk, cmp_res_hi, cmp_res_lo, cmp_result, cmp_sel_cmp, cmp_sel_rng_chk, cmp_shift_sel, conversion_clk, conversion_input, conversion_num_limbs, conversion_output_bits, conversion_radix, conversion_sel_to_radix_le, keccakf1600_clk, keccakf1600_input, keccakf1600_output, keccakf1600_sel_keccakf1600, main_abs_da_rem_gas, main_abs_l2_rem_gas, main_alu_in_tag, main_base_da_gas_op_cost, main_base_l2_gas_op_cost, main_bin_op_id, main_call_ptr, main_da_gas_remaining, main_da_out_of_gas, main_dyn_da_gas_op_cost, main_dyn_gas_multiplier, main_dyn_l2_gas_op_cost, main_emit_l2_to_l1_msg_write_offset, main_emit_note_hash_write_offset, main_emit_nullifier_write_offset, main_emit_unencrypted_log_write_offset, main_ia, main_ib, main_ic, main_id, main_id_zero, main_ind_addr_a, main_ind_addr_b, main_ind_addr_c, main_ind_addr_d, main_internal_return_ptr, main_inv, main_kernel_in_offset, main_kernel_out_offset, main_l1_to_l2_msg_exists_write_offset, main_l2_gas_remaining, main_l2_out_of_gas, main_mem_addr_a, main_mem_addr_b, main_mem_addr_c, main_mem_addr_d, main_note_hash_exist_write_offset, main_nullifier_exists_write_offset, main_nullifier_non_exists_write_offset, main_op_err, main_opcode_val, main_pc, main_r_in_tag, main_rwa, main_rwb, main_rwc, main_rwd, main_sel_alu, main_sel_bin, main_sel_calldata, main_sel_execution_row, main_sel_kernel_inputs, main_sel_kernel_out, main_sel_last, main_sel_mem_op_a, main_sel_mem_op_b, main_sel_mem_op_c, main_sel_mem_op_d, main_sel_mov_ia_to_ic, main_sel_mov_ib_to_ic, main_sel_op_add, main_sel_op_address, main_sel_op_and, main_sel_op_block_number, main_sel_op_calldata_copy, main_sel_op_cast, main_sel_op_chain_id, main_sel_op_cmov, main_sel_op_dagasleft, main_sel_op_div, main_sel_op_ecadd, main_sel_op_emit_l2_to_l1_msg, main_sel_op_emit_note_hash, main_sel_op_emit_nullifier, main_sel_op_emit_unencrypted_log, main_sel_op_eq, main_sel_op_external_call, main_sel_op_external_return, main_sel_op_external_revert, main_sel_op_fdiv, main_sel_op_fee_per_da_gas, main_sel_op_fee_per_l2_gas, main_sel_op_function_selector, main_sel_op_get_contract_instance, main_sel_op_internal_call, main_sel_op_internal_return, main_sel_op_is_static_call, main_sel_op_jump, main_sel_op_jumpi, main_sel_op_keccak, main_sel_op_l1_to_l2_msg_exists, main_sel_op_l2gasleft, main_sel_op_lt, main_sel_op_lte, main_sel_op_mov, main_sel_op_msm, main_sel_op_mul, main_sel_op_not, main_sel_op_note_hash_exists, main_sel_op_nullifier_exists, main_sel_op_or, main_sel_op_pedersen, main_sel_op_pedersen_commit, main_sel_op_poseidon2, main_sel_op_radix_le, main_sel_op_sender, main_sel_op_set, main_sel_op_sha256, main_sel_op_shl, main_sel_op_shr, main_sel_op_sload, main_sel_op_sstore, main_sel_op_static_call, main_sel_op_storage_address, main_sel_op_sub, main_sel_op_timestamp, main_sel_op_transaction_fee, main_sel_op_version, main_sel_op_xor, main_sel_q_kernel_lookup, main_sel_q_kernel_output_lookup, main_sel_resolve_ind_addr_a, main_sel_resolve_ind_addr_b, main_sel_resolve_ind_addr_c, main_sel_resolve_ind_addr_d, main_sel_returndata, main_sel_rng_16, main_sel_rng_8, main_sel_slice_gadget, main_side_effect_counter, main_sload_write_offset, main_space_id, main_sstore_write_offset, main_tag_err, main_w_in_tag, mem_addr, mem_clk, mem_diff, mem_glob_addr, mem_last, mem_lastAccess, mem_one_min_inv, mem_r_in_tag, mem_rw, mem_sel_mem, mem_sel_mov_ia_to_ic, mem_sel_mov_ib_to_ic, mem_sel_op_a, mem_sel_op_b, mem_sel_op_c, mem_sel_op_cmov, mem_sel_op_d, mem_sel_op_poseidon_read_a, mem_sel_op_poseidon_read_b, mem_sel_op_poseidon_read_c, mem_sel_op_poseidon_read_d, mem_sel_op_poseidon_write_a, mem_sel_op_poseidon_write_b, mem_sel_op_poseidon_write_c, mem_sel_op_poseidon_write_d, mem_sel_op_slice, mem_sel_resolve_ind_addr_a, mem_sel_resolve_ind_addr_b, mem_sel_resolve_ind_addr_c, mem_sel_resolve_ind_addr_d, mem_sel_rng_chk, mem_skip_check_tag, mem_space_id, mem_tag, mem_tag_err, mem_tsp, mem_val, mem_w_in_tag, pedersen_clk, pedersen_input, pedersen_output, pedersen_sel_pedersen, poseidon2_B_10_0, poseidon2_B_10_1, poseidon2_B_10_2, poseidon2_B_10_3, poseidon2_B_11_0, poseidon2_B_11_1, poseidon2_B_11_2, poseidon2_B_11_3, poseidon2_B_12_0, poseidon2_B_12_1, poseidon2_B_12_2, poseidon2_B_12_3, poseidon2_B_13_0, poseidon2_B_13_1, poseidon2_B_13_2, poseidon2_B_13_3, poseidon2_B_14_0, poseidon2_B_14_1, poseidon2_B_14_2, poseidon2_B_14_3, poseidon2_B_15_0, poseidon2_B_15_1, poseidon2_B_15_2, poseidon2_B_15_3, poseidon2_B_16_0, poseidon2_B_16_1, poseidon2_B_16_2, poseidon2_B_16_3, poseidon2_B_17_0, poseidon2_B_17_1, poseidon2_B_17_2, poseidon2_B_17_3, poseidon2_B_18_0, poseidon2_B_18_1, poseidon2_B_18_2, poseidon2_B_18_3, poseidon2_B_19_0, poseidon2_B_19_1, poseidon2_B_19_2, poseidon2_B_19_3, poseidon2_B_20_0, poseidon2_B_20_1, poseidon2_B_20_2, poseidon2_B_20_3, poseidon2_B_21_0, poseidon2_B_21_1, poseidon2_B_21_2, poseidon2_B_21_3, poseidon2_B_22_0, poseidon2_B_22_1, poseidon2_B_22_2, poseidon2_B_22_3, poseidon2_B_23_0, poseidon2_B_23_1, poseidon2_B_23_2, poseidon2_B_23_3, poseidon2_B_24_0, poseidon2_B_24_1, poseidon2_B_24_2, poseidon2_B_24_3, poseidon2_B_25_0, poseidon2_B_25_1, poseidon2_B_25_2, poseidon2_B_25_3, poseidon2_B_26_0, poseidon2_B_26_1, poseidon2_B_26_2, poseidon2_B_26_3, poseidon2_B_27_0, poseidon2_B_27_1, poseidon2_B_27_2, poseidon2_B_27_3, poseidon2_B_28_0, poseidon2_B_28_1, poseidon2_B_28_2, poseidon2_B_28_3, poseidon2_B_29_0, poseidon2_B_29_1, poseidon2_B_29_2, poseidon2_B_29_3, poseidon2_B_30_0, poseidon2_B_30_1, poseidon2_B_30_2, poseidon2_B_30_3, poseidon2_B_31_0, poseidon2_B_31_1, poseidon2_B_31_2, poseidon2_B_31_3, poseidon2_B_32_0, poseidon2_B_32_1, poseidon2_B_32_2, poseidon2_B_32_3, poseidon2_B_33_0, poseidon2_B_33_1, poseidon2_B_33_2, poseidon2_B_33_3, poseidon2_B_34_0, poseidon2_B_34_1, poseidon2_B_34_2, poseidon2_B_34_3, poseidon2_B_35_0, poseidon2_B_35_1, poseidon2_B_35_2, poseidon2_B_35_3, poseidon2_B_36_0, poseidon2_B_36_1, poseidon2_B_36_2, poseidon2_B_36_3, poseidon2_B_37_0, poseidon2_B_37_1, poseidon2_B_37_2, poseidon2_B_37_3, poseidon2_B_38_0, poseidon2_B_38_1, poseidon2_B_38_2, poseidon2_B_38_3, poseidon2_B_39_0, poseidon2_B_39_1, poseidon2_B_39_2, poseidon2_B_39_3, poseidon2_B_40_0, poseidon2_B_40_1, poseidon2_B_40_2, poseidon2_B_40_3, poseidon2_B_41_0, poseidon2_B_41_1, poseidon2_B_41_2, poseidon2_B_41_3, poseidon2_B_42_0, poseidon2_B_42_1, poseidon2_B_42_2, poseidon2_B_42_3, poseidon2_B_43_0, poseidon2_B_43_1, poseidon2_B_43_2, poseidon2_B_43_3, poseidon2_B_44_0, poseidon2_B_44_1, poseidon2_B_44_2, poseidon2_B_44_3, poseidon2_B_45_0, poseidon2_B_45_1, poseidon2_B_45_2, poseidon2_B_45_3, poseidon2_B_46_0, poseidon2_B_46_1, poseidon2_B_46_2, poseidon2_B_46_3, poseidon2_B_47_0, poseidon2_B_47_1, poseidon2_B_47_2, poseidon2_B_47_3, poseidon2_B_48_0, poseidon2_B_48_1, poseidon2_B_48_2, poseidon2_B_48_3, poseidon2_B_49_0, poseidon2_B_49_1, poseidon2_B_49_2, poseidon2_B_49_3, poseidon2_B_4_0, poseidon2_B_4_1, poseidon2_B_4_2, poseidon2_B_4_3, poseidon2_B_50_0, poseidon2_B_50_1, poseidon2_B_50_2, poseidon2_B_50_3, poseidon2_B_51_0, poseidon2_B_51_1, poseidon2_B_51_2, poseidon2_B_51_3, poseidon2_B_52_0, poseidon2_B_52_1, poseidon2_B_52_2, poseidon2_B_52_3, poseidon2_B_53_0, poseidon2_B_53_1, poseidon2_B_53_2, poseidon2_B_53_3, poseidon2_B_54_0, poseidon2_B_54_1, poseidon2_B_54_2, poseidon2_B_54_3, poseidon2_B_55_0, poseidon2_B_55_1, poseidon2_B_55_2, poseidon2_B_55_3, poseidon2_B_56_0, poseidon2_B_56_1, poseidon2_B_56_2, poseidon2_B_56_3, poseidon2_B_57_0, poseidon2_B_57_1, poseidon2_B_57_2, poseidon2_B_57_3, poseidon2_B_58_0, poseidon2_B_58_1, poseidon2_B_58_2, poseidon2_B_58_3, poseidon2_B_59_0, poseidon2_B_59_1, poseidon2_B_59_2, poseidon2_B_59_3, poseidon2_B_5_0, poseidon2_B_5_1, poseidon2_B_5_2, poseidon2_B_5_3, poseidon2_B_6_0, poseidon2_B_6_1, poseidon2_B_6_2, poseidon2_B_6_3, poseidon2_B_7_0, poseidon2_B_7_1, poseidon2_B_7_2, poseidon2_B_7_3, poseidon2_B_8_0, poseidon2_B_8_1, poseidon2_B_8_2, poseidon2_B_8_3, poseidon2_B_9_0, poseidon2_B_9_1, poseidon2_B_9_2, poseidon2_B_9_3, poseidon2_EXT_LAYER_4, poseidon2_EXT_LAYER_5, poseidon2_EXT_LAYER_6, poseidon2_EXT_LAYER_7, poseidon2_T_0_4, poseidon2_T_0_5, poseidon2_T_0_6, poseidon2_T_0_7, poseidon2_T_1_4, poseidon2_T_1_5, poseidon2_T_1_6, poseidon2_T_1_7, poseidon2_T_2_4, poseidon2_T_2_5, poseidon2_T_2_6, poseidon2_T_2_7, poseidon2_T_3_4, poseidon2_T_3_5, poseidon2_T_3_6, poseidon2_T_3_7, poseidon2_T_60_4, poseidon2_T_60_5, poseidon2_T_60_6, poseidon2_T_60_7, poseidon2_T_61_4, poseidon2_T_61_5, poseidon2_T_61_6, poseidon2_T_61_7, poseidon2_T_62_4, poseidon2_T_62_5, poseidon2_T_62_6, poseidon2_T_62_7, poseidon2_T_63_4, poseidon2_T_63_5, poseidon2_T_63_6, poseidon2_T_63_7, poseidon2_a_0, poseidon2_a_1, poseidon2_a_2, poseidon2_a_3, poseidon2_b_0, poseidon2_b_1, poseidon2_b_2, poseidon2_b_3, poseidon2_clk, poseidon2_input_addr, poseidon2_mem_addr_read_a, poseidon2_mem_addr_read_b, poseidon2_mem_addr_read_c, poseidon2_mem_addr_read_d, poseidon2_mem_addr_write_a, poseidon2_mem_addr_write_b, poseidon2_mem_addr_write_c, poseidon2_mem_addr_write_d, poseidon2_output_addr, poseidon2_sel_poseidon_perm, range_check_alu_rng_chk, range_check_clk, range_check_cmp_hi_bits_rng_chk, range_check_cmp_lo_bits_rng_chk, range_check_dyn_diff, range_check_dyn_rng_chk_bits, range_check_dyn_rng_chk_pow_2, range_check_gas_da_rng_chk, range_check_gas_l2_rng_chk, range_check_is_lte_u112, range_check_is_lte_u128, range_check_is_lte_u16, range_check_is_lte_u32, range_check_is_lte_u48, range_check_is_lte_u64, range_check_is_lte_u80, range_check_is_lte_u96, range_check_mem_rng_chk, range_check_rng_chk_bits, range_check_sel_lookup_0, range_check_sel_lookup_1, range_check_sel_lookup_2, range_check_sel_lookup_3, range_check_sel_lookup_4, range_check_sel_lookup_5, range_check_sel_lookup_6, range_check_sel_rng_chk, range_check_u16_r0, range_check_u16_r1, range_check_u16_r2, range_check_u16_r3, range_check_u16_r4, range_check_u16_r5, range_check_u16_r6, range_check_u16_r7, range_check_value, sha256_clk, sha256_input, sha256_output, sha256_sel_sha256_compression, sha256_state, slice_addr, slice_clk, slice_cnt, slice_col_offset, slice_one_min_inv, slice_sel_cd_cpy, slice_sel_mem_active, slice_sel_return, slice_sel_start, slice_space_id, slice_val, lookup_rng_chk_pow_2_counts, lookup_rng_chk_diff_counts, lookup_rng_chk_0_counts, lookup_rng_chk_1_counts, lookup_rng_chk_2_counts, lookup_rng_chk_3_counts, lookup_rng_chk_4_counts, lookup_rng_chk_5_counts, lookup_rng_chk_6_counts, lookup_rng_chk_7_counts, lookup_pow_2_0_counts, lookup_pow_2_1_counts, lookup_byte_lengths_counts, lookup_byte_operations_counts, lookup_opcode_gas_counts, kernel_output_lookup_counts, lookup_into_kernel_counts, lookup_cd_value_counts, lookup_ret_value_counts, incl_main_tag_err_counts, incl_mem_tag_err_counts #define DERIVED_WITNESS_ENTITIES perm_rng_mem_inv, perm_rng_cmp_lo_inv, perm_rng_cmp_hi_inv, perm_rng_alu_inv, perm_cmp_alu_inv, perm_rng_gas_l2_inv, perm_rng_gas_da_inv, perm_pos_mem_read_a_inv, perm_pos_mem_read_b_inv, perm_pos_mem_read_c_inv, perm_pos_mem_read_d_inv, perm_pos_mem_write_a_inv, perm_pos_mem_write_b_inv, perm_pos_mem_write_c_inv, perm_pos_mem_write_d_inv, perm_slice_mem_inv, perm_main_alu_inv, perm_main_bin_inv, perm_main_conv_inv, perm_main_pos2_perm_inv, perm_main_pedersen_inv, perm_main_slice_inv, perm_main_mem_a_inv, perm_main_mem_b_inv, perm_main_mem_c_inv, perm_main_mem_d_inv, perm_main_mem_ind_addr_a_inv, perm_main_mem_ind_addr_b_inv, perm_main_mem_ind_addr_c_inv, perm_main_mem_ind_addr_d_inv, lookup_rng_chk_pow_2_inv, lookup_rng_chk_diff_inv, lookup_rng_chk_0_inv, lookup_rng_chk_1_inv, lookup_rng_chk_2_inv, lookup_rng_chk_3_inv, lookup_rng_chk_4_inv, lookup_rng_chk_5_inv, lookup_rng_chk_6_inv, lookup_rng_chk_7_inv, lookup_pow_2_0_inv, lookup_pow_2_1_inv, lookup_byte_lengths_inv, lookup_byte_operations_inv, lookup_opcode_gas_inv, kernel_output_lookup_inv, lookup_into_kernel_inv, lookup_cd_value_inv, lookup_ret_value_inv, incl_main_tag_err_inv, incl_mem_tag_err_inv #define SHIFTED_ENTITIES binary_acc_ia_shift, binary_acc_ib_shift, binary_acc_ic_shift, binary_mem_tag_ctr_shift, binary_op_id_shift, cmp_a_hi_shift, cmp_a_lo_shift, cmp_b_hi_shift, cmp_b_lo_shift, cmp_cmp_rng_ctr_shift, cmp_op_gt_shift, cmp_p_sub_a_hi_shift, cmp_p_sub_a_lo_shift, cmp_p_sub_b_hi_shift, cmp_p_sub_b_lo_shift, cmp_sel_rng_chk_shift, main_da_gas_remaining_shift, main_emit_l2_to_l1_msg_write_offset_shift, main_emit_note_hash_write_offset_shift, main_emit_nullifier_write_offset_shift, main_emit_unencrypted_log_write_offset_shift, main_internal_return_ptr_shift, main_l1_to_l2_msg_exists_write_offset_shift, main_l2_gas_remaining_shift, main_note_hash_exist_write_offset_shift, main_nullifier_exists_write_offset_shift, main_nullifier_non_exists_write_offset_shift, main_pc_shift, main_sel_execution_row_shift, main_sload_write_offset_shift, main_sstore_write_offset_shift, mem_glob_addr_shift, mem_rw_shift, mem_sel_mem_shift, mem_tag_shift, mem_tsp_shift, mem_val_shift, slice_addr_shift, slice_clk_shift, slice_cnt_shift, slice_col_offset_shift, slice_sel_cd_cpy_shift, slice_sel_mem_active_shift, slice_sel_return_shift, slice_sel_start_shift, slice_space_id_shift #define TO_BE_SHIFTED(e) e.binary_acc_ia, e.binary_acc_ib, e.binary_acc_ic, e.binary_mem_tag_ctr, e.binary_op_id, e.cmp_a_hi, e.cmp_a_lo, e.cmp_b_hi, e.cmp_b_lo, e.cmp_cmp_rng_ctr, e.cmp_op_gt, e.cmp_p_sub_a_hi, e.cmp_p_sub_a_lo, e.cmp_p_sub_b_hi, e.cmp_p_sub_b_lo, e.cmp_sel_rng_chk, e.main_da_gas_remaining, e.main_emit_l2_to_l1_msg_write_offset, e.main_emit_note_hash_write_offset, e.main_emit_nullifier_write_offset, e.main_emit_unencrypted_log_write_offset, e.main_internal_return_ptr, e.main_l1_to_l2_msg_exists_write_offset, e.main_l2_gas_remaining, e.main_note_hash_exist_write_offset, e.main_nullifier_exists_write_offset, e.main_nullifier_non_exists_write_offset, e.main_pc, e.main_sel_execution_row, e.main_sload_write_offset, e.main_sstore_write_offset, e.mem_glob_addr, e.mem_rw, e.mem_sel_mem, e.mem_tag, e.mem_tsp, e.mem_val, e.slice_addr, e.slice_clk, e.slice_cnt, e.slice_col_offset, e.slice_sel_cd_cpy, e.slice_sel_mem_active, e.slice_sel_return, e.slice_sel_start, e.slice_space_id @@ -119,12 +120,12 @@ class AvmFlavor { static constexpr bool HasZK = false; static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 16; - static constexpr size_t NUM_WITNESS_ENTITIES = 687; + static constexpr size_t NUM_WITNESS_ENTITIES = 698; static constexpr size_t NUM_SHIFTED_ENTITIES = 46; static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES; // We have two copies of the witness entities, so we subtract the number of fixed ones (they have no shift), one for // the unshifted and one for the shifted - static constexpr size_t NUM_ALL_ENTITIES = 749; + static constexpr size_t NUM_ALL_ENTITIES = 760; // The total number of witnesses including shifts and derived entities. static constexpr size_t NUM_ALL_WITNESS_ENTITIES = NUM_WITNESS_ENTITIES + NUM_SHIFTED_ENTITIES; @@ -134,6 +135,7 @@ class AvmFlavor { // Relations Avm_vm::alu, Avm_vm::binary, + Avm_vm::bytecode, Avm_vm::cmp, Avm_vm::conversion, Avm_vm::gas, diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp index 033f4fc19610..3c8f0d86b56f 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp @@ -102,10 +102,21 @@ template std::vector AvmFullRow::names() "binary_op_id", "binary_sel_bin", "binary_start", + "bytecode_arifact_hash", + "bytecode_bytes", + "bytecode_bytes_pc", + "bytecode_class_id", + "bytecode_contract_address", + "bytecode_decomposed", + "bytecode_deployer_addr", "bytecode_end_latch", + "bytecode_initialization_hash", "bytecode_length_remaining", "bytecode_packed", + "bytecode_private_fn_root", + "bytecode_public_key_hash", "bytecode_running_hash", + "bytecode_salt", "cmp_a_hi", "cmp_a_lo", "cmp_b_hi", @@ -810,10 +821,21 @@ template RefVector AvmFullRow::as_vector() const binary_op_id, binary_sel_bin, binary_start, + bytecode_arifact_hash, + bytecode_bytes, + bytecode_bytes_pc, + bytecode_class_id, + bytecode_contract_address, + bytecode_decomposed, + bytecode_deployer_addr, bytecode_end_latch, + bytecode_initialization_hash, bytecode_length_remaining, bytecode_packed, + bytecode_private_fn_root, + bytecode_public_key_hash, bytecode_running_hash, + bytecode_salt, cmp_a_hi, cmp_a_lo, cmp_b_hi, diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp index a0e1513ff67b..1a1946877b06 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp @@ -93,10 +93,21 @@ template struct AvmFullRow { FF binary_op_id{}; FF binary_sel_bin{}; FF binary_start{}; + FF bytecode_arifact_hash{}; + FF bytecode_bytes{}; + FF bytecode_bytes_pc{}; + FF bytecode_class_id{}; + FF bytecode_contract_address{}; + FF bytecode_decomposed{}; + FF bytecode_deployer_addr{}; FF bytecode_end_latch{}; + FF bytecode_initialization_hash{}; FF bytecode_length_remaining{}; FF bytecode_packed{}; + FF bytecode_private_fn_root{}; + FF bytecode_public_key_hash{}; FF bytecode_running_hash{}; + FF bytecode_salt{}; FF cmp_a_hi{}; FF cmp_a_lo{}; FF cmp_b_hi{}; @@ -717,7 +728,7 @@ template struct AvmFullRow { RefVector as_vector() const; static std::vector names(); - static constexpr size_t SIZE = 703; + static constexpr size_t SIZE = 714; }; template std::ostream& operator<<(std::ostream& os, AvmFullRow const& row); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp new file mode 100644 index 000000000000..0180f977d248 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp @@ -0,0 +1,42 @@ +// AUTOGENERATED FILE +#pragma once + +#include "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_types.hpp" + +namespace bb::Avm_vm { + +template class bytecodeImpl { + public: + using FF = FF_; + + static constexpr std::array SUBRELATION_PARTIAL_LENGTHS = { 3 }; + + template + void static accumulate(ContainerOverSubrelations& evals, + const AllEntities& new_term, + [[maybe_unused]] const RelationParameters&, + [[maybe_unused]] const FF& scaling_factor) + { + + { + using Accumulator = typename std::tuple_element_t<0, ContainerOverSubrelations>; + auto tmp = (new_term.bytecode_end_latch * (FF(1) - new_term.bytecode_end_latch)); + tmp *= scaling_factor; + std::get<0>(evals) += typename Accumulator::View(tmp); + } + } +}; + +template class bytecode : public Relation> { + public: + static constexpr const char* NAME = "bytecode"; + + static std::string get_subrelation_label(size_t index) + { + switch (index) {} + return std::to_string(index); + } +}; + +} // namespace bb::Avm_vm \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.cpp index 9fc743010ded..197a94f51c5c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.cpp @@ -3,10 +3,35 @@ #include "barretenberg/crypto/poseidon2/poseidon2_params.hpp" namespace bb::avm_trace { + +// These separators can be added to the constants file, but it's a bit finicky since there are the GENERATOR_INDEX ones +// We can migrate these once they are finalised as part of contract address derivation +const FF PARTIAL_ADDRESS = 27; +const FF CONTRACT_ADDRESS_V1 = 15; +const FF CONTRACT_LEAF = 16; + using poseidon2 = crypto::Poseidon2; -AvmBytecodeTraceBuilder::AvmBytecodeTraceBuilder(const std::vector& all_contracts_bytecode) - : all_contracts_bytecode(all_contracts_bytecode) -{} + +/************************************************************************************************** + * HELPERS + **************************************************************************************************/ +FF AvmBytecodeTraceBuilder::compute_address_from_instance(ContractInstanceHint contract_instance) +{ + FF salted_initialization_hash = poseidon2::hash({ PARTIAL_ADDRESS, + contract_instance.salt, + contract_instance.initialisation_hash, + contract_instance.deployer_addr }); + FF partial_address = + poseidon2::hash({ PARTIAL_ADDRESS, contract_instance.contract_class_id, salted_initialization_hash }); + return poseidon2::hash({ CONTRACT_ADDRESS_V1, contract_instance.public_key_hash, partial_address }); +} + +FF AvmBytecodeTraceBuilder::compute_contract_class_id(FF artifact_hash, + FF private_fn_root, + FF public_bytecode_commitment) +{ + return poseidon2::hash({ CONTRACT_LEAF, artifact_hash, private_fn_root, public_bytecode_commitment }); +} std::vector AvmBytecodeTraceBuilder::pack_bytecode(const std::vector& contract_bytes) { @@ -26,7 +51,26 @@ std::vector AvmBytecodeTraceBuilder::pack_bytecode(const std::vector(0), + [](size_t acc, auto& contract) { return acc + contract.bytecode.size(); }); +} + +/************************************************************************************************** + * CONSTRUCTOR + **************************************************************************************************/ +AvmBytecodeTraceBuilder::AvmBytecodeTraceBuilder(const std::vector& all_contracts_bytecode) + : all_contracts_bytecode(all_contracts_bytecode) +{} + +/************************************************************************************************** + * BUILD BYTECODE TRACE + **************************************************************************************************/ + +void AvmBytecodeTraceBuilder::build_bytecode_hash_columns() { // This is the main loop that will generate the bytecode trace for (auto& contract_bytecode : all_contracts_bytecode) { @@ -34,7 +78,7 @@ void AvmBytecodeTraceBuilder::build_bytecode_columns() auto packed_bytecode = pack_bytecode(contract_bytecode.bytecode); // This size is already based on the number of fields for (size_t i = 0; i < packed_bytecode.size(); ++i) { - bytecode_trace.push_back(BytecodeTraceEntry{ + bytecode_hash_trace.push_back(BytecodeHashTraceEntry{ .packed_bytecode = packed_bytecode[i], .running_hash = running_hash, .bytecode_length_remaining = static_cast(packed_bytecode.size() - i), @@ -42,25 +86,44 @@ void AvmBytecodeTraceBuilder::build_bytecode_columns() running_hash = poseidon2::hash({ packed_bytecode[i], running_hash }); } // Now running_hash actually contains the bytecode hash - BytecodeTraceEntry last_entry; - last_entry.running_hash = running_hash; + BytecodeHashTraceEntry last_entry; last_entry.bytecode_length_remaining = 0; - // TODO: Come back to this later - // last_entry.class_id = _ - // last_entry.contract_address = _ + last_entry.running_hash = running_hash; + ASSERT(running_hash == contract_bytecode.contract_class_id_preimage.public_bytecode_commitment); + + last_entry.class_id = compute_contract_class_id(contract_bytecode.contract_class_id_preimage.artifact_hash, + contract_bytecode.contract_class_id_preimage.private_fn_root, + running_hash); + ASSERT(last_entry.class_id == contract_bytecode.contract_instance.contract_class_id); + + last_entry.contract_address = compute_address_from_instance(contract_bytecode.contract_instance); + ASSERT(last_entry.contract_address == contract_bytecode.contract_instance.address); } } void AvmBytecodeTraceBuilder::finalize(std::vector>& main_trace) { - for (size_t i = 0; i < bytecode_trace.size(); i++) { - auto const& src = bytecode_trace.at(i); + for (size_t i = 0; i < bytecode_hash_trace.size(); i++) { + auto const& src = bytecode_hash_trace.at(i); auto& dest = main_trace.at(i); dest.bytecode_running_hash = src.running_hash; dest.bytecode_length_remaining = src.bytecode_length_remaining; dest.bytecode_packed = src.packed_bytecode; dest.bytecode_end_latch = src.bytecode_length_remaining == 0 ? FF::one() : FF::zero(); } + + // We should probably combine this step with the previous one + size_t row_index = 0; + for (auto& bytecode : all_contracts_bytecode) { + // Reset the byte index for each contract + uint32_t byte_index = 0; + for (auto& byte : bytecode.bytecode) { + main_trace.at(row_index).bytecode_bytes = byte; + main_trace.at(row_index).bytecode_bytes_pc = byte_index; + } + // The row index will match up with the clk + row_index += bytecode.bytecode.size(); + } } } // namespace bb::avm_trace diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.hpp index aab3d6d6a7f6..2088bc959176 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/bytecode_trace.hpp @@ -8,7 +8,11 @@ namespace bb::avm_trace { class AvmBytecodeTraceBuilder { public: - struct BytecodeTraceEntry { + struct BytecodeByteTraceEntry { + FF bytecode_byte{}; + // In future selectors the aid in packing and decomposing + }; + struct BytecodeHashTraceEntry { // The field packed bytecode FF packed_bytecode{}; // Calculate the bytecode hash @@ -17,29 +21,35 @@ class AvmBytecodeTraceBuilder { uint16_t bytecode_length_remaining = 0; // Derive the class Id + FF arifact_hash{}; + FF private_fn_root{}; FF class_id{}; // Derive the contract address + FF salt{}; + FF initialization_hash{}; + FF deployer_addr{}; + FF public_key_hash{}; FF contract_address{}; }; // These interfaces will change when we start feeding in more inputs and hints AvmBytecodeTraceBuilder(const std::vector& all_contracts_bytecode); - size_t size() const { return bytecode_trace.size(); } + size_t size() const { return bytecode_hash_trace.size(); } + size_t total_bytecode_length() const; void reset(); void finalize(std::vector>& main_trace); - void build_bytecode_columns(); + void build_bytecode_hash_columns(); private: + static FF compute_contract_class_id(FF artifact_hash, FF private_fn_root, FF public_bytecode_commitment); + static FF compute_address_from_instance(ContractInstanceHint contract_instance); // Converts the bytecode into field elements (chunks of 31 bytes) static std::vector pack_bytecode(const std::vector& contract_bytes); - std::vector bytecode_trace; + std::vector bytecode_hash_trace; // The first element is the main top-level contract, the rest are external calls std::vector all_contracts_bytecode; - // TODO: Come back to this - // VmPublicInputs public_inputs; - // ExecutionHints hints; }; } // namespace bb::avm_trace diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp index 3cabca0baf40..c93093aee696 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp @@ -277,18 +277,18 @@ std::vector Execution::gen_trace(std::vector const& calldata, !public_inputs_vec.empty() ? static_cast(public_inputs_vec[PCPI_START_SIDE_EFFECT_COUNTER_OFFSET]) : 0; - // This address is the top-level contract address - vinfo("Length of all contract bytecode: ", execution_hints.all_contract_bytecode.size()); - - FF contract_address = std::get<0>(public_inputs)[ADDRESS_SELECTOR]; - vinfo("Top level contract address: ", contract_address); + // Re-enable this one we have the address used as part of the public inputs + // FF contract_address = std::get<0>(public_inputs)[ADDRESS_SELECTOR]; + // vinfo("Top level contract address: ", contract_address); // We use it to extract the bytecode we need to execute - std::vector bytecode = - std::find_if(execution_hints.all_contract_bytecode.begin(), - execution_hints.all_contract_bytecode.end(), - [&](auto& contract) { return contract.contract_instance.address == contract_address; }) - ->bytecode; - + // std::vector bytecode = + // std::find_if(execution_hints.all_contract_bytecode.begin(), + // execution_hints.all_contract_bytecode.end(), + // [&](auto& contract) { return contract.contract_instance.address == contract_address; }) + // ->bytecode; + + // For now we just take the first element in the list + std::vector bytecode = execution_hints.all_contract_bytecode.at(0).bytecode; std::vector instructions = Deserialization::parse(bytecode); vinfo("Deserialized " + std::to_string(instructions.size()) + " instructions"); AvmTraceBuilder trace_builder = diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution_hints.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution_hints.hpp index 1ea58dde7601..837b8420f71a 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution_hints.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution_hints.hpp @@ -67,8 +67,8 @@ inline void read(uint8_t const*& it, ContractInstanceHint& hint) struct AvmContractBytecode { std::vector bytecode; - ContractInstanceHint contract_instance; - ContractClassIdHint contract_class_id_preimage; + ContractInstanceHint contract_instance{}; + ContractClassIdHint contract_class_id_preimage{}; AvmContractBytecode() = default; AvmContractBytecode(std::vector bytecode, diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp index e244189c3513..43e07b2a7f70 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp @@ -286,7 +286,7 @@ AvmTraceBuilder::AvmTraceBuilder(VmPublicInputs public_inputs, , side_effect_counter(side_effect_counter) , execution_hints(std::move(execution_hints_)) , kernel_trace_builder(side_effect_counter, public_inputs, execution_hints) - , bytecode_trace_builder(execution_hints_.all_contract_bytecode) + , bytecode_trace_builder(execution_hints.all_contract_bytecode) { // TODO: think about cast gas_trace_builder.set_initial_gas( @@ -2572,7 +2572,9 @@ void AvmTraceBuilder::op_emit_unencrypted_log(uint8_t indirect, auto [resolved_log_offset, resolved_log_size_offset] = unpack_indirects<2>(indirect, { log_offset, log_size_offset }); - FF contract_address = std::get<0>(kernel_trace_builder.public_inputs)[ADDRESS_SELECTOR]; + // This is a hack to get the contract address from the first contract instance + // Once we have 1-enqueued call and proper nested contexts, this should use that address of the current contextt + FF contract_address = execution_hints.all_contract_bytecode.at(0).contract_instance.address; std::vector contract_address_bytes = contract_address.to_buffer(); // Unencrypted logs are hashed with sha256 and truncated to 31 bytes - and then padded back to 32 bytes @@ -3884,10 +3886,10 @@ std::vector AvmTraceBuilder::finalize() * BYTECODE TRACE INCLUSION **********************************************************************************************/ - bytecode_trace_builder.build_bytecode_columns(); + bytecode_trace_builder.build_bytecode_hash_columns(); // Should not have to resize in the future, but for now we do - if (bytecode_trace_builder.size() > main_trace_size) { - main_trace_size = bytecode_trace_builder.size(); + if (bytecode_trace_builder.total_bytecode_length() > main_trace_size) { + main_trace_size = bytecode_trace_builder.total_bytecode_length(); main_trace.resize(main_trace_size); } bytecode_trace_builder.finalize(main_trace); diff --git a/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp b/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp index dff16c66a41a..cb55959d632a 100644 --- a/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp @@ -35,7 +35,7 @@ #define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 691 #define PUBLIC_CONTEXT_INPUTS_LENGTH 42 #define AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS 66 -#define AVM_PROOF_LENGTH_IN_FIELDS 3842 +#define AVM_PROOF_LENGTH_IN_FIELDS 3897 #define AVM_PUBLIC_COLUMN_MAX_SIZE 1024 #define AVM_PUBLIC_INPUTS_FLATTENED_SIZE 2739 #define MEM_TAG_U1 1 diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr index 9614e98e2f21..5f0909b29be1 100644 --- a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr +++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr @@ -327,7 +327,7 @@ global AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS: u32 = 2 + 16 * 4; // `AVM_PROOF_LENGTH_IN_FIELDS` must be updated when AVM circuit changes. // To determine latest value, hover `COMPUTED_AVM_PROOF_LENGTH_IN_FIELDS` // in barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp -global AVM_PROOF_LENGTH_IN_FIELDS: u32 = 3842; +global AVM_PROOF_LENGTH_IN_FIELDS: u32 = 3897; global AVM_PUBLIC_COLUMN_MAX_SIZE : u32 = 1024; global AVM_PUBLIC_INPUTS_FLATTENED_SIZE : u32 = 2 * AVM_PUBLIC_COLUMN_MAX_SIZE + PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH; /** diff --git a/yarn-project/bb-prover/src/avm_proving.test.ts b/yarn-project/bb-prover/src/avm_proving.test.ts index 9bb536cc81eb..77579fa1abeb 100644 --- a/yarn-project/bb-prover/src/avm_proving.test.ts +++ b/yarn-project/bb-prover/src/avm_proving.test.ts @@ -1,18 +1,18 @@ import { AvmCircuitInputs, AvmVerificationKeyData, FunctionSelector, Gas, GlobalVariables } from '@aztec/circuits.js'; -import { makeContractClassPublic } from '@aztec/circuits.js/testing'; +import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { AvmSimulator, PublicSideEffectTrace, type WorldStateDB } from '@aztec/simulator'; import { getAvmTestContractBytecode, + getAvmTestContractFunctionSelector, initContext, initExecutionEnvironment, initPersistableStateManager, resolveAvmTestContractAssertionMessage, } from '@aztec/simulator/avm/fixtures'; -import { SerializableContractInstance } from '@aztec/types/contracts'; +import { type PublicFunction, SerializableContractInstance } from '@aztec/types/contracts'; -import { jest } from '@jest/globals'; import { mock } from 'jest-mock-extended'; import fs from 'node:fs/promises'; import { tmpdir } from 'node:os'; @@ -56,30 +56,55 @@ const proveAndVerifyAvmTestContract = async ( const functionSelector = FunctionSelector.random(); const globals = GlobalVariables.empty(); globals.timestamp = TIMESTAMP; - const environment = initExecutionEnvironment({ functionSelector, calldata, globals }); const worldStateDB = mock(); - const contractInstance = new SerializableContractInstance({ + // Top level contract call + const bytecode = getAvmTestContractBytecode(functionName); + const fnSelector = getAvmTestContractFunctionSelector(functionName); + const publicFn: PublicFunction = { bytecode, selector: fnSelector }; + const contractClass = makeContractClassPublic(0, publicFn); + const contractInstance = makeContractInstanceFromClassId(contractClass.id); + + const nestedCallBytecode = getAvmTestContractBytecode('add_args_return'); + const nestedCallFnSelector = getAvmTestContractFunctionSelector('add_args_return'); + const nestedCallPublicFn: PublicFunction = { bytecode: nestedCallBytecode, selector: nestedCallFnSelector }; + const nestedCallContractClass = makeContractClassPublic(0, nestedCallPublicFn); + const nestedCallContractInstance = makeContractInstanceFromClassId(nestedCallContractClass.id); + + const instanceGet = new SerializableContractInstance({ version: 1, salt: new Fr(0x123), deployer: new Fr(0x456), contractClassId: new Fr(0x789), initializationHash: new Fr(0x101112), publicKeysHash: new Fr(0x161718), - }).withAddress(environment.address); - worldStateDB.getContractInstance.mockResolvedValue(Promise.resolve(contractInstance)); + }).withAddress(contractInstance.address); - const contractClass = makeContractClassPublic(); - worldStateDB.getContractClass.mockResolvedValue(Promise.resolve(contractClass)); + worldStateDB.getContractInstance + .mockResolvedValueOnce(contractInstance) + .mockResolvedValueOnce(instanceGet) + .mockResolvedValueOnce(nestedCallContractInstance) + .mockResolvedValueOnce(nestedCallContractInstance); + worldStateDB.getContractClass.mockResolvedValueOnce(contractClass).mockResolvedValue(nestedCallContractClass); const storageValue = new Fr(5); worldStateDB.storageRead.mockResolvedValue(Promise.resolve(storageValue)); const trace = new PublicSideEffectTrace(startSideEffectCounter); const persistableState = initPersistableStateManager({ worldStateDB, trace }); + const environment = initExecutionEnvironment({ + functionSelector, + calldata, + globals, + address: contractInstance.address, + storageAddress: contractInstance.address, + }); const context = initContext({ env: environment, persistableState }); - const bytecode = getAvmTestContractBytecode(functionName); - jest.spyOn(worldStateDB, 'getBytecode').mockResolvedValue(bytecode); + + worldStateDB.getBytecode + .mockResolvedValueOnce(bytecode) + .mockResolvedValue(nestedCallBytecode) + .mockResolvedValue(nestedCallBytecode); const startGas = new Gas(context.machineState.gasLeft.daGas, context.machineState.gasLeft.l2Gas); diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts index b333503fe48a..fc4d7349ed88 100644 --- a/yarn-project/circuits.js/src/constants.gen.ts +++ b/yarn-project/circuits.js/src/constants.gen.ts @@ -215,7 +215,7 @@ export const NESTED_RECURSIVE_PROOF_LENGTH = 439; export const TUBE_PROOF_LENGTH = 439; export const VERIFICATION_KEY_LENGTH_IN_FIELDS = 128; export const AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS = 66; -export const AVM_PROOF_LENGTH_IN_FIELDS = 3842; +export const AVM_PROOF_LENGTH_IN_FIELDS = 3897; export const AVM_PUBLIC_COLUMN_MAX_SIZE = 1024; export const AVM_PUBLIC_INPUTS_FLATTENED_SIZE = 2739; export const MEM_TAG_U1 = 1; diff --git a/yarn-project/circuits.js/src/tests/factories.ts b/yarn-project/circuits.js/src/tests/factories.ts index f5794b5c1784..2e7c90e355e6 100644 --- a/yarn-project/circuits.js/src/tests/factories.ts +++ b/yarn-project/circuits.js/src/tests/factories.ts @@ -2,13 +2,16 @@ import { type FieldsOf, makeHalfFullTuple, makeTuple } from '@aztec/foundation/a import { AztecAddress } from '@aztec/foundation/aztec-address'; import { toBufferBE } from '@aztec/foundation/bigint-buffer'; import { compact } from '@aztec/foundation/collection'; +import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto'; import { EthAddress } from '@aztec/foundation/eth-address'; import { type Bufferable } from '@aztec/foundation/serialize'; import { type ContractClassPublic, + type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type PrivateFunction, type PublicFunction, + SerializableContractInstance, type UnconstrainedFunctionWithMembershipProof, } from '@aztec/types/contracts'; @@ -34,6 +37,7 @@ import { Fr, FunctionData, FunctionSelector, + GeneratorIndex, GrumpkinScalar, KeyValidationRequest, KeyValidationRequestAndGenerator, @@ -135,6 +139,7 @@ import { VerificationKey, VerificationKeyAsFields, VerificationKeyData, + computeAddress, computeContractClassId, computePublicBytecodeCommitment, makeRecursiveProof, @@ -1359,12 +1364,12 @@ export function makeUnconstrainedFunctionWithMembershipProof(seed = 0): Unconstr }; } -export function makeContractClassPublic(seed = 0): ContractClassPublic { +export function makeContractClassPublic(seed = 0, publicFunction?: PublicFunction): ContractClassPublic { const artifactHash = fr(seed + 1); - const publicFunctions = makeTuple(3, makeContractClassPublicFunction, seed + 2); + const publicFunctions = publicFunction ? [publicFunction] : makeTuple(1, makeContractClassPublicFunction, seed + 2); const privateFunctionsRoot = fr(seed + 3); const packedBytecode = packBytecode(publicFunctions); - const publicBytecodeCommitment = computePublicBytecodeCommitment(packedBytecode); + const publicBytecodeCommitment = computePublicBytecodeCommitment(publicFunction!.bytecode); const id = computeContractClassId({ artifactHash, privateFunctionsRoot, publicBytecodeCommitment }); return { id, @@ -1425,12 +1430,48 @@ export function makeAvmExternalCallHint(seed = 0): AvmExternalCallHint { ); } +export function makeContractInstanceFromClassId(classId: Fr, seed = 0): ContractInstanceWithAddress { + const salt = new Fr(seed); + const initializationHash = new Fr(seed + 1); + const deployer = new Fr(seed + 2); + const publicKeysHash = new Fr(seed + 3); + + const saltedInitializationHash = poseidon2HashWithSeparator( + [salt, initializationHash, deployer], + GeneratorIndex.PARTIAL_ADDRESS, + ); + const partialAddress = poseidon2HashWithSeparator( + [classId, saltedInitializationHash], + GeneratorIndex.PARTIAL_ADDRESS, + ); + const address = computeAddress(publicKeysHash, partialAddress); + return new SerializableContractInstance({ + version: 1, + salt, + deployer, + contractClassId: classId, + initializationHash, + publicKeysHash, + }).withAddress(address); +} + export function makeAvmBytecodeHints(seed = 0): AvmContractBytecodeHints { - const instance = makeAvmContractInstanceHint(seed); - const { artifactHash, privateFunctionsRoot, packedBytecode } = makeContractClassPublic(seed); + const { artifactHash, privateFunctionsRoot, packedBytecode, id } = makeContractClassPublic(seed); + const instance = makeContractInstanceFromClassId(id, seed + 0x1000); + + const avmHintInstance = new AvmContractInstanceHint( + instance.address, + true, + instance.salt, + instance.deployer, + instance.contractClassId, + instance.initializationHash, + instance.publicKeysHash, + ); + const publicBytecodeCommitment = computePublicBytecodeCommitment(packedBytecode); - return new AvmContractBytecodeHints(packedBytecode, instance, { + return new AvmContractBytecodeHints(packedBytecode, avmHintInstance, { artifactHash, privateFunctionsRoot, publicBytecodeCommitment, diff --git a/yarn-project/ivc-integration/src/avm_integration.test.ts b/yarn-project/ivc-integration/src/avm_integration.test.ts index 80c2f1227839..60d2cf1bbf6a 100644 --- a/yarn-project/ivc-integration/src/avm_integration.test.ts +++ b/yarn-project/ivc-integration/src/avm_integration.test.ts @@ -14,7 +14,7 @@ import { AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS, PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH, } from '@aztec/circuits.js/constants'; -import { makeContractClassPublic } from '@aztec/circuits.js/testing'; +import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing'; import { Fr } from '@aztec/foundation/fields'; import { createDebugLogger } from '@aztec/foundation/log'; import { BufferReader } from '@aztec/foundation/serialize'; @@ -22,12 +22,13 @@ import { type FixedLengthArray } from '@aztec/noir-protocol-circuits-types/types import { AvmSimulator, PublicSideEffectTrace, type WorldStateDB } from '@aztec/simulator'; import { getAvmTestContractBytecode, + getAvmTestContractFunctionSelector, initContext, initExecutionEnvironment, initPersistableStateManager, resolveAvmTestContractAssertionMessage, } from '@aztec/simulator/avm/fixtures'; -import { SerializableContractInstance } from '@aztec/types/contracts'; +import { PublicFunction, SerializableContractInstance } from '@aztec/types/contracts'; import { jest } from '@jest/globals'; import fs from 'fs/promises'; @@ -151,29 +152,54 @@ const proveAvmTestContract = async ( const startSideEffectCounter = 0; const functionSelector = FunctionSelector.random(); const globals = GlobalVariables.empty(); - const environment = initExecutionEnvironment({ functionSelector, calldata, globals }); - const contractInstance = new SerializableContractInstance({ + // Top level contract call + const bytecode = getAvmTestContractBytecode(functionName); + const fnSelector = getAvmTestContractFunctionSelector(functionName); + const publicFn: PublicFunction = { bytecode, selector: fnSelector }; + const contractClass = makeContractClassPublic(0, publicFn); + const contractInstance = makeContractInstanceFromClassId(contractClass.id); + + const nestedCallBytecode = getAvmTestContractBytecode('add_args_return'); + const nestedCallFnSelector = getAvmTestContractFunctionSelector('add_args_return'); + const nestedCallPublicFn: PublicFunction = { bytecode: nestedCallBytecode, selector: nestedCallFnSelector }; + const nestedCallContractClass = makeContractClassPublic(0, nestedCallPublicFn); + const nestedCallContractInstance = makeContractInstanceFromClassId(nestedCallContractClass.id); + + const instanceGet = new SerializableContractInstance({ version: 1, salt: new Fr(0x123), deployer: new Fr(0x456), contractClassId: new Fr(0x789), initializationHash: new Fr(0x101112), publicKeysHash: new Fr(0x161718), - }).withAddress(environment.address); - worldStateDB.getContractInstance.mockResolvedValue(contractInstance); + }).withAddress(contractInstance.address); - const contractClass = makeContractClassPublic(); - worldStateDB.getContractClass.mockResolvedValue(contractClass); + worldStateDB.getContractInstance + .mockResolvedValueOnce(contractInstance) + .mockResolvedValueOnce(instanceGet) + .mockResolvedValueOnce(nestedCallContractInstance) + .mockResolvedValueOnce(nestedCallContractInstance); + worldStateDB.getContractClass.mockResolvedValueOnce(contractClass).mockResolvedValue(nestedCallContractClass); const storageValue = new Fr(5); worldStateDB.storageRead.mockResolvedValue(storageValue); const trace = new PublicSideEffectTrace(startSideEffectCounter); const persistableState = initPersistableStateManager({ worldStateDB, trace }); + const environment = initExecutionEnvironment({ + functionSelector, + calldata, + globals, + address: contractInstance.address, + storageAddress: contractInstance.address, + }); const context = initContext({ env: environment, persistableState }); - const bytecode = getAvmTestContractBytecode(functionName); - jest.spyOn(worldStateDB, 'getBytecode').mockResolvedValue(bytecode); + + worldStateDB.getBytecode + .mockResolvedValueOnce(bytecode) + .mockResolvedValue(nestedCallBytecode) + .mockResolvedValue(nestedCallBytecode); const startGas = new Gas(context.machineState.gasLeft.daGas, context.machineState.gasLeft.l2Gas); diff --git a/yarn-project/simulator/src/avm/fixtures/index.ts b/yarn-project/simulator/src/avm/fixtures/index.ts index 9d8e2183322d..393395c8e028 100644 --- a/yarn-project/simulator/src/avm/fixtures/index.ts +++ b/yarn-project/simulator/src/avm/fixtures/index.ts @@ -120,6 +120,13 @@ export function randomMemoryFields(length: number): Field[] { return [...Array(length)].map(_ => new Field(Fr.random())); } +export function getAvmTestContractFunctionSelector(functionName: string): FunctionSelector { + const artifact = AvmTestContractArtifact.functions.find(f => f.name === functionName)!; + assert(!!artifact, `Function ${functionName} not found in AvmTestContractArtifact`); + const params = artifact.parameters; + return FunctionSelector.fromNameAndParameters(artifact.name, params); +} + export function getAvmTestContractBytecode(functionName: string): Buffer { const artifact = AvmTestContractArtifact.functions.find(f => f.name === functionName)!; assert( diff --git a/yarn-project/simulator/src/avm/journal/journal.ts b/yarn-project/simulator/src/avm/journal/journal.ts index 5f81a3a1ceaa..bd2007f3d1b3 100644 --- a/yarn-project/simulator/src/avm/journal/journal.ts +++ b/yarn-project/simulator/src/avm/journal/journal.ts @@ -269,7 +269,10 @@ export class AvmPersistableStateManager { const contractClassPreimage = { artifactHash: contractClass.artifactHash, privateFunctionsRoot: contractClass.privateFunctionsRoot, - publicBytecodeCommitment: computePublicBytecodeCommitment(contractClass.packedBytecode), + // This commitment includes the function selector - ideally we dont want to include that + // so we just hash the bytecode for now. N.B there is a disconnect between packedBytecode and the commitment + // publicBytecodeCommitment: computePublicBytecodeCommitment(contractClass.packedBytecode), + publicBytecodeCommitment: computePublicBytecodeCommitment(bytecode ?? Buffer.alloc(1)), }; this.trace.traceGetBytecode(bytecode!, { exists, ...contractInstance }, contractClassPreimage); @@ -294,7 +297,7 @@ export class AvmPersistableStateManager { (await this.worldStateDB.getDebugFunctionName(nestedEnvironment.address, nestedEnvironment.functionSelector)) ?? `${nestedEnvironment.address}:${nestedEnvironment.functionSelector}`; - this.log.verbose(`[AVM] Calling nested function ${functionName}`); + this.log.debug(`[AVM] Calling nested function ${functionName}`); this.trace.traceNestedCall( nestedState.trace, diff --git a/yarn-project/simulator/src/public/side_effect_trace.ts b/yarn-project/simulator/src/public/side_effect_trace.ts index 395df55a1f00..b02377da2c8f 100644 --- a/yarn-project/simulator/src/public/side_effect_trace.ts +++ b/yarn-project/simulator/src/public/side_effect_trace.ts @@ -91,26 +91,20 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface { contractInstance: TracedContractInstance, contractClass: ContractClassIdPreimage, ) { - // Deduplicate - we might want a map here to make this more efficient - const idx = this.avmCircuitHints.contractBytecodeHints.items.findIndex( - hint => hint.contractInstanceHint.address === contractInstance.address, + const instance = new AvmContractInstanceHint( + contractInstance.address, + contractInstance.exists, + contractInstance.salt, + contractInstance.deployer, + contractInstance.contractClassId, + contractInstance.initializationHash, + contractInstance.publicKeysHash, ); - // If this is the first time we have seen the contract instance, add it to the hints - if (idx === -1) { - const instance = new AvmContractInstanceHint( - contractInstance.address, - contractInstance.exists, - contractInstance.salt, - contractInstance.deployer, - contractInstance.contractClassId, - contractInstance.initializationHash, - contractInstance.publicKeysHash, - ); - this.avmCircuitHints.contractBytecodeHints.items.push( - new AvmContractBytecodeHints(bytecode, instance, contractClass), - ); - this.logger.debug(`Traced New Contract Bytecode deployed at ${contractInstance.address}`); - } + // We need to deduplicate the contract instances based on addresses + this.avmCircuitHints.contractBytecodeHints.items.push( + new AvmContractBytecodeHints(bytecode, instance, contractClass), + ); + this.logger.debug(`New contract instance execution traced: ${contractInstance.address} added`); } public tracePublicStorageRead(storageAddress: Fr, slot: Fr, value: Fr, _exists: boolean, _cached: boolean) { @@ -271,6 +265,8 @@ export class PublicSideEffectTrace implements PublicSideEffectTraceInterface { this.sideEffectCounter = result.endSideEffectCounter.toNumber(); // when a nested call returns, caller accepts its updated counter this.allUnencryptedLogs.push(...result.allUnencryptedLogs.logs); + // ARGHHH IS THIS NECESSARY? --- this is bad for performance + // this.avmCircuitHints.contractBytecodeHints.items.push(...result.avmCircuitHints.contractBytecodeHints.items); // NOTE: eventually if the AVM circuit processes an entire enqueued call, // this function will accept all of the nested's side effects into this instance this.nestedExecutions.push(result);