Date: Thu, 5 Oct 2023 18:44:03 +0200
Subject: [PATCH 003/119] Delete full db directory with `purge-chain`
subcommand (#1786)
Closes #1767
Until now the `purge-chain` command would only remove the `full`
subfolder of the db folder. However there is also the `parachains` db
that currently remains and can cause problems on node restart.
Example wiht old code:
```
polkadot purge-chain --database paritydb --base-path /tmp/some-folder
Are you sure to remove "/tmp/some-folder/chains/polkadot/paritydb/full"? [y/N]: y
"/tmp/some-folder/chains/polkadot/paritydb/full" removed.
```
In this case `/tmp/some-folder/chains/polkadot/paritydb/parachains`
would remain and might cause problem on node restart because of version
conflicts as described in #1767. After this PR the whole
`/tmp/some-folder/chains/polkadot/paritydb` folder will be deleted.
---
polkadot/tests/purge_chain_works.rs | 4 ----
substrate/client/cli/src/commands/purge_chain_cmd.rs | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/polkadot/tests/purge_chain_works.rs b/polkadot/tests/purge_chain_works.rs
index 831155fb4d7..f5a73e232e0 100644
--- a/polkadot/tests/purge_chain_works.rs
+++ b/polkadot/tests/purge_chain_works.rs
@@ -57,7 +57,6 @@ async fn purge_chain_rocksdb_works() {
assert!(cmd.wait().unwrap().success());
assert!(tmpdir.path().join("chains/rococo_dev").exists());
assert!(tmpdir.path().join("chains/rococo_dev/db/full").exists());
- assert!(tmpdir.path().join("chains/rococo_dev/db/full/parachains").exists());
// Purge chain
let status = Command::new(cargo_bin("polkadot"))
@@ -102,7 +101,6 @@ async fn purge_chain_paritydb_works() {
assert!(cmd.wait().unwrap().success());
assert!(tmpdir.path().join("chains/rococo_dev").exists());
assert!(tmpdir.path().join("chains/rococo_dev/paritydb/full").exists());
- assert!(tmpdir.path().join("chains/rococo_dev/paritydb/parachains").exists());
// Purge chain
let status = Command::new(cargo_bin("polkadot"))
@@ -118,8 +116,6 @@ async fn purge_chain_paritydb_works() {
// Make sure that the chain folder exists, but `db/full` is deleted.
assert!(tmpdir.path().join("chains/rococo_dev").exists());
assert!(!tmpdir.path().join("chains/rococo_dev/paritydb/full").exists());
- // Parachains removal requires calling "purge-chain --parachains".
- assert!(tmpdir.path().join("chains/rococo_dev/paritydb/parachains").exists());
})
.await;
}
diff --git a/substrate/client/cli/src/commands/purge_chain_cmd.rs b/substrate/client/cli/src/commands/purge_chain_cmd.rs
index 2ff3d4b9a04..6e7b8143a5b 100644
--- a/substrate/client/cli/src/commands/purge_chain_cmd.rs
+++ b/substrate/client/cli/src/commands/purge_chain_cmd.rs
@@ -48,7 +48,7 @@ pub struct PurgeChainCmd {
impl PurgeChainCmd {
/// Run the purge command
pub fn run(&self, database_config: DatabaseSource) -> error::Result<()> {
- let db_path = database_config.path().ok_or_else(|| {
+ let db_path = database_config.path().and_then(|p| p.parent()).ok_or_else(|| {
error::Error::Input("Cannot purge custom database implementation".into())
})?;
--
GitLab
From 0c592329e9cbb5d68373ac16be4899223b2d8de8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 00:09:10 +0200
Subject: [PATCH 004/119] Bump the known_good_semver group with 1 update
(#1752)
Bumps the known_good_semver group with 1 update:
[clap](https://github.com/clap-rs/clap).
Release notes
Sourced from clap's
releases.
v4.4.6
[4.4.6] - 2023-09-28
Internal
v4.4.5
[4.4.5] - 2023-09-25
Fixes
- (parser) When inferring subcommand
name or
long_flag, allow ambiguous-looking matches that
unambiguously map back to the same command
- (parser) When inferring subcommand
long_flag,
don't panic
- (assert) Clarify what action is causing a positional that
doesn't set values which is especially useful for derive users
Changelog
Sourced from clap's
changelog.
[4.4.6] - 2023-09-28
Internal
[4.4.5] - 2023-09-25
Fixes
- (parser) When inferring subcommand
name or
long_flag, allow ambiguous-looking matches that
unambiguously map back to the same command
- (parser) When inferring subcommand
long_flag,
don't panic
- (assert) Clarify what action is causing a positional that
doesn't set values which is especially useful for derive users
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore ` will
remove the ignore condition of the specified dependency and ignore
conditions
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
Cargo.lock | 70 +++++++++----------
cumulus/client/cli/Cargo.toml | 2 +-
cumulus/parachain-template/node/Cargo.toml | 2 +-
cumulus/polkadot-parachain/Cargo.toml | 2 +-
cumulus/test/service/Cargo.toml | 2 +-
polkadot/cli/Cargo.toml | 2 +-
polkadot/node/malus/Cargo.toml | 2 +-
.../test-parachains/adder/collator/Cargo.toml | 2 +-
.../undying/collator/Cargo.toml | 2 +-
polkadot/utils/generate-bags/Cargo.toml | 2 +-
.../remote-ext-tests/bags-list/Cargo.toml | 2 +-
substrate/bin/node-template/node/Cargo.toml | 2 +-
substrate/bin/node/bench/Cargo.toml | 2 +-
substrate/bin/node/cli/Cargo.toml | 4 +-
substrate/bin/node/inspect/Cargo.toml | 2 +-
.../bin/utils/chain-spec-builder/Cargo.toml | 2 +-
substrate/bin/utils/subkey/Cargo.toml | 2 +-
substrate/client/cli/Cargo.toml | 2 +-
substrate/client/storage-monitor/Cargo.toml | 2 +-
.../solution-type/fuzzer/Cargo.toml | 2 +-
.../npos-elections/fuzzer/Cargo.toml | 2 +-
.../ci/node-template-release/Cargo.toml | 2 +-
.../utils/frame/benchmarking-cli/Cargo.toml | 2 +-
.../frame/frame-utilities-cli/Cargo.toml | 2 +-
.../generate-bags/node-runtime/Cargo.toml | 2 +-
.../utils/frame/try-runtime/cli/Cargo.toml | 2 +-
26 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 46f6b6ea1fc..340587d268d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -229,9 +229,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -267,9 +267,9 @@ dependencies = [
[[package]]
name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
dependencies = [
"anstyle",
"windows-sys 0.48.0",
@@ -2303,7 +2303,7 @@ name = "chain-spec-builder"
version = "2.0.0"
dependencies = [
"ansi_term",
- "clap 4.4.4",
+ "clap 4.4.6",
"node-cli",
"rand 0.8.5",
"sc-chain-spec",
@@ -2433,9 +2433,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.4.4"
+version = "4.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
dependencies = [
"clap_builder",
"clap_derive 4.4.2",
@@ -2443,9 +2443,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.4.4"
+version = "4.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
dependencies = [
"anstream",
"anstyle",
@@ -2459,7 +2459,7 @@ version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
]
[[package]]
@@ -3031,7 +3031,7 @@ dependencies = [
"anes",
"cast",
"ciborium",
- "clap 4.4.4",
+ "clap 4.4.6",
"criterion-plot",
"futures",
"is-terminal",
@@ -3196,7 +3196,7 @@ dependencies = [
name = "cumulus-client-cli"
version = "0.1.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"parity-scale-codec",
"sc-chain-spec",
"sc-cli",
@@ -3881,7 +3881,7 @@ name = "cumulus-test-service"
version = "0.1.0"
dependencies = [
"async-trait",
- "clap 4.4.4",
+ "clap 4.4.6",
"criterion 0.5.1",
"cumulus-client-cli",
"cumulus-client-consensus-common",
@@ -5088,7 +5088,7 @@ dependencies = [
"Inflector",
"array-bytes",
"chrono",
- "clap 4.4.4",
+ "clap 4.4.6",
"comfy-table",
"frame-benchmarking",
"frame-support",
@@ -5180,7 +5180,7 @@ dependencies = [
name = "frame-election-solution-type-fuzzer"
version = "2.0.0-alpha.5"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"frame-election-provider-solution-type",
"frame-election-provider-support",
"frame-support",
@@ -8074,7 +8074,7 @@ name = "node-bench"
version = "0.9.0-dev"
dependencies = [
"array-bytes",
- "clap 4.4.4",
+ "clap 4.4.6",
"derive_more",
"fs_extra",
"futures",
@@ -8111,7 +8111,7 @@ version = "3.0.0-dev"
dependencies = [
"array-bytes",
"assert_cmd",
- "clap 4.4.4",
+ "clap 4.4.6",
"clap_complete",
"criterion 0.4.0",
"frame-benchmarking-cli",
@@ -8237,7 +8237,7 @@ dependencies = [
name = "node-inspect"
version = "0.9.0-dev"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"parity-scale-codec",
"sc-cli",
"sc-client-api",
@@ -8291,7 +8291,7 @@ dependencies = [
name = "node-runtime-generate-bags"
version = "3.0.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"generate-bags",
"kitchensink-runtime",
]
@@ -8300,7 +8300,7 @@ dependencies = [
name = "node-template"
version = "4.0.0-dev"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"frame-benchmarking",
"frame-benchmarking-cli",
"frame-system",
@@ -8343,7 +8343,7 @@ dependencies = [
name = "node-template-release"
version = "3.0.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"flate2",
"fs_extra",
"glob",
@@ -10756,7 +10756,7 @@ dependencies = [
name = "parachain-template-node"
version = "0.1.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"color-print",
"cumulus-client-cli",
"cumulus-client-collator",
@@ -11493,7 +11493,7 @@ dependencies = [
name = "polkadot-cli"
version = "1.1.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"frame-benchmarking-cli",
"futures",
"log",
@@ -12315,7 +12315,7 @@ dependencies = [
"bridge-hub-kusama-runtime",
"bridge-hub-polkadot-runtime",
"bridge-hub-rococo-runtime",
- "clap 4.4.4",
+ "clap 4.4.6",
"collectives-polkadot-runtime",
"color-print",
"contracts-rococo-runtime",
@@ -12792,7 +12792,7 @@ version = "1.0.0"
dependencies = [
"assert_matches",
"async-trait",
- "clap 4.4.4",
+ "clap 4.4.6",
"color-eyre",
"futures",
"futures-timer",
@@ -12939,7 +12939,7 @@ dependencies = [
name = "polkadot-voter-bags"
version = "1.0.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"generate-bags",
"sp-io",
"westend-runtime",
@@ -13699,7 +13699,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
name = "remote-ext-tests-bags-list"
version = "1.0.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"frame-system",
"log",
"pallet-bags-list-remote-tests",
@@ -14411,7 +14411,7 @@ version = "0.10.0-dev"
dependencies = [
"array-bytes",
"chrono",
- "clap 4.4.4",
+ "clap 4.4.6",
"fdlimit",
"futures",
"futures-timer",
@@ -15514,7 +15514,7 @@ dependencies = [
name = "sc-storage-monitor"
version = "0.1.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"fs4",
"log",
"sc-client-db",
@@ -17055,7 +17055,7 @@ dependencies = [
name = "sp-npos-elections-fuzzer"
version = "2.0.0-alpha.5"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"honggfuzz",
"rand 0.8.5",
"sp-npos-elections",
@@ -17659,7 +17659,7 @@ dependencies = [
name = "subkey"
version = "3.0.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"sc-cli",
]
@@ -17701,7 +17701,7 @@ dependencies = [
name = "substrate-frame-cli"
version = "4.0.0-dev"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"frame-support",
"frame-system",
"sc-cli",
@@ -18160,7 +18160,7 @@ dependencies = [
name = "test-parachain-adder-collator"
version = "1.0.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"futures",
"futures-timer",
"log",
@@ -18208,7 +18208,7 @@ dependencies = [
name = "test-parachain-undying-collator"
version = "1.0.0"
dependencies = [
- "clap 4.4.4",
+ "clap 4.4.6",
"futures",
"futures-timer",
"log",
@@ -18854,7 +18854,7 @@ version = "0.10.0-dev"
dependencies = [
"assert_cmd",
"async-trait",
- "clap 4.4.4",
+ "clap 4.4.6",
"frame-remote-externalities",
"frame-try-runtime",
"hex",
diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml
index c45b669fc6d..5dd18f0c156 100644
--- a/cumulus/client/cli/Cargo.toml
+++ b/cumulus/client/cli/Cargo.toml
@@ -5,7 +5,7 @@ authors.workspace = true
edition.workspace = true
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
url = "2.4.0"
diff --git a/cumulus/parachain-template/node/Cargo.toml b/cumulus/parachain-template/node/Cargo.toml
index 114b25d1261..e73c7b50726 100644
--- a/cumulus/parachain-template/node/Cargo.toml
+++ b/cumulus/parachain-template/node/Cargo.toml
@@ -11,7 +11,7 @@ build = "build.rs"
publish = false
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
log = "0.4.20"
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.188", features = ["derive"] }
diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
index 9d5a5ecda1e..778b056b89d 100644
--- a/cumulus/polkadot-parachain/Cargo.toml
+++ b/cumulus/polkadot-parachain/Cargo.toml
@@ -12,7 +12,7 @@ path = "src/main.rs"
[dependencies]
async-trait = "0.1.73"
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
futures = "0.3.28"
hex-literal = "0.4.1"
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index 5285376f3d5..c996a01a12e 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -11,7 +11,7 @@ path = "src/main.rs"
[dependencies]
async-trait = "0.1.73"
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
jsonrpsee = { version = "0.16.2", features = ["server"] }
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index 4646fb1c588..8057342aaea 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -15,7 +15,7 @@ wasm-opt = false
crate-type = ["cdylib", "rlib"]
[dependencies]
-clap = { version = "4.4.4", features = ["derive"], optional = true }
+clap = { version = "4.4.6", features = ["derive"], optional = true }
log = "0.4.17"
thiserror = "1.0.48"
futures = "0.3.21"
diff --git a/polkadot/node/malus/Cargo.toml b/polkadot/node/malus/Cargo.toml
index 42dd4af73c1..9ce725f1682 100644
--- a/polkadot/node/malus/Cargo.toml
+++ b/polkadot/node/malus/Cargo.toml
@@ -40,7 +40,7 @@ assert_matches = "1.5"
async-trait = "0.1.57"
sp-keystore = { path = "../../../substrate/primitives/keystore" }
sp-core = { path = "../../../substrate/primitives/core" }
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
futures = "0.3.21"
futures-timer = "3.0.2"
gum = { package = "tracing-gum", path = "../gum" }
diff --git a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
index 73b1fab529e..70f2ae769a8 100644
--- a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
[dependencies]
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
futures = "0.3.21"
futures-timer = "3.0.2"
log = "0.4.17"
diff --git a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
index 3fbed4046bd..4569d4e153b 100644
--- a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
[dependencies]
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["derive"] }
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
futures = "0.3.21"
futures-timer = "3.0.2"
log = "0.4.17"
diff --git a/polkadot/utils/generate-bags/Cargo.toml b/polkadot/utils/generate-bags/Cargo.toml
index 873b0c0030a..95ca57ea728 100644
--- a/polkadot/utils/generate-bags/Cargo.toml
+++ b/polkadot/utils/generate-bags/Cargo.toml
@@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
generate-bags = { path = "../../../substrate/utils/frame/generate-bags" }
sp-io = { path = "../../../substrate/primitives/io" }
diff --git a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
index c59d354dc4a..e305edc039b 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
+++ b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
@@ -15,6 +15,6 @@ sp-tracing = { path = "../../../../substrate/primitives/tracing" }
frame-system = { path = "../../../../substrate/frame/system" }
sp-core = { path = "../../../../substrate/primitives/core" }
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
log = "0.4.17"
tokio = { version = "1.24.2", features = ["macros"] }
diff --git a/substrate/bin/node-template/node/Cargo.toml b/substrate/bin/node-template/node/Cargo.toml
index 35654e7d564..23840cce222 100644
--- a/substrate/bin/node-template/node/Cargo.toml
+++ b/substrate/bin/node-template/node/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
name = "node-template"
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
futures = { version = "0.3.21", features = ["thread-pool"]}
sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
index 33560bca492..c111d345623 100644
--- a/substrate/bin/node/bench/Cargo.toml
+++ b/substrate/bin/node/bench/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
[dependencies]
array-bytes = "6.1"
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
log = "0.4.17"
node-primitives = { path = "../primitives" }
node-testing = { path = "../testing" }
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index c47f8a5c3e5..5ce4c73f98c 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -38,7 +38,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
# third-party dependencies
array-bytes = "6.1"
-clap = { version = "4.4.4", features = ["derive"], optional = true }
+clap = { version = "4.4.6", features = ["derive"], optional = true }
codec = { package = "parity-scale-codec", version = "3.6.1" }
serde = { version = "1.0.188", features = ["derive"] }
jsonrpsee = { version = "0.16.2", features = ["server"] }
@@ -135,7 +135,7 @@ pallet-timestamp = { path = "../../../frame/timestamp" }
substrate-cli-test-utils = { path = "../../../test-utils/cli" }
[build-dependencies]
-clap = { version = "4.4.4", optional = true }
+clap = { version = "4.4.6", optional = true }
clap_complete = { version = "4.0.2", optional = true }
node-inspect = { path = "../inspect", optional = true}
frame-benchmarking-cli = { path = "../../../utils/frame/benchmarking-cli", optional = true}
diff --git a/substrate/bin/node/inspect/Cargo.toml b/substrate/bin/node/inspect/Cargo.toml
index 06e9674117e..4a92db29185 100644
--- a/substrate/bin/node/inspect/Cargo.toml
+++ b/substrate/bin/node/inspect/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.6.1" }
thiserror = "1.0"
sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
index f564ff19af0..c7690faf7d0 100644
--- a/substrate/bin/utils/chain-spec-builder/Cargo.toml
+++ b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -22,7 +22,7 @@ crate-type = ["rlib"]
[dependencies]
ansi_term = "0.12.1"
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
rand = "0.8"
node-cli = { path = "../../node/cli" }
sc-chain-spec = { path = "../../../client/chain-spec" }
diff --git a/substrate/bin/utils/subkey/Cargo.toml b/substrate/bin/utils/subkey/Cargo.toml
index 4e8cb606c94..6606d8ac365 100644
--- a/substrate/bin/utils/subkey/Cargo.toml
+++ b/substrate/bin/utils/subkey/Cargo.toml
@@ -17,5 +17,5 @@ path = "src/main.rs"
name = "subkey"
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index cfdcb39b1fa..b78287be890 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
array-bytes = "6.1"
chrono = "0.4.27"
-clap = { version = "4.4.4", features = ["derive", "string"] }
+clap = { version = "4.4.6", features = ["derive", "string"] }
fdlimit = "0.2.1"
futures = "0.3.21"
libp2p-identity = { version = "0.1.3", features = ["peerid", "ed25519"]}
diff --git a/substrate/client/storage-monitor/Cargo.toml b/substrate/client/storage-monitor/Cargo.toml
index 7538f5ba602..021ee76240b 100644
--- a/substrate/client/storage-monitor/Cargo.toml
+++ b/substrate/client/storage-monitor/Cargo.toml
@@ -9,7 +9,7 @@ description = "Storage monitor service for substrate"
homepage = "https://substrate.io"
[dependencies]
-clap = { version = "4.4.4", features = ["derive", "string"] }
+clap = { version = "4.4.6", features = ["derive", "string"] }
log = "0.4.17"
fs4 = "0.6.3"
sc-client-db = { path = "../db", default-features = false}
diff --git a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
index 6ac09dd45c6..e4859201454 100644
--- a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
honggfuzz = "0.5"
rand = { version = "0.8", features = ["std", "small_rng"] }
diff --git a/substrate/primitives/npos-elections/fuzzer/Cargo.toml b/substrate/primitives/npos-elections/fuzzer/Cargo.toml
index eeb9deebb71..5e75f926f87 100644
--- a/substrate/primitives/npos-elections/fuzzer/Cargo.toml
+++ b/substrate/primitives/npos-elections/fuzzer/Cargo.toml
@@ -14,7 +14,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
honggfuzz = "0.5"
rand = { version = "0.8", features = ["std", "small_rng"] }
sp-npos-elections = { path = ".." }
diff --git a/substrate/scripts/ci/node-template-release/Cargo.toml b/substrate/scripts/ci/node-template-release/Cargo.toml
index c0e02758724..73ffce8645b 100644
--- a/substrate/scripts/ci/node-template-release/Cargo.toml
+++ b/substrate/scripts/ci/node-template-release/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
flate2 = "1.0"
fs_extra = "1.3"
glob = "0.3"
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index 9ba22e24faa..e32fe47b729 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
array-bytes = "6.1"
chrono = "0.4"
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.6.1" }
comfy-table = { version = "7.0.1", default-features = false }
handlebars = "4.2.2"
diff --git a/substrate/utils/frame/frame-utilities-cli/Cargo.toml b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
index 5a3365dc900..24c04f47391 100644
--- a/substrate/utils/frame/frame-utilities-cli/Cargo.toml
+++ b/substrate/utils/frame/frame-utilities-cli/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/substrate-frame-cli"
readme = "README.md"
[dependencies]
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
frame-support = { path = "../../../frame/support" }
frame-system = { path = "../../../frame/system" }
sc-cli = { path = "../../../client/cli" }
diff --git a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
index e1490aa363c..13e61138356 100644
--- a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
@@ -14,4 +14,4 @@ kitchensink-runtime = { path = "../../../../bin/node/runtime" }
generate-bags = { path = ".." }
# third-party
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
diff --git a/substrate/utils/frame/try-runtime/cli/Cargo.toml b/substrate/utils/frame/try-runtime/cli/Cargo.toml
index 3f693ca6c82..65380a22ce6 100644
--- a/substrate/utils/frame/try-runtime/cli/Cargo.toml
+++ b/substrate/utils/frame/try-runtime/cli/Cargo.toml
@@ -35,7 +35,7 @@ frame-try-runtime = { path = "../../../../frame/try-runtime", optional = true}
substrate-rpc-client = { path = "../../rpc/client" }
async-trait = "0.1.57"
-clap = { version = "4.4.4", features = ["derive"] }
+clap = { version = "4.4.6", features = ["derive"] }
hex = { version = "0.4.3", default-features = false }
log = "0.4.17"
parity-scale-codec = "3.6.1"
--
GitLab
From 1835c091c42456e8df3ecbf0a94b7b88c395f623 Mon Sep 17 00:00:00 2001
From: Oliver Tale-Yazdi
Date: Fri, 6 Oct 2023 10:08:09 +0200
Subject: [PATCH 005/119] Revive Substrate Crate (#1477)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes https://github.com/paritytech/polkadot-sdk/issues/1450
Bringing back the Substrate crate that was forgotten in the monorepo
import 😅.
It is a doc-only crate. Version number is set to `1.0.0` and publishing
is enabled (so that we can link to docs.rs).
---------
Signed-off-by: Oliver Tale-Yazdi
Co-authored-by: Bastian Köcher
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
Cargo.lock | 19 +++
Cargo.toml | 25 ++--
substrate/Cargo.toml | 28 ++++
substrate/src/src/lib.rs | 297 +++++++++++++++++++++++++++++++++++++++
4 files changed, 357 insertions(+), 12 deletions(-)
create mode 100644 substrate/Cargo.toml
create mode 100644 substrate/src/src/lib.rs
diff --git a/Cargo.lock b/Cargo.lock
index 340587d268d..e925c445b6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17663,6 +17663,25 @@ dependencies = [
"sc-cli",
]
+[[package]]
+name = "substrate"
+version = "1.0.0"
+dependencies = [
+ "aquamarine",
+ "chain-spec-builder",
+ "frame-support",
+ "sc-cli",
+ "sc-consensus-aura",
+ "sc-consensus-babe",
+ "sc-consensus-beefy",
+ "sc-consensus-grandpa",
+ "sc-consensus-manual-seal",
+ "sc-consensus-pow",
+ "sc-service",
+ "sp-runtime",
+ "subkey",
+]
+
[[package]]
name = "substrate-bip39"
version = "0.4.4"
diff --git a/Cargo.toml b/Cargo.toml
index 9c936024e5f..aa0b93737f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,11 +110,11 @@ members = [
"polkadot/node/core/parachains-inherent",
"polkadot/node/core/prospective-parachains",
"polkadot/node/core/provisioner",
+ "polkadot/node/core/pvf-checker",
"polkadot/node/core/pvf",
"polkadot/node/core/pvf/common",
"polkadot/node/core/pvf/execute-worker",
"polkadot/node/core/pvf/prepare-worker",
- "polkadot/node/core/pvf-checker",
"polkadot/node/core/runtime-api",
"polkadot/node/gum",
"polkadot/node/gum/proc-macro",
@@ -134,10 +134,10 @@ members = [
"polkadot/node/overseer",
"polkadot/node/primitives",
"polkadot/node/service",
- "polkadot/node/subsystem",
"polkadot/node/subsystem-test-helpers",
"polkadot/node/subsystem-types",
"polkadot/node/subsystem-util",
+ "polkadot/node/subsystem",
"polkadot/node/test/client",
"polkadot/node/test/service",
"polkadot/node/zombienet-backchannel",
@@ -165,8 +165,8 @@ members = [
"polkadot/utils/generate-bags",
"polkadot/utils/remote-ext-tests/bags-list",
"polkadot/xcm",
- "polkadot/xcm/pallet-xcm",
"polkadot/xcm/pallet-xcm-benchmarks",
+ "polkadot/xcm/pallet-xcm",
"polkadot/xcm/procedural",
"polkadot/xcm/xcm-builder",
"polkadot/xcm/xcm-executor",
@@ -174,6 +174,10 @@ members = [
"polkadot/xcm/xcm-simulator",
"polkadot/xcm/xcm-simulator/example",
"polkadot/xcm/xcm-simulator/fuzzer",
+ "substrate",
+ "substrate/bin/node-template/node",
+ "substrate/bin/node-template/pallets/template",
+ "substrate/bin/node-template/runtime",
"substrate/bin/node/bench",
"substrate/bin/node/cli",
"substrate/bin/node/executor",
@@ -182,9 +186,6 @@ members = [
"substrate/bin/node/rpc",
"substrate/bin/node/runtime",
"substrate/bin/node/testing",
- "substrate/bin/node-template/node",
- "substrate/bin/node-template/pallets/template",
- "substrate/bin/node-template/runtime",
"substrate/bin/utils/chain-spec-builder",
"substrate/bin/utils/subkey",
"substrate/client/allocator",
@@ -216,6 +217,7 @@ members = [
"substrate/client/keystore",
"substrate/client/merkle-mountain-range",
"substrate/client/merkle-mountain-range/rpc",
+ "substrate/client/network-gossip",
"substrate/client/network",
"substrate/client/network/bitswap",
"substrate/client/network/common",
@@ -224,13 +226,12 @@ members = [
"substrate/client/network/sync",
"substrate/client/network/test",
"substrate/client/network/transactions",
- "substrate/client/network-gossip",
"substrate/client/offchain",
"substrate/client/proposer-metrics",
- "substrate/client/rpc",
"substrate/client/rpc-api",
"substrate/client/rpc-servers",
"substrate/client/rpc-spec-v2",
+ "substrate/client/rpc",
"substrate/client/service",
"substrate/client/service/test",
"substrate/client/state-db",
@@ -257,8 +258,8 @@ members = [
"substrate/frame/bags-list/fuzzer",
"substrate/frame/bags-list/remote-tests",
"substrate/frame/balances",
- "substrate/frame/beefy",
"substrate/frame/beefy-mmr",
+ "substrate/frame/beefy",
"substrate/frame/benchmarking",
"substrate/frame/benchmarking/pov",
"substrate/frame/bounties",
@@ -398,12 +399,12 @@ members = [
"substrate/primitives/offchain",
"substrate/primitives/panic-handler",
"substrate/primitives/rpc",
- "substrate/primitives/runtime",
"substrate/primitives/runtime-interface",
"substrate/primitives/runtime-interface/proc-macro",
- "substrate/primitives/runtime-interface/test",
- "substrate/primitives/runtime-interface/test-wasm",
"substrate/primitives/runtime-interface/test-wasm-deprecated",
+ "substrate/primitives/runtime-interface/test-wasm",
+ "substrate/primitives/runtime-interface/test",
+ "substrate/primitives/runtime",
"substrate/primitives/session",
"substrate/primitives/staking",
"substrate/primitives/state-machine",
diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml
new file mode 100644
index 00000000000..d77f02c6060
--- /dev/null
+++ b/substrate/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "substrate"
+description = "Next-generation framework for blockchain innovation"
+license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
+homepage = "https://substrate.io"
+repository.workspace = true
+authors.workspace = true
+edition.workspace = true
+version = "1.0.0"
+
+# The dependencies are only needed for docs.
+[dependencies]
+aquamarine = "0.3.2"
+
+subkey = { path = "bin/utils/subkey" }
+chain-spec-builder = { path = "bin/utils/chain-spec-builder" }
+
+sc-service = { path = "client/service" }
+sc-cli = { path = "client/cli" }
+sc-consensus-aura = { path = "client/consensus/aura" }
+sc-consensus-babe = { path = "client/consensus/babe" }
+sc-consensus-grandpa = { path = "client/consensus/grandpa" }
+sc-consensus-beefy = { path = "client/consensus/beefy" }
+sc-consensus-manual-seal = { path = "client/consensus/manual-seal" }
+sc-consensus-pow = { path = "client/consensus/pow" }
+
+sp-runtime = { path = "primitives/runtime" }
+frame-support = { path = "frame/support" }
diff --git a/substrate/src/src/lib.rs b/substrate/src/src/lib.rs
new file mode 100644
index 00000000000..16a60677896
--- /dev/null
+++ b/substrate/src/src/lib.rs
@@ -0,0 +1,297 @@
+// This file is part of Substrate.
+
+// 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
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+//! # Substrate
+//!
+//! Substrate is a Rust framework for building blockchains in a modular and extensible way. While in
+//! itself un-opinionated, it is the main engine behind the Polkadot ecosystem.
+//!
+//! [![github]](https://github.com/paritytech/substrate/) - [![polkadot]](https://polkadot.network)
+//!
+//! This crate in itself does not contain any code and is just meant ot be a documentation hub for
+//! substrate-based crates.
+//!
+//! ## Overview
+//!
+//! Substrate approaches blockchain development with an acknowledgement of a few self-evident
+//! truths:
+//!
+//! 1. Society and technology evolves.
+//! 2. Humans are fallible.
+//!
+//! This, specifically, makes the task of designing a correct, safe and long-lasting blockchain
+//! system hard.
+//!
+//! Nonetheless, in order to achieve this goal, substrate embraces the following:
+//!
+//! 1. Use of **Rust** as a modern, and safe programming language, which limits human error through
+//! various means, most notably memory safety.
+//! 2. Substrate is written from the ground-up with a generic, modular and extensible design. This
+//! ensures that software components can be easily swapped and upgraded. Examples of this is
+//! multiple consensus mechanisms provided by Substrate, as listed below.
+//! 3. Lastly, the final blockchain system created with the above properties needs to be
+//! upgradeable. In order to achieve this, Substrate is designed as a meta-protocol, whereby the
+//! application logic of the blockchain (called "Runtime") is encoded as a Wasm blob, and is
+//! stored onchain. The rest of the system (called "Client") acts as the executor of the Wasm
+//! blob.
+//!
+//! In essence, the meta-protocol of all Substrate based chains is the "Runtime as Wasm blob"
+//! accord. This enables the Runtime to become inherently upgradeable (without forks). The upgrade
+//! is merely a matter of the Wasm blob being changed in the chain state, which is, in principle,
+//! same as updating an account's balance.
+//!
+//! To learn more about the substrate architecture using some visuals, see [`substrate_diagram`].
+//!
+//! `FRAME`, Substrate's default runtime development library takes the above even further by
+//! embracing a declarative programming model whereby correctness is enhanced and the system is
+//! highly configurable through parameterization.
+//!
+//! All in all, this design enables all substrate-based chains to achieve forkless, self-enacting
+//! upgrades out of the box. Combined with governance abilities that are shipped with `FRAME`, this
+//! enables a chain to survive the test of time.
+//!
+//! ## How to Get Stared
+//!
+//! Most developers want to leave the client side code as-is, and focus on the runtime. To do so,
+//! look into the [`frame_support`] crate, which is the entry point crate into runtime development
+//! with FRAME.
+//!
+//! > Side note, it is entirely possible to craft a substrate-based runtime without FRAME, an
+//! > example of which can be found [here](https://github.com/JoshOrndorff/frameless-node-template).
+//!
+//! In more broad terms, the following avenues exist into developing with substrate:
+//!
+//! * **Templates**: A number of substrate-based templates exist and they can be used for various
+//! purposes, with zero to little additional code needed. All of these templates contain runtimes
+//! that are highly configurable and are likely suitable for basic needs.
+//! * `FRAME`: If need, one can customize that runtime even further, by using `FRAME` and developing
+//! custom modules.
+//! * **Core**: To the contrary, some developers may want to customize the client side software to
+//! achieve novel goals such as a new consensus engine, or a new database backend. While
+//! Substrate's main configurability is in the runtime, the client is also highly generic and can
+//! be customized to a great extent.
+//!
+//! ## Structure
+//!
+//! Substrate is a massive cargo workspace with hundreds of crates, therefore it is useful to know
+//! how to navigate its crates.
+//!
+//! In broad terms, it is divided into three categories:
+//!
+//! * `sc-*` (short for *substrate-client*) crates, located under `./client` folder. These are all
+//! the client crates. Notable examples are crates such as [`sc-network`], various consensus
+//! crates, [`sc-rpc-api`] and [`sc-client-db`], all of which are expected to reside in the client
+//! side.
+//! * `sp-*` (short for *substrate-primitives*) crates, located under `./primitives` folder. These
+//! are the traits that glue the client and runtime together, but are not opinionated about what
+//! framework is using for building the runtime. Notable examples are [`sp-api`] and [`sp-io`],
+//! which form the communication bridge between the client and runtime, as explained in
+//! [`substrate_diagram`].
+//! * `pallet-*` and `frame-*` crates, located under `./frame` folder. These are the crates related
+//! to FRAME. See [`frame_support`] for more information.
+//!
+//! ### Wasm Build
+//!
+//! Many of the Substrate crates, such as entire `sp-*`, need to compile to both Wasm (when a Wasm
+//! runtime is being generated) and native (for example, when testing). To achieve this, Substrate
+//! follows the convention of the Rust community, and uses a `feature = "std"` to signify that a
+//! crate is being built with the standard library, and is built for native. Otherwise, it is built
+//! for `no_std`.
+//!
+//! This can be summarized in `#![cfg_attr(not(feature = "std"), no_std)]`, which you can often find
+//! in any Substrate-based runtime.
+//!
+//! Substrate-based runtimes use [`substrate-wasm-builder`] in their `build.rs` to automatically
+//! build their Wasm files as a part of normal build commandsOnce built, the wasm file is placed in
+//! `./target/{debug|release}/wbuild/{runtime_name}.wasm`.
+//!
+//! ### Binaries
+//!
+//! Multiple binaries are shipped with substrate, the most important of which are located in the
+//! `./bin` folder.
+//!
+//! * [`node`] is an extensive substrate node that contains the superset of all runtime and client
+//! side features. The corresponding runtime, called [`kitchensink_runtime`] contains all of the
+//! modules that are provided with `FRAME`. This node and runtime is only used for testing and
+//! demonstration.
+//! * [`chain-spec-builder`]: Utility to build more detailed chain-specs for the aforementioned
+//! node. Other projects typically contain a `build-spec` subcommand that does the same.
+//! * [`node-template`]: a template node that contains a minimal set of features and can act as a
+//! starting point of a project.
+//! * [`subkey`]: Substrate's key management utility.
+//!
+//! ### Anatomy of a Binary Crate
+//!
+//! From the above, [`node`] and [`node-template`] are essentially blueprints of a substrate-based
+//! project, as the name of the latter is implying. Each substrate-based project typically contains
+//! the following:
+//!
+//! * Under `./runtime`, a `./runtime/src/lib.rs` which is the top level runtime amalgamator file.
+//! This file typically contains the [`frame_support::construct_runtime`] macro, which is the
+//! final definition of a runtime.
+//!
+//! * Under `./node`, a `main.rs`, which is the point, and a `./service.rs`, which contains all the
+//! client side components. Skimming this file yields an overview of the networking, database,
+//! consensus and similar client side components.
+//!
+//! > The above two are conventions, not rules.
+//!
+//! ## Parachain?
+//!
+//! As noted above, Substrate is the main engine behind the Polkadot ecosystem. One of the ways
+//! through which Polkadot can be utilized is by building "parachains", blockchains that are
+//! connected to Polkadot's shared security.
+//!
+//! To build a parachain, one could use [`Cumulus`](https://github.com/paritytech/cumulus/), the
+//! library on top of Substrate, empowering any substrate-based chain to be a Polkadot parachain.
+//!
+//! ## Where To Go Next?
+//!
+//! Additional noteworthy crates within substrate:
+//!
+//! - RPC APIs of a Substrate node: [`sc-rpc-api`]/[`sc-rpc`]
+//! - CLI Options of a Substrate node: [`sc-cli`]
+//! - All of the consensus related crates provided by Substrate:
+//! - [`sc-consensus-aura`]
+//! - [`sc-consensus-babe`]
+//! - [`sc-consensus-grandpa`]
+//! - [`sc-consensus-beefy`]
+//! - [`sc-consensus-manual-seal`]
+//! - [`sc-consensus-pow`]
+//!
+//! Additional noteworthy external resources:
+//!
+//! - [Substrate Developer Hub](https://substrate.dev)
+//! - [Parity Tech's Documentation Hub](https://paritytech.github.io/)
+//! - [Frontier: Substrate's Ethereum Compatibility Library](https://paritytech.github.io/frontier/)
+//! - [Polkadot Wiki](https://wiki.polkadot.network/en/)
+//!
+//! Notable upstream crates:
+//!
+//! - [`parity-scale-codec`](https://github.com/paritytech/parity-scale-codec)
+//! - [`parity-db`](https://github.com/paritytech/parity-db)
+//! - [`trie`](https://github.com/paritytech/trie)
+//! - [`parity-common`](https://github.com/paritytech/parity-common)
+//!
+//! Templates:
+//!
+//! - classic [`substrate-node-template`](https://github.com/substrate-developer-hub/substrate-node-template)
+//! - classic [cumulus-parachain-template](https://github.com/substrate-developer-hub/substrate-parachain-template)
+//! - [`extended-parachain-template`](https://github.com/paritytech/extended-parachain-template)
+//! - [`frontier-parachain-template`](https://github.com/paritytech/frontier-parachain-template)
+//!
+//! [polkadot]:
+//! https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
+//! [github]:
+//! https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
+//! [`sp-io`]: ../sp_io/index.html
+//! [`sp-api`]: ../sp_api/index.html
+//! [`sp-api`]: ../sp_api/index.html
+//! [`sc-client-db`]: ../sc_client_db/index.html
+//! [`sc-network`]: ../sc_network/index.html
+//! [`sc-rpc-api`]: ../sc_rpc_api/index.html
+//! [`sc-rpc`]: ../sc_rpc/index.html
+//! [`sc-cli`]: ../sc_cli/index.html
+//! [`sc-consensus-aura`]: ../sc_consensus_aura/index.html
+//! [`sc-consensus-babe`]: ../sc_consensus_babe/index.html
+//! [`sc-consensus-grandpa`]: ../sc_consensus_grandpa/index.html
+//! [`sc-consensus-beefy`]: ../sc_consensus_beefy/index.html
+//! [`sc-consensus-manual-seal`]: ../sc_consensus_manual_seal/index.html
+//! [`sc-consensus-pow`]: ../sc_consensus_pow/index.html
+//! [`node`]: ../node_cli/index.html
+//! [`node-template`]: ../node_template/index.html
+//! [`kitchensink_runtime`]: ../kitchensink_runtime/index.html
+//! [`subkey`]: ../subkey/index.html
+//! [`chain-spec-builder`]: ../chain_spec_builder/index.html
+//! [`substrate-wasm-builder`]: https://crates.io/crates/substrate-wasm-builder
+
+#![deny(rustdoc::broken_intra_doc_links)]
+#![deny(rustdoc::private_intra_doc_links)]
+
+#[cfg_attr(doc, aquamarine::aquamarine)]
+/// In this module, we explore substrate at a more depth. First, let's establish substrate being
+/// divided into a client and runtime.
+///
+/// ```mermaid
+/// graph TB
+/// subgraph Substrate
+/// direction LR
+/// subgraph Client
+/// end
+/// subgraph Runtime
+/// end
+/// end
+/// ```
+///
+/// The client and the runtime of course need to communicate. This is done through two concepts:
+///
+/// 1. Host functions: a way for the (Wasm) runtime to talk to the client. All host functions are
+/// defined in [`sp-io`]. For example, [`sp-io::storage`] are the set of host functions that
+/// allow the runtime to read and write data to the on-chain state.
+/// 2. Runtime APIs: a way for the client to talk to the Wasm runtime. Runtime APIs are defined
+/// using macros and utilities in [`sp-api`]. For example, [`sp-api::Core`] is the most basic
+/// runtime API that any blockchain must implement in order to be able to (re) execute blocks.
+///
+/// ```mermaid
+/// graph TB
+/// subgraph Substrate
+/// direction LR
+/// subgraph Client
+/// end
+/// subgraph Runtime
+/// end
+/// Client --runtime-api--> Runtime
+/// Runtime --host-functions--> Client
+/// end
+/// ```
+///
+/// Finally, let's expand the diagram a bit further and look at the internals of each component:
+///
+/// ```mermaid
+/// graph TB
+/// subgraph Substrate
+/// direction LR
+/// subgraph Client
+/// Database
+/// Networking
+/// Consensus
+/// end
+/// subgraph Runtime
+/// subgraph FRAME
+/// direction LR
+/// Governance
+/// Currency
+/// Staking
+/// Identity
+/// end
+/// end
+/// Client --runtime-api--> Runtime
+/// Runtime --host-functions--> Client
+/// end
+/// ```
+///
+/// As noted the runtime contains all of the application specific logic of the blockchain. This is
+/// usually written with `FRAME`. The client, on the other hand, contains reusable and generic
+/// components that are not specific to one single blockchain, such as networking, database, and the
+/// consensus engine.
+///
+/// [`sp-io`]: ../../sp_io/index.html
+/// [`sp-api`]: ../../sp_api/index.html
+/// [`sp-io::storage`]: ../../sp_io/storage/index.html
+/// [`sp-api::Core`]: ../../sp_api/trait.Core.html
+pub mod substrate_diagram {}
--
GitLab
From ddf5e5c04c149f335f2274b9e920e411e83749a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 18:07:01 +0200
Subject: [PATCH 006/119] Bump the known_good_semver group with 1 update
(#1802)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps the known_good_semver group with 1 update:
[syn](https://github.com/dtolnay/syn).
Release notes
Sourced from syn's
releases.
2.0.38
- Fix "method 'peek' has an incompatible type for
trait" error when defining
bool as a custom
keyword (#1518,
thanks @Vanille-N)
Commits
43632bf
Release 2.0.38abd2c21
Merge pull request #1518
from Vanille-N/master6701e60
Absolute path to bool in
custom_punctuation.rs7313d24
Resolve single_match_else pedantic clippy lint in code generator67ab64f
Include unexpected token in the test failure message137ae33
Check no remaining token after the first literal258e9e8
Ignore single_match_else pedantic clippy lint in test92fd50e
Test docs.rs documentation build in CI- See full diff in compare
view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore ` will
remove the ignore condition of the specified dependency and ignore
conditions
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
Cargo.lock | 100 +++++++++---------
.../parachain-system/proc-macro/Cargo.toml | 2 +-
polkadot/node/gum/proc-macro/Cargo.toml | 2 +-
polkadot/xcm/procedural/Cargo.toml | 2 +-
substrate/client/chain-spec/derive/Cargo.toml | 2 +-
.../client/tracing/proc-macro/Cargo.toml | 2 +-
.../frame/contracts/proc-macro/Cargo.toml | 2 +-
.../solution-type/Cargo.toml | 2 +-
.../frame/staking/reward-curve/Cargo.toml | 2 +-
substrate/frame/support/procedural/Cargo.toml | 2 +-
.../frame/support/procedural/tools/Cargo.toml | 2 +-
.../procedural/tools/derive/Cargo.toml | 2 +-
.../primitives/api/proc-macro/Cargo.toml | 2 +-
.../core/hashing/proc-macro/Cargo.toml | 2 +-
substrate/primitives/debug-derive/Cargo.toml | 2 +-
.../runtime-interface/proc-macro/Cargo.toml | 2 +-
.../primitives/version/proc-macro/Cargo.toml | 2 +-
17 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e925c445b6b..1559ae20180 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1091,7 +1091,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -1113,7 +1113,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -1130,7 +1130,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -1304,7 +1304,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2484,7 +2484,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -3520,7 +3520,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4003,7 +4003,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4043,7 +4043,7 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4060,7 +4060,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4359,7 +4359,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4421,7 +4421,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.37",
+ "syn 2.0.38",
"termcolor",
"toml 0.7.6",
"walkdir",
@@ -4642,7 +4642,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4653,7 +4653,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4798,7 +4798,7 @@ dependencies = [
"fs-err",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -5154,7 +5154,7 @@ dependencies = [
"quote",
"scale-info",
"sp-arithmetic",
- "syn 2.0.37",
+ "syn 2.0.38",
"trybuild",
]
@@ -5307,7 +5307,7 @@ dependencies = [
"proc-macro2",
"quote",
"sp-core-hashing",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -5318,7 +5318,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -5327,7 +5327,7 @@ version = "3.0.0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -5550,7 +5550,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -7551,7 +7551,7 @@ dependencies = [
"macro_magic_core",
"macro_magic_macros",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -7565,7 +7565,7 @@ dependencies = [
"macro_magic_core_macros",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -7576,7 +7576,7 @@ checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -7587,7 +7587,7 @@ checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a"
dependencies = [
"macro_magic_core",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -9295,7 +9295,7 @@ version = "4.0.0-dev"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -10366,7 +10366,7 @@ dependencies = [
"proc-macro2",
"quote",
"sp-runtime",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -11233,7 +11233,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -11274,7 +11274,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -13117,7 +13117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
dependencies = [
"proc-macro2",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -13199,7 +13199,7 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -13245,7 +13245,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -13636,7 +13636,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -14402,7 +14402,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -15614,7 +15614,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -15974,7 +15974,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -16040,7 +16040,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -16473,7 +16473,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -16873,7 +16873,7 @@ version = "9.0.0"
dependencies = [
"quote",
"sp-core-hashing",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -16917,7 +16917,7 @@ version = "8.0.0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -17148,7 +17148,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -17388,7 +17388,7 @@ dependencies = [
"proc-macro2",
"quote",
"sp-version",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -18069,9 +18069,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.37"
+version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
"proc-macro2",
"quote",
@@ -18316,7 +18316,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -18496,7 +18496,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -18677,7 +18677,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -18720,7 +18720,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -19269,7 +19269,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
"wasm-bindgen-shared",
]
@@ -19303,7 +19303,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -20444,7 +20444,7 @@ dependencies = [
"Inflector",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -20563,7 +20563,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
diff --git a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
index a1510847fc2..cb5d9904c7c 100644
--- a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
+++ b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
@@ -9,7 +9,7 @@ description = "Proc macros provided by the parachain-system pallet"
proc-macro = true
[dependencies]
-syn = "2.0.37"
+syn = "2.0.38"
proc-macro2 = "1.0.64"
quote = "1.0.33"
proc-macro-crate = "1.3.1"
diff --git a/polkadot/node/gum/proc-macro/Cargo.toml b/polkadot/node/gum/proc-macro/Cargo.toml
index 83d064cadbe..1ffaf6160ba 100644
--- a/polkadot/node/gum/proc-macro/Cargo.toml
+++ b/polkadot/node/gum/proc-macro/Cargo.toml
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true
[dependencies]
-syn = { version = "2.0.37", features = ["full", "extra-traits"] }
+syn = { version = "2.0.38", features = ["full", "extra-traits"] }
quote = "1.0.28"
proc-macro2 = "1.0.56"
proc-macro-crate = "1.1.3"
diff --git a/polkadot/xcm/procedural/Cargo.toml b/polkadot/xcm/procedural/Cargo.toml
index 1ff73c64780..56df0d94f58 100644
--- a/polkadot/xcm/procedural/Cargo.toml
+++ b/polkadot/xcm/procedural/Cargo.toml
@@ -11,5 +11,5 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = "2.0.37"
+syn = "2.0.38"
Inflector = "0.11.4"
diff --git a/substrate/client/chain-spec/derive/Cargo.toml b/substrate/client/chain-spec/derive/Cargo.toml
index 202817438b7..74b8b656a40 100644
--- a/substrate/client/chain-spec/derive/Cargo.toml
+++ b/substrate/client/chain-spec/derive/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro = true
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = "2.0.37"
+syn = "2.0.38"
diff --git a/substrate/client/tracing/proc-macro/Cargo.toml b/substrate/client/tracing/proc-macro/Cargo.toml
index f18e0aacd37..b134cbce3cc 100644
--- a/substrate/client/tracing/proc-macro/Cargo.toml
+++ b/substrate/client/tracing/proc-macro/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro = true
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.56"
quote = { version = "1.0.28", features = ["proc-macro"] }
-syn = { version = "2.0.37", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "2.0.38", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/substrate/frame/contracts/proc-macro/Cargo.toml b/substrate/frame/contracts/proc-macro/Cargo.toml
index a04f5544067..3ada9e0c23d 100644
--- a/substrate/frame/contracts/proc-macro/Cargo.toml
+++ b/substrate/frame/contracts/proc-macro/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full"] }
+syn = { version = "2.0.38", features = ["full"] }
[dev-dependencies]
diff --git a/substrate/frame/election-provider-support/solution-type/Cargo.toml b/substrate/frame/election-provider-support/solution-type/Cargo.toml
index 39e535c6c3e..f4ea4ef6e36 100644
--- a/substrate/frame/election-provider-support/solution-type/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true
[dependencies]
-syn = { version = "2.0.37", features = ["full", "visit"] }
+syn = { version = "2.0.38", features = ["full", "visit"] }
quote = "1.0.28"
proc-macro2 = "1.0.56"
proc-macro-crate = "1.1.3"
diff --git a/substrate/frame/staking/reward-curve/Cargo.toml b/substrate/frame/staking/reward-curve/Cargo.toml
index 484afb6136b..0a725996115 100644
--- a/substrate/frame/staking/reward-curve/Cargo.toml
+++ b/substrate/frame/staking/reward-curve/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full", "visit"] }
+syn = { version = "2.0.38", features = ["full", "visit"] }
[dev-dependencies]
sp-runtime = { path = "../../../primitives/runtime" }
diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
index 704f355ff6c..d2854a2a79f 100644
--- a/substrate/frame/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -21,7 +21,7 @@ cfg-expr = "0.15.5"
itertools = "0.10.3"
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full"] }
+syn = { version = "2.0.38", features = ["full"] }
frame-support-procedural-tools = { path = "tools" }
proc-macro-warning = { version = "0.4.2", default-features = false }
macro_magic = { version = "0.4.2", features = ["proc_support"] }
diff --git a/substrate/frame/support/procedural/tools/Cargo.toml b/substrate/frame/support/procedural/tools/Cargo.toml
index 7589fa353d1..fd42e18180d 100644
--- a/substrate/frame/support/procedural/tools/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/Cargo.toml
@@ -15,5 +15,5 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full", "visit", "extra-traits"] }
+syn = { version = "2.0.38", features = ["full", "visit", "extra-traits"] }
frame-support-procedural-tools-derive = { path = "derive" }
diff --git a/substrate/frame/support/procedural/tools/derive/Cargo.toml b/substrate/frame/support/procedural/tools/derive/Cargo.toml
index 5bf67d43d06..06f8e0f3d53 100644
--- a/substrate/frame/support/procedural/tools/derive/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/derive/Cargo.toml
@@ -17,4 +17,4 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0.56"
quote = { version = "1.0.28", features = ["proc-macro"] }
-syn = { version = "2.0.37", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "2.0.38", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/substrate/primitives/api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml
index de5ddcf9dac..25c87b5d0a4 100644
--- a/substrate/primitives/api/proc-macro/Cargo.toml
+++ b/substrate/primitives/api/proc-macro/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
[dependencies]
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "2.0.38", features = ["full", "fold", "extra-traits", "visit"] }
proc-macro2 = "1.0.56"
blake2 = { version = "0.10.4", default-features = false }
proc-macro-crate = "1.1.3"
diff --git a/substrate/primitives/core/hashing/proc-macro/Cargo.toml b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
index 64b46ab9c19..187b5559b93 100644
--- a/substrate/primitives/core/hashing/proc-macro/Cargo.toml
+++ b/substrate/primitives/core/hashing/proc-macro/Cargo.toml
@@ -17,5 +17,5 @@ proc-macro = true
[dependencies]
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full", "parsing"] }
+syn = { version = "2.0.38", features = ["full", "parsing"] }
sp-core-hashing = { path = "..", default-features = false}
diff --git a/substrate/primitives/debug-derive/Cargo.toml b/substrate/primitives/debug-derive/Cargo.toml
index 9d3930ac257..c97c8a0a399 100644
--- a/substrate/primitives/debug-derive/Cargo.toml
+++ b/substrate/primitives/debug-derive/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
[dependencies]
quote = "1.0.28"
-syn = "2.0.37"
+syn = "2.0.38"
proc-macro2 = "1.0.56"
[features]
diff --git a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
index 5569e31c936..fbc49785ae9 100644
--- a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -20,4 +20,4 @@ Inflector = "0.11.4"
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full", "visit", "fold", "extra-traits"] }
+syn = { version = "2.0.38", features = ["full", "visit", "fold", "extra-traits"] }
diff --git a/substrate/primitives/version/proc-macro/Cargo.toml b/substrate/primitives/version/proc-macro/Cargo.toml
index cc28b8f176b..7fce559e3ed 100644
--- a/substrate/primitives/version/proc-macro/Cargo.toml
+++ b/substrate/primitives/version/proc-macro/Cargo.toml
@@ -19,7 +19,7 @@ proc-macro = true
codec = { package = "parity-scale-codec", version = "3.6.1", features = [ "derive" ] }
proc-macro2 = "1.0.56"
quote = "1.0.28"
-syn = { version = "2.0.37", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "2.0.38", features = ["full", "fold", "extra-traits", "visit"] }
[dev-dependencies]
sp-version = { path = ".." }
--
GitLab
From 35ed272dade7a339605a9f8df25dd451b199deb9 Mon Sep 17 00:00:00 2001
From: Dmitry Borodin <11879032+Dmitry-Borodin@users.noreply.github.com>
Date: Sat, 7 Oct 2023 04:04:00 -0500
Subject: [PATCH 007/119] migrate babe and authorship to use derive-impl
(#1790)
Moving a babe and authorship pallets to the latest and greatest
derive_impl.
Part of https://github.com/paritytech/polkadot-sdk/issues/171
---------
Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
substrate/frame/authorship/src/lib.rs | 33 +++------------------------
substrate/frame/babe/src/mock.rs | 28 ++++-------------------
2 files changed, 7 insertions(+), 54 deletions(-)
diff --git a/substrate/frame/authorship/src/lib.rs b/substrate/frame/authorship/src/lib.rs
index a9bd0c38cb6..56a516894de 100644
--- a/substrate/frame/authorship/src/lib.rs
+++ b/substrate/frame/authorship/src/lib.rs
@@ -97,16 +97,10 @@ mod tests {
use super::*;
use crate as pallet_authorship;
use codec::{Decode, Encode};
- use frame_support::{
- traits::{ConstU32, ConstU64},
- ConsensusEngineId,
- };
+ use frame_support::{derive_impl, ConsensusEngineId};
use sp_core::H256;
use sp_runtime::{
- generic::DigestItem,
- testing::Header,
- traits::{BlakeTwo256, Header as HeaderT, IdentityLookup},
- BuildStorage,
+ generic::DigestItem, testing::Header, traits::Header as HeaderT, BuildStorage,
};
type Block = frame_system::mocking::MockBlock;
@@ -119,30 +113,9 @@ mod tests {
}
);
+ #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for Test {
- type BaseCallFilter = frame_support::traits::Everything;
- type BlockWeights = ();
- type BlockLength = ();
- type DbWeight = ();
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = u64;
- type Lookup = IdentityLookup;
type Block = Block;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
- type Version = ();
- type PalletInfo = PalletInfo;
- type AccountData = ();
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type SystemWeightInfo = ();
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = ConstU32<16>;
}
impl pallet::Config for Test {
diff --git a/substrate/frame/babe/src/mock.rs b/substrate/frame/babe/src/mock.rs
index dbffe9f312e..a3f755902b5 100644
--- a/substrate/frame/babe/src/mock.rs
+++ b/substrate/frame/babe/src/mock.rs
@@ -24,7 +24,7 @@ use frame_election_provider_support::{
onchain, SequentialPhragmen,
};
use frame_support::{
- parameter_types,
+ derive_impl, parameter_types,
traits::{ConstU128, ConstU32, ConstU64, KeyOwnerProofSystem, OnInitialize},
};
use pallet_session::historical as pallet_session_historical;
@@ -32,14 +32,14 @@ use pallet_staking::FixedNominationsQuota;
use sp_consensus_babe::{AuthorityId, AuthorityPair, Randomness, Slot, VrfSignature};
use sp_core::{
crypto::{KeyTypeId, Pair, VrfSecret},
- H256, U256,
+ U256,
};
use sp_io;
use sp_runtime::{
curve::PiecewiseLinear,
impl_opaque_keys,
testing::{Digest, DigestItem, Header, TestXt},
- traits::{Header as _, IdentityLookup, OpaqueKeys},
+ traits::{Header as _, OpaqueKeys},
BuildStorage, Perbill,
};
use sp_staking::{EraIndex, SessionIndex};
@@ -63,30 +63,10 @@ frame_support::construct_runtime!(
}
);
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for Test {
- type BaseCallFilter = frame_support::traits::Everything;
- type BlockWeights = ();
- type BlockLength = ();
- type DbWeight = ();
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
- type Hash = H256;
- type Version = ();
- type Hashing = sp_runtime::traits::BlakeTwo256;
- type AccountId = DummyValidatorId;
- type Lookup = IdentityLookup;
type Block = Block;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
- type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData;
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type SystemWeightInfo = ();
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = frame_support::traits::ConstU32<16>;
}
impl frame_system::offchain::SendTransactionTypes for Test
--
GitLab
From 5a6912606a7724932e68a034998327af17e2038a Mon Sep 17 00:00:00 2001
From: Javier Viola
Date: Sat, 7 Oct 2023 18:14:21 +0200
Subject: [PATCH 008/119] chore: bump zombienter version (#1806)
Bump zombiente version. This version includes the fixes needed for
`mixnet`.
Thx!
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee6b9c98733..61451a9c462 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ variables:
RUSTY_CACHIER_COMPRESSION_METHOD: zstd
NEXTEST_FAILURE_OUTPUT: immediate-final
NEXTEST_SUCCESS_OUTPUT: final
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.68"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.69"
DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
default:
--
GitLab
From cb944dc54882222453071fc99f2e5014c51823ef Mon Sep 17 00:00:00 2001
From: Muharem
Date: Sat, 7 Oct 2023 19:32:35 +0200
Subject: [PATCH 009/119] Treasury spends various asset kinds (#1333)
### Summary
This PR introduces new dispatchables to the treasury pallet, allowing
spends of various asset types. The enhanced features of the treasury
pallet, in conjunction with the asset-rate pallet, are set up and
enabled for Westend and Rococo.
### Westend and Rococo runtimes.
Polkadot/Kusams/Rococo Treasury can accept proposals for `spends` of
various asset kinds by specifying the asset's location and ID.
#### Treasury Instance New Dispatchables:
- `spend(AssetKind, AssetBalance, Beneficiary, Option)` -
propose and approve a spend;
- `payout(SpendIndex)` - payout an approved spend or retry a failed
payout
- `check_payment(SpendIndex)` - check the status of a payout;
- `void_spend(SpendIndex)` - void previously approved spend;
> existing spend dispatchable renamed to spend_local
in this context, the `AssetKind` parameter contains the asset's location
and it's corresponding `asset_id`, for example:
`USDT` on `AssetHub`,
``` rust
location = MultiLocation(0, X1(Parachain(1000)))
asset_id = MultiLocation(0, X2(PalletInstance(50), GeneralIndex(1984)))
```
the `Beneficiary` parameter is a `MultiLocation` in the context of the
asset's location, for example
``` rust
// the Fellowship salary pallet's location / account
FellowshipSalaryPallet = MultiLocation(1, X2(Parachain(1001), PalletInstance(64)))
// or custom `AccountId`
Alice = MultiLocation(0, AccountId32(network: None, id: [1,...]))
```
the `AssetBalance` represents the amount of the `AssetKind` to be
transferred to the `Beneficiary`. For permission checks, the asset
amount is converted to the native amount and compared against the
maximum spendable amount determined by the commanding spend origin.
the `spend` dispatchable allows for batching spends with different
`ValidFrom` arguments, enabling milestone-based spending. If the
expectations tied to an approved spend are not met, it is possible to
void the spend later using the `void_spend` dispatchable.
Asset Rate Pallet provides the conversion rate from the `AssetKind` to
the native balance.
#### Asset Rate Instance Dispatchables:
- `create(AssetKind, Rate)` - initialize a conversion rate to the native
balance for the given asset
- `update(AssetKind, Rate)` - update the conversion rate to the native
balance for the given asset
- `remove(AssetKind)` - remove an existing conversion rate to the native
balance for the given asset
the pallet's dispatchables can be executed by the Root or Treasurer
origins.
### Treasury Pallet
Treasury Pallet can accept proposals for `spends` of various asset kinds
and pay them out through the implementation of the `Pay` trait.
New Dispatchables:
- `spend(Config::AssetKind, AssetBalance, Config::Beneficiary,
Option)` - propose and approve a spend;
- `payout(SpendIndex)` - payout an approved spend or retry a failed
payout;
- `check_payment(SpendIndex)` - check the status of a payout;
- `void_spend(SpendIndex)` - void previously approved spend;
> existing spend dispatchable renamed to spend_local
The parameters' types of the `spend` dispatchable exposed via the
pallet's `Config` and allows to propose and accept a spend of a certain
amount.
An approved spend can be claimed via the `payout` within the
`Config::SpendPeriod`. Clients provide an implementation of the `Pay`
trait which can pay an asset of the `AssetKind` to the `Beneficiary` in
`AssetBalance` units.
The implementation of the Pay trait might not have an immediate final
payment status, for example if implemented over `XCM` and the actual
transfer happens on a remote chain.
The `check_status` dispatchable can be executed to update the spend's
payment state and retry the `payout` if the payment has failed.
---------
Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
Co-authored-by: command-bot <>
---
Cargo.lock | 12 +
.../assets/asset-hub-westend/Cargo.toml | 13 +
.../assets/asset-hub-westend/src/tests/mod.rs | 1 +
.../asset-hub-westend/src/tests/treasury.rs | 126 +++++
.../emulated/common/src/lib.rs | 2 +
.../asset-hub-westend/src/xcm_config.rs | 22 +-
polkadot/runtime/common/Cargo.toml | 7 +
polkadot/runtime/common/src/impls.rs | 106 +++-
polkadot/runtime/rococo/Cargo.toml | 6 +-
polkadot/runtime/rococo/src/lib.rs | 52 +-
polkadot/runtime/rococo/src/weights/mod.rs | 1 +
.../rococo/src/weights/pallet_asset_rate.rs | 86 +++
.../rococo/src/weights/pallet_treasury.rs | 150 ++++--
polkadot/runtime/westend/Cargo.toml | 6 +-
polkadot/runtime/westend/src/lib.rs | 57 +-
polkadot/runtime/westend/src/weights/mod.rs | 1 +
.../westend/src/weights/pallet_asset_rate.rs | 86 +++
.../westend/src/weights/pallet_treasury.rs | 207 +++++---
substrate/bin/node/runtime/src/lib.rs | 11 +-
substrate/frame/asset-rate/src/lib.rs | 5 +
substrate/frame/bounties/src/tests.rs | 23 +-
substrate/frame/child-bounties/src/tests.rs | 14 +-
substrate/frame/support/src/traits/tokens.rs | 3 +-
.../frame/support/src/traits/tokens/misc.rs | 20 +
.../frame/support/src/traits/tokens/pay.rs | 35 +-
substrate/frame/tips/src/tests.rs | 24 +-
substrate/frame/treasury/Cargo.toml | 7 +-
substrate/frame/treasury/src/benchmarking.rs | 255 +++++++--
substrate/frame/treasury/src/lib.rs | 496 ++++++++++++++++--
substrate/frame/treasury/src/tests.rs | 426 ++++++++++++++-
substrate/frame/treasury/src/weights.rs | 223 ++++++--
substrate/primitives/core/src/crypto.rs | 14 +
32 files changed, 2212 insertions(+), 285 deletions(-)
create mode 100644 cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs
create mode 100644 polkadot/runtime/rococo/src/weights/pallet_asset_rate.rs
create mode 100644 polkadot/runtime/westend/src/weights/pallet_asset_rate.rs
diff --git a/Cargo.lock b/Cargo.lock
index 1559ae20180..48ac004a859 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -840,20 +840,27 @@ version = "1.0.0"
dependencies = [
"assert_matches",
"asset-hub-westend-runtime",
+ "cumulus-pallet-dmp-queue",
+ "cumulus-pallet-parachain-system",
"frame-support",
"frame-system",
"integration-tests-common",
"pallet-asset-conversion",
+ "pallet-asset-rate",
"pallet-assets",
"pallet-balances",
+ "pallet-treasury",
"pallet-xcm",
"parachains-common",
"parity-scale-codec",
"polkadot-core-primitives",
"polkadot-parachain-primitives",
+ "polkadot-runtime-common",
"polkadot-runtime-parachains",
"sp-runtime",
"staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
"xcm-emulator",
]
@@ -10567,6 +10574,7 @@ dependencies = [
name = "pallet-treasury"
version = "4.0.0-dev"
dependencies = [
+ "docify",
"frame-benchmarking",
"frame-support",
"frame-system",
@@ -12485,6 +12493,7 @@ dependencies = [
"impl-trait-for-tuples",
"libsecp256k1",
"log",
+ "pallet-asset-rate",
"pallet-authorship",
"pallet-babe",
"pallet-balances",
@@ -12519,6 +12528,7 @@ dependencies = [
"sp-staking",
"sp-std",
"staging-xcm",
+ "staging-xcm-builder",
"static_assertions",
]
@@ -13900,6 +13910,7 @@ dependencies = [
"frame-try-runtime",
"hex-literal",
"log",
+ "pallet-asset-rate",
"pallet-authority-discovery",
"pallet-authorship",
"pallet-babe",
@@ -19941,6 +19952,7 @@ dependencies = [
"frame-try-runtime",
"hex-literal",
"log",
+ "pallet-asset-rate",
"pallet-authority-discovery",
"pallet-authorship",
"pallet-babe",
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
index af9776cbcd9..bf141dafebf 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml
@@ -18,17 +18,24 @@ frame-system = { path = "../../../../../../substrate/frame/system", default-feat
pallet-balances = { path = "../../../../../../substrate/frame/balances", default-features = false}
pallet-assets = { path = "../../../../../../substrate/frame/assets", default-features = false}
pallet-asset-conversion = { path = "../../../../../../substrate/frame/asset-conversion", default-features = false}
+pallet-treasury = { path = "../../../../../../substrate/frame/treasury", default-features = false}
+pallet-asset-rate = { path = "../../../../../../substrate/frame/asset-rate", default-features = false}
# Polkadot
polkadot-core-primitives = { path = "../../../../../../polkadot/core-primitives", default-features = false}
polkadot-parachain-primitives = { path = "../../../../../../polkadot/parachain", default-features = false}
+polkadot-runtime-common = { path = "../../../../../../polkadot/runtime/common" }
polkadot-runtime-parachains = { path = "../../../../../../polkadot/runtime/parachains" }
xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
+xcm-builder = { package = "staging-xcm-builder", path = "../../../../../../polkadot/xcm/xcm-builder", default-features = false}
+xcm-executor = { package = "staging-xcm-executor", path = "../../../../../../polkadot/xcm/xcm-executor", default-features = false}
pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-features = false}
# Cumulus
parachains-common = { path = "../../../../common" }
asset-hub-westend-runtime = { path = "../../../../runtimes/assets/asset-hub-westend" }
+cumulus-pallet-dmp-queue = { default-features = false, path = "../../../../../pallets/dmp-queue" }
+cumulus-pallet-parachain-system = { default-features = false, path = "../../../../../pallets/parachain-system" }
# Local
xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
@@ -37,15 +44,21 @@ integration-tests-common = { path = "../../common", default-features = false}
[features]
runtime-benchmarks = [
"asset-hub-westend-runtime/runtime-benchmarks",
+ "cumulus-pallet-parachain-system/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"integration-tests-common/runtime-benchmarks",
"pallet-asset-conversion/runtime-benchmarks",
+ "pallet-asset-rate/runtime-benchmarks",
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
+ "pallet-treasury/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
+ "polkadot-runtime-common/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
+ "xcm-builder/runtime-benchmarks",
+ "xcm-executor/runtime-benchmarks",
]
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
index b3841af0e6c..0c9de89c5f9 100644
--- a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs
@@ -18,3 +18,4 @@ mod send;
mod set_xcm_versions;
mod swap;
mod teleport;
+mod treasury;
diff --git a/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs
new file mode 100644
index 00000000000..cf06f58682d
--- /dev/null
+++ b/cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/treasury.rs
@@ -0,0 +1,126 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::*;
+use frame_support::traits::fungibles::{Create, Inspect, Mutate};
+use integration_tests_common::constants::accounts::{ALICE, BOB};
+use polkadot_runtime_common::impls::VersionedLocatableAsset;
+use xcm_executor::traits::ConvertLocation;
+
+#[test]
+fn create_and_claim_treasury_spend() {
+ const ASSET_ID: u32 = 1984;
+ const SPEND_AMOUNT: u128 = 1_000_000;
+ // treasury location from a sibling parachain.
+ let treasury_location: MultiLocation = MultiLocation::new(1, PalletInstance(37));
+ // treasury account on a sibling parachain.
+ let treasury_account =
+ asset_hub_westend_runtime::xcm_config::LocationToAccountId::convert_location(
+ &treasury_location,
+ )
+ .unwrap();
+ let asset_hub_location = MultiLocation::new(0, Parachain(AssetHubWestend::para_id().into()));
+ let root = ::RuntimeOrigin::root();
+ // asset kind to be spend from the treasury.
+ let asset_kind = VersionedLocatableAsset::V3 {
+ location: asset_hub_location,
+ asset_id: AssetId::Concrete((PalletInstance(50), GeneralIndex(ASSET_ID.into())).into()),
+ };
+ // treasury spend beneficiary.
+ let alice: AccountId = Westend::account_id_of(ALICE);
+ let bob: AccountId = Westend::account_id_of(BOB);
+ let bob_signed = ::RuntimeOrigin::signed(bob.clone());
+
+ AssetHubWestend::execute_with(|| {
+ type Assets = ::Assets;
+
+ // create an asset class and mint some assets to the treasury account.
+ assert_ok!(>::create(
+ ASSET_ID,
+ treasury_account.clone(),
+ true,
+ SPEND_AMOUNT / 2
+ ));
+ assert_ok!(>::mint_into(ASSET_ID, &treasury_account, SPEND_AMOUNT * 4));
+ // beneficiary has zero balance.
+ assert_eq!(>::balance(ASSET_ID, &alice,), 0u128,);
+ });
+
+ Westend::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
+ type Treasury = ::Treasury;
+ type AssetRate = ::AssetRate;
+
+ // create a conversion rate from `asset_kind` to the native currency.
+ assert_ok!(AssetRate::create(root.clone(), Box::new(asset_kind.clone()), 2.into()));
+
+ // create and approve a treasury spend.
+ assert_ok!(Treasury::spend(
+ root,
+ Box::new(asset_kind),
+ SPEND_AMOUNT,
+ Box::new(MultiLocation::new(0, Into::<[u8; 32]>::into(alice.clone())).into()),
+ None,
+ ));
+ // claim the spend.
+ assert_ok!(Treasury::payout(bob_signed.clone(), 0));
+
+ assert_expected_events!(
+ Westend,
+ vec![
+ RuntimeEvent::Treasury(pallet_treasury::Event::Paid { .. }) => {},
+ ]
+ );
+ });
+
+ AssetHubWestend::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
+ type Assets = ::Assets;
+
+ // assert events triggered by xcm pay program
+ // 1. treasury asset transferred to spend beneficiary
+ // 2. response to Relay Chain treasury pallet instance sent back
+ // 3. XCM program completed
+ assert_expected_events!(
+ AssetHubWestend,
+ vec![
+ RuntimeEvent::Assets(pallet_assets::Event::Transferred { asset_id: id, from, to, amount }) => {
+ id: id == &ASSET_ID,
+ from: from == &treasury_account,
+ to: to == &alice,
+ amount: amount == &SPEND_AMOUNT,
+ },
+ RuntimeEvent::ParachainSystem(cumulus_pallet_parachain_system::Event::UpwardMessageSent { .. }) => {},
+ RuntimeEvent::DmpQueue(cumulus_pallet_dmp_queue::Event::ExecutedDownward { outcome: Outcome::Complete(..) ,.. }) => {},
+ ]
+ );
+ // beneficiary received the assets from the treasury.
+ assert_eq!(>::balance(ASSET_ID, &alice,), SPEND_AMOUNT,);
+ });
+
+ Westend::execute_with(|| {
+ type RuntimeEvent = ::RuntimeEvent;
+ type Treasury = ::Treasury;
+
+ // check the payment status to ensure the response from the AssetHub was received.
+ assert_ok!(Treasury::check_status(bob_signed, 0));
+ assert_expected_events!(
+ Westend,
+ vec![
+ RuntimeEvent::Treasury(pallet_treasury::Event::SpendProcessed { .. }) => {},
+ ]
+ );
+ });
+}
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
index 2c9581c3a18..068f0238f49 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
@@ -46,6 +46,8 @@ decl_test_relay_chains! {
XcmPallet: westend_runtime::XcmPallet,
Sudo: westend_runtime::Sudo,
Balances: westend_runtime::Balances,
+ Treasury: westend_runtime::Treasury,
+ AssetRate: westend_runtime::AssetRate,
}
},
#[api_version(7)]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
index 6981c290c98..a0921c50dc5 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
@@ -38,11 +38,12 @@ use xcm::latest::prelude::*;
use xcm_builder::{
AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses,
AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom, CurrencyAdapter,
- DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FungiblesAdapter, IsConcrete,
- LocalMint, NativeAsset, NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative,
- SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
- SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
- UsingComponents, WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
+ DenyReserveTransferToRelayChain, DenyThenTry, DescribeFamily, DescribePalletTerminal,
+ EnsureXcmOrigin, FungiblesAdapter, HashedDescription, IsConcrete, LocalMint, NativeAsset,
+ NoChecking, ParentAsSuperuser, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative,
+ SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
+ SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId, UsingComponents,
+ WeightInfoBounds, WithComputedOrigin, WithUniqueTopic,
};
use xcm_executor::{traits::WithOriginFilter, XcmExecutor};
@@ -75,6 +76,9 @@ pub type LocationToAccountId = (
SiblingParachainConvertsVia,
// Straight up local `AccountId32` origins just alias directly to `AccountId`.
AccountId32Aliases,
+ // Foreign chain account alias into local accounts according to a hash of their standard
+ // description.
+ HashedDescription>,
);
/// Means for transacting the native currency on this chain.
@@ -222,6 +226,9 @@ match_types! {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(Plurality { .. }) }
};
+ pub type TreasuryPallet: impl Contains = {
+ MultiLocation { parents: 1, interior: X1(PalletInstance(37)) }
+ };
}
/// A call filter for the XCM Transact instruction. This is a temporary measure until we properly
@@ -449,8 +456,9 @@ pub type Barrier = TrailingSetTopicAsId<
// If the message is one that immediately attemps to pay for execution, then
// allow it.
AllowTopLevelPaidExecutionFrom,
- // Parent and its pluralities (i.e. governance bodies) get free execution.
- AllowExplicitUnpaidExecutionFrom,
+ // Parent, its pluralities (i.e. governance bodies) and treasury pallet get
+ // free execution.
+ AllowExplicitUnpaidExecutionFrom<(ParentOrParentsPlurality, TreasuryPallet)>,
// Subscriptions for version tracking are OK.
AllowSubscriptionsFrom,
),
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index 17617bf4ada..2d1aad6a575 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -38,6 +38,7 @@ pallet-timestamp = { path = "../../../substrate/frame/timestamp", default-featur
pallet-vesting = { path = "../../../substrate/frame/vesting", default-features = false }
pallet-transaction-payment = { path = "../../../substrate/frame/transaction-payment", default-features = false }
pallet-treasury = { path = "../../../substrate/frame/treasury", default-features = false }
+pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false }
pallet-election-provider-multi-phase = { path = "../../../substrate/frame/election-provider-multi-phase", default-features = false }
frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
@@ -50,6 +51,7 @@ runtime-parachains = { package = "polkadot-runtime-parachains", path = "../parac
slot-range-helper = { path = "slot_range_helper", default-features = false }
xcm = { package = "staging-xcm", path = "../../xcm", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", path = "../../xcm/xcm-builder", default-features = false }
[dev-dependencies]
hex-literal = "0.4.1"
@@ -74,6 +76,7 @@ std = [
"inherents/std",
"libsecp256k1/std",
"log/std",
+ "pallet-asset-rate/std",
"pallet-authorship/std",
"pallet-balances/std",
"pallet-election-provider-multi-phase/std",
@@ -100,6 +103,7 @@ std = [
"sp-session/std",
"sp-staking/std",
"sp-std/std",
+ "xcm-builder/std",
"xcm/std",
]
runtime-benchmarks = [
@@ -109,6 +113,7 @@ runtime-benchmarks = [
"frame-system/runtime-benchmarks",
"libsecp256k1/hmac",
"libsecp256k1/static-context",
+ "pallet-asset-rate/runtime-benchmarks",
"pallet-babe/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-election-provider-multi-phase/runtime-benchmarks",
@@ -121,12 +126,14 @@ runtime-benchmarks = [
"runtime-parachains/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"sp-staking/runtime-benchmarks",
+ "xcm-builder/runtime-benchmarks",
]
try-runtime = [
"frame-election-provider-support/try-runtime",
"frame-support-test/try-runtime",
"frame-support/try-runtime",
"frame-system/try-runtime",
+ "pallet-asset-rate/try-runtime",
"pallet-authorship/try-runtime",
"pallet-babe?/try-runtime",
"pallet-balances/try-runtime",
diff --git a/polkadot/runtime/common/src/impls.rs b/polkadot/runtime/common/src/impls.rs
index 0d0dee2e9ad..590593745ed 100644
--- a/polkadot/runtime/common/src/impls.rs
+++ b/polkadot/runtime/common/src/impls.rs
@@ -18,8 +18,10 @@
use crate::NegativeImbalance;
use frame_support::traits::{Currency, Imbalance, OnUnbalanced};
+use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
use primitives::Balance;
-use sp_runtime::Perquintill;
+use sp_runtime::{traits::TryConvert, Perquintill, RuntimeDebug};
+use xcm::VersionedMultiLocation;
/// Logic for the author to get a portion of fees.
pub struct ToAuthor(sp_std::marker::PhantomData);
@@ -98,13 +100,104 @@ pub fn era_payout(
(staking_payout, rest)
}
+/// Versioned locatable asset type which contains both an XCM `location` and `asset_id` to identify
+/// an asset which exists on some chain.
+#[derive(
+ Encode, Decode, Eq, PartialEq, Clone, RuntimeDebug, scale_info::TypeInfo, MaxEncodedLen,
+)]
+pub enum VersionedLocatableAsset {
+ #[codec(index = 3)]
+ V3 {
+ /// The (relative) location in which the asset ID is meaningful.
+ location: xcm::v3::MultiLocation,
+ /// The asset's ID.
+ asset_id: xcm::v3::AssetId,
+ },
+}
+
+/// Converts the [`VersionedLocatableAsset`] to the [`xcm_builder::LocatableAssetId`].
+pub struct LocatableAssetConverter;
+impl TryConvert
+ for LocatableAssetConverter
+{
+ fn try_convert(
+ asset: VersionedLocatableAsset,
+ ) -> Result {
+ match asset {
+ VersionedLocatableAsset::V3 { location, asset_id } =>
+ Ok(xcm_builder::LocatableAssetId { asset_id, location }),
+ }
+ }
+}
+
+/// Converts the [`VersionedMultiLocation`] to the [`xcm::latest::MultiLocation`].
+pub struct VersionedMultiLocationConverter;
+impl TryConvert<&VersionedMultiLocation, xcm::latest::MultiLocation>
+ for VersionedMultiLocationConverter
+{
+ fn try_convert(
+ location: &VersionedMultiLocation,
+ ) -> Result {
+ let latest = match location.clone() {
+ VersionedMultiLocation::V2(l) => l.try_into().map_err(|_| location)?,
+ VersionedMultiLocation::V3(l) => l,
+ };
+ Ok(latest)
+ }
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmarks {
+ use super::VersionedLocatableAsset;
+ use pallet_asset_rate::AssetKindFactory;
+ use pallet_treasury::ArgumentsFactory as TreasuryArgumentsFactory;
+ use xcm::prelude::*;
+
+ /// Provides a factory method for the [`VersionedLocatableAsset`].
+ /// The location of the asset is determined as a Parachain with an ID equal to the passed seed.
+ pub struct AssetRateArguments;
+ impl AssetKindFactory for AssetRateArguments {
+ fn create_asset_kind(seed: u32) -> VersionedLocatableAsset {
+ VersionedLocatableAsset::V3 {
+ location: xcm::v3::MultiLocation::new(0, X1(Parachain(seed))),
+ asset_id: xcm::v3::MultiLocation::new(
+ 0,
+ X2(PalletInstance(seed.try_into().unwrap()), GeneralIndex(seed.into())),
+ )
+ .into(),
+ }
+ }
+ }
+
+ /// Provide factory methods for the [`VersionedLocatableAsset`] and the `Beneficiary` of the
+ /// [`VersionedMultiLocation`]. The location of the asset is determined as a Parachain with an
+ /// ID equal to the passed seed.
+ pub struct TreasuryArguments;
+ impl TreasuryArgumentsFactory
+ for TreasuryArguments
+ {
+ fn create_asset_kind(seed: u32) -> VersionedLocatableAsset {
+ AssetRateArguments::create_asset_kind(seed)
+ }
+ fn create_beneficiary(seed: [u8; 32]) -> VersionedMultiLocation {
+ VersionedMultiLocation::V3(xcm::v3::MultiLocation::new(
+ 0,
+ X1(AccountId32 { network: None, id: seed }),
+ ))
+ }
+ }
+}
+
#[cfg(test)]
mod tests {
use super::*;
use frame_support::{
dispatch::DispatchClass,
parameter_types,
- traits::{ConstU32, FindAuthor},
+ traits::{
+ tokens::{PayFromAccount, UnityAssetBalanceConversion},
+ ConstU32, FindAuthor,
+ },
weights::Weight,
PalletId,
};
@@ -189,6 +282,7 @@ mod tests {
parameter_types! {
pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
pub const MaxApprovals: u32 = 100;
+ pub TreasuryAccount: AccountId = Treasury::account_id();
}
impl pallet_treasury::Config for Test {
@@ -208,6 +302,14 @@ mod tests {
type MaxApprovals = MaxApprovals;
type WeightInfo = ();
type SpendOrigin = frame_support::traits::NeverEnsureOrigin;
+ type AssetKind = ();
+ type Beneficiary = Self::AccountId;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayFromAccount;
+ type BalanceConverter = UnityAssetBalanceConversion;
+ type PayoutPeriod = ConstU64<0>;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = ();
}
pub struct OneAuthor;
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index ab9b2f11acf..0b8a8624bb6 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -52,6 +52,7 @@ pallet-collective = { path = "../../../substrate/frame/collective", default-feat
pallet-conviction-voting = { path = "../../../substrate/frame/conviction-voting", default-features = false }
pallet-democracy = { path = "../../../substrate/frame/democracy", default-features = false }
pallet-elections-phragmen = { path = "../../../substrate/frame/elections-phragmen", default-features = false }
+pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false }
frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
pallet-grandpa = { path = "../../../substrate/frame/grandpa", default-features = false }
pallet-identity = { path = "../../../substrate/frame/identity", default-features = false }
@@ -72,7 +73,7 @@ pallet-scheduler = { path = "../../../substrate/frame/scheduler", default-featur
pallet-session = { path = "../../../substrate/frame/session", default-features = false }
pallet-society = { path = "../../../substrate/frame/society", default-features = false }
pallet-sudo = { path = "../../../substrate/frame/sudo", default-features = false }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, features = ["tuples-96"] }
pallet-staking = { path = "../../../substrate/frame/staking", default-features = false }
frame-system = { path = "../../../substrate/frame/system", default-features = false }
frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
@@ -131,6 +132,7 @@ std = [
"inherents/std",
"log/std",
"offchain-primitives/std",
+ "pallet-asset-rate/std",
"pallet-authority-discovery/std",
"pallet-authorship/std",
"pallet-babe/std",
@@ -207,6 +209,7 @@ runtime-benchmarks = [
"frame-support/runtime-benchmarks",
"frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
+ "pallet-asset-rate/runtime-benchmarks",
"pallet-babe/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-bounties/runtime-benchmarks",
@@ -258,6 +261,7 @@ try-runtime = [
"frame-system/try-runtime",
"frame-try-runtime",
"frame-try-runtime/try-runtime",
+ "pallet-asset-rate/try-runtime",
"pallet-authority-discovery/try-runtime",
"pallet-authorship/try-runtime",
"pallet-babe/try-runtime",
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 4bdcc123739..fd3e656f695 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -30,7 +30,10 @@ use primitives::{
ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, PARACHAIN_KEY_TYPE_ID,
};
use runtime_common::{
- assigned_slots, auctions, claims, crowdloan, impl_runtime_weights, impls::ToAuthor,
+ assigned_slots, auctions, claims, crowdloan, impl_runtime_weights,
+ impls::{
+ LocatableAssetConverter, ToAuthor, VersionedLocatableAsset, VersionedMultiLocationConverter,
+ },
paras_registrar, paras_sudo_wrapper, prod_or_fast, slots, BlockHashCount, BlockLength,
SlowAdjustingFeeUpdate,
};
@@ -79,7 +82,8 @@ use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
traits::{
AccountIdLookup, BlakeTwo256, Block as BlockT, ConstU32, ConvertInto,
- Extrinsic as ExtrinsicT, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
+ Extrinsic as ExtrinsicT, IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion,
+ Verify,
},
transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
@@ -88,7 +92,11 @@ use sp_staking::SessionIndex;
#[cfg(any(feature = "std", test))]
use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
-use xcm::latest::Junction;
+use xcm::{
+ latest::{InteriorMultiLocation, Junction, Junction::PalletInstance},
+ VersionedMultiLocation,
+};
+use xcm_builder::PayOverXcm;
pub use frame_system::Call as SystemCall;
pub use pallet_balances::Call as BalancesCall;
@@ -385,6 +393,10 @@ parameter_types! {
pub const SpendPeriod: BlockNumber = 6 * DAYS;
pub const Burn: Permill = Permill::from_perthousand(2);
pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+ pub const PayoutSpendPeriod: BlockNumber = 30 * DAYS;
+ // The asset's interior location for the paying account. This is the Treasury
+ // pallet instance (which sits at index 18).
+ pub TreasuryInteriorLocation: InteriorMultiLocation = PalletInstance(18).into();
pub const TipCountdown: BlockNumber = 1 * DAYS;
pub const TipFindersFee: Percent = Percent::from_percent(20);
@@ -394,6 +406,7 @@ parameter_types! {
pub const MaxAuthorities: u32 = 100_000;
pub const MaxKeys: u32 = 10_000;
pub const MaxPeerInHeartbeats: u32 = 10_000;
+ pub const MaxBalance: Balance = Balance::max_value();
}
impl pallet_treasury::Config for Runtime {
@@ -413,6 +426,23 @@ impl pallet_treasury::Config for Runtime {
type WeightInfo = weights::pallet_treasury::WeightInfo;
type SpendFunds = Bounties;
type SpendOrigin = TreasurySpender;
+ type AssetKind = VersionedLocatableAsset;
+ type Beneficiary = VersionedMultiLocation;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayOverXcm<
+ TreasuryInteriorLocation,
+ crate::xcm_config::XcmRouter,
+ crate::XcmPallet,
+ ConstU32<{ 6 * HOURS }>,
+ Self::Beneficiary,
+ Self::AssetKind,
+ LocatableAssetConverter,
+ VersionedMultiLocationConverter,
+ >;
+ type BalanceConverter = AssetRate;
+ type PayoutPeriod = PayoutSpendPeriod;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = runtime_common::impls::benchmarks::TreasuryArguments;
}
parameter_types! {
@@ -1202,6 +1232,18 @@ impl pallet_sudo::Config for Runtime {
type WeightInfo = weights::pallet_sudo::WeightInfo;
}
+impl pallet_asset_rate::Config for Runtime {
+ type WeightInfo = weights::pallet_asset_rate::WeightInfo;
+ type RuntimeEvent = RuntimeEvent;
+ type CreateOrigin = EnsureRoot;
+ type RemoveOrigin = EnsureRoot;
+ type UpdateOrigin = EnsureRoot;
+ type Currency = Balances;
+ type AssetKind = ::AssetKind;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = runtime_common::impls::benchmarks::AssetRateArguments;
+}
+
construct_runtime! {
pub enum Runtime
{
@@ -1279,6 +1321,9 @@ construct_runtime! {
// Preimage registrar.
Preimage: pallet_preimage::{Pallet, Call, Storage, Event, HoldReason} = 32,
+ // Asset rate.
+ AssetRate: pallet_asset_rate::{Pallet, Call, Storage, Event} = 39,
+
// Bounties modules.
Bounties: pallet_bounties::{Pallet, Call, Storage, Event} = 35,
ChildBounties: pallet_child_bounties = 40,
@@ -1465,6 +1510,7 @@ mod benches {
[pallet_treasury, Treasury]
[pallet_utility, Utility]
[pallet_vesting, Vesting]
+ [pallet_asset_rate, AssetRate]
[pallet_whitelist, Whitelist]
// XCM
[pallet_xcm, XcmPallet]
diff --git a/polkadot/runtime/rococo/src/weights/mod.rs b/polkadot/runtime/rococo/src/weights/mod.rs
index e0c1c4f4135..9c563a67d98 100644
--- a/polkadot/runtime/rococo/src/weights/mod.rs
+++ b/polkadot/runtime/rococo/src/weights/mod.rs
@@ -16,6 +16,7 @@
//! A list of the different weight modules for our runtime.
pub mod frame_system;
+pub mod pallet_asset_rate;
pub mod pallet_balances;
pub mod pallet_balances_nis_counterpart_balances;
pub mod pallet_bounties;
diff --git a/polkadot/runtime/rococo/src/weights/pallet_asset_rate.rs b/polkadot/runtime/rococo/src/weights/pallet_asset_rate.rs
new file mode 100644
index 00000000000..da2d1958cef
--- /dev/null
+++ b/polkadot/runtime/rococo/src/weights/pallet_asset_rate.rs
@@ -0,0 +1,86 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see .
+
+//! Autogenerated weights for `pallet_asset_rate`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-03, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: ``
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/debug/polkadot
+// benchmark
+// pallet
+// --chain=rococo-dev
+// --steps=50
+// --repeat=2
+// --pallet=pallet_asset_rate
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./runtime/rococo/src/weights/
+// --header=./file_header.txt
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_asset_rate`.
+pub struct WeightInfo(PhantomData);
+impl pallet_asset_rate::WeightInfo for WeightInfo {
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ fn create() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `42`
+ // Estimated: `4702`
+ // Minimum execution time: 143_000_000 picoseconds.
+ Weight::from_parts(155_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ fn update() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `110`
+ // Estimated: `4702`
+ // Minimum execution time: 156_000_000 picoseconds.
+ Weight::from_parts(172_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ fn remove() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `110`
+ // Estimated: `4702`
+ // Minimum execution time: 150_000_000 picoseconds.
+ Weight::from_parts(160_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
+}
diff --git a/polkadot/runtime/rococo/src/weights/pallet_treasury.rs b/polkadot/runtime/rococo/src/weights/pallet_treasury.rs
index 041d976d825..144e9d5b872 100644
--- a/polkadot/runtime/rococo/src/weights/pallet_treasury.rs
+++ b/polkadot/runtime/rococo/src/weights/pallet_treasury.rs
@@ -17,24 +17,24 @@
//! Autogenerated weights for `pallet_treasury`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-05-26, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-07-07, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bm5`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: ``
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
// Executed Command:
-// ./target/production/polkadot
+// ./target/debug/polkadot
// benchmark
// pallet
// --chain=rococo-dev
// --steps=50
-// --repeat=20
+// --repeat=2
// --pallet=pallet_treasury
// --extrinsic=*
-// --execution=wasm
// --wasm-execution=compiled
-// --header=./file_header.txt
+// --heap-pages=4096
// --output=./runtime/rococo/src/weights/
+// --header=./file_header.txt
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
@@ -47,13 +47,21 @@ use core::marker::PhantomData;
/// Weight functions for `pallet_treasury`.
pub struct WeightInfo(PhantomData);
impl pallet_treasury::WeightInfo for WeightInfo {
- fn spend() -> Weight {
+ /// Storage: Treasury ProposalCount (r:1 w:1)
+ /// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+ /// Storage: Treasury Approvals (r:1 w:1)
+ /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+ /// Storage: Treasury Proposals (r:0 w:1)
+ /// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+ fn spend_local() -> Weight {
// Proof Size summary in bytes:
- // Measured: `0`
- // Estimated: `0`
- // Minimum execution time: 204_000 picoseconds.
- Weight::from_parts(233_000, 0)
- .saturating_add(Weight::from_parts(0, 0))
+ // Measured: `42`
+ // Estimated: `1887`
+ // Minimum execution time: 177_000_000 picoseconds.
+ Weight::from_parts(191_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 1887))
+ .saturating_add(T::DbWeight::get().reads(2))
+ .saturating_add(T::DbWeight::get().writes(3))
}
/// Storage: Treasury ProposalCount (r:1 w:1)
/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -61,10 +69,10 @@ impl pallet_treasury::WeightInfo for WeightInfo {
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
fn propose_spend() -> Weight {
// Proof Size summary in bytes:
- // Measured: `107`
+ // Measured: `143`
// Estimated: `1489`
- // Minimum execution time: 27_592_000 picoseconds.
- Weight::from_parts(27_960_000, 0)
+ // Minimum execution time: 354_000_000 picoseconds.
+ Weight::from_parts(376_000_000, 0)
.saturating_add(Weight::from_parts(0, 1489))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(2))
@@ -75,10 +83,10 @@ impl pallet_treasury::WeightInfo for WeightInfo {
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
fn reject_proposal() -> Weight {
// Proof Size summary in bytes:
- // Measured: `265`
+ // Measured: `301`
// Estimated: `3593`
- // Minimum execution time: 40_336_000 picoseconds.
- Weight::from_parts(41_085_000, 0)
+ // Minimum execution time: 547_000_000 picoseconds.
+ Weight::from_parts(550_000_000, 0)
.saturating_add(Weight::from_parts(0, 3593))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
@@ -90,13 +98,13 @@ impl pallet_treasury::WeightInfo for WeightInfo {
/// The range of component `p` is `[0, 99]`.
fn approve_proposal(p: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `433 + p * (8 ±0)`
+ // Measured: `470 + p * (8 ±0)`
// Estimated: `3573`
- // Minimum execution time: 9_938_000 picoseconds.
- Weight::from_parts(12_061_206, 0)
+ // Minimum execution time: 104_000_000 picoseconds.
+ Weight::from_parts(121_184_402, 0)
.saturating_add(Weight::from_parts(0, 3573))
- // Standard Error: 801
- .saturating_add(Weight::from_parts(26_602, 0).saturating_mul(p.into()))
+ // Standard Error: 42_854
+ .saturating_add(Weight::from_parts(153_112, 0).saturating_mul(p.into()))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
}
@@ -104,10 +112,10 @@ impl pallet_treasury::WeightInfo for WeightInfo {
/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
fn remove_approval() -> Weight {
// Proof Size summary in bytes:
- // Measured: `90`
+ // Measured: `127`
// Estimated: `1887`
- // Minimum execution time: 7_421_000 picoseconds.
- Weight::from_parts(7_620_000, 0)
+ // Minimum execution time: 80_000_000 picoseconds.
+ Weight::from_parts(82_000_000, 0)
.saturating_add(Weight::from_parts(0, 1887))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
@@ -118,26 +126,98 @@ impl pallet_treasury::WeightInfo for WeightInfo {
/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
/// Storage: Treasury Approvals (r:1 w:1)
/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
- /// Storage: Treasury Proposals (r:100 w:100)
+ /// Storage: Treasury Proposals (r:99 w:99)
/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
- /// Storage: System Account (r:201 w:201)
+ /// Storage: System Account (r:199 w:199)
/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
/// Storage: Bounties BountyApprovals (r:1 w:1)
/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
- /// The range of component `p` is `[0, 100]`.
+ /// The range of component `p` is `[0, 99]`.
fn on_initialize_proposals(p: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `296 + p * (251 ±0)`
+ // Measured: `331 + p * (251 ±0)`
// Estimated: `3593 + p * (5206 ±0)`
- // Minimum execution time: 62_706_000 picoseconds.
- Weight::from_parts(61_351_470, 0)
+ // Minimum execution time: 887_000_000 picoseconds.
+ Weight::from_parts(828_616_021, 0)
.saturating_add(Weight::from_parts(0, 3593))
- // Standard Error: 32_787
- .saturating_add(Weight::from_parts(37_873_920, 0).saturating_mul(p.into()))
+ // Standard Error: 695_351
+ .saturating_add(Weight::from_parts(566_114_524, 0).saturating_mul(p.into()))
.saturating_add(T::DbWeight::get().reads(5))
.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
.saturating_add(T::DbWeight::get().writes(5))
.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
}
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:0)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ /// Storage: Treasury SpendCount (r:1 w:1)
+ /// Proof: Treasury SpendCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+ /// Storage: Treasury Spends (r:0 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ fn spend() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `114`
+ // Estimated: `4702`
+ // Minimum execution time: 208_000_000 picoseconds.
+ Weight::from_parts(222_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(2))
+ .saturating_add(T::DbWeight::get().writes(2))
+ }
+ /// Storage: Treasury Spends (r:1 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ /// Storage: XcmPallet QueryCounter (r:1 w:1)
+ /// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: Configuration ActiveConfig (r:1 w:0)
+ /// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
+ /// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
+ /// Storage: XcmPallet SupportedVersion (r:1 w:0)
+ /// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+ /// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
+ /// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
+ /// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: Dmp DownwardMessageQueues (r:1 w:1)
+ /// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
+ /// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
+ /// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+ /// Storage: XcmPallet Queries (r:0 w:1)
+ /// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+ fn payout() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `737`
+ // Estimated: `5313`
+ // Minimum execution time: 551_000_000 picoseconds.
+ Weight::from_parts(569_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 5313))
+ .saturating_add(T::DbWeight::get().reads(9))
+ .saturating_add(T::DbWeight::get().writes(6))
+ }
+ /// Storage: Treasury Spends (r:1 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ /// Storage: XcmPallet Queries (r:1 w:1)
+ /// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+ fn check_status() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `442`
+ // Estimated: `5313`
+ // Minimum execution time: 245_000_000 picoseconds.
+ Weight::from_parts(281_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 5313))
+ .saturating_add(T::DbWeight::get().reads(2))
+ .saturating_add(T::DbWeight::get().writes(2))
+ }
+ /// Storage: Treasury Spends (r:1 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ fn void_spend() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `172`
+ // Estimated: `5313`
+ // Minimum execution time: 147_000_000 picoseconds.
+ Weight::from_parts(160_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 5313))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
}
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index c9721935c32..58a6cc21eec 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -41,10 +41,11 @@ sp-npos-elections = { path = "../../../substrate/primitives/npos-elections", def
frame-election-provider-support = { path = "../../../substrate/frame/election-provider-support", default-features = false }
frame-executive = { path = "../../../substrate/frame/executive", default-features = false }
-frame-support = { path = "../../../substrate/frame/support", default-features = false }
+frame-support = { path = "../../../substrate/frame/support", default-features = false, features = ["tuples-96"] }
frame-system = { path = "../../../substrate/frame/system", default-features = false }
frame-system-rpc-runtime-api = { path = "../../../substrate/frame/system/rpc/runtime-api", default-features = false }
westend-runtime-constants = { package = "westend-runtime-constants", path = "constants", default-features = false }
+pallet-asset-rate = { path = "../../../substrate/frame/asset-rate", default-features = false }
pallet-authority-discovery = { path = "../../../substrate/frame/authority-discovery", default-features = false }
pallet-authorship = { path = "../../../substrate/frame/authorship", default-features = false }
pallet-babe = { path = "../../../substrate/frame/babe", default-features = false }
@@ -143,6 +144,7 @@ std = [
"inherents/std",
"log/std",
"offchain-primitives/std",
+ "pallet-asset-rate/std",
"pallet-authority-discovery/std",
"pallet-authorship/std",
"pallet-babe/std",
@@ -228,6 +230,7 @@ runtime-benchmarks = [
"frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"hex-literal",
+ "pallet-asset-rate/runtime-benchmarks",
"pallet-babe/runtime-benchmarks",
"pallet-bags-list/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
@@ -283,6 +286,7 @@ try-runtime = [
"frame-system/try-runtime",
"frame-try-runtime",
"frame-try-runtime/try-runtime",
+ "pallet-asset-rate/try-runtime",
"pallet-authority-discovery/try-runtime",
"pallet-authorship/try-runtime",
"pallet-babe/try-runtime",
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 6085b6e3745..d61acf36b4c 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -53,9 +53,14 @@ use primitives::{
ValidatorSignature, PARACHAIN_KEY_TYPE_ID,
};
use runtime_common::{
- assigned_slots, auctions, crowdloan, elections::OnChainAccuracy, impl_runtime_weights,
- impls::ToAuthor, paras_registrar, paras_sudo_wrapper, prod_or_fast, slots, BalanceToU256,
- BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, U256ToBalance,
+ assigned_slots, auctions, crowdloan,
+ elections::OnChainAccuracy,
+ impl_runtime_weights,
+ impls::{
+ LocatableAssetConverter, ToAuthor, VersionedLocatableAsset, VersionedMultiLocationConverter,
+ },
+ paras_registrar, paras_sudo_wrapper, prod_or_fast, slots, BalanceToU256, BlockHashCount,
+ BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, U256ToBalance,
};
use runtime_parachains::{
assigner_parachains as parachains_assigner_parachains,
@@ -77,7 +82,7 @@ use sp_runtime::{
generic, impl_opaque_keys,
traits::{
AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT,
- Keccak256, OpaqueKeys, SaturatedConversion, Verify,
+ IdentityLookup, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
},
transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
@@ -87,7 +92,11 @@ use sp_std::{collections::btree_map::BTreeMap, prelude::*};
#[cfg(any(feature = "std", test))]
use sp_version::NativeVersion;
use sp_version::RuntimeVersion;
-use xcm::latest::Junction;
+use xcm::{
+ latest::{InteriorMultiLocation, Junction, Junction::PalletInstance},
+ VersionedMultiLocation,
+};
+use xcm_builder::PayOverXcm;
pub use frame_system::Call as SystemCall;
pub use pallet_balances::Call as BalancesCall;
@@ -698,6 +707,10 @@ parameter_types! {
pub const SpendPeriod: BlockNumber = 6 * DAYS;
pub const Burn: Permill = Permill::from_perthousand(2);
pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+ pub const PayoutSpendPeriod: BlockNumber = 30 * DAYS;
+ // The asset's interior location for the paying account. This is the Treasury
+ // pallet instance (which sits at index 37).
+ pub TreasuryInteriorLocation: InteriorMultiLocation = PalletInstance(37).into();
pub const TipCountdown: BlockNumber = 1 * DAYS;
pub const TipFindersFee: Percent = Percent::from_percent(20);
@@ -707,6 +720,7 @@ parameter_types! {
pub const MaxAuthorities: u32 = 100_000;
pub const MaxKeys: u32 = 10_000;
pub const MaxPeerInHeartbeats: u32 = 10_000;
+ pub const MaxBalance: Balance = Balance::max_value();
}
impl pallet_treasury::Config for Runtime {
@@ -726,6 +740,23 @@ impl pallet_treasury::Config for Runtime {
type WeightInfo = weights::pallet_treasury::WeightInfo;
type SpendFunds = ();
type SpendOrigin = TreasurySpender;
+ type AssetKind = VersionedLocatableAsset;
+ type Beneficiary = VersionedMultiLocation;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayOverXcm<
+ TreasuryInteriorLocation,
+ crate::xcm_config::XcmRouter,
+ crate::XcmPallet,
+ ConstU32<{ 6 * HOURS }>,
+ Self::Beneficiary,
+ Self::AssetKind,
+ LocatableAssetConverter,
+ VersionedMultiLocationConverter,
+ >;
+ type BalanceConverter = AssetRate;
+ type PayoutPeriod = PayoutSpendPeriod;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = runtime_common::impls::benchmarks::TreasuryArguments;
}
impl pallet_offences::Config for Runtime {
@@ -1331,6 +1362,18 @@ parameter_types! {
pub const MigrationMaxKeyLen: u32 = 512;
}
+impl pallet_asset_rate::Config for Runtime {
+ type WeightInfo = weights::pallet_asset_rate::WeightInfo;
+ type RuntimeEvent = RuntimeEvent;
+ type CreateOrigin = EnsureRoot;
+ type RemoveOrigin = EnsureRoot;
+ type UpdateOrigin = EnsureRoot;
+ type Currency = Balances;
+ type AssetKind = ::AssetKind;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = runtime_common::impls::benchmarks::AssetRateArguments;
+}
+
construct_runtime! {
pub enum Runtime
{
@@ -1443,6 +1486,9 @@ construct_runtime! {
// Generalized message queue
MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event} = 100,
+
+ // Asset rate.
+ AssetRate: pallet_asset_rate::{Pallet, Call, Storage, Event} = 101,
}
}
@@ -1574,6 +1620,7 @@ mod benches {
[pallet_utility, Utility]
[pallet_vesting, Vesting]
[pallet_whitelist, Whitelist]
+ [pallet_asset_rate, AssetRate]
// XCM
[pallet_xcm, XcmPallet]
// NOTE: Make sure you point to the individual modules below.
diff --git a/polkadot/runtime/westend/src/weights/mod.rs b/polkadot/runtime/westend/src/weights/mod.rs
index faa94bcac58..9ae6798d70b 100644
--- a/polkadot/runtime/westend/src/weights/mod.rs
+++ b/polkadot/runtime/westend/src/weights/mod.rs
@@ -17,6 +17,7 @@
pub mod frame_election_provider_support;
pub mod frame_system;
+pub mod pallet_asset_rate;
pub mod pallet_bags_list;
pub mod pallet_balances;
pub mod pallet_conviction_voting;
diff --git a/polkadot/runtime/westend/src/weights/pallet_asset_rate.rs b/polkadot/runtime/westend/src/weights/pallet_asset_rate.rs
new file mode 100644
index 00000000000..810dd01a170
--- /dev/null
+++ b/polkadot/runtime/westend/src/weights/pallet_asset_rate.rs
@@ -0,0 +1,86 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot. If not, see .
+
+//! Autogenerated weights for `pallet_asset_rate`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: 2023-07-04, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `cob`, CPU: ``
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("polkadot-dev"), DB CACHE: 1024
+
+// Executed Command:
+// ./target/debug/polkadot
+// benchmark
+// pallet
+// --chain=polkadot-dev
+// --steps=50
+// --repeat=2
+// --pallet=pallet_asset_rate
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./runtime/polkadot/src/weights/
+// --header=./file_header.txt
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_asset_rate`.
+pub struct WeightInfo(PhantomData);
+impl pallet_asset_rate::WeightInfo for WeightInfo {
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ fn create() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `42`
+ // Estimated: `4702`
+ // Minimum execution time: 67_000_000 picoseconds.
+ Weight::from_parts(69_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ fn update() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `110`
+ // Estimated: `4702`
+ // Minimum execution time: 69_000_000 picoseconds.
+ Weight::from_parts(71_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:1)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ fn remove() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `110`
+ // Estimated: `4702`
+ // Minimum execution time: 70_000_000 picoseconds.
+ Weight::from_parts(90_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
+}
diff --git a/polkadot/runtime/westend/src/weights/pallet_treasury.rs b/polkadot/runtime/westend/src/weights/pallet_treasury.rs
index e2eb6abfc7b..144e9d5b872 100644
--- a/polkadot/runtime/westend/src/weights/pallet_treasury.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_treasury.rs
@@ -17,25 +17,24 @@
//! Autogenerated weights for `pallet_treasury`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-07-13, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-07-07, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-o7yfgx5n-project-163-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
-//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
+//! HOSTNAME: `cob`, CPU: ``
+//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024
// Executed Command:
-// target/production/polkadot
+// ./target/debug/polkadot
// benchmark
// pallet
+// --chain=rococo-dev
// --steps=50
-// --repeat=20
+// --repeat=2
+// --pallet=pallet_treasury
// --extrinsic=*
// --wasm-execution=compiled
// --heap-pages=4096
-// --json-file=/builds/parity/mirrors/polkadot/.git/.artifacts/bench.json
-// --pallet=pallet_treasury
-// --chain=westend-dev
+// --output=./runtime/rococo/src/weights/
// --header=./file_header.txt
-// --output=./runtime/westend/src/weights/
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
@@ -48,103 +47,177 @@ use core::marker::PhantomData;
/// Weight functions for `pallet_treasury`.
pub struct WeightInfo(PhantomData);
impl pallet_treasury::WeightInfo for WeightInfo {
- /// Storage: `Treasury::ProposalCount` (r:1 w:1)
- /// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
- /// Storage: `Treasury::Approvals` (r:1 w:1)
- /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
- /// Storage: `Treasury::Proposals` (r:0 w:1)
- /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
- fn spend() -> Weight {
+ /// Storage: Treasury ProposalCount (r:1 w:1)
+ /// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+ /// Storage: Treasury Approvals (r:1 w:1)
+ /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+ /// Storage: Treasury Proposals (r:0 w:1)
+ /// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+ fn spend_local() -> Weight {
// Proof Size summary in bytes:
- // Measured: `6`
+ // Measured: `42`
// Estimated: `1887`
- // Minimum execution time: 13_644_000 picoseconds.
- Weight::from_parts(13_988_000, 0)
+ // Minimum execution time: 177_000_000 picoseconds.
+ Weight::from_parts(191_000_000, 0)
.saturating_add(Weight::from_parts(0, 1887))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(3))
}
- /// Storage: `Treasury::ProposalCount` (r:1 w:1)
- /// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
- /// Storage: `Treasury::Proposals` (r:0 w:1)
- /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+ /// Storage: Treasury ProposalCount (r:1 w:1)
+ /// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+ /// Storage: Treasury Proposals (r:0 w:1)
+ /// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
fn propose_spend() -> Weight {
// Proof Size summary in bytes:
- // Measured: `107`
+ // Measured: `143`
// Estimated: `1489`
- // Minimum execution time: 26_304_000 picoseconds.
- Weight::from_parts(26_850_000, 0)
+ // Minimum execution time: 354_000_000 picoseconds.
+ Weight::from_parts(376_000_000, 0)
.saturating_add(Weight::from_parts(0, 1489))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(2))
}
- /// Storage: `Treasury::Proposals` (r:1 w:1)
- /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
- /// Storage: `System::Account` (r:1 w:1)
- /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+ /// Storage: Treasury Proposals (r:1 w:1)
+ /// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+ /// Storage: System Account (r:1 w:1)
+ /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
fn reject_proposal() -> Weight {
// Proof Size summary in bytes:
- // Measured: `265`
+ // Measured: `301`
// Estimated: `3593`
- // Minimum execution time: 40_318_000 picoseconds.
- Weight::from_parts(41_598_000, 0)
+ // Minimum execution time: 547_000_000 picoseconds.
+ Weight::from_parts(550_000_000, 0)
.saturating_add(Weight::from_parts(0, 3593))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(2))
}
- /// Storage: `Treasury::Proposals` (r:1 w:0)
- /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
- /// Storage: `Treasury::Approvals` (r:1 w:1)
- /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
+ /// Storage: Treasury Proposals (r:1 w:0)
+ /// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+ /// Storage: Treasury Approvals (r:1 w:1)
+ /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
/// The range of component `p` is `[0, 99]`.
fn approve_proposal(p: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `433 + p * (8 ±0)`
+ // Measured: `470 + p * (8 ±0)`
// Estimated: `3573`
- // Minimum execution time: 8_250_000 picoseconds.
- Weight::from_parts(10_937_873, 0)
+ // Minimum execution time: 104_000_000 picoseconds.
+ Weight::from_parts(121_184_402, 0)
.saturating_add(Weight::from_parts(0, 3573))
- // Standard Error: 1_239
- .saturating_add(Weight::from_parts(82_426, 0).saturating_mul(p.into()))
+ // Standard Error: 42_854
+ .saturating_add(Weight::from_parts(153_112, 0).saturating_mul(p.into()))
.saturating_add(T::DbWeight::get().reads(2))
.saturating_add(T::DbWeight::get().writes(1))
}
- /// Storage: `Treasury::Approvals` (r:1 w:1)
- /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
+ /// Storage: Treasury Approvals (r:1 w:1)
+ /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
fn remove_approval() -> Weight {
// Proof Size summary in bytes:
- // Measured: `90`
+ // Measured: `127`
// Estimated: `1887`
- // Minimum execution time: 6_170_000 picoseconds.
- Weight::from_parts(6_366_000, 0)
+ // Minimum execution time: 80_000_000 picoseconds.
+ Weight::from_parts(82_000_000, 0)
.saturating_add(Weight::from_parts(0, 1887))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(1))
}
- /// Storage: `Treasury::Deactivated` (r:1 w:1)
- /// Proof: `Treasury::Deactivated` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
- /// Storage: `Balances::InactiveIssuance` (r:1 w:1)
- /// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
- /// Storage: `Treasury::Approvals` (r:1 w:1)
- /// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
- /// Storage: `Treasury::Proposals` (r:100 w:100)
- /// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
- /// Storage: `System::Account` (r:200 w:200)
- /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
- /// The range of component `p` is `[0, 100]`.
+ /// Storage: Treasury Deactivated (r:1 w:1)
+ /// Proof: Treasury Deactivated (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+ /// Storage: Balances InactiveIssuance (r:1 w:1)
+ /// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+ /// Storage: Treasury Approvals (r:1 w:1)
+ /// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+ /// Storage: Treasury Proposals (r:99 w:99)
+ /// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+ /// Storage: System Account (r:199 w:199)
+ /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+ /// Storage: Bounties BountyApprovals (r:1 w:1)
+ /// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+ /// The range of component `p` is `[0, 99]`.
fn on_initialize_proposals(p: u32, ) -> Weight {
// Proof Size summary in bytes:
- // Measured: `175 + p * (251 ±0)`
- // Estimated: `1887 + p * (5206 ±0)`
- // Minimum execution time: 39_691_000 picoseconds.
- Weight::from_parts(29_703_313, 0)
- .saturating_add(Weight::from_parts(0, 1887))
- // Standard Error: 18_540
- .saturating_add(Weight::from_parts(42_601_290, 0).saturating_mul(p.into()))
- .saturating_add(T::DbWeight::get().reads(3))
+ // Measured: `331 + p * (251 ±0)`
+ // Estimated: `3593 + p * (5206 ±0)`
+ // Minimum execution time: 887_000_000 picoseconds.
+ Weight::from_parts(828_616_021, 0)
+ .saturating_add(Weight::from_parts(0, 3593))
+ // Standard Error: 695_351
+ .saturating_add(Weight::from_parts(566_114_524, 0).saturating_mul(p.into()))
+ .saturating_add(T::DbWeight::get().reads(5))
.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
- .saturating_add(T::DbWeight::get().writes(3))
+ .saturating_add(T::DbWeight::get().writes(5))
.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
}
+ /// Storage: AssetRate ConversionRateToNative (r:1 w:0)
+ /// Proof: AssetRate ConversionRateToNative (max_values: None, max_size: Some(1237), added: 3712, mode: MaxEncodedLen)
+ /// Storage: Treasury SpendCount (r:1 w:1)
+ /// Proof: Treasury SpendCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+ /// Storage: Treasury Spends (r:0 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ fn spend() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `114`
+ // Estimated: `4702`
+ // Minimum execution time: 208_000_000 picoseconds.
+ Weight::from_parts(222_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 4702))
+ .saturating_add(T::DbWeight::get().reads(2))
+ .saturating_add(T::DbWeight::get().writes(2))
+ }
+ /// Storage: Treasury Spends (r:1 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ /// Storage: XcmPallet QueryCounter (r:1 w:1)
+ /// Proof Skipped: XcmPallet QueryCounter (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: Configuration ActiveConfig (r:1 w:0)
+ /// Proof Skipped: Configuration ActiveConfig (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: Dmp DeliveryFeeFactor (r:1 w:0)
+ /// Proof Skipped: Dmp DeliveryFeeFactor (max_values: None, max_size: None, mode: Measured)
+ /// Storage: XcmPallet SupportedVersion (r:1 w:0)
+ /// Proof Skipped: XcmPallet SupportedVersion (max_values: None, max_size: None, mode: Measured)
+ /// Storage: XcmPallet VersionDiscoveryQueue (r:1 w:1)
+ /// Proof Skipped: XcmPallet VersionDiscoveryQueue (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: XcmPallet SafeXcmVersion (r:1 w:0)
+ /// Proof Skipped: XcmPallet SafeXcmVersion (max_values: Some(1), max_size: None, mode: Measured)
+ /// Storage: Dmp DownwardMessageQueues (r:1 w:1)
+ /// Proof Skipped: Dmp DownwardMessageQueues (max_values: None, max_size: None, mode: Measured)
+ /// Storage: Dmp DownwardMessageQueueHeads (r:1 w:1)
+ /// Proof Skipped: Dmp DownwardMessageQueueHeads (max_values: None, max_size: None, mode: Measured)
+ /// Storage: XcmPallet Queries (r:0 w:1)
+ /// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+ fn payout() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `737`
+ // Estimated: `5313`
+ // Minimum execution time: 551_000_000 picoseconds.
+ Weight::from_parts(569_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 5313))
+ .saturating_add(T::DbWeight::get().reads(9))
+ .saturating_add(T::DbWeight::get().writes(6))
+ }
+ /// Storage: Treasury Spends (r:1 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ /// Storage: XcmPallet Queries (r:1 w:1)
+ /// Proof Skipped: XcmPallet Queries (max_values: None, max_size: None, mode: Measured)
+ fn check_status() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `442`
+ // Estimated: `5313`
+ // Minimum execution time: 245_000_000 picoseconds.
+ Weight::from_parts(281_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 5313))
+ .saturating_add(T::DbWeight::get().reads(2))
+ .saturating_add(T::DbWeight::get().writes(2))
+ }
+ /// Storage: Treasury Spends (r:1 w:1)
+ /// Proof: Treasury Spends (max_values: None, max_size: Some(1848), added: 4323, mode: MaxEncodedLen)
+ fn void_spend() -> Weight {
+ // Proof Size summary in bytes:
+ // Measured: `172`
+ // Estimated: `5313`
+ // Minimum execution time: 147_000_000 picoseconds.
+ Weight::from_parts(160_000_000, 0)
+ .saturating_add(Weight::from_parts(0, 5313))
+ .saturating_add(T::DbWeight::get().reads(1))
+ .saturating_add(T::DbWeight::get().writes(1))
+ }
}
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index f018639b732..9e3b8153e2b 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -37,7 +37,7 @@ use frame_support::{
parameter_types,
traits::{
fungible::{Balanced, Credit, HoldConsideration, ItemOf},
- tokens::{nonfungibles_v2::Inspect, GetSalary, PayFromAccount},
+ tokens::{nonfungibles_v2::Inspect, pay::PayAssetFromAccount, GetSalary, PayFromAccount},
AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU16, ConstU32, Contains, Currency,
EitherOfDiverse, EqualPrivilegeOnly, Imbalance, InsideBoth, InstanceFilter,
KeyOwnerProofSystem, LinearStoragePrice, LockIdentifier, Nothing, OnUnbalanced,
@@ -1186,6 +1186,7 @@ parameter_types! {
pub const MaximumReasonLength: u32 = 300;
pub const MaxApprovals: u32 = 100;
pub const MaxBalance: Balance = Balance::max_value();
+ pub const SpendPayoutPeriod: BlockNumber = 30 * DAYS;
}
impl pallet_treasury::Config for Runtime {
@@ -1211,6 +1212,14 @@ impl pallet_treasury::Config for Runtime {
type WeightInfo = pallet_treasury::weights::SubstrateWeight;
type MaxApprovals = MaxApprovals;
type SpendOrigin = EnsureWithSuccess, AccountId, MaxBalance>;
+ type AssetKind = u32;
+ type Beneficiary = AccountId;
+ type BeneficiaryLookup = Indices;
+ type Paymaster = PayAssetFromAccount;
+ type BalanceConverter = AssetRate;
+ type PayoutPeriod = SpendPayoutPeriod;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = ();
}
impl pallet_asset_rate::Config for Runtime {
diff --git a/substrate/frame/asset-rate/src/lib.rs b/substrate/frame/asset-rate/src/lib.rs
index c3dc551f876..d4afca8b73c 100644
--- a/substrate/frame/asset-rate/src/lib.rs
+++ b/substrate/frame/asset-rate/src/lib.rs
@@ -240,4 +240,9 @@ where
.ok_or(pallet::Error::::UnknownAssetKind.into())?;
Ok(rate.saturating_mul_int(balance))
}
+ /// Set a conversion rate to `1` for the `asset_id`.
+ #[cfg(feature = "runtime-benchmarks")]
+ fn ensure_successful(asset_id: AssetKindOf) {
+ pallet::ConversionRateToNative::::set(asset_id.clone(), Some(1.into()));
+ }
}
diff --git a/substrate/frame/bounties/src/tests.rs b/substrate/frame/bounties/src/tests.rs
index a6fb89bb860..4083b05b629 100644
--- a/substrate/frame/bounties/src/tests.rs
+++ b/substrate/frame/bounties/src/tests.rs
@@ -24,7 +24,10 @@ use crate as pallet_bounties;
use frame_support::{
assert_noop, assert_ok, parameter_types,
- traits::{ConstU32, ConstU64, OnInitialize},
+ traits::{
+ tokens::{PayFromAccount, UnityAssetBalanceConversion},
+ ConstU32, ConstU64, OnInitialize,
+ },
PalletId,
};
@@ -104,6 +107,8 @@ parameter_types! {
pub const TreasuryPalletId2: PalletId = PalletId(*b"py/trsr2");
pub static SpendLimit: Balance = u64::MAX;
pub static SpendLimit1: Balance = u64::MAX;
+ pub TreasuryAccount: u128 = Treasury::account_id();
+ pub TreasuryInstance1Account: u128 = Treasury1::account_id();
}
impl pallet_treasury::Config for Test {
@@ -123,6 +128,14 @@ impl pallet_treasury::Config for Test {
type SpendFunds = Bounties;
type MaxApprovals = ConstU32<100>;
type SpendOrigin = frame_system::EnsureRootWithSuccess;
+ type AssetKind = ();
+ type Beneficiary = Self::AccountId;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayFromAccount;
+ type BalanceConverter = UnityAssetBalanceConversion;
+ type PayoutPeriod = ConstU64<10>;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = ();
}
impl pallet_treasury::Config for Test {
@@ -142,6 +155,14 @@ impl pallet_treasury::Config for Test {
type SpendFunds = Bounties1;
type MaxApprovals = ConstU32<100>;
type SpendOrigin = frame_system::EnsureRootWithSuccess;
+ type AssetKind = ();
+ type Beneficiary = Self::AccountId;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayFromAccount;
+ type BalanceConverter = UnityAssetBalanceConversion;
+ type PayoutPeriod = ConstU64<10>;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = ();
}
parameter_types! {
diff --git a/substrate/frame/child-bounties/src/tests.rs b/substrate/frame/child-bounties/src/tests.rs
index 24a6410f29f..1fa3d944f3d 100644
--- a/substrate/frame/child-bounties/src/tests.rs
+++ b/substrate/frame/child-bounties/src/tests.rs
@@ -24,7 +24,10 @@ use crate as pallet_child_bounties;
use frame_support::{
assert_noop, assert_ok, parameter_types,
- traits::{ConstU32, ConstU64, OnInitialize},
+ traits::{
+ tokens::{PayFromAccount, UnityAssetBalanceConversion},
+ ConstU32, ConstU64, OnInitialize,
+ },
weights::Weight,
PalletId,
};
@@ -104,6 +107,7 @@ parameter_types! {
pub const ProposalBond: Permill = Permill::from_percent(5);
pub const Burn: Permill = Permill::from_percent(50);
pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
+ pub TreasuryAccount: u128 = Treasury::account_id();
pub const SpendLimit: Balance = u64::MAX;
}
@@ -124,6 +128,14 @@ impl pallet_treasury::Config for Test {
type SpendFunds = Bounties;
type MaxApprovals = ConstU32<100>;
type SpendOrigin = frame_system::EnsureRootWithSuccess;
+ type AssetKind = ();
+ type Beneficiary = Self::AccountId;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayFromAccount;
+ type BalanceConverter = UnityAssetBalanceConversion;
+ type PayoutPeriod = ConstU64<10>;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = ();
}
parameter_types! {
// This will be 50% of the bounty fee.
diff --git a/substrate/frame/support/src/traits/tokens.rs b/substrate/frame/support/src/traits/tokens.rs
index 253b49c6671..3635311e643 100644
--- a/substrate/frame/support/src/traits/tokens.rs
+++ b/substrate/frame/support/src/traits/tokens.rs
@@ -31,6 +31,7 @@ pub mod pay;
pub use misc::{
AssetId, Balance, BalanceStatus, ConversionFromAssetBalance, ConversionToAssetBalance,
ConvertRank, DepositConsequence, ExistenceRequirement, Fortitude, GetSalary, Locker, Precision,
- Preservation, Provenance, Restriction, WithdrawConsequence, WithdrawReasons,
+ Preservation, Provenance, Restriction, UnityAssetBalanceConversion, WithdrawConsequence,
+ WithdrawReasons,
};
pub use pay::{Pay, PayFromAccount, PaymentStatus};
diff --git a/substrate/frame/support/src/traits/tokens/misc.rs b/substrate/frame/support/src/traits/tokens/misc.rs
index e8587be1017..fd497bc4eda 100644
--- a/substrate/frame/support/src/traits/tokens/misc.rs
+++ b/substrate/frame/support/src/traits/tokens/misc.rs
@@ -277,6 +277,26 @@ pub trait ConversionFromAssetBalance {
balance: AssetBalance,
asset_id: AssetId,
) -> Result;
+ /// Ensures that a conversion for the `asset_id` will be successful if done immediately after
+ /// this call.
+ #[cfg(feature = "runtime-benchmarks")]
+ fn ensure_successful(asset_id: AssetId);
+}
+
+/// Implements [`ConversionFromAssetBalance`], enabling a 1:1 conversion of the asset balance
+/// value to the balance.
+pub struct UnityAssetBalanceConversion;
+impl
+ ConversionFromAssetBalance for UnityAssetBalanceConversion
+where
+ AssetBalance: Into,
+{
+ type Error = ();
+ fn from_asset_balance(balance: AssetBalance, _: AssetId) -> Result {
+ Ok(balance.into())
+ }
+ #[cfg(feature = "runtime-benchmarks")]
+ fn ensure_successful(_: AssetId) {}
}
/// Trait to handle NFT locking mechanism to ensure interactions with the asset can be implemented
diff --git a/substrate/frame/support/src/traits/tokens/pay.rs b/substrate/frame/support/src/traits/tokens/pay.rs
index 78f8e7b8734..18af7e5e548 100644
--- a/substrate/frame/support/src/traits/tokens/pay.rs
+++ b/substrate/frame/support/src/traits/tokens/pay.rs
@@ -23,7 +23,7 @@ use sp_core::{RuntimeDebug, TypedGet};
use sp_runtime::DispatchError;
use sp_std::fmt::Debug;
-use super::{fungible, Balance, Preservation::Expendable};
+use super::{fungible, fungibles, Balance, Preservation::Expendable};
/// Can be implemented by `PayFromAccount` using a `fungible` impl, but can also be implemented with
/// XCM/MultiAsset and made generic over assets.
@@ -107,3 +107,36 @@ impl> Pay for PayFromAccount {
#[cfg(feature = "runtime-benchmarks")]
fn ensure_concluded(_: Self::Id) {}
}
+
+/// Simple implementation of `Pay` for assets which makes a payment from a "pot" - i.e. a single
+/// account.
+pub struct PayAssetFromAccount(sp_std::marker::PhantomData<(F, A)>);
+impl frame_support::traits::tokens::Pay for PayAssetFromAccount
+where
+ A: TypedGet,
+ F: fungibles::Mutate + fungibles::Create,
+{
+ type Balance = F::Balance;
+ type Beneficiary = A::Type;
+ type AssetKind = F::AssetId;
+ type Id = ();
+ type Error = DispatchError;
+ fn pay(
+ who: &Self::Beneficiary,
+ asset: Self::AssetKind,
+ amount: Self::Balance,
+ ) -> Result {
+ >::transfer(asset, &A::get(), who, amount, Expendable)?;
+ Ok(())
+ }
+ fn check_payment(_: ()) -> PaymentStatus {
+ PaymentStatus::Success
+ }
+ #[cfg(feature = "runtime-benchmarks")]
+ fn ensure_successful(_: &Self::Beneficiary, asset: Self::AssetKind, amount: Self::Balance) {
+ >::create(asset.clone(), A::get(), true, amount).unwrap();
+ >::mint_into(asset, &A::get(), amount).unwrap();
+ }
+ #[cfg(feature = "runtime-benchmarks")]
+ fn ensure_concluded(_: Self::Id) {}
+}
diff --git a/substrate/frame/tips/src/tests.rs b/substrate/frame/tips/src/tests.rs
index 20d4b2c1a4c..8fe111afc26 100644
--- a/substrate/frame/tips/src/tests.rs
+++ b/substrate/frame/tips/src/tests.rs
@@ -29,7 +29,10 @@ use sp_storage::Storage;
use frame_support::{
assert_noop, assert_ok, parameter_types,
storage::StoragePrefixedMap,
- traits::{ConstU32, ConstU64, SortedMembers, StorageVersion},
+ traits::{
+ tokens::{PayFromAccount, UnityAssetBalanceConversion},
+ ConstU32, ConstU64, SortedMembers, StorageVersion,
+ },
PalletId,
};
@@ -123,7 +126,10 @@ parameter_types! {
pub const Burn: Permill = Permill::from_percent(50);
pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
pub const TreasuryPalletId2: PalletId = PalletId(*b"py/trsr2");
+ pub TreasuryAccount: u128 = Treasury::account_id();
+ pub TreasuryInstance1Account: u128 = Treasury1::account_id();
}
+
impl pallet_treasury::Config for Test {
type PalletId = TreasuryPalletId;
type Currency = pallet_balances::Pallet;
@@ -141,6 +147,14 @@ impl pallet_treasury::Config for Test {
type SpendFunds = ();
type MaxApprovals = ConstU32<100>;
type SpendOrigin = frame_support::traits::NeverEnsureOrigin;
+ type AssetKind = ();
+ type Beneficiary = Self::AccountId;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayFromAccount;
+ type BalanceConverter = UnityAssetBalanceConversion;
+ type PayoutPeriod = ConstU64<10>;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = ();
}
impl pallet_treasury::Config for Test {
@@ -160,6 +174,14 @@ impl pallet_treasury::Config for Test {
type SpendFunds = ();
type MaxApprovals = ConstU32<100>;
type SpendOrigin = frame_support::traits::NeverEnsureOrigin;
+ type AssetKind = ();
+ type Beneficiary = Self::AccountId;
+ type BeneficiaryLookup = IdentityLookup;
+ type Paymaster = PayFromAccount;
+ type BalanceConverter = UnityAssetBalanceConversion;
+ type PayoutPeriod = ConstU64<10>;
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper = ();
}
parameter_types! {
diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
index 785564cd988..f7f7a6ae89c 100644
--- a/substrate/frame/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -17,6 +17,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
"derive",
"max-encoded-len",
] }
+docify = "0.2.0"
impl-trait-for-tuples = "0.2.2"
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.188", features = ["derive"], optional = true }
@@ -26,11 +27,12 @@ frame-system = { path = "../system", default-features = false}
pallet-balances = { path = "../balances", default-features = false}
sp-runtime = { path = "../../primitives/runtime", default-features = false}
sp-std = { path = "../../primitives/std", default-features = false}
+sp-core = { path = "../../primitives/core", default-features = false, optional = true}
[dev-dependencies]
-sp-core = { path = "../../primitives/core" }
sp-io = { path = "../../primitives/io" }
pallet-utility = { path = "../utility" }
+sp-core = { path = "../../primitives/core", default-features = false }
[features]
default = [ "std" ]
@@ -43,12 +45,13 @@ std = [
"pallet-utility/std",
"scale-info/std",
"serde",
- "sp-core/std",
+ "sp-core?/std",
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
]
runtime-benchmarks = [
+ "dep:sp-core",
"frame-benchmarking/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
diff --git a/substrate/frame/treasury/src/benchmarking.rs b/substrate/frame/treasury/src/benchmarking.rs
index 24c290ddb66..f5f73ea8dda 100644
--- a/substrate/frame/treasury/src/benchmarking.rs
+++ b/substrate/frame/treasury/src/benchmarking.rs
@@ -21,12 +21,41 @@
use super::{Pallet as Treasury, *};
-use frame_benchmarking::v1::{account, benchmarks_instance_pallet, BenchmarkError};
+use frame_benchmarking::{
+ v1::{account, BenchmarkError},
+ v2::*,
+};
use frame_support::{
ensure,
- traits::{EnsureOrigin, OnInitialize, UnfilteredDispatchable},
+ traits::{
+ tokens::{ConversionFromAssetBalance, PaymentStatus},
+ EnsureOrigin, OnInitialize,
+ },
};
use frame_system::RawOrigin;
+use sp_core::crypto::FromEntropy;
+
+/// Trait describing factory functions for dispatchables' parameters.
+pub trait ArgumentsFactory {
+ /// Factory function for an asset kind.
+ fn create_asset_kind(seed: u32) -> AssetKind;
+ /// Factory function for a beneficiary.
+ fn create_beneficiary(seed: [u8; 32]) -> Beneficiary;
+}
+
+/// Implementation that expects the parameters implement the [`FromEntropy`] trait.
+impl ArgumentsFactory for ()
+where
+ AssetKind: FromEntropy,
+ Beneficiary: FromEntropy,
+{
+ fn create_asset_kind(seed: u32) -> AssetKind {
+ AssetKind::from_entropy(&mut seed.encode().as_slice()).unwrap()
+ }
+ fn create_beneficiary(seed: [u8; 32]) -> Beneficiary {
+ Beneficiary::from_entropy(&mut seed.as_slice()).unwrap()
+ }
+}
const SEED: u32 = 0;
@@ -66,81 +95,245 @@ fn assert_last_event, I: 'static>(generic_event: >::
frame_system::Pallet::::assert_last_event(generic_event.into());
}
-benchmarks_instance_pallet! {
+// Create the arguments for the `spend` dispatchable.
+fn create_spend_arguments, I: 'static>(
+ seed: u32,
+) -> (T::AssetKind, AssetBalanceOf, T::Beneficiary, BeneficiaryLookupOf) {
+ let asset_kind = T::BenchmarkHelper::create_asset_kind(seed);
+ let beneficiary = T::BenchmarkHelper::create_beneficiary([seed.try_into().unwrap(); 32]);
+ let beneficiary_lookup = T::BeneficiaryLookup::unlookup(beneficiary.clone());
+ (asset_kind, 100u32.into(), beneficiary, beneficiary_lookup)
+}
+
+#[instance_benchmarks]
+mod benchmarks {
+ use super::*;
+
// This benchmark is short-circuited if `SpendOrigin` cannot provide
// a successful origin, in which case `spend` is un-callable and can use weight=0.
- spend {
+ #[benchmark]
+ fn spend_local() -> Result<(), BenchmarkError> {
let (_, value, beneficiary_lookup) = setup_proposal::(SEED);
- let origin = T::SpendOrigin::try_successful_origin();
+ let origin =
+ T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
let beneficiary = T::Lookup::lookup(beneficiary_lookup.clone()).unwrap();
- let call = Call::::spend { amount: value, beneficiary: beneficiary_lookup };
- }: {
- if let Ok(origin) = origin.clone() {
- call.dispatch_bypass_filter(origin)?;
- }
- }
- verify {
- if origin.is_ok() {
- assert_last_event::(Event::SpendApproved { proposal_index: 0, amount: value, beneficiary }.into())
- }
+
+ #[extrinsic_call]
+ _(origin as T::RuntimeOrigin, value, beneficiary_lookup);
+
+ assert_last_event::(
+ Event::SpendApproved { proposal_index: 0, amount: value, beneficiary }.into(),
+ );
+ Ok(())
}
- propose_spend {
+ #[benchmark]
+ fn propose_spend() -> Result<(), BenchmarkError> {
let (caller, value, beneficiary_lookup) = setup_proposal::(SEED);
// Whitelist caller account from further DB operations.
let caller_key = frame_system::Account::::hashed_key_for(&caller);
frame_benchmarking::benchmarking::add_to_whitelist(caller_key.into());
- }: _(RawOrigin::Signed(caller), value, beneficiary_lookup)
- reject_proposal {
+ #[extrinsic_call]
+ _(RawOrigin::Signed(caller), value, beneficiary_lookup);
+
+ Ok(())
+ }
+
+ #[benchmark]
+ fn reject_proposal() -> Result<(), BenchmarkError> {
let (caller, value, beneficiary_lookup) = setup_proposal::(SEED);
#[allow(deprecated)]
Treasury::::propose_spend(
RawOrigin::Signed(caller).into(),
value,
- beneficiary_lookup
+ beneficiary_lookup,
)?;
let proposal_id = Treasury::::proposal_count() - 1;
let reject_origin =
T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
- }: _(reject_origin, proposal_id)
- approve_proposal {
- let p in 0 .. T::MaxApprovals::get() - 1;
+ #[extrinsic_call]
+ _(reject_origin as T::RuntimeOrigin, proposal_id);
+
+ Ok(())
+ }
+
+ #[benchmark]
+ fn approve_proposal(
+ p: Linear<0, { T::MaxApprovals::get() - 1 }>,
+ ) -> Result<(), BenchmarkError> {
create_approved_proposals::(p)?;
let (caller, value, beneficiary_lookup) = setup_proposal::(SEED);
#[allow(deprecated)]
Treasury::::propose_spend(
RawOrigin::Signed(caller).into(),
value,
- beneficiary_lookup
+ beneficiary_lookup,
)?;
let proposal_id = Treasury::::proposal_count() - 1;
let approve_origin =
T::ApproveOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
- }: _(approve_origin, proposal_id)
- remove_approval {
+ #[extrinsic_call]
+ _(approve_origin as T::RuntimeOrigin, proposal_id);
+
+ Ok(())
+ }
+
+ #[benchmark]
+ fn remove_approval() -> Result<(), BenchmarkError> {
let (caller, value, beneficiary_lookup) = setup_proposal::(SEED);
#[allow(deprecated)]
Treasury::::propose_spend(
RawOrigin::Signed(caller).into(),
value,
- beneficiary_lookup
+ beneficiary_lookup,
)?;
let proposal_id = Treasury::::proposal_count() - 1;
#[allow(deprecated)]
Treasury::::approve_proposal(RawOrigin::Root.into(), proposal_id)?;
let reject_origin =
T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
- }: _(reject_origin, proposal_id)
- on_initialize_proposals {
- let p in 0 .. T::MaxApprovals::get();
+ #[extrinsic_call]
+ _(reject_origin as T::RuntimeOrigin, proposal_id);
+
+ Ok(())
+ }
+
+ #[benchmark]
+ fn on_initialize_proposals(
+ p: Linear<0, { T::MaxApprovals::get() - 1 }>,
+ ) -> Result<(), BenchmarkError> {
setup_pot_account::();
create_approved_proposals::(p)?;
- }: {
- Treasury::::on_initialize(frame_system::pallet_prelude::BlockNumberFor::::zero());
+
+ #[block]
+ {
+ Treasury::::on_initialize(0u32.into());
+ }
+
+ Ok(())
+ }
+
+ #[benchmark]
+ fn spend() -> Result<(), BenchmarkError> {
+ let origin =
+ T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+ let (asset_kind, amount, beneficiary, beneficiary_lookup) =
+ create_spend_arguments::(SEED);
+ T::BalanceConverter::ensure_successful(asset_kind.clone());
+
+ #[extrinsic_call]
+ _(
+ origin as T::RuntimeOrigin,
+ Box::new(asset_kind.clone()),
+ amount,
+ Box::new(beneficiary_lookup),
+ None,
+ );
+
+ let valid_from = frame_system::Pallet::::block_number();
+ let expire_at = valid_from.saturating_add(T::PayoutPeriod::get());
+ assert_last_event::(
+ Event::AssetSpendApproved {
+ index: 0,
+ asset_kind,
+ amount,
+ beneficiary,
+ valid_from,
+ expire_at,
+ }
+ .into(),
+ );
+ Ok(())
+ }
+
+ #[benchmark]
+ fn payout() -> Result<(), BenchmarkError> {
+ let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+ let (asset_kind, amount, beneficiary, beneficiary_lookup) =
+ create_spend_arguments::(SEED);
+ T::BalanceConverter::ensure_successful(asset_kind.clone());
+ Treasury::::spend(
+ origin,
+ Box::new(asset_kind.clone()),
+ amount,
+ Box::new(beneficiary_lookup),
+ None,
+ )?;
+ T::Paymaster::ensure_successful(&beneficiary, asset_kind, amount);
+ let caller: T::AccountId = account("caller", 0, SEED);
+
+ #[extrinsic_call]
+ _(RawOrigin::Signed(caller.clone()), 0u32);
+
+ let id = match Spends::::get(0).unwrap().status {
+ PaymentState::Attempted { id, .. } => {
+ assert_ne!(T::Paymaster::check_payment(id), PaymentStatus::Failure);
+ id
+ },
+ _ => panic!("No payout attempt made"),
+ };
+ assert_last_event::(Event::Paid { index: 0, payment_id: id }.into());
+ assert!(Treasury::::payout(RawOrigin::Signed(caller).into(), 0u32).is_err());
+ Ok(())
+ }
+
+ #[benchmark]
+ fn check_status() -> Result<(), BenchmarkError> {
+ let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+ let (asset_kind, amount, beneficiary, beneficiary_lookup) =
+ create_spend_arguments::(SEED);
+ T::BalanceConverter::ensure_successful(asset_kind.clone());
+ Treasury::::spend(
+ origin,
+ Box::new(asset_kind.clone()),
+ amount,
+ Box::new(beneficiary_lookup),
+ None,
+ )?;
+ T::Paymaster::ensure_successful(&beneficiary, asset_kind, amount);
+ let caller: T::AccountId = account("caller", 0, SEED);
+ Treasury::::payout(RawOrigin::Signed(caller.clone()).into(), 0u32)?;
+ match Spends::::get(0).unwrap().status {
+ PaymentState::Attempted { id, .. } => {
+ T::Paymaster::ensure_concluded(id);
+ },
+ _ => panic!("No payout attempt made"),
+ };
+
+ #[extrinsic_call]
+ _(RawOrigin::Signed(caller.clone()), 0u32);
+
+ if let Some(s) = Spends::::get(0) {
+ assert!(!matches!(s.status, PaymentState::Attempted { .. }));
+ }
+ Ok(())
+ }
+
+ #[benchmark]
+ fn void_spend() -> Result<(), BenchmarkError> {
+ let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+ let (asset_kind, amount, _, beneficiary_lookup) = create_spend_arguments::(SEED);
+ T::BalanceConverter::ensure_successful(asset_kind.clone());
+ Treasury::::spend(
+ origin,
+ Box::new(asset_kind.clone()),
+ amount,
+ Box::new(beneficiary_lookup),
+ None,
+ )?;
+ assert!(Spends::::get(0).is_some());
+ let origin =
+ T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+
+ #[extrinsic_call]
+ _(origin as T::RuntimeOrigin, 0u32);
+
+ assert!(Spends::::get(0).is_none());
+ Ok(())
}
impl_benchmark_test_suite!(Treasury, crate::tests::new_test_ext(), crate::tests::Test);
diff --git a/substrate/frame/treasury/src/lib.rs b/substrate/frame/treasury/src/lib.rs
index 730fae2a4e9..b2b3a8801c1 100644
--- a/substrate/frame/treasury/src/lib.rs
+++ b/substrate/frame/treasury/src/lib.rs
@@ -15,46 +15,60 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+//! > Made with *Substrate*, for *Polkadot*.
+//!
+//! [![github]](https://github.com/paritytech/substrate/frame/fast-unstake) -
+//! [![polkadot]](https://polkadot.network)
+//!
+//! [polkadot]: https://img.shields.io/badge/polkadot-E6007A?style=for-the-badge&logo=polkadot&logoColor=white
+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
+//!
//! # Treasury Pallet
//!
//! The Treasury pallet provides a "pot" of funds that can be managed by stakeholders in the system
//! and a structure for making spending proposals from this pot.
//!
-//! - [`Config`]
-//! - [`Call`]
-//!
//! ## Overview
//!
//! The Treasury Pallet itself provides the pot to store funds, and a means for stakeholders to
-//! propose, approve, and deny expenditures. The chain will need to provide a method (e.g.
-//! inflation, fees) for collecting funds.
+//! propose and claim expenditures (aka spends). The chain will need to provide a method to approve
+//! spends (e.g. public referendum) and a method for collecting funds (e.g. inflation, fees).
//!
-//! By way of example, the Council could vote to fund the Treasury with a portion of the block
+//! By way of example, stakeholders could vote to fund the Treasury with a portion of the block
//! reward and use the funds to pay developers.
//!
-//!
//! ### Terminology
//!
//! - **Proposal:** A suggestion to allocate funds from the pot to a beneficiary.
//! - **Beneficiary:** An account who will receive the funds from a proposal iff the proposal is
//! approved.
-//! - **Deposit:** Funds that a proposer must lock when making a proposal. The deposit will be
-//! returned or slashed if the proposal is approved or rejected respectively.
//! - **Pot:** Unspent funds accumulated by the treasury pallet.
+//! - **Spend** An approved proposal for transferring a specific amount of funds to a designated
+//! beneficiary.
//!
-//! ## Interface
+//! ### Example
//!
-//! ### Dispatchable Functions
+//! 1. Multiple local spends approved by spend origins and received by a beneficiary.
+#![doc = docify::embed!("src/tests.rs", spend_local_origin_works)]
//!
-//! General spending/proposal protocol:
-//! - `propose_spend` - Make a spending proposal and stake the required deposit.
-//! - `reject_proposal` - Reject a proposal, slashing the deposit.
-//! - `approve_proposal` - Accept the proposal, returning the deposit.
-//! - `remove_approval` - Remove an approval, the deposit will no longer be returned.
+//! 2. Approve a spend of some asset kind and claim it.
+#![doc = docify::embed!("src/tests.rs", spend_payout_works)]
//!
-//! ## GenesisConfig
+//! ## Pallet API
//!
-//! The Treasury pallet depends on the [`GenesisConfig`].
+//! See the [`pallet`] module for more information about the interfaces this pallet exposes,
+//! including its configuration trait, dispatchables, storage items, events and errors.
+//!
+//! ## Low Level / Implementation Details
+//!
+//! Spends can be initiated using either the `spend_local` or `spend` dispatchable. The
+//! `spend_local` dispatchable enables the creation of spends using the native currency of the
+//! chain, utilizing the funds stored in the pot. These spends are automatically paid out every
+//! [`pallet::Config::SpendPeriod`]. On the other hand, the `spend` dispatchable allows spending of
+//! any asset kind managed by the treasury, with payment facilitated by a designated
+//! [`pallet::Config::Paymaster`]. To claim these spends, the `payout` dispatchable should be called
+//! within some temporal bounds, starting from the moment they become valid and within one
+//! [`pallet::Config::PayoutPeriod`].
#![cfg_attr(not(feature = "std"), no_std)]
@@ -62,6 +76,8 @@ mod benchmarking;
#[cfg(test)]
mod tests;
pub mod weights;
+#[cfg(feature = "runtime-benchmarks")]
+pub use benchmarking::ArgumentsFactory;
use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
@@ -75,7 +91,7 @@ use sp_std::{collections::btree_map::BTreeMap, prelude::*};
use frame_support::{
print,
traits::{
- Currency, ExistenceRequirement::KeepAlive, Get, Imbalance, OnUnbalanced,
+ tokens::Pay, Currency, ExistenceRequirement::KeepAlive, Get, Imbalance, OnUnbalanced,
ReservableCurrency, WithdrawReasons,
},
weights::Weight,
@@ -87,6 +103,7 @@ pub use weights::WeightInfo;
pub type BalanceOf =
<>::Currency as Currency<::AccountId>>::Balance;
+pub type AssetBalanceOf = <>::Paymaster as Pay>::Balance;
pub type PositiveImbalanceOf = <>::Currency as Currency<
::AccountId,
>>::PositiveImbalance;
@@ -94,6 +111,7 @@ pub type NegativeImbalanceOf = <>::Currency as Currenc
::AccountId,
>>::NegativeImbalance;
type AccountIdLookupOf = <::Lookup as StaticLookup>::Source;
+type BeneficiaryLookupOf = <>::BeneficiaryLookup as StaticLookup>::Source;
/// A trait to allow the Treasury Pallet to spend it's funds for other purposes.
/// There is an expectation that the implementer of this trait will correctly manage
@@ -133,10 +151,47 @@ pub struct Proposal {
bond: Balance,
}
+/// The state of the payment claim.
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+pub enum PaymentState {
+ /// Pending claim.
+ Pending,
+ /// Payment attempted with a payment identifier.
+ Attempted { id: Id },
+ /// Payment failed.
+ Failed,
+}
+
+/// Info regarding an approved treasury spend.
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+pub struct SpendStatus {
+ // The kind of asset to be spent.
+ asset_kind: AssetKind,
+ /// The asset amount of the spend.
+ amount: AssetBalance,
+ /// The beneficiary of the spend.
+ beneficiary: Beneficiary,
+ /// The block number from which the spend can be claimed.
+ valid_from: BlockNumber,
+ /// The block number by which the spend has to be claimed.
+ expire_at: BlockNumber,
+ /// The status of the payout/claim.
+ status: PaymentState,
+}
+
+/// Index of an approved treasury spend.
+pub type SpendIndex = u32;
+
#[frame_support::pallet]
pub mod pallet {
use super::*;
- use frame_support::{dispatch_context::with_context, pallet_prelude::*};
+ use frame_support::{
+ dispatch_context::with_context,
+ pallet_prelude::*,
+ traits::tokens::{ConversionFromAssetBalance, PaymentStatus},
+ };
use frame_system::pallet_prelude::*;
#[pallet::pallet]
@@ -201,9 +256,38 @@ pub mod pallet {
type MaxApprovals: Get;
/// The origin required for approving spends from the treasury outside of the proposal
- /// process. The `Success` value is the maximum amount that this origin is allowed to
- /// spend at a time.
+ /// process. The `Success` value is the maximum amount in a native asset that this origin
+ /// is allowed to spend at a time.
type SpendOrigin: EnsureOrigin>;
+
+ /// Type parameter representing the asset kinds to be spent from the treasury.
+ type AssetKind: Parameter + MaxEncodedLen;
+
+ /// Type parameter used to identify the beneficiaries eligible to receive treasury spends.
+ type Beneficiary: Parameter + MaxEncodedLen;
+
+ /// Converting trait to take a source type and convert to [`Self::Beneficiary`].
+ type BeneficiaryLookup: StaticLookup;
+
+ /// Type for processing spends of [Self::AssetKind] in favor of [`Self::Beneficiary`].
+ type Paymaster: Pay;
+
+ /// Type for converting the balance of an [Self::AssetKind] to the balance of the native
+ /// asset, solely for the purpose of asserting the result against the maximum allowed spend
+ /// amount of the [`Self::SpendOrigin`].
+ type BalanceConverter: ConversionFromAssetBalance<
+ ::Balance,
+ Self::AssetKind,
+ BalanceOf,
+ >;
+
+ /// The period during which an approved treasury spend has to be claimed.
+ #[pallet::constant]
+ type PayoutPeriod: Get>;
+
+ /// Helper type for benchmarks.
+ #[cfg(feature = "runtime-benchmarks")]
+ type BenchmarkHelper: ArgumentsFactory;
}
/// Number of proposals that have been made.
@@ -233,6 +317,27 @@ pub mod pallet {
pub type Approvals, I: 'static = ()> =
StorageValue<_, BoundedVec, ValueQuery>;
+ /// The count of spends that have been made.
+ #[pallet::storage]
+ pub(crate) type SpendCount = StorageValue<_, SpendIndex, ValueQuery>;
+
+ /// Spends that have been approved and being processed.
+ // Hasher: Twox safe since `SpendIndex` is an internal count based index.
+ #[pallet::storage]
+ pub type Spends, I: 'static = ()> = StorageMap<
+ _,
+ Twox64Concat,
+ SpendIndex,
+ SpendStatus<
+ T::AssetKind,
+ AssetBalanceOf,
+ T::Beneficiary,
+ BlockNumberFor,
+ ::Id,
+ >,
+ OptionQuery,
+ >;
+
#[pallet::genesis_config]
#[derive(frame_support::DefaultNoBound)]
pub struct GenesisConfig, I: 'static = ()> {
@@ -277,6 +382,24 @@ pub mod pallet {
},
/// The inactive funds of the pallet have been updated.
UpdatedInactive { reactivated: BalanceOf, deactivated: BalanceOf },
+ /// A new asset spend proposal has been approved.
+ AssetSpendApproved {
+ index: SpendIndex,
+ asset_kind: T::AssetKind,
+ amount: AssetBalanceOf,
+ beneficiary: T::Beneficiary,
+ valid_from: BlockNumberFor,
+ expire_at: BlockNumberFor,
+ },
+ /// An approved spend was voided.
+ AssetSpendVoided { index: SpendIndex },
+ /// A payment happened.
+ Paid { index: SpendIndex, payment_id: ::Id },
+ /// A payment failed and can be retried.
+ PaymentFailed { index: SpendIndex, payment_id: ::Id },
+ /// A spend was processed and removed from the storage. It might have been successfully
+ /// paid or it may have expired.
+ SpendProcessed { index: SpendIndex },
}
/// Error for the treasury pallet.
@@ -284,7 +407,7 @@ pub mod pallet {
pub enum Error