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

Merge from Mainnet-1.6.2 #121

Closed
wants to merge 50 commits into from
Closed

Merge from Mainnet-1.6.2 #121

wants to merge 50 commits into from

Conversation

jchung00
Copy link
Member

No description provided.

kesar and others added 30 commits June 3, 2018 13:45
@kesar
ricardian contracts added
03080ae
@kesar
Update core_symbol.hpp
5f964d4
@kesar
contracts updated
af9ecd7
@kesar
Merge branch 'launch-rc' of github.com:EOS-Mainnet/eos into launch-rc
1a27ee3
@DenisCarriere
Sync Gov - Rolls back change to article IX
ea36983 
Ref: EOS-Mainnet/governance#15
@DenisCarriere
Merge pull request #28 from EOS-Mainnet/article-9-icc-to-ecaf
dbd5c74 
Sync ABI from Gov repo - Rolls back change to article IX
@nsjames
merge rc
967cd60
@DenisCarriere
Update eosio.system.abi
ee33a90
@DenisCarriere
Merge pull request #29 from EOS-Mainnet/update-ABI-1.0.2
1c560d2 
Update eosio.system ABI from v1.0.2
@winlin
finish the delegated_bandwidth->self_delegated_bandwidth
63f6a87
@jchung00
Merge pull request #31 from EOSBIXIN/dev-1.0.2
2d44208 
finish the delegated_bandwidth->self_delegated_bandwidth
@jchung00
Revert "finish the delegated_bandwidth->self_delegated_bandwidth"
2e59862
@jchung00
Merge pull request #33 from EOS-Mainnet/revert-31-dev-1.0.2
22957cb 
Revert "finish the delegated_bandwidth->self_delegated_bandwidth"
@jchung00
Update chain_plugin.cpp
b16df8d
@jchung00
Merge pull request #34 from jchung00/launch-rc-1.0.2
db57080 
cleos fix for get account bug
@HuweyII
Create BP_Instructions.md
6058a43
@HuweyII
Add files via upload
7b2ec4c
@HuweyII
Update BP_Instructions.md
28af326
@jemxpat
Merge pull request #35 from cypherglassdotcom/launch-rc-1.0.2
0319191 
Instructions for BP's (minimal info needed) and genesis
@nsjames
Merge branch 'launch-rc-1.0.2' into mainnet-1.0.3
4b476ec
@nsjames
merged with mainnet-1.0.3
f5cc093
@nsjames
Merge tag 'mainnet-1.0.4' into mainnet-1.0.5
db03136
@nsjames
Merge tag 'mainnet-1.0.5' into mainnet-1.0.6
aa35173
@jchung00
Merge pull request #42 from EOS-Mainnet/mainnet-1.0.6
b195012 
Merge tag `mainnet-1.0.6` into mainnet-1.0.7
@jchung00
Merge pull request #44 from EOS-Mainnet/mainnet-1.0.7
6ee3020 
Merge from mainnet-1.0.7
@jchung00
Merge pull request #49 from EOS-Mainnet/mainnet-1.0.8
bd0f22c 
Merge with mainnet-1.0.8
@jchung00
Merge pull request #53 from EOS-Mainnet/mainnet-1.0.9
60947c0 
Mainnet 1.0.9
@jchung00
Merge pull request #56 from EOS-Mainnet/mainnet-1.0.10
980721a 
Merge mainnet-1.0.10
@jchung00
Merge pull request #59 from EOS-Mainnet/mainnet-1.1.0
8777d8d 
Pull from mainnet-1.1.0
@jchung00
Merge pull request #63 from EOS-Mainnet/mainnet-1.1.1
4fd3fd6 
Merge from mainnet-1.1.1
@jchung00
Merge pull request #64 from EOS-Mainnet/mainnet-1.1.2
742618b 
Merge from mainnet-1.1.2
@jchung00
Merge pull request #70 from EOS-Mainnet/mainnet-1.1.3
2d3bb00 
Merge from mainnet-1.1.3
@jchung00
Merge pull request #72 from EOS-Mainnet/mainnet-1.1.4
d9d0e25 
Merge from Mainnet 1.1.4
@jchung00
Merge pull request #73 from EOS-Mainnet/mainnet-1.1.5
b8c1b2c 
Merge from Mainnet 1.1.5
@jchung00
Merge pull request #76 from EOS-Mainnet/mainnet-1.1.6
d19e1f7 
Merge from Mainnet 1.1.6
@jchung00
Merge pull request #77 from EOS-Mainnet/master
cb3645a 
sync appbase
@jchung00
Merge pull request #81 from EOS-Mainnet/mainnet-1.2.3
84ff00e 
Merge from mainnet-1.2.3
@jchung00
Merge pull request #82 from EOS-Mainnet/mainnet-1.2.4
f0a2572 
Merge from mainnet-1.2.4
@jchung00
Merge pull request #85 from EOS-Mainnet/mainnet-1.2.5
ced7ec6 
Merge from mainnet-1.2.5
@jchung00
Merge pull request #87 from EOS-Mainnet/master
c71d224 
Sync lib
@jchung00
Merge pull request #89 from EOS-Mainnet/mainnet-1.3.0
f2f238b 
Pull from mainnet-1.3.0
@jchung00
Merge pull request #92 from EOS-Mainnet/mainnet-1.3.1
9e62e73 
Merge from Mainnet-1.3.1
@jchung00
Merge pull request #96 from EOS-Mainnet/mainnet-1.3.2
99d9444 
Merge from Mainnet-1.3.2
@jchung00
Merge pull request #99 from EOS-Mainnet/mainnet-1.4.1
43a6b9f 
Merge from Mainnet-1.4.1
@jchung00
Merge pull request #101 from EOS-Mainnet/mainnet-1.4.2
17083dc 
Merge from Mainnet-1.4.2
@jchung00
Merge pull request #104 from EOS-Mainnet/mainnet-1.4.3
2fc5d1c 
Merge from Mainnet-1.4.3
@jchung00
Merge pull request #106 from EOS-Mainnet/mainnet-1.5.0
b312faa 
Merge from Mainnet-1.5.0
@jchung00
Merge pull request #111 from EOS-Mainnet/mainnet-1.5.1
9cc225b 
Merge from Mainnet-1.5.1
@jchung00
Merge pull request #114 from EOS-Mainnet/mainnet-1.6.0
0051615 
Merge from Mainnet-1.6.0
@jchung00
Merge pull request #116 from EOS-Mainnet/mainnet-1.6.1
2dc8d33 
Merge from Mainnet-1.6.1
@jchung00 jchung00 closed this Jul 1, 2019
pnx pushed a commit to eosswedenorg/eos that referenced this pull request Sep 27, 2019
# This is a combination of 186 commits.
6c09577 
# This is the 1st commit message:

