Skip to content
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

Jump to bottom

Feature/bos dpos pbft #33

Merged
merged 114 commits into from
Jan 11, 2019
Merged

Feature/bos dpos pbft #33

merged 114 commits into from
Jan 11, 2019

Conversation

Vardhamana
Copy link

Change Description
reduce the gap between HEAD and LIB

Consensus Changes

change to PBFT

API Changes

Documentation Additions

Design Document (中文)

Design Document (English)

Test and Deployment

qianxiaofeng and others added 30 commits December 4, 2018 14:27
@qianxiaofeng
dpos pbft
13ba0a3
@qianxiaofeng
merge bos develop and resolve conflict
e3a5548
@VincentOCL
bug fix: ignore empty certificate on view change validation
4b07cbf
@qianxiaofeng
Merge branch 'feature/dpos-pbft' into feature/bos-dpos-pbft
1739686
@VincentOCL
bug fix: force switch to new schedule when there is new schedule in p…
a92589f 
…ending; remove unnecessary logs.
@qianxiaofeng
Merge branch 'feature/dpos-pbft' into feature/bos-dpos-pbft
de5b3de
@VincentOCL
open view change related logs.
c60b4d7
@VincentOCL
separate checkpoint db from pbft state
4fc0b6a
@VincentOCL
update certificate validations.
93f7899
@VincentOCL
add logs for large scale debug.
5496207
@VincentOCL
bug fix: generate prepare (commit) certificates with valid prepare (c…
a1e568b 
…ommits) msgs
@VincentOCL
turn on view change related logs for testing.
b1f7367
@VincentOCL
extend waiting time on BP schedule change.
897365a
Merge remote-tracking branch 'origin/debug' into feature/dpos-pbft
9e23af3 
# Conflicts:
#	libraries/chain/pbft.cpp
#	plugins/chain_plugin/chain_plugin.cpp
separate checkpoint db from state db; remove dpos confirm related logic.
63e5ddd
@VincentOCL
move checkpoints dir into blocks dir; open more logs for debug.
c67fcb8
@VincentOCL
no longer persist target view (default value will be current view +1)…
fcd959b 
…; open more logs for debug.
@VincentOCL
bug fix: avoid fetching empty block state.
a1f7f59
@VincentOCL
open prepare-adding related logs
1a7f6b4
@VincentOCL
bug fix: inappropriate comparision may lead to crash during sorting.
6cb6d07
@VincentOCL
force activate schedule once gpo is set.
6f6c135
@VincentOCL
remove unnecessary logs.
2fbb45c
@VincentOCL
force all bps, who belong to any schedule in fork db blocks, sending …
9a9761a 
…pbft related msgs. bug fix: cannot load empty pbft index upon restart.
@VincentOCL
bp candidates are involved in pbft consensus.
cde9086
@VincentOCL
bug fix: proposed new view should be strictly equal to view changed c…
919dfbc 
…ert.
@VincentOCL
open new_view related logs.
42d467f
force new view check, even if I am the primary.
3c4ba8d
bug fix: calculate primary key
6027d47
@VincentOCL
extend view change timeout to 8 sec.
a209a85
@VincentOCL
skip view change validation for test.
73da364
qianxiaofeng and others added 28 commits January 3, 2019 19:27
@qianxiaofeng
clear outqueue when close conn
7185786
@qianxiaofeng
Merge branch 'feature/dpos-pbft-fix-network-issue-with-log' into feat…
d5aa7ef 
…ure/dpos-pbft

