Use umbrella crate for minimal template

Cargo.toml

@@ -584,7 +584,7 @@ ahash = { version = "0.8.2" }
 alloy-primitives = { version = "0.4.2", default-features = false }
 alloy-sol-types = { version = "0.4.2", default-features = false }
 always-assert = { version = "0.1" }
-anyhow = { version = "1.0.81" }
+anyhow = { version = "1.0.81", default-features = false }
 aquamarine = { version = "0.5.0" }
 arbitrary = { version = "1.3.2" }
 ark-bls12-377 = { version = "0.4.0", default-features = false }

bridges/relays/utils/Cargo.toml

@@ -11,7 +11,7 @@ publish = false
 workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow = { workspace = true, default-features = true }
 async-std = { workspace = true }
 async-trait = { workspace = true }
 backoff = { workspace = true }

cumulus/client/consensus/proposer/Cargo.toml

@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
+anyhow = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 thiserror = { workspace = true }
 

docs/sdk/src/reference_docs/chain_spec_runtime/src/runtime.rs

@@ -32,10 +32,7 @@ use frame::{
 		runtime,
 	},
 	prelude::*,
-	runtime::{
-		apis::{self, impl_runtime_apis, ExtrinsicInclusionMode},
-		prelude::*,
-	},
+	runtime::{apis, prelude::*},
 };
 use sp_genesis_builder::PresetId;
 

prdoc/pr_5155.prdoc

@@ -0,0 +1,27 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Use umbrella crate for minimal template
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Minor additions to the `polkadot-sdk-frame` crate and making it ready for usage in more templates. This PR already integrates it in the minimal template.
+
+
+crates:
+  - name: polkadot-sdk
+    bump: patch
+  - name: polkadot-sdk-frame
+    bump: patch
+  - name: sp-wasm-interface 
+    bump: patch
+  - name: pallet-revive
+    bump: patch
+  - name: pallet-revive-fixtures 
+    bump: patch
+  - name: frame-support
+    bump: patch
+  - name: pallet-balances
+    bump: patch
+

scripts/generate-umbrella.py

@@ -38,6 +38,12 @@ def exclude(crate):
 
 	return False
 
+
+def no_riscv_target(crate):
+	if crate.name == "pallet-contracts":
+		return True
+	return False
+
 def main(path, version):
 	delete_umbrella(path)
 	workspace = Workspace.from_path(path)
@@ -89,13 +95,21 @@ def main(path, version):
 	all_crates = std_crates + nostd_crates
 	all_crates.sort(key=lambda x: x[0].name)
 	dependencies = {}
-
+	target = {}
+	no_arch_riscv_deps = {}
+	target["cfg(not(target_arch = \"riscv32\"))"] = {}
+	target["cfg(not(target_arch = \"riscv32\"))"]["dependencies"] = no_arch_riscv_deps
+
+	def add_dependency(crate, path):
+		deps = no_arch_riscv_deps if no_riscv_target(crate) else dependencies
+		deps[crate.name] = {"path": f"../{path}", "default-features": False, "optional": True}
+
 	for (crate, path) in nostd_crates:
-		dependencies[crate.name] = {"path": f"../{path}", "default-features": False, "optional": True}
+		add_dependency(crate, path)
 
 	for (crate, path) in std_crates:
-		dependencies[crate.name] = {"path": f"../{path}", "default-features": False, "optional": True}
-
+		add_dependency(crate, path)
+	
 	# The empty features are filled by Zepter
 	features = {
 		"default": [ "std" ],
@@ -126,6 +140,7 @@ def main(path, version):
 		},
 		"dependencies": dependencies,
 		"features": features,
+		"target": target,
 	}
 
 	umbrella_dir = os.path.join(workspace.path, "umbrella")
@@ -158,7 +173,10 @@ def main(path, version):
 			use = crate.name.replace("-", "_")
 			desc = crate.description if crate.description.endswith(".") else crate.description + "."
 			f.write(f'\n/// {desc}')
