testdata: add testdata package

package.json

@@ -20,7 +20,7 @@
     "test:node": "npm run test:node --workspaces --if-present",
     "test:browser": "npm run test:browser --workspaces --if-present",
     "preinstall": "npm run checkNpmVersion",
-    "postinstall": "npm run build --workspaces",
+    "postinstall": "npm run build --workspaces --if-present",
     "prepare": "git config --local core.hooksPath .githooks",
     "sc": "npm run spellcheck",
     "sort-package-json": "sort-package-json \"package.json\" \"packages/*/package.json\"",

packages/block/examples/clique.ts

@@ -1,9 +1,8 @@
 import { createBlock } from '@ethereumjs/block'
 import { Common, Hardfork } from '@ethereumjs/common'
+import { goerliChainConfig } from '@ethereumjs/testdata'
 
-import { Goerli } from '../test/testdata/goerliCommon.ts'
-
-const common = new Common({ chain: Goerli, hardfork: Hardfork.Chainstart })
+const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Chainstart })
 
 console.log(common.consensusType()) // 'poa'
 console.log(common.consensusAlgorithm()) // 'clique'

packages/block/package.json

@@ -58,6 +58,7 @@
     "ethereum-cryptography": "^3.1.0"
   },
   "devDependencies": {
+    "@ethereumjs/testdata": "1.0.0",
     "@paulmillr/trusted-setups": "^0.1.2",
     "micro-eth-signer": "^0.14.0"
   },

packages/block/test/block.spec.ts

@@ -1,5 +1,11 @@
 import { Common, Hardfork, Mainnet, createCustomCommon } from '@ethereumjs/common'
 import { RLP } from '@ethereumjs/rlp'
