Merge pull request #3 from PureStake/alan-spring-cleaning

Alan spring cleaning

.editorconfig

@@ -0,0 +1,22 @@
+root = true
+[*]
+indent_style=tab
+indent_size=tab
+tab_width=4
+end_of_line=lf
+charset=utf-8
+trim_trailing_whitespace=true
+max_line_length=100
+insert_final_newline=true
+
+[*.yml]
+indent_style=space
+indent_size=2
+tab_width=8
+end_of_line=lf
+
+[*.sh]
+indent_style=space
+indent_size=2
+tab_width=8
+end_of_line=lf

.gitignore

@@ -5,9 +5,8 @@ book
 **/.DS_Store
 
 # Rust directories
-**/node/target
+**/target
 *.lock
 **/scripts/staging/tmp
 **/scripts/staging/spec.json
 **/scripts/staging/rawspec.json
-

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": true
+}

Cargo.toml

@@ -0,0 +1,7 @@
+[workspace]
+members = [
+    'node',
+    'runtime',
+]
+[profile.release]
+panic = 'unwind'

node/Cargo.toml

@@ -1,87 +1,83 @@
 [package]
-name = "moonbeam-node"
-version = "0.1.0"
-authors = ["PureStake"]
-edition = "2018"
-license = "Unlicense"
-build = "build.rs"
+authors = ['PureStake']
+build = 'build.rs'
+description = 'Substrate Moonbeam Node '
+edition = '2018'
+homepage = 'https://moonbeam.network'
+license = 'Unlicense'
+name = 'node-moonbeam'
+repository = 'https://github.com/PureStake/moonbeam/'
+version = '0.1.0'
 
-[[bin]]
-name = "moonbeam"
-path = "src/main.rs"
+[package.metadata.docs.rs]
+targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.0.6" }
-serde = { version = "1.0.102", features = ["derive"] }
-futures = { version = "0.3.1", features = ["compat"] }
-hex-literal = "0.2.1"
-jsonrpc-core = "14.0.3"
-log = "0.4.8"
-rand = "0.7.2"
-structopt = { version = "0.3.8", optional = true }
-tracing = "0.1.10"
-serde_json = "1.0.41"
-
-# primitives
-grandpa-primitives = { package = "sp-finality-grandpa", git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-core = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-runtime = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-inherents = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-consensus-babe = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-consensus = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-timestamp = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-finality-tracker = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-authority-discovery = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-
-# client dependencies
-sc-client = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sp-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-network = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-consensus-babe = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-grandpa = { package = "sc-finality-grandpa", git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-rpc = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-service = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-executor = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-basic-authorship = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-chain-spec = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-authority-discovery = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-consensus-babe-rpc = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-
-# frame dependencies
-pallet-indices = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-pallet-contracts = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02', default-features = false }
-pallet-contracts-rpc = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02', default-features = false }
-pallet-timestamp = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02', default-features = false }
-frame-system = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-pallet-balances = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-pallet-transaction-payment = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-frame-support = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02', default-features = false }
-pallet-im-online = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02', default-features = false }
-pallet-authority-discovery = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-
-# CLI-specific dependencies
-sc-cli = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-
-# node-specific dependencies 
-node-primitives = { version = "2.0.0-dev", path = "../primitives" }
-moonbeam-runtime = { version = "0.1.0", path = "../runtime" }
-
-[dev-dependencies]
-sc-keystore = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-sc-consensus-babe = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02', features = ["test-helpers"] }
-sc-consensus-epochs = { git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-
-[build-dependencies]
-vergen = "3.0.4"
-build-script-utils = { package = "substrate-build-script-utils", git = 'https://github.com/paritytech/substrate.git', rev = '992aea815a753da256a9c0bff053df408532df02' }
-structopt = { version = "0.3.8", optional = true }
-
-[features]
-default = ["cli"]
-cli = [
-	"structopt",
-]
+futures = '0.3.4'
+log = '0.4.8'
+structopt = '0.3.8'
+
+[dependencies.node-moonbeam-runtime]
+path = '../runtime'
+version = '0.1.0'
+
+[dependencies.sc-basic-authorship]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-cli]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-client-api]
+version = '2.0.0-alpha.7'
+
+[dependencies.sc-consensus]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-consensus-aura]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-executor]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-finality-grandpa]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-network]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-service]
+version = '0.8.0-alpha.7'
+
+[dependencies.sc-transaction-pool]
+version = '2.0.0-alpha.7'
+
+[dependencies.sp-consensus]
+version = '0.8.0-alpha.7'
+
+[dependencies.sp-consensus-aura]
+version = '0.8.0-alpha.7'
+
+[dependencies.sp-core]
+version = '2.0.0-alpha.7'
+
+[dependencies.sp-finality-grandpa]
+version = '2.0.0-alpha.7'
+
+[dependencies.sp-inherents]
+version = '2.0.0-alpha.7'
+
+[dependencies.sp-runtime]
+version = '2.0.0-alpha.7'
+
+[dependencies.sp-transaction-pool]
+version = '2.0.0-alpha.7'
+[build-dependencies.substrate-build-script-utils]
+version = '2.0.0-alpha.7'
+
+[dependencies.evm]
+default-features = false
+version = '2.0.0-alpha.7'
+package = 'pallet-evm'
+
+[[bin]]
+name = 'node-moonbeam'

node/build.rs

@@ -1,9 +1,7 @@
-use vergen::{ConstantsFlags, generate_cargo_keys};
-
-const ERROR_MSG: &str = "Failed to generate metadata files";
+use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 
 fn main() {
-	generate_cargo_keys(ConstantsFlags::SHA_SHORT).expect(ERROR_MSG);
+	generate_cargo_keys();
 
-	build_script_utils::rerun_if_git_head_changed();
+	rerun_if_git_head_changed();
 }