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 #69

Merged
merged 14 commits into from
Aug 9, 2018
Merged

Pull from upstream #69

merged 14 commits into from
Aug 9, 2018

Conversation

jchung00
Copy link
Member

@jchung00 jchung00 commented Aug 9, 2018

From v1.1.4.
We reset master to git head 4a90243106bc24b0c8b4a0e5aba9b782f3a779ff in order to revert changes from PR #65 and #66, which were not accepted through a formalized process.

b1bart and others added 14 commits August 6, 2018 10:15
@b1bart
make scheduled transactions subjectively fail on tx_cpu_usage_exceeded
ad2adef 
in #5001 the ability to bill appropriate CPU time for `soft_fail` and `hard_fail` scheduled transaction was added.  However, this exposes an ambiguity in the block structure:  There is no way to represent the objective failure of a scheduled transaction due to this limit.  This is because the measurement is subjective and must be strictly less than or equal to this limit otherwise the _block_ is objectively bad.  As a result, producers will no longer include those scheduled transactions in their blocks, giving each producer a chance to execute it in under the limited time or to another objective failure case.

Previous versions of `nodeos` were producing 0 values for billed transaction time which did not resolve the ambgiuity but shifted the failure mode from the desired mode (transaction exceeded an objective maximum) to a different failure mode (transaction under the minimum billable time) allowing those blocks to validate correctly despite the mismatch.

resolves #5057
@b1bart
ensure that changes only apply when producing blocks, not when valida…
87de17d 
…ting blocks
@heifner @jgiszczak
Update README.md
a809f70
@heifner
Merge pull request #5069 from EOSIO/update-readme
12e3777 
Update README.md
@b1bart
remove producer-subjectivness from leeway
73e56d8 
producer plugin was treating leeway cpu exceptions as subjective which in turn implies to the rest of the producer code that the block is exhausted.  However, this exception rarely clears in a fresh block (only on wall-clock wobble) so it is in-appropriate for the producer plugin to consider this "subjective"
@b1bart
Merge pull request #5068 from wanderingbort/feature/5057-subjectively…
8eaf97e 
…-fail-ambiguous-dtrx-case

make scheduled transactions subjectively fail on tx_cpu_usage_exceeded
@b1bart
Merge pull request #5071 from EOSIO/feature/leeway-exceptions-are-not…
12449d9 
…-producer-subjective

remove producer-subjectivness from leeway
@b1bart
bump version to 1.1.4
69ba735
@larryk85 @b1bart
Backport of fix/asset_mult_and_div onto release/1.1.x
27bb4b9 
Update asset.hpp
@b1bart @heifner @spoonincode
Consolidated Security Fixes for 1.1.4
e76894f 
- Various regression/unit tests

Co-authored-by: Kevin Heifner <heifner_k@ociweb.com>
Co-authored-by: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
@b1bart
Merge pull request #5092 from EOSIO/backport/fix/asset_mult_and_div
b7b34e5 
Backport of `fix/asset_mult_and_div` onto `release/1.1.x`
@b1bart
Merge pull request #5094 from EOSIO/feature/1.1.4-security-omnibus
c6b793e 
Consolidated Security Fixes for 1.1.4
@b1bart
Merge pull request #5087 from EOSIO/feature/bump-version-to-1.1.4
e1d0740 
bump version to 1.1.4
@b1bart
Merge pull request #5098 from EOSIO/release/1.1.x
4f4e5c2 
Release 1.1.4
@jchung00 jchung00 merged commit b401c0c into EOS-Mainnet:master Aug 9, 2018
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.
4 participants
@jchung00 @b1bart @heifner @larryk85