various improvements

# This is the commit message EOS-Mainnet#2:

new hash

# This is the commit message EOS-Mainnet#3:

fix for script path

# This is the commit message EOS-Mainnet#4:

fixes

# This is the commit message EOS-Mainnet#5:

fixes

# This is the commit message EOS-Mainnet#6:

fixes

# This is the commit message EOS-Mainnet#7:

fixes

# This is the commit message EOS-Mainnet#8:

fixes

# This is the commit message EOS-Mainnet#9:

fixes

# This is the commit message EOS-Mainnet#10:

fixes

# This is the commit message EOS-Mainnet#11:

fixes

# This is the commit message EOS-Mainnet#12:

fixes

# This is the commit message EOS-Mainnet#13:

fixes

# This is the commit message EOS-Mainnet#14:

fixes

# This is the commit message EOS-Mainnet#15:

fixes

# This is the commit message EOS-Mainnet#16:

fixes

# This is the commit message EOS-Mainnet#17:

fixes

# This is the commit message EOS-Mainnet#18:

fixes

# This is the commit message EOS-Mainnet#19:

fixes

# This is the commit message EOS-Mainnet#20:

fixes

# This is the commit message EOS-Mainnet#21:

fixes

# This is the commit message EOS-Mainnet#22:

fixes

# This is the commit message EOS-Mainnet#23:

fixes

# This is the commit message EOS-Mainnet#24:

fixes

# This is the commit message EOS-Mainnet#25:

fixes

# This is the commit message EOS-Mainnet#26:

testing

# This is the commit message EOS-Mainnet#27:

testing

# This is the commit message EOS-Mainnet#28:

testing

# This is the commit message EOS-Mainnet#29:

testing

# This is the commit message EOS-Mainnet#30:

testing

# This is the commit message EOS-Mainnet#31:

testing

# This is the commit message EOS-Mainnet#32:

testing

# This is the commit message EOS-Mainnet#33:

testing

