StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite extra gas label (#617)

Browse Source
This commit is contained in:
KirillPamPam
2025-01-08 14:36:29 +04:00
committed by GitHub
parent c6955afce4
commit 15ffdc2d2e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamSettingsDetector.kt
View File

@@ -81,9 +81,13 @@ class EthereumUpstreamSettingsDetector(
it.requireResult() it.requireResult()
}.flatMapMany { }.flatMapMany {
val gaslimit = String(it).drop(3).dropLast(1).toBigInteger(16) + (21182).toBigInteger() val gaslimit = String(it).drop(3).dropLast(1).toBigInteger(16) + (21182).toBigInteger()
val labels = mutableListOf(Pair("gas-limit", gaslimit.toString(10))) val nodeGasLimit = gaslimit.toString(10)
val labels = mutableListOf(Pair("gas-limit", nodeGasLimit))
if (gaslimit.toLong() > 590_000_000L) { if (gaslimit.toLong() > 590_000_000L) {
labels.add(Pair("extra_gas_limit", 600_000_000.toString())) labels.add(Pair("extra_gas_limit", 600_000_000.toString()))
} else {
// disable extra gas
labels.add(Pair("extra_gas_limit", nodeGasLimit))
} }
Flux.fromIterable(labels) Flux.fromIterable(labels)
}.onErrorResume { }.onErrorResume {

6
src/test/groovy/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamSettingsDetectorSpec.groovy
View File

@@ -55,9 +55,9 @@ class EthereumUpstreamSettingsDetectorSpec extends Specification {
result.expectComplete().verify(Duration.ofSeconds(1)) result.expectComplete().verify(Duration.ofSeconds(1))
where: where:
response | gas | gasv | extragas | clientType | version response | gas | gasv | extragas | clientType | version
"Nethermind/v1.19.3+e8ac1da4/linux-x64/dotnet7.0.8" | "0x2fa9dc2" | "50000000" | null | "nethermind" | "v1.19.3+e8ac1da4" "Nethermind/v1.19.3+e8ac1da4/linux-x64/dotnet7.0.8" | "0x2fa9dc2" | "50000000" | "50000000" | "nethermind" | "v1.19.3+e8ac1da4"
"Geth/v1.12.0-stable-e501b3b0/linux-amd64/go1.20.3" | "0x2fa9dc2" | "50000000" | null | "geth" | "v1.12.0-stable-e501b3b0" "Geth/v1.12.0-stable-e501b3b0/linux-amd64/go1.20.3" | "0x2fa9dc2" | "50000000" | "50000000" | "geth" | "v1.12.0-stable-e501b3b0"
"Erigon/v1.12.0-stable-e501b3b0/linux-amd64/go1.20.3" | "0x2fa9dc2" | "50000000" | null | "erigon" | "v1.12.0-stable-e501b3b0" "Erigon/v1.12.0-stable-e501b3b0/linux-amd64/go1.20.3" | "0x2fa9dc2" | "50000000" | "50000000" | "erigon" | "v1.12.0-stable-e501b3b0"
"Bor/v0.4.0/linux-amd64/go1.19.10" | "0x23c2f342"| "600000000" | "600000000" | "bor" | "v0.4.0" "Bor/v0.4.0/linux-amd64/go1.19.10" | "0x23c2f342"| "600000000" | "600000000" | "bor" | "v0.4.0"
} }