client: kaustinen7 verkle testnet preparation (#3433)

* client: remove initialVerkleStateRoot cli param * block: add parentStateRoot field to executionWitness * verkle: merkle to basic data leaf * verkle: address merge conflicts and refactors * verkle: use verkle code chunk size constant * verkle: adjust util tests * Fix build * remove stateroot from verifyVerkleProof * Add reserved bytes to encodeBasicData function * Merge commit + reserve bytes [no ci] * match EIP (bigEndian encoding) [no ci] * Switch to basic data packing [no ci] * skip tests that need kaustinen7 data --------- Co-authored-by: acolytec3 <[email protected]>
ethereumjs · Sep 2, 2024 · b9a386c · b9a386c
1 parent b91b545
commit b9a386c
Show file tree

Hide file tree

Showing 15 changed files with 159 additions and 189 deletions.
diff --git a/packages/block/src/block/block.ts b/packages/block/src/block/block.ts
@@ -109,6 +109,8 @@ export class Block {
     // undefined indicates that the executionWitness should be initialized with the default state
     if (this.common.isActivatedEIP(6800) && this.executionWitness === undefined) {
       this.executionWitness = {
+        // TODO: Evaluate how default parentStateRoot should be handled?
+        parentStateRoot: '0x',
         stateDiff: [],
         verkleProof: {
           commitmentsByPath: [],

diff --git a/packages/block/src/from-beacon-payload.ts b/packages/block/src/from-beacon-payload.ts
@@ -82,15 +82,18 @@ type VerkleStateDiffSnakeJson = {
 }
 
 type VerkleExecutionWitnessSnakeJson = {
+  parent_state_root: PrefixedHexString
   state_diff: VerkleStateDiffSnakeJson[]
   verkle_proof: VerkleProofSnakeJson
 }
 
 function parseExecutionWitnessFromSnakeJson({
+  parent_state_root,
   state_diff,
   verkle_proof,
 }: VerkleExecutionWitnessSnakeJson): VerkleExecutionWitness {
   return {
+    parentStateRoot: parent_state_root,
     stateDiff: state_diff.map(({ stem, suffix_diffs }) => ({
       stem,
       suffixDiffs: suffix_diffs.map(({ current_value, new_value, suffix }) => ({

diff --git a/packages/client/bin/cli.ts b/packages/client/bin/cli.ts
@@ -474,12 +474,6 @@ const args: ClientOpts = yargs
     boolean: true,
     hidden: true,
   })
-  .option('initialVerkleStateRoot', {
-    describe:
-      'Provides an initial stateRoot to start the StatelessVerkleStateManager. This is required to bootstrap verkle witness proof verification, since they depend on the stateRoot of the parent block',
-    string: true,
-    coerce: (initialVerkleStateRoot: PrefixedHexString) => hexToBytes(initialVerkleStateRoot),
-  })
   .option('useJsCrypto', {
     describe: 'Use pure Javascript cryptography functions',
     boolean: true,

diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts
@@ -338,7 +338,6 @@ export interface ConfigOptions {
   statelessVerkle?: boolean
   startExecution?: boolean
   ignoreStatelessInvalidExecs?: boolean
-  initialVerkleStateRoot?: Uint8Array
 
   /**
    * Enables Prometheus Metrics that can be collected for monitoring client health
@@ -451,7 +450,6 @@ export class Config {
   public readonly statelessVerkle: boolean
   public readonly startExecution: boolean
   public readonly ignoreStatelessInvalidExecs: boolean
-  public readonly initialVerkleStateRoot: Uint8Array
 
   public synchronized: boolean
   public lastSynchronized?: boolean
@@ -545,7 +543,6 @@ export class Config {
     this.ignoreStatelessInvalidExecs = options.ignoreStatelessInvalidExecs ?? false
 
     this.metrics = options.prometheusMetrics
-    this.initialVerkleStateRoot = options.initialVerkleStateRoot ?? new Uint8Array()
 
     // Start it off as synchronized if this is configured to mine or as single node
     this.synchronized = this.isSingleNode ?? this.mine

diff --git a/packages/client/src/execution/vmexecution.ts b/packages/client/src/execution/vmexecution.ts
@@ -203,7 +203,6 @@ export class VMExecution extends Execution {
     this.config.logger.info(`Setting up verkleVM`)
     const verkleCrypto = await loadVerkleCrypto()
     const stateManager = new StatelessVerkleStateManager({
-      initialStateRoot: this.config.initialVerkleStateRoot,
       verkleCrypto,
     })
     await mcl.init(mcl.BLS12_381)

diff --git a/packages/common/src/interfaces.ts b/packages/common/src/interfaces.ts
@@ -167,7 +167,7 @@ export interface StateManagerInterface {
     executionWitness?: VerkleExecutionWitness | null,
     accessWitness?: AccessWitnessInterface,
   ): void
-  verifyVerkleProof?(stateRoot: Uint8Array): boolean
+  verifyVerkleProof?(): boolean
   verifyPostState?(): boolean
   checkChunkWitnessPresent?(contract: Address, programCounter: number): Promise<boolean>
   getAppliedKey?(address: Uint8Array): Uint8Array // only for preimages

diff --git a/packages/evm/scripts/stackDeltaGenerator.ts b/packages/evm/scripts/stackDeltaGenerator.ts
@@ -6,7 +6,7 @@ class OpcodeInfo {
     opcode: number,
     inputs: number,
     outputs: number,
-    opSize: number
+    opSize: number,
   ) {
     return this.parse(instr, opcode, inputs, outputs, opSize)
   }
@@ -16,7 +16,7 @@ class OpcodeInfo {
     opcode: number,
     inputs: number,
     outputs: number,
-    opSize: number
+    opSize: number,
   ) {
     return this.parse(instr, opcode, inputs, outputs, opSize)
   }

diff --git a/packages/evm/src/opcodes/gas.ts b/packages/evm/src/opcodes/gas.ts
@@ -6,10 +6,8 @@ import {
   BIGINT_31,
   BIGINT_32,
   BIGINT_64,
-  VERKLE_BALANCE_LEAF_KEY,
+  VERKLE_BASIC_DATA_LEAF_KEY,
   VERKLE_CODE_HASH_LEAF_KEY,
-  VERKLE_CODE_SIZE_LEAF_KEY,
-  VERKLE_VERSION_LEAF_KEY,
   bigIntToBytes,
   getVerkleTreeIndexesForStorageSlot,
   setLengthLeft,
@@ -95,7 +93,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           const coldAccessGas = runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
             address,
             0,
-            VERKLE_BALANCE_LEAF_KEY,
+            VERKLE_BASIC_DATA_LEAF_KEY,
           )
 
           gas += coldAccessGas
@@ -165,12 +163,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           coldAccessGas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
             address,
             0,
-            VERKLE_VERSION_LEAF_KEY,
-          )
-          coldAccessGas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
-            address,
-            0,
-            VERKLE_CODE_SIZE_LEAF_KEY,
+            VERKLE_BASIC_DATA_LEAF_KEY,
           )
 
           gas += coldAccessGas
@@ -203,12 +196,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           coldAccessGas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
             address,
             0,
-            VERKLE_VERSION_LEAF_KEY,
-          )
-          coldAccessGas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
-            address,
-            0,
-            VERKLE_CODE_SIZE_LEAF_KEY,
+            VERKLE_BASIC_DATA_LEAF_KEY,
           )
 
           gas += coldAccessGas
@@ -1026,45 +1014,31 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
 
         let selfDestructToCharge2929Gas = true
         if (common.isActivatedEIP(6800)) {
-          // read accesses for version and code size
-          if (runState.interpreter._evm.getPrecompile(contractAddress) === undefined) {
-            gas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
-              contractAddress,
-              0,
-              VERKLE_VERSION_LEAF_KEY,
-            )
-            gas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
-              contractAddress,
-              0,
-              VERKLE_CODE_SIZE_LEAF_KEY,
-            )
-          }
-
           gas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
             contractAddress,
             0,
-            VERKLE_BALANCE_LEAF_KEY,
+            VERKLE_BASIC_DATA_LEAF_KEY,
           )
           if (balance > BIGINT_0) {
             gas += runState.env.accessWitness!.touchAddressOnWriteAndComputeGas(
               contractAddress,
               0,
-              VERKLE_BALANCE_LEAF_KEY,
+              VERKLE_BASIC_DATA_LEAF_KEY,
             )
           }
 
           let selfDestructToColdAccessGas =
             runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
               selfdestructToAddress,
               0,
-              VERKLE_BALANCE_LEAF_KEY,
+              VERKLE_BASIC_DATA_LEAF_KEY,
             )
           if (balance > BIGINT_0) {
             selfDestructToColdAccessGas +=
               runState.env.accessWitness!.touchAddressOnWriteAndComputeGas(
                 selfdestructToAddress,
                 0,
-                VERKLE_BALANCE_LEAF_KEY,
+                VERKLE_BASIC_DATA_LEAF_KEY,
               )
           }
 

diff --git a/packages/statemanager/src/accessWitness.ts b/packages/statemanager/src/accessWitness.ts
@@ -1,14 +1,11 @@
 import {
   BIGINT_0,
-  VERKLE_BALANCE_LEAF_KEY,
+  VERKLE_BASIC_DATA_LEAF_KEY,
   VERKLE_CODE_HASH_LEAF_KEY,
   VERKLE_CODE_OFFSET,
-  VERKLE_CODE_SIZE_LEAF_KEY,
   VERKLE_HEADER_STORAGE_OFFSET,
   VERKLE_MAIN_STORAGE_OFFSET,
   VERKLE_NODE_WIDTH,
-  VERKLE_NONCE_LEAF_KEY,
-  VERKLE_VERSION_LEAF_KEY,
   bytesToBigInt,
   bytesToHex,
   getVerkleKey,
@@ -89,79 +86,64 @@ export class AccessWitness implements AccessWitnessInterface {
   touchAndChargeProofOfAbsence(address: Address): bigint {
     let gas = BIGINT_0
 
-    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_VERSION_LEAF_KEY)
-    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_BALANCE_LEAF_KEY)
-    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_CODE_SIZE_LEAF_KEY)
+    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_BASIC_DATA_LEAF_KEY)
     gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_CODE_HASH_LEAF_KEY)
-    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_NONCE_LEAF_KEY)
 
     return gas
   }
 
   touchAndChargeMessageCall(address: Address): bigint {
     let gas = BIGINT_0
 
-    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_VERSION_LEAF_KEY)
-    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_CODE_SIZE_LEAF_KEY)
+    gas += this.touchAddressOnReadAndComputeGas(address, 0, VERKLE_BASIC_DATA_LEAF_KEY)
 
     return gas
   }
 
   touchAndChargeValueTransfer(caller: Address, target: Address): bigint {
     let gas = BIGINT_0
 
-    gas += this.touchAddressOnWriteAndComputeGas(caller, 0, VERKLE_BALANCE_LEAF_KEY)
-    gas += this.touchAddressOnWriteAndComputeGas(target, 0, VERKLE_BALANCE_LEAF_KEY)
+    gas += this.touchAddressOnWriteAndComputeGas(caller, 0, VERKLE_BASIC_DATA_LEAF_KEY)
+    gas += this.touchAddressOnWriteAndComputeGas(target, 0, VERKLE_BASIC_DATA_LEAF_KEY)
 
     return gas
   }
 
   touchAndChargeContractCreateInit(address: Address): bigint {
     let gas = BIGINT_0
 
-    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_VERSION_LEAF_KEY)
-    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_NONCE_LEAF_KEY)
+    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_BASIC_DATA_LEAF_KEY)
 
     return gas
   }
 
   touchAndChargeContractCreateCompleted(address: Address): bigint {
     let gas = BIGINT_0
 
-    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_VERSION_LEAF_KEY)
-    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_BALANCE_LEAF_KEY)
-    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_CODE_SIZE_LEAF_KEY)
+    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_BASIC_DATA_LEAF_KEY)
     gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_CODE_HASH_LEAF_KEY)
-    gas += this.touchAddressOnWriteAndComputeGas(address, 0, VERKLE_NONCE_LEAF_KEY)
 
     return gas
   }
 
   touchTxOriginAndComputeGas(origin: Address): bigint {
     let gas = BIGINT_0
 
-    gas += this.touchAddressOnReadAndComputeGas(origin, 0, VERKLE_VERSION_LEAF_KEY)
-    gas += this.touchAddressOnReadAndComputeGas(origin, 0, VERKLE_CODE_SIZE_LEAF_KEY)
+    gas += this.touchAddressOnReadAndComputeGas(origin, 0, VERKLE_BASIC_DATA_LEAF_KEY)
     gas += this.touchAddressOnReadAndComputeGas(origin, 0, VERKLE_CODE_HASH_LEAF_KEY)
 
-    gas += this.touchAddressOnWriteAndComputeGas(origin, 0, VERKLE_NONCE_LEAF_KEY)
-    gas += this.touchAddressOnWriteAndComputeGas(origin, 0, VERKLE_BALANCE_LEAF_KEY)
-
     return gas
   }
 
   touchTxTargetAndComputeGas(target: Address, { sendsValue }: { sendsValue?: boolean } = {}) {
     let gas = BIGINT_0
 
-    gas += this.touchAddressOnReadAndComputeGas(target, 0, VERKLE_VERSION_LEAF_KEY)
-    gas += this.touchAddressOnReadAndComputeGas(target, 0, VERKLE_CODE_SIZE_LEAF_KEY)
     gas += this.touchAddressOnReadAndComputeGas(target, 0, VERKLE_CODE_HASH_LEAF_KEY)
-    gas += this.touchAddressOnReadAndComputeGas(target, 0, VERKLE_NONCE_LEAF_KEY)
 
     if (sendsValue === true) {
-      gas += this.touchAddressOnWriteAndComputeGas(target, 0, VERKLE_BALANCE_LEAF_KEY)
+      gas += this.touchAddressOnWriteAndComputeGas(target, 0, VERKLE_BASIC_DATA_LEAF_KEY)
     } else {
-      gas += this.touchAddressOnReadAndComputeGas(target, 0, VERKLE_BALANCE_LEAF_KEY)
+      gas += this.touchAddressOnReadAndComputeGas(target, 0, VERKLE_BASIC_DATA_LEAF_KEY)
     }
 
     return gas