From aa5ada324be2c7fb478edc3812d922ad6c859534 Mon Sep 17 00:00:00 2001 From: a10zn8 Date: Tue, 23 May 2023 19:40:47 +0400 Subject: [PATCH] Fix native subscription in case grpc head subscription mode. Grpc Head provides limited set of information, so we need to make some new fields optional --- .../ethereum/subscribe/json/NewHeadMessage.kt | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/json/NewHeadMessage.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/json/NewHeadMessage.kt index f6fd348f..e1f7662b 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/json/NewHeadMessage.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/subscribe/json/NewHeadMessage.kt @@ -55,19 +55,26 @@ data class NewHeadMessage( val baseFeePerGas: BigInteger?, @get:JsonSerialize(using = HexDataSerializer::class) - val extraData: HexData, + @get:JsonInclude(JsonInclude.Include.NON_NULL) + val extraData: HexData?, @get:JsonSerialize(using = HexDataSerializer::class) + @get:JsonInclude(JsonInclude.Include.NON_NULL) val mixHash: HexData?, @get:JsonSerialize(using = HexDataSerializer::class) - val nonce: HexData, + @get:JsonInclude(JsonInclude.Include.NON_NULL) + val nonce: HexData?, @get:JsonSerialize(using = HexDataSerializer::class) - val receiptsRoot: HexData, + @get:JsonInclude(JsonInclude.Include.NON_NULL) + val receiptsRoot: HexData?, @get:JsonSerialize(using = HexDataSerializer::class) - val sha3Uncles: HexData, + @get:JsonInclude(JsonInclude.Include.NON_NULL) + val sha3Uncles: HexData?, @get:JsonSerialize(using = HexDataSerializer::class) - val stateRoot: HexData, + @get:JsonInclude(JsonInclude.Include.NON_NULL) + val stateRoot: HexData?, @get:JsonSerialize(using = HexDataSerializer::class) - val transactionsRoot: HexData, + @get:JsonInclude(JsonInclude.Include.NON_NULL) + val transactionsRoot: HexData?, @get:JsonSerialize(using = HexDataSerializer::class) @get:JsonInclude(JsonInclude.Include.NON_NULL) val withdrawalsRoot: HexData?,