Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Updated signature and heightPrevious / heightPrevoted with support old implementation - Closes #3558, #3556 #3722

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a3d45aa
Solve merge conflicts development
michielmulders Jun 4, 2019
534414a
Working implementation for bft modifications
michielmulders Jun 5, 2019
2280b3e
Modify block version for switching
michielmulders Jun 6, 2019
75b1b07
Add tests block_version
michielmulders Jun 7, 2019
dd2282a
Update tests blocks/block.js
michielmulders Jun 11, 2019
5a74c37
Finish tests for create block
michielmulders Jun 12, 2019
ad9678a
Solve merge conflicts
michielmulders Jun 12, 2019
5508bca
Insert exceptions and modify tests accordingly for block and block_ve…
michielmulders Jun 13, 2019
5e9911a
Add filter for heightPrevoted and previous - change order getBytes
michielmulders Jun 13, 2019
e546e03
Split blockV1 and blockV2
michielmulders Jun 13, 2019
e631389
Modify block tests with correct version
michielmulders Jun 13, 2019
3bbdc78
Fix all blocks related tests
michielmulders Jun 13, 2019
fa1bb69
Remove context usage block creation
michielmulders Jun 14, 2019
220e956
Merge branch 'feature/introduce_bft_consensus' into 3556-height-previ…
michielmulders Jun 17, 2019
31576a9
Fix naming conventions files and interface
michielmulders Jun 17, 2019
b365813
Import explicit lodash functions
michielmulders Jun 17, 2019
002c63e
Alter check block version to be more efficient
michielmulders Jun 17, 2019
e94072f
Modify interface for other block functions
michielmulders Jun 17, 2019
6073d0f
Fix test integration
michielmulders Jun 17, 2019
56b5fad
Add improved switching logic
michielmulders Jun 17, 2019
2b8d2b4
Solve merge conflicts
michielmulders Jun 19, 2019
770fae3
Fixed integration tests and modified block fixture
michielmulders Jun 19, 2019
4812916
Cleanup code based on feedback
michielmulders Jun 20, 2019
f8d093e
Fixed bug stubbing currentBlockVersion
michielmulders Jun 20, 2019
1f30cb1
Fixed bug stubbing currentBlockVersion
michielmulders Jun 20, 2019
cd949e8
Blocks test values null to 0
michielmulders Jun 20, 2019
aa97504
Fix failing integration test signature invalid
michielmulders Jun 21, 2019
3c485ba
Solve merge conflicts
michielmulders Jun 24, 2019
b9bef84
Fix unit block_v2 stub and lisk-validator
michielmulders Jun 24, 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
8 changes: 8 additions & 0 deletions framework/src/components/storage/entities/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const sqlFiles = {
* @property {string} generatorPublicKey
* @property {string} blockSignature
* @property {number} height
* @property {number} maxHeightPreviouslyForged
* @property {number} prevotedConfirmedUptoHeight
* @property {string} totalFee
* @property {string} reward
* @property {number} payloadLength
Expand Down Expand Up @@ -167,6 +169,12 @@ class Block extends BaseEntity {
this.addField('rowId', 'number');
this.addField('id', 'string', { filter: filterType.TEXT });
this.addField('height', 'number', { filter: filterType.NUMBER });
this.addField('maxHeightPreviouslyForged', 'number', {
filter: filterType.NUMBER,
});
this.addField('prevotedConfirmedUptoHeight', 'number', {
filter: filterType.NUMBER,
});
this.addField(
'blockSignature',
'string',
Expand Down
2 changes: 2 additions & 0 deletions framework/src/components/storage/sql/blocks/get.sql
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ SELECT
"totalFee",
"reward",
"payloadLength",
"maxHeightPreviouslyForged",
"prevotedConfirmedUptoHeight",
"previousBlock" as "previousBlockId",
"numberOfTransactions",
"totalAmount",
Expand Down
Loading