diff --git a/old-faithful-proto/old-faithful-grpc/old-faithful.pb.go b/old-faithful-proto/old-faithful-grpc/old-faithful.pb.go
index 5ed7b72b..cd4f53a4 100644
--- a/old-faithful-proto/old-faithful-grpc/old-faithful.pb.go
+++ b/old-faithful-proto/old-faithful-grpc/old-faithful.pb.go
@@ -66,55 +66,6 @@ func (GetResponseErrorCode) EnumDescriptor() ([]byte, []int) {
 	return file_old_faithful_proto_rawDescGZIP(), []int{0}
 }
 
-type StreamBlocksErrorCode int32
-
-const (
-	StreamBlocksErrorCode_STREAM_BLOCKS_INTERNAL           StreamBlocksErrorCode = 0
-	StreamBlocksErrorCode_STREAM_BLOCKS_INVALID_SLOT_RANGE StreamBlocksErrorCode = 1
-	StreamBlocksErrorCode_STREAM_BLOCKS_SLOT_NOT_FOUND     StreamBlocksErrorCode = 2
-)
-
-// Enum value maps for StreamBlocksErrorCode.
-var (
-	StreamBlocksErrorCode_name = map[int32]string{
-		0: "STREAM_BLOCKS_INTERNAL",
-		1: "STREAM_BLOCKS_INVALID_SLOT_RANGE",
-		2: "STREAM_BLOCKS_SLOT_NOT_FOUND",
-	}
-	StreamBlocksErrorCode_value = map[string]int32{
-		"STREAM_BLOCKS_INTERNAL":           0,
-		"STREAM_BLOCKS_INVALID_SLOT_RANGE": 1,
-		"STREAM_BLOCKS_SLOT_NOT_FOUND":     2,
-	}
-)
-
-func (x StreamBlocksErrorCode) Enum() *StreamBlocksErrorCode {
-	p := new(StreamBlocksErrorCode)
-	*p = x
-	return p
-}
-
-func (x StreamBlocksErrorCode) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (StreamBlocksErrorCode) Descriptor() protoreflect.EnumDescriptor {
-	return file_old_faithful_proto_enumTypes[1].Descriptor()
-}
-
-func (StreamBlocksErrorCode) Type() protoreflect.EnumType {
-	return &file_old_faithful_proto_enumTypes[1]
-}
-
-func (x StreamBlocksErrorCode) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use StreamBlocksErrorCode.Descriptor instead.
-func (StreamBlocksErrorCode) EnumDescriptor() ([]byte, []int) {
-	return file_old_faithful_proto_rawDescGZIP(), []int{1}
-}
-
 type VersionRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1018,138 +969,6 @@ func (x *StreamBlocksFilter) GetAccountInclude() []string {
 	return nil
 }
 
