Skip to content

Commit

Permalink
Fix Session Migration (#183)
Browse files Browse the repository at this point in the history 
* do session account migration before staking to fix migration

* set branch to apopiak-fix-session-migration

* bump spec_version

* update cargo.lock

* update cargo.lock and spec_version

* update cargo.lock

* Ups lock file dependencies

Co-authored-by: Drew Stone <drewstone329@gmail.com>
  • Loading branch information
@apopiak @drewstone
apopiak and drewstone authored Jul 22, 2020
1 parent 84fb046 commit 0f4bf1e
Show file tree
Hide file tree
Showing 14 changed files with 602 additions and 624 deletions.
834 changes: 406 additions & 428 deletions Cargo.lock
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions modules/edge-signaling/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ serde = { version = "1.0", default-features = false, optional = true }
serde_derive = { version = "1.0", optional = true }
safe-mix = { version = "1.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
voting = { package ="edge-voting", path = "../edge-voting", default-features = false }

[dev-dependencies]
sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }

[features]
default = ["std"]
Expand Down
26 changes: 13 additions & 13 deletions modules/edge-treasury-reward/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ edition = "2018"
serde = { version = "1.0", default-features = false, optional = true }
safe-mix = { version = "1.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }

[dev-dependencies]
sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-staking-reward-curve = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
sp-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-staking-reward-curve = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }

[features]
default = ["std"]
Expand Down
14 changes: 7 additions & 7 deletions modules/edge-voting/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ edition = "2018"
serde = { version = "1.0", default-features = false, optional = true }
safe-mix = { version = "1.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }

[dev-dependencies]
sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-fix-session-migration", default-features = false }

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit 0f4bf1e

Please sign in to comment.