Fix compilation on latest nightly because of stdsimd (#3296)

We need to bump `ahash` to make it compile again.

Closes: https://github.com/paritytech/polkadot-sdk/issues/3269

Cargo.lock

@@ -114,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom 0.2.10",
  "once_cell",
@@ -125,9 +125,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
 dependencies = [
  "cfg-if",
  "getrandom 0.2.10",
@@ -4375,9 +4375,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4811,7 +4811,7 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
@@ -4840,7 +4840,7 @@ version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "ed25519",
  "hashbrown 0.14.3",
  "hex",
@@ -6229,7 +6229,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -6238,7 +6238,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
 ]
 
 [[package]]
@@ -6247,7 +6247,7 @@ version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "allocator-api2",
  "serde",
 ]
@@ -8127,7 +8127,7 @@ dependencies = [
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "c2-chacha",
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "either",
  "hashlink",
  "lioness",
@@ -15764,7 +15764,7 @@ dependencies = [
 name = "sc-consensus-grandpa"
 version = "0.19.0"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "array-bytes 6.1.0",
  "assert_matches",
  "async-trait",
@@ -16150,7 +16150,7 @@ dependencies = [
 name = "sc-network-gossip"
 version = "0.34.0"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "async-trait",
  "futures",
  "futures-timer",
@@ -16842,7 +16842,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "cfg-if",
  "hashbrown 0.13.2",
 ]
@@ -16888,7 +16888,7 @@ dependencies = [
  "aead 0.5.2",
  "arrayref",
  "arrayvec 0.7.4",
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "getrandom_or_panic",
  "merlin 3.0.0",
  "rand_core 0.6.4",
@@ -17577,7 +17577,7 @@ dependencies = [
  "aes-gcm 0.9.4",
  "blake2 0.10.6",
  "chacha20poly1305",
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "rand_core 0.6.4",
  "ring 0.16.20",
  "rustc_version 0.4.0",
@@ -18858,7 +18858,7 @@ name = "sp-statement-store"
 version = "10.0.0"
 dependencies = [
  "aes-gcm 0.10.3",
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "ed25519-dalek",
  "hkdf",
  "parity-scale-codec",
@@ -18985,7 +18985,7 @@ dependencies = [
 name = "sp-trie"
 version = "29.0.0"
 dependencies = [
- "ahash 0.8.7",
+ "ahash 0.8.8",
  "array-bytes 6.1.0",
  "criterion 0.4.0",
  "hash-db",
@@ -22070,7 +22070,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek 4.1.2",
  "rand_core 0.6.4",
  "serde",
  "zeroize",

substrate/bin/node-template/env-setup/README.md

@@ -0,0 +1,9 @@
+# Env setup
+
+Special files for setting up an environment to work with the template:
+
+- `rust-toolchain.toml` when working with `rustup`.
+- `flake.nix` when working with `nix`.
+
+These files will be copied by the installer script to the main directory. They are
+put into this special directory to not interfere with the normal CI.

substrate/bin/node-template/env-setup/rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly"
+channel = "stable"
 components = [
 	"cargo",
 	"clippy",

substrate/scripts/ci/node-template-release/src/main.rs

@@ -18,6 +18,7 @@
 
 use std::{
 	collections::HashMap,
+	ffi::OsString,
 	fs::{self, File, OpenOptions},
 	path::{Path, PathBuf},
 	process::Command,
@@ -56,9 +57,24 @@ struct Options {
 }
 
 /// Copy the `node-template` to the given path.
-fn copy_node_template(node_template: &Path, dest_path: &Path) {
+fn copy_node_template(node_template: &Path, node_template_folder: &OsString, dest_path: &Path) {
 	let options = CopyOptions::new();
 	dir::copy(node_template, dest_path, &options).expect("Copies node-template to tmp dir");
+
+	let dest_path = dest_path.join(node_template_folder);
+
+	dir::get_dir_content(dest_path.join("env-setup"))
+		.expect("`env-setup` directory should exist")
+		.files
+		.iter()
+		.for_each(|f| {
+			fs::copy(
+				f,
+				dest_path.join(PathBuf::from(f).file_name().expect("File has a file name.")),
+			)
+			.expect("Copying from `env-setup` directory works");
+		});
+	dir::remove(dest_path.join("env-setup")).expect("Deleting `env-setup works`");
 }
 
 /// Find all `Cargo.toml` files in the given path.
@@ -195,6 +211,9 @@ fn update_root_cargo_toml(
 	commit_id: &str,
 ) {
 	let mut workspace = Table::new();
+
+	workspace.insert("resolver", value("2"));
+
 	workspace.insert("members", value(Array::from_iter(members.iter())));
 	let mut workspace_dependencies = Table::new();
 	deps.values()
@@ -216,6 +235,8 @@ fn update_root_cargo_toml(
 	workspace.insert("package", Item::Table(package));
 
 	workspace.insert("dependencies", Item::Table(workspace_dependencies));
+
+	workspace.insert("lints", Item::Table(Table::new()));
 	cargo_toml.insert("workspace", Item::Table(workspace));
 
 	let mut panic_unwind = Table::new();
@@ -294,7 +315,7 @@ fn main() {
 		.file_name()
 		.expect("Node template folder is last element of path")
 		.to_owned();
-	copy_node_template(&options.node_template, build_dir.path());
+	copy_node_template(&options.node_template, &node_template_folder, build_dir.path());
 
 	// The path to the node-template in the build dir.
 	let node_template_path = build_dir.path().join(node_template_folder);
@@ -429,6 +450,7 @@ frame-system = { workspace = true }
 		);
 
 		let expected_toml = r#"[workspace]
+resolver = "2"
 members = ["node", "pallets/template", "runtime"]
 
 [workspace.package]
@@ -438,6 +460,8 @@ edition = "2021"
 frame-system = { version = "4.0.0-dev", default-features = true, git = "https://github.com/paritytech/polkadot-sdk.git", rev = "commit_id" }
 sp-io = { version = "7.0.0", git = "https://github.com/paritytech/polkadot-sdk.git", rev = "commit_id" }
 
+[workspace.lints]
+
 [profile]
 
 [profile.release]