Skip to content

core, eth/catalyst: fix race conditions in tests #26790

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

Merged
merged 7 commits into from
Mar 6, 2023
Merged

core, eth/catalyst: fix race conditions in tests #26790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a571b5
core, eth, graphql: fix race condition
MariusVanDerWijden Mar 2, 2023
e60f668
hacky fix for blockhash data race in graphql
s1na Mar 3, 2023
4e7c39b
graphql: set hash in tx.resolve
s1na Mar 3, 2023
a70db38
graphql: get rid of unnecessary fix
MariusVanDerWijden Mar 3, 2023
0a364c1
graphql: avoid writing to block
s1na Mar 3, 2023
f138d2e
graphql: split graphql fixes out
MariusVanDerWijden Mar 6, 2023
7d805c2
eth/catalyst: reduce diff
MariusVanDerWijden Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/types/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ func CopyHeader(h *Header) *Header {
copy(cpy.Extra, h.Extra)
}
if h.WithdrawalsHash != nil {
cpy.WithdrawalsHash = new(common.Hash)
Copy link
Member

Choose a reason for hiding this comment

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

So, previously, the copied header shares them same withdrawalsHash pointer with the original one?

Copy link
Member Author

@MariusVanDerWijden MariusVanDerWijden Mar 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, it did not surface as a problem, since its only ever read in rlpHash, but still kinda unsafe I think

Copy link
Member

Choose a reason for hiding this comment

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

Sure, we should fix it

Copy link
Contributor

Choose a reason for hiding this comment

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

First this looked wrong to me, so had to dig a bit.

After the cpy=*h, the cpy and the h have a pointer to the same hash.
The cpy have one pointer, the h have another pointer, and both pointers have the same value. At this point, we know it's not the nil-value.

Previously, we deferred the cpy pointer-value, and overwrote it with the contents of the h pointer value. Which seems to have been a complete no-op, as far as I can tell.

So yeah, I totally agree.

*cpy.WithdrawalsHash = *h.WithdrawalsHash
}
return &cpy
Expand Down
2 changes: 1 addition & 1 deletion eth/catalyst/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ func TestNewPayloadOnInvalidTerminalBlock(t *testing.T) {
n, ethservice := startEthService(t, genesis, preMergeBlocks)
defer n.Close()

genesis.Config.TerminalTotalDifficulty = preMergeBlocks[0].Difficulty() //.Sub(genesis.Config.TerminalTotalDifficulty, preMergeBlocks[len(preMergeBlocks)-1].Difficulty())
ethservice.BlockChain().Config().TerminalTotalDifficulty = preMergeBlocks[0].Difficulty() //.Sub(genesis.Config.TerminalTotalDifficulty, preMergeBlocks[len(preMergeBlocks)-1].Difficulty())

var (
api = NewConsensusAPI(ethservice)
Expand Down