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

V2.6.7 beta #11337

Merged
merged 15 commits into from
Dec 16, 2019
Merged

V2.6.7 beta #11337

merged 15 commits into from
Dec 16, 2019

Conversation

dvdplm
Copy link
Collaborator

@dvdplm dvdplm commented Dec 14, 2019

No description provided.

soc1c and others added 10 commits December 13, 2019 13:35
@soc1c @s3krit
ethcore/res: activate agharta on classic 9573000 (#11331)
bf5a81f
@varasev @s3krit
Istanbul activation on xDai (#11299)
8d7190b
@varasev @s3krit
Istanbul activation on POA Core (#11298)
aaee95f
@varasev @s3krit
Istanbul HF on POA Sokol (#11282)
e801ade
@sorpaas @s3krit
Enable EIP-2384 for ice age hard fork (#11281)
e6826bf 
* Enable EIP-2384 for Istanbul hard fork

* Update bomb delay block number

* Update ropsten.json
@s3krit
Update version and CHANGELOG.md
96b27c1
@ordian @dvdplm
[secretstore] migrate to version 4 (#11322)
598f039 
* secret-store: migrate the db to version 4

* Fix secretstore build

* Fix secretstore build: include ethkey when building with the "accounts" feature

* fix build

* secret-store: actually use new column

* a bunch of fixes

* last nits

* Apply suggestions from code review

Co-Authored-By: Niklas Adolfsson <niklasadolfsson1@gmail.com>

* secret-store: move db stuff to secret-store as per Anton's request
@dvdplm
cleanup
91f867b
@ordian @dvdplm
tx-q: enable basic verification of local transactions (#11332)
9632b2c 
* 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 <HCastano@users.noreply.github.com>

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

* tx-q: info! -> warn! on local tx rejection
@ordian @dvdplm
remove null signatures (#11335)
106b5b9 
* 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
View reviewed changes
secret-store/src/key_storage.rs Outdated Show resolved Hide resolved
@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
@ordian ordian added the A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. label Dec 14, 2019
@ordian
Copy link
Collaborator

ordian commented Dec 14, 2019 

error[E0433]: failed to resolve: use of undeclared type or module `parity_crypto`
   --> ethcore/types/src/transaction/transaction.rs:650:8
    |
650 |             Err(parity_crypto::publickey::Error::InvalidSignature) => {}
    |                 ^^^^^^^^^^^^^ use of undeclared type or module `parity_crypto`

niklasad1
niklasad1 reviewed Dec 14, 2019
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
dvdplm and others added 2 commits December 14, 2019 14:27
@dvdplm
Fix tests
e8a0399
@dvdplm @ordian
Update secret-store/src/key_storage.rs
bddf175 
Co-Authored-By: Andronik Ordian <write@reusable.software>
@dvdplm dvdplm added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. labels Dec 14, 2019
niklasad1
niklasad1 previously approved these changes Dec 14, 2019
View reviewed changes
@soc1c
Copy link
Contributor

soc1c commented Dec 15, 2019

can we also get #11338 in?

@dvdplm
Copy link
Collaborator Author

dvdplm commented Dec 15, 2019

can we also get #11338 in?

Sure, I don't see why not. For both stable and beta?

@soc1c
Copy link
Contributor

soc1c commented Dec 15, 2019

yes, thanks.

@soc1c @dvdplm
ethcore/res: activate ecip-1061 on kotti and mordor (#11338)
99e3d4a 
* ethcore/res: activate ecip-1061 on kotti and mordor

* ethcore/res: update bootnodes for mordor
@s3krit s3krit merged commit ba1b879 into beta Dec 16, 2019
@soc1c soc1c deleted the v2.6.7-beta branch December 16, 2019 14:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@niklasad1 niklasad1 niklasad1 approved these changes

@ordian ordian ordian left review comments

Assignees
No one assigned
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch. A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Milestone
Patch
Development

Successfully merging this pull request may close these issues.
7 participants
@dvdplm @ordian @soc1c @niklasad1 @s3krit @varasev @sorpaas