-type StreamBlocksResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to Response:
-	//
-	//	*StreamBlocksResponse_Error
-	//	*StreamBlocksResponse_Block
-	Response isStreamBlocksResponse_Response `protobuf_oneof:"response"`
-}
-
-func (x *StreamBlocksResponse) Reset() {
-	*x = StreamBlocksResponse{}
-	mi := &file_old_faithful_proto_msgTypes[14]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *StreamBlocksResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*StreamBlocksResponse) ProtoMessage() {}
-
-func (x *StreamBlocksResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_old_faithful_proto_msgTypes[14]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use StreamBlocksResponse.ProtoReflect.Descriptor instead.
-func (*StreamBlocksResponse) Descriptor() ([]byte, []int) {
-	return file_old_faithful_proto_rawDescGZIP(), []int{14}
-}
-
-func (m *StreamBlocksResponse) GetResponse() isStreamBlocksResponse_Response {
-	if m != nil {
-		return m.Response
-	}
-	return nil
-}
-
-func (x *StreamBlocksResponse) GetError() *StreamBlocksError {
-	if x, ok := x.GetResponse().(*StreamBlocksResponse_Error); ok {
-		return x.Error
-	}
-	return nil
-}
-
-func (x *StreamBlocksResponse) GetBlock() *BlockResponse {
-	if x, ok := x.GetResponse().(*StreamBlocksResponse_Block); ok {
-		return x.Block
-	}
-	return nil
-}
-
-type isStreamBlocksResponse_Response interface {
-	isStreamBlocksResponse_Response()
-}
-
-type StreamBlocksResponse_Error struct {
-	Error *StreamBlocksError `protobuf:"bytes,1,opt,name=error,proto3,oneof"`
-}
-
-type StreamBlocksResponse_Block struct {
-	Block *BlockResponse `protobuf:"bytes,2,opt,name=block,proto3,oneof"`
-}
-
-func (*StreamBlocksResponse_Error) isStreamBlocksResponse_Response() {}
-
-func (*StreamBlocksResponse_Block) isStreamBlocksResponse_Response() {}
-
-type StreamBlocksError struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Code    StreamBlocksErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=OldFaithful.StreamBlocksErrorCode" json:"code,omitempty"`
-	Message string                `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
-}
-
-func (x *StreamBlocksError) Reset() {
-	*x = StreamBlocksError{}
-	mi := &file_old_faithful_proto_msgTypes[15]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *StreamBlocksError) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*StreamBlocksError) ProtoMessage() {}
-
-func (x *StreamBlocksError) ProtoReflect() protoreflect.Message {
-	mi := &file_old_faithful_proto_msgTypes[15]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use StreamBlocksError.ProtoReflect.Descriptor instead.
-func (*StreamBlocksError) Descriptor() ([]byte, []int) {
-	return file_old_faithful_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *StreamBlocksError) GetCode() StreamBlocksErrorCode {
-	if x != nil {
-		return x.Code
-	}
-	return StreamBlocksErrorCode_STREAM_BLOCKS_INTERNAL
-}
-
-func (x *StreamBlocksError) GetMessage() string {
-	if x != nil {
-		return x.Message
-	}
-	return ""
-}
-
 var File_old_faithful_proto protoreflect.FileDescriptor
 
 var file_old_faithful_proto_rawDesc = []byte{
@@ -1270,69 +1089,45 @@ var file_old_faithful_proto_rawDesc = []byte{
 	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x46, 0x69, 0x6c, 0x74,
 	0x65, 0x72, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x6e,
 	0x63, 0x6c, 0x75, 0x64, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x63, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x22, 0x8e, 0x01, 0x0a, 0x14,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75,
-	0x6c, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x45, 0x72,
-	0x72, 0x6f, 0x72, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x32, 0x0a, 0x05,
-	0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x4f, 0x6c,
-	0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
-	0x42, 0x0a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x65, 0x0a, 0x11,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x45, 0x72, 0x72, 0x6f,
-	0x72, 0x12, 0x36, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x22, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x53, 0x74,
-	0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43,
-	0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x2a, 0x33, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x49,
-	0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54,
-	0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x2a, 0x7b, 0x0a, 0x15, 0x53, 0x74, 0x72, 0x65,
-	0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64,
-	0x65, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x5f, 0x42, 0x4c, 0x4f, 0x43,
-	0x4b, 0x53, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x10, 0x00, 0x12, 0x24, 0x0a,
-	0x20, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x5f, 0x42, 0x4c, 0x4f, 0x43, 0x4b, 0x53, 0x5f, 0x49,
-	0x4e, 0x56, 0x41, 0x4c, 0x49, 0x44, 0x5f, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x52, 0x41, 0x4e, 0x47,
-	0x45, 0x10, 0x01, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x5f, 0x42, 0x4c,
-	0x4f, 0x43, 0x4b, 0x53, 0x5f, 0x53, 0x4c, 0x4f, 0x54, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x4f,
-	0x55, 0x4e, 0x44, 0x10, 0x02, 0x32, 0xd2, 0x03, 0x0a, 0x0b, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69,
-	0x74, 0x68, 0x66, 0x75, 0x6c, 0x12, 0x47, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75,
-	0x6c, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1c, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x56,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41,
-	0x0a, 0x08, 0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x19, 0x2e, 0x4f, 0x6c, 0x64,
-	0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68,
-	0x66, 0x75, 0x6c, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x4d, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d,
-	0x65, 0x12, 0x1d, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e,
-	0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x1e, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x42,
-	0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x53, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x1f, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c,
-	0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75,
-	0x6c, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3c, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12, 0x17, 0x2e, 0x4f,
-	0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68,
-	0x66, 0x75, 0x6c, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28,
-	0x01, 0x30, 0x01, 0x12, 0x55, 0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f,
-	0x63, 0x6b, 0x73, 0x12, 0x20, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75,
-	0x6c, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68,
-	0x66, 0x75, 0x6c, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x42, 0x4e, 0x5a, 0x4c, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x70, 0x63, 0x70, 0x6f, 0x6f, 0x6c,
-	0x2f, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x2d, 0x66, 0x61, 0x69,
-	0x74, 0x68, 0x66, 0x75, 0x6c, 0x2f, 0x6f, 0x6c, 0x64, 0x2d, 0x66, 0x61, 0x69, 0x74, 0x68, 0x66,
-	0x75, 0x6c, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x6f, 0x6c, 0x64, 0x5f, 0x66, 0x61, 0x69,
-	0x74, 0x68, 0x66, 0x75, 0x6c, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x6f, 0x75, 0x6e, 0x74, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x2a, 0x33, 0x0a, 0x14, 0x47,
+	0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43,
+	0x6f, 0x64, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x10,
+	0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x54, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01,
+	0x32, 0xcb, 0x03, 0x0a, 0x0b, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c,
+	0x12, 0x47, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1b,
+	0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x56, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x4f, 0x6c,
+	0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x08, 0x47, 0x65, 0x74,
+	0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x19, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68,
+	0x66, 0x75, 0x6c, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1a, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x42,
+	0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4d, 0x0a, 0x0c,
+	0x47, 0x65, 0x74, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1d, 0x2e, 0x4f,
+	0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+	0x54, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x4f, 0x6c,
+	0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x54,
+	0x69, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x47,
+	0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x2e,
+	0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20,
+	0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x54, 0x72, 0x61,
+	0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x12, 0x3c, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12, 0x17, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69,
+	0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x18, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x47,
+	0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x12, 0x4e,
+	0x0a, 0x0c, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x20,
+	0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1a, 0x2e, 0x4f, 0x6c, 0x64, 0x46, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2e, 0x42,
+	0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x30, 0x01, 0x42, 0x4e,
+	0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x70, 0x63,
+	0x70, 0x6f, 0x6f, 0x6c, 0x2f, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x74, 0x6f, 0x6e, 0x65,
+	0x2d, 0x66, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2f, 0x6f, 0x6c, 0x64, 0x2d, 0x66, 0x61,
+	0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x6f, 0x6c, 0x64,
+	0x5f, 0x66, 0x61, 0x69, 0x74, 0x68, 0x66, 0x75, 0x6c, 0x5f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1347,62 +1142,56 @@ func file_old_faithful_proto_rawDescGZIP() []byte {
 	return file_old_faithful_proto_rawDescData
 }
 
-var file_old_faithful_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_old_faithful_proto_msgTypes = make([]protoimpl.MessageInfo, 16)
+var file_old_faithful_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_old_faithful_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
 var file_old_faithful_proto_goTypes = []any{
-	(GetResponseErrorCode)(0),    // 0: OldFaithful.GetResponseErrorCode
-	(StreamBlocksErrorCode)(0),   // 1: OldFaithful.StreamBlocksErrorCode
-	(*VersionRequest)(nil),       // 2: OldFaithful.VersionRequest
-	(*VersionResponse)(nil),      // 3: OldFaithful.VersionResponse
-	(*BlockRequest)(nil),         // 4: OldFaithful.BlockRequest
-	(*BlockResponse)(nil),        // 5: OldFaithful.BlockResponse
-	(*BlockTimeRequest)(nil),     // 6: OldFaithful.BlockTimeRequest
-	(*BlockTimeResponse)(nil),    // 7: OldFaithful.BlockTimeResponse
-	(*TransactionRequest)(nil),   // 8: OldFaithful.TransactionRequest
-	(*TransactionResponse)(nil),  // 9: OldFaithful.TransactionResponse
-	(*Transaction)(nil),          // 10: OldFaithful.Transaction
-	(*GetRequest)(nil),           // 11: OldFaithful.GetRequest
-	(*GetResponse)(nil),          // 12: OldFaithful.GetResponse
-	(*GetResponseError)(nil),     // 13: OldFaithful.GetResponseError
-	(*StreamBlocksRequest)(nil),  // 14: OldFaithful.StreamBlocksRequest
-	(*StreamBlocksFilter)(nil),   // 15: OldFaithful.StreamBlocksFilter
-	(*StreamBlocksResponse)(nil), // 16: OldFaithful.StreamBlocksResponse
-	(*StreamBlocksError)(nil),    // 17: OldFaithful.StreamBlocksError
+	(GetResponseErrorCode)(0),   // 0: OldFaithful.GetResponseErrorCode
+	(*VersionRequest)(nil),      // 1: OldFaithful.VersionRequest
+	(*VersionResponse)(nil),     // 2: OldFaithful.VersionResponse
+	(*BlockRequest)(nil),        // 3: OldFaithful.BlockRequest
+	(*BlockResponse)(nil),       // 4: OldFaithful.BlockResponse
+	(*BlockTimeRequest)(nil),    // 5: OldFaithful.BlockTimeRequest
+	(*BlockTimeResponse)(nil),   // 6: OldFaithful.BlockTimeResponse
+	(*TransactionRequest)(nil),  // 7: OldFaithful.TransactionRequest
+	(*TransactionResponse)(nil), // 8: OldFaithful.TransactionResponse
+	(*Transaction)(nil),         // 9: OldFaithful.Transaction
+	(*GetRequest)(nil),          // 10: OldFaithful.GetRequest
+	(*GetResponse)(nil),         // 11: OldFaithful.GetResponse
+	(*GetResponseError)(nil),    // 12: OldFaithful.GetResponseError
+	(*StreamBlocksRequest)(nil), // 13: OldFaithful.StreamBlocksRequest
+	(*StreamBlocksFilter)(nil),  // 14: OldFaithful.StreamBlocksFilter
 }
 var file_old_faithful_proto_depIdxs = []int32{
-	10, // 0: OldFaithful.BlockResponse.transactions:type_name -> OldFaithful.Transaction
-	10, // 1: OldFaithful.TransactionResponse.transaction:type_name -> OldFaithful.Transaction
-	2,  // 2: OldFaithful.GetRequest.version:type_name -> OldFaithful.VersionRequest
-	6,  // 3: OldFaithful.GetRequest.block_time:type_name -> OldFaithful.BlockTimeRequest
-	4,  // 4: OldFaithful.GetRequest.block:type_name -> OldFaithful.BlockRequest
-	8,  // 5: OldFaithful.GetRequest.transaction:type_name -> OldFaithful.TransactionRequest
-	13, // 6: OldFaithful.GetResponse.error:type_name -> OldFaithful.GetResponseError
-	3,  // 7: OldFaithful.GetResponse.version:type_name -> OldFaithful.VersionResponse
-	7,  // 8: OldFaithful.GetResponse.block_time:type_name -> OldFaithful.BlockTimeResponse
-	5,  // 9: OldFaithful.GetResponse.block:type_name -> OldFaithful.BlockResponse
-	9,  // 10: OldFaithful.GetResponse.transaction:type_name -> OldFaithful.TransactionResponse
+	9,  // 0: OldFaithful.BlockResponse.transactions:type_name -> OldFaithful.Transaction
+	9,  // 1: OldFaithful.TransactionResponse.transaction:type_name -> OldFaithful.Transaction
+	1,  // 2: OldFaithful.GetRequest.version:type_name -> OldFaithful.VersionRequest
+	5,  // 3: OldFaithful.GetRequest.block_time:type_name -> OldFaithful.BlockTimeRequest
+	3,  // 4: OldFaithful.GetRequest.block:type_name -> OldFaithful.BlockRequest
+	7,  // 5: OldFaithful.GetRequest.transaction:type_name -> OldFaithful.TransactionRequest
+	12, // 6: OldFaithful.GetResponse.error:type_name -> OldFaithful.GetResponseError
+	2,  // 7: OldFaithful.GetResponse.version:type_name -> OldFaithful.VersionResponse
+	6,  // 8: OldFaithful.GetResponse.block_time:type_name -> OldFaithful.BlockTimeResponse
+	4,  // 9: OldFaithful.GetResponse.block:type_name -> OldFaithful.BlockResponse
+	8,  // 10: OldFaithful.GetResponse.transaction:type_name -> OldFaithful.TransactionResponse
 	0,  // 11: OldFaithful.GetResponseError.code:type_name -> OldFaithful.GetResponseErrorCode
-	15, // 12: OldFaithful.StreamBlocksRequest.filter:type_name -> OldFaithful.StreamBlocksFilter
-	17, // 13: OldFaithful.StreamBlocksResponse.error:type_name -> OldFaithful.StreamBlocksError
-	5,  // 14: OldFaithful.StreamBlocksResponse.block:type_name -> OldFaithful.BlockResponse
-	1,  // 15: OldFaithful.StreamBlocksError.code:type_name -> OldFaithful.StreamBlocksErrorCode
-	2,  // 16: OldFaithful.OldFaithful.GetVersion:input_type -> OldFaithful.VersionRequest
-	4,  // 17: OldFaithful.OldFaithful.GetBlock:input_type -> OldFaithful.BlockRequest
-	6,  // 18: OldFaithful.OldFaithful.GetBlockTime:input_type -> OldFaithful.BlockTimeRequest
-	8,  // 19: OldFaithful.OldFaithful.GetTransaction:input_type -> OldFaithful.TransactionRequest
-	11, // 20: OldFaithful.OldFaithful.Get:input_type -> OldFaithful.GetRequest
-	14, // 21: OldFaithful.OldFaithful.StreamBlocks:input_type -> OldFaithful.StreamBlocksRequest
-	3,  // 22: OldFaithful.OldFaithful.GetVersion:output_type -> OldFaithful.VersionResponse
-	5,  // 23: OldFaithful.OldFaithful.GetBlock:output_type -> OldFaithful.BlockResponse
-	7,  // 24: OldFaithful.OldFaithful.GetBlockTime:output_type -> OldFaithful.BlockTimeResponse
-	9,  // 25: OldFaithful.OldFaithful.GetTransaction:output_type -> OldFaithful.TransactionResponse
-	12, // 26: OldFaithful.OldFaithful.Get:output_type -> OldFaithful.GetResponse
-	16, // 27: OldFaithful.OldFaithful.StreamBlocks:output_type -> OldFaithful.StreamBlocksResponse
-	22, // [22:28] is the sub-list for method output_type
-	16, // [16:22] is the sub-list for method input_type
-	16, // [16:16] is the sub-list for extension type_name
-	16, // [16:16] is the sub-list for extension extendee
-	0,  // [0:16] is the sub-list for field type_name
+	14, // 12: OldFaithful.StreamBlocksRequest.filter:type_name -> OldFaithful.StreamBlocksFilter
+	1,  // 13: OldFaithful.OldFaithful.GetVersion:input_type -> OldFaithful.VersionRequest
+	3,  // 14: OldFaithful.OldFaithful.GetBlock:input_type -> OldFaithful.BlockRequest
+	5,  // 15: OldFaithful.OldFaithful.GetBlockTime:input_type -> OldFaithful.BlockTimeRequest
+	7,  // 16: OldFaithful.OldFaithful.GetTransaction:input_type -> OldFaithful.TransactionRequest
+	10, // 17: OldFaithful.OldFaithful.Get:input_type -> OldFaithful.GetRequest
+	13, // 18: OldFaithful.OldFaithful.StreamBlocks:input_type -> OldFaithful.StreamBlocksRequest
+	2,  // 19: OldFaithful.OldFaithful.GetVersion:output_type -> OldFaithful.VersionResponse
+	4,  // 20: OldFaithful.OldFaithful.GetBlock:output_type -> OldFaithful.BlockResponse
+	6,  // 21: OldFaithful.OldFaithful.GetBlockTime:output_type -> OldFaithful.BlockTimeResponse
+	8,  // 22: OldFaithful.OldFaithful.GetTransaction:output_type -> OldFaithful.TransactionResponse
+	11, // 23: OldFaithful.OldFaithful.Get:output_type -> OldFaithful.GetResponse
+	4,  // 24: OldFaithful.OldFaithful.StreamBlocks:output_type -> OldFaithful.BlockResponse
+	19, // [19:25] is the sub-list for method output_type
+	13, // [13:19] is the sub-list for method input_type
+	13, // [13:13] is the sub-list for extension type_name
+	13, // [13:13] is the sub-list for extension extendee
+	0,  // [0:13] is the sub-list for field type_name
 }
 
 func init() { file_old_faithful_proto_init() }
@@ -1427,17 +1216,13 @@ func file_old_faithful_proto_init() {
 		(*GetResponse_Transaction)(nil),
 	}
 	file_old_faithful_proto_msgTypes[12].OneofWrappers = []any{}
-	file_old_faithful_proto_msgTypes[14].OneofWrappers = []any{
-		(*StreamBlocksResponse_Error)(nil),
-		(*StreamBlocksResponse_Block)(nil),
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_old_faithful_proto_rawDesc,
-			NumEnums:      2,
-			NumMessages:   16,
+			NumEnums:      1,
+			NumMessages:   14,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/old-faithful-proto/old-faithful-grpc/old-faithful_grpc.pb.go b/old-faithful-proto/old-faithful-grpc/old-faithful_grpc.pb.go
index 7ad3b42b..309884be 100644
--- a/old-faithful-proto/old-faithful-grpc/old-faithful_grpc.pb.go
+++ b/old-faithful-proto/old-faithful-grpc/old-faithful_grpc.pb.go
@@ -36,7 +36,7 @@ type OldFaithfulClient interface {
 	GetBlockTime(ctx context.Context, in *BlockTimeRequest, opts ...grpc.CallOption) (*BlockTimeResponse, error)
 	GetTransaction(ctx context.Context, in *TransactionRequest, opts ...grpc.CallOption) (*TransactionResponse, error)
 	Get(ctx context.Context, opts ...grpc.CallOption) (grpc.BidiStreamingClient[GetRequest, GetResponse], error)
-	StreamBlocks(ctx context.Context, in *StreamBlocksRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[StreamBlocksResponse], error)
+	StreamBlocks(ctx context.Context, in *StreamBlocksRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[BlockResponse], error)
 }
 
 type oldFaithfulClient struct {
@@ -100,13 +100,13 @@ func (c *oldFaithfulClient) Get(ctx context.Context, opts ...grpc.CallOption) (g
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
 type OldFaithful_GetClient = grpc.BidiStreamingClient[GetRequest, GetResponse]
 
-func (c *oldFaithfulClient) StreamBlocks(ctx context.Context, in *StreamBlocksRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[StreamBlocksResponse], error) {
+func (c *oldFaithfulClient) StreamBlocks(ctx context.Context, in *StreamBlocksRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[BlockResponse], error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	stream, err := c.cc.NewStream(ctx, &OldFaithful_ServiceDesc.Streams[1], OldFaithful_StreamBlocks_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
-	x := &grpc.GenericClientStream[StreamBlocksRequest, StreamBlocksResponse]{ClientStream: stream}
+	x := &grpc.GenericClientStream[StreamBlocksRequest, BlockResponse]{ClientStream: stream}
 	if err := x.ClientStream.SendMsg(in); err != nil {
 		return nil, err
 	}
@@ -117,7 +117,7 @@ func (c *oldFaithfulClient) StreamBlocks(ctx context.Context, in *StreamBlocksRe
 }
 
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type OldFaithful_StreamBlocksClient = grpc.ServerStreamingClient[StreamBlocksResponse]
+type OldFaithful_StreamBlocksClient = grpc.ServerStreamingClient[BlockResponse]
 
 // OldFaithfulServer is the server API for OldFaithful service.
 // All implementations must embed UnimplementedOldFaithfulServer
@@ -128,7 +128,7 @@ type OldFaithfulServer interface {
 	GetBlockTime(context.Context, *BlockTimeRequest) (*BlockTimeResponse, error)
 	GetTransaction(context.Context, *TransactionRequest) (*TransactionResponse, error)
 	Get(grpc.BidiStreamingServer[GetRequest, GetResponse]) error
-	StreamBlocks(*StreamBlocksRequest, grpc.ServerStreamingServer[StreamBlocksResponse]) error
+	StreamBlocks(*StreamBlocksRequest, grpc.ServerStreamingServer[BlockResponse]) error
 	mustEmbedUnimplementedOldFaithfulServer()
 }
 
@@ -154,7 +154,7 @@ func (UnimplementedOldFaithfulServer) GetTransaction(context.Context, *Transacti
 func (UnimplementedOldFaithfulServer) Get(grpc.BidiStreamingServer[GetRequest, GetResponse]) error {
 	return status.Errorf(codes.Unimplemented, "method Get not implemented")
 }
-func (UnimplementedOldFaithfulServer) StreamBlocks(*StreamBlocksRequest, grpc.ServerStreamingServer[StreamBlocksResponse]) error {
+func (UnimplementedOldFaithfulServer) StreamBlocks(*StreamBlocksRequest, grpc.ServerStreamingServer[BlockResponse]) error {
 	return status.Errorf(codes.Unimplemented, "method StreamBlocks not implemented")
 }
 func (UnimplementedOldFaithfulServer) mustEmbedUnimplementedOldFaithfulServer() {}
@@ -262,11 +262,11 @@ func _OldFaithful_StreamBlocks_Handler(srv interface{}, stream grpc.ServerStream
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
-	return srv.(OldFaithfulServer).StreamBlocks(m, &grpc.GenericServerStream[StreamBlocksRequest, StreamBlocksResponse]{ServerStream: stream})
+	return srv.(OldFaithfulServer).StreamBlocks(m, &grpc.GenericServerStream[StreamBlocksRequest, BlockResponse]{ServerStream: stream})
 }
 
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type OldFaithful_StreamBlocksServer = grpc.ServerStreamingServer[StreamBlocksResponse]
+type OldFaithful_StreamBlocksServer = grpc.ServerStreamingServer[BlockResponse]
 
 // OldFaithful_ServiceDesc is the grpc.ServiceDesc for OldFaithful service.
 // It's only intended for direct use with grpc.RegisterService,