Return validation options and fix gas validator (#553)

This commit is contained in:
KirillPamPam
2024-08-22 12:33:47 +04:00
committed by GitHub
parent 3d9193e11c
commit a8b91fa84a
3 changed files with 15 additions and 6 deletions

View File

@@ -155,15 +155,18 @@ object EthereumChainSpecific : AbstractPollChainSpecific() {
): List<SingleValidator<ValidateUpstreamSettingsResult>> {
val limitValidator = callLimitValidatorFactory(upstream, options, config, chain)
return listOf(
val validators = mutableListOf(
ChainIdValidator(upstream, chain),
OldBlockValidator(upstream),
GasPriceValidator(upstream, config),
) + if (limitValidator.isEnabled()) {
listOf(limitValidator)
} else {
emptyList()
)
if (limitValidator.isEnabled()) {
validators.add(limitValidator)
}
if (options.validateGasPrice) {
validators.add(GasPriceValidator(upstream, config))
}
return validators
}
override fun chainSettingsValidator(

View File

@@ -267,6 +267,9 @@ class GasPriceValidator(
val log: Logger = LoggerFactory.getLogger(GasPriceValidator::class.java)
}
override fun validate(onError: ValidateUpstreamSettingsResult): Mono<ValidateUpstreamSettingsResult> {
if (!upstream.getMethods().isCallable("eth_gasPrice")) {
return Mono.just(ValidateUpstreamSettingsResult.UPSTREAM_VALID)
}
return upstream.getIngressReader()
.read(ChainRequest("eth_gasPrice", ListParams()))
.flatMap(ChainResponse::requireStringResult)