diff --git a/beacon-chain/p2p/gossip_topic_mappings.go b/beacon-chain/p2p/gossip_topic_mappings.go index 2a763b256..9aba63458 100644 --- a/beacon-chain/p2p/gossip_topic_mappings.go +++ b/beacon-chain/p2p/gossip_topic_mappings.go @@ -54,7 +54,9 @@ func init() { for k, v := range gossipTopicMappings { GossipTypeMapping[reflect.TypeOf(v)] = k } - // Specially handle Altair Objects. + // Specially handle Altair objects. GossipTypeMapping[reflect.TypeOf(ðpb.SignedBeaconBlockAltair{})] = BlockSubnetTopicFormat + // Specially handle Bellatrix objects. GossipTypeMapping[reflect.TypeOf(ðpb.SignedBeaconBlockBellatrix{})] = BlockSubnetTopicFormat + GossipTypeMapping[reflect.TypeOf(ðpb.SignedBlindedBeaconBlockBellatrix{})] = BlockSubnetTopicFormat } diff --git a/beacon-chain/rpc/apimiddleware/structs.go b/beacon-chain/rpc/apimiddleware/structs.go index 756c23ce9..784b32f9a 100644 --- a/beacon-chain/rpc/apimiddleware/structs.go +++ b/beacon-chain/rpc/apimiddleware/structs.go @@ -457,7 +457,7 @@ type blindedBeaconBlockBodyBellatrixJson struct { Deposits []*depositJson `json:"deposits"` VoluntaryExits []*signedVoluntaryExitJson `json:"voluntary_exits"` SyncAggregate *syncAggregateJson `json:"sync_aggregate"` - ExecutionPayloadHeader *executionPayloadHeaderJson `json:"execution_payload"` + ExecutionPayloadHeader *executionPayloadHeaderJson `json:"execution_payload_header"` } type executionPayloadJson struct { @@ -489,7 +489,7 @@ type executionPayloadHeaderJson struct { GasUsed string `json:"gas_used"` TimeStamp string `json:"timestamp"` ExtraData string `json:"extra_data" hex:"true"` - BaseFeePerGas string `json:"base_fee_per_gas" hex:"true"` + BaseFeePerGas string `json:"base_fee_per_gas" uint256:"true"` BlockHash string `json:"block_hash" hex:"true"` TransactionsRoot string `json:"transactions_root" hex:"true"` }