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

backports for 2.3.0 beta #10164

Merged
merged 7 commits into from Jan 15, 2019
Merged

backports for 2.3.0 beta #10164

merged 7 commits into from Jan 15, 2019

Conversation

5chdn
Copy link
Contributor

@5chdn 5chdn commented Jan 10, 2019

@5chdn 5chdn added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. A8-backport 🕸 Pull request is already reviewed well in another branch. labels Jan 10, 2019
@5chdn 5chdn added this to the 2.3 milestone Jan 10, 2019
@5chdn 5chdn added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Jan 10, 2019
* Change igd to github:maufl/rust-igd

* Run `igd::search_gateway_from_timeout` from own thread
Copy link
Collaborator

@tomusdrw tomusdrw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, #10065 can be backported now

foundation = { forkBlock = 4370000, critical = false }
ropsten = { forkBlock = 4230000, critical = false }
kovan = { forkBlock = 6600000, critical = false }
foundation = { forkBlock = 4370000, critical = true }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

forkBlock most likely needs an update

ropsten = { forkBlock = 4230000, critical = false }
kovan = { forkBlock = 6600000, critical = false }
foundation = { forkBlock = 4370000, critical = true }
ropsten = { forkBlock = 4230000, critical = true }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it critical on testnets? Because of #10167 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we might need a better definition of critical here

…ith storage items (#10065)

* Add is_base_storage_root_unchanged

* Fix compile, use a shortcut for check, and remove ignored tests

* Add a warn!

* Update ethereum/tests to v6.0.0-beta.2

* grumble: use {:#x} instead of 0x{:x}

Co-Authored-By: sorpaas <accounts@that.world>
* ethcore: pull constantinople on ethereum network

* version: mark update as critical

* ethcore: remove constantinople alltogether from chain spec

* version: revert fork block for ethereum
@5chdn 5chdn removed the A0-pleasereview 🤓 Pull request needs code review. label Jan 15, 2019
@5chdn 5chdn merged commit 10657d9 into beta Jan 15, 2019
@5chdn 5chdn deleted the a5-beta-230 branch January 15, 2019 22:06
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. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants