Upgrade to substrate v1.0.0

.gitignore

@@ -2,11 +2,10 @@
 # will have compiled files and executables
 **/target/
 
-# Cargo lock in subs
-runtime/**/Cargo.lock
-
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
 # JetBrains IDEs
 .idea
+
+substrate-runtime-joystream/

Cargo.toml

@@ -1,24 +1,34 @@
+[[bin]]
+name = 'joystream-node'
+path = 'src/main.rs'
+
+[package]
+authors = ['Joystream']
+build = 'build.rs'
+edition = '2018'
+name = 'joystream-node'
+version = '1.0.0'
+
 [dependencies]
 error-chain = '0.12'
 exit-future = '0.1'
 futures = '0.1'
 hex-literal = '0.1'
 log = '0.4'
-parity-codec = '3.0'
+parity-codec = '3.2'
 parking_lot = '0.7.1'
-slog = '^2'
 tokio = '0.1'
-trie-root = '0.11.0'
+trie-root = '0.12.0'
 
 [dependencies.basic-authorship]
 git = 'https://github.com/joystream/substrate.git'
 package = 'substrate-basic-authorship'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.consensus]
 git = 'https://github.com/joystream/substrate.git'
 package = 'substrate-consensus-aura'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.ctrlc]
 features = ['termination']
@@ -27,66 +37,59 @@ version = '3.0'
 [dependencies.inherents]
 git = 'https://github.com/joystream/substrate.git'
 package = 'substrate-inherents'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
-[dependencies.node-executor]
+[dependencies.network]
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+package = 'substrate-network'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.joystream-node-runtime]
-git = 'https://github.com/joystream/substrate-runtime-joystream.git'
-tag = 'v3.4.0'
-# When developing locally change the location of the dependency to a local directory
-# comment out the "git" and "tag" lines above and replace with a "path"
-# path = 'runtime'
-# path = '../my-local-joystream-runtime-repo/'
+# clone https://github.com/joystream/substrate-runtime-joystream to this path:
+path = 'substrate-runtime-joystream'
 
 [dependencies.primitives]
 git = 'https://github.com/joystream/substrate.git'
 package = 'substrate-primitives'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.sr-io]
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.substrate-cli]
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.substrate-client]
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.substrate-executor]
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
-
-[dependencies.substrate-network]
-git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.substrate-service]
 git = 'https://github.com/joystream/substrate.git'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
 [dependencies.transaction-pool]
 git = 'https://github.com/joystream/substrate.git'
 package = 'substrate-transaction-pool'
-rev = 'df5e65927780b323482e2e8b5031822f423a032d'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
-[package]
-authors = ['Joystream']
-build = 'build.rs'
-edition = '2018'
-name = 'joystream-node'
-version = '0.10.1'
+[dependencies.substrate-telemetry]
+git = 'https://github.com/joystream/substrate.git'
+package = 'substrate-telemetry'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
-[[bin]]
-name = 'joystream-node'
-path = 'src/main.rs'
+[dependencies.grandpa]
+git = 'https://github.com/joystream/substrate.git'
+package = 'substrate-finality-grandpa'
+rev = '89bbb7b6d0e076f0eda736b330f5f792aa2e2991'
 
-[build-dependencies]
-vergen = '3'
 [profile.release]
 panic = 'unwind'
+
+[build-dependencies]
+vergen = '3'

build-runtime.sh

@@ -12,7 +12,7 @@ normal=$(tput sgr0)
 # Save current directory.
 pushd . >/dev/null
 
-for SRC in runtime/wasm
+for SRC in substrate-runtime-joystream/
 do
   echo "${bold}Building webassembly binary in $SRC...${normal}"
   cd "$PROJECT_ROOT/$SRC"