+import {
+  goerliChainConfig,
+  preLondonTestDataBlocks1,
+  preLondonTestDataBlocks2,
+  testnetMergeChainConfig,
+} from '@ethereumjs/testdata'
 import { createLegacyTx } from '@ethereumjs/tx'
 import { KECCAK256_RLP_ARRAY, bytesToHex, equalsBytes, hexToBytes, toBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
@@ -17,11 +23,7 @@ import {
 } from '../src/index.ts'
 
 import { genesisHashesTestData } from './testdata/genesisHashesTest.ts'
-import { Goerli } from './testdata/goerliCommon.ts'
 import { testdataFromRPCGoerliData } from './testdata/testdata-from-rpc-goerli.ts'
-import { testdataPreLondon2Data } from './testdata/testdata_pre-london-2.ts'
-import { testdataPreLondonData } from './testdata/testdata_pre-london.ts'
-import { testnetMergeData } from './testdata/testnetMerge.ts'
 
 import type { NestedUint8Array, PrefixedHexString } from '@ethereumjs/util'
 
@@ -83,7 +85,7 @@ describe('[Block]: block functions', () => {
   })
 
   it('initialization -> setHardfork option', () => {
-    const common = createCustomCommon(testnetMergeData, Mainnet)
+    const common = createCustomCommon(testnetMergeChainConfig, Mainnet)
 
     let block = createBlock(
       {
@@ -135,7 +137,7 @@ describe('[Block]: block functions', () => {
 
   it('should test block validation on pow chain', async () => {
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.Istanbul })
-    const blockRlp = hexToBytes(testdataPreLondonData.blocks[0].rlp as PrefixedHexString)
+    const blockRlp = hexToBytes(preLondonTestDataBlocks1.blocks[0].rlp as PrefixedHexString)
     try {
       createBlockFromRLP(blockRlp, { common })
       assert.isTrue(true, 'should pass')
@@ -145,7 +147,7 @@ describe('[Block]: block functions', () => {
   })
 
   it('should test block validation on poa chain', async () => {
-    const common = new Common({ chain: Goerli, hardfork: Hardfork.Chainstart })
+    const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Chainstart })
 
     try {
       createBlockFromRPC(testdataFromRPCGoerliData, [], { common })
@@ -161,7 +163,7 @@ describe('[Block]: block functions', () => {
   }
 
   it('should test transaction validation - invalid tx trie', async () => {
-    const blockRlp = hexToBytes(testdataPreLondonData.blocks[0].rlp as PrefixedHexString)
+    const blockRlp = hexToBytes(preLondonTestDataBlocks1.blocks[0].rlp as PrefixedHexString)
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.London })
     const block = createBlockFromRLP(blockRlp, { common, freeze: false })
     await testTransactionValidation(block)
@@ -203,7 +205,7 @@ describe('[Block]: block functions', () => {
 
   it('should test transaction validation with legacy tx in london', async () => {
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.London })
-    const blockRlp = hexToBytes(testdataPreLondonData.blocks[0].rlp as PrefixedHexString)
+    const blockRlp = hexToBytes(preLondonTestDataBlocks1.blocks[0].rlp as PrefixedHexString)
     const block = createBlockFromRLP(blockRlp, { common, freeze: false })
     await testTransactionValidation(block)
     // @ts-expect-error -- Assigning to read-only property
@@ -217,7 +219,7 @@ describe('[Block]: block functions', () => {
 
   it('should test uncles hash validation', async () => {
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.Istanbul })
-    const blockRlp = hexToBytes(testdataPreLondon2Data.blocks[2].rlp as PrefixedHexString)
+    const blockRlp = hexToBytes(preLondonTestDataBlocks2.blocks[2].rlp as PrefixedHexString)
     const block = createBlockFromRLP(blockRlp, { common, freeze: false })
     assert.equal(block.uncleHashIsValid(), true)
     // @ts-expect-error -- Assigning to read-only property
@@ -355,7 +357,7 @@ describe('[Block]: block functions', () => {
   it('should return the same block data from raw()', () => {
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.Istanbul })
     const block = createBlockFromRLP(
-      toBytes(testdataPreLondon2Data.blocks[2].rlp as PrefixedHexString),
+      toBytes(preLondonTestDataBlocks2.blocks[2].rlp as PrefixedHexString),
       {
         common,
       },
@@ -367,7 +369,7 @@ describe('[Block]: block functions', () => {
   it('should test toJSON', () => {
     const common = new Common({ chain: Mainnet, hardfork: Hardfork.Istanbul })
     const block = createBlockFromRLP(
-      toBytes(testdataPreLondon2Data.blocks[2].rlp as PrefixedHexString),
+      toBytes(preLondonTestDataBlocks2.blocks[2].rlp as PrefixedHexString),
       {
         common,
       },
@@ -377,7 +379,7 @@ describe('[Block]: block functions', () => {
 
   it('DAO hardfork', () => {
     const blockData = RLP.decode(
-      testdataPreLondon2Data.blocks[0].rlp as PrefixedHexString,
+      preLondonTestDataBlocks2.blocks[0].rlp as PrefixedHexString,
     ) as NestedUint8Array
     // Set block number from test block to mainnet DAO fork block 1920000
     blockData[0][8] = hexToBytes('0x1D4C00')

packages/block/test/clique.spec.ts

@@ -13,10 +13,10 @@ import {
   createSealedCliqueBlockHeader,
 } from '../src/index.ts'
 
-import { Goerli } from './testdata/goerliCommon.ts'
+import { goerliChainConfig } from '@ethereumjs/testdata'
 
 describe('[Header]: Clique PoA Functionality', () => {
-  const common = new Common({ chain: Goerli, hardfork: Hardfork.Chainstart })
+  const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Chainstart })
 
   it('Header Data', () => {
     let header = createBlockHeader({ number: 1 })

packages/block/test/eip4844block.spec.ts

@@ -14,14 +14,14 @@ import { fakeExponential, getNumBlobs } from '../src/helpers.ts'
 import { createBlock, createBlockHeader } from '../src/index.ts'
 import { paramsBlock } from '../src/params.ts'
 
-import { hardfork4844Data } from './testdata/4844-hardfork.ts'
+import { eip4844GethGenesis } from '@ethereumjs/testdata'
 
 import type { TypedTransaction } from '@ethereumjs/tx'
 
 describe('EIP4844 header tests', () => {
   const kzg = new microEthKZG(trustedSetup)
 
-  const common = createCommonFromGethGenesis(hardfork4844Data, {
+  const common = createCommonFromGethGenesis(eip4844GethGenesis, {
     chain: 'customChain',
     hardfork: Hardfork.Cancun,
     customCrypto: { kzg },
@@ -96,7 +96,7 @@ describe('EIP4844 header tests', () => {
 describe('blob gas tests', () => {
   const kzg = new microEthKZG(trustedSetup)
 
-  const common = createCommonFromGethGenesis(hardfork4844Data, {
+  const common = createCommonFromGethGenesis(eip4844GethGenesis, {
     chain: 'customChain',
     hardfork: Hardfork.Cancun,
     params: paramsBlock,
@@ -154,7 +154,7 @@ describe('blob gas tests', () => {
 describe('transaction validation tests', () => {
   const kzg = new microEthKZG(trustedSetup)
 
-  const common = createCommonFromGethGenesis(hardfork4844Data, {
+  const common = createCommonFromGethGenesis(eip4844GethGenesis, {
     chain: 'customChain',
     hardfork: Hardfork.Cancun,
     params: paramsBlock,

packages/block/test/from-beacon-payload.spec.ts

@@ -5,15 +5,15 @@ import { assert, describe, expect, it } from 'vitest'
 
 import { createBlockFromBeaconPayloadJSON, createBlockHeader } from '../src/index.ts'
 
-import { devnet4844Config } from './testdata/4844-devnet.ts'
+import { eip4844GethGenesis } from '@ethereumjs/testdata'
 import { payloadKaustinenData } from './testdata/payload-kaustinen.ts'
 import { payloadSlot87335Data } from './testdata/payload-slot-87335.ts'
 import { payloadSlot87475Data } from './testdata/payload-slot-87475.ts'
-import { testnetVerkleKaustinenData } from './testdata/testnetVerkleKaustinen.ts'
+import { verkleKaustinenGethGenesis } from './testdata/testnetVerkleKaustinen.ts'
 
 const kzg = new microEthKZG(trustedSetup)
 describe('[fromExecutionPayloadJSON]: 4844 devnet 5', () => {
-  const commonConfig = { ...devnet4844Config }
+  const commonConfig = { ...eip4844GethGenesis }
   commonConfig.config = { ...commonConfig.config, chainId: 4844001005 }
   const network = 'sharding'
   const common = createCommonFromGethGenesis(commonConfig, {
@@ -74,7 +74,7 @@ describe('[fromExecutionPayloadJSON]: kaustinen', () => {
   const network = 'kaustinen'
 
   // safely change chainId without modifying underlying json
-  const common = createCommonFromGethGenesis(testnetVerkleKaustinenData, {
+  const common = createCommonFromGethGenesis(verkleKaustinenGethGenesis, {
     chain: network,
     eips: [6800],
   })

packages/block/test/from-rpc.spec.ts

@@ -8,8 +8,8 @@ import {
   createBlockHeaderFromRPC,
 } from '../src/index.ts'
 
+import { goerliChainConfig } from '@ethereumjs/testdata'
 import { alchemy14151203Data } from './testdata/alchemy14151203.ts'
-import { Goerli } from './testdata/goerliCommon.ts'
 import { infuraGoerliBlock10536893Data } from './testdata/infura-goerli-block-10536893.ts'
 import { infura2000004withTransactionsData } from './testdata/infura2000004withTransactions.ts'
 import { infura2000004withoutTransactionsData } from './testdata/infura2000004withoutTransactions.ts'
@@ -91,7 +91,7 @@ describe('[fromRPC]:', () => {
   })
 
   it('should create a block from london hardfork', () => {
-    const common = new Common({ chain: Goerli, hardfork: Hardfork.London })
+    const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.London })
     const block = createBlockFromRPC(testdataFromRPCGoerliLondonData, [], { common })
     assert.equal(
       `0x${block.header.baseFeePerGas?.toString(16)}`,
@@ -172,7 +172,7 @@ describe('[fromRPC] - Alchemy/Infura API block responses', () => {
   })
 
   it('should correctly parse a cancun block over rpc', () => {
-    const common = new Common({ chain: Goerli, hardfork: Hardfork.Cancun })
+    const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Cancun })
     const block = createBlockHeaderFromRPC(infuraGoerliBlock10536893Data, { common }) // cspell:disable-line
     const hash = hexToBytes(infuraGoerliBlock10536893Data.hash)
     assert.isTrue(equalsBytes(block.hash(), hash))

packages/block/test/header.spec.ts

@@ -1,5 +1,6 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import { RLP } from '@ethereumjs/rlp'
+import { goerliBlocks, goerliChainConfig, mainnetBlocks } from '@ethereumjs/testdata'
 import {
   KECCAK256_RLP,
   KECCAK256_RLP_ARRAY,
@@ -21,9 +22,6 @@ import {
 } from '../src/index.ts'
 
 import { bcBlockGasLimitTestData } from './testdata/bcBlockGasLimitTest.ts'
-import { blocksGoerliData } from './testdata/blocks_goerli.ts'
-import { blocksMainnetData } from './testdata/blocks_mainnet.ts'
-import { Goerli } from './testdata/goerliCommon.ts'
 
 import type { CliqueConfig } from '@ethereumjs/common'
 import type { PrefixedHexString } from '@ethereumjs/util'
@@ -177,7 +175,7 @@ describe('[Block]: Header functions', () => {
   })
 
   it('Initialization -> Clique Blocks', () => {
-    const common = new Common({ chain: Goerli, hardfork: Hardfork.Chainstart })
+    const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Chainstart })
     const header = createBlockHeader({ extraData: new Uint8Array(97) }, { common })
     assert.isDefined(bytesToHex(header.hash()), 'default block should initialize')
   })
@@ -219,7 +217,7 @@ describe('[Block]: Header functions', () => {
     )
 
     // PoA
-    common = new Common({ chain: Goerli, hardfork: Hardfork.Chainstart })
+    common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Chainstart })
     genesis = createBlock({ header: { extraData: new Uint8Array(97) } }, { common })
 
     parentHash = genesis.hash()
@@ -271,7 +269,7 @@ describe('[Block]: Header functions', () => {
   })
 
   it('should skip consensusFormatValidation if flag is set to false', () => {
-    const common = new Common({ chain: Goerli, hardfork: Hardfork.Chainstart })
+    const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Chainstart })
 
     assert.doesNotThrow(
       () =>
@@ -319,7 +317,7 @@ describe('[Block]: Header functions', () => {
   it('header validation -> poa checks',  () => {
     const headerData = testDataPreLondon.blocks[0].blockHeader
 
-    const common = new Common({ chain: Goerli, hardfork: Hardfork.Istanbul })
+    const common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Istanbul })
     const blockchain = new Mockchain()
 
     const genesisRlp = toBytes(testDataPreLondon.genesisRLP)
@@ -453,15 +451,15 @@ describe('[Block]: Header functions', () => {
 
   it('should test hash() function', () => {
     let common = new Common({ chain: Mainnet, hardfork: Hardfork.Chainstart })
-    let header = createBlockHeader(blocksMainnetData[0]['header'], { common })
+    let header = createBlockHeader(mainnetBlocks[0]['header'], { common })
     assert.equal(
       bytesToHex(header.hash()),
       '0x88e96d4537bea4d9c05d12549907b32561d3bf31f45aae734cdc119f13406cb6',
       'correct PoW hash (mainnet block 1)',
     )
 
-    common = new Common({ chain: Goerli, hardfork: Hardfork.Chainstart })
-    header = createBlockHeader(blocksGoerliData[0]['header'], { common })
+    common = new Common({ chain: goerliChainConfig, hardfork: Hardfork.Chainstart })
+    header = createBlockHeader(goerliBlocks[0]['header'], { common })
     assert.equal(
       bytesToHex(header.hash()),
       '0x8f5bab218b6bb34476f51ca588e9f4553a3a7ce5e13a66c660a5283e97e9a85a',