Skip to content

chore: upgrade and clean up #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weichweich merged 6 commits into from
Apr 28, 2022
Merged

chore: upgrade and clean up #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3cd60f0
chore: upgrade
weichweich Apr 28, 2022
98d6820
fix keys
weichweich Apr 28, 2022
d948eeb
refactor: use runtime debug
weichweich Apr 28, 2022
39356e7
fix: don't disable default features in dev-dependencies
weichweich Apr 28, 2022
b6542ca
refactor: remove more debug impls
weichweich Apr 28, 2022
4181e1a
🧹🐢
weichweich Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 28 additions & 53 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions nodes/parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ runtime-common = {path = "../../runtimes/common"}
spiritnet-runtime = {path = "../../runtimes/spiritnet"}

# External dependencies
clap = { version = "3.1.6", features = ["derive"] }
codec = {package = "parity-scale-codec", version = "3.0.0"}
derive_more = "0.99.16"
futures = {version = "0.3.1", features = ["compat"]}
clap = {version = "3.1.12", features = ["derive"]}
codec = {package = "parity-scale-codec", version = "3.1.2"}
derive_more = "0.99.17"
futures = {version = "0.3.21", features = ["compat"]}
hex-literal = "0.3.4"
log = "0.4.16"
parking_lot = "0.12.0"
serde = {version = "1.0.132", features = ["derive"]}
serde_json = "1.0.74"
serde = {version = "1.0.136", features = ["derive"]}
serde_json = "1.0.79"

# Substrate dependencies
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
Expand Down Expand Up @@ -79,8 +79,8 @@ cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch
cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
cumulus-relay-chain-inprocess-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}
cumulus-relay-chain-rpc-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.19"}

# Polkadot dependencies
Expand All @@ -96,8 +96,8 @@ frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branc

# Runtime tests
node-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
pallet-conviction-voting = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
pallet-referenda = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
pallet-conviction-voting = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
pallet-referenda = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}
try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", optional = true}

[features]
Expand Down
13 changes: 6 additions & 7 deletions nodes/standalone/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ name = "mashnet-node"
path = "src/main.rs"

[build-dependencies]
build-script-utils = {package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
vergen = "3.1.0"
substrate-build-script-utils = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}

[dependencies]

Expand All @@ -20,12 +19,12 @@ mashnet-node-runtime = {path = "../../runtimes/standalone"}
runtime-common = {path = "../../runtimes/common"}

# External dependencies
clap = {version = "3.1", features = ["derive"]}
futures = "0.3"
clap = {version = "3.1.12", features = ["derive"]}
futures = "0.3.21"
hex-literal = "0.3.4"
log = "0.4.16"
serde = {version = "1.0.132", features = ["derive"]}
serde_json = "1.0.74"
serde = {version = "1.0.136", features = ["derive"]}
serde_json = "1.0.79"

# Substrate dependencies
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19"}
Expand Down Expand Up @@ -75,7 +74,7 @@ runtime-benchmarks = [
"mashnet-node-runtime/runtime-benchmarks",
"pallet-conviction-voting/runtime-benchmarks",
"pallet-referenda/runtime-benchmarks",
"runtime-common/runtime-benchmarks"
"runtime-common/runtime-benchmarks",
]
try-runtime = [
"mashnet-node-runtime/try-runtime",
Expand Down
8 changes: 3 additions & 5 deletions nodes/standalone/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@

// If you feel like getting in touch with us, you can do so at [email protected]

use vergen::{generate_cargo_keys, ConstantsFlags};

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();
}
4 changes: 2 additions & 2 deletions nodes/standalone/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ fn get_authority_keys_from_secret(seed: &str) -> (AccountId, AuraId, GrandpaId)

const TELEMETRY_URL: &str = "wss://telemetry-backend.kilt.io:8080/submit";

const SPORRAN_AUTHORITY_ACC: [u8; 32] = hex!("0621f3a33afc66ab7973e3d2cdf86d30ab89aa3e717e8bb1db23a9cb1736061b");
const SPORRAN_AUTHORITY_ACC: [u8; 32] = hex!("2c94fbcfe0a7db40579e12bc74d0f7215fe91ba51b3eade92799788ca549f373");
const SPORRAN_AUTHORITY_SESSION: [u8; 32] = hex!("3bbaa842650064362767a1d9dd8899f531c80dc42eafb9599f4df0965e4a5299");
const SPORRAN_FAUCET: [u8; 32] = hex!("2c9e9c40e15a2767e2d04dc1f05d824dd76d1d37bada3d7bb1d40eca29f3a4ff");
const SPORRAN_FAUCET: [u8; 32] = hex!("780d87860ac7a02ebffa10e41a5a486efdebf63d595a44907ec0ced1d8626c4a");
const TRANSFER_ACCOUNT: [u8; 32] = hex!("6a3c793cec9dbe330b349dc4eea6801090f5e71f53b1b41ad11afb4a313a282c");

impl Alternative {
Expand Down
Loading