From d220e2679b48bdb9e042b2fee33a46ebbe8cd22d Mon Sep 17 00:00:00 2001 From: Marcelo Fornet Date: Thu, 1 Jul 2021 06:11:20 +0200 Subject: [PATCH] Use patched version from ethereumjs block while https://github.com/ethereumjs/ethereumjs-monorepo/pull/1330 is merged --- eth2near/eth2near-block-relay/package.json | 2 +- yarn.lock | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/eth2near/eth2near-block-relay/package.json b/eth2near/eth2near-block-relay/package.json index 8157aa649..0e15c61f6 100644 --- a/eth2near/eth2near-block-relay/package.json +++ b/eth2near/eth2near-block-relay/package.json @@ -20,7 +20,7 @@ "bn.js": "^5.1.3", "eth-object": "near/eth-object#54e03b8aac8208cf724e206d49ffb8bdd30451d7", "eth-util-lite": "near/eth-util-lite#master", - "@ethereumjs/block": "^3.3.0", + "@ethereumjs/block": "mfornet/ethereumjs-block", "merkle-patricia-tree": "^2.1.2", "prom-client": "^12.0.0", "promisfy": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 5483b6de4..787aa8999 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,17 +39,16 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@ethereumjs/block@^3.3.0": +"@ethereumjs/block@mfornet/ethereumjs-block": version "3.3.0" - resolved "https://registry.yarnpkg.com/@ethereumjs/block/-/block-3.3.0.tgz#a1b3baec831c71c0d9e7f6145f25e919cff4939c" - integrity sha512-WoefY9Rs4W8vZTxG9qwntAlV61xsSv0NPoXmHO7x3SH16dwJQtU15YvahPCz4HEEXbu7GgGgNgu0pv8JY7VauA== + resolved "https://codeload.github.com/mfornet/ethereumjs-block/tar.gz/675ef04aafdf8a27c8afd9179c557b61e30ce69a" dependencies: - "@ethereumjs/common" "^2.3.0" - "@ethereumjs/tx" "^3.2.0" + "@ethereumjs/common" "^2.3.1" + "@ethereumjs/tx" "^3.2.1" ethereumjs-util "^7.0.10" merkle-patricia-tree "^4.2.0" -"@ethereumjs/common@^2.3.0", "@ethereumjs/common@^2.3.1": +"@ethereumjs/common@^2.3.1": version "2.3.1" resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.3.1.tgz#d692e3aff5adb35dd587dd1e6caab69e0ed2fa0b" integrity sha512-V8hrULExoq0H4HFs3cCmdRGbgmipmlNzak6Xg34nHYfQyqkSdrCuflvYjyWmsNpI8GtrcZhzifAbgX/1C1Cjwg== @@ -57,7 +56,7 @@ crc-32 "^1.2.0" ethereumjs-util "^7.0.10" -"@ethereumjs/tx@^3.2.0": +"@ethereumjs/tx@^3.2.1": version "3.2.1" resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.2.1.tgz#65f5f1c11541764f08377a94ba4b0dcbbd67739e" integrity sha512-i9V39OtKvwWos1uVNZxdVhd7zFOyzFLjgt69CoiOY0EmXugS0HjO3uxpLBSglDKFMRriuGqw6ddKEv+RP1UNEw==