replace data with Inner

baseapi/base/v1/resource.proto

@@ -22,8 +22,17 @@ message Address {
   bytes address = 1;
 }
 
+
+// // Lengths of hashes and addresses in bytes.
+// const (
+// 	// HashLength is the expected length of the hash
+// 	HashLength = 32
+// 	// AddressLength is the expected length of the address
+// 	AddressLength = 20
+// )
+
 message EthTransaction {
-  Txdata  data = 1;
+  Txdata  Inner = 1;
   google.protobuf.Timestamp time =2;  
 }
   

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

@@ -8,6 +8,7 @@ package ringv1
 
 import (
 	context "context"
+	v1 "github.com/CaduceusMetaverseProtocol/metaprotocol/gen/proto/go/base/v1"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -68,7 +69,7 @@ type RingServiceClient interface {
 	GetCode(ctx context.Context, in *GetCodeRequest, opts ...grpc.CallOption) (*GetCodeResponse, error)
 	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 *SendTransactionRequest, opts ...grpc.CallOption) (*SendTransactionResponse, error)
+	SendTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendTransactionResponse, error)
 	SendRawTransaction(ctx context.Context, in *SendRawTransactionRequest, opts ...grpc.CallOption) (*SendRawTransactionResponse, error)
 	Call(ctx context.Context, in *CallRequest, opts ...grpc.CallOption) (*CallResponse, error)
 	// filter
@@ -422,7 +423,7 @@ func (c *ringServiceClient) SignTransaction(ctx context.Context, in *SignTransac
 	return out, nil
 }
 
-func (c *ringServiceClient) SendTransaction(ctx context.Context, in *SendTransactionRequest, opts ...grpc.CallOption) (*SendTransactionResponse, error) {
+func (c *ringServiceClient) SendTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendTransactionResponse, error) {
 	out := new(SendTransactionResponse)
 	err := c.cc.Invoke(ctx, "/ring.v1.RingService/SendTransaction", in, out, opts...)
 	if err != nil {
@@ -561,7 +562,7 @@ type RingServiceServer interface {
 	GetCode(context.Context, *GetCodeRequest) (*GetCodeResponse, error)
 	Sign(context.Context, *SignRequest) (*SignResponse, error)
 	SignTransaction(context.Context, *SignTransactionRequest) (*SignTransactionResponse, error)
-	SendTransaction(context.Context, *SendTransactionRequest) (*SendTransactionResponse, error)
+	SendTransaction(context.Context, *v1.EthTransaction) (*SendTransactionResponse, error)
 	SendRawTransaction(context.Context, *SendRawTransactionRequest) (*SendRawTransactionResponse, error)
 	Call(context.Context, *CallRequest) (*CallResponse, error)
 	// filter
@@ -690,7 +691,7 @@ func (UnimplementedRingServiceServer) Sign(context.Context, *SignRequest) (*Sign
 func (UnimplementedRingServiceServer) SignTransaction(context.Context, *SignTransactionRequest) (*SignTransactionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignTransaction not implemented")
 }
-func (UnimplementedRingServiceServer) SendTransaction(context.Context, *SendTransactionRequest) (*SendTransactionResponse, error) {
+func (UnimplementedRingServiceServer) SendTransaction(context.Context, *v1.EthTransaction) (*SendTransactionResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendTransaction not implemented")
 }
 func (UnimplementedRingServiceServer) SendRawTransaction(context.Context, *SendRawTransactionRequest) (*SendRawTransactionResponse, error) {
@@ -1400,7 +1401,7 @@ func _RingService_SignTransaction_Handler(srv interface{}, ctx context.Context,
 }
 
 func _RingService_SendTransaction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SendTransactionRequest)
+	in := new(v1.EthTransaction)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1412,7 +1413,7 @@ func _RingService_SendTransaction_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/ring.v1.RingService/SendTransaction",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RingServiceServer).SendTransaction(ctx, req.(*SendTransactionRequest))
+		return srv.(RingServiceServer).SendTransaction(ctx, req.(*v1.EthTransaction))
 	}
 	return interceptor(ctx, in, info, handler)
 }

ringapi/ring/v1/service.proto

@@ -5,6 +5,7 @@ package ring.v1;
 import "google/protobuf/empty.proto";
 import "ring/v1/request_response.proto";
 import "ring/v1/account_req_res.proto";
+import "base/v1/resource.proto";
 
 service RingService{
  // web3
@@ -60,7 +61,7 @@ service RingService{
  rpc GetCode(GetCodeRequest) returns (GetCodeResponse) {};
  rpc Sign(SignRequest) returns (SignResponse) {};
  rpc SignTransaction(SignTransactionRequest) returns (SignTransactionResponse) {};
- rpc SendTransaction(SendTransactionRequest) returns (SendTransactionResponse) {};
+ rpc SendTransaction(base.v1.EthTransaction) returns (SendTransactionResponse) {};
  rpc SendRawTransaction(SendRawTransactionRequest) returns (SendRawTransactionResponse) {};
  rpc Call(CallRequest) returns (CallResponse) {};