diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 2b76f61df79124acb489b616d1c99eda16ec84d8..733c6d73d270988cd3d993b0951a6b7e6c547522 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -3299,6 +3299,100 @@ dependencies = [
"tiny-keccak",
]
+[[package]]
+name = "kitchensink-runtime"
+version = "3.0.0-dev"
+dependencies = [
+ "frame-benchmarking",
+ "frame-election-provider-support",
+ "frame-executive",
+ "frame-support",
+ "frame-system",
+ "frame-system-benchmarking",
+ "frame-system-rpc-runtime-api",
+ "frame-try-runtime",
+ "hex-literal",
+ "log",
+ "node-primitives",
+ "pallet-alliance",
+ "pallet-asset-tx-payment",
+ "pallet-assets",
+ "pallet-authority-discovery",
+ "pallet-authorship",
+ "pallet-babe",
+ "pallet-bags-list",
+ "pallet-balances",
+ "pallet-bounties",
+ "pallet-child-bounties",
+ "pallet-collective",
+ "pallet-contracts",
+ "pallet-contracts-primitives",
+ "pallet-contracts-rpc-runtime-api",
+ "pallet-conviction-voting",
+ "pallet-democracy",
+ "pallet-election-provider-multi-phase",
+ "pallet-election-provider-support-benchmarking",
+ "pallet-elections-phragmen",
+ "pallet-gilt",
+ "pallet-grandpa",
+ "pallet-identity",
+ "pallet-im-online",
+ "pallet-indices",
+ "pallet-lottery",
+ "pallet-membership",
+ "pallet-mmr",
+ "pallet-multisig",
+ "pallet-nomination-pools",
+ "pallet-nomination-pools-benchmarking",
+ "pallet-nomination-pools-runtime-api",
+ "pallet-offences",
+ "pallet-offences-benchmarking",
+ "pallet-preimage",
+ "pallet-proxy",
+ "pallet-randomness-collective-flip",
+ "pallet-ranked-collective",
+ "pallet-recovery",
+ "pallet-referenda",
+ "pallet-remark",
+ "pallet-scheduler",
+ "pallet-session",
+ "pallet-session-benchmarking",
+ "pallet-society",
+ "pallet-staking",
+ "pallet-staking-reward-curve",
+ "pallet-state-trie-migration",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-tips",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "pallet-transaction-storage",
+ "pallet-treasury",
+ "pallet-uniques",
+ "pallet-utility",
+ "pallet-vesting",
+ "pallet-whitelist",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-authority-discovery",
+ "sp-block-builder",
+ "sp-consensus-babe",
+ "sp-core",
+ "sp-inherents",
+ "sp-io",
+ "sp-offchain",
+ "sp-runtime",
+ "sp-sandbox",
+ "sp-session",
+ "sp-staking",
+ "sp-std",
+ "sp-transaction-pool",
+ "sp-version",
+ "static_assertions",
+ "substrate-wasm-builder",
+]
+
[[package]]
name = "kv-log-macro"
version = "1.0.7"
@@ -4511,12 +4605,12 @@ dependencies = [
"futures",
"hash-db",
"hex",
+ "kitchensink-runtime",
"kvdb",
"kvdb-rocksdb",
"lazy_static",
"log",
"node-primitives",
- "node-runtime",
"node-testing",
"parity-db",
"parity-util-mem",
@@ -4553,13 +4647,13 @@ dependencies = [
"futures",
"hex-literal",
"jsonrpsee",
+ "kitchensink-runtime",
"log",
"nix 0.23.1",
"node-executor",
"node-inspect",
"node-primitives",
"node-rpc",
- "node-runtime",
"pallet-asset-tx-payment",
"pallet-balances",
"pallet-im-online",
@@ -4631,8 +4725,8 @@ dependencies = [
"frame-support",
"frame-system",
"futures",
+ "kitchensink-runtime",
"node-primitives",
- "node-runtime",
"node-testing",
"pallet-balances",
"pallet-contracts",
@@ -4716,107 +4810,13 @@ dependencies = [
"substrate-state-trie-migration-rpc",
]
-[[package]]
-name = "node-runtime"
-version = "3.0.0-dev"
-dependencies = [
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal",
- "log",
- "node-primitives",
- "pallet-alliance",
- "pallet-asset-tx-payment",
- "pallet-assets",
- "pallet-authority-discovery",
- "pallet-authorship",
- "pallet-babe",
- "pallet-bags-list",
- "pallet-balances",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-contracts",
- "pallet-contracts-primitives",
- "pallet-contracts-rpc-runtime-api",
- "pallet-conviction-voting",
- "pallet-democracy",
- "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
- "pallet-gilt",
- "pallet-grandpa",
- "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-lottery",
- "pallet-membership",
- "pallet-mmr",
- "pallet-multisig",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-randomness-collective-flip",
- "pallet-ranked-collective",
- "pallet-recovery",
- "pallet-referenda",
- "pallet-remark",
- "pallet-scheduler",
- "pallet-session",
- "pallet-session-benchmarking",
- "pallet-society",
- "pallet-staking",
- "pallet-staking-reward-curve",
- "pallet-state-trie-migration",
- "pallet-sudo",
- "pallet-timestamp",
- "pallet-tips",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-transaction-storage",
- "pallet-treasury",
- "pallet-uniques",
- "pallet-utility",
- "pallet-vesting",
- "pallet-whitelist",
- "parity-scale-codec",
- "scale-info",
- "sp-api",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-offchain",
- "sp-runtime",
- "sp-sandbox",
- "sp-session",
- "sp-staking",
- "sp-std",
- "sp-transaction-pool",
- "sp-version",
- "static_assertions",
- "substrate-wasm-builder",
-]
-
[[package]]
name = "node-runtime-generate-bags"
version = "3.0.0"
dependencies = [
"clap 3.1.18",
"generate-bags",
- "node-runtime",
+ "kitchensink-runtime",
]
[[package]]
@@ -4905,10 +4905,10 @@ dependencies = [
"frame-system",
"fs_extra",
"futures",
+ "kitchensink-runtime",
"log",
"node-executor",
"node-primitives",
- "node-runtime",
"pallet-asset-tx-payment",
"pallet-transaction-payment",
"parity-scale-codec",
diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
index 90c325b8e5b32e39bca786b3a855c0256b276af8..4d090c71a72e95fe7567eeb3129bd69949e62bd3 100644
--- a/substrate/bin/node/bench/Cargo.toml
+++ b/substrate/bin/node/bench/Cargo.toml
@@ -13,7 +13,7 @@ clap = { version = "3.1.18", features = ["derive"] }
log = "0.4.17"
node-primitives = { version = "2.0.0", path = "../primitives" }
node-testing = { version = "3.0.0-dev", path = "../testing" }
-node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+kitchensink-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }
sp-state-machine = { version = "0.12.0", path = "../../../primitives/state-machine" }
diff --git a/substrate/bin/node/bench/src/import.rs b/substrate/bin/node/bench/src/import.rs
index b9229fbd5331da25b9c885034cb296ab22a2756b..47f630eb68700b26d2dd69d1eca0b2856d35b4bf 100644
--- a/substrate/bin/node/bench/src/import.rs
+++ b/substrate/bin/node/bench/src/import.rs
@@ -148,13 +148,13 @@ impl core::Benchmark for ImportBenchmark {
// the transaction fee into the treasury
// - extrinsic success
assert_eq!(
- node_runtime::System::events().len(),
+ kitchensink_runtime::System::events().len(),
(self.block.extrinsics.len() - 1) * 8 + 1,
);
},
BlockType::Noop => {
assert_eq!(
- node_runtime::System::events().len(),
+ kitchensink_runtime::System::events().len(),
// should be 2 per signed extrinsic + 1 per unsigned
// we have 1 unsigned and the rest are signed in the block
// those 2 events per signed are:
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index b2e24f0b33189d100fe7844215109fa043b240f1..9dde225c0d6fb75452bfc2677f6d9a2566e9d8af 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -87,7 +87,7 @@ pallet-asset-tx-payment = { version = "4.0.0-dev", path = "../../../frame/transa
pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../../frame/im-online" }
# node-specific dependencies
-node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+kitchensink-runtime = { version = "3.0.0-dev", path = "../runtime" }
node-rpc = { version = "3.0.0-dev", path = "../rpc" }
node-primitives = { version = "2.0.0", path = "../primitives" }
node-executor = { version = "3.0.0-dev", path = "../executor" }
@@ -159,10 +159,10 @@ cli = [
"substrate-build-script-utils",
"try-runtime-cli",
]
-runtime-benchmarks = ["node-runtime/runtime-benchmarks", "frame-benchmarking-cli"]
+runtime-benchmarks = ["kitchensink-runtime/runtime-benchmarks", "frame-benchmarking-cli"]
# Enable features that allow the runtime to be tried and debugged. Name might be subject to change
# in the near future.
-try-runtime = ["node-runtime/try-runtime", "try-runtime-cli"]
+try-runtime = ["kitchensink-runtime/try-runtime", "try-runtime-cli"]
[[bench]]
name = "transaction_pool"
diff --git a/substrate/bin/node/cli/benches/block_production.rs b/substrate/bin/node/cli/benches/block_production.rs
index ad16ba8e4072bfe1ed20ea493e68925844bbf803..6d269ccaac271a880d707264e214d265d5dd2172 100644
--- a/substrate/bin/node/cli/benches/block_production.rs
+++ b/substrate/bin/node/cli/benches/block_production.rs
@@ -18,8 +18,8 @@
use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
+use kitchensink_runtime::{constants::currency::*, BalancesCall};
use node_cli::service::{create_extrinsic, FullClient};
-use node_runtime::{constants::currency::*, BalancesCall};
use sc_block_builder::{BlockBuilderProvider, BuiltBlock, RecordProof};
use sc_client_api::execution_extensions::ExecutionStrategies;
use sc_consensus::{
@@ -121,9 +121,9 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
}
fn extrinsic_set_time(now: u64) -> OpaqueExtrinsic {
- node_runtime::UncheckedExtrinsic {
+ kitchensink_runtime::UncheckedExtrinsic {
signature: None,
- function: node_runtime::Call::Timestamp(pallet_timestamp::Call::set { now }),
+ function: kitchensink_runtime::Call::Timestamp(pallet_timestamp::Call::set { now }),
}
.into()
}
diff --git a/substrate/bin/node/cli/benches/transaction_pool.rs b/substrate/bin/node/cli/benches/transaction_pool.rs
index d88c3a65b6138b449d6f1c9c144e608e07410e0a..580a10d6a6678ed8a538af0a5d022761eff17ce9 100644
--- a/substrate/bin/node/cli/benches/transaction_pool.rs
+++ b/substrate/bin/node/cli/benches/transaction_pool.rs
@@ -20,9 +20,9 @@ use std::time::Duration;
use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput};
use futures::{future, StreamExt};
+use kitchensink_runtime::{constants::currency::*, BalancesCall, SudoCall};
use node_cli::service::{create_extrinsic, fetch_nonce, FullClient, TransactionPool};
use node_primitives::AccountId;
-use node_runtime::{constants::currency::*, BalancesCall, SudoCall};
use sc_client_api::execution_extensions::ExecutionStrategies;
use sc_service::{
config::{
diff --git a/substrate/bin/node/cli/src/benchmarking.rs b/substrate/bin/node/cli/src/benchmarking.rs
index 52657016c046a7436b07c1e5d8b244a8116a0d7b..19bd1660a4dd91c2d2014822e6583af59dc942fa 100644
--- a/substrate/bin/node/cli/src/benchmarking.rs
+++ b/substrate/bin/node/cli/src/benchmarking.rs
@@ -22,8 +22,8 @@
use crate::service::{create_extrinsic, FullClient};
+use kitchensink_runtime::{BalancesCall, SystemCall};
use node_primitives::{AccountId, Balance};
-use node_runtime::{BalancesCall, SystemCall};
use sc_cli::Result;
use sp_inherents::{InherentData, InherentDataProvider};
use sp_keyring::Sr25519Keyring;
diff --git a/substrate/bin/node/cli/src/chain_spec.rs b/substrate/bin/node/cli/src/chain_spec.rs
index 47c3634aa00df0001db24731e71622b09d2dd3be..77e2f73dd6e18793cc81506181ab422782c92329 100644
--- a/substrate/bin/node/cli/src/chain_spec.rs
+++ b/substrate/bin/node/cli/src/chain_spec.rs
@@ -20,7 +20,7 @@
use grandpa_primitives::AuthorityId as GrandpaId;
use hex_literal::hex;
-use node_runtime::{
+use kitchensink_runtime::{
constants::currency::*, wasm_binary_unwrap, AuthorityDiscoveryConfig, BabeConfig,
BalancesConfig, Block, CouncilConfig, DemocracyConfig, ElectionsConfig, GrandpaConfig,
ImOnlineConfig, IndicesConfig, MaxNominations, NominationPoolsConfig, SessionConfig,
@@ -40,8 +40,8 @@ use sp_runtime::{
Perbill,
};
+pub use kitchensink_runtime::GenesisConfig;
pub use node_primitives::{AccountId, Balance, Signature};
-pub use node_runtime::GenesisConfig;
type AccountPublic = <Signature as Verify>::Signer;
@@ -343,7 +343,7 @@ pub fn testnet_genesis(
sudo: SudoConfig { key: Some(root_key) },
babe: BabeConfig {
authorities: vec![],
- epoch_config: Some(node_runtime::BABE_GENESIS_EPOCH_CONFIG),
+ epoch_config: Some(kitchensink_runtime::BABE_GENESIS_EPOCH_CONFIG),
},
im_online: ImOnlineConfig { keys: vec![] },
authority_discovery: AuthorityDiscoveryConfig { keys: vec![] },
diff --git a/substrate/bin/node/cli/src/command.rs b/substrate/bin/node/cli/src/command.rs
index df3d5a891e2abf82647f8bdd183744cef3840dec..85e5415dbe1399b91f8c6488e73e83ee72ecf9ec 100644
--- a/substrate/bin/node/cli/src/command.rs
+++ b/substrate/bin/node/cli/src/command.rs
@@ -23,9 +23,9 @@ use crate::{
Cli, Subcommand,
};
use frame_benchmarking_cli::*;
+use kitchensink_runtime::{ExistentialDeposit, RuntimeApi};
use node_executor::ExecutorDispatch;
use node_primitives::Block;
-use node_runtime::{ExistentialDeposit, RuntimeApi};
use sc_cli::{ChainSpec, Result, RuntimeVersion, SubstrateCli};
use sc_service::PartialComponents;
use sp_keyring::Sr25519Keyring;
@@ -75,7 +75,7 @@ impl SubstrateCli for Cli {
}
fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
- &node_runtime::VERSION
+ &kitchensink_runtime::VERSION
}
}
diff --git a/substrate/bin/node/cli/src/service.rs b/substrate/bin/node/cli/src/service.rs
index bff4be88002fb79466753544a1ac1013410d0e46..e0644f462cf205195048c70415eb797dc73d5e44 100644
--- a/substrate/bin/node/cli/src/service.rs
+++ b/substrate/bin/node/cli/src/service.rs
@@ -23,9 +23,9 @@
use codec::Encode;
use frame_system_rpc_runtime_api::AccountNonceApi;
use futures::prelude::*;
+use kitchensink_runtime::RuntimeApi;
use node_executor::ExecutorDispatch;
use node_primitives::Block;
-use node_runtime::RuntimeApi;
use sc_client_api::{BlockBackend, ExecutorProvider};
use sc_consensus_babe::{self, SlotProportion};
use sc_executor::NativeElseWasmExecutor;
@@ -68,41 +68,43 @@ pub fn fetch_nonce(client: &FullClient, account: sp_core::sr25519::Pair) -> u32
pub fn create_extrinsic(
client: &FullClient,
sender: sp_core::sr25519::Pair,
- function: impl Into<node_runtime::Call>,
+ function: impl Into<kitchensink_runtime::Call>,
nonce: Option<u32>,
-) -> node_runtime::UncheckedExtrinsic {
+) -> kitchensink_runtime::UncheckedExtrinsic {
let function = function.into();
let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed");
let best_hash = client.chain_info().best_hash;
let best_block = client.chain_info().best_number;
let nonce = nonce.unwrap_or_else(|| fetch_nonce(client, sender.clone()));
- let period = node_runtime::BlockHashCount::get()
+ let period = kitchensink_runtime::BlockHashCount::get()
.checked_next_power_of_two()
.map(|c| c / 2)
.unwrap_or(2) as u64;
let tip = 0;
- let extra: node_runtime::SignedExtra = (
- frame_system::CheckNonZeroSender::<node_runtime::Runtime>::new(),
- frame_system::CheckSpecVersion::<node_runtime::Runtime>::new(),
- frame_system::CheckTxVersion::<node_runtime::Runtime>::new(),
- frame_system::CheckGenesis::<node_runtime::Runtime>::new(),
- frame_system::CheckEra::<node_runtime::Runtime>::from(generic::Era::mortal(
+ let extra: kitchensink_runtime::SignedExtra = (
+ frame_system::CheckNonZeroSender::<kitchensink_runtime::Runtime>::new(),
+ frame_system::CheckSpecVersion::<kitchensink_runtime::Runtime>::new(),
+ frame_system::CheckTxVersion::<kitchensink_runtime::Runtime>::new(),
+ frame_system::CheckGenesis::<kitchensink_runtime::Runtime>::new(),
+ frame_system::CheckEra::<kitchensink_runtime::Runtime>::from(generic::Era::mortal(
period,
best_block.saturated_into(),
)),
- frame_system::CheckNonce::<node_runtime::Runtime>::from(nonce),
- frame_system::CheckWeight::<node_runtime::Runtime>::new(),
- pallet_asset_tx_payment::ChargeAssetTxPayment::<node_runtime::Runtime>::from(tip, None),
+ frame_system::CheckNonce::<kitchensink_runtime::Runtime>::from(nonce),
+ frame_system::CheckWeight::<kitchensink_runtime::Runtime>::new(),
+ pallet_asset_tx_payment::ChargeAssetTxPayment::<kitchensink_runtime::Runtime>::from(
+ tip, None,
+ ),
);
- let raw_payload = node_runtime::SignedPayload::from_raw(
+ let raw_payload = kitchensink_runtime::SignedPayload::from_raw(
function.clone(),
extra.clone(),
(
(),
- node_runtime::VERSION.spec_version,
- node_runtime::VERSION.transaction_version,
+ kitchensink_runtime::VERSION.spec_version,
+ kitchensink_runtime::VERSION.transaction_version,
genesis_hash,
best_hash,
(),
@@ -112,10 +114,10 @@ pub fn create_extrinsic(
);
let signature = raw_payload.using_encoded(|e| sender.sign(e));
- node_runtime::UncheckedExtrinsic::new_signed(
+ kitchensink_runtime::UncheckedExtrinsic::new_signed(
function,
sp_runtime::AccountId32::from(sender.public()).into(),
- node_runtime::Signature::Sr25519(signature),
+ kitchensink_runtime::Signature::Sr25519(signature),
extra,
)
}
@@ -565,11 +567,11 @@ pub fn new_full(
mod tests {
use crate::service::{new_full_base, NewFullBase};
use codec::Encode;
- use node_primitives::{Block, DigestItem, Signature};
- use node_runtime::{
+ use kitchensink_runtime::{
constants::{currency::CENTS, time::SLOT_DURATION},
Address, BalancesCall, Call, UncheckedExtrinsic,
};
+ use node_primitives::{Block, DigestItem, Signature};
use sc_client_api::BlockBackend;
use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
use sc_consensus_babe::{BabeIntermediate, CompatibleDigestItem, INTERMEDIATE_KEY};
diff --git a/substrate/bin/node/executor/Cargo.toml b/substrate/bin/node/executor/Cargo.toml
index 6143ea3bd8c421e8fff46884d17d934dc34e5cf8..71865783da8ac348b2b2e86ecdbd01955aaebeba 100644
--- a/substrate/bin/node/executor/Cargo.toml
+++ b/substrate/bin/node/executor/Cargo.toml
@@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
scale-info = { version = "2.1.1", features = ["derive"] }
frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }
node-primitives = { version = "2.0.0", path = "../primitives" }
-node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+kitchensink-runtime = { version = "3.0.0-dev", path = "../runtime" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
sp-core = { version = "6.0.0", path = "../../../primitives/core" }
sp-keystore = { version = "0.12.0", path = "../../../primitives/keystore" }
diff --git a/substrate/bin/node/executor/benches/bench.rs b/substrate/bin/node/executor/benches/bench.rs
index 61e2d1b0530126c4f406fe86b54b422fcf87fb12..a1d31a5a966db0823f70e2478d577fb656eeeadd 100644
--- a/substrate/bin/node/executor/benches/bench.rs
+++ b/substrate/bin/node/executor/benches/bench.rs
@@ -18,12 +18,12 @@
use codec::{Decode, Encode};
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
use frame_support::Hashable;
-use node_executor::ExecutorDispatch;
-use node_primitives::{BlockNumber, Hash};
-use node_runtime::{
+use kitchensink_runtime::{
constants::currency::*, Block, BuildStorage, Call, CheckedExtrinsic, GenesisConfig, Header,
UncheckedExtrinsic,
};
+use node_executor::ExecutorDispatch;
+use node_primitives::{BlockNumber, Hash};
use node_testing::keyring::*;
#[cfg(feature = "wasmtime")]
use sc_executor::WasmtimeInstantiationStrategy;
@@ -41,7 +41,7 @@ criterion_main!(benches);
/// The wasm runtime code.
pub fn compact_code_unwrap() -> &'static [u8] {
- node_runtime::WASM_BINARY.expect(
+ kitchensink_runtime::WASM_BINARY.expect(
"Development wasm binary is not available. Testing is only supported with the flag \
disabled.",
)
@@ -49,9 +49,9 @@ pub fn compact_code_unwrap() -> &'static [u8] {
const GENESIS_HASH: [u8; 32] = [69u8; 32];
-const TRANSACTION_VERSION: u32 = node_runtime::VERSION.transaction_version;
+const TRANSACTION_VERSION: u32 = kitchensink_runtime::VERSION.transaction_version;
-const SPEC_VERSION: u32 = node_runtime::VERSION.spec_version;
+const SPEC_VERSION: u32 = kitchensink_runtime::VERSION.spec_version;
const HEAP_PAGES: u64 = 20;
diff --git a/substrate/bin/node/executor/src/lib.rs b/substrate/bin/node/executor/src/lib.rs
index 9f87c7d12623c06f29f3e1ee9b262317fb66a674..c4edf5ad22f471042a678511f8bb915193d03121 100644
--- a/substrate/bin/node/executor/src/lib.rs
+++ b/substrate/bin/node/executor/src/lib.rs
@@ -28,10 +28,10 @@ impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
- node_runtime::api::dispatch(method, data)
+ kitchensink_runtime::api::dispatch(method, data)
}
fn native_version() -> sc_executor::NativeVersion {
- node_runtime::native_version()
+ kitchensink_runtime::native_version()
}
}
diff --git a/substrate/bin/node/executor/tests/basic.rs b/substrate/bin/node/executor/tests/basic.rs
index 31a9bd0a9049611ff6dd8dbc898e7ced1741dcce..27e848a281097165edb26d420b109dcd616df8f9 100644
--- a/substrate/bin/node/executor/tests/basic.rs
+++ b/substrate/bin/node/executor/tests/basic.rs
@@ -26,12 +26,12 @@ use sp_runtime::{
traits::Hash as HashT, transaction_validity::InvalidTransaction, ApplyExtrinsicResult,
};
-use node_primitives::{Balance, Hash};
-use node_runtime::{
+use kitchensink_runtime::{
constants::{currency::*, time::SLOT_DURATION},
Balances, Call, CheckedExtrinsic, Event, Header, Runtime, System, TransactionPayment,
UncheckedExtrinsic,
};
+use node_primitives::{Balance, Hash};
use node_testing::keyring::*;
use wat;
@@ -44,7 +44,7 @@ use self::common::{sign, *};
/// have to execute provided wasm code instead of the native equivalent. This trick is used to
/// test code paths that differ between native and wasm versions.
pub fn bloaty_code_unwrap() -> &'static [u8] {
- node_runtime::WASM_BINARY_BLOATY.expect(
+ kitchensink_runtime::WASM_BINARY_BLOATY.expect(
"Development wasm binary is not available. \
Testing is only supported with the flag disabled.",
)
diff --git a/substrate/bin/node/executor/tests/common.rs b/substrate/bin/node/executor/tests/common.rs
index a2bb91056f474c23c2fae3098263fa6b230db3e5..407a1e09f8efb3b0996015ba3dd6949f3f362572 100644
--- a/substrate/bin/node/executor/tests/common.rs
+++ b/substrate/bin/node/executor/tests/common.rs
@@ -35,12 +35,12 @@ use sp_runtime::{
};
use sp_state_machine::TestExternalities as CoreTestExternalities;
-use node_executor::ExecutorDispatch;
-use node_primitives::{BlockNumber, Hash};
-use node_runtime::{
+use kitchensink_runtime::{
constants::currency::*, Block, BuildStorage, CheckedExtrinsic, Header, Runtime,
UncheckedExtrinsic,
};
+use node_executor::ExecutorDispatch;
+use node_primitives::{BlockNumber, Hash};
use node_testing::keyring::*;
use sp_externalities::Externalities;
@@ -69,7 +69,7 @@ impl AppCrypto<MultiSigner, MultiSignature> for TestAuthorityId {
/// making the binary slimmer. There is a convention to use compact version of the runtime
/// as canonical.
pub fn compact_code_unwrap() -> &'static [u8] {
- node_runtime::WASM_BINARY.expect(
+ kitchensink_runtime::WASM_BINARY.expect(
"Development wasm binary is not available. Testing is only supported with the flag \
disabled.",
)
@@ -77,9 +77,9 @@ pub fn compact_code_unwrap() -> &'static [u8] {
pub const GENESIS_HASH: [u8; 32] = [69u8; 32];
-pub const SPEC_VERSION: u32 = node_runtime::VERSION.spec_version;
+pub const SPEC_VERSION: u32 = kitchensink_runtime::VERSION.spec_version;
-pub const TRANSACTION_VERSION: u32 = node_runtime::VERSION.transaction_version;
+pub const TRANSACTION_VERSION: u32 = kitchensink_runtime::VERSION.transaction_version;
pub type TestExternalities<H> = CoreTestExternalities<H>;
diff --git a/substrate/bin/node/executor/tests/fees.rs b/substrate/bin/node/executor/tests/fees.rs
index e1550071d3006719b461d4b0fcaf163818d73de3..008ed5f53927bf11848d9f5ea24e2b36f91acb99 100644
--- a/substrate/bin/node/executor/tests/fees.rs
+++ b/substrate/bin/node/executor/tests/fees.rs
@@ -20,11 +20,11 @@ use frame_support::{
traits::Currency,
weights::{constants::ExtrinsicBaseWeight, GetDispatchInfo, IdentityFee, WeightToFee},
};
-use node_primitives::Balance;
-use node_runtime::{
+use kitchensink_runtime::{
constants::{currency::*, time::SLOT_DURATION},
Balances, Call, CheckedExtrinsic, Multiplier, Runtime, TransactionByteFee, TransactionPayment,
};
+use node_primitives::Balance;
use node_testing::keyring::*;
use sp_core::NeverNativeValue;
use sp_runtime::{traits::One, Perbill};
diff --git a/substrate/bin/node/executor/tests/submit_transaction.rs b/substrate/bin/node/executor/tests/submit_transaction.rs
index 7df13a577006eacf658cdbf6588530cacabaad3c..be43f3c78674f8047a8e7abbf2106528dd3b01eb 100644
--- a/substrate/bin/node/executor/tests/submit_transaction.rs
+++ b/substrate/bin/node/executor/tests/submit_transaction.rs
@@ -17,7 +17,7 @@
use codec::Decode;
use frame_system::offchain::{SendSignedTransaction, Signer, SubmitTransaction};
-use node_runtime::{Executive, Indices, Runtime, UncheckedExtrinsic};
+use kitchensink_runtime::{Executive, Indices, Runtime, UncheckedExtrinsic};
use sp_application_crypto::AppKey;
use sp_core::offchain::{testing::TestTransactionPoolExt, TransactionPoolExt};
use sp_keyring::sr25519::Keyring::Alice;
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index d3138ce51de9c6b6788c1ec47da87628378762aa..10b15b6ec554dbe206b9b69e88bc4bbd2b123012 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "node-runtime"
+name = "kitchensink-runtime"
version = "3.0.0-dev"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index 7caf10366b48c9f31618e5b1b9cc5c776e84df2a..ed81301e4518997ccb162205ff6fdfed4ac1c4ee 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -21,7 +21,7 @@ tempfile = "3.1.0"
frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
node-executor = { version = "3.0.0-dev", path = "../executor" }
node-primitives = { version = "2.0.0", path = "../primitives" }
-node-runtime = { version = "3.0.0-dev", path = "../runtime" }
+kitchensink-runtime = { version = "3.0.0-dev", path = "../runtime" }
pallet-asset-tx-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/asset-tx-payment" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
diff --git a/substrate/bin/node/testing/src/bench.rs b/substrate/bin/node/testing/src/bench.rs
index 00ce7f64bc3f03b06e4dbabadbed133e7348778e..18e979b95737f7affced2fc02fec86853e715349 100644
--- a/substrate/bin/node/testing/src/bench.rs
+++ b/substrate/bin/node/testing/src/bench.rs
@@ -34,11 +34,11 @@ use crate::{
};
use codec::{Decode, Encode};
use futures::executor;
-use node_primitives::Block;
-use node_runtime::{
+use kitchensink_runtime::{
constants::currency::DOLLARS, AccountId, BalancesCall, Call, CheckedExtrinsic, MinimumPeriod,
Signature, SystemCall, UncheckedExtrinsic,
};
+use node_primitives::Block;
use sc_block_builder::BlockBuilderProvider;
use sc_client_api::{
execution_extensions::{ExecutionExtensions, ExecutionStrategies},
@@ -304,20 +304,21 @@ impl<'a> Iterator for BlockContentIterator<'a> {
CheckedExtrinsic {
signed: Some((
sender,
- signed_extra(0, node_runtime::ExistentialDeposit::get() + 1),
+ signed_extra(0, kitchensink_runtime::ExistentialDeposit::get() + 1),
)),
function: match self.content.block_type {
BlockType::RandomTransfersKeepAlive =>
Call::Balances(BalancesCall::transfer_keep_alive {
dest: sp_runtime::MultiAddress::Id(receiver),
- value: node_runtime::ExistentialDeposit::get() + 1,
+ value: kitchensink_runtime::ExistentialDeposit::get() + 1,
}),
BlockType::RandomTransfersReaping => {
Call::Balances(BalancesCall::transfer {
dest: sp_runtime::MultiAddress::Id(receiver),
// Transfer so that ending balance would be 1 less than existential
// deposit so that we kill the sender account.
- value: 100 * DOLLARS - (node_runtime::ExistentialDeposit::get() - 1),
+ value: 100 * DOLLARS -
+ (kitchensink_runtime::ExistentialDeposit::get() - 1),
})
},
BlockType::Noop => Call::System(SystemCall::remark { remark: Vec::new() }),
@@ -592,9 +593,9 @@ impl BenchKeyring {
}
/// Generate genesis with accounts from this keyring endowed with some balance.
- pub fn generate_genesis(&self) -> node_runtime::GenesisConfig {
+ pub fn generate_genesis(&self) -> kitchensink_runtime::GenesisConfig {
crate::genesis::config_endowed(
- Some(node_runtime::wasm_binary_unwrap()),
+ Some(kitchensink_runtime::wasm_binary_unwrap()),
self.collect_account_ids(),
)
}
diff --git a/substrate/bin/node/testing/src/client.rs b/substrate/bin/node/testing/src/client.rs
index 8cb98511098f1955fe0482bf7a9dd2a801ec54fb..590304bdd52a542435eff86113313ebc0a0200d7 100644
--- a/substrate/bin/node/testing/src/client.rs
+++ b/substrate/bin/node/testing/src/client.rs
@@ -16,14 +16,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
-//! Utilities to build a `TestClient` for `node-runtime`.
+//! Utilities to build a `TestClient` for `kitchensink-runtime`.
use sc_service::client;
use sp_runtime::BuildStorage;
/// Re-export test-client utilities.
pub use substrate_test_client::*;
-/// Call executor for `node-runtime` `TestClient`.
+/// Call executor for `kitchensink-runtime` `TestClient`.
pub type ExecutorDispatch = sc_executor::NativeElseWasmExecutor<node_executor::ExecutorDispatch>;
/// Default backend type.
@@ -34,10 +34,10 @@ pub type Client = client::Client<
Backend,
client::LocalCallExecutor<node_primitives::Block, Backend, ExecutorDispatch>,
node_primitives::Block,
- node_runtime::RuntimeApi,
+ kitchensink_runtime::RuntimeApi,
>;
-/// Transaction for node-runtime.
+/// Transaction for kitchensink-runtime.
pub type Transaction = sc_client_api::backend::TransactionFor<Backend, node_primitives::Block>;
/// Genesis configuration parameters for `TestClient`.
diff --git a/substrate/bin/node/testing/src/genesis.rs b/substrate/bin/node/testing/src/genesis.rs
index fbd28c5af02985a25acd844e06a0370815bb9c0c..1eb7318db52da426c0af1dfc30ea5d97c3a9d5a0 100644
--- a/substrate/bin/node/testing/src/genesis.rs
+++ b/substrate/bin/node/testing/src/genesis.rs
@@ -19,7 +19,7 @@
//! Genesis Configuration.
use crate::keyring::*;
-use node_runtime::{
+use kitchensink_runtime::{
constants::currency::*, wasm_binary_unwrap, AccountId, BabeConfig, BalancesConfig,
GenesisConfig, GrandpaConfig, IndicesConfig, SessionConfig, SocietyConfig, StakerStatus,
StakingConfig, SystemConfig, BABE_GENESIS_EPOCH_CONFIG,
diff --git a/substrate/bin/node/testing/src/keyring.rs b/substrate/bin/node/testing/src/keyring.rs
index 41dd28bb89988be8f57b009071266fd2a7769cd8..88d9dc56b05325e86b507594b216d0dbc29a7828 100644
--- a/substrate/bin/node/testing/src/keyring.rs
+++ b/substrate/bin/node/testing/src/keyring.rs
@@ -19,8 +19,8 @@
//! Test accounts.
use codec::Encode;
+use kitchensink_runtime::{CheckedExtrinsic, SessionKeys, SignedExtra, UncheckedExtrinsic};
use node_primitives::{AccountId, Balance, Index};
-use node_runtime::{CheckedExtrinsic, SessionKeys, SignedExtra, UncheckedExtrinsic};
use sp_keyring::{AccountKeyring, Ed25519Keyring, Sr25519Keyring};
use sp_runtime::generic::Era;
diff --git a/substrate/bin/utils/subkey/src/main.rs b/substrate/bin/utils/subkey/src/main.rs
index d85c6dbe9d0489257e8f2d95d12ff667b63cc349..271388549bcf95a6f727ac17e35dd08e371b6b8f 100644
--- a/substrate/bin/utils/subkey/src/main.rs
+++ b/substrate/bin/utils/subkey/src/main.rs
@@ -16,7 +16,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
-//! Subkey utility, based on node_runtime.
+//! Subkey utility, based on kitchensink_runtime.
fn main() -> Result<(), sc_cli::Error> {
subkey::run()
diff --git a/substrate/docs/README.adoc b/substrate/docs/README.adoc
index 0b82f0ed82a13136239035af8a9cee5273edc951..5d7b0b52c525041609dded9aa8bb1a8cdab7ea43 100644
--- a/substrate/docs/README.adoc
+++ b/substrate/docs/README.adoc
@@ -445,7 +445,7 @@ pallet-assets, pallet-balances, pallet-consensus, pallet-contracts, pallet-counc
frame-executive, pallet-session, pallet-staking, pallet-timestamp, pallet-treasury
* Node
[source, shell]
-node-cli, node-consensus, node-executor, node-network, node-primitives, node-runtime
+node-cli, node-consensus, node-executor, node-network, node-primitives, kitchensink-runtime
* Subkey
[source, shell]
subkey
diff --git a/substrate/scripts/ci/gitlab/pipeline/test.yml b/substrate/scripts/ci/gitlab/pipeline/test.yml
index 7a9f57e9a77341e923aa19528022475e8497d634..ccf8338236d0ac6a91b79e1a7ef00c630f59db90 100644
--- a/substrate/scripts/ci/gitlab/pipeline/test.yml
+++ b/substrate/scripts/ci/gitlab/pipeline/test.yml
@@ -181,13 +181,13 @@ test-deterministic-wasm:
script:
- rusty-cachier snapshot create
# build runtime
- - cargo build --verbose --release -p node-runtime
+ - cargo build --verbose --release -p kitchensink-runtime
# make checksum
- - sha256sum $CARGO_TARGET_DIR/release/wbuild/node-runtime/target/wasm32-unknown-unknown/release/node_runtime.wasm > checksum.sha256
+ - sha256sum $CARGO_TARGET_DIR/release/wbuild/kitchensink-runtime/target/wasm32-unknown-unknown/release/kitchensink_runtime.wasm > checksum.sha256
# clean up
- rm -rf $CARGO_TARGET_DIR/release/wbuild
# build again
- - cargo build --verbose --release -p node-runtime
+ - cargo build --verbose --release -p kitchensink-runtime
# confirm checksum
- sha256sum -c ./checksum.sha256
# clean up again, don't put release binaries into the cache
diff --git a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
index c5f3b1998fa972d5f476b01eb8222ca20473bf40..5af7dd78a08e87523cc452fd6481daeba7736aa9 100644
--- a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
@@ -6,11 +6,11 @@ edition = "2021"
license = "Apache-2.0"
homepage = "https://substrate.io"
repository = "https://github.com/paritytech/substrate/"
-description = "Bag threshold generation script for pallet-bag-list and node-runtime."
+description = "Bag threshold generation script for pallet-bag-list and kitchensink-runtime."
readme = "README.md"
[dependencies]
-node-runtime = { version = "3.0.0-dev", path = "../../../../bin/node/runtime" }
+kitchensink-runtime = { version = "3.0.0-dev", path = "../../../../bin/node/runtime" }
generate-bags = { version = "4.0.0-dev", path = "../" }
# third-party
diff --git a/substrate/utils/frame/generate-bags/node-runtime/src/main.rs b/substrate/utils/frame/generate-bags/node-runtime/src/main.rs
index 12bcf8d28cf2bb9e8c03eb8fb63b2756b94709ed..5ea1262d95d34225498cbd9429a016f6b4154c63 100644
--- a/substrate/utils/frame/generate-bags/node-runtime/src/main.rs
+++ b/substrate/utils/frame/generate-bags/node-runtime/src/main.rs
@@ -43,5 +43,10 @@ struct Opt {
fn main() -> Result<(), std::io::Error> {
let Opt { n_bags, output, total_issuance, minimum_balance } = Opt::parse();
- generate_thresholds::<node_runtime::Runtime>(n_bags, &output, total_issuance, minimum_balance)
+ generate_thresholds::<kitchensink_runtime::Runtime>(
+ n_bags,
+ &output,
+ total_issuance,
+ minimum_balance,
+ )
}
diff --git a/substrate/utils/wasm-builder/src/lib.rs b/substrate/utils/wasm-builder/src/lib.rs
index 919290655368b1872102ed469d44d683aee43118..fc86a06170a506ee50d840a5a1e668db4d5e4aed 100644
--- a/substrate/utils/wasm-builder/src/lib.rs
+++ b/substrate/utils/wasm-builder/src/lib.rs
@@ -92,7 +92,7 @@
//!
//! Each project can be skipped individually by using the environment variable
//! `SKIP_PROJECT_NAME_WASM_BUILD`. Where `PROJECT_NAME` needs to be replaced by the name of the
-//! cargo project, e.g. `node-runtime` will be `NODE_RUNTIME`.
+//! cargo project, e.g. `kitchensink-runtime` will be `NODE_RUNTIME`.
//!
//! ## Prerequisites:
//!