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

Pull from upstream #75

Merged
merged 446 commits into from
Aug 29, 2018
Merged

Pull from upstream #75

merged 446 commits into from
Aug 29, 2018

Conversation

jchung00
Copy link
Member

No description provided.

asiniscalchi and others added 30 commits August 3, 2018 20:19
@asiniscalchi
put all the additional_plugin code into cmake module
29f6964
@heifner
Merge pull request #5031 from EOSIO/master
342f048 
Merge 1.1.3 into develop
@heifner
Merge pull request #4739 from greymass/master
4d5e663 
Add filter-out history config option
@asiniscalchi
refactoring
7d1917f
@venediktov
add ripemd160 and --encode-type
fd45c87
@venediktov
add support for 160-bit keys
fc43e9c
@heifner
Merge branch 'develop' into gh#4836-signals
357ff35
@venediktov
Revert "add support for 160-bit keys"
d4af450 
This reverts commit fc43e9c.
@larryk85
update crypto.h to use const char*
1e06d39
@spartucus
Fix null pointer dereference
d5eb2b7 
Although it has fewer chance chain_plugin is invalid, still it's safer to assert it.
@spartucus
Fix null pointer dereference
4bef903 
Although there are fewer chances that chain_plugin is invalid, still it's safer to assert it.
@spartucus
Fix null pointer dereference
f256c1b 
Although there are fewer chances that chain_plugin is invalid, still it's safer to assert it.
@heifner
Revert unneeded test changes
0c6edfa
@heifner
Assert not implicit/scheduled on push_transaction
31d8b7e
@larryk85
Merge pull request #5077 from EOSIO/update_crypto_h
62420d2 
update crypto.h to use const char*
@larryk85
Update asset.hpp
07c9971
@larryk85
used numeric_limits
bfe9334
@larryk85
Update asset.hpp
8781da2
@heifner
Consistently emit before squash/undo
9550f29
@b1bart
Merge pull request #5090 from EOSIO/fix/asset_mult_and_div
48cea97 
Update asset.hpp
@EugeneChung
Use eosio::chain::config::system_account_name constant instead of N(e…
ff044a9 
…osio)
@ScottSallinen
Log which peer gives unexpected length messages
b9ce3fb 
This allows a quicker understanding of which peer is misbehaving, allowing faster turnaround time to blocking bad peers.
@b1bart
Merge tag 'v1.1.4' into develop
9f1522a
@EugeneChung
Make customization point for executable names
09412d5
@EugeneChung
Make customization point for executable names
653b1f3
@asiniscalchi
removed libsoci-dev system lib from ubuntu building script
16b5318
@EugeneChung
Support customization point for excutable names : keosd binPath of cleos
9ba7a0d
@heifner
Merge pull request #5099 from EOSIO/port-1.1.4
6c4d153 
Port 1.1.4 to develop
@heifner
Merge pull request #4901 from EOSIO/gh#4836-signals
79fd74c 
Gh#4836 signals
@heifner
Only set irreversible when true to avoid overwriting an irreversibe=t…
bae241d 
…rue with a irreversible=false
heifner and others added 27 commits August 25, 2018 16:16
@heifner
Change log to debug for exceptions as they are expected
c8f88db
@heifner
dlog is on by default, remove call for accept_transaction for excepti…
93bd826 
…ons since they are expected
@arhag
subjectively fail transaction if unprivileged code bills RAM to an ac…
0442485 
…count other than itself within a notify context
@arhag
Add support in config.ini to disable the RAM billing soft-fix in noti…
9a77456 
…fication handlers.
@jgiszczak
Merge pull request #5401 from xJonathanLEI/fix_eosiocpp_g
5c378a9 
Fixed eosiocpp ABI Generation Error
@arhag
add unit test for RAM billing soft-fix in notify context
a1dffae
@taokayan @heifner
don't change transaction data in cleos push signed transaction
4313676
@taokayan @heifner
should not change txn content if already signed
5e01987
@xJonathanLEI
Fixed ignored action name in ABI generation
e6633a5
@taokayan @arhag
suppress greylist related exception loggings
5566754
@arhag
cleanup of greylisting variables
2732be0
@arhag
Merge pull request #5423 from EOSIO/net_plugin-reduce-noise
431c8ee 
Reduce error log output in net_plugin
@arhag
Merge branch 'release/1.2.x' into cpu-greylist
89b9022
@arhag
Merge pull request #5451 from EOSIO/notify-ram-charging-soft-fix
e8bf908 
Subjectively fail transaction if contract bills RAM to another account within a notification handler
@arhag
added test case involving a deferred transaction canceling itself
083935e
@larryk85
changed exception message
5383224
@arhag
distinguish exception messages of greylisted vs non-greylisted resour…
1978a79 
…ce exhausted errors
@arhag
Merge branch 'cpu-greylist' of https://github.com/eosio/eos into cpu-…
fad9e17 
…greylist
@heifner
Merge pull request #5461 from EOSIO/cleos-sign
a15a02a 
Don't change txn if already signed
@heifner
Merge pull request #5417 from EOSIO/bnet-fix
ac44213 
bnet threading issues
@heifner
Merge pull request #5415 from EOSIO/feature/5408-fix-light-validation…
8399f32 
…-speculation

do not apply transaction optimizations on light-nodes when speculating
@heifner
Merge pull request #5459 from xJonathanLEI/abi_action_name
a4096cb 
Fixed Bug Ignoring Action Name in ABI Generation
@heifner
Merge pull request #5464 from EOSIO/cancel-self-bug-unit-test
dc5f5d0 
Unit test for self-cancelling deferred transaction bug
@heifner
Merge pull request #5462 from EOSIO/cpu-greylist
34e848a 
CPU greylist fixes
@arhag
bump version to 1.2.3
281ab1a
@arhag
Merge pull request #5465 from EOSIO/feature/bump-version-to-1.2.3
181cae3 
bump version to 1.2.3
@arhag
Merge pull request #5466 from EOSIO/release/1.2.x
e87d245 
Version 1.2.3
@jchung00 jchung00 merged commit e87d245 into EOS-Mainnet:master Aug 29, 2018
pnx pushed a commit to eosswedenorg/eos that referenced this pull request May 14, 2019
@vonhenry
Merge pull request EOS-Mainnet#75 from vchengsong/develop
b626a36 
Fill history commits of develop branch
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
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.