From 1b6d696b8ed2dd85ec8af40c5fdc1cceeb5c7a7b Mon Sep 17 00:00:00 2001
From: Gabriel Rocheleau <contact@rockwaterweb.com>
Date: Wed, 10 Jul 2024 20:16:10 -0400
Subject: [PATCH] verkle: address merge conflicts and refactors

---
 packages/evm/src/opcodes/gas.ts               |  2 +-
 .../src/statelessVerkleStateManager.ts        | 10 +--
 packages/util/src/verkle.ts                   | 62 +++++++++++++++++++
 packages/verkle/src/constants.ts              | 24 -------
 packages/verkle/src/index.ts                  |  1 -
 packages/verkle/src/node/util.ts              | 51 +--------------
 6 files changed, 70 insertions(+), 80 deletions(-)
 delete mode 100644 packages/verkle/src/constants.ts

diff --git a/packages/evm/src/opcodes/gas.ts b/packages/evm/src/opcodes/gas.ts
index 0100d38bf0..ade64847b8 100644
--- a/packages/evm/src/opcodes/gas.ts
+++ b/packages/evm/src/opcodes/gas.ts
@@ -261,7 +261,7 @@ export const dynamicGasHandlers: Map<number, AsyncDynamicGasHandler | SyncDynami
           coldAccessGas += runState.env.accessWitness!.touchAddressOnReadAndComputeGas(
             codeAddress,
             0,
-            VERKLE_BASIC_DATA_LEAF_KEY
+            VERKLE_CODE_HASH_LEAF_KEY
           )
 
           gas += coldAccessGas