-			f.write(f'\n#[cfg(feature = "{crate.name}")]\n')
+			if no_riscv_target(crate):
+				f.write(f'\n#[cfg(all(feature = "{crate.name}", not(target_arch = "riscv32")))]\n')
+			else:
+				f.write(f'\n#[cfg(feature = "{crate.name}")]\n')
 			f.write(f"pub use {use};\n")
 
 		print(f"Wrote {lib_path}")

substrate/frame/contracts/fixtures/Cargo.toml

@@ -7,21 +7,24 @@ edition.workspace = true
 license.workspace = true
 description = "Fixtures for testing contracts pallet."
 
+[package.metadata.polkadot-sdk]
+exclude-from-umbrella = true
+
 [lints]
 workspace = true
 
 [dependencies]
 frame-system = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-anyhow = { workspace = true }
+anyhow = { workspace = true, default-features = true }
 
 [build-dependencies]
 parity-wasm = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
 twox-hash = { workspace = true, default-features = true }
 polkavm-linker = { workspace = true, optional = true }
-anyhow = { workspace = true }
+anyhow = { workspace = true, default-features = true }
 
 [features]
 riscv = ["polkavm-linker"]

substrate/frame/revive/fixtures/Cargo.toml

@@ -15,6 +15,9 @@ frame-system = { workspace = true, default-features = true, optional = true }
 sp-runtime = { workspace = true, default-features = true, optional = true }
 anyhow = { workspace = true }
 
+[package.metadata.polkadot-sdk]
+exclude-from-umbrella = true
+
 [build-dependencies]
 parity-wasm = { workspace = true }
 tempfile = { workspace = true }
@@ -29,4 +32,8 @@ default = ["std"]
 # we will remove this once there is an upstream toolchain
 riscv = []
 # only when std is enabled all fixtures are available
-std = ["frame-system", "sp-runtime"]
+std = [
+	"anyhow/std",
+	"frame-system",
+	"sp-runtime",
+]

substrate/frame/revive/src/wasm/runtime.rs

@@ -556,7 +556,7 @@ impl<'a, E: Ext, M: PolkaVmInstance<E::T>> Runtime<'a, E, M> {
 	}
 }
 
