Skip to content

395 skipped blocksmith #71

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
Nov 6, 2019
Merged

395 skipped blocksmith #71

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
182ec6f
zoobc/zoobc-core#305 add skipped blocksmith model
andy-shi88 Oct 31, 2019
9f0cba7
#395 update block height to use uint32
andy-shi88 Oct 31, 2019
76e7440
zoobc/zoobc-core#395 add skipped blocksmith to block extended info
andy-shi88 Nov 4, 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
41 changes: 27 additions & 14 deletions documentation.swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,12 @@
"type": "string",
"format": "int64"
},
"SkippedBlocksmiths": {
"type": "array",
"items": {
"$ref": "#/definitions/modelSkippedBlocksmith"
}
},
"TotalReceipts": {
"type": "string",
"format": "int64"
Expand Down Expand Up @@ -1452,6 +1458,27 @@
}
}
},
"modelSkippedBlocksmith": {
"type": "object",
"properties": {
"BlockHeight": {
"type": "integer",
"format": "int64"
},
"BlocksmithIndex": {
"type": "integer",
"format": "int32"
},
"BlocksmithPublicKey": {
"type": "string",
"format": "byte"
},
"POPChange": {
"type": "string",
"format": "int64"
}
}
},
"modelStorageInformation": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1618,19 +1645,5 @@
}
}
}
},
"x-stream-definitions": {
"modelGetNodeHardwareResponse": {
"properties": {
"error": {
"$ref": "#/definitions/runtimeStreamError"
},
"result": {
"$ref": "#/definitions/modelGetNodeHardwareResponse"
}
},
"title": "Stream result of modelGetNodeHardwareResponse",
"type": "object"
}
}
}
2 changes: 2 additions & 0 deletions model/block.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import "model/transaction.proto";
import "model/batchReceipt.proto";
import "model/receipt.proto";
import "model/publishedReceipt.proto";
import "model/skippedBlocksmith.proto";

// Block represent the block data structure stored in the database
message Block {
Expand Down Expand Up @@ -36,6 +37,7 @@ message BlockExtendedInfo {
int64 ReceiptValue = 3 [ jstype = JS_STRING ];
string BlocksmithAccountAddress = 4;
int64 PopChange = 5 [ jstype = JS_STRING ];
repeated SkippedBlocksmith SkippedBlocksmiths = 6;
}

// GetBlockRequest create request for single block
Expand Down
12 changes: 12 additions & 0 deletions model/skippedBlocksmith.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
syntax="proto3";

package model;

option go_package = "github.com/zoobc/zoobc-core/common/model";

message SkippedBlocksmith {
bytes BlocksmithPublicKey = 1;
int64 POPChange = 2 [jstype = JS_STRING];
uint32 BlockHeight = 3;
int32 BlocksmithIndex = 4;
}