Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add staking migration #173

Merged
merged 4 commits into from
Jun 29, 2020
Merged

Add staking migration #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b44d7ac
add staking migration
apopiak Jun 26, 2020
338b72c
use apopiak-staking-migration branch of substrate
apopiak Jun 26, 2020
eed6851
update cargo.lock
apopiak Jun 26, 2020
2458eea
update cargo.lock
apopiak Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
392 changes: 196 additions & 196 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions modules/edge-signaling/Cargo.toml
View file
Open in desktop
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-staking-migration", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-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-staking-migration", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }

[features]
default = ["std"]
Expand Down
26 changes: 13 additions & 13 deletions modules/edge-treasury-reward/Cargo.toml
View file
Open in desktop
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-staking-migration", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-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-staking-migration", default-features = false }
sp-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-staking-reward-curve = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }

[features]
default = ["std"]
Expand Down
14 changes: 7 additions & 7 deletions modules/edge-voting/Cargo.toml
View file
Open in desktop
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-staking-migration", default-features = false }
sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-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-staking-migration", default-features = false }
sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }

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