refactor: bump bincode to 2.0.1 (#356)

* build(deps): bump bincode to 2.0.1

* Update dash-network/Cargo.toml

Co-authored-by: Kevin Rombach <[email protected]>

* chore(dash-spv): replace bincode 1.3.3 with bincode 2.0.1

---------

Co-authored-by: Kevin Rombach <[email protected]>

Author: lklimek

dash-network/Cargo.toml

@@ -15,8 +15,8 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 
 # Optional dependencies for serialization
 serde = { version = "1.0", default-features = false, optional = true, features = ["derive", "alloc"] }
-bincode = { version = "=2.0.0-rc.3", optional = true, default-features = false }
-bincode_derive = { version= "=2.0.0-rc.3", optional = true }
+bincode = { version = "2.0.1", optional = true, default-features = false }
+bincode_derive = { version = "2.0.1", optional = true }
 
 [features]
 default = ["std"]

dash-spv/Cargo.toml

@@ -33,7 +33,7 @@ anyhow = "1.0"
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-bincode = "1.3"
+bincode = "2.0.1"
 
 # Logging
 tracing = "0.1"

dash-spv/src/chain/chainlock_manager.rs

@@ -334,7 +334,7 @@ impl ChainLockManager {
 
         // Store persistently
         let key = format!("chainlock:{}", chain_lock.block_height);
-        let data = bincode::serialize(&chain_lock)
+        let data = bincode::encode_to_vec(&chain_lock, bincode::config::standard())
             .map_err(|e| StorageError::Serialization(e.to_string()))?;
         storage.store_metadata(&key, &data).await?;
 
@@ -416,8 +416,9 @@ impl ChainLockManager {
         for height in start_height..=end_height {
             let key = format!("chainlock:{}", height);
             if let Some(data) = storage.load_metadata(&key).await? {
-                match bincode::deserialize::<ChainLock>(&data) {
-                    Ok(chain_lock) => {
+                match bincode::decode_from_slice::<ChainLock, _>(&data, bincode::config::standard())
+                {
+                    Ok((chain_lock, _)) => {
                         // Cache it
                         let entry = ChainLockEntry {
                             chain_lock: chain_lock.clone(),

dash-spv/src/storage/headers.rs

@@ -58,7 +58,8 @@ pub(super) async fn load_block_index(
     let index_path = manager.base_path.join("headers/index.dat");
 
     if let Ok(content) = tokio::fs::read(&index_path).await {
-        bincode::deserialize(&content)
+        bincode::decode_from_slice(&content, bincode::config::standard())
+            .map(|(index, _)| index)
             .map_err(|e| StorageError::ReadFailed(format!("Failed to deserialize index: {}", e)))
     } else {
         manager.block_headers.write().await.build_block_index_from_segments().await
@@ -70,7 +71,7 @@ pub(super) async fn save_index_to_disk(
     path: &Path,
     index: &HashMap<BlockHash, u32>,
 ) -> StorageResult<()> {
-    let data = bincode::serialize(index)
+    let data = bincode::encode_to_vec(index, bincode::config::standard())
         .map_err(|e| StorageError::WriteFailed(format!("Failed to serialize index: {}", e)))?;
 
     atomic_write(path, &data).await

dash-spv/src/storage/state.rs

@@ -123,12 +123,13 @@ impl DiskStorageManager {
         chain_lock: &dashcore::ChainLock,
     ) -> StorageResult<()> {
         let path = self.base_path.join("chainlocks").join(format!("chainlock_{:08}.bin", height));
-        let data = bincode::serialize(chain_lock).map_err(|e| {
-            crate::error::StorageError::WriteFailed(format!(
-                "Failed to serialize chain lock: {}",
-                e
-            ))
-        })?;
+        let data =
+            bincode::encode_to_vec(chain_lock, bincode::config::standard()).map_err(|e| {
+                crate::error::StorageError::WriteFailed(format!(
+                    "Failed to serialize chain lock: {}",
+                    e
+                ))
+            })?;
 
         atomic_write(&path, &data).await?;
         tracing::debug!("Stored chain lock at height {}", height);
@@ -144,14 +145,15 @@ impl DiskStorageManager {
         }
 
         let data = tokio::fs::read(&path).await?;
-        let chain_lock = bincode::deserialize(&data).map_err(|e| {
-            crate::error::StorageError::ReadFailed(format!(
-                "Failed to deserialize chain lock: {}",
-                e
-            ))
-        })?;
+        let chain_lock =
+            bincode::decode_from_slice(&data, bincode::config::standard()).map_err(|e| {
+                crate::error::StorageError::ReadFailed(format!(
+                    "Failed to deserialize chain lock: {}",
+                    e
+                ))
+            })?;
 
-        Ok(Some(chain_lock))
+        Ok(Some(chain_lock.0))
     }
 
     /// Get ChainLocks in a height range.
@@ -181,7 +183,9 @@ impl DiskStorageManager {
                     if height >= start_height && height <= end_height {
                         let path = entry.path();
                         let data = tokio::fs::read(&path).await?;
-                        if let Ok(chain_lock) = bincode::deserialize(&data) {
+                        if let Ok((chain_lock, _)) =
+                            bincode::decode_from_slice(&data, bincode::config::standard())
+                        {
                             chain_locks.push((height, chain_lock));
                         }
                     }

dash/Cargo.toml

@@ -61,8 +61,8 @@ bitcoinconsensus = { version = "0.20.2-0.5.0", default-features = false, optiona
 hex_lit = "0.1.1"
 anyhow = { version= "1.0" }
 hex = { version= "0.4" }
-bincode = { version= "=2.0.0-rc.3", optional = true }
-bincode_derive = { version= "=2.0.0-rc.3", optional = true }
+bincode = { version = "2.0.1", optional = true }
+bincode_derive = { version = "2.0.1", optional = true }
 blsful = { git = "https://github.com/dashpay/agora-blsful", rev = "0c34a7a488a0bd1c9a9a2196e793b303ad35c900", optional = true }
 ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
 blake3 = "1.8.1"
@@ -75,7 +75,7 @@ serde_json = "1.0.140"
 serde_test = "1.0.177"
 serde_derive = "1.0.219"
 secp256k1 = { features = [ "recovery", "rand", "hashes" ], version="0.30.0" }
-bincode = { version= "=2.0.0-rc.3" }
+bincode = { version = "2.0.1" }
 assert_matches = "1.5.0"
 dashcore = { path = ".", features = ["core-block-hash-use-x11", "message_verification", "quorum_validation", "signer"] }
 criterion = "0.5"

dash/src/address.rs

@@ -863,8 +863,8 @@ impl bincode::Encode for Address {
 }
 
 #[cfg(feature = "bincode")]
-impl bincode::Decode for Address {
-    fn decode<D: bincode::de::Decoder>(
+impl<C> bincode::Decode<C> for Address {
+    fn decode<D: bincode::de::Decoder<Context = C>>(
         decoder: &mut D,
     ) -> Result<Self, bincode::error::DecodeError> {
         use core::str::FromStr;
@@ -876,8 +876,8 @@ impl bincode::Decode for Address {
 }
 
 #[cfg(feature = "bincode")]
-impl<'de> bincode::BorrowDecode<'de> for Address {
-    fn borrow_decode<D: bincode::de::BorrowDecoder<'de>>(
+impl<'de, C> bincode::BorrowDecode<'de, C> for Address {
+    fn borrow_decode<D: bincode::de::BorrowDecoder<'de, Context = C>>(
         decoder: &mut D,
     ) -> Result<Self, bincode::error::DecodeError> {
         use core::str::FromStr;
@@ -899,8 +899,8 @@ impl bincode::Encode for AddressType {
 }
 
 #[cfg(feature = "bincode")]
-impl bincode::Decode for AddressType {
-    fn decode<D: bincode::de::Decoder>(
+impl<C> bincode::Decode<C> for AddressType {
+    fn decode<D: bincode::de::Decoder<Context = C>>(
         decoder: &mut D,
     ) -> Result<Self, bincode::error::DecodeError> {
         let val = u8::decode(decoder)?;
@@ -916,8 +916,8 @@ impl bincode::Decode for AddressType {
 }
 
 #[cfg(feature = "bincode")]
-impl<'de> bincode::BorrowDecode<'de> for AddressType {
-    fn borrow_decode<D: bincode::de::BorrowDecoder<'de>>(
+impl<'de, C> bincode::BorrowDecode<'de, C> for AddressType {
+    fn borrow_decode<D: bincode::de::BorrowDecoder<'de, Context = C>>(
         decoder: &mut D,
     ) -> Result<Self, bincode::error::DecodeError> {
         let val = u8::borrow_decode(decoder)?;

hashes/Cargo.toml

@@ -35,7 +35,7 @@ actual-schemars = { package = "schemars", version = "1.0", optional = true }
 secp256k1 = { default-features = false, features = ["hashes"], version= "0.30.0" }
 
 rs-x11-hash = { version = "0.1.8", optional = true }
-bincode = { version= "=2.0.0-rc.3", optional = true }
+bincode = { version = "2.0.1", optional = true }
 
 [dev-dependencies]
 serde_test = "1.0"

hashes/src/bincode_macros.rs

@@ -32,16 +32,16 @@ macro_rules! bincode_impl {
             }
         }
 
-        impl<$($gen: $gent),*> bincode::Decode for $t<$($gen),*> {
-            fn decode<D: bincode::de::Decoder>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
+        impl<C $(, $gen: $gent)*> bincode::Decode<C> for $t<$($gen),*> {
+            fn decode<D: bincode::de::Decoder<Context = C>>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
                 // Decode a fixed-length byte array and then reconstruct via from_byte_array
                 let bytes: [u8; $len] = <[u8; $len]>::decode(decoder)?;
                 Ok(Self::from_byte_array(bytes))
             }
         }
 
-        impl<'de, $($gen: $gent),*> bincode::BorrowDecode<'de> for $t<$($gen),*> {
-            fn borrow_decode<D: bincode::de::BorrowDecoder<'de>>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
+        impl<'de, C $(, $gen: $gent)*> bincode::BorrowDecode<'de, C> for $t<$($gen),*> {
+            fn borrow_decode<D: bincode::de::BorrowDecoder<'de, Context = C>>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
                 // Decode a borrowed reference, then use from_bytes_ref (and clone, since our type is Copy)
                 use std::convert::TryInto;
 

hashes/src/internal_macros.rs

@@ -148,8 +148,8 @@ macro_rules! hash_trait_impls {
         }
 
         #[cfg(feature = "bincode")]
-        impl<$($gen: $gent),*> bincode::Decode for Hash<$($gen),*> {
-            fn decode<D: bincode::de::Decoder>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
+        impl<C $(, $gen: $gent)*> bincode::Decode<C> for Hash<$($gen),*> {
+            fn decode<D: bincode::de::Decoder<Context = C>>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
                 use crate::Hash;
                 // Decode a fixed-length byte array and then create the Hash
                 let bytes: [u8; $bits / 8] = <[u8; $bits / 8]>::decode(decoder)?;
@@ -158,8 +158,8 @@ macro_rules! hash_trait_impls {
         }
 
         #[cfg(feature = "bincode")]
-        impl<'de, $($gen: $gent),*> bincode::BorrowDecode<'de> for Hash<$($gen),*> {
-            fn borrow_decode<D: bincode::de::BorrowDecoder<'de>>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
+        impl<'de, C $(, $gen: $gent)*> bincode::BorrowDecode<'de, C> for Hash<$($gen),*> {
+            fn borrow_decode<D: bincode::de::BorrowDecoder<'de, Context = C>>(decoder: &mut D) -> Result<Self, bincode::error::DecodeError> {
                 use std::convert::TryInto;
                 // Decode a borrowed reference to a byte slice
                 let bytes: &[u8] = bincode::BorrowDecode::borrow_decode(decoder)?;