Merge branch 'master' into moonbeam-polkadot-stable2407

README.md

@@ -16,7 +16,7 @@ Docker images are published for every tagged release. Learn more with `moonbeam
 
 ```bash
 # Join the public testnet
-docker run --network="host" moonbeamfoundation/moonbeam:v0.40.0 --chain alphanet
+docker run --network="host" moonbeamfoundation/moonbeam:v0.40.1 --chain alphanet
 ```
 
 You can find more detailed instructions to [run a full node in our TestNet](https://docs.moonbeam.network/node-operators/networks/run-a-node/overview/)
@@ -28,7 +28,7 @@ locally. You can quickly set up a single node without a relay chain backing it u
 
 ```bash
 # Run a dev service node
-docker run --network="host" moonbeamfoundation/moonbeam:v0.40.0 --dev
+docker run --network="host" moonbeamfoundation/moonbeam:v0.40.1 --dev
 ```
 
 For more information, see our detailed instructions to [run a development node](https://docs.moonbeam.network/builders/get-started/networks/moonbeam-dev/)
@@ -39,10 +39,10 @@ The above command will start the node in instant seal mode. It creates a block w
 
 ```bash
 # Author a block every 6 seconds.
-docker run --network="host" moonbeamfoundation/moonbeam:v0.40.0 --dev --sealing 6000
+docker run --network="host" moonbeamfoundation/moonbeam:v0.40.1 --dev --sealing 6000
 
 # Manually control the block authorship and finality
-docker run --network="host" moonbeamfoundation/moonbeam:v0.40.0 --dev --sealing manual
+docker run --network="host" moonbeamfoundation/moonbeam:v0.40.1 --dev --sealing manual
 ```
 
 ### Prefunded Development Addresses

node/cli/src/command.rs

@@ -221,18 +221,8 @@ fn validate_trace_environment(cli: &Cli) -> Result<()> {
 
 /// Parse command line arguments into service configuration.
 pub fn run() -> Result<()> {
-	let mut cli = Cli::from_args();
+	let cli = Cli::from_args();
 	let _ = validate_trace_environment(&cli)?;
-	// Set --execution wasm as default
-	let execution_strategies = cli.run.base.base.import_params.execution_strategies.clone();
-	if execution_strategies.execution.is_none() {
-		cli.run
-			.base
-			.base
-			.import_params
-			.execution_strategies
-			.execution = Some(sc_cli::ExecutionStrategy::Wasm);
-	}
 
 	match &cli.subcommand {
 		Some(Subcommand::BuildSpec(params)) => {

node/service/src/lib.rs

@@ -1855,23 +1855,28 @@ where
 			.client
 			.header(hash)
 			.map_err(|e| sp_inherents::Error::Application(Box::new(e)))?
-			.expect("Best block header should be present")
+			.ok_or(sp_inherents::Error::Application(
+				"Best block header should be present".into(),
+			))?
 			.digest;
 		// Get the nimbus id from the digest.
 		let nimbus_id = digest
 			.logs
 			.iter()
 			.find_map(|x| {
 				if let DigestItem::PreRuntime(nimbus_primitives::NIMBUS_ENGINE_ID, nimbus_id) = x {
-					Some(
-						NimbusId::from_slice(nimbus_id.as_slice())
-							.expect("Nimbus pre-runtime digest should be valid"),
-					)
+					Some(NimbusId::from_slice(nimbus_id.as_slice()).map_err(|_| {
+						sp_inherents::Error::Application(
+							"Nimbus pre-runtime digest should be valid".into(),
+						)
+					}))
 				} else {
 					None
 				}
 			})
-			.expect("Nimbus pre-runtime digest should be present");
+			.ok_or(sp_inherents::Error::Application(
+				"Nimbus pre-runtime digest should be present".into(),
+			))??;
 		// Remove the old VRF digest.
 		let pos = digest.logs.iter().position(|x| {
 			matches!(