Reset to substrate-node v0.9.40

octopus-network · Apr 1, 2023 · 81a16c3 · 81a16c3
1 parent cc86629
commit 81a16c3
Show file tree

Hide file tree

Showing 30 changed files with 7,997 additions and 3,841 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
diff --git a/cli/bin/main.rs b/cli/bin/main.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2018-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
@@ -21,5 +21,5 @@
 #![warn(missing_docs)]
 
 fn main() -> sc_cli::Result<()> {
-	appchain_cli::run()
+	node_cli::run()
 }
diff --git a/cli/build.rs b/cli/build.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@ fn main() {
 mod cli {
 	include!("src/cli.rs");
 
-	use clap::{ArgEnum, CommandFactory};
+	use clap::{CommandFactory, ValueEnum};
 	use clap_complete::{generate_to, Shell};
 	use std::{env, fs, path::Path};
 	use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};

diff --git a/cli/res/flaming-fir.json b/cli/res/flaming-fir.json
diff --git a/cli/res/octopus-mainnet.json b/cli/res/octopus-mainnet.json
diff --git a/cli/res/octopus-testnet.json b/cli/res/octopus-testnet.json
diff --git a/cli/src/benchmarking.rs b/cli/src/benchmarking.rs
@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// Copyright (C) Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
 
 // This program is free software: you can redistribute it and/or modify
@@ -22,8 +22,8 @@
 
 use crate::service::{create_extrinsic, FullClient};
 
-use appchain_barnacle_runtime::{BalancesCall, SystemCall};
-use appchain_primitives::{AccountId, Balance};
+use kitchensink_runtime::{BalancesCall, SystemCall};
+use node_primitives::{AccountId, Balance};
 use sc_cli::Result;
 use sp_inherents::{InherentData, InherentDataProvider};
 use sp_keyring::Sr25519Keyring;
@@ -116,8 +116,7 @@ pub fn inherent_benchmark_data() -> Result<InherentData> {
 	let d = Duration::from_millis(0);
 	let timestamp = sp_timestamp::InherentDataProvider::new(d.into());
 
-	timestamp
-		.provide_inherent_data(&mut inherent_data)
+	futures::executor::block_on(timestamp.provide_inherent_data(&mut inherent_data))
 		.map_err(|e| format!("creating inherent data: {:?}", e))?;
 	Ok(inherent_data)
 }