From 3d1fa5263318273e0ef55ae97f9ea4b71fde2cd1 Mon Sep 17 00:00:00 2001
From: jeanmon <jean@aztecprotocol.com>
Date: Thu, 5 Dec 2024 15:29:38 +0000
Subject: [PATCH] 9396: Further cleaning up of function selector

---
 .../vm/avm/trace/kernel_trace.cpp             |  4 ----
 .../vm/avm/trace/kernel_trace.hpp             |  1 -
 .../aztec/src/context/public_context.nr       | 11 ---------
 .../contracts/avm_test_contract/src/main.nr   | 23 +++----------------
 4 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.cpp
index 0405ebab1194..ecacb7d41c23 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.cpp
@@ -353,10 +353,6 @@ void AvmKernelTraceBuilder::op_sstore(uint32_t clk, uint32_t side_effect_counter
 //                 dest.main_kernel_in_offset = SENDER_KERNEL_INPUTS_COL_OFFSET;
 //                 dest.main_sel_q_kernel_lookup = 1;
 //                 break;
-//             case KernelTraceOpType::FUNCTION_SELECTOR:
-//                 dest.main_kernel_in_offset = FUNCTION_SELECTOR_KERNEL_INPUTS_COL_OFFSET;
-//                 dest.main_sel_q_kernel_lookup = 1;
-//                 break;
 //             case KernelTraceOpType::TRANSACTION_FEE:
 //                 dest.main_kernel_in_offset = TRANSACTION_FEE_KERNEL_INPUTS_COL_OFFSET;
 //                 dest.main_sel_q_kernel_lookup = 1;
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.hpp
index 23a249abaf53..6ecc60763245 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/kernel_trace.hpp
@@ -18,7 +18,6 @@ class AvmKernelTraceBuilder {
         // IN
         ADDRESS,
         SENDER,
-        FUNCTION_SELECTOR,
         TRANSACTION_FEE,
         CHAIN_ID,
         VERSION,
diff --git a/noir-projects/aztec-nr/aztec/src/context/public_context.nr b/noir-projects/aztec-nr/aztec/src/context/public_context.nr
index aa9e5aa8757b..d8095be42dd3 100644
--- a/noir-projects/aztec-nr/aztec/src/context/public_context.nr
+++ b/noir-projects/aztec-nr/aztec/src/context/public_context.nr
@@ -253,14 +253,6 @@ unconstrained fn address() -> AztecAddress {
 unconstrained fn sender() -> AztecAddress {
     sender_opcode()
 }
-// TODO(9396): Remove.
-unconstrained fn portal() -> EthAddress {
-    portal_opcode()
-}
-// TODO(9396): Remove.
-//unconstrained fn function_selector() -> u32 {
-//    function_selector_opcode()
-//}
 unconstrained fn transaction_fee() -> Field {
     transaction_fee_opcode()
 }
@@ -364,9 +356,6 @@ unconstrained fn address_opcode() -> AztecAddress {}
 #[oracle(avmOpcodeSender)]
 unconstrained fn sender_opcode() -> AztecAddress {}
 
-#[oracle(avmOpcodePortal)]
-unconstrained fn portal_opcode() -> EthAddress {}
-
 #[oracle(avmOpcodeTransactionFee)]
 unconstrained fn transaction_fee_opcode() -> Field {}
 
diff --git a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
index 93c07de02a27..faa68f48bc8a 100644
--- a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
+++ b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
@@ -37,16 +37,14 @@ contract AvmTest {
         get_contract_instance_initialization_hash_avm,
     };
     use dep::aztec::prelude::Map;
-    use dep::aztec::protocol_types::{
-        abis::function_selector::FunctionSelector, contract_class_id::ContractClassId,
-        storage::map::derive_storage_slot_in_map,
-    };
     use dep::aztec::protocol_types::{
         address::{AztecAddress, EthAddress},
         point::Point,
         scalar::Scalar,
     };
-    use dep::aztec::protocol_types::constants::CONTRACT_INSTANCE_LENGTH;
+    use dep::aztec::protocol_types::{
+        contract_class_id::ContractClassId, storage::map::derive_storage_slot_in_map,
+    };
     use dep::aztec::state_vars::PublicMutable;
     use dep::compressed_string::CompressedString;
     use std::embedded_curve_ops::{EmbeddedCurvePoint, multi_scalar_mul};
@@ -378,11 +376,6 @@ contract AvmTest {
         context.msg_sender()
     }
 
-    #[public]
-    fn get_function_selector() -> FunctionSelector {
-        context.selector()
-    }
-
     #[public]
     fn get_transaction_fee() -> Field {
         context.transaction_fee()
@@ -434,14 +427,6 @@ contract AvmTest {
         assert(timestamp == expected_timestamp, "timestamp does not match");
     }
 
-    #[public]
-    fn check_selector() {
-        assert(
-            context.selector() == comptime { FunctionSelector::from_signature("check_selector()") },
-            "Unexpected selector!",
-        );
-    }
-
     #[public]
     fn get_args_hash(_a: u8, _fields: [Field; 3]) -> Field {
         context.get_args_hash()
@@ -624,8 +609,6 @@ contract AvmTest {
         let _ = get_address();
         dep::aztec::oracle::debug_log::debug_log("get_sender");
         let _ = get_sender();
-        dep::aztec::oracle::debug_log::debug_log("get_function_selector");
-        let _ = get_function_selector();
         dep::aztec::oracle::debug_log::debug_log("get_transaction_fee");
         let _ = get_transaction_fee();
         dep::aztec::oracle::debug_log::debug_log("get_chain_id");