Skip to content

M
MetaProtocol
Commit 065b1599 authored by Ubuntu's avatar Ubuntu
Browse files
Options

add eth std raw tx

parent 9099c989
Expand all Show whitespace changes
Inline Side-by-side
Showing with 916 additions and 527 deletions
baseapi/base/v1/eth.proto
View file @ 065b1599
......@@ -6,18 +6,18 @@ import "google/protobuf/timestamp.proto";
import "google/protobuf/any.proto";
import "base/v1/resource.proto";
message StdTxData {
uint32 type = 1;
uint64 nonce = 2;
BigInt gas_price = 3;
uint64 gas_limit = 4;
Address recipient = 5;
BigInt amount = 6;
bytes data = 7;
BigInt r = 8;
BigInt s = 9;
BigInt v = 10;
}
// message StdTxData {
// uint32 type = 1;
// uint64 nonce = 2;
// BigInt gas_price = 3;
// uint64 gas_limit = 4;
// Address recipient = 5;
// BigInt amount = 6;
// bytes data = 7;
// BigInt r = 8;
// BigInt s = 9;
// BigInt v = 10;
// }
message Receipt {
uint32 type = 1;
......
baseapi/base/v1/resource.proto
View file @ 065b1599
......@@ -31,12 +31,12 @@ message Address {
// AddressLength = 20
// )
message EthTransaction {
Txdata Inner = 1;
message EthTx {
EthTxData Inner = 1;
google.protobuf.Timestamp time =2;
}
message Txdata{
message EthTxData{
uint64 account_nonce =1;
bytes price =2 ;
uint64 gas_limit =3;
......@@ -48,22 +48,73 @@ message Txdata{
bytes s=9;
//This is only used when marshaling to JSON.
Hash hash=10;
bytes from=11;
}
message CheckTx {
google.protobuf.Any tx = 1;
Address from =2;
message StdTxData{
uint64 account_nonce =1;
bytes price =2 ;
uint64 gas_limit =3;
Address recipient =4;
bytes amount =5;
bytes payload =6;
bytes v =7;
bytes r=8;
bytes s=9;
//This is only used when marshaling to JSON.
Hash hash=10;
bytes from=11;
}
message Transaction{
message StdTx{
StdTxData Inner = 1;
google.protobuf.Timestamp time =2;
}
message TxProof{
bytes rset = 1;
bytes wset = 2;
bytes proof =3;
int64 state_block_num =4;
int64 timeout_block_num =5;
CheckTx check_tx =6;
}
// 1. any eth--> proto3 eth tx --> grpc --->proto3 eth tx --> eth
message Transaction{
TxProof tx_proof=1;
int64 timeout_block_num =2;
google.protobuf.Any tx =3; // EthTx StdTx
}
//2. eth std: proto3 eth tx --> grpc --->proto3 eth tx
// proto3 std tx --> grpc --->proto3 std tx
message TransactionStd{
TxProof tx_proof=1;
int64 timeout_block_num =2;
EthTx tx =3;
}
message TransactionEth{
TxProof tx_proof=1;
int64 timeout_block_num =2;
StdTx tx =3;
}
//3. bytes
message TransactionBytes{
TxProof tx_proof=1;
int64 timeout_block_num =2;
bytes tx =3; // EthTx StdTx
}
//ype checkTx struct{
// tx interface
// From []byte
......
ethrpcapi/ethrpc/v1/service.proto
View file @ 065b1599
......@@ -63,8 +63,8 @@ service RpcService {
rpc GetCode(GetCodeRequest) returns (GetCodeResponse) {};
rpc Sign(SignRequest) returns (SignResponse) {};
rpc SignTransaction(SignTransactionRequest) returns (SignTransactionResponse) {};
rpc SendTransaction(base.v1.EthTransaction) returns (SendTransactionResponse) {};
rpc SendRawTransaction(base.v1.EthTransaction) returns (SendRawTransactionResponse) {};
rpc SendTransaction(base.v1.EthTx) returns (SendTransactionResponse) {};
rpc SendRawTransaction(base.v1.EthTx) returns (SendRawTransactionResponse) {};
rpc Call(CallRequest) returns (CallResponse) {};
// filter
......
gen/proto/go/base/v1/eth.pb.go
View file @ 065b1599
This diff is collapsed.
gen/proto/go/base/v1/resource.pb.go
View file @ 065b1599
This diff is collapsed.
gen/proto/go/ethrpc/v1/service.pb.go
View file @ 065b1599
This diff is collapsed.
gen/proto/go/ethrpc/v1/service_grpc.pb.go
View file @ 065b1599
......@@ -69,8 +69,8 @@ type RpcServiceClient 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 *v1.EthTransaction, opts ...grpc.CallOption) (*SendTransactionResponse, error)
SendRawTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendRawTransactionResponse, error)
SendTransaction(ctx context.Context, in *v1.EthTx, opts ...grpc.CallOption) (*SendTransactionResponse, error)
SendRawTransaction(ctx context.Context, in *v1.EthTx, 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)
......@@ -423,7 +423,7 @@ func (c *rpcServiceClient) SignTransaction(ctx context.Context, in *SignTransact
return out, nil
}
func (c *rpcServiceClient) SendTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendTransactionResponse, error) {
func (c *rpcServiceClient) SendTransaction(ctx context.Context, in *v1.EthTx, opts ...grpc.CallOption) (*SendTransactionResponse, error) {
out := new(SendTransactionResponse)
err := c.cc.Invoke(ctx, "/ethrpc.v1.RpcService/SendTransaction", in, out, opts...)
if err != nil {
......@@ -432,7 +432,7 @@ func (c *rpcServiceClient) SendTransaction(ctx context.Context, in *v1.EthTransa
return out, nil
}
func (c *rpcServiceClient) SendRawTransaction(ctx context.Context, in *v1.EthTransaction, opts ...grpc.CallOption) (*SendRawTransactionResponse, error) {
func (c *rpcServiceClient) SendRawTransaction(ctx context.Context, in *v1.EthTx, opts ...grpc.CallOption) (*SendRawTransactionResponse, error) {
out := new(SendRawTransactionResponse)
err := c.cc.Invoke(ctx, "/ethrpc.v1.RpcService/SendRawTransaction", in, out, opts...)
if err != nil {
......@@ -562,8 +562,8 @@ type RpcServiceServer interface {
GetCode(context.Context, *GetCodeRequest) (*GetCodeResponse, error)
Sign(context.Context, *SignRequest) (*SignResponse, error)
SignTransaction(context.Context, *SignTransactionRequest) (*SignTransactionResponse, error)
SendTransaction(context.Context, *v1.EthTransaction) (*SendTransactionResponse, error)
SendRawTransaction(context.Context, *v1.EthTransaction) (*SendRawTransactionResponse, error)
SendTransaction(context.Context, *v1.EthTx) (*SendTransactionResponse, error)
SendRawTransaction(context.Context, *v1.EthTx) (*SendRawTransactionResponse, error)
Call(context.Context, *CallRequest) (*CallResponse, error)
// filter
NewFilter(context.Context, *NewFilterRequest) (*NewFilterResponse, error)
......@@ -691,10 +691,10 @@ func (UnimplementedRpcServiceServer) Sign(context.Context, *SignRequest) (*SignR
func (UnimplementedRpcServiceServer) SignTransaction(context.Context, *SignTransactionRequest) (*SignTransactionResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method SignTransaction not implemented")
}
func (UnimplementedRpcServiceServer) SendTransaction(context.Context, *v1.EthTransaction) (*SendTransactionResponse, error) {
func (UnimplementedRpcServiceServer) SendTransaction(context.Context, *v1.EthTx) (*SendTransactionResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method SendTransaction not implemented")
}
func (UnimplementedRpcServiceServer) SendRawTransaction(context.Context, *v1.EthTransaction) (*SendRawTransactionResponse, error) {
func (UnimplementedRpcServiceServer) SendRawTransaction(context.Context, *v1.EthTx) (*SendRawTransactionResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method SendRawTransaction not implemented")
}
func (UnimplementedRpcServiceServer) Call(context.Context, *CallRequest) (*CallResponse, error) {
......@@ -1401,7 +1401,7 @@ func _RpcService_SignTransaction_Handler(srv interface{}, ctx context.Context, d
}
func _RpcService_SendTransaction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(v1.EthTransaction)
in := new(v1.EthTx)
if err := dec(in); err != nil {
return nil, err
}
......@@ -1413,13 +1413,13 @@ func _RpcService_SendTransaction_Handler(srv interface{}, ctx context.Context, d
FullMethod: "/ethrpc.v1.RpcService/SendTransaction",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RpcServiceServer).SendTransaction(ctx, req.(*v1.EthTransaction))
return srv.(RpcServiceServer).SendTransaction(ctx, req.(*v1.EthTx))
}
return interceptor(ctx, in, info, handler)
}
func _RpcService_SendRawTransaction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(v1.EthTransaction)
in := new(v1.EthTx)
if err := dec(in); err != nil {
return nil, err
}
......@@ -1431,7 +1431,7 @@ func _RpcService_SendRawTransaction_Handler(srv interface{}, ctx context.Context
FullMethod: "/ethrpc.v1.RpcService/SendRawTransaction",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RpcServiceServer).SendRawTransaction(ctx, req.(*v1.EthTransaction))
return srv.(RpcServiceServer).SendRawTransaction(ctx, req.(*v1.EthTx))
}
return interceptor(ctx, in, info, handler)
}
......
gen/proto/go/ring/v1/service.pb.go
View file @ 065b1599
......@@ -33,37 +33,37 @@ var file_ring_v1_service_proto_rawDesc = []byte{
0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x72,
0x65, 0x71, 0x5f, 0x72, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x61,
0x73, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x32, 0x96, 0x01, 0x0a, 0x0b, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72,
0x76, 0x69, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x12, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x77, 0x54,
0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x2e, 0x62, 0x61, 0x73,
0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x1a, 0x23, 0x2e, 0x72,
0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x77, 0x54, 0x72,
0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
0x65, 0x22, 0x00, 0x12, 0x38, 0x0a, 0x05, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x15, 0x2e, 0x72,
0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75,
0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f,
0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xa7, 0x01,
0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x53,
0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67,
0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x43, 0x61, 0x64, 0x75, 0x63, 0x65,
0x75, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x76, 0x65, 0x72, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f,
0x63, 0x6f, 0x6c, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x72, 0x69,
0x6e, 0x67, 0x2f, 0x76, 0x31, 0x3b, 0x72, 0x69, 0x6e, 0x67, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52,
0x58, 0x58, 0xaa, 0x02, 0x07, 0x52, 0x69, 0x6e, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x07, 0x52,
0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x13, 0x52, 0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31,
0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, 0x52,
0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x72, 0x6f, 0x74, 0x6f, 0x32, 0x94, 0x01, 0x0a, 0x0b, 0x52, 0x69, 0x6e, 0x67, 0x53, 0x65, 0x72,
0x76, 0x69, 0x63, 0x65, 0x12, 0x4b, 0x0a, 0x12, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x77, 0x54,
0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x2e, 0x62, 0x61, 0x73,
0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x74, 0x68, 0x54, 0x78, 0x1a, 0x23, 0x2e, 0x72, 0x69, 0x6e,
0x67, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x77, 0x54, 0x72, 0x61, 0x6e,
0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
0x00, 0x12, 0x38, 0x0a, 0x05, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x15, 0x2e, 0x72, 0x69, 0x6e,
0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
0x74, 0x1a, 0x16, 0x2e, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x6f, 0x6e, 0x63,
0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xa7, 0x01, 0x0a, 0x0b,
0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x53, 0x65, 0x72,
0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67, 0x69, 0x74,
0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x43, 0x61, 0x64, 0x75, 0x63, 0x65, 0x75, 0x73,
0x4d, 0x65, 0x74, 0x61, 0x76, 0x65, 0x72, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
0x6c, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x67,
0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x72, 0x69, 0x6e, 0x67,
0x2f, 0x76, 0x31, 0x3b, 0x72, 0x69, 0x6e, 0x67, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x58, 0x58,
0xaa, 0x02, 0x07, 0x52, 0x69, 0x6e, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x07, 0x52, 0x69, 0x6e,
0x67, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x13, 0x52, 0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47,
0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x08, 0x52, 0x69, 0x6e,
0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var file_ring_v1_service_proto_goTypes = []interface{}{
(*v1.CheckTx)(nil), // 0: base.v1.CheckTx
(*v1.EthTx)(nil), // 0: base.v1.EthTx
(*NonceRequest)(nil), // 1: ring.v1.NonceRequest
(*SendRawTransactionResponse)(nil), // 2: ring.v1.SendRawTransactionResponse
(*NonceResponse)(nil), // 3: ring.v1.NonceResponse
}
var file_ring_v1_service_proto_depIdxs = []int32{
0, // 0: ring.v1.RingService.SendRawTransaction:input_type -> base.v1.CheckTx
0, // 0: ring.v1.RingService.SendRawTransaction:input_type -> base.v1.EthTx
1, // 1: ring.v1.RingService.Nonce:input_type -> ring.v1.NonceRequest
2, // 2: ring.v1.RingService.SendRawTransaction:output_type -> ring.v1.SendRawTransactionResponse
3, // 3: ring.v1.RingService.Nonce:output_type -> ring.v1.NonceResponse
......
gen/proto/go/ring/v1/service_grpc.pb.go
View file @ 065b1599
......@@ -24,7 +24,7 @@ const _ = grpc.SupportPackageIsVersion7
// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
type RingServiceClient interface {
// account info service
SendRawTransaction(ctx context.Context, in *v1.CheckTx, opts ...grpc.CallOption) (*SendRawTransactionResponse, error)
SendRawTransaction(ctx context.Context, in *v1.EthTx, opts ...grpc.CallOption) (*SendRawTransactionResponse, error)
Nonce(ctx context.Context, in *NonceRequest, opts ...grpc.CallOption) (*NonceResponse, error)
}
......@@ -36,7 +36,7 @@ func NewRingServiceClient(cc grpc.ClientConnInterface) RingServiceClient {
return &ringServiceClient{cc}
}
func (c *ringServiceClient) SendRawTransaction(ctx context.Context, in *v1.CheckTx, opts ...grpc.CallOption) (*SendRawTransactionResponse, error) {
func (c *ringServiceClient) SendRawTransaction(ctx context.Context, in *v1.EthTx, opts ...grpc.CallOption) (*SendRawTransactionResponse, error) {
out := new(SendRawTransactionResponse)
err := c.cc.Invoke(ctx, "/ring.v1.RingService/SendRawTransaction", in, out, opts...)
if err != nil {
......@@ -59,7 +59,7 @@ func (c *ringServiceClient) Nonce(ctx context.Context, in *NonceRequest, opts ..
// for forward compatibility
type RingServiceServer interface {
// account info service
SendRawTransaction(context.Context, *v1.CheckTx) (*SendRawTransactionResponse, error)
SendRawTransaction(context.Context, *v1.EthTx) (*SendRawTransactionResponse, error)
Nonce(context.Context, *NonceRequest) (*NonceResponse, error)
mustEmbedUnimplementedRingServiceServer()
}
......@@ -68,7 +68,7 @@ type RingServiceServer interface {
type UnimplementedRingServiceServer struct {
}
func (UnimplementedRingServiceServer) SendRawTransaction(context.Context, *v1.CheckTx) (*SendRawTransactionResponse, error) {
func (UnimplementedRingServiceServer) SendRawTransaction(context.Context, *v1.EthTx) (*SendRawTransactionResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method SendRawTransaction not implemented")
}
func (UnimplementedRingServiceServer) Nonce(context.Context, *NonceRequest) (*NonceResponse, error) {
......@@ -88,7 +88,7 @@ func RegisterRingServiceServer(s grpc.ServiceRegistrar, srv RingServiceServer) {
}
func _RingService_SendRawTransaction_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(v1.CheckTx)
in := new(v1.EthTx)
if err := dec(in); err != nil {
return nil, err
}
......@@ -100,7 +100,7 @@ func _RingService_SendRawTransaction_Handler(srv interface{}, ctx context.Contex
FullMethod: "/ring.v1.RingService/SendRawTransaction",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(RingServiceServer).SendRawTransaction(ctx, req.(*v1.CheckTx))
return srv.(RingServiceServer).SendRawTransaction(ctx, req.(*v1.EthTx))
}
return interceptor(ctx, in, info, handler)
}
......
gen/proto/go/txchecker/v1/request_response.pb.go
View file @ 065b1599
......@@ -27,7 +27,7 @@ type BatchCheckTxRequest struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Txs []*v1.CheckTx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
Txs []*v1.EthTx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
}
func (x *BatchCheckTxRequest) Reset() {
......@@ -62,7 +62,7 @@ func (*BatchCheckTxRequest) Descriptor() ([]byte, []int) {
return file_txchecker_v1_request_response_proto_rawDescGZIP(), []int{0}
}
func (x *BatchCheckTxRequest) GetTxs() []*v1.CheckTx {
func (x *BatchCheckTxRequest) GetTxs() []*v1.EthTx {
if x != nil {
return x.Txs
}
......@@ -125,28 +125,28 @@ var file_txchecker_v1_request_response_proto_rawDesc = []byte{
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x74, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72,
0x2e, 0x76, 0x31, 0x1a, 0x16, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x65, 0x73,
0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x39, 0x0a, 0x13, 0x42,
0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x37, 0x0a, 0x13, 0x42,
0x61, 0x74, 0x63, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x71, 0x75, 0x65,
0x73, 0x74, 0x12, 0x22, 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x10, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54,
0x78, 0x52, 0x03, 0x74, 0x78, 0x73, 0x22, 0x2e, 0x0a, 0x14, 0x42, 0x61, 0x74, 0x63, 0x68, 0x43,
0x68, 0x65, 0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16,
0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x08, 0x52, 0x06,
0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0xd2, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x74,
0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x52, 0x65, 0x71,
0x75, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74,
0x6f, 0x50, 0x01, 0x5a, 0x57, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
0x43, 0x61, 0x64, 0x75, 0x63, 0x65, 0x75, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x76, 0x65, 0x72, 0x73,
0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x2f, 0x67, 0x6f, 0x2f, 0x74, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x76, 0x31,
0x3b, 0x74, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x54,
0x58, 0x58, 0xaa, 0x02, 0x0c, 0x54, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x56,
0x31, 0xca, 0x02, 0x0c, 0x54, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x5c, 0x56, 0x31,
0xe2, 0x02, 0x18, 0x54, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x5c, 0x56, 0x31, 0x5c,
0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0d, 0x54, 0x78,
0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
0x73, 0x74, 0x12, 0x20, 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x0e, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x74, 0x68, 0x54, 0x78, 0x52,
0x03, 0x74, 0x78, 0x73, 0x22, 0x2e, 0x0a, 0x14, 0x42, 0x61, 0x74, 0x63, 0x68, 0x43, 0x68, 0x65,
0x63, 0x6b, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06,
0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74,
0x61, 0x74, 0x75, 0x73, 0x42, 0xd2, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x78, 0x63,
0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x52, 0x65, 0x71, 0x75, 0x65,
0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
0x01, 0x5a, 0x57, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x43, 0x61,
0x64, 0x75, 0x63, 0x65, 0x75, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x76, 0x65, 0x72, 0x73, 0x65, 0x50,
0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67,
0x6f, 0x2f, 0x74, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x74,
0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58,
0xaa, 0x02, 0x0c, 0x54, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x2e, 0x56, 0x31, 0xca,
0x02, 0x0c, 0x54, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x5c, 0x56, 0x31, 0xe2, 0x02,
0x18, 0x54, 0x78, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x72, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50,
0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0d, 0x54, 0x78, 0x63, 0x68,
0x65, 0x63, 0x6b, 0x65, 0x72, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
}
var (
......@@ -165,10 +165,10 @@ var file_txchecker_v1_request_response_proto_msgTypes = make([]protoimpl.Message
var file_txchecker_v1_request_response_proto_goTypes = []interface{}{
(*BatchCheckTxRequest)(nil), // 0: txchecker.v1.BatchCheckTxRequest
(*BatchCheckTxResponse)(nil), // 1: txchecker.v1.BatchCheckTxResponse
(*v1.CheckTx)(nil), // 2: base.v1.CheckTx
(*v1.EthTx)(nil), // 2: base.v1.EthTx
}
var file_txchecker_v1_request_response_proto_depIdxs = []int32{
2, // 0: txchecker.v1.BatchCheckTxRequest.txs:type_name -> base.v1.CheckTx
2, // 0: txchecker.v1.BatchCheckTxRequest.txs:type_name -> base.v1.EthTx
1, // [1:1] is the sub-list for method output_type
1, // [1:1] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name
......
nebulaapi/txchecker/v1/request_response.proto
View file @ 065b1599
......@@ -6,7 +6,7 @@ import "base/v1/resource.proto";
// The standard BatchGet request definition.
message BatchCheckTxRequest {
repeated base.v1.CheckTx txs = 1;
repeated base.v1.EthTx txs = 1;
}
......
ringapi/ring/v1/service.proto
View file @ 065b1599
......@@ -10,7 +10,7 @@ import "base/v1/resource.proto";
service RingService{
// account info service
rpc SendRawTransaction(base.v1.CheckTx) returns (SendRawTransactionResponse) {};
rpc SendRawTransaction(base.v1.EthTx) returns (SendRawTransactionResponse) {};
rpc Nonce(NonceRequest) returns (NonceResponse) {};
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment