chore(deps): bincode 2.0 (#2297)

* mv bincode to workspace toml

* bump bincode to 2.0

Author: yash-atreya

Cargo.toml

@@ -141,6 +141,9 @@ serde = { version = "1.0", default-features = false, features = [
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_with = { version = "3", default-features = false, features = ["macros"] }
 
+# bincode
+bincode = "2.0"
+
 # misc
 auto_impl = "1.2"
 base64 = "0.22"

crates/consensus/Cargo.toml

@@ -60,7 +60,7 @@ alloy-eips = { workspace = true, features = ["arbitrary"] }
 alloy-primitives = { workspace = true, features = ["arbitrary", "rand"] }
 
 arbitrary = { workspace = true, features = ["derive"] }
-bincode = "1.3"
+bincode = { workspace = true, features = ["serde"] }
 k256.workspace = true
 rand.workspace = true
 serde_json.workspace = true

crates/consensus/src/block/header.rs

@@ -1029,13 +1029,13 @@ pub(crate) mod serde_bincode_compat {
 
     #[cfg(test)]
     mod tests {
+        use super::super::{serde_bincode_compat, Header};
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
 
-        use super::super::{serde_bincode_compat, Header};
-
         #[test]
         fn test_header_bincode_roundtrip() {
             #[serde_as]
@@ -1051,8 +1051,9 @@ pub(crate) mod serde_bincode_compat {
                 header: Header::arbitrary(&mut arbitrary::Unstructured::new(&bytes)).unwrap(),
             };
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/receipt/envelope.rs

@@ -384,6 +384,7 @@ pub(crate) mod serde_bincode_compat {
         use super::super::{serde_bincode_compat, ReceiptEnvelope};
         use alloy_primitives::Log;
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
@@ -407,8 +408,9 @@ pub(crate) mod serde_bincode_compat {
             // ensure we have proper roundtrip data
             data.transaction.as_receipt_with_bloom_mut().unwrap().receipt.status = true.into();
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/receipt/receipts.rs

@@ -456,6 +456,7 @@ pub(crate) mod serde_bincode_compat {
         use super::super::{serde_bincode_compat, Receipt};
         use alloy_primitives::Log;
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{de::DeserializeOwned, Deserialize, Serialize};
         use serde_with::serde_as;
@@ -477,8 +478,10 @@ pub(crate) mod serde_bincode_compat {
             // ensure we don't have an invalid poststate variant
             data.receipt.status = data.receipt.status.coerce_status().into();
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data<Log> = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data<Log>, _>(&encoded, config::legacy())
+                    .unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/transaction/eip1559.rs

@@ -382,6 +382,7 @@ pub(super) mod serde_bincode_compat {
     #[cfg(test)]
     mod tests {
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
@@ -404,8 +405,9 @@ pub(super) mod serde_bincode_compat {
                     .unwrap(),
             };
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/transaction/eip2930.rs

@@ -397,6 +397,7 @@ pub(super) mod serde_bincode_compat {
     #[cfg(test)]
     mod tests {
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
@@ -419,8 +420,9 @@ pub(super) mod serde_bincode_compat {
                     .unwrap(),
             };
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/transaction/eip7702.rs

@@ -379,6 +379,7 @@ pub(super) mod serde_bincode_compat {
     #[cfg(test)]
     mod tests {
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
@@ -401,8 +402,9 @@ pub(super) mod serde_bincode_compat {
                     .unwrap(),
             };
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/transaction/envelope.rs

@@ -1189,6 +1189,7 @@ pub mod serde_bincode_compat {
         use super::super::{serde_bincode_compat, EthereumTxEnvelope};
         use crate::TxEip4844;
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
@@ -1211,8 +1212,9 @@ pub mod serde_bincode_compat {
                 .unwrap(),
             };
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/transaction/legacy.rs

@@ -613,6 +613,7 @@ pub(super) mod serde_bincode_compat {
     #[cfg(test)]
     mod tests {
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
@@ -635,8 +636,9 @@ pub(super) mod serde_bincode_compat {
                     .unwrap(),
             };
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }

crates/consensus/src/transaction/typed.rs

@@ -686,6 +686,7 @@ pub(crate) mod serde_bincode_compat {
         use super::super::{serde_bincode_compat, EthereumTypedTransaction};
         use crate::TxEip4844;
         use arbitrary::Arbitrary;
+        use bincode::config;
         use rand::Rng;
         use serde::{Deserialize, Serialize};
         use serde_with::serde_as;
@@ -708,8 +709,9 @@ pub(crate) mod serde_bincode_compat {
                 .unwrap(),
             };
 
-            let encoded = bincode::serialize(&data).unwrap();
-            let decoded: Data = bincode::deserialize(&encoded).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, config::legacy()).unwrap();
             assert_eq!(decoded, data);
         }
     }