diff --git a/bor/bor.pb.go b/bor/bor.pb.go
index 0a56708..86a5587 100644
--- a/bor/bor.pb.go
+++ b/bor/bor.pb.go
@@ -309,7 +309,7 @@ type GetHeaderByNumberRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Number uint64 `protobuf:"varint,1,opt,name=number,proto3" json:"number,omitempty"`
+	Number string `protobuf:"bytes,1,opt,name=number,proto3" json:"number,omitempty"`
 }
 
 func (x *GetHeaderByNumberRequest) Reset() {
@@ -344,11 +344,11 @@ func (*GetHeaderByNumberRequest) Descriptor() ([]byte, []int) {
 	return file_bor_bor_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *GetHeaderByNumberRequest) GetNumber() uint64 {
+func (x *GetHeaderByNumberRequest) GetNumber() string {
 	if x != nil {
 		return x.Number
 	}
-	return 0
+	return ""
 }
 
 type GetHeaderByNumberResponse struct {
@@ -403,7 +403,7 @@ type GetBlockByNumberRequest struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Number uint64 `protobuf:"varint,1,opt,name=number,proto3" json:"number,omitempty"`
+	Number string `protobuf:"bytes,1,opt,name=number,proto3" json:"number,omitempty"`
 }
 
 func (x *GetBlockByNumberRequest) Reset() {
@@ -438,11 +438,11 @@ func (*GetBlockByNumberRequest) Descriptor() ([]byte, []int) {
 	return file_bor_bor_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *GetBlockByNumberRequest) GetNumber() uint64 {
+func (x *GetBlockByNumberRequest) GetNumber() string {
 	if x != nil {
 		return x.Number
 	}
-	return 0
+	return ""
 }
 
 type GetBlockByNumberResponse struct {
@@ -988,7 +988,7 @@ var file_bor_bor_proto_rawDesc = []byte{
 	0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
 	0x73, 0x65, 0x22, 0x32, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42,
 	0x79, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16,
-	0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06,
+	0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
 	0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x40, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61,
 	0x64, 0x65, 0x72, 0x42, 0x79, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
@@ -996,7 +996,7 @@ var file_bor_bor_proto_rawDesc = []byte{
 	0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x31, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x42,
 	0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x79, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75,
 	0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x04, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x3c, 0x0a, 0x18, 0x47,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x3c, 0x0a, 0x18, 0x47,
 	0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x42, 0x79, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52,
 	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x62, 0x6f, 0x72, 0x2e, 0x42, 0x6c, 0x6f,
diff --git a/bor/bor.proto b/bor/bor.proto
index b1e1d88..7d39efc 100644
--- a/bor/bor.proto
+++ b/bor/bor.proto
@@ -49,7 +49,7 @@ message GetVoteOnHashResponse {
 // ---- HEADER BY NUMBER ----
 
 message GetHeaderByNumberRequest {
-    uint64 number = 1;
+    string number = 1;
 }
 
 message GetHeaderByNumberResponse {
@@ -59,7 +59,7 @@ message GetHeaderByNumberResponse {
 // ---- BLOCK BY NUMBER ----
 
 message GetBlockByNumberRequest {
-    uint64 number = 1;
+    string number = 1;
 }
 
 message GetBlockByNumberResponse {