chore: remove circular dep

gabrocheleau · gabrocheleau · commit 195925f31ac2 · 2025-10-02T08:54:41.000-04:00
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -67,6 +67,7 @@
     "eventemitter3": "^5.0.1"
   },
   "devDependencies": {
+    "@ethereumjs/testdata": "workspace:*",
     "@polkadot/util": "^13.4.3",
     "@polkadot/wasm-crypto": "^7.4.1",
     "ethereum-cryptography": "^3.2.0"
diff --git a/packages/testdata/package.json b/packages/testdata/package.json
@@ -21,9 +21,5 @@
     "lint": "pnpm run biome && eslint --config ./eslint.config.mjs .",
     "lint:fix": "pnpm run biome:fix && eslint --fix --config ./eslint.config.mjs .",
     "tsc": "../../config/cli/ts-compile.sh"
-  },
-  "devDependencies": {
-    "@ethereumjs/common": "workspace:*",
-    "@ethereumjs/util": "workspace:*"
   }
 }
diff --git a/packages/testdata/src/blocks/preLondonTestDataBlocks1RLP.ts b/packages/testdata/src/blocks/preLondonTestDataBlocks1RLP.ts
@@ -1,4 +1,4 @@
-import type { PrefixedHexString } from '@ethereumjs/util'
+import type { PrefixedHexString } from '../types.js'
 
 export const preLondonTestDataBlocks1RLP: {
   blockRLP: PrefixedHexString
diff --git a/packages/testdata/src/blocks/preLondonTestDataBlocks2RLP.ts b/packages/testdata/src/blocks/preLondonTestDataBlocks2RLP.ts
@@ -1,4 +1,4 @@
-import type { PrefixedHexString } from '@ethereumjs/util'
+import type { PrefixedHexString } from '../types.js'
 
 export const preLondonTestDataBlocks2RLP: Record<string, PrefixedHexString> = {
   block0RLP:
diff --git a/packages/testdata/src/chainConfigs/customChainConfig.ts b/packages/testdata/src/chainConfigs/customChainConfig.ts
@@ -1,4 +1,4 @@
-import type { ChainConfig } from '@ethereumjs/common'
+import type { ChainConfig } from '../types.js'
 
 export const customChainConfig: ChainConfig = {
   name: 'testnet',
diff --git a/packages/testdata/src/chainConfigs/goerliChainConfig.ts b/packages/testdata/src/chainConfigs/goerliChainConfig.ts
@@ -1,4 +1,4 @@
-import type { ChainConfig } from '@ethereumjs/common'
+import type { ChainConfig } from '../types.js'
 
 export const goerliChainConfig: ChainConfig = {
   name: 'goerli',
diff --git a/packages/testdata/src/chainConfigs/testnetMergeChainConfig.ts b/packages/testdata/src/chainConfigs/testnetMergeChainConfig.ts
@@ -1,4 +1,4 @@
-import type { ChainConfig } from '@ethereumjs/common'
+import type { ChainConfig } from '../types.js'
 
 export const testnetMergeChainConfig: ChainConfig = {
   name: 'testnetMerge',
diff --git a/packages/testdata/src/gethGenesis/eip4844GethGenesis.ts b/packages/testdata/src/gethGenesis/eip4844GethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const eip4844GethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/gethGenesis/goerliGethGenesis.ts b/packages/testdata/src/gethGenesis/goerliGethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const goerliGethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/gethGenesis/invalidSpuriousDragonGethGenesis.ts b/packages/testdata/src/gethGenesis/invalidSpuriousDragonGethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const invalidSpuriousDragonGethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/gethGenesis/kilnGethGenesis.ts b/packages/testdata/src/gethGenesis/kilnGethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const kilnGethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/gethGenesis/postMergeGethGenesis.ts b/packages/testdata/src/gethGenesis/postMergeGethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const postMergeGethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/gethGenesis/shanghaiTimeGethGenesis.ts b/packages/testdata/src/gethGenesis/shanghaiTimeGethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const shanghaiTimeGethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/gethGenesis/verkleKaustinenGethGenesis.ts b/packages/testdata/src/gethGenesis/verkleKaustinenGethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const verkleKaustinenGethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/gethGenesis/withdrawalsGethGenesis.ts b/packages/testdata/src/gethGenesis/withdrawalsGethGenesis.ts
@@ -1,4 +1,4 @@
-import type { GethGenesis } from '@ethereumjs/common'
+import type { GethGenesis } from '../types.js'
 
 export const withdrawalsGethGenesis: GethGenesis = {
   config: {
diff --git a/packages/testdata/src/types.ts b/packages/testdata/src/types.ts
@@ -1,6 +1,6 @@
 /**
  * Local type definitions for testdata package
- * These are minimal types that avoid circular dependencies with @ethereumjs/block
+ * These are minimal types that avoid circular dependencies with @ethereumjs/block and @ethereumjs/common
  */
 
 export interface BlockData {
@@ -34,3 +34,163 @@ export interface BlockData {
 }
 
 export type PrefixedHexString = string
+
+/**
+ * Local copy of ChainConfig and related interfaces to avoid circular dependency with @ethereumjs/common
+ */
+export interface ChainConfig {
+  name: string
+  chainId: number | string
+  defaultHardfork?: string
+  comment?: string
+  url?: string
+  genesis: GenesisBlockConfig
+  hardforks: HardforkTransitionConfig[]
+  customHardforks?: HardforksDict
+  bootstrapNodes: BootstrapNodeConfig[]
+  dnsNetworks?: string[]
+  consensus: ConsensusConfig
+  depositContractAddress?: PrefixedHexString
+}
+
+export interface GenesisBlockConfig {
+  timestamp?: PrefixedHexString
+  gasLimit: number | PrefixedHexString
+  difficulty: number | PrefixedHexString
+  nonce: PrefixedHexString
+  extraData: PrefixedHexString
+  baseFeePerGas?: PrefixedHexString
+  excessBlobGas?: PrefixedHexString
+  requestsHash?: PrefixedHexString
+}
+
+export interface HardforkTransitionConfig {
+  name: string
+  block: number | null
+  timestamp?: number | string
+  forkHash?: PrefixedHexString | null
+  ttd?: number | null
+}
+
+export interface HardforksDict {
+  [key: string]: HardforkTransitionConfig
+}
+
+export interface BootstrapNodeConfig {
+  ip: string
+  port: number | string
+  network?: string
+  chainId?: number
+  id: string
+  location: string
+  comment: string
+}
+
+export type ConsensusType = 'pow' | 'poa' | 'casper'
+export type ConsensusAlgorithm = 'ethash' | 'clique' | 'casper'
+
+export type CliqueConfig = {
+  period: number
+  epoch: number
+}
+
+export type EthashConfig = {}
+
+export type CasperConfig = {}
+
+type ConsensusConfig = {
+  type: ConsensusType | string
+  algorithm: ConsensusAlgorithm | string
+  clique?: CliqueConfig
+  ethash?: EthashConfig
+  casper?: CasperConfig
+}
+
+/**
+ * Local copy of GethGenesis interface to avoid circular dependency with @ethereumjs/common
+ */
+export interface GethGenesisConfig {
+  chainId: number
+  depositContractAddress?: string
+  homesteadBlock?: number
+  daoForkBlock?: number
+  daoForkSupport?: boolean
+  eip150Block?: number
+  eip150Hash?: string
+  eip155Block?: number
+  eip158Block?: number
+  byzantiumBlock?: number
+  constantinopleBlock?: number
+  petersburgBlock?: number
+  istanbulBlock?: number
+  muirGlacierBlock?: number
+  berlinBlock?: number
+  londonBlock?: number
+  mergeForkBlock?: number
+  cancunBlock?: number
+  arrowGlacierBlock?: number
+  grayGlacierBlock?: number
+  mergeNetsplitBlock?: number
+  shanghaiTime?: number
+  cancunTime?: number
+  pragueTime?: number
+  verkleTime?: number
+  terminalTotalDifficulty?: number
+  terminalTotalDifficultyPassed?: boolean
+  ethash?: {}
+  clique?: {
+    period?: number
+    epoch?: number
+    blockperiodseconds?: number
+    epochlength?: number
+  }
+  trustedCheckpoint?: {
+    sectionIndex: number
+    sectionHead: string
+    chtRoot: string
+    bloomRoot: string
+  }
+  trustedCheckpointOracle?: {
+    address: string
+    signers: string[]
+    threshold: number
+  }
+  blobSchedule?: GethGenesisBlobSchedule
+  proofInBlocks?: boolean
+}
+
+export interface GethGenesisAlloc {
+  [address: string]: {
+    balance: string
+    code?: string
+    storage?: { [key: string]: string }
+    nonce?: string
+  }
+}
+
+export interface GethGenesisBlobSchedule {
+  [fork: string]: {
+    target?: number
+    max?: number
+    baseFeeUpdateFraction?: number
+  }
+}
+
+export interface GethGenesis {
+  config: GethGenesisConfig
+  name?: string
+  excessBlobGas?: string
+  requestsHash?: string
+  nonce: string
+  timestamp: string
+  extraData?: string
+  gasLimit: PrefixedHexString
+  difficulty?: PrefixedHexString
+  mixHash?: PrefixedHexString
+  coinbase?: PrefixedHexString
+  alloc: GethGenesisAlloc
+  number?: PrefixedHexString
+  gasUsed?: PrefixedHexString
+  parentHash?: PrefixedHexString
+  baseFeePerGas?: PrefixedHexString | number | null
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,5 @@`
`21`	`21`	`"lint": "pnpm run biome && eslint --config ./eslint.config.mjs .",`
`22`	`22`	`"lint:fix": "pnpm run biome:fix && eslint --fix --config ./eslint.config.mjs .",`
`23`	`23`	`"tsc": "../../config/cli/ts-compile.sh"`
`24`		`- },`
`25`		`- "devDependencies": {`
`26`		`- "@ethereumjs/common": "workspace:*",`
`27`		`- "@ethereumjs/util": "workspace:*"`
`28`	`24`	`}`
`29`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { PrefixedHexString } from '@ethereumjs/util'`
	`1`	`+import type { PrefixedHexString } from '../types.js'`
`2`	`2`
`3`	`3`	`export const preLondonTestDataBlocks1RLP: {`
`4`	`4`	`blockRLP: PrefixedHexString`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ChainConfig } from '@ethereumjs/common'`
	`1`	`+import type { ChainConfig } from '../types.js'`
`2`	`2`
`3`	`3`	`export const customChainConfig: ChainConfig = {`
`4`	`4`	`name: 'testnet',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { GethGenesis } from '@ethereumjs/common'`
	`1`	`+import type { GethGenesis } from '../types.js'`
`2`	`2`
`3`	`3`	`export const eip4844GethGenesis: GethGenesis = {`
`4`	`4`	`config: {`