chore(avm): remove function selector type of getenv opcode (#10406)

Resolves #9396
AztecProtocol · Dec 6, 2024 · 38c0c14 · 38c0c14
1 parent 38941bf
commit 38c0c14
Show file tree

Hide file tree

Showing 32 changed files with 2,061 additions and 1,863 deletions.
diff --git a/avm-transpiler/src/transpile.rs b/avm-transpiler/src/transpile.rs
@@ -786,7 +786,6 @@ fn handle_getter_instruction(
     enum EnvironmentVariable {
         ADDRESS,
         SENDER,
-        FUNCTIONSELECTOR,
         TRANSACTIONFEE,
         CHAINID,
         VERSION,
@@ -821,7 +820,6 @@ fn handle_getter_instruction(
         "avmOpcodeTimestamp" => EnvironmentVariable::TIMESTAMP,
         "avmOpcodeL2GasLeft" => EnvironmentVariable::L2GASLEFT,
         "avmOpcodeDaGasLeft" => EnvironmentVariable::DAGASLEFT,
-        "avmOpcodeFunctionSelector" => EnvironmentVariable::FUNCTIONSELECTOR,
         "avmOpcodeIsStaticCall" => EnvironmentVariable::ISSTATICCALL,
         _ => panic!("Transpiler doesn't know how to process getter {:?}", function),
     };

diff --git a/barretenberg/cpp/pil/avm/constants_gen.pil b/barretenberg/cpp/pil/avm/constants_gen.pil
@@ -21,7 +21,6 @@ namespace constants(256);
     pol MEM_TAG_U128 = 6;
     pol SENDER_KERNEL_INPUTS_COL_OFFSET = 0;
     pol ADDRESS_KERNEL_INPUTS_COL_OFFSET = 1;
-    pol FUNCTION_SELECTOR_KERNEL_INPUTS_COL_OFFSET = 2;
     pol IS_STATIC_CALL_KERNEL_INPUTS_COL_OFFSET = 3;
     pol CHAIN_ID_KERNEL_INPUTS_COL_OFFSET = 4;
     pol VERSION_KERNEL_INPUTS_COL_OFFSET = 5;

diff --git a/barretenberg/cpp/pil/avm/kernel.pil b/barretenberg/cpp/pil/avm/kernel.pil
@@ -95,9 +95,6 @@ namespace main(256);
     #[SENDER_KERNEL]
     sel_op_sender * (kernel_in_offset - constants.SENDER_KERNEL_INPUTS_COL_OFFSET) = 0;
 
-    #[FUNCTION_SELECTOR_KERNEL]
-    sel_op_function_selector * (kernel_in_offset - constants.FUNCTION_SELECTOR_KERNEL_INPUTS_COL_OFFSET) = 0;
-
     #[FEE_TRANSACTION_FEE_KERNEL]
     sel_op_transaction_fee  * (kernel_in_offset - constants.TRANSACTION_FEE_KERNEL_INPUTS_COL_OFFSET) = 0;
 
@@ -172,7 +169,7 @@ namespace main(256);
 
     //===== LOOKUPS INTO THE PUBLIC INPUTS ===========================================
     pol KERNEL_INPUT_SELECTORS = sel_op_address + sel_op_sender
-                               + sel_op_function_selector + sel_op_transaction_fee + sel_op_chain_id
+                               + sel_op_transaction_fee + sel_op_chain_id
                                + sel_op_version + sel_op_block_number + sel_op_timestamp
                                + sel_op_fee_per_l2_gas + sel_op_fee_per_da_gas + sel_op_is_static_call;
     // Ensure that only one kernel lookup is active when the kernel_in_offset is active

diff --git a/barretenberg/cpp/pil/avm/main.pil b/barretenberg/cpp/pil/avm/main.pil
@@ -61,7 +61,6 @@ namespace main(256);
     // CONTEXT - ENVIRONMENT
     pol commit sel_op_address;
     pol commit sel_op_sender;
-    pol commit sel_op_function_selector;
     pol commit sel_op_transaction_fee;
     pol commit sel_op_is_static_call;
 
@@ -234,7 +233,6 @@ namespace main(256);
     // opcode decomposition.
     sel_op_address * (1 - sel_op_address) = 0;
     sel_op_sender * (1 - sel_op_sender) = 0;
-    sel_op_function_selector * (1 - sel_op_function_selector) = 0;
     sel_op_transaction_fee * (1 - sel_op_transaction_fee) = 0;
     sel_op_chain_id * (1 - sel_op_chain_id) = 0;
     sel_op_version * (1 - sel_op_version) = 0;
@@ -445,7 +443,7 @@ namespace main(256);
                        + sel_op_ecadd + sel_op_msm;
     pol SEL_ALL_MEMORY = sel_op_mov + sel_op_set;
     pol KERNEL_INPUT_SELECTORS = sel_op_address + sel_op_sender
-                               + sel_op_function_selector + sel_op_transaction_fee + sel_op_chain_id
+                               + sel_op_transaction_fee + sel_op_chain_id
                                + sel_op_version + sel_op_block_number + sel_op_timestamp
                                + sel_op_fee_per_l2_gas + sel_op_fee_per_da_gas + sel_op_is_static_call;
     pol KERNEL_OUTPUT_SELECTORS = sel_op_note_hash_exists + sel_op_emit_note_hash + sel_op_nullifier_exists

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp
@@ -323,7 +323,6 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co
                 polys.main_sel_op_fdiv.set_if_valid_index(i, rows[i].main_sel_op_fdiv);
                 polys.main_sel_op_fee_per_da_gas.set_if_valid_index(i, rows[i].main_sel_op_fee_per_da_gas);
                 polys.main_sel_op_fee_per_l2_gas.set_if_valid_index(i, rows[i].main_sel_op_fee_per_l2_gas);
-                polys.main_sel_op_function_selector.set_if_valid_index(i, rows[i].main_sel_op_function_selector);
                 polys.main_sel_op_get_contract_instance.set_if_valid_index(i,
                                                                            rows[i].main_sel_op_get_contract_instance);
                 polys.main_sel_op_internal_call.set_if_valid_index(i, rows[i].main_sel_op_internal_call);