update substrate dependency to branch v1.0

Cargo.toml

@@ -2,11 +2,7 @@
 authors = ['Joystream']
 edition = '2018'
 name = 'joystream-node-runtime'
-version = '5.4.0'
-
-[dependencies]
-# restrict version of syn, see https://github.com/paritytech/substrate/issues/2326
-syn = { version = ">= 0.15.26, < 0.15.32", features = ["full"] }
+version = '6.0.0'
 
 [features]
 default = ['std']
@@ -41,43 +37,43 @@ std = [
 ]
 [dependencies.aura]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-aura'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.balances]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-balances'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.consensus]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-consensus'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.consensus-aura]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-consensus-aura-primitives'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.executive]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-executive'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.indices]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-indices'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.parity-codec]
 default-features = false
-version = '3.1'
+version = '3.2'
 
 [dependencies.parity-codec-derive]
 default-features = false
@@ -85,27 +81,27 @@ version = '3.1'
 
 [dependencies.primitives]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-primitives'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.rstd]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-std'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.runtime-io]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-io'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.runtime-primitives]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.safe-mix]
 default-features = false
@@ -121,76 +117,78 @@ version = '1.0'
 
 [dependencies.srml-support]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+git = 'https://github.com/paritytech/substrate.git'
+branch = "v1.0"
 
 [dependencies.substrate-client]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+git = 'https://github.com/paritytech/substrate.git'
+branch = "v1.0"
 
 [dependencies.sudo]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-sudo'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.system]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.timestamp]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-timestamp'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.version]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-version'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.staking]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-staking'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.session]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-session'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.offchain-primitives]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-offchain-primitives'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.consensus-authorities]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-consensus-authorities'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.grandpa]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-grandpa'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.finality-tracker]
 default_features = false
-git = 'https://github.com/joystream/substrate.git'
+git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-finality-tracker'
-rev = '6dfc3e8b057bb00322136251a0f10305fbb1ad8f'
+branch = "v1.0"
 
 [dependencies.forum]
 default_features = false
 git = 'https://github.com/joystream/substrate-forum-module'
 package = 'substrate-forum-module'
-tag = "v1.0.0"
+branch = "development"
+# Before releasing Rome - finalize and tag release new forum and update this
+# tag = "v1.0.0"

src/lib.rs

@@ -129,8 +129,8 @@ pub mod opaque {
 pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
-    authoring_version: 5,
-    spec_version: 4,
+    authoring_version: 6,
+    spec_version: 0,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
 };

wasm/Cargo.toml

@@ -20,4 +20,4 @@ path = '..'
 authors = ['Joystream']
 edition = '2018'
 name = 'joystream-node-runtime-wasm'
-version = '5.4.0'
+version = '6.0.0'