mirror of
https://github.com/status-im/nimbus-eth2.git
synced 2025-01-10 14:26:26 +00:00
Avoid potential stalls in the Eth1 monitor code due to missing timeouts (#3905)
* Avoid potential stalls in the Eth1 monitor code due to missing timeouts * 1 second timeout for exchange-configuration
This commit is contained in:
zah
GitHub
parent
1a1553fee8
commit
7d27e10315
@ -425,7 +425,8 @@ proc close(p: Web3DataProviderRef): Future[void] {.async.} =
|
||||
except CatchableError:
|
||||
debug "Failed to clean up block headers subscription properly"
|
||||
|
||||
await p.web3.close()
|
||||
awaitWithTimeout(p.web3.close(), 30.seconds):
|
||||
debug "Failed to close data provider in time"
|
||||
|
||||
proc getBlockByHash(p: Web3DataProviderRef, hash: BlockHash):
|
||||
Future[BlockObject] =
|
||||
@ -538,8 +539,15 @@ proc exchangeTransitionConfiguration*(p: Eth1Monitor): Future[void] {.async.} =
|
||||
# https://github.com/nim-lang/Nim/issues/19802
|
||||
(static(default(Quantity))))
|
||||
let ecTransitionConfiguration =
|
||||
await p.dataProvider.web3.provider.engine_exchangeTransitionConfigurationV1(
|
||||
ccTransitionConfiguration)
|
||||
try:
|
||||
awaitWithRetries(
|
||||
p.dataProvider.web3.provider.engine_exchangeTransitionConfigurationV1(
|
||||
ccTransitionConfiguration),
|
||||
timeout = 1.seconds)
|
||||
except CatchableError as err:
|
||||
debug "Failed to exchange transition configuration", err = err.msg
|
||||
return
|
||||
|
||||
if ccTransitionConfiguration != ecTransitionConfiguration:
|
||||
warn "exchangeTransitionConfiguration: Configuration mismatch detected",
|
||||
consensusTerminalTotalDifficulty =
|
||||
@ -625,14 +633,14 @@ type
|
||||
DepositCountIncorrect
|
||||
DepositCountUnavailable
|
||||
|
||||
template awaitOrRaiseOnTimeout[T](fut: Future[T],
|
||||
timeout: Duration): T =
|
||||
awaitWithTimeout(fut, timeout):
|
||||
raise newException(DataProviderTimeout, "Timeout")
|
||||
|
||||
when hasDepositRootChecks:
|
||||
const
|
||||
contractCallTimeout = seconds(60)
|
||||
|
||||
template awaitOrRaiseOnTimeout[T](fut: Future[T],
|
||||
timeout: Duration): T =
|
||||
awaitWithTimeout(fut, timeout):
|
||||
raise newException(DataProviderTimeout, "Timeout")
|
||||
contractCallTimeout = 60.seconds
|
||||
|
||||
func fetchDepositContractData(p: Web3DataProviderRef, blk: Eth1Block):
|
||||
Future[DepositContractDataStatus] {.async.} =
|
||||
@ -915,7 +923,7 @@ proc new*(T: type Web3DataProvider,
|
||||
jwtSecret: Option[seq[byte]]):
|
||||
Future[Result[Web3DataProviderRef, string]] {.async.} =
|
||||
let web3Fut = newWeb3(web3Url, getJsonRpcRequestHeaders(jwtSecret))
|
||||
yield web3Fut or sleepAsync(chronos.seconds(10))
|
||||
yield web3Fut or sleepAsync(10.seconds)
|
||||
if (not web3Fut.finished) or web3Fut.failed:
|
||||
await cancelAndWait(web3Fut)
|
||||
if web3Fut.failed:
|
||||
@ -1023,7 +1031,7 @@ func clear(chain: var Eth1Chain) =
|
||||
chain.hasConsensusViolation = false
|
||||
|
||||
proc detectPrimaryProviderComingOnline(m: Eth1Monitor) {.async.} =
|
||||
const checkInterval = chronos.seconds(30)
|
||||
const checkInterval = 30.seconds
|
||||
|
||||
let
|
||||
web3Url = m.web3Urls[0]
|
||||
@ -1063,7 +1071,8 @@ proc doStop(m: Eth1Monitor) {.async.} =
|
||||
safeCancel m.runFut
|
||||
|
||||
if m.dataProvider != nil:
|
||||
await m.dataProvider.close()
|
||||
awaitWithTimeout(m.dataProvider.close(), 30.seconds):
|
||||
debug "Failed to close data provider in time"
|
||||
m.dataProvider = nil
|
||||
|
||||
proc ensureDataProvider*(m: Eth1Monitor) {.async.} =
|
||||
@ -1499,7 +1508,8 @@ proc start*(m: Eth1Monitor) =
|
||||
proc getEth1BlockHash*(
|
||||
url: string, blockId: RtBlockIdentifier, jwtSecret: Option[seq[byte]]):
|
||||
Future[BlockHash] {.async.} =
|
||||
let web3 = await newWeb3(url, getJsonRpcRequestHeaders(jwtSecret))
|
||||
let web3 = awaitOrRaiseOnTimeout(newWeb3(url, getJsonRpcRequestHeaders(jwtSecret)),
|
||||
10.seconds)
|
||||
try:
|
||||
let blk = awaitWithRetries(
|
||||
web3.provider.eth_getBlockByNumber(blockId, false))
|
||||
@ -1507,54 +1517,61 @@ proc getEth1BlockHash*(
|
||||
finally:
|
||||
await web3.close()
|
||||
|
||||
func `$`(x: Quantity): string =
|
||||
$(x.uint64)
|
||||
|
||||
func `$`(x: BlockObject): string =
|
||||
$(x.number) & " [" & $(x.hash) & "]"
|
||||
|
||||
proc testWeb3Provider*(web3Url: Uri,
|
||||
depositContractAddress: Eth1Address,
|
||||
jwtSecret: Option[seq[byte]]) {.async.} =
|
||||
template mustSucceed(action: static string, expr: untyped): untyped =
|
||||
try: expr
|
||||
stdout.write "Establishing web3 connection..."
|
||||
var web3: Web3
|
||||
try:
|
||||
web3 = awaitOrRaiseOnTimeout(
|
||||
newWeb3($web3Url, getJsonRpcRequestHeaders(jwtSecret)), 5.seconds)
|
||||
stdout.write "\rEstablishing web3 connection: Connected\n"
|
||||
except CatchableError as err:
|
||||
stdout.write "\rEstablishing web3 connection: Failure(" & err.msg & ")\n"
|
||||
quit 1
|
||||
|
||||
template request(actionDesc: static string,
|
||||
action: untyped): untyped =
|
||||
stdout.write actionDesc & "..."
|
||||
stdout.flushFile()
|
||||
var res: typeof(read action)
|
||||
try:
|
||||
res = awaitWithRetries action
|
||||
stdout.write "\r" & actionDesc & ": " & $res
|
||||
except CatchableError as err:
|
||||
fatal("Failed to " & action, err = err.msg)
|
||||
quit 1
|
||||
stdout.write "\r" & actionDesc & ": Error(" & err.msg & ")"
|
||||
stdout.write "\n"
|
||||
res
|
||||
|
||||
let
|
||||
web3 = mustSucceed "connect to web3 provider":
|
||||
await newWeb3(
|
||||
$web3Url, getJsonRpcRequestHeaders(jwtSecret))
|
||||
latestBlock = mustSucceed "get latest block":
|
||||
awaitWithRetries web3.provider.eth_getBlockByNumber(blockId("latest"), false)
|
||||
syncStatus = mustSucceed "get sync status":
|
||||
awaitWithRetries web3.provider.eth_syncing()
|
||||
peers =
|
||||
try:
|
||||
awaitWithRetries web3.provider.net_peerCount()
|
||||
except:
|
||||
0
|
||||
clientVersion = mustSucceed "get client version":
|
||||
awaitWithRetries web3.provider.web3_clientVersion()
|
||||
mining = mustSucceed "get mining status":
|
||||
awaitWithRetries web3.provider.eth_mining()
|
||||
clientVersion = request "Client version":
|
||||
web3.provider.web3_clientVersion()
|
||||
|
||||
echo "Client Version: ", clientVersion
|
||||
echo "Network Peers: ", peers
|
||||
echo "Syncing: ", syncStatus
|
||||
echo "Latest block: ", latestBlock.number.uint64
|
||||
echo "Last Known Nonce: ", web3.lastKnownNonce
|
||||
echo "Mining: ", mining
|
||||
chainId = request "Chain ID":
|
||||
web3.provider.eth_chainId()
|
||||
|
||||
try:
|
||||
let chainId = awaitWithRetries web3.provider.eth_chainId()
|
||||
echo "Chain ID: ", chainId.uint64
|
||||
except DataProviderFailure as exc:
|
||||
# Typically because it's not synced through EIP-155.
|
||||
echo "Web3 provider does not provide chain ID: " & exc.msg
|
||||
latestBlock = request "Latest block":
|
||||
web3.provider.eth_getBlockByNumber(blockId("latest"), false)
|
||||
|
||||
let ns = web3.contractSender(DepositContract, depositContractAddress)
|
||||
try:
|
||||
let depositRoot = awaitWithRetries(
|
||||
ns.get_deposit_root.call(blockNumber = latestBlock.number.uint64))
|
||||
echo "Deposit root: ", depositRoot
|
||||
except CatchableError as err:
|
||||
echo "Web3 provider is not archive mode: ", err.msg
|
||||
syncStatus = request "Sync status":
|
||||
web3.provider.eth_syncing()
|
||||
|
||||
peers = request "Peers":
|
||||
web3.provider.net_peerCount()
|
||||
|
||||
miningStatus = request "Mining status":
|
||||
web3.provider.eth_mining()
|
||||
|
||||
ns = web3.contractSender(DepositContract, depositContractAddress)
|
||||
|
||||
depositRoot = request "Deposit root":
|
||||
ns.get_deposit_root.call(blockNumber = latestBlock.number.uint64)
|
||||
|
||||
when hasGenesisDetection:
|
||||
proc loadPersistedDeposits*(monitor: Eth1Monitor) =
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user