catch and check revert reasons

Ensure specific contract reverts are handled and returned as booleans or default values

# Conflicts:
#	codex/contracts/proofs.nim
This commit is contained in:
Eric Mastro 2022-09-20 13:24:28 +10:00 committed by Eric Mastro
parent 10d4dcd70d
commit 5eb65336fd
2 changed files with 13 additions and 7 deletions

View File

@ -1,4 +1,6 @@
import std/strutils
import pkg/ethers
import pkg/ethers/testing
import pkg/upraises
import pkg/questionable
import ../market
@ -38,7 +40,8 @@ method getRequest(market: OnChainMarket,
id: RequestId): Future[?StorageRequest] {.async.} =
try:
return some await market.contract.getRequest(id)
except ValueError:
except JsonRpcProviderError as e:
if e.revertReason.contains("Unknown request"):
# Unknown request
return none StorageRequest

View File

@ -1,3 +1,4 @@
import std/strutils
import pkg/ethers
import pkg/ethers/testing
import ../storageproofs/timing/proofs
@ -28,7 +29,7 @@ method isProofRequired*(proofs: OnChainProofs,
try:
return await proofs.storage.isProofRequired(id)
except JsonRpcProviderError as e:
if e.revertReason == "Slot empty":
if e.revertReason.contains("Slot empty"):
return false
raise e
@ -37,7 +38,7 @@ method willProofBeRequired*(proofs: OnChainProofs,
try:
return await proofs.storage.willProofBeRequired(id)
except JsonRpcProviderError as e:
if e.revertReason == "Slot empty":
if e.revertReason.contains("Slot empty"):
return false
raise e
@ -45,8 +46,10 @@ method getProofEnd*(proofs: OnChainProofs,
id: SlotId): Future[UInt256] {.async.} =
try:
return await proofs.storage.proofEnd(id)
except ValueError:
except JsonRpcProviderError as e:
if e.revertReason.contains("Slot empty"):
return 0.u256
raise e
method submitProof*(proofs: OnChainProofs,
id: SlotId,