Move all kzg stuff to util

packages/block/test/eip4844block.spec.ts

@@ -1,10 +1,11 @@
 import { Chain, Common, Hardfork } from '@ethereumjs/common'
-import { BlobEIP4844Transaction, initKZG } from '@ethereumjs/tx'
+import { BlobEIP4844Transaction } from '@ethereumjs/tx'
 import {
   blobsToCommitments,
   commitmentsToVersionedHashes,
   getBlobs,
-} from '@ethereumjs/tx/dist/utils/blobHelpers'
+  initKZG,
+} from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import { randomBytes } from 'crypto'
 import * as tape from 'tape'

packages/client/bin/cli.ts

@@ -4,8 +4,7 @@ import { Block } from '@ethereumjs/block'
 import { Blockchain, parseGethGenesisState } from '@ethereumjs/blockchain'
 import { Chain, Common, ConsensusAlgorithm, Hardfork } from '@ethereumjs/common'
 import { RLP } from '@ethereumjs/rlp'
-import { initKZG } from '@ethereumjs/tx'
-import { Address, arrToBufArr, short, toBuffer } from '@ethereumjs/util'
+import { Address, arrToBufArr, initKZG, short, toBuffer } from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import { randomBytes } from 'crypto'
 import { existsSync, writeFileSync } from 'fs'

packages/client/devnets/4844-interop/tools/txGenerator.ts

@@ -1,12 +1,13 @@
 // Adapted from - https://github.com/Inphi/eip4844-interop/blob/master/blob_tx_generator/blob.js
 import { Common, Hardfork } from '@ethereumjs/common'
-import { BlobEIP4844Transaction, initKZG } from '@ethereumjs/tx'
+import { BlobEIP4844Transaction } from '@ethereumjs/tx'
 import {
+  Address,
+  initKZG,
   blobsToCommitments,
   commitmentsToVersionedHashes,
   getBlobs,
-} from '@ethereumjs/tx/dist/utils/blobHelpers'
-import { Address } from '@ethereumjs/util'
+} from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import { randomBytes } from 'crypto'
 import { Client } from 'jayson/promise'

packages/client/test/miner/pendingBlock.spec.ts

@@ -1,12 +1,15 @@
 import { Block, BlockHeader } from '@ethereumjs/block'
 import { Common, Chain as CommonChain, Hardfork } from '@ethereumjs/common'
-import { BlobEIP4844Transaction, Transaction, initKZG } from '@ethereumjs/tx'
+import { BlobEIP4844Transaction, Transaction } from '@ethereumjs/tx'
 import {
+  Account,
+  Address,
   blobsToCommitments,
+  bufferToHex,
   commitmentsToVersionedHashes,
   getBlobs,
-} from '@ethereumjs/tx/dist/utils/blobHelpers'
-import { Account, Address, bufferToHex } from '@ethereumjs/util'
+  initKZG,
+} from '@ethereumjs/util'
 import { VM } from '@ethereumjs/vm'
 import { VmState } from '@ethereumjs/vm/dist/eei/vmState'
 import * as kzg from 'c-kzg'

packages/client/test/rpc/engine/getBlobsBundleV1.spec.ts

@@ -1,7 +1,7 @@
 import { Hardfork } from '@ethereumjs/common'
 import { DefaultStateManager } from '@ethereumjs/statemanager'
-import { TransactionFactory, initKZG } from '@ethereumjs/tx'
-import { Address } from '@ethereumjs/util'
+import { TransactionFactory } from '@ethereumjs/tx'
+import { Address, initKZG } from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import * as tape from 'tape'
 

packages/client/test/rpc/eth/sendRawTransaction.spec.ts

@@ -1,18 +1,14 @@
 import { BlockHeader } from '@ethereumjs/block'
 import { Chain, Common, Hardfork } from '@ethereumjs/common'
 import { DefaultStateManager } from '@ethereumjs/statemanager'