diff --git a/packages/statemanager/src/statelessVerkleStateManager.ts b/packages/statemanager/src/statelessVerkleStateManager.ts
index 7a75acaf2a..ba10d55bdf 100644
--- a/packages/statemanager/src/statelessVerkleStateManager.ts
+++ b/packages/statemanager/src/statelessVerkleStateManager.ts
@@ -4,9 +4,9 @@ import {
   KECCAK256_NULL_S,
   VerkleLeafType,
   bigIntToBytes,
-  bytesToBigInt,
   bytesToHex,
-  bytesToInt32,
+  decodeVerkleLeafBasicData,
+  encodeVerkleLeafBasicData,
   getVerkleKey,
   getVerkleStem,
   getVerkleTreeKeyForCodeChunk,
@@ -549,7 +549,9 @@ export class StatelessVerkleStateManager implements EVMStateManagerInterface {
       throw Error(errorMsg)
     }
 
-    const { version, balance, nonce, codeSize } = decodeLeafBasicData(hexToBytes(basicDataRaw))
+    const { version, balance, nonce, codeSize } = decodeVerkleLeafBasicData(
+      hexToBytes(basicDataRaw)
+    )
 
     const account = Account.fromPartialAccountData({
       version,
@@ -582,7 +584,7 @@ export class StatelessVerkleStateManager implements EVMStateManagerInterface {
     if (this._accountCacheSettings.deactivate) {
       const stem = getVerkleStem(this.verkleCrypto, address, 0)
       const basicDataKey = getVerkleKey(stem, VerkleLeafType.BasicData)
-      const basicDataBytes = encodeLeafBasicData({
+      const basicDataBytes = encodeVerkleLeafBasicData({
         version: account.version,
         balance: account.balance,
         nonce: account.nonce,
diff --git a/packages/util/src/verkle.ts b/packages/util/src/verkle.ts
index 6e4a591e00..eeff673509 100644
--- a/packages/util/src/verkle.ts
+++ b/packages/util/src/verkle.ts
@@ -1,5 +1,7 @@
 import {
   bigIntToBytes,
+  bytesToBigInt,
+  bytesToInt32,
   concatBytes,
   int32ToBytes,
   intToBytes,
@@ -124,6 +126,23 @@ export enum VerkleLeafType {
   CodeHash = 1,
 }
 
+export type VerkleLeafBasicData = {
+  version: number
+  nonce: bigint
+  balance: bigint
+  codeSize: number
+}
+
+export const VERKLE_VERSION_OFFSET = 0
+export const VERKLE_NONCE_OFFSET = 4
+export const VERKLE_CODE_SIZE_OFFSET = 12
+export const VERKLE_BALANCE_OFFSET = 16
+
+export const VERKLE_VERSION_BYTES_LENGTH = 1
+export const VERKLE_NONCE_BYTES_LENGTH = 8
+export const VERKLE_CODE_SIZE_BYTES_LENGTH = 4
+export const VERKLE_BALANCE_BYTES_LENGTH = 16
+
 export const VERKLE_BASIC_DATA_LEAF_KEY = intToBytes(VerkleLeafType.BasicData)
 export const VERKLE_CODE_HASH_LEAF_KEY = intToBytes(VerkleLeafType.CodeHash)
 
@@ -202,3 +221,46 @@ export const getVerkleTreeKeyForStorageSlot = async (
 
   return concatBytes(getVerkleStem(verkleCrypto, address, treeIndex), toBytes(subIndex))
 }
+
+export function decodeVerkleLeafBasicData(encodedBasicData: Uint8Array): VerkleLeafBasicData {
+  const versionBytes = encodedBasicData.slice(0, VERKLE_VERSION_BYTES_LENGTH)
+  const nonceBytes = encodedBasicData.slice(
+    VERKLE_NONCE_OFFSET,
+    VERKLE_NONCE_OFFSET + VERKLE_NONCE_BYTES_LENGTH
+  )
+  const codeSizeBytes = encodedBasicData.slice(
+    VERKLE_CODE_SIZE_OFFSET,
+    VERKLE_CODE_SIZE_OFFSET + VERKLE_CODE_SIZE_BYTES_LENGTH
+  )
+  const balanceBytes = encodedBasicData.slice(
+    VERKLE_BALANCE_OFFSET,
+    VERKLE_BALANCE_OFFSET + VERKLE_BALANCE_BYTES_LENGTH
+  )
+
+  const version = bytesToInt32(versionBytes, true)
+  const nonce = bytesToBigInt(nonceBytes, true)
+  const codeSize = bytesToInt32(codeSizeBytes, true)
+  const balance = bytesToBigInt(balanceBytes, true)
+
+  return { version, nonce, codeSize, balance }
+}
+
+export function encodeVerkleLeafBasicData(basicData: VerkleLeafBasicData): Uint8Array {
+  const encodedVersion = setLengthRight(
+    int32ToBytes(basicData.version, true),
+    VERKLE_VERSION_BYTES_LENGTH
+  )
+  const encodedNonce = setLengthRight(
+    bigIntToBytes(basicData.nonce, true),
+    VERKLE_NONCE_BYTES_LENGTH
+  )
+  const encodedCodeSize = setLengthRight(
+    int32ToBytes(basicData.codeSize, true),
+    VERKLE_CODE_SIZE_BYTES_LENGTH
+  )
+  const encodedBalance = setLengthRight(
+    bigIntToBytes(basicData.balance, true),
+    VERKLE_BALANCE_BYTES_LENGTH
+  )
+  return concatBytes(encodedVersion, encodedNonce, encodedCodeSize, encodedBalance)
+}
diff --git a/packages/verkle/src/constants.ts b/packages/verkle/src/constants.ts
deleted file mode 100644
index 98fc8d133d..0000000000
--- a/packages/verkle/src/constants.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { intToBytes } from '@ethereumjs/util'
-
-export enum LeafType {
-  BasicData = 0,
-  CodeHash = 1,
-}
-
-export const VERSION_OFFSET = 0
-export const NONCE_OFFSET = 4
-export const CODE_SIZE_OFFSET = 12
-export const BALANCE_OFFSET = 16
-
-export const VERSION_BYTES_LENGTH = 1
-export const NONCE_BYTES_LENGTH = 8
-export const CODE_SIZE_BYTES_LENGTH = 4
-export const BALANCE_BYTES_LENGTH = 16
-
-export const BASIC_DATA_LEAF_KEY = intToBytes(LeafType.BasicData)
-export const CODE_HASH_LEAF_KEY = intToBytes(LeafType.CodeHash)
-
-export const HEADER_STORAGE_OFFSET = 64
-export const CODE_OFFSET = 128
-export const VERKLE_NODE_WIDTH = 256
-export const MAIN_STORAGE_OFFSET = BigInt(256) ** BigInt(31)
diff --git a/packages/verkle/src/index.ts b/packages/verkle/src/index.ts
index a316ad72a9..d7fde388d7 100644
--- a/packages/verkle/src/index.ts
+++ b/packages/verkle/src/index.ts
@@ -1,4 +1,3 @@
-export * from './constants.js'
 export * from './db/index.js'
 export * from './node/index.js'
 export * from './types.js'
diff --git a/packages/verkle/src/node/util.ts b/packages/verkle/src/node/util.ts
index 3eec4b34de..72c1953034 100644
--- a/packages/verkle/src/node/util.ts
+++ b/packages/verkle/src/node/util.ts
@@ -1,28 +1,10 @@
 import { RLP } from '@ethereumjs/rlp'
-import {
-  bigIntToBytes,
-  bytesToBigInt,
-  bytesToInt32,
-  concatBytes,
-  int32ToBytes,
-  setLengthRight,
-} from '@ethereumjs/util'
-
-import {
-  BALANCE_BYTES_LENGTH,
-  BALANCE_OFFSET,
-  CODE_SIZE_BYTES_LENGTH,
-  CODE_SIZE_OFFSET,
-  NONCE_BYTES_LENGTH,
-  NONCE_OFFSET,
-  VERSION_BYTES_LENGTH,
-} from '../constants.js'
+import { setLengthRight } from '@ethereumjs/util'
 
 import { InternalNode } from './internalNode.js'
 import { LeafNode } from './leafNode.js'
 import { VerkleLeafNodeValue, type VerkleNode, VerkleNodeType } from './types.js'
 
-import type { VerkleLeafBasicData } from '../types.js'
 import type { VerkleCrypto } from '@ethereumjs/util'
 
 export function decodeRawNode(raw: Uint8Array[], verkleCrypto: VerkleCrypto): VerkleNode {
@@ -113,34 +95,3 @@ export const createCValues = (values: (Uint8Array | VerkleLeafNodeValue)[]) => {
   }
   return expandedValues
 }
-
-export function decodeLeafBasicData(encodedBasicData: Uint8Array): VerkleLeafBasicData {
-  const versionBytes = encodedBasicData.slice(0, VERSION_BYTES_LENGTH)
-  const nonceBytes = encodedBasicData.slice(NONCE_OFFSET, NONCE_OFFSET + NONCE_BYTES_LENGTH)
-  const codeSizeBytes = encodedBasicData.slice(
-    CODE_SIZE_OFFSET,
-    CODE_SIZE_OFFSET + CODE_SIZE_BYTES_LENGTH
-  )
-  const balanceBytes = encodedBasicData.slice(BALANCE_OFFSET, BALANCE_OFFSET + BALANCE_BYTES_LENGTH)
-
-  const version = bytesToInt32(versionBytes, true)
-  const nonce = bytesToBigInt(nonceBytes, true)
-  const codeSize = bytesToInt32(codeSizeBytes, true)
-  const balance = bytesToBigInt(balanceBytes, true)
-
-  return { version, nonce, codeSize, balance }
-}
-
-export function encodeLeafBasicData(basicData: VerkleLeafBasicData): Uint8Array {
-  const encodedVersion = setLengthRight(int32ToBytes(basicData.version, true), VERSION_BYTES_LENGTH)
-  const encodedNonce = setLengthRight(bigIntToBytes(basicData.nonce, true), NONCE_BYTES_LENGTH)
-  const encodedCodeSize = setLengthRight(
-    int32ToBytes(basicData.codeSize, true),
-    CODE_SIZE_BYTES_LENGTH
-  )
-  const encodedBalance = setLengthRight(
-    bigIntToBytes(basicData.balance, true),
-    BALANCE_BYTES_LENGTH
-  )
-  return concatBytes(encodedVersion, encodedNonce, encodedCodeSize, encodedBalance)
-}