Skip to content

Commit a0b1a17

Browse files
ScottyPoiScottyPoi
andauthored
cleanup unused dependencies and fix dependency categorization (#4146)
* chore: remove unused @types/core-js dependencies - Remove @types/core-js from evm and vm packages - These dependencies are not used anywhere in the codebase * chore: move test/benchmark-only dependencies to devDependencies - Move @types/debug from dependencies to devDependencies in evm package - Reorganize devDependencies alphabetically in tx and vm packages - These dependencies are only used in tests, benchmarks, or for TypeScript types * chore: add missing devDependencies for TypeScript types - Add @types/debug to mpt, blockchain, binarytree, and vm packages - Add @types/benchmark to rlp package - These packages use debug/benchmark in source code but were missing type definitions * commit lockfile * fix .lastIndex error --------- Co-authored-by: ScottyPoi <[email protected]>
1 parent 22b0a6c commit a0b1a17

File tree

9 files changed

+27
-21
lines changed

9 files changed

+27
-21
lines changed

package-lock.json

Lines changed: 11 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/binarytree/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
"ethereum-cryptography": "^3.2.0",
6262
"lru-cache": "11.0.2"
6363
},
64+
"devDependencies": {
65+
"@types/debug": "^4.1.12"
66+
},
6467
"engines": {
6568
"node": ">=18"
6669
}

packages/blockchain/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
"lru-cache": "11.0.2"
6161
},
6262
"devDependencies": {
63-
"@ethereumjs/ethash": "^10.0.0"
63+
"@ethereumjs/ethash": "^10.0.0",
64+
"@types/debug": "^4.1.12"
6465
},
6566
"engines": {
6667
"node": ">=18"

packages/evm/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,14 @@
5959
"@ethereumjs/statemanager": "^10.0.0",
6060
"@ethereumjs/util": "^10.0.0",
6161
"@noble/curves": "^1.9.0",
62-
"@types/debug": "^4.1.12",
6362
"debug": "^4.4.0",
6463
"ethereum-cryptography": "^3.2.0",
6564
"eventemitter3": "^5.0.1"
6665
},
6766
"devDependencies": {
6867
"@paulmillr/trusted-setups": "^0.2.0",
6968
"@types/benchmark": "^2.1.5",
70-
"@types/core-js": "^2.5.8",
69+
"@types/debug": "^4.1.12",
7170
"@types/minimist": "^1.2.5",
7271
"@types/node-dir": "^0.0.37",
7372
"benchmark": "^2.1.4",

packages/evm/src/eof/container.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,10 @@ class EOFHeader {
272272

273273
// Returns the code section for a given program counter position
274274
getSectionFromProgramCounter(programCounter: number) {
275-
if (
276-
programCounter < 0 ||
277-
programCounter >
278-
this.codeStartPos[this.codeStartPos.lastIndex] + this.codeSizes[this.codeSizes.lastIndex]
279-
) {
275+
const lastIndex = this.codeSizes.length - 1
276+
const lastStart = this.getCodePosition(lastIndex)
277+
const lastEnd = lastStart + this.codeSizes[lastIndex]
278+
if (programCounter < 0 || programCounter > lastEnd) {
280279
// If code position is outside the beginning or end of the code sections, return 0
281280
throw EthereumJSErrorWithoutCode('program counter out of bounds')
282281
}

packages/mpt/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"devDependencies": {
6363
"@ethereumjs/genesis": "^10.0.0",
6464
"@types/benchmark": "^2.1.5",
65+
"@types/debug": "^4.1.12",
6566
"abstract-level": "^3.0.1",
6667
"level": "^9.0.0",
6768
"lmdb": "^3.2.6",

packages/rlp/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"node": ">=18"
6666
},
6767
"devDependencies": {
68+
"@types/benchmark": "^2.1.5",
6869
"benchmark": "^2.1.4"
6970
}
7071
}

packages/tx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
},
6565
"devDependencies": {
6666
"@ethereumjs/testdata": "1.0.0",
67+
"@paulmillr/trusted-setups": "^0.2.0",
6768
"@types/minimist": "^1.2.5",
6869
"@types/node-dir": "^0.0.37",
69-
"@paulmillr/trusted-setups": "^0.2.0",
7070
"micro-eth-signer": "^0.15.0",
7171
"minimist": "^1.2.8",
7272
"node-dir": "^0.1.17",

packages/vm/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,10 @@
8181
"devDependencies": {
8282
"@ethereumjs/blockchain": "^10.0.0",
8383
"@ethereumjs/ethash": "^10.0.0",
84+
"@ethereumjs/testdata": "1.0.0",
8485
"@paulmillr/trusted-setups": "^0.2.0",
8586
"@types/benchmark": "^2.1.5",
86-
"@types/core-js": "^2.5.8",
87+
"@types/debug": "^4.1.12",
8788
"@types/minimist": "^1.2.5",
8889
"@types/node-dir": "^0.0.37",
8990
"benchmark": "^2.1.4",
@@ -95,8 +96,7 @@
9596
"nyc": "^17.1.0",
9697
"solc": "^0.8.28",
9798
"tape": "^5.9.0",
98-
"yargs": "^17.7.2",
99-
"@ethereumjs/testdata": "1.0.0"
99+
"yargs": "^17.7.2"
100100
},
101101
"engines": {
102102
"node": ">=18"

0 commit comments

Comments
 (0)