Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge ethereum/hive/master #26

Merged
merged 22 commits into from
May 12, 2023
Merged

Merge ethereum/hive/master #26

merged 22 commits into from
May 12, 2023

Conversation

shekhirin
Copy link

@shekhirin shekhirin commented May 12, 2023 •
edited
Loading

PoW was recently removed from geth, and then ethash-related stuff was also removed from hive. Currently, build from our fork fails:

hive --client go-ethereum --sim ethereum/engine --docker.output
INFO[05-12|18:16:05] building image                           image=hive/hiveproxy nocache=false pull=false
...
Step 15/16 : RUN  /usr/local/bin/geth makecache     1 ~/.ethereum/geth/ethash &&  /usr/local/bin/geth makecache 30001 ~/.ethereum/geth/ethash
 ---> Running in 52425f962a15
invalid command: "makecache"
EROR[05-12|18:16:06] image build failed                       image=hive/clients/go-ethereum:latest err="The command '/bin/sh -c /usr/local/bin/geth makecache     1 ~/.ethereum/geth/ethash &&  /usr/local/bin/geth makecache 30001 ~/.ethereum/geth/ethash' returned a non-zero code: 1"
all clients failed to build

marioevz and others added 22 commits April 5, 2023 16:05
@marioevz
simulators/ethereum/engine: send eth_ requests to port 8545 (ethere…
0f237de 
…um#752)

simulators/ethereum/engine: send `eth_` requests to 8545
@marioevz
clients/ethereumjs: Update branch (ethereum#753)
ed1e5e7 
* clients/ethereumjs: Change git branch

* clients/ethereumjs: Fix bash script issues
@marioevz
simulators/ethereum/engine: node: unsubscribe from events
aa696f6
@marioevz
simulators/ethereum/engine: clmock: add extra logs
ed3f6a1
@marioevz
simulators/ethereum/engine: correctly stop secondary clients
f2c72be
@marioevz
simulators/eth2/common: create client interfaces, update mock builder (…
28a27c9 
…ethereum#738)

* simulators/eth2/common: refactor clients

* simulators/eth2/engine: fixes due to refactor

* simulators/eth2/common: builder: invalidate payloads

* simulators/eth2/common: builder readme

* simulators/eth2/common: builder: add option to build a payload on an outdated version

* simulators/eth2/withdrawals: add invalid built payload version test

* simulators/eth2/common: builder: remove check to build invalid payload

* simulators/eth2/withdrawals: Fix check

* simulators/eth2/withdrawals: test case validation

* simulators/eth2/common: builder: fix invalidation

* simulators/eth2/withdrawals: fix verifications again
@marioevz
simulators/ethereum/pyspec: Comment Dockerfile to run local fixtures (e…
8a4ef3d 
…thereum#755)

simulators/ethereum/pyspec: Add Dockerfile comment to run locally generated fixtures
@gfukushima
clients/besu: add --data-storage-format=BONSAI (ethereum#758)
17a79c3
@marioevz
simulators/ethereum/engine: Unique Payload ID Tests (ethereum#757)
7f904b2 
* simulators/ethereum/engine: expose generic fcu, np

* simulators/ethereum/engine: Unique payload id test

* simulators/ethereum/engine: Add payload id test
@marioevz
simulators/ethereum/engine: Parallel getPayloadBodies Test (ethereum#749
3b877f0 
)

* simulators/ethereum/engine: parallel getpayloadbodies

* simulators/ethereum/withdrawals: readme
@yperbasis
clients/erigon: --externalcl flag is not supported anymore (ethereum#760
9c4e6fd 
)
@s1na
graphql: consistent rule for Long outputs and args (ethereum#746)
0b06590
@marioevz
simulators/eth2: Verify block signatures on blocks sent to builder (e…
51ecfda 
…thereum#756)

* simulators/eth2/common/builder: interfaces changes

* simulators/eth2/common/builder: verify signatures

* simulators/eth2/withdrawals: Verify block signatures

* simulators/eth2/withdrawals: Update README

* simulators/eth2/withdrawals: minor nit comment
@yperbasis
clients/erigon: explicit --db.size.limit value (ethereum#766)
6a92a68
@marioevz
clients/nethermind: Cancun support (ethereum#762)
76f7162 
* clients/nethermind: Cancun Support

* clients/nethermind: Dockerfile args
@spencer-tb
clients/besu: Cancun Support (ethereum#769)
67aaa4f
@spencer-tb
clients/ethereumjs: Cancun Support (ethereum#768)
972a180 
clients/ethereumjs: Cancun Support.
@s1na @holiman
clients/go-ethereum: remove deprecated PoW (ethereum#773)
7e559b0 
Remove ethash-related flags and utils from go-ethereum, since they were
deprecated upstream.

---------

Co-authored-by: Martin Holst Swende <[email protected]>
@spencer-tb
clients/nethermind: Add excessDataGas to genesis mapper. (ethereum#771)
99e1894
@holiman
sim/pyspec: bubble error (ethereum#777)
1b2273d
@holiman
simulators/devp2p: fix issue causing ethereumjs to crash (ethereum#778)
625f3e3 
sim/devp2p: fix issue causing ethereumjs to crash

It seems ethereumjs crashes if the chainid is not present in the genesis.
@shekhirin
Merge remote-tracking branch 'origin/master' into paradigmxyz/master
f1aafd6
mattsse
mattsse approved these changes May 12, 2023
View reviewed changes
Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome!
rip pow

@mattsse mattsse merged commit bbd52d3 into paradigmxyz:master May 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattsse mattsse mattsse approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@shekhirin @mattsse @marioevz @gfukushima @yperbasis @s1na @spencer-tb @holiman