ethclient: add 'finalized' and 'safe' block number support (#25580)

8df8eb4e · Rachel Bousfield · GitHub · 44b36a0c · 8df8eb4e · 8df8eb4e
Unverified Commit 8df8eb4e authored Aug 30, 2022 by Rachel Bousfield Committed by GitHub Aug 30, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 0 deletions

ethclient.go ethclient/ethclient.go +8 -0

gethclient.go ethclient/gethclient/gethclient.go +8 -0

No files found.
--- a/ethclient/ethclient.go
+++ b/ethclient/ethclient.go
@@ -570,6 +570,14 @@ func toBlockNumArg(number *big.Int) string {
 	if number.Cmp(pending) == 0 {
 		return "pending"
 	}
+	finalized := big.NewInt(int64(rpc.FinalizedBlockNumber))
+	if number.Cmp(finalized) == 0 {
+		return "finalized"
+	}
+	safe := big.NewInt(int64(rpc.SafeBlockNumber))
+	if number.Cmp(safe) == 0 {
+		return "safe"
+	}
 	return hexutil.EncodeBig(number)
 }


--- a/ethclient/gethclient/gethclient.go
+++ b/ethclient/gethclient/gethclient.go
@@ -187,6 +187,14 @@ func toBlockNumArg(number *big.Int) string {
 	if number.Cmp(pending) == 0 {
 		return "pending"
 	}
+	finalized := big.NewInt(int64(rpc.FinalizedBlockNumber))
+	if number.Cmp(finalized) == 0 {
+		return "finalized"
+	}
+	safe := big.NewInt(int64(rpc.SafeBlockNumber))
+	if number.Cmp(safe) == 0 {
+		return "safe"
+	}
 	return hexutil.EncodeBig(number)
 }