verkle: remove verkle package (#4145)

* chore: initial verkle removal

* chore: cleanup more verkle stuff

* chore: cleanup verkle

* chore: more verkl removal

* fix: lintG

* chore: remove kaustinen

* chore: remove unused arg

Author: gabrocheleau

.github/ISSUE_TEMPLATE/package--ethereumjs-verkle.md

@@ -179,12 +179,6 @@ jobs:
     with:
       dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
 
-  verkle:
-    needs: build
-    uses: ./.github/workflows/verkle-build.yml
-    with:
-      dep-cache-key: ${{ needs.build.outputs.dep-cache-key }}
-
   vm-pr:
     needs: [build, checkout-submodules]
     uses: ./.github/workflows/vm-pr.yml

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           node-version: 20
           cache: 'npm'
-      
+
       - run: npm ci
         working-directory: ${{github.workspace}}
 
@@ -33,13 +33,13 @@ jobs:
         with:
           node-version: 20
           cache: 'npm'
-      
+
       - run: npm ci
         working-directory: ${{github.workspace}}
 
       - run: npm run test
         working-directory: ${{ github.workspace }}/packages/client
-  
+
   test-devp2p:
     runs-on: ubuntu-latest
     steps:
@@ -49,13 +49,13 @@ jobs:
         with:
           node-version: 20
           cache: 'npm'
-      
+
       - run: npm ci
         working-directory: ${{github.workspace}}
 
       - run: npm run test
         working-directory: ${{ github.workspace }}/packages/devp2p
-  
+
   test-wallet:
     runs-on: ubuntu-latest
     steps:
@@ -65,25 +65,9 @@ jobs:
         with:
           node-version: 20
           cache: 'npm'
-      
-      - run: npm ci
-        working-directory: ${{github.workspace}}
-
-      - run: npm run test
-        working-directory: ${{ github.workspace }}/packages/wallet
-  
-  test-verkle:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'npm'
-      
       - run: npm ci
         working-directory: ${{github.workspace}}
 
       - run: npm run test
-        working-directory: ${{ github.workspace }}/packages/verkle
+        working-directory: ${{ github.workspace }}/packages/wallet

.github/workflows/other-nightly.yml

@@ -22,7 +22,6 @@ COPY packages/rlp/dist packages/rlp/dist
 COPY packages/statemanager/dist packages/statemanager/dist
 COPY packages/tx/dist packages/tx/dist
 COPY packages/util/dist packages/util/dist
-COPY packages/verkle/dist packages/verkle/dist
 COPY packages/vm/dist packages/vm/dist
 COPY packages/wallet/dist packages/wallet/dist
 
@@ -42,7 +41,6 @@ COPY packages/rlp/package.json packages/rlp/package.json
 COPY packages/statemanager/package.json packages/statemanager/package.json
 COPY packages/tx/package.json packages/tx/package.json
 COPY packages/util/package.json packages/util/package.json
-COPY packages/verkle/package.json packages/verkle/package.json
 COPY packages/vm/package.json packages/vm/package.json
 COPY packages/wallet/package.json packages/wallet/package.json
 

.github/workflows/verkle-build.yml

@@ -54,7 +54,6 @@ The following packages are deprecated and will not be updated.
 | [@ethereumjs/client][client-package]             | [![NPM Package][client-npm-badge]][client-npm-link]             | [![Client Issues][client-issues-badge]][client-issues-link]                   | [![Actions Status][client-actions-badge]][client-actions-link]             | [![Code Coverage][client-coverage-badge]][client-coverage-link]             |
 | [@ethereumjs/devp2p][devp2p-package]             | [![NPM Package][devp2p-npm-badge]][devp2p-npm-link]             | [![Devp2p Issues][devp2p-issues-badge]][devp2p-issues-link]                   | [![Actions Status][devp2p-actions-badge]][devp2p-actions-link]             | [![Code Coverage][devp2p-coverage-badge]][devp2p-coverage-link]             |
 | [@ethereumjs/ethash][ethash-package]             | [![NPM Package][ethash-npm-badge]][ethash-npm-link]             | [![Ethash Issues][ethash-issues-badge]][ethash-issues-link]                   | [![Actions Status][ethash-actions-badge]][ethash-actions-link]             | [![Code Coverage][ethash-coverage-badge]][ethash-coverage-link]             |
-| [@ethereumjs/verkle][verkle-package]             | [![NPM Package][verkle-npm-badge]][verkle-npm-link]             | [![VM Issues][verkle-issues-badge]][verkle-issues-link]                       | [![Actions Status][verkle-actions-badge]][verkle-actions-link]             | [![Code Coverage][verkle-coverage-badge]][verkle-coverage-link]             |
 | [@ethereumjs/wallet][wallet-package]             | [![NPM Package][wallet-npm-badge]][wallet-npm-link]             | [![StateManager Issues][wallet-issues-badge]][wallet-issues-link]             | [![Actions Status][wallet-actions-badge]][wallet-actions-link]             | [![Code Coverage][wallet-coverage-badge]][wallet-coverage-link]             |
 
 ## Getting Started
@@ -127,9 +126,6 @@ To inspect code related to a specific package version, refer to the [tags](https
    mpt --> blockchain
    mpt --> block
    mpt --> statemanager
-   verkle --> vm
-   verkle --> evm
-   verkle --> statemanager
    binarytree --> vm
    binarytree --> statemanager
    util --> common
@@ -313,16 +309,6 @@ Most packages are [MPL-2.0](<https://tldrlegal.com/license/mozilla-public-licens
 [util-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/branch/master/graph/badge.svg?flag=util
 [util-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/tree/master/packages/util
 
-[verkle-package]: ./packages/verkle
-[verkle-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/verkle.svg
-[verkle-npm-link]: https://www.npmjs.com/package/@ethereumjs/verkle
-[verkle-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-monorepo/package:%20verkle?label=issues
-[verkle-issues-link]: https://github.com/ethereumjs/ethereumjs-monorepo/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+verkle"
-[verkle-actions-badge]: https://github.com/ethereumjs/ethereumjs-monorepo/workflows/Verkle/badge.svg
-[verkle-actions-link]: https://github.com/ethereumjs/ethereumjs-monorepo/actions?query=workflow%3A%22Verkle%22
-[verkle-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/branch/master/graph/badge.svg?flag=verkle
-[verkle-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/tree/master/packages/verkle
-
 [vm-package]: ./packages/vm
 [vm-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/vm.svg
 [vm-npm-link]: https://www.npmjs.com/package/@ethereumjs/vm

Dockerfile

@@ -168,7 +168,6 @@
     "validblock",
     "rustbn",
     "Preimage",
-    "verkle",
     "Preimages",
     "modexp",
     "roninjin",

README.md

@@ -42,8 +42,6 @@
     "ethash",
     "KECCAK",
     "keccak",
-    "Verkle",
-    "verkle",
     "maxblob",
     "Randao",
     "hardforks",
@@ -643,4 +641,4 @@
     "getpayload",
     "ckzg"
   ]
-}
+}

config/cspell-md.json

@@ -15,7 +15,7 @@ import { sha256 } from 'ethereum-cryptography/sha256.js'
 
 import type { Common } from '@ethereumjs/common'
 import type { FeeMarket1559Tx, LegacyTx, TypedTransaction } from '@ethereumjs/tx'
-import type { VerkleExecutionWitness, Withdrawal } from '@ethereumjs/util'
+import type { Withdrawal } from '@ethereumjs/util'
 /* eslint-disable */
 // This is to allow for a proper and linked collection of constructors for the class header.
 // For tree shaking/code size this should be no problem since types go away on transpilation.
@@ -62,13 +62,6 @@ export class Block {
   protected keccakFunction: (msg: Uint8Array) => Uint8Array
   protected sha256Function: (msg: Uint8Array) => Uint8Array
 
-  /**
-   * EIP-6800: Verkle Proof Data (experimental)
-   * null implies that the non default executionWitness might exist but not available
-   * and will not lead to execution of the block via vm with verkle stateless manager
-   */
-  public readonly executionWitness?: VerkleExecutionWitness | null
-
   protected cache: {
     txTrieRoot?: Uint8Array
     withdrawalsTrieRoot?: Uint8Array
@@ -86,7 +79,6 @@ export class Block {
     uncleHeaders: BlockHeader[] = [],
     withdrawals?: Withdrawal[],
     opts: BlockOptions = {},
-    executionWitness?: VerkleExecutionWitness | null,
   ) {
     this.header = header ?? new BlockHeader({}, opts)
     this.common = this.header.common
@@ -95,27 +87,6 @@ export class Block {
 
     this.transactions = transactions
     this.withdrawals = withdrawals ?? (this.common.isActivatedEIP(4895) ? [] : undefined)
-    this.executionWitness = executionWitness
-    // null indicates an intentional absence of value or unavailability
-    // 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: [],
-          d: '0x',
-          depthExtensionPresent: '0x',
-          ipaProof: {
-            cl: [],
-            cr: [],
-            finalEvaluation: '0x',
-          },
-          otherStems: [],
-        },
-      }
-    }
 
     this.uncleHeaders = uncleHeaders
     if (uncleHeaders.length > 0) {
@@ -138,16 +109,6 @@ export class Block {
       throw EthereumJSErrorWithoutCode('Cannot have a withdrawals field if EIP 4895 is not active')
     }
 
-    if (
-      !this.common.isActivatedEIP(6800) &&
-      executionWitness !== undefined &&
-      executionWitness !== null
-    ) {
-      throw EthereumJSErrorWithoutCode(
-        `Cannot have executionWitness field if EIP 6800 is not active `,
-      )
-    }
-
     const freeze = opts?.freeze ?? true
     if (freeze) {
       Object.freeze(this)
@@ -170,10 +131,6 @@ export class Block {
       bytesArray.push(withdrawalsRaw)
     }
 
-    if (this.executionWitness !== undefined && this.executionWitness !== null) {
-      const executionWitnessBytes = RLP.encode(JSON.stringify(this.executionWitness))
-      bytesArray.push(executionWitnessBytes as any)
-    }
     return bytesArray
   }
 
@@ -335,20 +292,6 @@ export class Block {
       const msg = this._errorMsg('invalid withdrawals trie')
       throw EthereumJSErrorWithoutCode(msg)
     }
-
-    // Validation for Verkle blocks
-    // Unnecessary in this implementation since we're providing defaults if those fields are undefined
-    // TODO: Decide if we should actually require this or not
-    if (this.common.isActivatedEIP(6800)) {
-      if (this.executionWitness === undefined) {
-        throw EthereumJSErrorWithoutCode(`Invalid block: missing executionWitness`)
-      }
-      if (this.executionWitness === null) {
-        throw EthereumJSErrorWithoutCode(
-          `Invalid block: ethereumjs stateless client needs executionWitness`,
-        )
-      }
-    }
   }
 
   /**
@@ -526,7 +469,6 @@ export class Block {
       ...withdrawalsArr,
       parentBeaconBlockRoot: header.parentBeaconBlockRoot,
       requestsHash: header.requestsHash,
-      executionWitness: this.executionWitness,
     }
 
     return executionPayload