From ecd207f421ac02446254fbda038d69e14b0a426b Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Tue, 13 Jan 2026 12:47:43 +1100
Subject: [PATCH] Remove selector attribute duplication! Yay!

---
 Cargo.lock                                | 18 +++++++++---------
 testing/ef_tests/src/cases/ssz_generic.rs |  7 -------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e6a696496f..104061df5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3057,7 +3057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4675,7 +4675,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -6270,7 +6270,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -7179,7 +7179,7 @@ dependencies = [
  "once_cell",
  "socket2 0.6.1",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -7674,7 +7674,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7687,7 +7687,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.11.0",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -8753,7 +8753,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.2",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -9324,7 +9324,7 @@ dependencies = [
 [[package]]
 name = "tree_hash"
 version = "0.12.0"
-source = "git+https://github.com/sigp/tree_hash?branch=progressive#2fd80712e4d85e5f61dc574d8f5837a5c9b355b8"
+source = "git+https://github.com/sigp/tree_hash?branch=progressive#4f7349913ba9ac8cce7112b2279364f8fcac1f5d"
 dependencies = [
  "alloy-primitives",
  "ethereum_hashing",
@@ -9336,7 +9336,7 @@ dependencies = [
 [[package]]
 name = "tree_hash_derive"
 version = "0.12.0"
-source = "git+https://github.com/sigp/tree_hash?branch=progressive#2fd80712e4d85e5f61dc574d8f5837a5c9b355b8"
+source = "git+https://github.com/sigp/tree_hash?branch=progressive#4f7349913ba9ac8cce7112b2279364f8fcac1f5d"
 dependencies = [
  "darling 0.21.3",
  "proc-macro2",
diff --git a/testing/ef_tests/src/cases/ssz_generic.rs b/testing/ef_tests/src/cases/ssz_generic.rs
index ec30111234..e394a69437 100644
--- a/testing/ef_tests/src/cases/ssz_generic.rs
+++ b/testing/ef_tests/src/cases/ssz_generic.rs
@@ -431,7 +431,6 @@ struct ProgressiveComplexTestStruct {
 #[context_deserialize(ForkName)]
 enum CompatibleUnionA {
     #[ssz(selector = "1")]
-    #[tree_hash(selector = "1")]
     ProgressiveSingleFieldContainerTestStruct(ProgressiveSingleFieldContainerTestStruct),
 }
 
@@ -441,10 +440,8 @@ enum CompatibleUnionA {
 #[context_deserialize(ForkName)]
 enum CompatibleUnionBC {
     #[ssz(selector = "2")]
-    #[tree_hash(selector = "2")]
     ProgressiveSingleListContainerTestStruct(ProgressiveSingleListContainerTestStruct),
     #[ssz(selector = "3")]
-    #[tree_hash(selector = "3")]
     ProgressiveVarTestStruct(ProgressiveVarTestStruct),
 }
 
@@ -454,16 +451,12 @@ enum CompatibleUnionBC {
 #[context_deserialize(ForkName)]
 enum CompatibleUnionABCA {
     #[ssz(selector = "1")]
-    #[tree_hash(selector = "1")]
     A1(ProgressiveSingleFieldContainerTestStruct),
     #[ssz(selector = "2")]
-    #[tree_hash(selector = "2")]
     B1(ProgressiveSingleListContainerTestStruct),
     #[ssz(selector = "3")]
-    #[tree_hash(selector = "3")]
     C1(ProgressiveVarTestStruct),
     #[ssz(selector = "4")]
-    #[tree_hash(selector = "4")]
     A2(ProgressiveSingleFieldContainerTestStruct),
 }