Upgrade to substrate v1.0.0

Cargo.toml

@@ -2,7 +2,7 @@
 authors = ['Joystream']
 edition = '2018'
 name = 'joystream-node-runtime'
-version = '1.0.1'
+version = '4.1.0'
 
 [features]
 default = ['std']
@@ -15,7 +15,6 @@ std = [
     'runtime-io/std',
     'srml-support/std',
     'balances/std',
-    'fees/std',
     'executive/std',
     'aura/std',
     'indices/std',
@@ -30,48 +29,46 @@ std = [
     'consensus-aura/std',
     'staking/std',
     'session/std',
+    'offchain-primitives/std',
+    'consensus-authorities/std',
+    'grandpa/std',
+    'finality-tracker/std',
 ]
 [dependencies.aura]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-aura'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.balances]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-balances'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.consensus]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-consensus'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.consensus-aura]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'substrate-consensus-aura-primitives'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.executive]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-executive'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
-
-[dependencies.fees]
-default_features = false
-git = 'https://github.com/joystream/substrate.git'
-package = 'srml-fees'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.indices]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-indices'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.parity-codec]
 default-features = false
@@ -85,25 +82,25 @@ version = '3.1'
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'substrate-primitives'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.rstd]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'sr-std'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.runtime-io]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'sr-io'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.runtime-primitives]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'sr-primitives'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.safe-mix]
 default-features = false
@@ -120,45 +117,69 @@ version = '1.0'
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.substrate-client]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.sudo]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-sudo'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-system'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.timestamp]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-timestamp'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.version]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'sr-version'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.staking]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-staking'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.session]
 default_features = false
 git = 'https://github.com/joystream/substrate.git'
 package = 'srml-session'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
+
+[dependencies.offchain-primitives]
+default_features = false
+git = 'https://github.com/joystream/substrate.git'
+package = 'substrate-offchain-primitives'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
+
+[dependencies.consensus-authorities]
+default_features = false
+git = 'https://github.com/joystream/substrate.git'
+package = 'substrate-consensus-authorities'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
+
+[dependencies.grandpa]
+default_features = false
+git = 'https://github.com/joystream/substrate.git'
+package = 'srml-grandpa'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
+
+[dependencies.finality-tracker]
+default_features = false
+git = 'https://github.com/joystream/substrate.git'
+package = 'srml-finality-tracker'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'

src/governance/council.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(not(feature = "std"), no_std)]
-
 use rstd::prelude::*;
 use runtime_primitives::traits::{As, Zero};
 use srml_support::{decl_event, decl_module, decl_storage, ensure, StorageValue};
@@ -68,7 +66,7 @@ decl_module! {
     pub struct Module<T: Trait> for enum Call where origin: T::Origin {
         fn deposit_event<T>() = default;
 
-        fn on_finalise(now: T::BlockNumber) {
+        fn on_finalize(now: T::BlockNumber) {
             if now == Self::term_ends_at() {
                 Self::deposit_event(RawEvent::CouncilTermEnded(now));
                 T::CouncilTermEnded::council_term_ended();