Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Backport Stable 2.1.6 #9904

Merged
merged 12 commits into from
Nov 14, 2018
Merged

Backport Stable 2.1.6 #9904

merged 12 commits into from
Nov 14, 2018

Conversation

Tbaut
Copy link
Contributor

@Tbaut Tbaut commented Nov 13, 2018

@Tbaut Tbaut added A8-backport 🕸 Pull request is already reviewed well in another branch. M4-core ⛓ Core client code / Rust. M2-config 📂 Chain specifications and node configurations. A0-pleasereview 🤓 Pull request needs code review. labels Nov 13, 2018
andresilva and others added 5 commits November 13, 2018 15:04
* ethcore: use Machine::verify_transaction on parent block

also fixes off-by-one activation of transaction permission contract

* ethcore: clarify call to verify_transaction
* use docker cargo config file for android builds

* make android build succeed
…quired gas from response on failure (#9824)

* fix start_gas, handle OOG exceptions & NotEnoughGas

* Change START_GAS: 50_000 -> 60_000
* When the `OutOfGas exception` is received then try to double the gas until it succeeds or block gas limit is reached
* When `NotEnoughBasGas error` is received then use the required gas provided in the response

* fix(light-fetch): ensure block_gas_limit is tried

Try the `block_gas_limit` before regard the execution as an error

* Update rpc/src/v1/helpers/light_fetch.rs

Co-Authored-By: niklasad1 <[email protected]>
ordian
ordian previously approved these changes Nov 14, 2018
@ordian
Copy link
Collaborator

ordian commented Nov 14, 2018

looks #9824 depends on #9318

@ordian ordian dismissed their stale review November 14, 2018 10:31

712 wans't merged

@ordian ordian added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Nov 14, 2018
Will go without cache. Meanwhile have to investigate what was wrong and how to use it effectively.
@Tbaut Tbaut merged commit 491f17f into stable Nov 14, 2018
@ordian ordian deleted the Tbaut-stable-216 branch November 14, 2018 13:51
@5chdn 5chdn added this to the Patch milestone Nov 25, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch. A8-looksgood 🦄 Pull request is reviewed well. M2-config 📂 Chain specifications and node configurations. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants