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 1 commit
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
Next Next commit
chore: bump deps
  • Loading branch information
@wischli
wischli committed Sep 6, 2022
commit 34ca624dcd190393572c5c1cb6644724d98fb60c
1,219 changes: 680 additions & 539 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

106 changes: 53 additions & 53 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,7 +24,7 @@ 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"]}
Expand All @@ -36,65 +36,65 @@ serde = {version = "1.0.142", 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
72 changes: 36 additions & 36 deletions nodes/standalone/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "mashnet-node"
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 @@ -21,54 +21,54 @@ mashnet-node-runtime = {path = "../../runtimes/standalone"}
runtime-common = {path = "../../runtimes/common"}

# External dependencies
clap = {version = "3.2.10", features = ["derive"]}
clap = {version = "3.2.20", features = ["derive"]}
futures = "0.3.21"
log = "0.4.17"
serde = {version = "1.0.142", features = ["derive"]}
serde_json = "1.0.83"

# Substrate dependencies
frame-system = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
pallet-transaction-payment = {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-cli = {git = "https://github.com/paritytech/substrate", 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-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27"}
sp-keyring = {git = "https://github.com/paritytech/substrate", 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-service = {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-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-finality-grandpa = {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-runtime = {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"}
frame-system = {git = "https://github.com/paritytech/substrate", branch = "master"}
pallet-transaction-payment = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-cli = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-executor = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-keyring = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-keystore = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-network = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-service = {git = "https://github.com/paritytech/substrate", branch = "master"}
sc-telemetry = {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-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-inherents = {git = "https://github.com/paritytech/substrate", branch = "master"}
sp-runtime = {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"}

# RPC related dependencies
frame-rpc-system = {package = "substrate-frame-rpc-system", 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"}
jsonrpsee = { version = "0.14.0", features = ["server"] }
pallet-transaction-payment-rpc = {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"}
pallet-transaction-payment-rpc = {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"}

# 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
Loading