fix: conflicts from previous merge

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     if: (github.event.action != 'closed' || github.event.pull_request.merged == true)
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
     steps:
         - uses: actions/checkout@v3
@@ -63,7 +63,7 @@ jobs:
 
         - name: test-integration
           run: make test-integration
-        
+
         - name: Upload coverage to Codecov
           uses: codecov/codecov-action@v1
           with:

ethclient/ethclient.go

@@ -533,10 +533,23 @@ func toBlockNumArg(number *big.Int) string {
 	if number == nil {
 		return "latest"
 	}
+
 	pending := big.NewInt(-1)
+	finalized := big.NewInt(int64(rpc.FinalizedBlockNumber))
+	safe := big.NewInt(int64(rpc.SafeBlockNumber))
+
 	if number.Cmp(pending) == 0 {
 		return "pending"
 	}
+
+	if number.Cmp(finalized) == 0 {
+		return "finalized"
+	}
+
+	if number.Cmp(safe) == 0 {
+		return "safe"
+	}
+
 	return hexutil.EncodeBig(number)
 }
 

ethclient/gethclient/gethclient.go

@@ -183,10 +183,23 @@ func toBlockNumArg(number *big.Int) string {
 	if number == nil {
 		return "latest"
 	}
+
 	pending := big.NewInt(-1)
+	finalized := big.NewInt(int64(rpc.FinalizedBlockNumber))
+	safe := big.NewInt(int64(rpc.SafeBlockNumber))
+
 	if number.Cmp(pending) == 0 {
 		return "pending"
 	}
+
+	if number.Cmp(finalized) == 0 {
+		return "finalized"
+	}
+
+	if number.Cmp(safe) == 0 {
+		return "safe"
+	}
+
 	return hexutil.EncodeBig(number)
 }
 

rpc/types.go

@@ -61,9 +61,11 @@ type jsonWriter interface {
 type BlockNumber int64
 
 const (
-	PendingBlockNumber  = BlockNumber(-2)
-	LatestBlockNumber   = BlockNumber(-1)
-	EarliestBlockNumber = BlockNumber(0)
+	SafeBlockNumber      = BlockNumber(-4)
+	FinalizedBlockNumber = BlockNumber(-3)
+	PendingBlockNumber   = BlockNumber(-2)
+	LatestBlockNumber    = BlockNumber(-1)
+	EarliestBlockNumber  = BlockNumber(0)
 )
 
 // UnmarshalJSON parses the given JSON fragment into a BlockNumber. It supports: