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

[secretstore] migrate to version 4 #11322

Merged
merged 9 commits into from
Dec 12, 2019
Merged

Conversation

ordian
Copy link
Collaborator

@ordian ordian commented Dec 10, 2019

in preparation for paritytech/parity-common#278

I'm deliberately not using util/migration-rocksdb here in order to avoid adding more dependencies on parity-ethereum to secret-store as it's about to be moved.

  • store version in a file

@ordian ordian requested review from grbIzl and dvdplm December 10, 2019 15:57
@ordian ordian added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Dec 10, 2019
@ordian ordian added this to the 2.7 milestone Dec 10, 2019
@ordian ordian added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. and removed A0-pleasereview 🤓 Pull request needs code review. labels Dec 10, 2019
@ordian ordian force-pushed the ao-migrate-secretstore-rocksdb-column branch from 7b5e01f to 0a2e125 Compare December 10, 2019 18:30
@ordian ordian added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Dec 10, 2019
Copy link
Collaborator

@dvdplm dvdplm left a comment

Choose a reason for hiding this comment

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

lgtm, a few nits.

parity/db/rocksdb/migration_secretstore.rs Outdated Show resolved Hide resolved
parity/db/rocksdb/migration_secretstore.rs Outdated Show resolved Hide resolved
parity/db/rocksdb/migration_secretstore.rs Outdated Show resolved Hide resolved
@@ -17,6 +17,7 @@ ethcore-accounts = { path = "../accounts", optional = true}
ethcore-call-contract = { path = "../ethcore/call-contract" }
ethcore-sync = { path = "../ethcore/sync" }
ethereum-types = "0.8.0"
ethkey = { path = "../accounts/ethkey", optional = true }
Copy link
Collaborator

Choose a reason for hiding this comment

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

I had to add this too, to get parity-ethereum to build. A bit concerning CI didn't catch this.

@dvdplm
Copy link
Collaborator

dvdplm commented Dec 11, 2019

Test failure looks legit.

@dvdplm dvdplm added the A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. label Dec 11, 2019
@ordian ordian removed the A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. label Dec 11, 2019
@ordian ordian requested a review from dvdplm December 11, 2019 21:42
Copy link
Collaborator

@dvdplm dvdplm left a comment

Choose a reason for hiding this comment

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

Still lgtm!

Copy link
Collaborator

@grbIzl grbIzl 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 merged commit ae74e8d into master Dec 12, 2019
@ordian ordian deleted the ao-migrate-secretstore-rocksdb-column branch December 12, 2019 12:21
@ordian ordian added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Dec 12, 2019
ordian added a commit that referenced this pull request Dec 13, 2019
* master:
  ethcore/res: activate agharta on classic 9573000 (#11331)
  [secretstore] migrate to version 4 (#11322)
  Enable EIP-2384 for ice age hard fork (#11281)
dvdplm pushed a commit that referenced this pull request Dec 13, 2019
* 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
@niklasad1 niklasad1 mentioned this pull request Dec 14, 2019
dvdplm added a commit that referenced this pull request Dec 15, 2019
…ate their data instead

Merge branch 'master' into dp/chore/kvdb-no-default-column

* master:
  tx-q: enable basic verification of local transactions (#11332)
  remove null signatures (#11335)
  ethcore/res: activate agharta on classic 9573000 (#11331)
  [secretstore] migrate to version 4 (#11322)
  Enable EIP-2384 for ice age hard fork (#11281)
  Fix atomicity violation in network-devp2p (#11277)
s3krit pushed a commit that referenced this pull request Dec 16, 2019
* Enable EIP-2384 for ice age hard fork (#11281)
* ethcore/res: activate agharta on classic 9573000 (#11331)
* 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)
* Activate ecip-1061 on kotti and mordor (#11338)
* Enable basic verification of local transactions (#11332)
* Disallow EIP-86 style null signatures for transactions outside tests (#11335)
* SecretStore database migration to v4 (#11322)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants