feat(avm): vm2 initial context by IlyasRidhuan · Pull Request #12972 · AztecProtocol/aztec-packages

IlyasRidhuan · 2025-03-24T07:18:36Z

This adds the initial work for context and context_stack to vm2. The interfaces will still need to be updated in the future, but it sets up the points where the context events will happen (i.e. at the end of the main execution loop and within call).

This also outlines the contents of the two events albeit commented out for now (until we have the supported inputs in the context itself)

fcarreiro

Looking good

barretenberg/cpp/pil/vm2/context_stack.pil

barretenberg/cpp/pil/vm2/execution.pil

fcarreiro · 2025-03-24T09:56:22Z

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

+    void emit_context_snapshot() override
+    {
+        ctx_stack_events.emit({ .id = context_id,
+                                .next_pc = next_pc,
+                                .msg_sender = msg_sender,
+                                .contract_addr = address,
+                                .is_static = is_static });
+    };
+
+    ContextEvent get_current_context() override
+    {
+        return {
+            .id = context_id, .pc = pc, .msg_sender = msg_sender, .contract_addr = address, .is_static = is_static
+        };
+    };


A bit strange (the assymetry) that the Context delegates emission of ContextEvents but does "own" and emit the stack events itself.

No need to change, let's just keep an eye on it.

fcarreiro · 2025-03-24T10:05:56Z

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

+    NestedContext(uint32_t context_id,
+                  AztecAddress address,
+                  AztecAddress msg_sender,
+                  std::span<const FF> calldata,


So IIUC for the moment you split the classes but they are kind of the same and you'll be changing in other PR

fcarreiro · 2025-03-24T10:07:02Z

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

-                                   std::span<const FF> calldata,
-                                   AztecAddress msg_sender,
-                                   bool is_static)
+// This context interface is an top-level enqueued one


Comment is a bit confusing

Ah yeah - strictly speaking this execute should really only take in an EnqueuedCallContext and never a NestedCallContext. But I wasn't sure if removing the polymorphism would be appropriate right now.

We might have a (Enqueued)/(Nested)ContextInterface in the end if they diverge significantly which is what i would then put here.

Ha! If this requires you to know the specific kind of context then usually either this is wrong or the interface is wrong 😆 but we can see later

fcarreiro · 2025-03-24T10:08:21Z

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

+            auto context_event = context.get_current_context();
+            ex_event.context_event = std::move(context_event);


Just do ex_event.context_event = context.get_current_context(). Otherwise you run the risk of using a "nullified" context_event afterwards. This is not rust and the compiler will not warn you most likely XD

fcarreiro · 2025-03-24T10:08:58Z

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

-                            AztecAddress msg_sender,
-                            bool is_static) override;
+    ExecutionResult execute(ContextInterface& enqueued_call_context) override;
+    ExecutionComponentsProviderInterface& get_provider() override { return execution_components; };


hmm lets see why this is needed

fcarreiro · 2025-03-24T10:10:47Z

barretenberg/cpp/src/barretenberg/vm2/simulation/tx_execution.cpp

+                                                                     std::span<const FF> calldata,
+                                                                     bool is_static)
+{
+    auto& execution_provider = call_execution.get_provider();


Ah, I see why now. Ok for now but we might need to consider lifting the provider as well.

You probably can just pass the same provider to both TxExecution and Execution in the simulator helper.

yeah i had that version in an earlier commit, i.e. re-introducing a ContextProvider at the transaction level. But passing the provider twice seemed kinda bad.

Long term if we can break the statefulness of the provider we could make this cleaner. The statefulness is just the context_id counter that is shared across enqueued and nested calls

fcarreiro · 2025-03-24T10:11:46Z

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

+
  private:
    ExecutionInterface& call_execution;
+    // More things need to be lifted into the tx execution??


Won't you need to lift the whole context? (that would include the db)

Possibly, I'm not sure how the tx-level operations might utilise the context at the moment, outside of just mutating the initial one it creates.

fcarreiro · 2025-03-24T10:12:38Z

barretenberg/cpp/src/barretenberg/vm2/simulation_helper.cpp

                                       instruction_fetching_emitter);
-    ExecutionComponentsProvider execution_components(bytecode_manager, memory_emitter, instruction_info_db);
+    ExecutionComponentsProvider execution_components(
+        bytecode_manager, memory_emitter, context_stack_emitter, instruction_info_db);


