feat(AVM)!: Enable tx=>execution lookup (#16455)

Enables the lookup now that it's passing bulk test, and reduces two
columns in the tx trace for context ids

Author: AztecBot

barretenberg/cpp/pil/vm2/context.pil

@@ -44,6 +44,10 @@ namespace execution;
     // ==== Gas ====
     pol commit l2_gas_limit;
     pol commit da_gas_limit;
+
+    pol commit prev_l2_gas_used;
+    pol commit prev_da_gas_used;
+
     pol commit l2_gas_used;
     pol commit da_gas_used;
 
@@ -114,16 +118,23 @@ namespace execution;
 
     // next_context_id increments with each invocation of an external call or new enqueued call
     pol commit next_context_id; // Can be replaced by clk
+
+    // We always start enqueued calls with fresh context ids, so the next context id must start at context_id + 1
+    #[ENQUEUED_CALL_START_NEXT_CTX_ID]
+    enqueued_call_start * (context_id + 1 - next_context_id) = 0;
+
     // The initial next_context_id = 2, in row = 1
     #[INCR_NEXT_CONTEXT_ID]
     NOT_LAST_EXEC * (next_context_id' - (next_context_id + sel_enter_call)) = 0;
 
     // nested_exit_call = 1 ==> context_id' = parent_id
     // sel_enter_call   = 1 ==> context_id' = next_context_id
     // otherwise        = 0 ==> context_id' = context_id
-    #[CONTEXT_ID_CALL_NEXT_ROW]
+    #[CONTEXT_ID_NEXT_ROW]
     NOT_LAST_EXEC * DEFAULT_CTX_ROW * (context_id' - context_id) = 0;
+    #[CONTEXT_ID_EXT_CALL]
     NOT_LAST_EXEC * sel_enter_call  * (context_id' - next_context_id) = 0;
+    #[CONTEXT_ID_NESTED_EXIT]
     NOT_LAST_EXEC * nested_exit_call   * (context_id' - parent_id) = 0;
 
     // nested_exit_call = 1 ==> constraints come from lookup
@@ -429,9 +440,6 @@ namespace execution;
     // nested_exit_call = 1 <==> prev_gas_used' = parent_gas_used + gas_used
     // sel_enter_call   = 1 <==> prev_gas_used' = 0
     // otherwise        = 0 <==> prev_gas_used' = gas_used
-    pol commit prev_l2_gas_used;
-    pol commit prev_da_gas_used;
-
     #[L2_GAS_USED_CONTINUITY]
     NOT_LAST_EXEC * DEFAULT_CTX_ROW * (l2_gas_used - prev_l2_gas_used') = 0;
     #[L2_GAS_USED_ZERO_AFTER_CALL]

barretenberg/cpp/pil/vm2/tx.pil

@@ -201,16 +201,6 @@ namespace tx;
     pol commit should_process_call_request;
     should_process_call_request = is_public_call_request * (1 - is_padded);
 
-    // When sending a call to execution, next context id is incremented by one, since we use next_context_id for the call.
-    pol commit next_context_id_sent_to_enqueued_call;
-    // When coming back from a call, the next context id may have incremented an amount we can't predict from the tx trace.
-    pol commit next_context_id_from_enqueued_call;
-
-    // When issuing a call, context id is used for the call, making the next context id it plus one.
-    should_process_call_request * ((next_context_id + 1) - next_context_id_sent_to_enqueued_call) = 0;
-    // When comming back from the call, the newly available context id is the next_context_id that comes from the end of the call.
-    should_process_call_request * (next_context_id_from_enqueued_call - next_context_id') = 0;
-
     pol commit is_teardown_phase; // TODO: Constrain
     is_teardown_phase * (1 - is_teardown_phase) = 0;
 
@@ -229,116 +219,114 @@ namespace tx;
 
     // Public Call Requests are dispatch to the execution trace
     // We match the values to the start of an enqueued call in the execution trace
-    // Commented out for now since we dont have enqueued call flags in execution set
-    // #[DISPATCH_EXEC_START]
-    // should_process_call_request {
-    //     next_context_id,
-    //     next_context_id_sent_to_enqueued_call,
-    //     discard,
-    //     msg_sender,
-    //     contract_addr,
-    //     fee,
-    //     is_static,
-    //     // Tree State
-    //     prev_note_hash_tree_root,
-    //     prev_note_hash_tree_size,
-    //     prev_num_note_hashes_emitted,
-    //     prev_nullifier_tree_size,
-    //     prev_num_nullifiers_emitted,
-    //     prev_public_data_tree_root,
-    //     prev_public_data_tree_size,
-    //     prev_written_public_data_slots_tree_root,
-    //     prev_written_public_data_slots_tree_size,
-    //     l1_l2_tree_root,
-    //     // Side Effect States
-    //     prev_num_unencrypted_logs,
-    //     prev_num_l2_to_l1_messages,
-    //     // Gas Info
-    //     prev_l2_gas_used_sent_to_enqueued_call,
-    //     prev_da_gas_used_sent_to_enqueued_call,
-    //     l2_gas_limit,
-    //     da_gas_limit
-    // } in
-    // execution.enqueued_call_start {
-    //     execution.context_id,
-    //     execution.next_context_id,
-    //     execution.discard,
-    //     execution.msg_sender,
-    //     execution.contract_address,
-    //     execution.transaction_fee,
-    //     execution.is_static,
-    //     // Tree State
-    //     execution.prev_note_hash_tree_root,
-    //     execution.prev_note_hash_tree_size,
-    //     execution.prev_num_note_hashes_emitted,
-    //     execution.prev_nullifier_tree_size,
-    //     execution.prev_num_nullifiers_emitted,
-    //     execution.prev_public_data_tree_root,
-    //     execution.prev_public_data_tree_size,
-    //     execution.prev_written_public_data_slots_tree_root,
-    //     execution.prev_written_public_data_slots_tree_size,
-    //     execution.l1_l2_tree_root,
-    //     // Side Effect States
-    //     execution.prev_num_unencrypted_logs,
-    //     execution.prev_num_l2_to_l1_messages,
-    //     // Gas Info
-    //     execution.prev_l2_gas_used_sent_to_enqueued_call,
-    //     execution.prev_da_gas_used_sent_to_enqueued_call,
-    //     execution.l2_gas_limit,
-    //     execution.da_gas_limit
-    // };
+    #[DISPATCH_EXEC_START]
+    should_process_call_request {
+        next_context_id,
+        discard,
+        msg_sender,
+        contract_addr,
+        fee,
+        is_static,
+        // Tree State
+        prev_note_hash_tree_root,
+        prev_note_hash_tree_size,
+        prev_num_note_hashes_emitted,
+        prev_nullifier_tree_root,
+        prev_nullifier_tree_size,
+        prev_num_nullifiers_emitted,
+        prev_public_data_tree_root,
+        prev_public_data_tree_size,
+        prev_written_public_data_slots_tree_root,
+        prev_written_public_data_slots_tree_size,
+        l1_l2_tree_root,
+        // Side Effect States
+        prev_num_unencrypted_logs,
+        prev_num_l2_to_l1_messages,
+        // Gas Info
+        prev_l2_gas_used_sent_to_enqueued_call,
+        prev_da_gas_used_sent_to_enqueued_call,
+        l2_gas_limit,
+        da_gas_limit
+    } in
+    execution.enqueued_call_start {
+        execution.context_id, // next_context_id must be constrained in the execution trace on enqueued_call_start
+        execution.discard,
+        execution.msg_sender,
+        execution.contract_address,
+        execution.transaction_fee,
+        execution.is_static,
+        // Tree State
+        execution.prev_note_hash_tree_root,
+        execution.prev_note_hash_tree_size,
+        execution.prev_num_note_hashes_emitted,
+        execution.prev_nullifier_tree_root,
+        execution.prev_nullifier_tree_size,
+        execution.prev_num_nullifiers_emitted,
+        execution.prev_public_data_tree_root,
+        execution.prev_public_data_tree_size,
+        execution.prev_written_public_data_slots_tree_root,
+        execution.prev_written_public_data_slots_tree_size,
+        execution.l1_l2_tree_root,
+        // Side Effect States
+        execution.prev_num_unencrypted_logs,
+        execution.prev_num_l2_to_l1_messages,
+        // Gas Info
+        execution.prev_l2_gas_used,
+        execution.prev_da_gas_used,
+        execution.l2_gas_limit,
+        execution.da_gas_limit
+    };
 
     // We retrieve the return values at the end of an enqueued call in the execution trace
-    // Commented out for now since we dont have enqueued call flags in execution set
-    //#[DISPATCH_EXEC_GET_REVERT]
-    //should_process_call_request {
-    //    next_context_id,
-    //    next_context_id_from_enqueued_call,
-    //    reverted,
-    //    discard,
-    //    // Tree State
-    //    next_note_hash_tree_root,
-    //    next_note_hash_tree_size,
-    //    next_num_note_hashes_emitted,
-    //    next_nullifier_tree_root,
-    //    next_nullifier_tree_size,
-    //    next_num_nullifiers_emitted,
-    //    next_public_data_tree_root,
-    //    next_public_data_tree_size,
-    //    next_written_public_data_slots_tree_root,
-    //    next_written_public_data_slots_tree_size,
-    //    l1_l2_tree_root,
-    //    // Side Effect States
-    //    next_num_unencrypted_logs,
-    //    next_num_l2_to_l1_messages,
-    //    // Gas Info
-    //    next_l2_gas_used_sent_to_enqueued_call,
-    //    next_da_gas_used_sent_to_enqueued_call
-    //} in
-    //execution.enqueued_call_end {
-    //    execution.context_id,
-    //    execution.next_context_id,
-    //    execution.sel_error,
-    //    execution.discard,
-    //    // Tree State
-    //    execution.note_hash_tree_root,
-    //    execution.note_hash_tree_size,
-    //    execution.num_note_hashes_emitted,
-    //    execution.nullifier_tree_root,
-    //    execution.nullifier_tree_size,
-    //    execution.num_nullifiers_emitted,
-    //    execution.public_data_tree_root,
-    //    execution.public_data_tree_size,
-    //    execution.written_public_data_slots_tree_root,
-    //    execution.written_public_data_slots_tree_size,
-    //    execution.l1_l2_tree_root,
-    //    // Side Effect States
-    //    execution.num_unencrypted_logs,
-    //    execution.num_l2_to_l1_messages,
-    //    // Gas Info
-    //    execution.l2_gas_used_sent_to_enqueued_call,
-    //    execution.da_gas_used_sent_to_enqueued_call
-    //};
+    #[DISPATCH_EXEC_END]
+    should_process_call_request {
+       next_context_id,
+       next_context_id', // The context id of the next row must be the one after the execution of the enqueued call
+       reverted,
+       discard,
+       // Tree State
+       next_note_hash_tree_root,
+       next_note_hash_tree_size,
+       next_num_note_hashes_emitted,
+       next_nullifier_tree_root,
+       next_nullifier_tree_size,
+       next_num_nullifiers_emitted,
+       next_public_data_tree_root,
+       next_public_data_tree_size,
+       next_written_public_data_slots_tree_root,
+       next_written_public_data_slots_tree_size,
+       l1_l2_tree_root,
+       // Side Effect States
+       next_num_unencrypted_logs,
+       next_num_l2_to_l1_messages,
+       // Gas Info
+       next_l2_gas_used_sent_to_enqueued_call,
+       next_da_gas_used_sent_to_enqueued_call
+    } in
+    execution.enqueued_call_end {
+       execution.context_id,
+       execution.next_context_id,
+       execution.sel_error,
+       execution.discard,
+       // Tree State
+       execution.note_hash_tree_root,
+       execution.note_hash_tree_size,
+       execution.num_note_hashes_emitted,
+       execution.nullifier_tree_root,
+       execution.nullifier_tree_size,
+       execution.num_nullifiers_emitted,
+       execution.public_data_tree_root,
+       execution.public_data_tree_size,
+       execution.written_public_data_slots_tree_root,
+       execution.written_public_data_slots_tree_size,
+       execution.l1_l2_tree_root,
+       // Side Effect States
+       execution.num_unencrypted_logs,
+       execution.num_l2_to_l1_messages,
+       // Gas Info
+       execution.l2_gas_used,
+       execution.da_gas_used
+    };
 
     // === PRIVATE SIDE EFFECT INSERTIONS ===
     pol commit sel_revertible_append_note_hash;

barretenberg/cpp/src/barretenberg/vm2/constraining/relations/context.test.cpp

@@ -509,5 +509,77 @@ TEST(ContextConstrainingTest, BytecodeIdPropagation)
                               "BYTECODE_ID_NEXT_ROW"); // Should fail constraint
 }
 
+TEST(ContextConstrainingTest, ContextIdPropagation)
+{
+    TestTraceContainer trace({
+        {
+            { C::precomputed_first_row, 1 },
+        },
+        {
+            { C::execution_sel, 1 },
+            { C::execution_enqueued_call_start, 1 },
+            { C::execution_context_id, 1 },
+            { C::execution_next_context_id, 2 },
+            { C::execution_sel_enter_call, 1 },
+        },
+        {
+            { C::execution_sel, 1 },
+            { C::execution_context_id, 2 },
+            { C::execution_next_context_id, 3 },
+            { C::execution_sel_exit_call, 1 },
+            { C::execution_nested_exit_call, 1 },
+            { C::execution_parent_id, 1 },
+        },
+        {
+            { C::execution_sel, 1 },
+            { C::execution_context_id, 1 },
+            { C::execution_next_context_id, 3 },
+        },
+        {
+            { C::execution_sel, 1 },
+            { C::execution_context_id, 1 },
+            { C::execution_next_context_id, 3 },
+        },
+    });
+    check_relation<context>(trace,
+                            context::SR_ENQUEUED_CALL_START_NEXT_CTX_ID,
+                            context::SR_INCR_NEXT_CONTEXT_ID,
+                            context::SR_CONTEXT_ID_NEXT_ROW,
+                            context::SR_CONTEXT_ID_EXT_CALL,
+                            context::SR_CONTEXT_ID_NESTED_EXIT);
+
+    // Negative test: next context id should be context id + 1 on enqueued call start
+    trace.set(C::execution_next_context_id, 1, 3);
+    EXPECT_THROW_WITH_MESSAGE(check_relation<context>(trace, context::SR_ENQUEUED_CALL_START_NEXT_CTX_ID),
+                              "ENQUEUED_CALL_START_NEXT_CTX_ID");
+    trace.set(C::execution_next_context_id, 1, 2);
+
+    // Negative test: next context id should increase on external call
+    trace.set(C::execution_next_context_id, 2, 2);
+    EXPECT_THROW_WITH_MESSAGE(check_relation<context>(trace, context::SR_INCR_NEXT_CONTEXT_ID), "INCR_NEXT_CONTEXT_ID");
+    trace.set(C::execution_next_context_id, 2, 3);
+
+    // Negative test: next context id should be propagated
+    trace.set(C::execution_next_context_id, 4, 4);
+    EXPECT_THROW_WITH_MESSAGE(check_relation<context>(trace, context::SR_INCR_NEXT_CONTEXT_ID), "INCR_NEXT_CONTEXT_ID");
+    trace.set(C::execution_next_context_id, 4, 3);
+
+    // Negative test: context id should be propagated
+    trace.set(C::execution_context_id, 4, 2);
+    EXPECT_THROW_WITH_MESSAGE(check_relation<context>(trace, context::SR_CONTEXT_ID_NEXT_ROW), "CONTEXT_ID_NEXT_ROW");
+    trace.set(C::execution_context_id, 4, 1);
+
+    // Negative test: context id should be next context id when entering call
+    trace.set(C::execution_context_id, 2, 1);
+    EXPECT_THROW_WITH_MESSAGE(check_relation<context>(trace, context::SR_CONTEXT_ID_EXT_CALL), "CONTEXT_ID_EXT_CALL");
+    trace.set(C::execution_context_id, 2, 2);
+
+    // Negative test: context id should be restored on exit
+    trace.set(C::execution_context_id, 3, 2);
+    EXPECT_THROW_WITH_MESSAGE(check_relation<context>(trace, context::SR_CONTEXT_ID_NESTED_EXIT),
+                              "CONTEXT_ID_NESTED_EXIT");
+    trace.set(C::execution_context_id, 3, 1);
+}
+
 } // namespace
 } // namespace bb::avm2::constraining