From b9b8e68fdb5ebecec2dc13158df55a776c0ce78f Mon Sep 17 00:00:00 2001 From: KirillPamPam Date: Wed, 6 Nov 2024 18:41:52 +0400 Subject: [PATCH] New state error, fix near lower bound (#591) --- foundation/src/main/resources/public | 2 +- .../upstream/ethereum/EthereumLowerBoundBlockDetector.kt | 1 + .../upstream/ethereum/EthereumLowerBoundStateDetector.kt | 1 + .../dshackle/upstream/near/NearLowerBoundStateDetector.kt | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/foundation/src/main/resources/public b/foundation/src/main/resources/public index 1052aa76..8621e77b 160000 --- a/foundation/src/main/resources/public +++ b/foundation/src/main/resources/public @@ -1 +1 @@ -Subproject commit 1052aa7631c86cc6b744fe81121f040aefef3b5b +Subproject commit 8621e77b50dd1dd7500ecc95cbe20a6443cbfab7 diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundBlockDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundBlockDetector.kt index de515a5d..4ba27a96 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundBlockDetector.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundBlockDetector.kt @@ -25,6 +25,7 @@ class EthereumLowerBoundBlockDetector( private val NO_BLOCK_ERRORS = listOf( "error loading messages for tipset", "bad tipset height", + "Block with such an ID is pruned", // zksync ) } diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundStateDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundStateDetector.kt index c5c6121b..dc26d2c5 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundStateDetector.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumLowerBoundStateDetector.kt @@ -47,6 +47,7 @@ class EthereumLowerBoundStateDetector( "Block with such an ID is pruned", // zksync "state at block", // berachain, eth "unsupported block number", // arb + "unexpected state root", // fantom ) } diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/near/NearLowerBoundStateDetector.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/near/NearLowerBoundStateDetector.kt index 51dd4018..55aa2777 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/near/NearLowerBoundStateDetector.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/near/NearLowerBoundStateDetector.kt @@ -36,6 +36,6 @@ class NearLowerBoundStateDetector( } override fun types(): Set { - return setOf(LowerBoundType.STATE) + return setOf(LowerBoundType.STATE, LowerBoundType.BLOCK) } }