context stack stuff feels like it could just go in execution, but not a blocker (since it's not 100% clear)

This adds the initial work for `context` and `context_stack` to vm2. The interfaces will still need to be updated in the future, but it sets up the points where the context events will happen (i.e. at the end of the main execution loop and within `call`). This also outlines the contents of the two events albeit commented out for now (until we have the supported inputs in the context itself)

🤖 I have created a new Aztec Packages release --- ## [0.82.3](v0.82.2...v0.82.3) (2025-03-27) ### Features * `msgpack` encoding for `Program` and `WitnessStack` ([#12841](#12841)) ([1e58eb1](1e58eb1)) * 64 bit log type id, 64 bit log metadata ([#12956](#12956)) ([20d734a](20d734a)) * AVM parsing tag validation ([#12936](#12936)) ([56b1f0d](56b1f0d)) * **avm:** add calldata & returndata to context ([#13008](#13008)) ([f03b2e5](f03b2e5)) * **avm:** merkle db hints (part 1) ([#12922](#12922)) ([34ec9e8](34ec9e8)) * **avm:** merkle hints (part 2) ([#13077](#13077)) ([fbbc6c7](fbbc6c7)) * **avm:** vm2 initial context ([#12972](#12972)) ([e2b1361](e2b1361)) * benchmark avm simulator ([#12985](#12985)) ([00fae1b](00fae1b)) * client flows benchmarks ([#13007](#13007)) ([9bf7568](9bf7568)) * gas benchmark for "normal usage" ([#13073](#13073)) ([4eb1156](4eb1156)) * Implement merkle writes in the merkle check gadget ([#13050](#13050)) ([c94fe50](c94fe50)) * LogEncryption trait ([#12942](#12942)) ([0b7e564](0b7e564)) * Node snapshot sync ([#12927](#12927)) ([afde851](afde851)), closes [#12926](#12926) * **p2p:** capture all gossipsub metrics ([#12930](#12930)) ([cc940cb](cc940cb)) * Prover node snapshot sync ([#13097](#13097)) ([1e77efb](1e77efb)) * staking asset handler ([#12968](#12968)) ([af48184](af48184)), closes [#12932](#12932) * stream crs data to disk ([#12996](#12996)) ([d016e4d](d016e4d)), closes [#12948](#12948) * track failed tests. add flake. ([f4936d7](f4936d7)) * Track test history. ([#13037](#13037)) ([036bb32](036bb32)) * track total tx fee ([#12601](#12601)) ([9612a4e](9612a4e)) * Validators sentinel ([#12818](#12818)) ([770695c](770695c)) ### Bug Fixes * added #[derive(Eq)] to EcdsaPublicKeyNote ([#12966](#12966)) ([0c21c74](0c21c74)) * Allow use of local blob sink client ([#13025](#13025)) ([ba8d654](ba8d654)) * **avm:** semicolons are hard ([#12999](#12999)) ([8871c83](8871c83)) * bootstrap network and sponsored fpc devnet ([#13044](#13044)) ([8a47d8b](8a47d8b)) * Bump tsc target ([#13052](#13052)) ([985e83b](985e83b)) * cycle_group fuzzer ([#12921](#12921)) ([69f426e](69f426e)) * **docs:** Fix import errors in aztec.js tutorial ([#12969](#12969)) ([856208a](856208a)) * **docs:** Load token artifact from the compiled source in the sample dapp tutorial ([#12802](#12802)) ([0838084](0838084)), closes [#12810](#12810) * **docs:** Update sponsored fpc docs to use 82.2 syntax ([#13054](#13054)) ([e5d425b](e5d425b)) * **e2e:** p2p ([#13002](#13002)) ([1ece539](1ece539)) * extend e2e 2 pxes timeout. strip color codes for error_regex. ([73820e4](73820e4)) * flake ([6cc9e81](6cc9e81)) * fuzzer on staking asset handler constructor test ([#13101](#13101)) ([d936285](d936285)) * invalid getCommittee function ([#13072](#13072)) ([327341f](327341f)) * mac publish should use clang 18 like x-compiler, and use it ([#12983](#12983)) ([7b83c45](7b83c45)) * make circuit parsing deterministic ([#11772](#11772)) ([76ef873](76ef873)) * parse away trailing slash from consensus host ([#12577](#12577)) ([6701806](6701806)) * prerelease versions should be pushed to install.aztec.network ([#13086](#13086)) ([c4e6039](c4e6039)) * smoke ([#13060](#13060)) ([7756b15](7756b15)) * some flake additions ([58638f1](58638f1)) * sponsored fpc arg parsed correctly ([#12976](#12976)) ([#12977](#12977)) ([a85f530](a85f530)) * starting the sandbox with no pxe should still deploy initial test accounts ([#13047](#13047)) ([d92d895](d92d895)) * Syntax error when running tests via jest after tsc build ([#13051](#13051)) ([f972db9](f972db9)) * Use the correct image in aztec start ([#13058](#13058)) ([06285cd](06285cd)) * yolo fix ([91e2f4b](91e2f4b)) * yolo fix nightly ([b3b3259](b3b3259)) * yolo fix obvious thing to track fails. ([2fee630](2fee630)) * yolo flakes ([e3b030a](e3b030a)) * yolo set -x ([bfd3205](bfd3205)) * yolo we suspect the halt is making tests fail that would have passed ([04e3fa2](04e3fa2)) ### Miscellaneous * `getIndexedTaggingSecretAsSender` oracle cleanup ([#13015](#13015)) ([8e71e55](8e71e55)) * Add a script to generate cpp files for AVM2 ([#13091](#13091)) ([7bb43a9](7bb43a9)) * add default native proving for cli wallet ([#12855](#12855)) ([c0f773c](c0f773c)) * add default native proving for cli wallet retry ([#13028](#13028)) ([b2f4785](b2f4785)) * Alpha testnet into master ([#13033](#13033)) ([d98fdbd](d98fdbd)) * AVM TS - move tag validation outside of instruction constructors ([#13038](#13038)) ([45548ab](45548ab)), closes [#12934](#12934) * **avm:** final codegen nuking ([#13089](#13089)) ([9c82f3f](9c82f3f)) * **avm:** remove codegen (all but flavor) ([#13079](#13079)) ([e1f2bdd](e1f2bdd)) * **bb:** minor acir buf C++ improvements ([#13042](#13042)) ([1ebd044](1ebd044)) * boxes dep cleanup ([#12979](#12979)) ([6540b7c](6540b7c)) * **ci:** less catch all e2e_p2p flakes ([#12737](#12737)) ([2134634](2134634)) * comprehensive cleanup of translator flavor and use inheritance properly in flavors ([#13041](#13041)) ([dc5f78f](dc5f78f)) * compress storage footprint ([#12871](#12871)) ([58c110f](58c110f)) * display warning when installing bb versions < 0.82.0 ([#13027](#13027)) ([7247fe7](7247fe7)) * **docs:** Update docs on fees and various other updates ([#12929](#12929)) ([1dec907](1dec907)) * dump dmesg/net/cpu/mem usage at end of ci run ([#12967](#12967)) ([8877792](8877792)) * fix governance util issue ([#13043](#13043)) ([d768d26](d768d26)) * redundant if in affine from projective constructor ([#13045](#13045)) ([3a7ba2d](3a7ba2d)) * remove addition of dummy ops in mock circuit producer ([#13003](#13003)) ([a64d1dc](a64d1dc)) * remove dummy ops in decider pk ([#13049](#13049)) ([da6d021](da6d021)) * replace relative paths to noir-protocol-circuits ([e1b88f6](e1b88f6)) * replace relative paths to noir-protocol-circuits ([849b4b0](849b4b0)) * replace relative paths to noir-protocol-circuits ([18a02d6](18a02d6)) * Revert "chore: add default native proving for cli wallet ([#12855](#12855))" ([#13013](#13013)) ([98e2576](98e2576)) * Speed up and deflake sentinel test ([#13078](#13078)) ([27f1eca](27f1eca)) * **testnet:** making consensus host mandatory input ([#12716](#12716)) ([d47c74a](d47c74a)) * towards no more mock op_queues ([#12984](#12984)) ([fefffa7](fefffa7)) * update bb version for noir 1.0.0-beta.0+ ([#13026](#13026)) ([dd68074](dd68074)) * update CODEOWNERS to reflect new sync method ([#12998](#12998)) ([a3d1915](a3d1915)) ### Documentation * Add fees to cli reference ([#12884](#12884)) ([4a0fd58](4a0fd58)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

IlyasRidhuan requested a review from fcarreiro March 24, 2025 07:18

IlyasRidhuan requested review from Maddiaa0 and jeanmon as code owners March 24, 2025 07:18

IlyasRidhuan removed request for Maddiaa0 and jeanmon March 24, 2025 09:36

fcarreiro approved these changes Mar 24, 2025

View reviewed changes

IlyasRidhuan added 5 commits March 24, 2025 20:10

scaffolding

c0318b2

remove context provider

05425d0

start adding pil

fbe2f0b

add tests

0f2f514

clean up

be0941a

IlyasRidhuan force-pushed the ir/contexts branch from ebbbbaf to be0941a Compare March 24, 2025 12:10

IlyasRidhuan added 2 commits March 24, 2025 15:15

no more seg fault in mock

25be95b

cleanup

53e70de

IlyasRidhuan merged commit e2b1361 into master Mar 25, 2025
7 checks passed

IlyasRidhuan deleted the ir/contexts branch March 25, 2025 03:41

AztecBot mentioned this pull request Mar 25, 2025

chore(master): release 0.82.3 #12980

Merged

		auto context_event = context.get_current_context();
		ex_event.context_event = std::move(context_event);

Conversation

IlyasRidhuan commented Mar 24, 2025

Uh oh!

fcarreiro left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants