Skip to content

Commit

Permalink
Truncate ExtraData to 32 bytes for to satisfy SSZ marshal (#14803)
Browse files Browse the repository at this point in the history
  • Loading branch information
terencechain authored Jan 16, 2025
1 parent e7e48dc commit dc002c2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions changelog/tt_fix_generate_genesis.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Fixed

- Prysmctl generate genesis state: fix truncation of ExtraData to 32 bytes to satisfy SSZ marshaling
10 changes: 7 additions & 3 deletions runtime/interop/premine-state.go
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,10 @@ func (s *PremineGenesisConfig) setLatestBlockHeader(g state.BeaconState) error {

func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error {
gb := s.GB
extraData := gb.Extra()
if len(extraData) > 32 {
extraData = extraData[:32]
}

if s.Version >= version.Deneb {
payload := &enginev1.ExecutionPayloadDeneb{
Expand All @@ -634,7 +638,7 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error {
GasLimit: gb.GasLimit(),
GasUsed: gb.GasUsed(),
Timestamp: gb.Time(),
ExtraData: gb.Extra(),
ExtraData: extraData,
BaseFeePerGas: bytesutil.PadTo(bytesutil.ReverseByteOrder(gb.BaseFee().Bytes()), fieldparams.RootLength),
BlockHash: gb.Hash().Bytes(),
Transactions: make([][]byte, 0),
Expand Down Expand Up @@ -673,7 +677,7 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error {
GasLimit: gb.GasLimit(),
GasUsed: gb.GasUsed(),
Timestamp: gb.Time(),
ExtraData: gb.Extra(),
ExtraData: extraData,
BaseFeePerGas: bytesutil.PadTo(bytesutil.ReverseByteOrder(gb.BaseFee().Bytes()), fieldparams.RootLength),
BlockHash: gb.Hash().Bytes(),
Transactions: make([][]byte, 0),
Expand Down Expand Up @@ -709,7 +713,7 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error {
GasLimit: gb.GasLimit(),
GasUsed: gb.GasUsed(),
Timestamp: gb.Time(),
ExtraData: gb.Extra(),
ExtraData: extraData,
BaseFeePerGas: bytesutil.PadTo(bytesutil.ReverseByteOrder(gb.BaseFee().Bytes()), fieldparams.RootLength),
BlockHash: gb.Hash().Bytes(),
Transactions: make([][]byte, 0),
Expand Down

0 comments on commit dc002c2

Please sign in to comment.