Convert `StatelessVerkleStateManager` usage to type in `vm` #4021

acolytec3 · 2025-04-24T15:17:32Z

This modifies our usage of StatelessVerkleStateManager in vm to import it only as a type so it does not get included in a bundle where the StatelessVerkleStateManager isn't actually used

codecov · 2025-04-24T15:20:35Z

Codecov Report

Attention: Patch coverage is 16.66667% with 10 lines in your changes missing coverage. Please review.

Project coverage is 79.54%. Comparing base (3d94933) to head (4d13bbe).
Report is 13 commits behind head on master.

Additional details and impacted files

Flag	Coverage Δ
block	`84.33% <ø> (ø)`
blockchain	`89.32% <ø> (ø)`
client	`67.99% <ø> (?)`
common	`97.51% <ø> (ø)`
devp2p	`86.78% <ø> (+0.07%)`	⬆️
evm	`73.02% <ø> (ø)`
mpt	`89.74% <ø> (+0.30%)`	⬆️
statemanager	`69.06% <0.00%> (ø)`
static	`99.11% <ø> (ø)`
tx	`90.59% <ø> (ø)`
util	`89.36% <ø> (ø)`
vm	`55.50% <20.00%> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

jochem-brouwer

Some comments 😄 👍

jochem-brouwer · 2025-04-24T15:20:47Z

packages/vm/src/runBlock.ts

@@ -160,10 +160,10 @@ export async function runBlock(vm: VM, opts: RunBlockOpts): Promise<RunBlockResu
    // Populate the execution witness
    stateManager.initVerkleExecutionWitness!(block.header.number, block.executionWitness)

-    if (stateManager instanceof StatelessVerkleStateManager) {
+    if ('verifyPostState' in stateManager) {


The line was previously very descriptive stateManager instanceof StatelessVerkleStateManager such that it is clear that stateManager is actually a StatelessVerkleStateManager. Could you add a comment here? Check if stateManager is of type StatelessVerkleStateManager for instance

jochem-brouwer · 2025-04-24T15:21:13Z

packages/vm/src/runBlock.ts

@@ -273,7 +273,7 @@ export async function runBlock(vm: VM, opts: RunBlockOpts): Promise<RunBlockResu
      }
    }

-    if (!(vm.stateManager instanceof StatelessVerkleStateManager)) {
+    if (!('verifyPostState' in vm.stateManager)) {


Here a comment for StatelessVerkleStateManager

jochem-brouwer · 2025-04-24T15:22:14Z

packages/vm/src/runTx.ts

-      !(vm.stateManager instanceof StatefulVerkleStateManager) &&
-      !(vm.stateManager instanceof StatelessVerkleStateManager)
-    ) {
+    if (!('verifyPostState' in vm.stateManager) && !('verifyPostState' in vm.stateManager)) {


Here thus a check if it's a *VerkleStateManager type (Stateful or Stateless)

packages/vm/src/runTx.ts

acolytec3

Update evm/vite.config.bundler.ts to point to ../vm/examples/runGoerliBlock.ts and then run npm run visualize:bundle from root/packages/evm and verify that only the MerkleStateManager appears under the statemanager in the bundle

gabrocheleau · 2025-04-24T15:41:46Z

packages/vm/src/runTx.ts

-      !(vm.stateManager instanceof StatefulVerkleStateManager) &&
-      !(vm.stateManager instanceof StatelessVerkleStateManager)
-    ) {
+    if (!('verifyPostState' in vm.stateManager) && !('verifyPostState' in vm.stateManager)) {


Isn't this checking the same condition twice?

Ah, good point, I did not catch this 😅 If verifyPostState is only a method of StatefulVerkleStateManager and StatelessVerkleStateManager and not of any other StateManager then we can indeed compactify it to one check (and not the same check twice)

Hah, sorry I missed that. Will update!

holgerd77 · 2025-04-24T15:52:44Z

packages/vm/src/runBlock.ts

@@ -160,10 +160,10 @@ export async function runBlock(vm: VM, opts: RunBlockOpts): Promise<RunBlockResu
    // Populate the execution witness
    stateManager.initVerkleExecutionWitness!(block.header.number, block.executionWitness)

-    if (stateManager instanceof StatelessVerkleStateManager) {
+    if ('verifyPostState' in stateManager) {


I think it would be nice to have a code comment directly on the original verifyPostState method how the method is (mis-)used and that it should therefore not be renamed.

holgerd77

Will take this in here, additional comments on the other PR(s).

holgerd77

LGTM

Make Verkle State Managers types in vm

0846929

acolytec3 added the package: vm label Apr 24, 2025

jochem-brouwer reviewed Apr 24, 2025

View reviewed changes

Add clarifying comments

bd0d293

acolytec3 commented Apr 24, 2025

View reviewed changes

acolytec3 marked this pull request as ready for review April 24, 2025 15:31

gabrocheleau reviewed Apr 24, 2025

View reviewed changes

holgerd77 reviewed Apr 24, 2025

View reviewed changes

address feedback

c25c422

acolytec3 mentioned this pull request Apr 24, 2025

Update verkle statemanager API to match interface #4022

Merged

This was referenced Apr 25, 2025

VM Bundle includes both Verkle StateManagers #4017

Closed

StateManager: add name property to interface #4025

Closed

holgerd77 previously approved these changes Apr 25, 2025

View reviewed changes

Merge branch 'master' into make-statemanagers-types

5243351

holgerd77 dismissed their stale review via 5243351 April 25, 2025 08:12

holgerd77 added 2 commits April 25, 2025 10:38

Merge branch 'master' into make-statemanagers-types

c09eae8

verifyPostState -> verifyVerklePostState

4d13bbe

holgerd77 approved these changes Apr 25, 2025

View reviewed changes

holgerd77 merged commit 934e20d into master Apr 25, 2025
38 of 40 checks passed

holgerd77 deleted the make-statemanagers-types branch April 25, 2025 09:03

holgerd77 added PR state: needs review type: enhancement labels Apr 28, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert `StatelessVerkleStateManager` usage to type in `vm` #4021

Convert `StatelessVerkleStateManager` usage to type in `vm` #4021

acolytec3 commented Apr 24, 2025

codecov bot commented Apr 24, 2025 •

edited

Loading

jochem-brouwer left a comment

jochem-brouwer Apr 24, 2025

jochem-brouwer Apr 24, 2025

jochem-brouwer Apr 24, 2025

acolytec3 left a comment

gabrocheleau Apr 24, 2025

jochem-brouwer Apr 24, 2025

acolytec3 Apr 24, 2025

holgerd77 Apr 24, 2025

holgerd77 left a comment

holgerd77 left a comment

Convert StatelessVerkleStateManager usage to type in vm #4021

Convert StatelessVerkleStateManager usage to type in vm #4021

Conversation

acolytec3 commented Apr 24, 2025

codecov bot commented Apr 24, 2025 • edited Loading

Codecov Report

jochem-brouwer left a comment

Choose a reason for hiding this comment

jochem-brouwer Apr 24, 2025

Choose a reason for hiding this comment

jochem-brouwer Apr 24, 2025

Choose a reason for hiding this comment

jochem-brouwer Apr 24, 2025

Choose a reason for hiding this comment

acolytec3 left a comment

Choose a reason for hiding this comment

gabrocheleau Apr 24, 2025

Choose a reason for hiding this comment

jochem-brouwer Apr 24, 2025

Choose a reason for hiding this comment

acolytec3 Apr 24, 2025

Choose a reason for hiding this comment

holgerd77 Apr 24, 2025

Choose a reason for hiding this comment

holgerd77 left a comment

Choose a reason for hiding this comment

holgerd77 left a comment

Choose a reason for hiding this comment

Convert `StatelessVerkleStateManager` usage to type in `vm` #4021

Convert `StatelessVerkleStateManager` usage to type in `vm` #4021

codecov bot commented Apr 24, 2025 •

edited

Loading