From 59806022de7c6fce3fe0d2f3bdd5a869e1aea4af Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Fri, 20 Oct 2023 05:13:19 +0200
Subject: [PATCH] Switch trie cache random seed (#1935)

Use a more secure seed for hashsets of cache.
---
 Cargo.lock                                          | 1 +
 substrate/primitives/trie/Cargo.toml                | 2 ++
 substrate/primitives/trie/src/cache/shared_cache.rs | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1595fcb195f3..2ffa738f6953 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17535,6 +17535,7 @@ dependencies = [
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.12.1",
+ "rand 0.8.5",
  "scale-info",
  "schnellru",
  "sp-core",
diff --git a/substrate/primitives/trie/Cargo.toml b/substrate/primitives/trie/Cargo.toml
index 0b54514f6003..1ef4318c51ff 100644
--- a/substrate/primitives/trie/Cargo.toml
+++ b/substrate/primitives/trie/Cargo.toml
@@ -26,6 +26,7 @@ lazy_static = { version = "1.4.0", optional = true }
 memory-db = { version = "0.32.0", default-features = false }
 nohash-hasher = { version = "0.2.0", optional = true }
 parking_lot = { version = "0.12.1", optional = true }
+rand = { version = "0.8", optional = true }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.48", optional = true }
 tracing = { version = "0.1.29", optional = true }
@@ -53,6 +54,7 @@ std = [
 	"memory-db/std",
 	"nohash-hasher",
 	"parking_lot",
+	"rand",
 	"scale-info/std",
 	"schnellru",
 	"sp-core/std",
diff --git a/substrate/primitives/trie/src/cache/shared_cache.rs b/substrate/primitives/trie/src/cache/shared_cache.rs
index 28b3274fde11..01ac41a1e47d 100644
--- a/substrate/primitives/trie/src/cache/shared_cache.rs
+++ b/substrate/primitives/trie/src/cache/shared_cache.rs
@@ -30,7 +30,11 @@ use std::{
 use trie_db::{node::NodeOwned, CachedValue};
 
 lazy_static::lazy_static! {
-	static ref RANDOM_STATE: ahash::RandomState = ahash::RandomState::default();
+	static ref RANDOM_STATE: ahash::RandomState = {
+		use rand::Rng;
+		let mut rng = rand::thread_rng();
+		ahash::RandomState::generate_with(rng.gen(), rng.gen(), rng.gen(), rng.gen())
+	};
 }
 
 pub struct SharedNodeCacheLimiter {