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

eth/catalyst: update simulated beacon for cancun #28829

Merged
merged 10 commits into from
Feb 29, 2024
Merged

eth/catalyst: update simulated beacon for cancun #28829

Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
123a3e5
eth/catalyst: update simulated beacon for cancun
s1na Jan 17, 2024
adc10d2
validate blob hashes
s1na Jan 18, 2024
803dd9b
Merge branch 'master' into dev/cancun
s1na Jan 18, 2024
96dcc9e
resolve merge conflict
s1na Jan 26, 2024
dbfe2be
compute hashes from commitment
s1na Jan 26, 2024
b3c9b7e
Merge branch 'master' into dev/cancun
s1na Feb 22, 2024
4cc0f14
fix beacon root and payload version
s1na Feb 22, 2024
0c58f4a
check commitment conversion
s1na Feb 28, 2024
0b4adbc
fix random attr
s1na Feb 29, 2024
a8b9fd9
flip dev to cancun
s1na Feb 29, 2024
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
28 changes: 24 additions & 4 deletions eth/catalyst/simulated_beacon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package catalyst

import (
"crypto/rand"
"crypto/sha256"
"errors"
"math/big"
"sync"
Expand All @@ -26,6 +27,7 @@ import (
"github.com/ethereum/go-ethereum/beacon/engine"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto/kzg4844"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/node"
Expand Down Expand Up @@ -148,7 +150,12 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
c.feeRecipientLock.Unlock()

// Reset to CurrentBlock in case of the chain was rewound
if header := c.eth.BlockChain().CurrentBlock(); c.curForkchoiceState.HeadBlockHash != header.Hash() {
var (
header = c.eth.BlockChain().CurrentBlock()
number = new(big.Int).Add(header.Number, big.NewInt(1))
isCancun = c.eth.BlockChain().Config().IsCancun(number, timestamp)
)
if c.curForkchoiceState.HeadBlockHash != header.Hash() {
finalizedHash := c.finalizedBlockHash(header.Number.Uint64())
c.setCurrentState(header.Hash(), *finalizedHash)
}
Expand All @@ -167,7 +174,6 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
if fcResponse == engine.STATUS_SYNCING {
return errors.New("chain rewind prevented invocation of payload creation")
}

envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID, true)
if err != nil {
return err
Expand All @@ -186,8 +192,22 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
}

// Mark the payload as canon
if _, err = c.engineAPI.NewPayloadV2(*payload); err != nil {
return err
if isCancun {
blobHashes := make([]common.Hash, 0)
if envelope.BlobsBundle != nil {
hasher := sha256.New()
for _, commit := range envelope.BlobsBundle.Commitments {
c := kzg4844.Commitment(commit[:])
s1na marked this conversation as resolved.
Show resolved Hide resolved
blobHashes = append(blobHashes, kzg4844.CalcBlobHashV1(hasher, &c))
}
}
if _, err = c.engineAPI.NewPayloadV3(*payload, blobHashes, &common.Hash{}); err != nil {
return err
}
} else {
if _, err = c.engineAPI.NewPayloadV2(*payload); err != nil {
return err
}
}
c.setCurrentState(payload.BlockHash, finalizedHash)

Expand Down
Loading