remove cached bytecode id in context

Author: sirasistant

barretenberg/cpp/src/barretenberg/vm2/simulation/bytecode_manager.hpp

@@ -99,6 +99,10 @@ class BytecodeManagerInterface {
     // Returns the id of the current bytecode. Tries to fetch it if not already done.
     // Throws BytecodeNotFoundError if contract does not exist.
     virtual BytecodeId get_bytecode_id() = 0;
+
+    // Returns the id of the current bytecode if it has been retrieved, std::nullopt otherwise.
+    // Won't try to retrieve the bytecode.
+    virtual std::optional<BytecodeId> get_retrieved_bytecode_id() = 0;
 };
 
 class BytecodeManager : public BytecodeManagerInterface {
@@ -121,6 +125,8 @@ class BytecodeManager : public BytecodeManagerInterface {
         return bytecode_id.value();
     }
 
+    std::optional<BytecodeId> get_retrieved_bytecode_id() override { return bytecode_id; }
+
   private:
     AztecAddress address;
     std::optional<BytecodeId> bytecode_id;

barretenberg/cpp/src/barretenberg/vm2/simulation/context.cpp

@@ -71,7 +71,7 @@ ContextEvent EnqueuedCallContext::serialize_context_event()
         .pc = get_pc(),
         .msg_sender = get_msg_sender(),
         .contract_addr = get_address(),
-        .bytecode_id = get_bytecode_id().value_or(FF(0)),
+        .bytecode_id = get_bytecode_manager().get_retrieved_bytecode_id().value_or(FF(0)),
         .transaction_fee = get_transaction_fee(),
         .is_static = get_is_static(),
         .parent_cd_addr = 0,
@@ -131,7 +131,7 @@ ContextEvent NestedContext::serialize_context_event()
         .pc = get_pc(),
         .msg_sender = get_msg_sender(),
         .contract_addr = get_address(),
-        .bytecode_id = get_bytecode_id().value_or(FF(0)),
+        .bytecode_id = get_bytecode_manager().get_retrieved_bytecode_id().value_or(FF(0)),
         .transaction_fee = get_transaction_fee(),
         .is_static = get_is_static(),
         .parent_cd_addr = parent_cd_addr,

barretenberg/cpp/src/barretenberg/vm2/simulation/context.hpp

@@ -82,9 +82,6 @@ class ContextInterface {
 
     virtual uint32_t get_checkpoint_id_at_creation() const = 0;
 
-    virtual std::optional<BytecodeId> get_bytecode_id() const = 0;
-    virtual void set_bytecode_id(BytecodeId bytecode_id) = 0;
-
     // Events
     virtual ContextEvent serialize_context_event() = 0;
 };
@@ -190,9 +187,6 @@ class BaseContext : public ContextInterface {
 
     uint32_t get_checkpoint_id_at_creation() const override { return checkpoint_id_at_creation; }
 
-    std::optional<BytecodeId> get_bytecode_id() const override { return bytecode_id; }
-    void set_bytecode_id(BytecodeId bytecode_id) override { this->bytecode_id = bytecode_id; }
-
     // Input / Output
     std::vector<FF> get_returndata(uint32_t rd_offset, uint32_t rd_copy_size) override;
 
@@ -220,7 +214,6 @@ class BaseContext : public ContextInterface {
     Gas gas_used;
     Gas gas_limit;
     std::unique_ptr<BytecodeManagerInterface> bytecode;
-    std::optional<BytecodeId> bytecode_id = std::nullopt;
     std::unique_ptr<MemoryInterface> memory;
     std::unique_ptr<InternalCallStackManagerInterface> internal_call_stack_manager;
 

barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp

@@ -1080,8 +1080,7 @@ ExecutionResult Execution::execute(std::unique_ptr<ContextInterface> enqueued_ca
             // We try to get the bytecode id. This can throw if the contract is not deployed or if we have retrieved too
             // many unique class ids. Note: bytecode_id is tracked in context events, not in the top-level execution
             // event. It is already included in the before_context_event (defaulting to 0 on error/not-found).
-            BytecodeId id = context.get_bytecode_manager().get_bytecode_id();
-            context.set_bytecode_id(id);
+            context.get_bytecode_manager().get_bytecode_id();
 
             //// Temporality group 2 starts ////
 
@@ -1167,7 +1166,9 @@ void Execution::handle_enter_call(ContextInterface& parent_context, std::unique_
           .next_pc = parent_context.get_next_pc(),
           .msg_sender = parent_context.get_msg_sender(),
           .contract_addr = parent_context.get_address(),
-          .bytecode_id = parent_context.get_bytecode_id().value(), // Should never be nullopt when entering a call
+          .bytecode_id = parent_context.get_bytecode_manager()
+                             .get_retrieved_bytecode_id()
+                             .value(), // Bytecode should have been retrieved in the parent context if it issued a call.
           .is_static = parent_context.get_is_static(),
           .parent_cd_addr = parent_context.get_parent_cd_addr(),
           .parent_cd_size = parent_context.get_parent_cd_size(),

barretenberg/cpp/src/barretenberg/vm2/simulation/execution.test.cpp

@@ -270,7 +270,8 @@ TEST_F(ExecutionSimulationTest, Call)
     // Context snapshotting
     EXPECT_CALL(context, get_context_id);
     EXPECT_CALL(context, get_parent_id);
-    EXPECT_CALL(context, get_bytecode_id).WillOnce(Return(FF(1)));
+    EXPECT_CALL(context, get_bytecode_manager).WillOnce(ReturnRef(bytecode_manager));
+    EXPECT_CALL(bytecode_manager, get_retrieved_bytecode_id).WillOnce(Return(FF(1)));
     EXPECT_CALL(context, get_next_pc);
     EXPECT_CALL(context, get_is_static).WillRepeatedly(Return(false));
     EXPECT_CALL(context, get_msg_sender).WillOnce(ReturnRef(parent_address));
@@ -346,7 +347,8 @@ TEST_F(ExecutionSimulationTest, ExternalCallStaticnessPropagation)
         EXPECT_CALL(gas_tracker, consume_gas(Gas{ 0, 0 }));
         EXPECT_CALL(context, get_context_id);
         EXPECT_CALL(context, get_parent_id);
-        EXPECT_CALL(context, get_bytecode_id).WillOnce(Return(FF(1)));
+        EXPECT_CALL(context, get_bytecode_manager).WillOnce(ReturnRef(bytecode_manager));
+        EXPECT_CALL(bytecode_manager, get_retrieved_bytecode_id).WillOnce(Return(FF(1)));
         EXPECT_CALL(context, get_next_pc);
         EXPECT_CALL(context, get_is_static).WillRepeatedly(Return(parent_is_static));
         EXPECT_CALL(context, get_msg_sender).WillOnce(ReturnRef(parent_address));

barretenberg/cpp/src/barretenberg/vm2/simulation/testing/mock_bytecode_manager.hpp

@@ -19,6 +19,7 @@ class MockBytecodeManager : public BytecodeManagerInterface {
 
     MOCK_METHOD(Instruction, read_instruction, (uint32_t pc), (override));
     MOCK_METHOD(BytecodeId, get_bytecode_id, (), (override));
+    MOCK_METHOD(std::optional<BytecodeId>, get_retrieved_bytecode_id, (), (override));
 };
 
 } // namespace bb::avm2::simulation

barretenberg/cpp/src/barretenberg/vm2/simulation/testing/mock_context.hpp

@@ -73,9 +73,6 @@ class MockContext : public ContextInterface {
 
     MOCK_METHOD(uint32_t, get_checkpoint_id_at_creation, (), (const, override));
 
-    MOCK_METHOD(std::optional<BytecodeId>, get_bytecode_id, (), (const, override));
-    MOCK_METHOD(void, set_bytecode_id, (BytecodeId bytecode_id), (override));
-
     // Event Emitting
     MOCK_METHOD(ContextEvent, serialize_context_event, (), (override));
 };