problem: with recent Geth on PoS networks there is no Difficulty value for blocks

splix · splix · commit c4098f8973e0 · 2024-11-27T18:44:59.000Z
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/data/BlockContainer.kt b/src/main/kotlin/io/emeraldpay/dshackle/data/BlockContainer.kt
@@ -48,7 +48,7 @@ class BlockContainer(
                 block.number,
                 BlockId.from(block),
                 block.parentHash?.let(BlockId.Companion::from),
-                block.totalDifficulty,
+                block.totalDifficulty ?: BigInteger.ZERO,
                 block.timestamp,
                 hasTransactions,
                 raw,
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackEthereumTx.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/TrackEthereumTx.kt
@@ -187,7 +187,7 @@ class TrackEthereumTx(
     }
 
     fun setBlockDetails(tx: TxDetails, block: BlockJson<TransactionRefJson>): TxDetails {
-        return if (block.number != null && block.totalDifficulty != null) {
+        return if (block.number != null) {
             tx.withStatus(
                 blockTotalDifficulty = block.totalDifficulty,
                 blockTime = block.timestamp

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ class TrackEthereumTx(`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`fun setBlockDetails(tx: TxDetails, block: BlockJson<TransactionRefJson>): TxDetails {`
`190`		`- return if (block.number != null && block.totalDifficulty != null) {`
	`190`	`+ return if (block.number != null) {`
`191`	`191`	`tx.withStatus(`
`192`	`192`	`blockTotalDifficulty = block.totalDifficulty,`
`193`	`193`	`blockTime = block.timestamp`