diff --git a/Cargo.lock b/Cargo.lock
index 121f846d..cc8dd9bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,7 +115,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -124,7 +124,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -240,7 +240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ac2c016b079e771204030951c366db398864f5026f84a44dafb0ff20f02085d"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -263,7 +263,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
  "hermit-abi",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -325,9 +325,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 
 [[package]]
 name = "base64"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e223af0dc48c96d4f8342ec01a4974f139df863896b316681efd36742f22cc67"
+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
 [[package]]
 name = "bincode"
@@ -552,9 +552,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.54"
+version = "1.0.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
+checksum = "b1be3409f94d7bdceeb5f5fac551039d9b3f00e25da7a74fc4d33400a0d96368"
 dependencies = [
  "jobserver",
 ]
@@ -1039,7 +1039,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
 dependencies = [
  "libc",
  "redox_users",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1481,7 +1481,7 @@ checksum = "b480f641ccf0faf324e20c1d3e53d81b7484c698b42ea677f6907ae4db195371"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -1687,7 +1687,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1695,7 +1695,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1712,7 +1712,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1730,7 +1730,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1745,7 +1745,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1756,7 +1756,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1781,7 +1781,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2",
@@ -1792,7 +1792,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1804,7 +1804,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "proc-macro2",
  "quote 1.0.7",
@@ -1814,7 +1814,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1830,7 +1830,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1845,7 +1845,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "libloading",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2082,7 +2082,7 @@ dependencies = [
  "libc",
  "log 0.4.8",
  "rustc_version",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2906,7 +2906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
 dependencies = [
  "cc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3353,7 +3353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3453,7 +3453,7 @@ dependencies = [
  "log 0.4.8",
  "mio",
  "miow 0.3.5",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3486,7 +3486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
 dependencies = [
  "socket2",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3582,7 +3582,7 @@ checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
 dependencies = [
  "cfg-if",
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3615,7 +3615,7 @@ dependencies = [
 [[package]]
 name = "node-executor"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-benchmarking",
  "node-primitives",
@@ -3632,7 +3632,7 @@ dependencies = [
 [[package]]
 name = "node-primitives"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
@@ -3644,7 +3644,7 @@ dependencies = [
 [[package]]
 name = "node-runtime"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",
@@ -3734,7 +3734,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3847,9 +3847,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "openssl"
-version = "0.10.29"
+version = "0.10.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
+checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -3884,7 +3884,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -3899,7 +3899,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3918,7 +3918,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3934,7 +3934,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3949,7 +3949,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3971,7 +3971,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3986,7 +3986,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4001,7 +4001,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4022,7 +4022,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-primitives"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -4032,7 +4032,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4051,7 +4051,7 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-rpc-runtime-api"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "pallet-contracts-primitives",
  "parity-scale-codec",
@@ -4063,7 +4063,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4078,7 +4078,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4092,7 +4092,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "evm",
  "frame-support",
@@ -4113,7 +4113,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4129,7 +4129,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4149,7 +4149,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4165,7 +4165,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4184,7 +4184,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4200,7 +4200,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4214,7 +4214,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4229,7 +4229,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4244,7 +4244,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4259,7 +4259,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4272,7 +4272,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4287,7 +4287,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4302,7 +4302,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4322,7 +4322,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4336,7 +4336,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4356,7 +4356,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -4367,7 +4367,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4381,7 +4381,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4398,7 +4398,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4413,7 +4413,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4431,7 +4431,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4444,7 +4444,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4458,7 +4458,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4473,7 +4473,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4596,7 +4596,7 @@ dependencies = [
  "tokio 0.1.22",
  "tokio-named-pipes",
  "tokio-uds",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -4611,7 +4611,7 @@ dependencies = [
  "parking_lot 0.10.2",
  "primitive-types",
  "smallvec 1.4.0",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -4664,7 +4664,7 @@ dependencies = [
  "redox_syscall",
  "rustc_version",
  "smallvec 0.6.13",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -4678,7 +4678,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec 1.4.0",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -4887,9 +4887,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-error"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678"
+checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
 dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
@@ -4900,9 +4900,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-error-attr"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53"
+checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
 dependencies = [
  "proc-macro2",
  "quote 1.0.7",
@@ -5087,7 +5087,7 @@ dependencies = [
  "libc",
  "rand_core 0.3.1",
  "rdrand",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5100,7 +5100,7 @@ dependencies = [
  "fuchsia-cprng",
  "libc",
  "rand_core 0.3.1",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5119,7 +5119,7 @@ dependencies = [
  "rand_os",
  "rand_pcg 0.1.2",
  "rand_xorshift",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5215,7 +5215,7 @@ checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 dependencies = [
  "libc",
  "rand_core 0.4.2",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5230,7 +5230,7 @@ dependencies = [
  "rand_core 0.4.2",
  "rdrand",
  "wasm-bindgen",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5396,7 +5396,7 @@ dependencies = [
  "bitflags",
  "libc",
  "mach",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5405,7 +5405,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5441,7 +5441,7 @@ dependencies = [
  "spin",
  "untrusted",
  "web-sys",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5476,7 +5476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -5587,7 +5587,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "bytes 0.5.5",
  "derive_more",
@@ -5614,7 +5614,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -5638,7 +5638,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5654,7 +5654,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5670,7 +5670,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5681,7 +5681,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -5721,7 +5721,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "fnv",
@@ -5757,7 +5757,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -5786,7 +5786,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -5797,7 +5797,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -5828,7 +5828,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -5850,7 +5850,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -5878,7 +5878,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "log 0.4.8",
@@ -5895,7 +5895,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5910,7 +5910,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -5931,7 +5931,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "assert_matches",
  "derive_more",
@@ -5969,7 +5969,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -5986,7 +5986,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.5",
@@ -6005,7 +6005,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "hex 0.4.2",
@@ -6021,7 +6021,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -6040,7 +6040,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "bitflags",
  "bs58",
@@ -6092,7 +6092,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "futures-timer 3.0.2",
@@ -6107,7 +6107,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "bytes 0.5.5",
  "fnv",
@@ -6134,7 +6134,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "libp2p",
@@ -6147,7 +6147,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "log 0.4.8",
  "substrate-prometheus-endpoint",
@@ -6156,7 +6156,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -6188,7 +6188,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -6212,7 +6212,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -6228,7 +6228,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "directories",
@@ -6291,7 +6291,7 @@ dependencies = [
 [[package]]
 name = "sc-service-test"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "env_logger",
  "fdlimit",
@@ -6328,7 +6328,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -6342,7 +6342,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "bytes 0.5.5",
  "futures 0.3.5",
@@ -6364,7 +6364,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -6381,7 +6381,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -6401,7 +6401,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -6431,7 +6431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 dependencies = [
  "lazy_static",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -6738,7 +6738,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -6764,7 +6764,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "log 0.4.8",
@@ -6776,7 +6776,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -6791,7 +6791,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -6803,7 +6803,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6815,7 +6815,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.12",
@@ -6828,7 +6828,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6840,7 +6840,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6851,7 +6851,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6863,7 +6863,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "log 0.4.8",
@@ -6879,7 +6879,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "serde",
  "serde_json",
@@ -6888,7 +6888,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -6912,7 +6912,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6926,7 +6926,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -6944,7 +6944,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -6956,7 +6956,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -6998,7 +6998,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -7007,7 +7007,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "proc-macro2",
  "quote 1.0.7",
@@ -7017,7 +7017,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -7028,7 +7028,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "finality-grandpa",
  "log 0.4.8",
@@ -7044,7 +7044,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -7054,7 +7054,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7066,7 +7066,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7087,7 +7087,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -7098,7 +7098,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -7110,7 +7110,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -7121,7 +7121,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -7131,7 +7131,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -7140,7 +7140,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "serde",
  "sp-core",
@@ -7149,7 +7149,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -7171,7 +7171,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -7186,7 +7186,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -7198,7 +7198,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-core",
@@ -7211,7 +7211,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "serde",
  "serde_json",
@@ -7220,7 +7220,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7233,7 +7233,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -7243,7 +7243,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "hash-db",
  "itertools 0.9.0",
@@ -7264,12 +7264,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "impl-serde 0.2.3",
  "ref-cast",
@@ -7281,7 +7281,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7295,7 +7295,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "log 0.4.8",
  "rental",
@@ -7305,7 +7305,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "derive_more",
  "futures 0.3.5",
@@ -7321,7 +7321,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -7335,7 +7335,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "futures-core",
@@ -7347,7 +7347,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -7359,7 +7359,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7487,7 +7487,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7514,7 +7514,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "platforms",
 ]
@@ -7522,7 +7522,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.5",
@@ -7545,7 +7545,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "async-std",
  "derive_more",
@@ -7559,7 +7559,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "hash-db",
@@ -7581,7 +7581,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7621,7 +7621,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-rc3"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 dependencies = [
  "futures 0.3.5",
  "parity-scale-codec",
@@ -7642,7 +7642,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.6"
-source = "git+https://github.com/hicommonwealth/substrate.git?branch=time-travel#fee40523a6ce4e92c54a0fc59ff2d21f4e09eebf"
+source = "git+https://github.com/hicommonwealth/substrate.git?branch=apopiak-staking-migration#39a031b3c0cf23bbd39839fdd97d818f30afc01d"
 
 [[package]]
 name = "substrate-wasmtime"
@@ -7664,7 +7664,7 @@ dependencies = [
  "wasmparser 0.52.2",
  "wasmtime-environ",
  "wat",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -7691,7 +7691,7 @@ dependencies = [
  "wasmparser 0.52.2",
  "wasmtime-debug",
  "wasmtime-environ",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -7730,7 +7730,7 @@ dependencies = [
  "region",
  "thiserror",
  "wasmtime-environ",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -7811,7 +7811,7 @@ dependencies = [
  "ntapi",
  "once_cell",
  "rayon",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -7837,7 +7837,7 @@ dependencies = [
  "rand 0.7.3",
  "redox_syscall",
  "remove_dir_all",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -7903,7 +7903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
  "libc",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -7990,7 +7990,7 @@ dependencies = [
  "pin-project-lite",
  "signal-hook-registry",
  "slab",
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
@@ -8551,7 +8551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 dependencies = [
  "same-file",
- "winapi 0.3.8",
+ "winapi 0.3.9",
  "winapi-util",
 ]
 
@@ -8723,7 +8723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed54fd9d64dfeeee7c285fd126174a6b5e6d4efc7e5a1566fdb635e60ff6a74e"
 dependencies = [
  "anyhow",
- "base64 0.12.2",
+ "base64 0.12.3",
  "bincode",
  "cranelift-codegen",
  "cranelift-entity",
@@ -8741,24 +8741,24 @@ dependencies = [
  "thiserror",
  "toml",
  "wasmparser 0.51.4",
- "winapi 0.3.8",
+ "winapi 0.3.9",
  "zstd",
 ]
 
 [[package]]
 name = "wast"
-version = "20.0.0"
+version = "21.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb95ce157a8c779ec301ef3e4c0a7caeb6f9f902f813f1f5f7e464367048924"
+checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afa9815ddfb592fb97bb2b817a514c6995e5c171b05037b91d0d831f3a2a9c0"
+checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c"
 dependencies = [
  "wast",
 ]
@@ -8859,9 +8859,9 @@ checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 
 [[package]]
 name = "winapi"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
  "winapi-i686-pc-windows-gnu",
  "winapi-x86_64-pc-windows-gnu",
@@ -8885,7 +8885,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.8",
+ "winapi 0.3.9",
 ]
 
 [[package]]
diff --git a/modules/edge-signaling/Cargo.toml b/modules/edge-signaling/Cargo.toml
index 015a980f..4471da88 100644
--- a/modules/edge-signaling/Cargo.toml
+++ b/modules/edge-signaling/Cargo.toml
@@ -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"]
diff --git a/modules/edge-treasury-reward/Cargo.toml b/modules/edge-treasury-reward/Cargo.toml
index 4fbda20c..195e8425 100644
--- a/modules/edge-treasury-reward/Cargo.toml
+++ b/modules/edge-treasury-reward/Cargo.toml
@@ -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"]
diff --git a/modules/edge-voting/Cargo.toml b/modules/edge-voting/Cargo.toml
index be4cc838..aee30c49 100644
--- a/modules/edge-voting/Cargo.toml
+++ b/modules/edge-voting/Cargo.toml
@@ -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"]
diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
index f1b2c9ff..e35e9369 100644
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -42,49 +42,49 @@ hex = "0.3.2"
 serde_json = "1.0"
 
 # primitives
-sp-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-consensus-aura = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-finality-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-finality-tracker = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-inherents = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-keyring = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-consensus = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sp-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-consensus-aura = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-finality-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-finality-tracker = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-inherents = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-keyring = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-consensus = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 
 # client dependencies
-sc-client-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-chain-spec = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-consensus = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-network = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-consensus-aura = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-finality-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-client-db = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sc-offchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-basic-authorship = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-service = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sc-tracing = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-telemetry = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sc-client-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-chain-spec = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-consensus = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-network = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-consensus-aura = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-finality-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-client-db = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sc-offchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-basic-authorship = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-service = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sc-tracing = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-telemetry = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 
 
 # frame dependencies
-pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-im-online = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-system-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-im-online = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-system-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 
 # node-specific dependencies
 edgeware-runtime = { path = "../runtime" }
@@ -94,23 +94,23 @@ edgeware-executor = { path = "../executor" }
 
 # CLI-specific dependencies
 edgeware-inspect = { version = "3.0.0", optional = true, path = "../inspect" }
-sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", optional = true }
-frame-benchmarking-cli = { optional = true, git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", optional = true }
+frame-benchmarking-cli = { optional = true, git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 
 
 # WASM-specific dependencies
 wasm-bindgen = { version = "0.2.57", optional = true }
 wasm-bindgen-futures = { version = "0.4.7", optional = true }
-browser-utils = { package = "substrate-browser-utils", git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", optional = true }
+browser-utils = { package = "substrate-browser-utils", git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", optional = true }
 
 [target.'cfg(target_arch="x86_64")'.dependencies]
-node-executor = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", features = [ "wasmtime" ] }
-sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", optional = true, features = [ "wasmtime" ] }
-sc-service = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false, features = [ "wasmtime" ] }
+node-executor = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", features = [ "wasmtime" ] }
+sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", optional = true, features = [ "wasmtime" ] }
+sc-service = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false, features = [ "wasmtime" ] }
 
 [dev-dependencies]
-sc-keystore = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-service-test = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sc-keystore = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-service-test = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 futures = "0.3.4"
 tempfile = "3.1.0"
 assert_cmd = "1.0"
@@ -120,11 +120,11 @@ regex = "1"
 platforms = "0.2.1"
 
 [build-dependencies]
-sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", optional = true }
-substrate-build-script-utils = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", optional = true }
+sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", optional = true }
+substrate-build-script-utils = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", optional = true }
 structopt = { version = "0.3.8", optional = true }
 edgeware-inspect = { version = "3.0.0", optional = true, path = "../inspect" }
-frame-benchmarking-cli = { optional = true, git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+frame-benchmarking-cli = { optional = true, git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 
 
 [features]
diff --git a/node/executor/Cargo.toml b/node/executor/Cargo.toml
index 02ad5307..5d824377 100644
--- a/node/executor/Cargo.toml
+++ b/node/executor/Cargo.toml
@@ -8,30 +8,30 @@ edition = "2018"
 [dependencies]
 trie-root = "0.16.0"
 codec = { package = "parity-scale-codec", version = "1.3.0" }
-sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-state-machine = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-executor = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-trie = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-benchmarking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-state-machine = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-executor = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-trie = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-benchmarking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 
 edgeware-primitives = { path = "../primitives" }
 edgeware-runtime = { path = "../runtime" }
 edgeware-runtime-interface = { path = "../runtime-interface" }
 
 [dev-dependencies]
-test-client = { package = "substrate-test-client", git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+test-client = { package = "substrate-test-client", git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 wabt = "0.9.2"
 criterion = "0.3.0"
 
diff --git a/node/inspect/Cargo.toml b/node/inspect/Cargo.toml
index cff097b2..fa83090f 100644
--- a/node/inspect/Cargo.toml
+++ b/node/inspect/Cargo.toml
@@ -11,10 +11,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "1.3.0" }
 derive_more = "0.99"
 log = "0.4.8"
-sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-client-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-service = { default-features = false, git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-blockchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sc-cli = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-client-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-service = { default-features = false, git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-blockchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 structopt = "0.3.8"
diff --git a/node/primitives/Cargo.toml b/node/primitives/Cargo.toml
index 130289b3..0dcd306e 100644
--- a/node/primitives/Cargo.toml
+++ b/node/primitives/Cargo.toml
@@ -9,13 +9,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
-frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-application-crypto = { 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-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
+frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-application-crypto = { 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 }
+sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
 
 [dev-dependencies]
-sp-serializer = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sp-serializer = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 pretty_assertions = "0.6.1"
 
 [features]
diff --git a/node/rpc-client/Cargo.toml b/node/rpc-client/Cargo.toml
index b2d902e2..8b76b360 100644
--- a/node/rpc-client/Cargo.toml
+++ b/node/rpc-client/Cargo.toml
@@ -11,4 +11,4 @@ hyper = "0.12.35"
 jsonrpc-core-client = { version = "14.0.3", features = ["http", "ws"] }
 log = "0.4.8"
 edgeware-primitives = { path = "../primitives" }
-sc-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sc-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml
index ca963e30..66019c2c 100644
--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -9,19 +9,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 jsonrpc-core = "14.0.3"
-sc-client-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-contracts-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-transaction-payment-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-substrate-frame-rpc-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-keystore = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-consensus = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-blockchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-finality-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-finality-grandpa-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-rpc-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-block-builder = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sc-client-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-contracts-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-transaction-payment-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+substrate-frame-rpc-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-keystore = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-consensus = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-blockchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-finality-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-finality-grandpa-rpc = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-rpc-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-block-builder = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 edgeware-primitives = { path = "../primitives" }
 edgeware-runtime = { path = "../runtime" }
\ No newline at end of file
diff --git a/node/runtime-interface/Cargo.toml b/node/runtime-interface/Cargo.toml
index 81b91ef1..ab276a35 100644
--- a/node/runtime-interface/Cargo.toml
+++ b/node/runtime-interface/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.0" }
-sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-runtime-interface = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-runtime-interface-proc-macro = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-runtime-interface = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-runtime-interface-proc-macro = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 edgeware-primitives = { path = "../primitives" }
 
 [features]
diff --git a/node/runtime/Cargo.toml b/node/runtime/Cargo.toml
index c887a998..a363a5bf 100644
--- a/node/runtime/Cargo.toml
+++ b/node/runtime/Cargo.toml
@@ -20,61 +20,61 @@ serde = { version = "1.0.102", optional = true }
 static_assertions = "1.1.0"
 
 # primitives
-sp-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-consensus-aura = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-block-builder = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false}
-sp-inherents = { 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-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-api = { 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 }
-sp-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-keyring = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", optional = true }
-sp-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-version = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-sp-offchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
+sp-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-consensus-aura = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-block-builder = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false}
+sp-inherents = { 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 }
+sp-std = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-api = { 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 }
+sp-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-keyring = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", optional = true }
+sp-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-transaction-pool = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-version = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+sp-offchain = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
 
 # edgeware primitives
 edgeware-primitives = { path = "../primitives", default-features = false }
 
 # pallet dependencies
-pallet-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-authorship = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-aura = { 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-collective = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-contracts-primitives = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-contracts-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-democracy = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-elections-phragmen = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-evm = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-frame-executive = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-finality-tracker = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-identity = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-im-online = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-multisig = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-offences = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-proxy = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-randomness-collective-flip = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-recovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-scheduler = { 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, features = ["historical"] }
-pallet-staking = { 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" }
-pallet-sudo = { 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 }
-frame-system-rpc-runtime-api = { 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 }
-pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-utility = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
-pallet-vesting = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", default-features = false }
+pallet-authority-discovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-authorship = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-aura = { 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-collective = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-contracts-primitives = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-contracts-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-democracy = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-elections-phragmen = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-evm = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+frame-executive = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-finality-tracker = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-identity = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-im-online = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-multisig = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-offences = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-proxy = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-randomness-collective-flip = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-recovery = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-scheduler = { 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, features = ["historical"] }
+pallet-staking = { 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" }
+pallet-sudo = { 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 }
+frame-system-rpc-runtime-api = { 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 }
+pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-utility = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
+pallet-vesting = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", default-features = false }
 
 
 signaling = { package = "edge-signaling", path = "../../modules/edge-signaling", default-features = false }
@@ -82,10 +82,10 @@ treasury-reward = { package = "edge-treasury-reward", path = "../../modules/edge
 voting = { package = "edge-voting", path = "../../modules/edge-voting", default-features = false }
 
 [build-dependencies]
-wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", version = "1.0.4" }
+wasm-builder-runner = { package = "substrate-wasm-builder-runner", git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", version = "1.0.4" }
 
 [dev-dependencies]
-sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 
 [features]
 default = ["std"]
diff --git a/node/runtime/src/lib.rs b/node/runtime/src/lib.rs
index 13fd590c..51686977 100644
--- a/node/runtime/src/lib.rs
+++ b/node/runtime/src/lib.rs
@@ -848,12 +848,14 @@ mod custom_migration {
 	use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};
 	use pallet_balances::migration::on_runtime_upgrade as balances_upgrade;
 	use frame_system::migration::migrate_accounts as accounts_upgrade;
+	use pallet_staking::migration::migrate_to_simple_payouts as staking_upgrade;
 
 	pub struct Upgrade;
 	impl OnRuntimeUpgrade for Upgrade {
 		fn on_runtime_upgrade() -> Weight {
 			let mut weight = 0;
 			weight += balances_upgrade::<Runtime, pallet_balances::DefaultInstance>();
+			weight += staking_upgrade::<Runtime>();
 			weight += accounts_upgrade::<Runtime>();
 			weight
 		}
diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml
index f96c037c..0d91a7a1 100644
--- a/node/testing/Cargo.toml
+++ b/node/testing/Cargo.toml
@@ -6,25 +6,25 @@ description = "Test utilities for Edgeware."
 edition = "2018"
 
 [dependencies]
-pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+pallet-balances = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 codec = { package = "parity-scale-codec", version = "1.3.0" }
-sc-service = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel", features = ["test-helpers", "db"] }
-pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-keyring = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-sc-executor = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-substrate-test-client = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
-pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "time-travel" }
+sc-service = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration", features = ["test-helpers", "db"] }
+pallet-contracts = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-grandpa = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-indices = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-keyring = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-core = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-io = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-support = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-session = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sp-runtime = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-staking = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+sc-executor = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+frame-system = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+substrate-test-client = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-timestamp = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-transaction-payment = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
+pallet-treasury = { git = "https://github.com/hicommonwealth/substrate.git", branch = "apopiak-staking-migration" }
 wabt = "0.9.2"
 
 edgeware-executor = { path = "../executor" }