Merge branch 'gloas-containers' into gloas_envelope_processing_merge_containers

beacon_node/operation_pool/Cargo.toml

@@ -9,7 +9,7 @@ portable = ["beacon_chain/portable"]
 
 [dependencies]
 bitvec = { workspace = true }
-derivative = { workspace = true }
+educe = { workspace = true }
 ethereum_ssz = { workspace = true }
 ethereum_ssz_derive = { workspace = true }
 itertools = { workspace = true }

beacon_node/operation_pool/src/persistence.rs

@@ -3,7 +3,7 @@ use crate::OperationPool;
 use crate::attestation_storage::AttestationMap;
 use crate::bls_to_execution_changes::{BlsToExecutionChanges, ReceivedPreCapella};
 use crate::sync_aggregate_id::SyncAggregateId;
-use derivative::Derivative;
+use educe::Educe;
 use parking_lot::RwLock;
 use ssz::{Decode, Encode};
 use ssz_derive::{Decode, Encode};
@@ -22,10 +22,7 @@ type PersistedSyncContributions<E> = Vec<(SyncAggregateId, Vec<SyncCommitteeCont
 /// of this type (or its encoded form) for equality. Convert back to an `OperationPool` first.
 #[superstruct(
     variants(V15, V20),
-    variant_attributes(
-        derive(Derivative, PartialEq, Debug, Encode, Decode),
-        derivative(Clone),
-    ),
+    variant_attributes(derive(Educe, PartialEq, Debug, Encode, Decode), educe(Clone),),
     partial_getter_error(ty = "OpPoolError", expr = "OpPoolError::IncorrectOpPoolVariant")
 )]
 #[derive(PartialEq, Debug, Encode)]