Skip to content

fix!: some missing context stuff in the AVM Cpp #16247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbanks12 merged 1 commit into from
Aug 7, 2025
Merged

fix!: some missing context stuff in the AVM Cpp #16247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ void Execution::handle_enter_call(ContextInterface& parent_context, std::unique_
ctx_stack_events.emit(
{ .id = parent_context.get_context_id(),
.parent_id = parent_context.get_parent_id(),
.entered_context_id = context_provider.get_next_context_id(),
.entered_context_id = child_context->get_context_id(), // gets the context id of the child!
Copy link
Contributor

@IlyasRidhuan IlyasRidhuan Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh nice - yeah this makes sense now that we emit after we create. Must be a throwback when we use to recurse

.next_pc = parent_context.get_next_pc(),
.msg_sender = parent_context.get_msg_sender(),
.contract_addr = parent_context.get_address(),
Expand Down
1 change: 0 additions & 1 deletion barretenberg/cpp/src/barretenberg/vm2/simulation/execution.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ TEST_F(ExecutionSimulationTest, Call)

// Context snapshotting
EXPECT_CALL(context, get_context_id);
EXPECT_CALL(context_provider, get_next_context_id);
EXPECT_CALL(context, get_parent_id);
EXPECT_CALL(context, get_next_pc);
EXPECT_CALL(context, get_is_static);
Expand Down
5 changes: 5 additions & 0 deletions barretenberg/cpp/src/barretenberg/vm2/tracegen/execution_trace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "barretenberg/vm2/generated/columns.hpp"
#include "barretenberg/vm2/generated/relations/lookups_addressing.hpp"
#include "barretenberg/vm2/generated/relations/lookups_alu.hpp"
#include "barretenberg/vm2/generated/relations/lookups_context.hpp"
#include "barretenberg/vm2/generated/relations/lookups_emit_notehash.hpp"
#include "barretenberg/vm2/generated/relations/lookups_emit_nullifier.hpp"
#include "barretenberg/vm2/generated/relations/lookups_execution.hpp"
Expand Down Expand Up @@ -1177,6 +1178,10 @@ const InteractionDefinition ExecutionTraceBuilder::interactions =
.add<lookup_execution_check_radix_gt_256_settings, InteractionType::LookupGeneric>()
.add<lookup_execution_get_p_limbs_settings, InteractionType::LookupGeneric>()
.add<lookup_execution_get_max_limbs_settings, InteractionType::LookupGeneric>()
// Context Stack
.add<lookup_context_ctx_stack_call_settings, InteractionType::LookupGeneric>()
.add<lookup_context_ctx_stack_rollback_settings, InteractionType::LookupGeneric>()
.add<lookup_context_ctx_stack_return_settings, InteractionType::LookupGeneric>()
// External Call
.add<lookup_external_call_call_allocated_left_l2_range_settings, InteractionType::LookupIntoIndexedByClk>()
.add<lookup_external_call_call_allocated_left_da_range_settings, InteractionType::LookupIntoIndexedByClk>()
Expand Down
7 changes: 7 additions & 0 deletions barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "barretenberg/vm2/tracegen/bytecode_trace.hpp"
#include "barretenberg/vm2/tracegen/calldata_trace.hpp"
#include "barretenberg/vm2/tracegen/class_id_derivation_trace.hpp"
#include "barretenberg/vm2/tracegen/context_stack_trace.hpp"
#include "barretenberg/vm2/tracegen/contract_instance_retrieval_trace.hpp"
#include "barretenberg/vm2/tracegen/data_copy_trace.hpp"
#include "barretenberg/vm2/tracegen/ecc_trace.hpp"
Expand Down Expand Up @@ -388,6 +389,12 @@ void AvmTraceGenHelper::fill_trace_columns(TraceContainer& trace,
internal_call_stack_builder.process(events.internal_call_stack_events, trace));
clear_events(events.internal_call_stack_events);
},
[&]() {
ContextStackTraceBuilder context_stack_builder;
AVM_TRACK_TIME("tracegen/context_stack",
context_stack_builder.process(events.context_stack, trace));
clear_events(events.context_stack);
},
[&]() {
NoteHashTreeCheckTraceBuilder note_hash_tree_check_trace_builder;
AVM_TRACK_TIME(
Expand Down
Loading