# This is the commit message EOS-Mainnet#34:

testing

# This is the commit message EOS-Mainnet#35:

testing

# This is the commit message EOS-Mainnet#36:

testing

# This is the commit message EOS-Mainnet#37:

testing

# This is the commit message EOS-Mainnet#38:

testing

# This is the commit message EOS-Mainnet#39:

testing

# This is the commit message EOS-Mainnet#40:

testing

# This is the commit message EOS-Mainnet#41:

testing

# This is the commit message EOS-Mainnet#42:

testing

# This is the commit message EOS-Mainnet#43:

testing

# This is the commit message EOS-Mainnet#44:

fixes

# This is the commit message EOS-Mainnet#45:

fixes

# This is the commit message EOS-Mainnet#46:

fixes

# This is the commit message EOS-Mainnet#47:

fixes

# This is the commit message EOS-Mainnet#48:

fixes

# This is the commit message EOS-Mainnet#49:

fixes

# This is the commit message EOS-Mainnet#50:

fixes

# This is the commit message EOS-Mainnet#51:

fixes

# This is the commit message EOS-Mainnet#52:

fixes

# This is the commit message EOS-Mainnet#53:

fixes

# This is the commit message EOS-Mainnet#54:

fixes

# This is the commit message EOS-Mainnet#55:

fixes

# This is the commit message EOS-Mainnet#56:

fixes

# This is the commit message EOS-Mainnet#57:

fixes

# This is the commit message EOS-Mainnet#58:

fixes

# This is the commit message EOS-Mainnet#59:

fixes

# This is the commit message EOS-Mainnet#60:

fixes

# This is the commit message EOS-Mainnet#61:

fixes

# This is the commit message EOS-Mainnet#62:

fixes

# This is the commit message EOS-Mainnet#63:

fixes

# This is the commit message EOS-Mainnet#64:

fixes

# This is the commit message EOS-Mainnet#65:

fixes

# This is the commit message EOS-Mainnet#66:

fixes

# This is the commit message EOS-Mainnet#67:

fixes

# This is the commit message EOS-Mainnet#68:

fixes

# This is the commit message EOS-Mainnet#69:

fixes

# This is the commit message EOS-Mainnet#70:

fixes

# This is the commit message EOS-Mainnet#71:

fixes

# This is the commit message EOS-Mainnet#72:

fixes

# This is the commit message EOS-Mainnet#73:

fixes

# This is the commit message EOS-Mainnet#74:

fixes

# This is the commit message EOS-Mainnet#75:

fixes

# This is the commit message EOS-Mainnet#76:

fixes

# This is the commit message EOS-Mainnet#77:

fixes

# This is the commit message EOS-Mainnet#78:

fixes

# This is the commit message EOS-Mainnet#79:

more testing

# This is the commit message EOS-Mainnet#80:

testing

# This is the commit message EOS-Mainnet#81:

fixes

# This is the commit message EOS-Mainnet#82:

fixes

# This is the commit message EOS-Mainnet#83:

fixes

# This is the commit message EOS-Mainnet#84:

fixes

# This is the commit message EOS-Mainnet#85:

fixes

# This is the commit message EOS-Mainnet#86:

fixes

# This is the commit message EOS-Mainnet#87:

fixes

# This is the commit message EOS-Mainnet#88:

fixes

# This is the commit message EOS-Mainnet#89:

fixes

# This is the commit message EOS-Mainnet#90:

fixes

# This is the commit message EOS-Mainnet#91:

fixes

# This is the commit message EOS-Mainnet#92:

fixes

# This is the commit message EOS-Mainnet#93:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#94:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#95:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#96:

propagate-environment for buildkite-agent

# This is the commit message EOS-Mainnet#97:

fixes

# This is the commit message EOS-Mainnet#98:

fixes

# This is the commit message EOS-Mainnet#99:

fixes

# This is the commit message EOS-Mainnet#100:

fixes

# This is the commit message EOS-Mainnet#101:

fixes

# This is the commit message EOS-Mainnet#102:

fixes

# This is the commit message EOS-Mainnet#103:

fixes

# This is the commit message EOS-Mainnet#104:

fixes

# This is the commit message EOS-Mainnet#105:

fixes

# This is the commit message EOS-Mainnet#106:

fixes

# This is the commit message EOS-Mainnet#107:

fixes

# This is the commit message EOS-Mainnet#108:

fixes

