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

fix batch-pbft overload & forks issue #102

Merged
merged 216 commits into from
Jun 28, 2019
Merged

fix batch-pbft overload & forks issue #102

merged 216 commits into from
Jun 28, 2019

Conversation

Thaipanda
Copy link

@Thaipanda Thaipanda commented Jun 14, 2019 •
edited
Loading

#98 Feature/dpos pbft bos upgrade: fix snapshot compatibility; add pbft_api plugin; fix bugs
#100 Feature/dpos pbft bos upgrade: Bug fix & performance improvement; Add pbft_api_plugin
#101 Feature/dpos pbft bos upgrade: bug fix
#107 Fix free & malloc bug; fix fullnode apply view change error; fix CPU overload caused by socket exception

VincentOCL and others added 30 commits March 19, 2019 16:22
@VincentOCL
resolve conflicts of net message sending, enqueue pbft msgs into sync…
1e95f15 
… queue.
@VincentOCL
merge pbft feature into bos, resolve conflicts in block extension usage
c20cee9
@VincentOCL
fix merge error in get_table_tests
7bda6a3
@qianxiaofeng
txn plugin now use system newaccount to create account and support cu…
22acbf9 
…stom core_symbol
@qianxiaofeng
don't stop if push transaction failed
a1ee007
@qianxiaofeng
don't stop if push transaction failed
cb89b32 
disconnect all conn then re-connect
@VincentOCL
bug fix: cannot find block, use block state ptr to mark pbft prepare …
037dbb6 
…(my prepare) fork.
@qianxiaofeng
Merge branch 'feature/dpos-pbft-bos-v2.0.2' into feature/bos-dpos-pbf…
f564829 
…t-tps
@VincentOCL
clear prepared (my prepare) id when it becomes invalid.
5679479
@VincentOCL
init commit for upgrade solution
1977fc0
@qianxiaofeng
add migration function, hack load function for forkdb.dat
1ec967e
@VincentOCL
hardcoded consensus upgrade at 1000.
55fcd20
@VincentOCL
disable proposed schedule promotion during upgrading
0493444
@VincentOCL
add system contract support
8b737cc
@VincentOCL
add upo assertion, target block num must be at least 100 more than cu…
35ce2cf 
…rrent head.
@VincentOCL
some code reformat
2e96766
@VincentOCL
add newly built system contract to contracts/eosio.system folder
d424438
@VincentOCL
add pbft_plugin as default plugins
458be93
@VincentOCL
revert eosio.system contract; upgrade version can be found from a for…
dab790e 
…ked repo.
@qianxiaofeng
txn plugin now use system newaccount to create account and support cu…
5d90ba1 
…stom core_symbol
@qianxiaofeng
Merge branch 'feature/dpos-pbft-bos-upgrade' into test_bos_master
1d02e6f 
# Conflicts:
#	README.md
#	libraries/chain/controller.cpp
#	plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
#	plugins/net_plugin/net_plugin.cpp
#	programs/cleos/main.cpp
@qianxiaofeng
try to fix gpo propose block num inconsistent bug
434385f
@qianxiaofeng
solve consensus chosen conflict when upgrade
e61b533
Merge remote-tracking branch 'origin/feature/dpos-pbft-bos-upgrade' i…
28605a3 
…nto feature/dpos-pbft-bos-upgrade
@qianxiaofeng
bug fix: shouldn't print upgrade log when chain is fresh started
4ab5c0f
Merge remote-tracking branch 'origin/feature/dpos-pbft-bos-upgrade' i…
6d68dc3 
…nto feature/dpos-pbft-bos-upgrade
@VincentOCL
reject target setting when it is upgrading or has just upgraded.
2d60f58
@VincentOCL
add new view related log.
83427a1
@VincentOCL
add new view sending related log.
c9cfa3e
@VincentOCL
add new view transition raw bytes.
387d55a
vonhenry
vonhenry previously approved these changes Jun 14, 2019
View reviewed changes
oldcold and others added 14 commits June 15, 2019 14:04
fix pbft testcases
a6e0e6d
stay at view change state when there is no valid stable checkpoint
f8d517b
@Thaipanda
Merge pull request #105 from eosiosg/feature/dpos-pbft-bos-upgrade
16c2e27 
fix pbft testcases
merge eos v1.6.6
52208ea
@Thaipanda
Merge pull request #106 from eosiosg/feature/dpos-pbft-bos-upgrade
4666ad6 
merge eos v1.6.6
@Thaipanda
adjust the EOSIO version
a043e54
@VincentOCL
optimise pbft message body
68c4886
@VincentOCL
optimise stable checkpoints sync
f652819
optimise stable checkpoints sync, based on bos-v0.11.0
fe0a4ae
bug fix: checkpoints db prune.
9d5d835
@VincentOCL
prune all blocks which are below current lscb in fork_db
0e2cbc1
@VincentOCL
add socket opening check during start_read_message
6334a0c
fix for compatibility.
73ca674
@Thaipanda
Merge pull request #107 from eosiosg/feature/dpos-pbft-bos-upgrade
9354e34 
Feature/dpos pbft bos upgrade: bug fixes & performance improvements
@Thaipanda Thaipanda closed this Jun 28, 2019
@Thaipanda Thaipanda reopened this Jun 28, 2019
@vlbos vlbos merged commit 3252a14 into master Jun 28, 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

@BOS-boscore BOS-boscore BOS-boscore approved these changes

@vonhenry vonhenry vonhenry approved these changes

@qianxiaofeng qianxiaofeng Awaiting requested review from qianxiaofeng

@vchengsong vchengsong Awaiting requested review from vchengsong

@vlbos vlbos Awaiting requested review from vlbos

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

Successfully merging this pull request may close these issues.