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

always set extragas to specific value, to simplify selection (#610)

Browse Source
This commit is contained in:
Vyacheslav
2024-12-20 12:09:37 +02:00
committed by GitHub
parent c65119b307
commit 42da48be5f
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,9 @@ class EthereumUpstreamSettingsDetector(
}.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 labels = mutableListOf(Pair("gas-limit", gaslimit.toString(10)))
labels.add(Pair("extra_gas_limit", gaslimit.toString(10))) if (gaslimit.toLong() > 590_000_000L) {
labels.add(Pair("extra_gas_limit", 600_000_000.toString()))
}
Flux.fromIterable(labels) Flux.fromIterable(labels)
}.onErrorResume { }.onErrorResume {
Flux.empty() Flux.empty()

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

@@ -34,7 +34,7 @@ class EthereumUpstreamSettingsDetectorSpec extends Specification {
"0x53Daa71B04d589429f6d3DF52db123913B818F22": [ "0x53Daa71B04d589429f6d3DF52db123913B818F22": [
"code": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c806351be4eaa14602d575b600080fd5b60336047565b604051603e91906066565b60405180910390f35b60005a905090565b6000819050919050565b606081604f565b82525050565b6000602082019050607960008301846059565b9291505056fea26469706673582212201c0202887c1afe66974b06ee355dee07542bbc424cf4d1659c91f56c08c3dcc064736f6c63430008130033", "code": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c806351be4eaa14602d575b600080fd5b60336047565b604051603e91906066565b60405180910390f35b60005a905090565b6000819050919050565b606081604f565b82525050565b6000602082019050607960008301846059565b9291505056fea26469706673582212201c0202887c1afe66974b06ee355dee07542bbc424cf4d1659c91f56c08c3dcc064736f6c63430008130033",
], ],
]], "0x2fa9dc2") ]], gas)
} }
) )
def detector = new EthereumUpstreamSettingsDetector(up, Chain.ETHEREUM__MAINNET) def detector = new EthereumUpstreamSettingsDetector(up, Chain.ETHEREUM__MAINNET)
@@ -42,22 +42,23 @@ class EthereumUpstreamSettingsDetectorSpec extends Specification {
when: when:
def act = detector.internalDetectLabels() def act = detector.internalDetectLabels()
then: then:
StepVerifier.create(act) def result = StepVerifier.create(act)
.expectNext( .expectNext(
new Pair<String, String>("client_type", clientType), new Pair<String, String>("client_type", clientType),
new Pair<String, String>("client_version", version), new Pair<String, String>("client_version", version),
new Pair<String, String>("archive", "true"), new Pair<String, String>("archive", "true"),
new Pair<String, String>("gas-limit", "50000000"), new Pair<String, String>("gas-limit", gasv),
new Pair<String, String>("extra_gas_limit", "50000000")
) )
.expectComplete() if (extragas != null) {
.verify(Duration.ofSeconds(1)) result.expectNext(new Pair<String, String>("extra_gas_limit", extragas))
}
result.expectComplete().verify(Duration.ofSeconds(1))
where: where:
response | clientType | version response | gas | gasv | extragas | clientType | version
"Nethermind/v1.19.3+e8ac1da4/linux-x64/dotnet7.0.8" | "nethermind" | "v1.19.3+e8ac1da4" "Nethermind/v1.19.3+e8ac1da4/linux-x64/dotnet7.0.8" | "0x2fa9dc2" | "50000000" | null | "nethermind" | "v1.19.3+e8ac1da4"
"Geth/v1.12.0-stable-e501b3b0/linux-amd64/go1.20.3" | "geth" | "v1.12.0-stable-e501b3b0" "Geth/v1.12.0-stable-e501b3b0/linux-amd64/go1.20.3" | "0x2fa9dc2" | "50000000" | null | "geth" | "v1.12.0-stable-e501b3b0"
"Erigon/v1.12.0-stable-e501b3b0/linux-amd64/go1.20.3" | "erigon" | "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"
"Bor/v0.4.0/linux-amd64/go1.19.10" | "bor" | "v0.4.0" "Bor/v0.4.0/linux-amd64/go1.19.10" | "0x23c2f342"| "600000000" | "600000000" | "bor" | "v0.4.0"
} }
def "Not archival node if null response"() { def "Not archival node if null response"() {