-impl<'a, E: Ext, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
+impl<'a, E: Ext + 'a, M: ?Sized + Memory<E::T>> Runtime<'a, E, M> {
 	pub fn new(ext: &'a mut E, input_data: Vec<u8>) -> Self {
 		Self {
 			ext,

substrate/frame/src/lib.rs

@@ -177,21 +177,34 @@ pub mod runtime {
 		pub use frame_executive::*;
 
 		/// Macro to amalgamate the runtime into `struct Runtime`.
+		///
+		/// Consider using the new version of this [`frame_construct_runtime`].
 		pub use frame_support::construct_runtime;
 
+		/// Macro to amalgamate the runtime into `struct Runtime`.
+		///
+		/// This is the newer version of [`construct_runtime`].
+		pub use frame_support::runtime as frame_construct_runtime;
+
 		/// Macro to easily derive the `Config` trait of various pallet for `Runtime`.
 		pub use frame_support::derive_impl;
 
 		/// Macros to easily impl traits such as `Get` for types.
 		// TODO: using linking in the Get in the line above triggers an ICE :/
 		pub use frame_support::{ord_parameter_types, parameter_types};
 
+		/// For building genesis config.
+		pub use frame_support::genesis_builder_helper::{build_state, get_preset};
+
 		/// Const types that can easily be used in conjuncture with `Get`.
 		pub use frame_support::traits::{
 			ConstBool, ConstI128, ConstI16, ConstI32, ConstI64, ConstI8, ConstU128, ConstU16,
 			ConstU32, ConstU64, ConstU8,
 		};
 
+		/// Used for simple fee calculation.
+		pub use frame_support::weights::{self, FixedFee, NoFee};
+
 		/// Primary types used to parameterize `EnsureOrigin` and `EnsureRootWithArg`.
 		pub use frame_system::{
 			EnsureNever, EnsureNone, EnsureRoot, EnsureRootWithSuccess, EnsureSigned,
@@ -201,11 +214,16 @@ pub mod runtime {
 		/// Types to define your runtime version.
 		pub use sp_version::{create_runtime_str, runtime_version, RuntimeVersion};
 
+		#[cfg(feature = "std")]
+		pub use sp_version::NativeVersion;
+
 		/// Macro to implement runtime APIs.
 		pub use sp_api::impl_runtime_apis;
 
-		#[cfg(feature = "std")]
-		pub use sp_version::NativeVersion;
+		// Types often used in the runtime APIs.
+		pub use sp_core::OpaqueMetadata;
+		pub use sp_inherents::{CheckInherentsResult, InherentData};
+		pub use sp_runtime::{ApplyExtrinsicResult, ExtrinsicInclusionMode};
 	}
 
 	/// Types and traits for runtimes that implement runtime APIs.
@@ -223,11 +241,6 @@ pub mod runtime {
 	// moved to file similarly.
 	#[allow(ambiguous_glob_reexports)]
 	pub mod apis {
-		// Types often used in the runtime APIs.
-		pub use sp_core::OpaqueMetadata;
-		pub use sp_inherents::{CheckInherentsResult, InherentData};
-		pub use sp_runtime::{ApplyExtrinsicResult, ExtrinsicInclusionMode};
-
 		pub use frame_system_rpc_runtime_api::*;
 		pub use sp_api::{self, *};
 		pub use sp_block_builder::*;

substrate/frame/support/test/tests/pallet_outer_enums_explicit.rs

@@ -19,8 +19,6 @@ use frame_support::derive_impl;
 
 mod common;
 
-use common::outer_enums::{pallet, pallet2};
-
 pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
@@ -75,8 +73,10 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[cfg(feature = "experimental")]
 #[test]
 fn module_error_outer_enum_expand_explicit() {
+	use common::outer_enums::{pallet, pallet2};
 	// The Runtime has *all* parts explicitly defined.
 
 	// Check that all error types are propagated
@@ -90,9 +90,7 @@ fn module_error_outer_enum_expand_explicit() {
 			frame_system::Error::NonZeroRefCount => (),
 			frame_system::Error::CallFiltered => (),
 			frame_system::Error::MultiBlockMigrationsOngoing => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::InvalidTask => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::FailedTask => (),
 			frame_system::Error::NothingAuthorized => (),
 			frame_system::Error::Unauthorized => (),

substrate/frame/support/test/tests/pallet_outer_enums_implicit.rs

@@ -19,8 +19,6 @@ use frame_support::derive_impl;
 
 mod common;
 
-use common::outer_enums::{pallet, pallet2};
-
 pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
@@ -75,8 +73,10 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[cfg(feature = "experimental")]
 #[test]
 fn module_error_outer_enum_expand_implicit() {
+	use common::outer_enums::{pallet, pallet2};
 	// The Runtime has *all* parts implicitly defined.
 
 	// Check that all error types are propagated
@@ -90,9 +90,7 @@ fn module_error_outer_enum_expand_implicit() {
 			frame_system::Error::NonZeroRefCount => (),
 			frame_system::Error::CallFiltered => (),
 			frame_system::Error::MultiBlockMigrationsOngoing => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::InvalidTask => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::FailedTask => (),
 			frame_system::Error::NothingAuthorized => (),
 			frame_system::Error::Unauthorized => (),

substrate/primitives/wasm-interface/Cargo.toml

@@ -25,5 +25,9 @@ anyhow = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "log/std"]
+std = [
+	"anyhow?/std",
+	"codec/std",
+	"log/std",
+]
 wasmtime = ["anyhow", "dep:wasmtime"]