For deneb(4)

parachain/pallets/ethereum-beacon-client/src/lib.rs

@@ -788,6 +788,9 @@ pub mod pallet {
 
 		/// Returns the fork version based on the current epoch.
 		pub(super) fn select_fork_version(fork_versions: &ForkVersions, epoch: u64) -> ForkVersion {
+			if epoch >= fork_versions.deneb.epoch {
+				return fork_versions.deneb.version
+			}
 			if epoch >= fork_versions.capella.epoch {
 				return fork_versions.capella.version
 			}
@@ -797,7 +800,6 @@ pub mod pallet {
 			if epoch >= fork_versions.altair.epoch {
 				return fork_versions.altair.version
 			}
-
 			fork_versions.genesis.version
 		}
 

parachain/primitives/beacon/src/types.rs

@@ -39,6 +39,7 @@ pub struct ForkVersions {
 	pub altair: Fork,
 	pub bellatrix: Fork,
 	pub capella: Fork,
+	pub deneb: Fork,
 }
 
 #[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo)]

relayer/relays/beacon/header/syncer/api/api_response.go

@@ -648,6 +648,16 @@ func (b BeaconBlockResponse) ToFastSSZ(activeSpec config.ActiveSpec, isDeneb boo
 		return nil, err
 	}
 
+	blobGasUsed, err := util.ToUint64(executionPayload.BlobGasUsed)
+	if err != nil {
+		return nil, err
+	}
+
+	excessBlobGas, err := util.ToUint64(executionPayload.ExcessBlobGas)
+	if err != nil {
+		return nil, err
+	}
+
 	syncCommitteeBits, err := util.HexStringToByteArray(body.SyncAggregate.SyncCommitteeBits)
 	if err != nil {
 		return nil, err
@@ -677,6 +687,53 @@ func (b BeaconBlockResponse) ToFastSSZ(activeSpec config.ActiveSpec, isDeneb boo
 	}
 
 	if activeSpec == config.Minimal {
+		if isDeneb {
+			return &state.BeaconBlockDenebMinimal{
+				Slot:          slot,
+				ProposerIndex: proposerIndex,
+				ParentRoot:    parentRoot,
+				StateRoot:     stateRoot,
+				Body: &state.BeaconBlockBodyDenebMinimal{
+					RandaoReveal: randaoReveal,
+					Eth1Data: &state.Eth1Data{
+						DepositRoot:  eth1DepositRoot,
+						DepositCount: eth1DepositCount,
+						BlockHash:    eth1BlockHash,
+					},
+					Graffiti:          graffiti,
+					ProposerSlashings: proposerSlashings,
+					AttesterSlashings: attesterSlashings,
+					Attestations:      attestations,
+					Deposits:          deposits,
+					VoluntaryExits:    voluntaryExits,
+					SyncAggregate: &state.SyncAggregateMinimal{
+						SyncCommitteeBits:      syncCommitteeBits,
+						SyncCommitteeSignature: syncCommitteeSignature,
+					},
+					ExecutionPayload: &state.ExecutionPayloadDeneb{
+						ParentHash:    parentHash,
+						FeeRecipient:  feeRecipient,
+						StateRoot:     executionStateRoot,
+						ReceiptsRoot:  receiptsRoot,
+						LogsBloom:     logsBloom,
+						PrevRandao:    prevRando,
+						BlockNumber:   blockNumber,
+						GasLimit:      gasLimit,
+						GasUsed:       gasUsed,
+						Timestamp:     timestamp,
+						ExtraData:     extraData,
+						BaseFeePerGas: baseFeePerGasBytes,
+						BlockHash:     blockHash,
+						Transactions:  transactions,
+						Withdrawals:   withdrawals,
+						BlobGasUsed:   blobGasUsed,   // new for Deneb
+						ExcessBlobGas: excessBlobGas, // new for Deneb
+					},
+					BlsToExecutionChanges: blsExecutionChanges,
+					BlobKzgCommitments:    kzgCommitments, // new for Deneb
+				},
+			}, nil
+		}
 		return &state.BeaconBlockCapellaMinimal{
 			Slot:          slot,
 			ProposerIndex: proposerIndex,
@@ -720,6 +777,53 @@ func (b BeaconBlockResponse) ToFastSSZ(activeSpec config.ActiveSpec, isDeneb boo
 			},
 		}, nil
 	} else {
+		if isDeneb {
+			return &state.BeaconBlockDenebMainnet{
+				Slot:          slot,
+				ProposerIndex: proposerIndex,
+				ParentRoot:    parentRoot,
+				StateRoot:     stateRoot,
+				Body: &state.BeaconBlockBodyDenebMainnet{
+					RandaoReveal: randaoReveal,
+					Eth1Data: &state.Eth1Data{
+						DepositRoot:  eth1DepositRoot,
+						DepositCount: eth1DepositCount,
+						BlockHash:    eth1BlockHash,
+					},
+					Graffiti:          graffiti,
+					ProposerSlashings: proposerSlashings,
+					AttesterSlashings: attesterSlashings,
+					Attestations:      attestations,
+					Deposits:          deposits,
+					VoluntaryExits:    voluntaryExits,
+					SyncAggregate: &state.SyncAggregateMainnet{
+						SyncCommitteeBits:      syncCommitteeBits,
+						SyncCommitteeSignature: syncCommitteeSignature,
+					},
+					ExecutionPayload: &state.ExecutionPayloadDeneb{
+						ParentHash:    parentHash,
+						FeeRecipient:  feeRecipient,
+						StateRoot:     executionStateRoot,
+						ReceiptsRoot:  receiptsRoot,
+						LogsBloom:     logsBloom,
+						PrevRandao:    prevRando,
+						BlockNumber:   blockNumber,
+						GasLimit:      gasLimit,
+						GasUsed:       gasUsed,
+						Timestamp:     timestamp,
+						ExtraData:     extraData,
+						BaseFeePerGas: baseFeePerGasBytes,
+						BlockHash:     blockHash,
+						Transactions:  transactions,
+						Withdrawals:   withdrawals,
+						BlobGasUsed:   blobGasUsed,   // new for Deneb
+						ExcessBlobGas: excessBlobGas, // new for Deneb
+					},
+					BlsToExecutionChanges: blsExecutionChanges,
+					BlobKzgCommitments:    kzgCommitments, // new for Deneb
+				},
+			}, nil
+		}
 		return &state.BeaconBlockCapellaMainnet{
 			Slot:          slot,
 			ProposerIndex: proposerIndex,

relayer/relays/beacon/header/syncer/syncer.go

@@ -162,13 +162,25 @@ func (s *Syncer) GetBlockRoots(slot uint64) (scale.BlockRootProof, error) {
 	var blockRootsContainer state.BlockRootsContainer
 
 	data, err := s.Client.DownloadBeaconState(strconv.FormatUint(slot, 10))
+	if err != nil {
+		return blockRootProof, fmt.Errorf("download beacon state failed: %w", err)
+	}
+	isDeneb := s.DenebForked(slot)
 
 	if s.activeSpec == config.Minimal {
 		blockRootsContainer = &state.BlockRootsContainerMinimal{}
-		beaconState = &state.BeaconStateCapellaMinimal{}
+		if isDeneb {
+			beaconState = &state.BeaconStateDenebMinimal{}
+		} else {
+			beaconState = &state.BeaconStateCapellaMinimal{}
+		}
 	} else {
 		blockRootsContainer = &state.BlockRootsContainerMainnet{}
-		beaconState = &state.BeaconStateCapellaMainnet{}
+		if isDeneb {
+			beaconState = &state.BeaconStateDenebMainnet{}
+		} else {
+			beaconState = &state.BeaconStateCapellaMainnet{}
+		}
 	}
 
 	err = beaconState.UnmarshalSSZ(data)

relayer/relays/beacon/state/beacon.go

@@ -367,14 +367,6 @@ func (b *BeaconBlockCapellaMinimal) GetBeaconSlot() uint64 {
 	return b.Slot
 }
 
-func (b *BeaconBlockCapellaMinimal) CapallaExecutionPayload() *ExecutionPayloadCapella {
-	return b.Body.ExecutionPayload
-}
-
-func (b *BeaconBlockCapellaMinimal) DenebExecutionPayload() *ExecutionPayloadDeneb {
-	return nil
-}
-
 func (b *BeaconBlockCapellaMinimal) GetBlockBodyTree() (*ssz.Node, error) {
 	return b.Body.GetTree()
 }
@@ -383,14 +375,6 @@ func (b *BeaconBlockCapellaMainnet) GetBeaconSlot() uint64 {
 	return b.Slot
 }
 
-func (b *BeaconBlockCapellaMainnet) CapallaExecutionPayload() *ExecutionPayloadCapella {
-	return b.Body.ExecutionPayload
-}
-
-func (b *BeaconBlockCapellaMainnet) DenebExecutionPayload() *ExecutionPayloadDeneb {
-	return nil
-}
-
 func (b *BeaconBlockCapellaMainnet) GetBlockBodyTree() (*ssz.Node, error) {
 	return b.Body.GetTree()
 }
@@ -422,3 +406,19 @@ func (b *BeaconStateCapellaMainnet) GetBlockRoots() [][]byte {
 func (b *BeaconStateCapellaMainnet) SetBlockRoots(blockRoots [][]byte) {
 	b.BlockRoots = blockRoots
 }
+
+func (b *BeaconBlockCapellaMainnet) CapallaExecutionPayload() *ExecutionPayloadCapella {
+	return b.Body.ExecutionPayload
+}
+
+func (b *BeaconBlockCapellaMainnet) DenebExecutionPayload() *ExecutionPayloadDeneb {
+	return nil
+}
+
+func (b *BeaconBlockCapellaMinimal) CapallaExecutionPayload() *ExecutionPayloadCapella {
+	return b.Body.ExecutionPayload
+}
+
+func (b *BeaconBlockCapellaMinimal) DenebExecutionPayload() *ExecutionPayloadDeneb {
+	return nil
+}

relayer/relays/beacon/state/beacon_deneb.go

@@ -72,7 +72,7 @@ type BeaconBlockBodyDenebMinimal struct {
 	SyncAggregate         *SyncAggregateMinimal         `json:"sync_aggregate"`
 	ExecutionPayload      *ExecutionPayloadDeneb        `json:"execution_payload"`
 	BlsToExecutionChanges []*SignedBLSToExecutionChange `json:"bls_to_execution_changes,omitempty" ssz-max:"16"`
-	BlobKzgCommitments    [][]byte                      `json:"blob_kzg_commitments,omitempty" ssz-max:"16" ssz-size:"?,48"`
+	BlobKzgCommitments    [][48]byte                    `json:"blob_kzg_commitments,omitempty" ssz-max:"16" ssz-size:"?,48"`
 }
 
 type BeaconBlockBodyDenebMainnet struct {
@@ -87,7 +87,7 @@ type BeaconBlockBodyDenebMainnet struct {
 	SyncAggregate         *SyncAggregateMainnet         `json:"sync_aggregate"`
 	ExecutionPayload      *ExecutionPayloadDeneb        `json:"execution_payload"`
 	BlsToExecutionChanges []*SignedBLSToExecutionChange `json:"bls_to_execution_changes,omitempty" ssz-max:"16"`
-	BlobKzgCommitments    [][]byte                      `json:"blob_kzg_commitments,omitempty" ssz-max:"4096" ssz-size:"?,48"`
+	BlobKzgCommitments    [][48]byte                    `json:"blob_kzg_commitments,omitempty" ssz-max:"4096" ssz-size:"?,48"`
 }
 
 type BeaconStateDenebMainnet struct {
@@ -156,14 +156,6 @@ func (b *BeaconBlockDenebMinimal) GetBeaconSlot() uint64 {
 	return b.Slot
 }
 
-func (b *BeaconBlockDenebMinimal) DenebExecutionPayload() *ExecutionPayloadDeneb {
-	return b.Body.ExecutionPayload
-}
-
-func (b *BeaconBlockDenebMinimal) CapellaExecutionPayload() *ExecutionPayloadCapella {
-	return nil
-}
-
 func (b *BeaconBlockDenebMinimal) GetBlockBodyTree() (*ssz.Node, error) {
 	return b.Body.GetTree()
 }
@@ -172,14 +164,6 @@ func (b *BeaconBlockDenebMainnet) GetBeaconSlot() uint64 {
 	return b.Slot
 }
 
-func (b *BeaconBlockDenebMainnet) DenebExecutionPayload() *ExecutionPayloadDeneb {
-	return b.Body.ExecutionPayload
-}
-
-func (b *BeaconBlockDenebMainnet) CapellaExecutionPayload() *ExecutionPayloadCapella {
-	return nil
-}
-
 func (b *BeaconBlockDenebMainnet) GetBlockBodyTree() (*ssz.Node, error) {
 	return b.Body.GetTree()
 }
@@ -211,3 +195,19 @@ func (b *BeaconStateDenebMainnet) GetBlockRoots() [][]byte {
 func (b *BeaconStateDenebMainnet) SetBlockRoots(blockRoots [][]byte) {
 	b.BlockRoots = blockRoots
 }
+
+func (b *BeaconBlockDenebMainnet) CapallaExecutionPayload() *ExecutionPayloadCapella {
+	return nil
+}
+
+func (b *BeaconBlockDenebMainnet) DenebExecutionPayload() *ExecutionPayloadDeneb {
+	return b.Body.ExecutionPayload
+}
+
+func (b *BeaconBlockDenebMinimal) CapallaExecutionPayload() *ExecutionPayloadCapella {
+	return nil
+}
+
+func (b *BeaconBlockDenebMinimal) DenebExecutionPayload() *ExecutionPayloadDeneb {
+	return b.Body.ExecutionPayload
+}