-import {
-  BlobEIP4844Transaction,
-  FeeMarketEIP1559Transaction,
-  Transaction,
-  initKZG,
-} from '@ethereumjs/tx'
+import { BlobEIP4844Transaction, FeeMarketEIP1559Transaction, Transaction } from '@ethereumjs/tx'
 import {
   blobsToCommitments,
   commitmentsToVersionedHashes,
   getBlobs,
-} from '@ethereumjs/tx/dist/utils/blobHelpers'
-import { toBuffer } from '@ethereumjs/util'
+  initKZG,
+  toBuffer,
+} from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import { randomBytes } from 'crypto'
 import * as tape from 'tape'

packages/client/test/sim/simutils.ts

@@ -1,12 +1,13 @@
 import { Blockchain } from '@ethereumjs/blockchain'
-import { BlobEIP4844Transaction, FeeMarketEIP1559Transaction, initKZG } from '@ethereumjs/tx'
+import { BlobEIP4844Transaction, FeeMarketEIP1559Transaction } from '@ethereumjs/tx'
 import {
+  Address,
   blobsToCommitments,
   blobsToProofs,
   commitmentsToVersionedHashes,
   getBlobs,
-} from '@ethereumjs/tx/dist/utils/blobHelpers'
-import { Address } from '@ethereumjs/util'
+  initKZG,
+} from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import { randomBytes } from 'crypto'
 import * as fs from 'fs/promises'

packages/client/test/sim/txGenerator.ts

@@ -1,10 +1,11 @@
 // Adapted from - https://github.com/Inphi/eip4844-interop/blob/master/blob_tx_generator/blob.js
-import { BlobEIP4844Transaction, initKZG } from '@ethereumjs/tx'
+import { BlobEIP4844Transaction } from '@ethereumjs/tx'
 import {
+  Address,
   blobsToCommitments,
   commitmentsToVersionedHashes,
-} from '@ethereumjs/tx/test/utils/blobHelpers'
-import { Address } from '@ethereumjs/util'
+  initKZG,
+} from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import { randomBytes } from 'crypto'
 import { Client } from 'jayson/promise'

packages/evm/package.json

@@ -47,7 +47,6 @@
   },
   "dependencies": {
     "@ethereumjs/common": "^3.1.1",
-    "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethersproject/providers": "^5.7.1",
     "debug": "^4.3.3",

packages/evm/src/precompiles/14-kzg-point-evaluation.ts

@@ -1,5 +1,12 @@
-import { computeVersionedHash, kzg } from '@ethereumjs/tx'
-import { bigIntToBuffer, bufferToBigInt, bufferToHex, setLengthLeft, short } from '@ethereumjs/util'
+import {
+  bigIntToBuffer,
+  bufferToBigInt,
+  bufferToHex,
+  computeVersionedHash,
+  kzg,
+  setLengthLeft,
+  short,
+} from '@ethereumjs/util'
 
 import { EvmErrorResult } from '../evm'
 import { ERROR, EvmError } from '../exceptions'

packages/evm/test/precompiles/14-pointevaluation.spec.ts

@@ -1,6 +1,11 @@
 import { Common, Hardfork } from '@ethereumjs/common'
-import { computeVersionedHash, initKZG } from '@ethereumjs/tx'
-import { bigIntToBuffer, bufferToBigInt, unpadBuffer } from '@ethereumjs/util'
+import {
+  bigIntToBuffer,
+  bufferToBigInt,
+  computeVersionedHash,
+  initKZG,
+  unpadBuffer,
+} from '@ethereumjs/util'
 import * as kzg from 'c-kzg'
 import * as tape from 'tape'
 

packages/tx/src/eip4844Transaction.ts

@@ -6,21 +6,21 @@ import {
   bigIntToUnpaddedBuffer,
   bufferToBigInt,
   bufferToHex,
+  computeVersionedHash,
   ecrecover,
+  kzg,
   toBuffer,
 } from '@ethereumjs/util'
 import { keccak256 } from 'ethereum-cryptography/keccak'
 
 import { BaseTransaction } from './baseTransaction'
 import { LIMIT_BLOBS_PER_TX } from './constants'
-import { kzg } from './kzg/kzg'
 import {
   BlobNetworkTransactionWrapper,
   BlobTransactionType,
   SignedBlobTransactionType,
 } from './types'
 import { AccessLists, blobTxToNetworkWrapperDataFormat } from './util'
-import { computeVersionedHash } from './utils/blobHelpers'
 
 import type {
   AccessList,

packages/tx/src/index.ts

@@ -1,8 +1,6 @@
 export { FeeMarketEIP1559Transaction } from './eip1559Transaction'
 export { AccessListEIP2930Transaction } from './eip2930Transaction'
 export { BlobEIP4844Transaction } from './eip4844Transaction'
-export { initKZG, kzg } from './kzg/kzg'
 export { Transaction } from './legacyTransaction'
 export { TransactionFactory } from './transactionFactory'
 export * from './types'
-export { computeVersionedHash } from './utils/blobHelpers'

packages/tx/test/eip4844.spec.ts

@@ -1,15 +1,16 @@
 import { Common, Hardfork } from '@ethereumjs/common'
-import * as kzg from 'c-kzg'
-import { randomBytes } from 'crypto'
-import * as tape from 'tape'
-
-import { BlobEIP4844Transaction, TransactionFactory, initKZG } from '../src'
 import {
   blobsToCommitments,
   blobsToProofs,
   commitmentsToVersionedHashes,
   getBlobs,
-} from '../src/utils/blobHelpers'
+  initKZG,
+} from '@ethereumjs/util'
+import * as kzg from 'c-kzg'
+import { randomBytes } from 'crypto'
+import * as tape from 'tape'
+
+import { BlobEIP4844Transaction, TransactionFactory } from '../src'
 
 // Hack to detect if running in browser or not
 const isBrowser = new Function('try {return this===window;}catch(e){ return false;}')

packages/util/package.json

@@ -91,6 +91,14 @@
     "@types/bn.js": "^5.1.0",
     "@types/secp256k1": "^4.0.1"
   },
