Skip to content

zoobc/zoobc-core#136 remove length field usages #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 15, 2019
Merged

zoobc/zoobc-core#136 remove length field usages #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ccff96
zoobc/zoobc-core#136 remove length field usages
andy-shi88 Aug 15, 2019
a54f6fc
#136 remove account service json
andy-shi88 Aug 15, 2019
38dae30
zoobc/zoobc#136 signature field number
andy-shi88 Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions documentation.swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,58 +396,6 @@
}
}
},
"/v1/nodeRegistration/UpdateNodeRegistration": {
"get": {
"tags": [
"NodeRegistrationService"
],
"operationId": "UpdateNodeRegistration",
"parameters": [
{
"type": "string",
"format": "byte",
"name": "ID",
"in": "query"
},
{
"type": "string",
"format": "byte",
"name": "NodePublicKey",
"in": "query"
},
{
"type": "integer",
"format": "int64",
"name": "AccountType",
"in": "query"
},
{
"type": "string",
"name": "AccountAddress",
"in": "query"
},
{
"type": "string",
"name": "NodeAddress",
"in": "query"
},
{
"type": "string",
"format": "int64",
"name": "LockedBalance",
"in": "query"
}
],
"responses": {
"200": {
"description": "A successful response.",
"schema": {
"$ref": "#/definitions/modelNodeRegistration"
}
}
}
}
},
"/v1/transaction/GetTransaction": {
"get": {
"tags": [
Expand Down Expand Up @@ -570,10 +518,6 @@
"BlocksmithAddress": {
"type": "string"
},
"BlocksmithAddressLength": {
"type": "integer",
"format": "int64"
},
"CumulativeDifficulty": {
"type": "string"
},
Expand Down Expand Up @@ -904,31 +848,19 @@
"AccountAddress": {
"type": "string"
},
"AccountAddressLength": {
"type": "integer",
"format": "int64"
},
"LockedBalance": {
"type": "string",
"format": "int64"
},
"NodeAddress": {
"type": "string"
},
"NodeAddressLength": {
"type": "integer",
"format": "int64"
},
"NodePublicKey": {
"type": "string",
"format": "byte"
},
"Poown": {
"$ref": "#/definitions/modelProofOfOwnership"
},
"RegistrationHeight": {
"type": "integer",
"format": "int64"
}
}
},
Expand Down Expand Up @@ -1013,17 +945,9 @@
"RecipientAccountAddress": {
"type": "string"
},
"RecipientAccountAddressLength": {
"type": "integer",
"format": "int64"
},
"SenderAccountAddress": {
"type": "string"
},
"SenderAccountAddressLength": {
"type": "integer",
"format": "int64"
},
"Signature": {
"type": "string",
"format": "byte"
Expand Down Expand Up @@ -1076,10 +1000,6 @@
"NodeAddress": {
"type": "string"
},
"NodeAddressLength": {
"type": "integer",
"format": "int64"
},
"NodePublicKey": {
"type": "string",
"format": "byte"
Expand Down
17 changes: 8 additions & 9 deletions model/block.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@ message Block {
bytes BlockSignature = 6;
string CumulativeDifficulty = 7;
int64 SmithScale = 8;
uint32 BlocksmithAddressLength = 9;
string BlocksmithAddress = 10;
int64 TotalAmount = 11;
int64 TotalFee = 12;
int64 TotalCoinBase = 13;
uint32 Version = 14;
uint32 PayloadLength = 15;
bytes PayloadHash = 16;
repeated Transaction Transactions = 17;
string BlocksmithAddress = 9;
int64 TotalAmount = 10;
int64 TotalFee = 11;
int64 TotalCoinBase = 12;
uint32 Version = 13;
uint32 PayloadLength = 14;
bytes PayloadHash = 15;
repeated Transaction Transactions = 16;
}

// GetBlockRequest create request for single block
Expand Down
46 changes: 20 additions & 26 deletions model/transaction.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,22 @@ message Transaction {
int64 ID = 2;
int64 BlockID = 3;
uint32 Height = 4;
uint32 SenderAccountAddressLength = 5;
string SenderAccountAddress = 6;
uint32 RecipientAccountAddressLength = 7;
string RecipientAccountAddress = 8;
uint32 TransactionType = 9;
int64 Fee = 10;
int64 Timestamp = 11;
bytes TransactionHash = 12;
uint32 TransactionBodyLength = 13;
bytes TransactionBodyBytes = 14;
string SenderAccountAddress = 5;
string RecipientAccountAddress = 6;
uint32 TransactionType = 7;
int64 Fee = 8;
int64 Timestamp = 9;
bytes TransactionHash = 10;
uint32 TransactionBodyLength = 11;
bytes TransactionBodyBytes = 12;
// TransactionBody
oneof TransactionBody {
EmptyTransactionBody emptyTransactionBody = 15;
SendMoneyTransactionBody sendMoneyTransactionBody = 16;
NodeRegistrationTransactionBody nodeRegistrationTransactionBody = 17;
UpdateNodeRegistrationTransactionBody updateNodeRegistrationTransactionBody = 18;
EmptyTransactionBody emptyTransactionBody = 13;
SendMoneyTransactionBody sendMoneyTransactionBody = 14;
NodeRegistrationTransactionBody nodeRegistrationTransactionBody = 15;
UpdateNodeRegistrationTransactionBody updateNodeRegistrationTransactionBody = 16;
}
bytes Signature = 19;
bytes Signature = 17;
}

message EmptyTransactionBody {}
Expand All @@ -38,20 +36,17 @@ message SendMoneyTransactionBody {

message NodeRegistrationTransactionBody {
bytes NodePublicKey = 1;
uint32 AccountAddressLength = 2;
string AccountAddress = 3;
uint32 NodeAddressLength = 4;
string NodeAddress = 5;
int64 LockedBalance = 6;
ProofOfOwnership Poown = 7;
string AccountAddress = 2;
string NodeAddress = 3;
int64 LockedBalance = 4;
ProofOfOwnership Poown = 5;
}

message UpdateNodeRegistrationTransactionBody {
bytes NodePublicKey = 1;
uint32 NodeAddressLength = 2;
string NodeAddress = 3;
int64 LockedBalance = 4;
ProofOfOwnership Poown = 5;
string NodeAddress = 2;
int64 LockedBalance = 3;
ProofOfOwnership Poown = 4;
}

//TODO: shall we move this to a different file?
Expand Down Expand Up @@ -105,4 +100,3 @@ message PostTransactionResponse {
message SendTransactionRequest {
bytes TransactionBytes = 1;
}