# This is the commit message EOS-Mainnet#109:

fixes

# This is the commit message EOS-Mainnet#110:

fixes

# This is the commit message EOS-Mainnet#111:

fixes

# This is the commit message EOS-Mainnet#112:

fixes

# This is the commit message EOS-Mainnet#113:

fixes

# This is the commit message EOS-Mainnet#114:

fixes

# This is the commit message EOS-Mainnet#115:

fixes

# This is the commit message EOS-Mainnet#116:

fixes

# This is the commit message EOS-Mainnet#117:

fixes

# This is the commit message EOS-Mainnet#118:

fixes

# This is the commit message EOS-Mainnet#119:

fixes

# This is the commit message EOS-Mainnet#120:

fixes

# This is the commit message EOS-Mainnet#121:

fixes

# This is the commit message EOS-Mainnet#122:

fixes

# This is the commit message EOS-Mainnet#123:

fixes

# This is the commit message EOS-Mainnet#124:

fixes

# This is the commit message EOSIO#125:

fixes

# This is the commit message EOSIO#126:

fixes

# This is the commit message EOSIO#127:

fixes

# This is the commit message EOSIO#128:

fixes

# This is the commit message EOSIO#129:

fixes

# This is the commit message EOSIO#130:

fixes

# This is the commit message EOSIO#131:

fixes

# This is the commit message EOSIO#132:

fixes

# This is the commit message EOSIO#133:

fixes

# This is the commit message EOSIO#134:

fixes

# This is the commit message EOSIO#135:

fixes

# This is the commit message EOSIO#136:

fixes

# This is the commit message EOSIO#137:

fixes

# This is the commit message EOSIO#138:

fixes

# This is the commit message EOSIO#139:

fixes

# This is the commit message EOSIO#140:

fixes

# This is the commit message EOSIO#141:

fixes

# This is the commit message EOSIO#142:

fixes

# This is the commit message EOSIO#143:

fixes

# This is the commit message EOSIO#144:

fixes

# This is the commit message EOSIO#145:

fixes

# This is the commit message EOSIO#146:

fixes

# This is the commit message EOSIO#147:

fixes

# This is the commit message EOSIO#148:

fixes

# This is the commit message EOSIO#149:

fixes

# This is the commit message EOSIO#150:

fixes

# This is the commit message EOSIO#151:

fixes

# This is the commit message EOSIO#152:

fixes

# This is the commit message EOSIO#153:

testing

# This is the commit message EOSIO#154:

fixes

# This is the commit message EOSIO#155:

fixes

# This is the commit message EOSIO#156:

fixes

# This is the commit message EOSIO#157:

fixes

# This is the commit message EOSIO#158:

fixes

# This is the commit message EOSIO#159:

fixes

# This is the commit message EOSIO#160:

fixes

# This is the commit message EOSIO#161:

fixes

# This is the commit message EOSIO#162:

fixes

# This is the commit message EOSIO#163:

fixes

# This is the commit message EOSIO#164:

fixes

# This is the commit message EOSIO#165:

fixes

# This is the commit message EOSIO#166:

fixes

# This is the commit message EOSIO#167:

fixes

# This is the commit message EOSIO#168:

fixes

# This is the commit message EOSIO#169:

fixes

# This is the commit message EOSIO#170:

fixes

# This is the commit message EOSIO#171:

fixes

# This is the commit message EOSIO#172:

fixes

# This is the commit message EOSIO#173:

fixes

# This is the commit message EOSIO#174:

fixes

# This is the commit message EOSIO#175:

fixes

# This is the commit message EOSIO#176:

fixes

# This is the commit message EOSIO#177:

fixes

# This is the commit message EOSIO#178:

fixes

# This is the commit message EOSIO#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
pnx pushed a commit to eosswedenorg/eos that referenced this pull request Nov 11, 2019
@oldcold @qianxiaofeng
dpos pbft optimise (EOS-Mainnet#121)
a4e89a2 
* optimise for return value.

* reset timer upon state transition; refactor code;

* add global object to control pbft behavior; optimise checkpoint logic

* refactor pbft db persistence

* fix tests

* reset view change timer when global timeout is changed.

* reserve prepare only if my_prepare is on forks

* reserve prepare only if my_prepare is on forks

* Modify reserve prepare test case
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.
7 participants
@jchung00 @kesar @DenisCarriere @nsjames @winlin @HuweyII @jemxpat