+  "peerDependencies": {
+    "c-kzg": "^2.0.0"
+  },
+  "peerDependenciesMeta": {
+    "c-kzg": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": ">=14"
   }

packages/tx/src/utils/blobHelpers.ts → packages/util/src/blobHelpers.ts

@@ -1,6 +1,6 @@
 import { sha256 } from 'ethereum-cryptography/sha256'
 
-import { kzg } from '../kzg/kzg'
+import { kzg } from './kzg'
 
 /**
  * These utilities for constructing blobs are borrowed from https://github.com/Inphi/eip4844-interop.git

packages/util/src/index.ts

@@ -52,6 +52,7 @@ export * from './encoding'
  * Export ethjs-util methods
  */
 export * from './asyncEventEmitter'
+export * from './blobHelpers'
 export {
   arrayContainsArray,
   fromAscii,
@@ -64,4 +65,5 @@ export {
   stripHexPrefix,
   toAscii,
 } from './internal'
+export * from './kzg'
 export * from './lock'

packages/tx/src/kzg/kzg.ts → packages/util/src/kzg.ts

@@ -1,4 +1,23 @@
-import type { Kzg } from '../depInterfaces'
+/**
+ * Interface for an externally provided kzg library used when creating blob transactions
+ */
+export interface Kzg {
+  loadTrustedSetup(filePath: string): void
+  freeTrustedSetup(): void
+  blobToKzgCommitment(blob: Uint8Array): Uint8Array
+  computeBlobKzgProof(blob: Uint8Array): Uint8Array
+  verifyKzgProof(
+    polynomialKzg: Uint8Array,
+    z: Uint8Array,
+    y: Uint8Array,
+    kzgProof: Uint8Array
+  ): boolean
+  verifyBlobKzgProofBatch(
+    blobs: Uint8Array[],
+    expectedKzgCommitments: Uint8Array[],
+    kzgProofs: Uint8Array[]
+  ): boolean
+}
 
 function kzgNotLoaded(): never {
   throw Error('kzg library not loaded')