Merge pull request #33 from ava-labs/fix-nil-pointer

Fix potential nil pointer dereference

1 files changed, 6 insertions, 1 deletions

diff --git a/rpc/types.go b/rpc/types.go
index 6575203..3ee46f3 100644
--- a/rpc/types.go
+++ b/rpc/types.go
@@ -148,13 +148,18 @@ func (bnh *BlockNumberOrHash) UnmarshalJSON(data []byte) error {
 		bnh.BlockNumber = &bn
 		return nil
 	case "latest":
-		bn := LatestBlockNumber
+		//*bn = LatestBlockNumber
+		bn := AcceptedBlockNumber
 		bnh.BlockNumber = &bn
 		return nil
 	case "pending":
 		bn := PendingBlockNumber
 		bnh.BlockNumber = &bn
 		return nil
+	case "accepted":
+		bn := AcceptedBlockNumber
+		bnh.BlockNumber = &bn
+		return nil
 	default:
 		if len(input) == 66 {
 			hash := common.Hash{}