diff --git a/da/grpc/grpc.go b/da/grpc/grpc.go index 334f070c13b..81c01179c51 100644 --- a/da/grpc/grpc.go +++ b/da/grpc/grpc.go @@ -85,14 +85,14 @@ func (d *DataAvailabilityLayerClient) SubmitBlock(block *types.Block) da.ResultS BaseResult: da.BaseResult{ Code: da.StatusCode(resp.Result.Code), Message: resp.Result.Message, - DAHeight: resp.Result.DataLayerHeight, + DAHeight: resp.Result.DAHeight, }, } } // CheckBlockAvailability proxies CheckBlockAvailability request to gRPC server. -func (d *DataAvailabilityLayerClient) CheckBlockAvailability(dataLayerHeight uint64) da.ResultCheckBlock { - resp, err := d.client.CheckBlockAvailability(context.TODO(), &dalc.CheckBlockAvailabilityRequest{DataLayerHeight: dataLayerHeight}) +func (d *DataAvailabilityLayerClient) CheckBlockAvailability(daHeight uint64) da.ResultCheckBlock { + resp, err := d.client.CheckBlockAvailability(context.TODO(), &dalc.CheckBlockAvailabilityRequest{DAHeight: daHeight}) if err != nil { return da.ResultCheckBlock{BaseResult: da.BaseResult{Code: da.StatusError, Message: err.Error()}} } @@ -103,8 +103,8 @@ func (d *DataAvailabilityLayerClient) CheckBlockAvailability(dataLayerHeight uin } // RetrieveBlocks proxies RetrieveBlocks request to gRPC server. -func (d *DataAvailabilityLayerClient) RetrieveBlocks(dataLayerHeight uint64) da.ResultRetrieveBlocks { - resp, err := d.client.RetrieveBlocks(context.TODO(), &dalc.RetrieveBlocksRequest{DataLayerHeight: dataLayerHeight}) +func (d *DataAvailabilityLayerClient) RetrieveBlocks(daHeight uint64) da.ResultRetrieveBlocks { + resp, err := d.client.RetrieveBlocks(context.TODO(), &dalc.RetrieveBlocksRequest{DAHeight: daHeight}) if err != nil { return da.ResultRetrieveBlocks{BaseResult: da.BaseResult{Code: da.StatusError, Message: err.Error()}} } @@ -122,7 +122,7 @@ func (d *DataAvailabilityLayerClient) RetrieveBlocks(dataLayerHeight uint64) da. BaseResult: da.BaseResult{ Code: da.StatusCode(resp.Result.Code), Message: resp.Result.Message, - DAHeight: dataLayerHeight, + DAHeight: daHeight, }, Blocks: blocks, } diff --git a/da/grpc/mockserv/mockserv.go b/da/grpc/mockserv/mockserv.go index 54ab3de8596..a9b70f69457 100644 --- a/da/grpc/mockserv/mockserv.go +++ b/da/grpc/mockserv/mockserv.go @@ -48,15 +48,15 @@ func (m *mockImpl) SubmitBlock(_ context.Context, request *dalc.SubmitBlockReque resp := m.mock.SubmitBlock(&b) return &dalc.SubmitBlockResponse{ Result: &dalc.DAResponse{ - Code: dalc.StatusCode(resp.Code), - Message: resp.Message, - DataLayerHeight: resp.DAHeight, + Code: dalc.StatusCode(resp.Code), + Message: resp.Message, + DAHeight: resp.DAHeight, }, }, nil } func (m *mockImpl) CheckBlockAvailability(_ context.Context, request *dalc.CheckBlockAvailabilityRequest) (*dalc.CheckBlockAvailabilityResponse, error) { - resp := m.mock.CheckBlockAvailability(request.DataLayerHeight) + resp := m.mock.CheckBlockAvailability(request.DAHeight) return &dalc.CheckBlockAvailabilityResponse{ Result: &dalc.DAResponse{ Code: dalc.StatusCode(resp.Code), @@ -67,7 +67,7 @@ func (m *mockImpl) CheckBlockAvailability(_ context.Context, request *dalc.Check } func (m *mockImpl) RetrieveBlocks(context context.Context, request *dalc.RetrieveBlocksRequest) (*dalc.RetrieveBlocksResponse, error) { - resp := m.mock.RetrieveBlocks(request.DataLayerHeight) + resp := m.mock.RetrieveBlocks(request.DAHeight) blocks := make([]*optimint.Block, len(resp.Blocks)) for i := range resp.Blocks { blocks[i] = resp.Blocks[i].ToProto() diff --git a/da/mock/mock.go b/da/mock/mock.go index 9e618504628..22140a79511 100644 --- a/da/mock/mock.go +++ b/da/mock/mock.go @@ -97,18 +97,18 @@ func (m *DataAvailabilityLayerClient) SubmitBlock(block *types.Block) da.ResultS } // CheckBlockAvailability queries DA layer to check data availability of block corresponding to given header. -func (m *DataAvailabilityLayerClient) CheckBlockAvailability(dataLayerHeight uint64) da.ResultCheckBlock { - blocksRes := m.RetrieveBlocks(dataLayerHeight) +func (m *DataAvailabilityLayerClient) CheckBlockAvailability(daHeight uint64) da.ResultCheckBlock { + blocksRes := m.RetrieveBlocks(daHeight) return da.ResultCheckBlock{BaseResult: da.BaseResult{Code: blocksRes.Code}, DataAvailable: len(blocksRes.Blocks) > 0} } // RetrieveBlocks returns block at given height from data availability layer. -func (m *DataAvailabilityLayerClient) RetrieveBlocks(dataLayerHeight uint64) da.ResultRetrieveBlocks { - if dataLayerHeight >= atomic.LoadUint64(&m.daHeight) { +func (m *DataAvailabilityLayerClient) RetrieveBlocks(daHeight uint64) da.ResultRetrieveBlocks { + if daHeight >= atomic.LoadUint64(&m.daHeight) { return da.ResultRetrieveBlocks{BaseResult: da.BaseResult{Code: da.StatusError, Message: "block not found"}} } - iter := m.dalcKV.PrefixIterator(getPrefix(dataLayerHeight)) + iter := m.dalcKV.PrefixIterator(getPrefix(daHeight)) defer iter.Discard() var blocks []*types.Block diff --git a/proto/dalc/dalc.proto b/proto/dalc/dalc.proto index cbe3f6e89fb..2c0bdb32247 100644 --- a/proto/dalc/dalc.proto +++ b/proto/dalc/dalc.proto @@ -3,6 +3,7 @@ package dalc; option go_package = "github.com/celestiaorg/optimint/types/pb/dalc"; import "optimint/optimint.proto"; +import "gogoproto/gogo.proto"; enum StatusCode { STATUS_CODE_UNSPECIFIED = 0; @@ -14,7 +15,7 @@ enum StatusCode { message DAResponse { StatusCode code = 1; string message = 2; - uint64 data_layer_height = 3; + uint64 da_height = 3 [(gogoproto.customname) = "DAHeight"]; } message SubmitBlockRequest { @@ -26,7 +27,7 @@ message SubmitBlockResponse { } message CheckBlockAvailabilityRequest { - uint64 data_layer_height = 1; + uint64 da_height = 1 [(gogoproto.customname) = "DAHeight"]; } message CheckBlockAvailabilityResponse { @@ -35,7 +36,7 @@ message CheckBlockAvailabilityResponse { } message RetrieveBlocksRequest { - uint64 data_layer_height = 1; + uint64 da_height = 1 [(gogoproto.customname) = "DAHeight"]; } message RetrieveBlocksResponse { diff --git a/types/pb/dalc/dalc.pb.go b/types/pb/dalc/dalc.pb.go index c89e04c32fa..d5a57ad598f 100644 --- a/types/pb/dalc/dalc.pb.go +++ b/types/pb/dalc/dalc.pb.go @@ -7,6 +7,7 @@ import ( context "context" fmt "fmt" optimint "github.com/celestiaorg/optimint/types/pb/optimint" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -59,9 +60,9 @@ func (StatusCode) EnumDescriptor() ([]byte, []int) { } type DAResponse struct { - Code StatusCode `protobuf:"varint,1,opt,name=code,proto3,enum=dalc.StatusCode" json:"code,omitempty"` - Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` - DataLayerHeight uint64 `protobuf:"varint,3,opt,name=data_layer_height,json=dataLayerHeight,proto3" json:"data_layer_height,omitempty"` + Code StatusCode `protobuf:"varint,1,opt,name=code,proto3,enum=dalc.StatusCode" json:"code,omitempty"` + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + DAHeight uint64 `protobuf:"varint,3,opt,name=da_height,json=daHeight,proto3" json:"da_height,omitempty"` } func (m *DAResponse) Reset() { *m = DAResponse{} } @@ -111,9 +112,9 @@ func (m *DAResponse) GetMessage() string { return "" } -func (m *DAResponse) GetDataLayerHeight() uint64 { +func (m *DAResponse) GetDAHeight() uint64 { if m != nil { - return m.DataLayerHeight + return m.DAHeight } return 0 } @@ -207,7 +208,7 @@ func (m *SubmitBlockResponse) GetResult() *DAResponse { } type CheckBlockAvailabilityRequest struct { - DataLayerHeight uint64 `protobuf:"varint,1,opt,name=data_layer_height,json=dataLayerHeight,proto3" json:"data_layer_height,omitempty"` + DAHeight uint64 `protobuf:"varint,1,opt,name=da_height,json=daHeight,proto3" json:"da_height,omitempty"` } func (m *CheckBlockAvailabilityRequest) Reset() { *m = CheckBlockAvailabilityRequest{} } @@ -243,9 +244,9 @@ func (m *CheckBlockAvailabilityRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CheckBlockAvailabilityRequest proto.InternalMessageInfo -func (m *CheckBlockAvailabilityRequest) GetDataLayerHeight() uint64 { +func (m *CheckBlockAvailabilityRequest) GetDAHeight() uint64 { if m != nil { - return m.DataLayerHeight + return m.DAHeight } return 0 } @@ -303,7 +304,7 @@ func (m *CheckBlockAvailabilityResponse) GetDataAvailable() bool { } type RetrieveBlocksRequest struct { - DataLayerHeight uint64 `protobuf:"varint,1,opt,name=data_layer_height,json=dataLayerHeight,proto3" json:"data_layer_height,omitempty"` + DAHeight uint64 `protobuf:"varint,1,opt,name=da_height,json=daHeight,proto3" json:"da_height,omitempty"` } func (m *RetrieveBlocksRequest) Reset() { *m = RetrieveBlocksRequest{} } @@ -339,9 +340,9 @@ func (m *RetrieveBlocksRequest) XXX_DiscardUnknown() { var xxx_messageInfo_RetrieveBlocksRequest proto.InternalMessageInfo -func (m *RetrieveBlocksRequest) GetDataLayerHeight() uint64 { +func (m *RetrieveBlocksRequest) GetDAHeight() uint64 { if m != nil { - return m.DataLayerHeight + return m.DAHeight } return 0 } @@ -412,40 +413,41 @@ func init() { func init() { proto.RegisterFile("dalc/dalc.proto", fileDescriptor_45d7d8eda2693dc1) } var fileDescriptor_45d7d8eda2693dc1 = []byte{ - // 527 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x6e, 0xda, 0x4c, - 0x10, 0xc7, 0x31, 0xf0, 0xf1, 0xb5, 0x83, 0x0a, 0x64, 0xa3, 0x04, 0x97, 0xb4, 0x16, 0x72, 0x13, - 0x15, 0x45, 0x2a, 0x48, 0xf4, 0xd8, 0x43, 0x45, 0x8c, 0xdb, 0xa2, 0x26, 0xa5, 0x5a, 0xc3, 0xa5, - 0x17, 0x64, 0x9b, 0x11, 0xac, 0x30, 0x31, 0xf1, 0x2e, 0xa8, 0x3c, 0x42, 0x6f, 0x7d, 0xac, 0x1e, - 0x73, 0xec, 0xb1, 0x82, 0x17, 0xa9, 0xbc, 0x36, 0x84, 0xa4, 0x6e, 0xa4, 0xf4, 0x62, 0xed, 0xce, - 0x6f, 0x67, 0xe6, 0x3f, 0x9e, 0xd1, 0x40, 0x71, 0x68, 0x7b, 0x6e, 0x23, 0xfc, 0xd4, 0x67, 0x81, - 0x2f, 0x7c, 0x92, 0x0d, 0xcf, 0x95, 0xb2, 0x3f, 0x13, 0x6c, 0xca, 0x2e, 0x45, 0x63, 0x73, 0x88, - 0xb0, 0xfe, 0x15, 0xa0, 0xdd, 0xa2, 0xc8, 0x67, 0xfe, 0x25, 0x47, 0x72, 0x0c, 0x59, 0xd7, 0x1f, - 0xa2, 0xaa, 0x54, 0x95, 0x5a, 0xa1, 0x59, 0xaa, 0xcb, 0x38, 0x96, 0xb0, 0xc5, 0x9c, 0x1b, 0xfe, - 0x10, 0xa9, 0xa4, 0x44, 0x85, 0xff, 0xa7, 0xc8, 0xb9, 0x3d, 0x42, 0x35, 0x5d, 0x55, 0x6a, 0x8f, - 0xe9, 0xe6, 0x4a, 0x4e, 0x61, 0x6f, 0x68, 0x0b, 0x7b, 0xe0, 0xd9, 0x4b, 0x0c, 0x06, 0x63, 0x64, - 0xa3, 0xb1, 0x50, 0x33, 0x55, 0xa5, 0x96, 0xa5, 0xc5, 0x10, 0x9c, 0x87, 0xf6, 0x0f, 0xd2, 0xac, - 0xbf, 0x01, 0x62, 0xcd, 0x9d, 0x29, 0x13, 0x67, 0x9e, 0xef, 0x4e, 0x28, 0x5e, 0xcd, 0x91, 0x0b, - 0x72, 0x02, 0xff, 0x39, 0xe1, 0x5d, 0x4a, 0xc8, 0x37, 0x8b, 0xf5, 0xad, 0xde, 0xe8, 0x59, 0x44, - 0xf5, 0xb7, 0xb0, 0x7f, 0xcb, 0x39, 0xd6, 0x5f, 0x83, 0x5c, 0x80, 0x7c, 0xee, 0x89, 0xd8, 0x3d, - 0xae, 0xe0, 0xa6, 0x42, 0x1a, 0x73, 0xfd, 0x23, 0x3c, 0x37, 0xc6, 0xe8, 0x4e, 0xa4, 0x7f, 0x6b, - 0x61, 0x33, 0xcf, 0x76, 0x98, 0xc7, 0xc4, 0x72, 0x23, 0x24, 0xb1, 0x14, 0x25, 0xb9, 0x94, 0x2b, - 0xd0, 0xfe, 0x16, 0xec, 0xa1, 0xc2, 0xc8, 0x09, 0x14, 0x64, 0x5e, 0x3b, 0x0a, 0xe3, 0x45, 0xff, - 0xf8, 0x11, 0x7d, 0x12, 0x5a, 0x5b, 0x1b, 0xa3, 0x6e, 0xc0, 0x01, 0x45, 0x11, 0x30, 0x5c, 0xa0, - 0xcc, 0xca, 0xff, 0x45, 0xf7, 0x04, 0x0e, 0xef, 0x06, 0x79, 0xb0, 0xde, 0x97, 0x90, 0x93, 0x2d, - 0xe1, 0x6a, 0xba, 0x9a, 0x49, 0xea, 0x58, 0x8c, 0x4f, 0x03, 0x80, 0x9b, 0x49, 0x22, 0x47, 0x50, - 0xb6, 0x7a, 0xad, 0x5e, 0xdf, 0x1a, 0x18, 0xdd, 0xb6, 0x39, 0xe8, 0x7f, 0xb2, 0x3e, 0x9b, 0x46, - 0xe7, 0x5d, 0xc7, 0x6c, 0x97, 0x52, 0xa4, 0x0c, 0xfb, 0xbb, 0xd0, 0xea, 0x1b, 0x86, 0x69, 0x59, - 0x25, 0xe5, 0x2e, 0xe8, 0x75, 0x2e, 0xcc, 0x6e, 0xbf, 0x57, 0x4a, 0x93, 0x03, 0xd8, 0xdb, 0x05, - 0x26, 0xa5, 0x5d, 0x5a, 0xca, 0x34, 0xbf, 0xa5, 0x21, 0xdf, 0x6e, 0x9d, 0x1b, 0x16, 0x06, 0x0b, - 0xe6, 0x22, 0x69, 0x43, 0x7e, 0x67, 0x6c, 0x88, 0x1a, 0x0f, 0xf8, 0x1f, 0x63, 0x58, 0x79, 0x9a, - 0x40, 0xa2, 0xc2, 0xf5, 0x14, 0x41, 0x38, 0x4c, 0x6e, 0x37, 0x79, 0x11, 0xb9, 0xdd, 0x3b, 0x59, - 0x95, 0xe3, 0xfb, 0x1f, 0x6d, 0xd3, 0x5c, 0x40, 0xe1, 0x76, 0x77, 0xc8, 0x51, 0xe4, 0x99, 0xd8, - 0xf8, 0xca, 0xb3, 0x64, 0xb8, 0x09, 0x77, 0xf6, 0xfe, 0xc7, 0x4a, 0x53, 0xae, 0x57, 0x9a, 0xf2, - 0x6b, 0xa5, 0x29, 0xdf, 0xd7, 0x5a, 0xea, 0x7a, 0xad, 0xa5, 0x7e, 0xae, 0xb5, 0xd4, 0x97, 0x57, - 0x23, 0x26, 0xc6, 0x73, 0xa7, 0xee, 0xfa, 0xd3, 0x86, 0x8b, 0x1e, 0x72, 0xc1, 0x6c, 0x3f, 0x18, - 0x6d, 0x57, 0x45, 0x43, 0x2c, 0x67, 0xc8, 0x1b, 0x33, 0x47, 0xee, 0x15, 0x27, 0x27, 0x37, 0xc7, - 0xeb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x72, 0xc7, 0x7f, 0x66, 0x6b, 0x04, 0x00, 0x00, + // 542 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xc1, 0x8f, 0xd2, 0x4e, + 0x14, 0xa6, 0xec, 0xfe, 0xf8, 0xb1, 0x0f, 0x65, 0x71, 0xd6, 0x5d, 0x2a, 0xab, 0x95, 0xd4, 0xdd, + 0x88, 0x26, 0xd2, 0x04, 0x8f, 0x1e, 0x4c, 0x69, 0xab, 0x62, 0x5c, 0x31, 0x2d, 0x5c, 0xbc, 0x90, + 0x69, 0x3b, 0x29, 0x13, 0xca, 0x0e, 0xdb, 0x19, 0x30, 0xfb, 0x27, 0x78, 0xf3, 0xcf, 0xf2, 0xb8, + 0x47, 0x4f, 0xc6, 0xc0, 0x3f, 0x62, 0x68, 0x0b, 0x0b, 0x2b, 0x92, 0xac, 0x97, 0xe6, 0xcd, 0xfb, + 0xe6, 0xbd, 0xf9, 0xbe, 0xbe, 0x2f, 0x0f, 0xf6, 0x7d, 0x1c, 0x7a, 0xda, 0xfc, 0x53, 0x1f, 0x45, + 0x4c, 0x30, 0xb4, 0x3b, 0x8f, 0x2b, 0x65, 0x36, 0x12, 0x74, 0x48, 0xcf, 0x85, 0xb6, 0x08, 0x12, + 0xb8, 0x72, 0x3f, 0x60, 0x01, 0x8b, 0x43, 0x6d, 0x1e, 0x25, 0x59, 0xf5, 0x0b, 0x80, 0xa9, 0xdb, + 0x84, 0x8f, 0xd8, 0x39, 0x27, 0xe8, 0x04, 0x76, 0x3d, 0xe6, 0x13, 0x59, 0xaa, 0x4a, 0xb5, 0x62, + 0xa3, 0x54, 0x8f, 0xbb, 0x3b, 0x02, 0x8b, 0x31, 0x37, 0x98, 0x4f, 0xec, 0x18, 0x45, 0x32, 0xfc, + 0x3f, 0x24, 0x9c, 0xe3, 0x80, 0xc8, 0xd9, 0xaa, 0x54, 0xdb, 0xb3, 0x17, 0x47, 0xf4, 0x0c, 0xf6, + 0x7c, 0xdc, 0xeb, 0x13, 0x1a, 0xf4, 0x85, 0xbc, 0x53, 0x95, 0x6a, 0xbb, 0xcd, 0x3b, 0xd3, 0x9f, + 0x8f, 0xf3, 0xa6, 0xfe, 0x2e, 0xce, 0xd9, 0x79, 0x1f, 0x27, 0x91, 0xfa, 0x0a, 0x90, 0x33, 0x76, + 0x87, 0x54, 0x34, 0x43, 0xe6, 0x0d, 0x6c, 0x72, 0x31, 0x26, 0x5c, 0xa0, 0x53, 0xf8, 0xcf, 0x9d, + 0x9f, 0x63, 0x06, 0x85, 0xc6, 0x7e, 0x7d, 0x29, 0x22, 0xb9, 0x96, 0xa0, 0xea, 0x6b, 0x38, 0x58, + 0x2b, 0x4e, 0xe9, 0xd7, 0x20, 0x17, 0x11, 0x3e, 0x0e, 0x45, 0x5a, 0x9e, 0x0a, 0xb8, 0x16, 0x68, + 0xa7, 0xb8, 0xfa, 0x1e, 0x1e, 0x19, 0x7d, 0xe2, 0x0d, 0xe2, 0x7a, 0x7d, 0x82, 0x69, 0x88, 0x5d, + 0x1a, 0x52, 0x71, 0xb9, 0x20, 0xb2, 0xa6, 0x44, 0xda, 0xaa, 0xe4, 0x02, 0x94, 0xbf, 0xf5, 0xba, + 0x2d, 0x2f, 0x74, 0x0a, 0x45, 0x1f, 0x0b, 0xdc, 0xc3, 0x49, 0x9b, 0x30, 0xf9, 0xc3, 0x79, 0xfb, + 0xee, 0x3c, 0xab, 0x2f, 0x92, 0x6a, 0x13, 0x0e, 0x6d, 0x22, 0x22, 0x4a, 0x26, 0x24, 0x7e, 0x95, + 0xff, 0x03, 0xed, 0x01, 0x1c, 0xdd, 0xec, 0x71, 0x6b, 0xba, 0x4f, 0x21, 0x17, 0x0f, 0x84, 0xcb, + 0xd9, 0xea, 0xce, 0xa6, 0x79, 0xa5, 0xf0, 0xf3, 0x08, 0xe0, 0xda, 0x46, 0xe8, 0x18, 0xca, 0x4e, + 0x47, 0xef, 0x74, 0x9d, 0x9e, 0xd1, 0x36, 0xad, 0x5e, 0xf7, 0xa3, 0xf3, 0xc9, 0x32, 0x5a, 0x6f, + 0x5a, 0x96, 0x59, 0xca, 0xa0, 0x32, 0x1c, 0xac, 0x82, 0x4e, 0xd7, 0x30, 0x2c, 0xc7, 0x29, 0x49, + 0x37, 0x81, 0x4e, 0xeb, 0xcc, 0x6a, 0x77, 0x3b, 0xa5, 0x2c, 0x3a, 0x84, 0x7b, 0xab, 0x80, 0x65, + 0xdb, 0x6d, 0xbb, 0xb4, 0xd3, 0xf8, 0x9a, 0x85, 0x82, 0xa9, 0x7f, 0x30, 0x1c, 0x12, 0x4d, 0xa8, + 0x47, 0x90, 0x09, 0x85, 0x15, 0xd3, 0x20, 0x39, 0x75, 0xf7, 0x1f, 0x26, 0xac, 0x3c, 0xd8, 0x80, + 0x24, 0xc2, 0xd5, 0x0c, 0x22, 0x70, 0xb4, 0x79, 0xda, 0xe8, 0x49, 0x52, 0xb6, 0xd5, 0x57, 0x95, + 0x93, 0xed, 0x97, 0x96, 0xcf, 0x9c, 0x41, 0x71, 0x7d, 0x3a, 0xe8, 0x38, 0xa9, 0xdc, 0x38, 0xf7, + 0xca, 0xc3, 0xcd, 0xe0, 0xa2, 0x5d, 0xf3, 0xed, 0xf7, 0xa9, 0x22, 0x5d, 0x4d, 0x15, 0xe9, 0xd7, + 0x54, 0x91, 0xbe, 0xcd, 0x94, 0xcc, 0xd5, 0x4c, 0xc9, 0xfc, 0x98, 0x29, 0x99, 0xcf, 0x2f, 0x02, + 0x2a, 0xfa, 0x63, 0xb7, 0xee, 0xb1, 0xa1, 0xe6, 0x91, 0x90, 0x70, 0x41, 0x31, 0x8b, 0x82, 0xe5, + 0xf6, 0xd0, 0xc4, 0xe5, 0x88, 0x70, 0x6d, 0xe4, 0xc6, 0xab, 0xc6, 0xcd, 0xc5, 0x6b, 0xe3, 0xe5, + 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x98, 0xfb, 0x9a, 0x7e, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -620,8 +622,8 @@ func (m *DAResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DataLayerHeight != 0 { - i = encodeVarintDalc(dAtA, i, uint64(m.DataLayerHeight)) + if m.DAHeight != 0 { + i = encodeVarintDalc(dAtA, i, uint64(m.DAHeight)) i-- dAtA[i] = 0x18 } @@ -730,8 +732,8 @@ func (m *CheckBlockAvailabilityRequest) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l - if m.DataLayerHeight != 0 { - i = encodeVarintDalc(dAtA, i, uint64(m.DataLayerHeight)) + if m.DAHeight != 0 { + i = encodeVarintDalc(dAtA, i, uint64(m.DAHeight)) i-- dAtA[i] = 0x8 } @@ -803,8 +805,8 @@ func (m *RetrieveBlocksRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DataLayerHeight != 0 { - i = encodeVarintDalc(dAtA, i, uint64(m.DataLayerHeight)) + if m.DAHeight != 0 { + i = encodeVarintDalc(dAtA, i, uint64(m.DAHeight)) i-- dAtA[i] = 0x8 } @@ -884,8 +886,8 @@ func (m *DAResponse) Size() (n int) { if l > 0 { n += 1 + l + sovDalc(uint64(l)) } - if m.DataLayerHeight != 0 { - n += 1 + sovDalc(uint64(m.DataLayerHeight)) + if m.DAHeight != 0 { + n += 1 + sovDalc(uint64(m.DAHeight)) } return n } @@ -922,8 +924,8 @@ func (m *CheckBlockAvailabilityRequest) Size() (n int) { } var l int _ = l - if m.DataLayerHeight != 0 { - n += 1 + sovDalc(uint64(m.DataLayerHeight)) + if m.DAHeight != 0 { + n += 1 + sovDalc(uint64(m.DAHeight)) } return n } @@ -950,8 +952,8 @@ func (m *RetrieveBlocksRequest) Size() (n int) { } var l int _ = l - if m.DataLayerHeight != 0 { - n += 1 + sovDalc(uint64(m.DataLayerHeight)) + if m.DAHeight != 0 { + n += 1 + sovDalc(uint64(m.DAHeight)) } return n } @@ -1063,9 +1065,9 @@ func (m *DAResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DataLayerHeight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DAHeight", wireType) } - m.DataLayerHeight = 0 + m.DAHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDalc @@ -1075,7 +1077,7 @@ func (m *DAResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.DataLayerHeight |= uint64(b&0x7F) << shift + m.DAHeight |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1304,9 +1306,9 @@ func (m *CheckBlockAvailabilityRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DataLayerHeight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DAHeight", wireType) } - m.DataLayerHeight = 0 + m.DAHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDalc @@ -1316,7 +1318,7 @@ func (m *CheckBlockAvailabilityRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.DataLayerHeight |= uint64(b&0x7F) << shift + m.DAHeight |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -1479,9 +1481,9 @@ func (m *RetrieveBlocksRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DataLayerHeight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DAHeight", wireType) } - m.DataLayerHeight = 0 + m.DAHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDalc @@ -1491,7 +1493,7 @@ func (m *RetrieveBlocksRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.DataLayerHeight |= uint64(b&0x7F) << shift + m.DAHeight |= uint64(b&0x7F) << shift if b < 0x80 { break }