diff --git a/api/api.proto b/api/api.proto index 3b3f8a038ef..49c3dd3dfdd 100644 --- a/api/api.proto +++ b/api/api.proto @@ -39,7 +39,7 @@ service Wallet { rpc ListWitnesses (EmptyMessage) returns (WitnessList) { }; - + rpc UpdateWitness (WitnessUpdateContract) returns (Transaction) { }; @@ -48,8 +48,24 @@ service Wallet { }; + rpc TransferAssert (TransferAssertContract) returns (Transaction) { + + } + rpc TransferTokenToAssert (TransferTokenToAssetContract) returns (Transaction) { + + } + rpc ListNodes (EmptyMessage) returns (NodeList) { + } + rpc GetAssetIssueList (EmptyMessage) returns (AssetIssueList) { + + } + rpc GetNowBlock (EmptyMessage) returns (Block) { + + } + rpc GetBlockByNum (NumberMessage) returns (Block) { + } }; @@ -65,6 +81,10 @@ message WitnessList { repeated Witness witnesses = 1; } +message AssetIssueList { + repeated AssetIssueContract witnesses = 1; +} + // Gossip node list message NodeList { repeated Node nodes = 1; @@ -83,3 +103,6 @@ message Address { message EmptyMessage { } +message NumberMessage { + int64 num = 1; +} diff --git a/core/Contract.proto b/core/Contract.proto index 105f28a47d9..c8a2e32066f 100644 --- a/core/Contract.proto +++ b/core/Contract.proto @@ -83,6 +83,13 @@ message AssetIssueContract { bytes url = 21; } +message TransferTokenToAssetContract { + bytes owner_address = 1; + bytes to_address = 2; + bytes name = 3; + int32 trx_num = 4; +} + message DeployContract { bytes owner_address = 1; bytes script = 2; diff --git a/core/Message.proto b/core/Message.proto index de7d06f8582..a25c21506f6 100644 --- a/core/Message.proto +++ b/core/Message.proto @@ -11,16 +11,6 @@ message Capability { int32 version = 2; } -enum P2pMessageCode { - HELLO = 0; - DISCONNECT = 1; - PING = 2; - PONG = 3; - GET_PEERS = 4; - PEERS = 5; - USER = 6; -} - enum ReasonCode { REQUESTED = 0; TCP_ERROR = 1; @@ -59,4 +49,38 @@ message HelloMessage { message PeersMessage { repeated Peer peers = 1; +} + +message Endpoint { + bytes address = 1; + int32 udpPort = 2; + int32 tcpPort = 3; +} + +message PingMessage { + int32 version = 1; + Endpoint from = 2; + Endpoint to = 3; + int32 timestamp = 4; +} + +message PongMessage { + Endpoint to = 1; + int32 echo = 2; + int32 timestamp = 3; +} + +message FindNeighbours { + bytes target = 1; + int32 timestamp = 2; +} + +message Neighbour { + Endpoint endpoint = 1; + bytes nodeId = 2; +} + +message Neighbours { + repeated Neighbour neighbours = 1; + int32 timestamp = 2; } \ No newline at end of file diff --git a/core/Tron.proto b/core/Tron.proto index 75b0e80882b..a529e733b64 100644 --- a/core/Tron.proto +++ b/core/Tron.proto @@ -80,6 +80,7 @@ message Transaction { AssetIssueContract = 6; DeployContract = 7; WitnessUpdateContract = 8; + TransferTokenToAssetContract = 9; } ContractType type = 1; google.protobuf.Any parameter = 2; @@ -102,6 +103,7 @@ message Transaction { bytes data = 10; repeated Contract contract = 11; bytes scripts = 16; + int64 timestamp = 17; } raw raw_data = 1;