Skip to content

#603 multisig sender address #97

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 2 commits into from
Mar 9, 2020
Merged

#603 multisig sender address #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdbf590
#603 multisig sender address
andy-shi88 Mar 9, 2020
bb1388b
zoobc/zoobc-core#603 fix conflicts
andy-shi88 Mar 9, 2020
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
39 changes: 39 additions & 0 deletions documentation.swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,22 @@
}
}
},
"/v1/block/GetNextBlocksmiths": {
"get": {
"tags": [
"BlocksmithService"
],
"operationId": "GetNextBlocksmiths",
"responses": {
"200": {
"description": "A successful response.",
"schema": {
"$ref": "#/definitions/modelGetNextBlocksmithsResponse"
}
}
}
}
},
"/v1/escrow/GetEscrowTransactionRequest": {
"get": {
"tags": [
Expand Down Expand Up @@ -1339,6 +1355,21 @@
}
}
},
"modelGetNextBlocksmithsResponse": {
"type": "object",
"properties": {
"Node": {
"type": "array",
"items": {
"$ref": "#/definitions/modelNode"
}
},
"SmithingTime": {
"type": "string",
"format": "int64"
}
}
},
"modelGetNodeHardwareResponse": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1572,6 +1603,10 @@
"type": "integer",
"format": "int64"
},
"Latest": {
"type": "boolean",
"format": "boolean"
},
"MinimumSignatures": {
"type": "integer",
"format": "int64"
Expand Down Expand Up @@ -2086,6 +2121,10 @@
"type": "string",
"format": "int64"
},
"MultisigChild": {
"type": "boolean",
"format": "boolean"
},
"RecipientAccountAddress": {
"type": "string"
},
Expand Down
12 changes: 8 additions & 4 deletions model/multiSignature.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ message MultiSignatureInfo {
repeated string Addresses = 3;
string MultisigAddress = 4;
uint32 BlockHeight = 5;
bool Latest = 6;
}

// represent the signature posted by account
Expand All @@ -23,14 +24,17 @@ message PendingSignature {
string AccountAddress = 2;
bytes Signature = 3;
uint32 BlockHeight = 4;
bool Latest = 5;
}

// represent transaction inside multisig body
message PendingTransaction {
bytes TransactionHash = 1;
bytes TransactionBytes = 2;
PendingTransactionStatus Status = 3;
uint32 BlockHeight = 4;
string SenderAddress = 1;
bytes TransactionHash = 2;
bytes TransactionBytes = 3;
PendingTransactionStatus Status = 4;
uint32 BlockHeight = 5;
bool Latest = 6;
}

enum PendingTransactionStatus {
Expand Down
27 changes: 14 additions & 13 deletions model/transaction.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,23 @@ message Transaction {
uint32 TransactionBodyLength = 11;
bytes TransactionBodyBytes = 12;
uint32 TransactionIndex = 13;
// TransactionBody
bool MultisigChild = 14;
// transactionbody
oneof TransactionBody {
EmptyTransactionBody emptyTransactionBody = 14;
SendMoneyTransactionBody sendMoneyTransactionBody = 15;
NodeRegistrationTransactionBody nodeRegistrationTransactionBody = 16;
UpdateNodeRegistrationTransactionBody updateNodeRegistrationTransactionBody = 17;
RemoveNodeRegistrationTransactionBody removeNodeRegistrationTransactionBody = 18;
ClaimNodeRegistrationTransactionBody claimNodeRegistrationTransactionBody = 19;
SetupAccountDatasetTransactionBody setupAccountDatasetTransactionBody = 20;
RemoveAccountDatasetTransactionBody removeAccountDatasetTransactionBody = 21;
ApprovalEscrowTransactionBody approvalEscrowTransactionBody = 22;
MultiSignatureTransactionBody multiSignatureTransactionBody = 23;
EmptyTransactionBody emptyTransactionBody = 15;
SendMoneyTransactionBody sendMoneyTransactionBody = 16;
NodeRegistrationTransactionBody nodeRegistrationTransactionBody = 17;
UpdateNodeRegistrationTransactionBody updateNodeRegistrationTransactionBody = 18;
RemoveNodeRegistrationTransactionBody removeNodeRegistrationTransactionBody = 19;
ClaimNodeRegistrationTransactionBody claimNodeRegistrationTransactionBody = 20;
SetupAccountDatasetTransactionBody setupAccountDatasetTransactionBody = 21;
RemoveAccountDatasetTransactionBody removeAccountDatasetTransactionBody = 22;
ApprovalEscrowTransactionBody approvalEscrowTransactionBody = 23;
MultiSignatureTransactionBody multiSignatureTransactionBody = 24;
}
bytes Signature = 24;
bytes Signature = 25;
// nullable
Escrow Escrow = 25;
Escrow Escrow = 26;
}

enum TransactionType {
Expand Down