grpc mempool EthTransaction, p2p Transaction checkTx CheckTx

baseapi/base/v1/resource.proto

@@ -55,7 +55,7 @@ message CheckTx {
    Address  from =2;
 }
 
-message transaction{
+message Transaction{
   bytes rset = 1;
   bytes wset = 2;
   bytes proof =3;

ethrpcapi/ethrpc/v1/service.proto

@@ -64,7 +64,7 @@ service NebulaService {
   rpc Sign(SignRequest) returns (SignResponse) {};
   rpc SignTransaction(SignTransactionRequest) returns (SignTransactionResponse) {};
   rpc SendTransaction(base.v1.EthTransaction) returns (SendTransactionResponse) {};
-  rpc SendRawTransaction(SendRawTransactionRequest) returns (SendRawTransactionResponse) {};
+  rpc SendRawTransaction(base.v1.EthTransaction) returns (SendRawTransactionResponse) {};
   rpc Call(CallRequest) returns (CallResponse) {};
 
   // filter

gen/proto/go/base/v1/resource.pb.go

@@ -573,7 +573,7 @@ var file_base_v1_resource_proto_rawDesc = []byte{
 	0x41, 0x6e, 0x79, 0x52, 0x02, 0x74, 0x78, 0x12, 0x24, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x2e,
 	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x22, 0xcc, 0x01,
-	0x0a, 0x0b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a,
+	0x0a, 0x0b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a,
 	0x04, 0x72, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x72, 0x73, 0x65,
 	0x74, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
 	0x04, 0x77, 0x73, 0x65, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18, 0x03,
@@ -620,7 +620,7 @@ var file_base_v1_resource_proto_goTypes = []interface{}{
 	(*EthTransaction)(nil),        // 4: base.v1.EthTransaction
 	(*Txdata)(nil),                // 5: base.v1.Txdata
 	(*CheckTx)(nil),               // 6: base.v1.CheckTx
-	(*Transaction)(nil),           // 7: base.v1.transaction
+	(*Transaction)(nil),           // 7: base.v1.Transaction
 	(*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp
 	(*anypb.Any)(nil),             // 9: google.protobuf.Any
 }
@@ -631,7 +631,7 @@ var file_base_v1_resource_proto_depIdxs = []int32{
 	2, // 3: base.v1.Txdata.hash:type_name -> base.v1.Hash
 	9, // 4: base.v1.CheckTx.tx:type_name -> google.protobuf.Any
 	3, // 5: base.v1.CheckTx.from:type_name -> base.v1.Address
-	6, // 6: base.v1.transaction.check_tx:type_name -> base.v1.CheckTx
+	6, // 6: base.v1.Transaction.check_tx:type_name -> base.v1.CheckTx
 	7, // [7:7] is the sub-list for method output_type
 	7, // [7:7] is the sub-list for method input_type
 	7, // [7:7] is the sub-list for extension type_name

gen/proto/go/ethrpc/v1/service_grpc.pb.go

@@ -70,7 +70,7 @@ type NebulaServiceClient interface {
 	Sign(ctx context.Context, in *SignRequest, opts ...grpc.CallOption) (*SignResponse, error)
 	SignTransaction(ctx context.Context, in *SignTransactionRequest, opts ...grpc.CallOption) (*SignTransactionResponse, error)
 	SendTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendTransactionResponse, error)
-	SendRawTransaction(ctx context.Context, in *SendRawTransactionRequest, opts ...grpc.CallOption) (*SendRawTransactionResponse, error)
+	SendRawTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendRawTransactionResponse, error)
 	Call(ctx context.Context, in *CallRequest, opts ...grpc.CallOption) (*CallResponse, error)
 	// filter
 	NewFilter(ctx context.Context, in *NewFilterRequest, opts ...grpc.CallOption) (*NewFilterResponse, error)
@@ -432,7 +432,7 @@ func (c *nebulaServiceClient) SendTransaction(ctx context.Context, in *v1.EthTra
 	return out, nil
 }
 
-func (c *nebulaServiceClient) SendRawTransaction(ctx context.Context, in *SendRawTransactionRequest, opts ...grpc.CallOption) (*SendRawTransactionResponse, error) {
+func (c *nebulaServiceClient) SendRawTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendRawTransactionResponse, error) {
 	out := new(SendRawTransactionResponse)
 	err := c.cc.Invoke(ctx, "/ethrpc.v1.NebulaService/SendRawTransaction", in, out, opts...)
 	if err != nil {
@@ -563,7 +563,7 @@ type NebulaServiceServer interface {
 	Sign(context.Context, *SignRequest) (*SignResponse, error)
 	SignTransaction(context.Context, *SignTransactionRequest) (*SignTransactionResponse, error)
 	SendTransaction(context.Context, *v1.EthTransaction) (*SendTransactionResponse, error)
-	SendRawTransaction(context.Context, *SendRawTransactionRequest) (*SendRawTransactionResponse, error)
+	SendRawTransaction(context.Context, *v1.EthTransaction) (*SendRawTransactionResponse, error)
 	Call(context.Context, *CallRequest) (*CallResponse, error)
 	// filter
 	NewFilter(context.Context, *NewFilterRequest) (*NewFilterResponse, error)
@@ -694,7 +694,7 @@ func (UnimplementedNebulaServiceServer) SignTransaction(context.Context, *SignTr
 func (UnimplementedNebulaServiceServer) SendTransaction(context.Context, *v1.EthTransaction) (*SendTransactionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendTransaction not implemented")
 }
-func (UnimplementedNebulaServiceServer) SendRawTransaction(context.Context, *SendRawTransactionRequest) (*SendRawTransactionResponse, error) {
+func (UnimplementedNebulaServiceServer) SendRawTransaction(context.Context, *v1.EthTransaction) (*SendRawTransactionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendRawTransaction not implemented")
 }
 func (UnimplementedNebulaServiceServer) Call(context.Context, *CallRequest) (*CallResponse, error) {
@@ -1419,7 +1419,7 @@ func _NebulaService_SendTransaction_Handler(srv interface{}, ctx context.Context
 }
 
 func _NebulaService_SendRawTransaction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SendRawTransactionRequest)
+	in := new(v1.EthTransaction)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1431,7 +1431,7 @@ func _NebulaService_SendRawTransaction_Handler(srv interface{}, ctx context.Cont
 		FullMethod: "/ethrpc.v1.NebulaService/SendRawTransaction",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(NebulaServiceServer).SendRawTransaction(ctx, req.(*SendRawTransactionRequest))
+		return srv.(NebulaServiceServer).SendRawTransaction(ctx, req.(*v1.EthTransaction))
 	}
 	return interceptor(ctx, in, info, handler)
 }

p2papi/p2p/v1/request_response.proto

@@ -17,7 +17,7 @@ message BroadCastResponse {
 
 
 message BroadCastTxsRequest {
-  repeated    base.v1.CheckTx    txs = 1;
+  repeated    base.v1.Transaction    txs = 1;
 }
 
 message BroadCastTxsResponse {
@@ -33,7 +33,7 @@ message BatchTxsHashRequest{
 
 message BatchTxsHashResponse {
   bytes hash = 1;
-  repeated    base.v1.CheckTx    txs = 2;
+  repeated    base.v1.Transaction    txs = 2;
 }