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

perpare to release the batch-pbft version #88

Merged
merged 80 commits into from
Apr 30, 2019
Merged

perpare to release the batch-pbft version #88

merged 80 commits into from
Apr 30, 2019

Conversation

Thaipanda
Copy link

No description provided.

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
VincentOCL and others added 28 commits April 23, 2019 16:42
@VincentOCL
bug fix: itr bug during removing marks
c8092f7
@qianxiaofeng
Merge branch 'feature/dpos-pbft-bos-upgrade' into feature/dpos-pbft-b…
5093652 
…os-upgrade-tps
@qianxiaofeng
Merge branch 'feature/dpos-pbft-bos-upgrade' into feature/dpos-pbft-b…
c5bea21 
…os-upgrade-merged-develop
@qianxiaofeng
fix unit_test
06aa979
@VincentOCL
Merge remote-tracking branch 'remotes/origin/feature/dpos-pbft-bos-up…
3b48e8e 
…grade-merged' into feature/dpos-pbft-bos-upgrade
@VincentOCL
add prepare watermarks
9f1e648
@VincentOCL
bug fix: only request checkpoints in new version
de03c3d
@VincentOCL
resolve inconsistency in is_upgrading calculation.
ef0ccfa
@VincentOCL
bug fix: return empty if upgrade target block equals to default.
1231a2b
@VincentOCL
bug fix: compare schedule between pending checkpoint & lscb (instead …
4a637f6 
…of lib).
@VincentOCL
bug fix: modified the start of new version
8f305f5
@VincentOCL
bug fix: add null ptr check during fetching scp from blk extn.
9f44c2e
@VincentOCL
add upgrade related log.
d9c9a54
@qianxiaofeng
migration support for snapshot
d1a9009
@qianxiaofeng
Merge branch 'feature/dpos-pbft-bos-upgrade' of https://github.com/eo…
b4bdc9e 
…siosg/eos into feature/dpos-pbft-bos-upgrade
@VincentOCL
upgrade log formatted
66e7de2
@VincentOCL
change type of ucb in upo.
b85b91e
@qianxiaofeng
bugfix: snapshot migration prefer vector<char> to string
4c24d23
@VincentOCL
add new version debug log
630154a
@VincentOCL
mark fork_db regardless of the version; new version now is when head …
0490bff 
…greater than ucb (not including).
@qianxiaofeng
add more log , to be revert soon
be6c4f5
@VincentOCL
bug fix: force generate upo if not found.
bff6990
@qianxiaofeng
fix unit test
4eebe6a
@qianxiaofeng
Merge remote-tracking branch 'origin/feature/dpos-pbft-bos-upgrade' i…
ee63bfa 
…nto feature/dpos-pbft-bos-upgrade
@VincentOCL
remove debug log; reformat new view validation; revert txn_test_gen_p…
9f0cde3 
…lugin to the original.
@VincentOCL
Merge remote-tracking branch 'origin/feature/dpos-pbft-bos-upgrade' i…
cd99520 
…nto feature/dpos-pbft-bos-upgrade
@qianxiaofeng
Merge branch 'develop' into feature/dpos-pbft-bos-upgrade
57e14e4
@Thaipanda
Merge pull request #87 from eosiosg/feature/dpos-pbft-bos-upgrade
d3e4f5f 
Feature/dpos pbft bos upgrade
@Thaipanda Thaipanda merged commit f235892 into release/3.0.x Apr 30, 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
@Thaipanda @VincentOCL @qianxiaofeng