From bad87ac7e101cd8106b3b60901e9a60adebd6848 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Tue, 11 Jul 2023 08:47:35 -0400 Subject: [PATCH] Revert "fix: ensure @ethereumjs/util matches the version required by @ethereumjs/evm" This reverts commit 0949e8d427b6a70497bc5c93bd6df5a72247b848. --- npm-shrinkwrap.json | 76 +++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index fd778db..9e7a651 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -17,7 +17,7 @@ "@ethereumjs/common": "3.0.0", "@ethereumjs/trie": "5.0.0", "@ethereumjs/tx": "4.0.0", - "@ethereumjs/util": "^8.1.0", + "@ethereumjs/util": "8.0.0", "@ethereumjs/vm": "6.0.0", "@lodestar/config": "1.9.1", "@lodestar/light-client": "1.9.1", @@ -1726,6 +1726,19 @@ "node": ">=14" } }, + "node_modules/@ethereumjs/ethash/node_modules/@ethereumjs/util": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", + "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", + "dependencies": { + "@ethereumjs/rlp": "^4.0.1", + "ethereum-cryptography": "^2.0.0", + "micro-ftch": "^0.3.1" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/@ethereumjs/ethash/node_modules/@scure/bip32": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.1.tgz", @@ -1804,6 +1817,19 @@ "node": ">=14" } }, + "node_modules/@ethereumjs/evm/node_modules/@ethereumjs/util": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", + "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", + "dependencies": { + "@ethereumjs/rlp": "^4.0.1", + "ethereum-cryptography": "^2.0.0", + "micro-ftch": "^0.3.1" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/@ethereumjs/evm/node_modules/@scure/bip32": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.1.tgz", @@ -1861,6 +1887,19 @@ "crc-32": "^1.2.0" } }, + "node_modules/@ethereumjs/statemanager/node_modules/@ethereumjs/util": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", + "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", + "dependencies": { + "@ethereumjs/rlp": "^4.0.1", + "ethereum-cryptography": "^2.0.0", + "micro-ftch": "^0.3.1" + }, + "engines": { + "node": ">=14" + } + }, "node_modules/@ethereumjs/statemanager/node_modules/@scure/bip32": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.1.tgz", @@ -1927,42 +1966,17 @@ } }, "node_modules/@ethereumjs/util": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", - "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.0.0.tgz", + "integrity": "sha512-Zz/Ovar0VU/CaYHLvigBTjG5PmkG0OzjvRjjoXRJbJcdWJoTCN2N4BYgoCBOZomKjaAT4ABpQ7wer6ZFOglvjg==", "dependencies": { - "@ethereumjs/rlp": "^4.0.1", - "ethereum-cryptography": "^2.0.0", - "micro-ftch": "^0.3.1" + "@ethereumjs/rlp": "^4.0.0-beta.2", + "ethereum-cryptography": "^1.1.2" }, "engines": { "node": ">=14" } }, - "node_modules/@ethereumjs/util/node_modules/@scure/bip32": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.1.tgz", - "integrity": "sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==", - "dependencies": { - "@noble/curves": "~1.1.0", - "@noble/hashes": "~1.3.1", - "@scure/base": "~1.1.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@ethereumjs/util/node_modules/ethereum-cryptography": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.1.0.tgz", - "integrity": "sha512-QX4uRmoGJdxDPsncrOaeVCC7JOOvMzUXkvo9Xasv2EKV5RwZgZxQ9s5yEbWSB1MSeso362hWWRPV/FYKNLditw==", - "dependencies": { - "@noble/curves": "1.1.0", - "@noble/hashes": "1.3.1", - "@scure/bip32": "1.3.1", - "@scure/bip39": "1.2.1" - } - }, "node_modules/@ethereumjs/vm": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@ethereumjs/vm/-/vm-6.0.0.tgz", diff --git a/package.json b/package.json index 8cd130f..70d8231 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@ethereumjs/common": "3.0.0", "@ethereumjs/trie": "5.0.0", "@ethereumjs/tx": "4.0.0", - "@ethereumjs/util": "^8.1.0", + "@ethereumjs/util": "8.0.0", "@ethereumjs/vm": "6.0.0", "@chainsafe/as-sha256": "^0.3.1", "@chainsafe/bls": "7.1.1",