feat(rpc): make v10 self contained (part 2) (#3541)

* feat: copy ChainID method from v9 into v10 + tests

* feat: copy BlockNumber, BlockHashAndNumber, and BlockTransactionCount method from v9 into v10 + tests

* feat: copy Syncing method from v9 into v10 + tests

* feat: copy Nonce method from v9 into v10 + tests

* feat: copy ClassHashAt, Class, and ClassAt methods from v9 into v10 + tests

* feat: copy CompiledCasm method from v9 into v10 + tests

* feat: copy GetMessageStatus method from v9 into v10 + tests

* feat: copy StorageProof method from v9 into v10 + tests

* fix: linter errors

Author: thiagodeev

rpc/handlers.go

@@ -144,15 +144,15 @@ func (h *Handler) MethodsV0_10() ([]jsonrpc.Method, string) {
 	return []jsonrpc.Method{
 		{
 			Name:    "starknet_chainId",
-			Handler: h.rpcv6Handler.ChainID,
+			Handler: h.rpcv10Handler.ChainID,
 		},
 		{
 			Name:    "starknet_blockNumber",
-			Handler: h.rpcv6Handler.BlockNumber,
+			Handler: h.rpcv10Handler.BlockNumber,
 		},
 		{
 			Name:    "starknet_blockHashAndNumber",
-			Handler: h.rpcv6Handler.BlockHashAndNumber,
+			Handler: h.rpcv10Handler.BlockHashAndNumber,
 		},
 		{
 			Name:    "starknet_getBlockWithTxHashes",
@@ -183,7 +183,7 @@ func (h *Handler) MethodsV0_10() ([]jsonrpc.Method, string) {
 		{
 			Name:    "starknet_getBlockTransactionCount",
 			Params:  []jsonrpc.Parameter{{Name: "block_id"}},
-			Handler: h.rpcv9Handler.BlockTransactionCount,
+			Handler: h.rpcv10Handler.BlockTransactionCount,
 		},
 		{
 			Name: "starknet_getTransactionByBlockIdAndIndex",
@@ -204,12 +204,12 @@ func (h *Handler) MethodsV0_10() ([]jsonrpc.Method, string) {
 		},
 		{
 			Name:    "starknet_syncing",
-			Handler: h.rpcv6Handler.Syncing,
+			Handler: h.rpcv10Handler.Syncing,
 		},
 		{
 			Name:    "starknet_getNonce",
 			Params:  []jsonrpc.Parameter{{Name: "block_id"}, {Name: "contract_address"}},
-			Handler: h.rpcv9Handler.Nonce,
+			Handler: h.rpcv10Handler.Nonce,
 		},
 		{
 			Name: "starknet_getStorageAt",
@@ -224,17 +224,17 @@ func (h *Handler) MethodsV0_10() ([]jsonrpc.Method, string) {
 		{
 			Name:    "starknet_getClassHashAt",
 			Params:  []jsonrpc.Parameter{{Name: "block_id"}, {Name: "contract_address"}},
-			Handler: h.rpcv9Handler.ClassHashAt,
+			Handler: h.rpcv10Handler.ClassHashAt,
 		},
 		{
 			Name:    "starknet_getClass",
 			Params:  []jsonrpc.Parameter{{Name: "block_id"}, {Name: "class_hash"}},
-			Handler: h.rpcv9Handler.Class,
+			Handler: h.rpcv10Handler.Class,
 		},
 		{
 			Name:    "starknet_getClassAt",
 			Params:  []jsonrpc.Parameter{{Name: "block_id"}, {Name: "contract_address"}},
-			Handler: h.rpcv9Handler.ClassAt,
+			Handler: h.rpcv10Handler.ClassAt,
 		},
 		{
 			Name:    "starknet_addInvokeTransaction",
@@ -359,12 +359,12 @@ func (h *Handler) MethodsV0_10() ([]jsonrpc.Method, string) {
 		{
 			Name:    "starknet_getCompiledCasm",
 			Params:  []jsonrpc.Parameter{{Name: "class_hash"}},
-			Handler: h.rpcv9Handler.CompiledCasm,
+			Handler: h.rpcv10Handler.CompiledCasm,
 		},
 		{
 			Name:    "starknet_getMessagesStatus",
 			Params:  []jsonrpc.Parameter{{Name: "transaction_hash"}},
-			Handler: h.rpcv9Handler.GetMessageStatus,
+			Handler: h.rpcv10Handler.GetMessageStatus,
 		},
 		{
 			Name: "starknet_getStorageProof",
@@ -374,7 +374,7 @@ func (h *Handler) MethodsV0_10() ([]jsonrpc.Method, string) {
 				{Name: "contract_addresses", Optional: true},
 				{Name: "contracts_storage_keys", Optional: true},
 			},
-			Handler: h.rpcv9Handler.StorageProof,
+			Handler: h.rpcv10Handler.StorageProof,
 		},
 	}, "/v0_10"
 }

rpc/v10/block.go

@@ -84,6 +84,54 @@ type BlockWithReceipts struct {
 	Transactions []TransactionWithReceipt `json:"transactions"`
 }
 
+// https://github.com/starkware-libs/starknet-specs/blob/release/v0.10.2/api/starknet_api_openrpc.json#L830-L848
+type BlockHashAndNumber struct {
+	Hash   *felt.Felt `json:"block_hash"`
+	Number uint64     `json:"block_number"`
+}
+
+/****************************************************
+		Block Handlers
+*****************************************************/
+
+// BlockNumber returns the latest synced block number.
+//
+// It follows the specification defined here:
+// https://github.com/starkware-libs/starknet-specs/blob/release/v0.10.2/api/starknet_api_openrpc.json#L809
+func (h *Handler) BlockNumber() (uint64, *jsonrpc.Error) {
+	num, err := h.bcReader.Height()
+	if err != nil {
+		return 0, rpccore.ErrNoBlock
+	}
+
+	return num, nil
+}
+
+// BlockHashAndNumber returns the block hash and number of the latest synced block.
+//
+// It follows the specification defined here:
+// https://github.com/starkware-libs/starknet-specs/blob/release/v0.10.2/api/starknet_api_openrpc.json#L827
+func (h *Handler) BlockHashAndNumber() (*BlockHashAndNumber, *jsonrpc.Error) {
+	block, err := h.bcReader.Head()
+	if err != nil {
+		return nil, rpccore.ErrNoBlock
+	}
+	return &BlockHashAndNumber{Number: block.Number, Hash: block.Hash}, nil
+}
+
+// BlockTransactionCount returns the number of transactions in a block
+// identified by the given BlockID.
+//
+// It follows the specification defined here:
+// https://github.com/starkware-libs/starknet-specs/blob/release/v0.10.2/api/starknet_api_openrpc.json#L622
+func (h *Handler) BlockTransactionCount(id *BlockID) (uint64, *jsonrpc.Error) {
+	header, rpcErr := h.blockHeaderByID(id)
+	if rpcErr != nil {
+		return 0, rpcErr
+	}
+	return header.TransactionCount, nil
+}
+
 // BlockWithTxHashes returns the block information with transaction hashes given a block ID.
 //
 // It follows the specification defined here: