Merge remote-tracking branch 'origin/master' into agustin-client-asyn…

…c-backing
moondance-labs · Jan 31, 2024 · 151a24e · 151a24e
2 parents 29a98b4 + c208610
commit 151a24e
Show file tree

Hide file tree

Showing 68 changed files with 6,437 additions and 972 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,8 +71,10 @@ pallet-evm-precompile-balances-erc20 = { git = "https://github.com/moondance-lab
 pallet-evm-precompile-batch = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
 pallet-evm-precompile-call-permit = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
 pallet-evm-precompile-xcm-utils = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
+pallet-foreign-asset-creator = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
 pallet-maintenance-mode = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
 pallet-migrations = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
+pallet-relay-storage-roots = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
 xcm-primitives = { git = "https://github.com/moondance-labs/moonkit", branch = "agustin-client-async-backing", default-features = false }
 
 # Substrate (wasm)
@@ -83,6 +85,8 @@ frame-system = { git = "https://github.com/moondance-labs/polkadot-sdk.git", bra
 frame-system-benchmarking = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 frame-system-rpc-runtime-api = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 frame-try-runtime = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
+pallet-asset-rate = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
+pallet-assets = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 pallet-balances = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 pallet-identity = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 pallet-im-online = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
@@ -193,6 +197,7 @@ cumulus-primitives-core = { git = "https://github.com/moondance-labs/polkadot-sd
 cumulus-primitives-timestamp = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 cumulus-primitives-utility = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 parachain-info = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
+parachains-common = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
 
 # Cumulus (client)
 cumulus-client-cli = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "agustin-client-async-backing", default-features = false }
@@ -266,6 +271,7 @@ tempfile = "3.1.0"
 thiserror = { version = "1.0.40" }
 tokio = { version = "1.32.0", default-features = false }
 tracing = { version = "0.1.37", default-features = false }
+tracing-subscriber = { version = "0.2.25", default-features = false }
 url = "2.2.2"
 
 [patch.crates-io]

diff --git a/container-chains/templates/frontier/runtime/Cargo.toml b/container-chains/templates/frontier/runtime/Cargo.toml
@@ -68,6 +68,7 @@ sp-version = { workspace = true }
 
 # Polkadot
 pallet-xcm = { workspace = true }
+pallet-xcm-benchmarks = { workspace = true, optional = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
 staging-xcm = { workspace = true }
@@ -101,6 +102,10 @@ pallet-evm-precompile-simple = { workspace = true }
 pallet-hotfix-sufficients = { workspace = true }
 precompile-utils = { workspace = true }
 
+# Benchmarking
+frame-benchmarking = { workspace = true, optional = true }
+frame-system-benchmarking = { workspace = true, optional = true }
+
 [build-dependencies]
 substrate-wasm-builder = { workspace = true }
 
@@ -120,8 +125,10 @@ std = [
 	"fp-evm/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
+	"frame-benchmarking?/std",
 	"frame-executive/std",
 	"frame-support/std",
+	"frame-system-benchmarking?/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
@@ -156,6 +163,7 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-tx-pause/std",
 	"pallet-utility/std",
+	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
 	"parity-scale-codec/std",
@@ -194,7 +202,9 @@ runtime-benchmarks = [
 	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"cumulus-primitives-utility/runtime-benchmarks",
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
+	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"hex-literal",
 	"nimbus-primitives/runtime-benchmarks",
@@ -211,12 +221,14 @@ runtime-benchmarks = [
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-tx-pause/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
+	"pallet-xcm-benchmarks/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"staging-xcm-builder/runtime-benchmarks",
 	"staging-xcm-executor/runtime-benchmarks",
+	"tp-consensus/runtime-benchmarks",
 	"xcm-primitives/runtime-benchmarks",
 ]