merge remote

crypterapi/crypter/v1/service.proto

@@ -5,9 +5,6 @@ package crypter.v1;
 import "crypter/v1/request_response.proto";
 
 service CrypterService {
-  // rpc Sign(SignRequest) returns (SignResponse) {}
-  // rpc Verify(VerifyRequest) returns (VerifyResponse) {}
-  // rpc Recover(RecoverRequest) returns (RecoverResponse) {}
   rpc BatchSign(BatchSignRequest) returns (BatchSignResponse) {}
   rpc BatchVerify(BatchVerifyRequest) returns (BatchVerifyResponse) {}
   rpc BatchRecover(BatchRecoverRequest) returns (BatchRecoverResponse) {}

nebulaapi/nebula/v1/resource.proto

 syntax = "proto3";
 
 package nebula.v1;
+import "base/v1/resource.proto";
+message Tx {
+    base.v1.Address address = 1;
+    base.v1.Hash    hash = 2;
+}
\ No newline at end of file

nebulaapi/nebula/v1/service.proto

@@ -27,8 +27,6 @@ service NebulaService {
   // tx operatoration
   rpc GasPrice(google.protobuf.Empty) returns (GasPriceResponse) {};
   
-
-  
   // block info service 
   rpc BlockNumber(google.protobuf.Empty) returns (HeightResponse) {};
   rpc BlockByHash(BlockByHashRequest) returns (BlockByHashResponse) {};

p2papi/p2p/v1/service.proto

@@ -4,7 +4,9 @@ package p2p.v1;
 import "p2p/v1/request_response.proto";
 
 service P2PService {
+
   rpc BroadcastMsg(BroadCastRequest) returns (BroadCastResponse) {}
   rpc SendMsg(SendDataRequest) returns (SendDataResponse) {}
   rpc SubscribeMsg(SubscribeMsgRequest) returns (SubscribeMsgResponse) {}
+
 }

txflow.md

+## SendTx
 ```plantuml
 @startuml
-participant "Ring" as a
+actor Alice
+participant "Ring" as r
 participant "Crypter" as c
-a -> c : 
+participant "TxCheck" as t
+participant "Sentry" as s
+participant "p2p" as p
+participant "nebula" as n
+
+n -> p : SubscribeMessage(rethtx, batchtx)
+Alice -> r : SendRawTransaction(ethtx)
+r -> c : BatchRecoverTx(ethtx)
+c -> r : RethTx
+r -> t : BatchCheckTx(rethTx)
+t -> r : true
+r -> Alice : txhash
+r -> r : makeBatchTx
+r -> s : LimitInfoRequest
+s -> r : LimitInfoResponse
+r -> s : CommitBatchTx(batchtx)
+r -> p : BroadCastMessage(rethtx, batchtx)
+p -> n : Stream(rethtx, batchtx)
+n -> n : mineblock(rethtx)
+Alice -> r : TransactionReceipt(txhash)
+r -> n : TransactionReceipt(txhash)
+n -> r : receipt
+r -> Alice : receipt
 @enduml
 ```