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/dpos pbft bos upgrade: Bug fix & performance improvement; Add pbft_api_plugin #100

Merged
merged 26 commits into from
Jun 13, 2019
Merged

Feature/dpos pbft bos upgrade: Bug fix & performance improvement; Add pbft_api_plugin #100

merged 26 commits into from
Jun 13, 2019

Conversation

oldcold
Copy link

@oldcold oldcold commented Jun 13, 2019

Change Description

Consensus Changes

API Changes

Documentation Additions

VincentOCL and others added 26 commits May 14, 2019 18:58
@VincentOCL
fix potential crash when calculating integrity hash
a28493e
@VincentOCL
fix snapshot's container reading in different os.
8dad318
@VincentOCL
reformat snapshot sections; reformat getting block state in pbft_db.
37beebe
@oldcold
Merge branch 'develop' into feature/dpos-pbft-bos-upgrade
ec893e6
@VincentOCL
re-struct pbft message; compress pbft new view
1cc5e17
add new view primary check; add debug info during prepare (commit) in…
902177a 
…sertion.
@VincentOCL
optimise cal in should_recv_pbft_msg and should_send_pbft_msg; do…
cf75956 
… not send stable checkpoints higher than my lscb
@VincentOCL
generate pbft watermark from forkdb.
3c45326
generate pbft watermark from forkdb.
303c12d
@VincentOCL
Merge remote-tracking branch 'origin/feature/dpos-pbft-bos-upgrade' i…
0f63be7 
…nto feature/dpos-pbft-bos-upgrade

# Conflicts:
#	libraries/chain/fork_database.cpp
#	libraries/chain/pbft_database.cpp
@VincentOCL
add pbft_api_plugin
f475fa6
@VincentOCL
increase pbft message deadline
8a1c39c
@VincentOCL
increase new view message deadline; add prepared & my_prepare in pbft…
56110e0 
…_api_plugin
@VincentOCL
re-struct pbft message; compress pbft new view
7b241d5
@VincentOCL
fix bug in new view decompression.
3b7068b
@VincentOCL
Merge remote-tracking branch 'origin/feature/dpos-pbft-bos-upgrade-sl…
601c8c6 
…im' into feature/dpos-pbft-bos-upgrade-slim

# Conflicts:
#	libraries/chain/controller.cpp
#	libraries/chain/include/eosio/chain/pbft_database.hpp
#	libraries/chain/pbft_database.cpp
#	plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
#	plugins/net_plugin/net_plugin.cpp
optimise scp sync; move upo creation into update_pbft_status;
fd444d2
@VincentOCL
fix bug in loading old version snapshots.
a63265f
@VincentOCL
add message_type in pbft messages; refactor code.
45ad108
@VincentOCL
Merge branch 'feature/dpos-pbft-bos-upgrade-slim' into feature/dpos-p…
dde4c39 
…bft-bos-upgrade
@VincentOCL
remove pbft controller config; fix net layer bugs.
7c9404e
@VincentOCL
bug fix: view change certs generation;
74bde5c
@VincentOCL
retry sending all pending checkpoints;
2ffcf15
check all prepares (commits) fall on the same fork during generating …
299f82f 
…prepared cert (committed cert)
@VincentOCL
add pre_prepares in prepared_cert, requesting missing blocks upon vie…
01775ea 
…w change.
@VincentOCL
bug fix: reset view change state cache properly.
a3d05a0
@Thaipanda Thaipanda merged commit 3dd5850 into boscore:release/3.0.x Jun 13, 2019
vlbos
vlbos reviewed Jun 13, 2019
View reviewed changes
libraries/chain/include/eosio/chain/pbft.hpp
psm_machine state_machine;
pbft_config config;
pbft_database pbft_db;
std::shared_ptr<class psm_machine> state_machine;
Copy link

@vlbos vlbos Jun 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::shared_ptr不需要class 吧？

vlbos
vlbos reviewed Jun 13, 2019
View reviewed changes
plugins/pbft_plugin/include/eosio/pbft_plugin/pbft_plugin.hpp
APPBASE_PLUGIN_REQUIRES()
virtual void set_program_options(options_description&, options_description& cfg) override;

void plugin_initialize(const variables_map& options);
void plugin_startup();
void plugin_shutdown();
static void plugin_shutdown();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

static void plugin_shutdown();应该加static 吗？其他都没有

This was referenced Jun 14, 2019
Merged
Merged
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

@vlbos vlbos vlbos left review comments

@vonhenry vonhenry vonhenry approved these changes

@Thaipanda Thaipanda Thaipanda approved these changes

@vchengsong vchengsong Awaiting requested review from vchengsong

@qianxiaofeng qianxiaofeng Awaiting requested review from qianxiaofeng

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@oldcold @vonhenry @Thaipanda @vlbos @VincentOCL