# Conflicts:
#	plugins/net_plugin/net_plugin.cpp
#	plugins/pbft_plugin/pbft_plugin.cpp
@qianxiaofeng
resolve conflict
d6908de
do not bcast pbft msgs if I am not in sync; only bcast (forward) to c…
4d0dcc0 
…urrent connections; force send checkpoints upon committed local; clean view change cache upon new state; bug fix: cal pending stable checkpoint via block info (instead of num)
@qianxiaofeng
add timeout when conn is doing connecting
5591039
@qianxiaofeng
clean up do_queue_write
f0907f2
@VincentOCL
increase checkpoint interval to 100; increase block production sleep …
088bf07 
…time to 100ms.
@VincentOCL
Merge branch 'feature/dpos-pbft-fix-network-issue-with-log' into feat…
520b68a 
…ure/dpos-pbft
skip switch fork if is pbft prepared, to ensure invariance
71c6173
@qianxiaofeng
add pbft test
f91e205
@VincentOCL
add pbft_supported into block_state, ensure prepared fork is current …
737d57b 
…chain.
@VincentOCL
bug fix: set prepared block as pbft_supported
3656c27
@qianxiaofeng
Merge remote-tracking branch 'origin/feature/dpos-pbft-fix-fork-issue…
3ffcac3 
…' into feature/dpos-pbft
@qianxiaofeng
Merge branch 'develop' into feature/bos-dpos-pbft
6fa1483
@qianxiaofeng
resolve conflict
54cf928
@VincentOCL
bug fix: set my prepare block as supported fork.
2687db2
@VincentOCL
correct conditions for prepare reserve; fix typo
02c5e44
@VincentOCL
add prepared and my prepare priority to fork_db, to ensure fork_db he…
75ebe7c 
…ad falls on the fork that the majority is prepared or that I used to prepare
@qianxiaofeng
add log
8963611
@VincentOCL
bug fix: add all prepared cert info pbft db, to ensure consistency
8f78be9
@VincentOCL
Merge remote-tracking branch 'origin/feature/dpos-pbft-fix-fork-issue…
5baf6ab 
…' into feature/dpos-pbft-fix-fork-issue
@VincentOCL
clear pbft state during transit to new view
6bf336d
@VincentOCL
prevent sending and receiving pbft msgs during syncing; reformat logs;
94ab297
@VincentOCL
Merge branch 'feature/dpos-pbft-fix-fork-issue' into feature/dpos-pbft
8959c2c
@VincentOCL
switch connection stats monitor to debug level
584ee59
@qianxiaofeng
Merge branch 'feature/dpos-pbft' into feature/bos-dpos-pbft
ac46164
@VincentOCL
correct my prepare mark; remove unnecessary methods; change log level…
a6e5fad 
… to debug in net plugin
@qianxiaofeng
Merge remote-tracking branch 'origin/feature/dpos-pbft' into feature/…
db7466b 
…bos-dpos-pbft
@Vardhamana Vardhamana merged commit f8a5b33 into boscore:feature/bos-dpos-pbft Jan 11, 2019
vlbos pushed a commit to vlbos/bos that referenced this pull request Sep 18, 2019
# This is a combination of 186 commits.
6c09577 
# This is the 1st commit message:

various improvements

# This is the commit message #2:

new hash

# This is the commit message #3:

fix for script path

# This is the commit message #4:

fixes

# This is the commit message #5:

fixes

# This is the commit message #6:

fixes

# This is the commit message #7:

fixes

# This is the commit message #8:

fixes

# This is the commit message #9:

fixes

# This is the commit message #10:

fixes

# This is the commit message boscore#11:

fixes

# This is the commit message boscore#12:

fixes

# This is the commit message boscore#13:

fixes

# This is the commit message boscore#14:

fixes

# This is the commit message boscore#15:

fixes

# This is the commit message boscore#16:

fixes

# This is the commit message boscore#17:

fixes

# This is the commit message boscore#18:

fixes

# This is the commit message boscore#19:

fixes

# This is the commit message boscore#20:

fixes

# This is the commit message boscore#21:

fixes

# This is the commit message boscore#22:

fixes

# This is the commit message boscore#23:

fixes

# This is the commit message boscore#24:

fixes

# This is the commit message boscore#25:

fixes

# This is the commit message boscore#26:

testing

# This is the commit message boscore#27:

testing

# This is the commit message boscore#28:

testing

# This is the commit message boscore#29:

testing

# This is the commit message boscore#30:

testing

# This is the commit message boscore#31:

testing

# This is the commit message boscore#32:

testing

# This is the commit message boscore#33:

testing

# This is the commit message boscore#34:

testing

# This is the commit message boscore#35:

testing

# This is the commit message boscore#36:

testing

# This is the commit message boscore#37:

testing

# This is the commit message boscore#38:

testing

# This is the commit message boscore#39:

testing

# This is the commit message boscore#40:

testing

# This is the commit message boscore#41:

testing

# This is the commit message boscore#42:

testing

# This is the commit message boscore#43:

testing

# This is the commit message boscore#44:

fixes

# This is the commit message boscore#45:

fixes

# This is the commit message boscore#46:

fixes

# This is the commit message boscore#47:

fixes

# This is the commit message boscore#48:

fixes

# This is the commit message boscore#49:

fixes

# This is the commit message boscore#50:

fixes

# This is the commit message boscore#51:

fixes

# This is the commit message boscore#52:

fixes

# This is the commit message boscore#53:

fixes

# This is the commit message boscore#54:

fixes

# This is the commit message boscore#55:

fixes

# This is the commit message boscore#56:

fixes

# This is the commit message boscore#57:

fixes

# This is the commit message boscore#58:

fixes

# This is the commit message boscore#59:

fixes

# This is the commit message boscore#60:

fixes

# This is the commit message boscore#61:

fixes

# This is the commit message boscore#62:

fixes

# This is the commit message boscore#63:

fixes

# This is the commit message boscore#64:

fixes

# This is the commit message boscore#65:

fixes

# This is the commit message boscore#66:

fixes

# This is the commit message boscore#67:

fixes

# This is the commit message boscore#68:

fixes

# This is the commit message boscore#69:

fixes

# This is the commit message boscore#70:

fixes

# This is the commit message boscore#71:

fixes

# This is the commit message boscore#72:

fixes

# This is the commit message boscore#73:

fixes

# This is the commit message boscore#74:

fixes

# This is the commit message boscore#75:

fixes

# This is the commit message boscore#76:

fixes

# This is the commit message boscore#77:

fixes

# This is the commit message boscore#78:

fixes

# This is the commit message boscore#79:

more testing

# This is the commit message boscore#80:

testing

# This is the commit message boscore#81:

fixes

# This is the commit message boscore#82:

fixes

# This is the commit message boscore#83:

fixes

# This is the commit message boscore#84:

fixes

# This is the commit message boscore#85:

fixes

# This is the commit message boscore#86:

fixes

# This is the commit message boscore#87:

fixes

# This is the commit message boscore#88:

fixes

# This is the commit message boscore#89:

fixes

# This is the commit message boscore#90:

fixes

# This is the commit message boscore#91:

fixes

# This is the commit message boscore#92:

fixes

# This is the commit message boscore#93:

propagate-environment for buildkite-agent

# This is the commit message boscore#94:

propagate-environment for buildkite-agent

# This is the commit message boscore#95:

propagate-environment for buildkite-agent

# This is the commit message boscore#96:

propagate-environment for buildkite-agent

# This is the commit message boscore#97:

fixes

# This is the commit message boscore#98:

fixes

# This is the commit message boscore#99:

fixes

# This is the commit message boscore#100:

fixes

# This is the commit message boscore#101:

fixes

# This is the commit message boscore#102:

fixes

# This is the commit message boscore#103:

fixes

# This is the commit message boscore#104:

fixes

# This is the commit message boscore#105:

fixes

# This is the commit message boscore#106:

fixes

# This is the commit message boscore#107:

fixes

# This is the commit message boscore#108:

fixes

# This is the commit message boscore#109:

fixes

# This is the commit message boscore#110:

fixes

# This is the commit message boscore#111:

fixes

# This is the commit message boscore#112:

fixes

# This is the commit message boscore#113:

fixes

# This is the commit message boscore#114:

fixes

# This is the commit message boscore#115:

fixes

# This is the commit message boscore#116:

fixes

# This is the commit message boscore#117:

fixes

# This is the commit message boscore#118:

fixes

# This is the commit message boscore#119:

fixes

# This is the commit message boscore#120:

fixes

# This is the commit message boscore#121:

fixes

# This is the commit message boscore#122:

fixes

# This is the commit message boscore#123:

fixes

# This is the commit message boscore#124:

fixes

# This is the commit message boscore#125:

fixes

# This is the commit message boscore#126:

fixes

# This is the commit message boscore#127:

fixes

# This is the commit message boscore#128:

fixes

# This is the commit message boscore#129:

fixes

# This is the commit message boscore#130:

fixes

# This is the commit message boscore#131:

fixes

# This is the commit message boscore#132:

fixes

# This is the commit message boscore#133:

fixes

# This is the commit message boscore#134:

fixes

# This is the commit message boscore#135:

fixes

# This is the commit message boscore#136:

fixes

# This is the commit message boscore#137:

fixes

# This is the commit message boscore#138:

fixes

# This is the commit message boscore#139:

fixes

# This is the commit message boscore#140:

fixes

# This is the commit message boscore#141:

fixes

# This is the commit message boscore#142:

fixes

# This is the commit message boscore#143:

fixes

# This is the commit message boscore#144:

fixes

# This is the commit message boscore#145:

fixes

# This is the commit message boscore#146:

fixes

# This is the commit message boscore#147:

fixes

# This is the commit message boscore#148:

fixes

# This is the commit message boscore#149:

fixes

# This is the commit message boscore#150:

fixes

# This is the commit message boscore#151:

fixes

# This is the commit message boscore#152:

fixes

# This is the commit message boscore#153:

testing

# This is the commit message boscore#154:

fixes

# This is the commit message boscore#155:

fixes

# This is the commit message boscore#156:

fixes

# This is the commit message boscore#157:

fixes

# This is the commit message boscore#158:

fixes

# This is the commit message boscore#159:

fixes

# This is the commit message boscore#160:

fixes

# This is the commit message boscore#161:

fixes

# This is the commit message boscore#162:

fixes

# This is the commit message boscore#163:

fixes

# This is the commit message boscore#164:

fixes

# This is the commit message boscore#165:

fixes

# This is the commit message boscore#166:

fixes

# This is the commit message boscore#167:

fixes

# This is the commit message boscore#168:

fixes

# This is the commit message boscore#169:

fixes

# This is the commit message boscore#170:

fixes

# This is the commit message boscore#171:

fixes

# This is the commit message boscore#172:

fixes

# This is the commit message boscore#173:

fixes

# This is the commit message boscore#174:

fixes

# This is the commit message boscore#175:

fixes

# This is the commit message boscore#176:

fixes

# This is the commit message boscore#177:

fixes

# This is the commit message boscore#178:

fixes

# This is the commit message boscore#179:

fixes

# This is the commit message EOSIO#180:

fixes

# This is the commit message EOSIO#181:

fixes

# This is the commit message EOSIO#182:

fixes

# This is the commit message EOSIO#183:

fixes

# This is the commit message EOSIO#184:

fixes

# This is the commit message EOSIO#185:

fixes

# This is the commit message EOSIO#186:

fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Vardhamana @qianxiaofeng @VincentOCL