Skip to content

feat: add weights v2 #403

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

Closed
wischli wants to merge 10 commits into from
Closed

feat: add weights v2 #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
34ca624
chore: bump deps
wischli Sep 6, 2022
7160779
wip: migrate pallets and runtimes
wischli Sep 6, 2022
be04423
chore: bump more versions
wischli Sep 6, 2022
a24e19a
wip: fix clients
wischli Sep 6, 2022
2f04b88
fix: runtime tomls
wischli Sep 7, 2022
a18bca5
style: ignore clippy in default weights
wischli Sep 7, 2022
9c48ae3
fix: client pt2
wischli Sep 7, 2022
89ba1e5
fix: runtimes, clippy
wischli Sep 7, 2022
6d6aad3
feat: switch pallet execution order
wischli Sep 7, 2022
a4cb4ed
tests: merge delegation from wf-2168-polkadot-v0.9.28
wischli Sep 7, 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
1,076 changes: 555 additions & 521 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions nodes/parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name = "kilt-parachain"
path = "src/main.rs"

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

[dependencies]

Expand All @@ -24,77 +24,77 @@ runtime-common = {path = "../../runtimes/common"}
spiritnet-runtime = {path = "../../runtimes/spiritnet"}

# External dependencies
clap = {version = "3.2.10", features = ["derive"]}
clap = {version = "3.2.20", features = ["derive"]}
codec = {package = "parity-scale-codec", version = "3.1.5"}
derive_more = "0.99.17"
futures = {version = "0.3.21", features = ["compat"]}
hex-literal = "0.3.4"
jsonrpsee = {version = "0.14.0", features = ["server"]}
jsonrpsee = {version = "0.15.1", features = ["server"]}
log = "0.4.17"
parking_lot = "0.12.1"
serde = {version = "1.0.142", features = ["derive"]}
serde = {version = "1.0.144", features = ["derive"]}
serde_json = "1.0.83"

# Substrate dependencies
frame-rpc-system = {package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-chain-spec = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-cli = {git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "polkadot-v0.9.27"}
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-executor = {git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "polkadot-v0.9.27"}
sc-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-service = {git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "polkadot-v0.9.27"}
sc-sysinfo = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-tracing = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-block-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-inherents = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-offchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-runtime = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-session = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
substrate-prometheus-endpoint = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
frame-rpc-system = {package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master"}
pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-chain-spec = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-cli = {git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "master"}
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-executor = {git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "master"}
sc-keystore = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-network = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-rpc = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-service = {git = "https://github.com/paritytech/substrate", features = ["wasmtime"], branch = "master"}
sc-sysinfo = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-tracing = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-api = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-block-builder = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-core = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-inherents = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-keystore = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-offchain = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-runtime = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-session = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "master"}
substrate-prometheus-endpoint = {git = "https://github.com/paritytech/substrate", branch = "master"}

# Cumulus dependencies
cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-client-collator = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-relay-chain-inprocess-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-relay-chain-rpc-interface = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.27"}
cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-client-collator = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-relay-chain-inprocess-interface = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-relay-chain-interface = {git = "https://github.com/paritytech/cumulus", branch = "master"}
cumulus-relay-chain-rpc-interface = {git = "https://github.com/paritytech/cumulus", branch = "master"}

# Polkadot dependencies
polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27"}
polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27"}
polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27"}
polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27"}
xcm = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.27"}
polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "master"}
polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "master"}
polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "master"}
polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "master"}
xcm = {git = "https://github.com/paritytech/polkadot", branch = "master"}

# Benchmarking
frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "master"}
frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branch = "master"}

# Runtime tests
try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27", optional = true}
try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "master", optional = true}

[features]
default = []
Expand Down
6 changes: 3 additions & 3 deletions nodes/parachain/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ impl CliConfiguration<Self> for RelayChainCli {
fn base_path(&self) -> Result<Option<BasePath>> {
Ok(self
.shared_params()
.base_path()
.base_path()?
.or_else(|| self.base_path.clone().map(Into::into)))
}

Expand Down Expand Up @@ -579,8 +579,8 @@ impl CliConfiguration<Self> for RelayChainCli {
self.base.base.transaction_pool(is_dev)
}

fn state_cache_child_ratio(&self) -> Result<Option<usize>> {
self.base.base.state_cache_child_ratio()
fn trie_cache_maximum_size(&self) -> Result<Option<usize>> {
self.base.base.trie_cache_maximum_size()
}

fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {
Expand Down
12 changes: 6 additions & 6 deletions nodes/parachain/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ use cumulus_client_service::{
use cumulus_primitives_core::ParaId;
use cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain;
use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
use cumulus_relay_chain_rpc_interface::RelayChainRPCInterface;
use cumulus_relay_chain_rpc_interface::{create_client_and_start_worker, RelayChainRpcInterface};
use polkadot_service::{CollatorPair, NativeExecutionDispatch};
use sc_client_api::ExecutorProvider;
use sc_executor::NativeElseWasmExecutor;
use sc_network::NetworkService;
use sc_network::{NetworkBlock, NetworkService};
use sc_service::{Configuration, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_api::ConstructRuntimeApi;
Expand Down Expand Up @@ -205,10 +205,10 @@ async fn build_relay_chain_interface(
hwbench: Option<sc_sysinfo::HwBench>,
) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option<CollatorPair>)> {
match collator_options.relay_chain_rpc_url {
Some(relay_chain_url) => Ok((
Arc::new(RelayChainRPCInterface::new(relay_chain_url).await?) as Arc<_>,
None,
)),
Some(relay_chain_url) => {
let client = create_client_and_start_worker(relay_chain_url, task_manager).await?;
Ok((Arc::new(RelayChainRpcInterface::new(client)) as Arc<_>, None))
}
None => build_inprocess_relay_chain(
polkadot_config,
parachain_config,
Expand Down
Loading