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

V2.5.12 stable #11336

Merged
merged 12 commits into from
Dec 16, 2019
Merged

V2.5.12 stable #11336

merged 12 commits into from
Dec 16, 2019

Conversation

dvdplm
Copy link
Collaborator

@dvdplm dvdplm commented Dec 14, 2019

No description provided.

varasev and others added 10 commits December 13, 2019 13:22
* Enable EIP-2384 for Istanbul hard fork

* Update bomb delay block number

* Update ropsten.json
* tx-q: basic verification of local transactions

* miner: basic test for local import

* miner: info log when rejecting local txn

* Hernandofmt

Co-Authored-By: Hernando Castano <[email protected]>

* miner: assert in a test with the concrete error type

* tx-q: info! -> warn! on local tx rejection
* tx: clean up legacy eip-86 based null signature

* tx: add a test for null signature rejection

* tx: revert json txn changes

* fix evmbin bench build

* tx: put UNSIGNED_SENDER behind 'test-helpers' feature

* Revert "tx: put UNSIGNED_SENDER behind 'test-helpers' feature"

This reverts commit 1dde478.

* tx: add comment for null_sign

* even more cleanup

* Revert "even more cleanup"

This reverts commit be29f03.
ordian
ordian previously approved these changes Dec 14, 2019
Copy link
Collaborator

@ordian ordian left a comment

Choose a reason for hiding this comment

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

Looks good

@ordian ordian added the A8-backport 🕸 Pull request is already reviewed well in another branch. label Dec 14, 2019
@ordian ordian added this to the Patch milestone Dec 14, 2019
niklasad1
niklasad1 previously approved these changes Dec 14, 2019
CHANGELOG.md Outdated
* Istanbul HF in xDai (2019-12-12) (#11299)
* Istanbul HF in POA Core (2019-12-19) (#11298)
* Istanbul HF in POA Sokol (2019-12-05) (#11282)
* Enable EIP-2384 for ice age hard fork (#11281)
Copy link
Collaborator

@niklasad1 niklasad1 Dec 14, 2019

Choose a reason for hiding this comment

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

I think we should add #11332 and #11335 to the changelog

* ethcore/res: activate ecip-1061 on kotti and mordor

* ethcore/res: update bootnodes for mordor
@dvdplm dvdplm dismissed stale reviews from niklasad1 and ordian via b283c14 December 16, 2019 06:34
@s3krit s3krit merged commit 29ebddc into stable Dec 16, 2019
@niklasad1 niklasad1 deleted the v2.5.12-stable branch December 16, 2019 15:12
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants