Upgrade to bincode v2

And increase MSRV to use workspace dependency feature

Author: LLFourn

.github/workflows/test.yml

@@ -1,6 +1,5 @@
 name: Tests
 
-
 on:
   push:
     branches:
@@ -9,11 +8,10 @@ on:
 
 # Make sure CI fails on all warnings, including Clippy lints
 env:
-    RUSTFLAGS: "-Dwarnings"
-    RUSTDOCFLAGS: "-Dwarnings"
+  RUSTFLAGS: "-Dwarnings"
+  RUSTDOCFLAGS: "-Dwarnings"
 
 jobs:
-
   fmt:
     name: Rustfmt
     runs-on: ubuntu-latest
@@ -38,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.63.0
+      - uses: dtolnay/rust-toolchain@1.64.0
       - uses: Swatinem/rust-cache@v2
       - run: |
           cargo update -p proptest --precise "1.2.0"
@@ -66,9 +64,9 @@ jobs:
       - name: test-on-target
         uses: actions-rs/cargo@v1
         with:
-          use-cross:  ${{ matrix.target != 'x86_64-unknown-linux-gnu' }}
+          use-cross: ${{ matrix.target != 'x86_64-unknown-linux-gnu' }}
           command: test
-          args:  --all-features --release --target ${{ matrix.target }}
+          args: --all-features --release --target ${{ matrix.target }}
 
   # test nightly build/test
   test-nightly:
@@ -84,31 +82,29 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: [ "secp256kfun", "sigma_fun", "ecdsa_fun", "schnorr_fun" ]
+        package: ["secp256kfun", "sigma_fun", "ecdsa_fun", "schnorr_fun"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2.0.0
       - run: cargo test --release --no-default-features -p ${{ matrix.package }}
 
-
   # test with alloc feature only
   test-alloc:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package: [ "secp256kfun", "sigma_fun", "ecdsa_fun", "schnorr_fun" ]
+        package: ["secp256kfun", "sigma_fun", "ecdsa_fun", "schnorr_fun"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2.0.0
       - run: cargo test --release --no-default-features --features alloc -p ${{ matrix.package }}
 
-
   doc-build:
-     name: doc-build
-     runs-on: ubuntu-latest
-     steps:
-       - uses: actions/checkout@v4
-       - uses: dtolnay/rust-toolchain@stable
-       - run:  cargo doc --no-deps --workspace --all-features
+    name: doc-build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo doc --no-deps --workspace --all-features

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## Unreleased
+
+- Upgrade to bincode v2
+- MSRV 1.63 -> 1.64
+
 ## v0.11.0
 
 - Added `prelude` module for convenient importing

Cargo.toml

@@ -8,3 +8,6 @@ members = [
     "arithmetic_macros"
 ]
 resolver = "2"
+
+[workspace.dependencies]
+bincode = { version = "2",  default-features = false, features = ["derive"] }

ecdsa_fun/Cargo.toml

@@ -3,7 +3,7 @@ name = "ecdsa_fun"
 version = "0.11.0"
 authors = ["LLFourn <lloyd.fourn@gmail.com>"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 license = "0BSD"
 homepage = "https://github.com/LLFourn/secp256kfun/tree/master/ecdsa_fun"
 repository = "https://github.com/LLFourn/secp256kfun"
@@ -17,7 +17,7 @@ keywords = ["bitcoin", "ecdsa", "secp256k1"]
 secp256kfun = { path = "../secp256kfun", version = "0.11", default-features = false }
 sigma_fun = { path = "../sigma_fun", version = "0.8", features = ["secp256k1"], default-features = false, optional = true }
 rand_chacha = {  version = "0.3", optional = true }  # needed for adaptor signatures atm but would be nice to get rid of
-bincode = { version = "1.0", optional = true }
+bincode  = { workspace = true, optional = true }
 
 [dev-dependencies]
 rand = "0.8"
@@ -42,8 +42,8 @@ libsecp_compat_0_30 = ["secp256kfun/libsecp_compat_0_30"]
 std = ["alloc"]
 alloc = ["secp256kfun/alloc", "sigma_fun?/alloc" ]
 serde = ["secp256kfun/serde","sigma_fun?/serde"]
-adaptor = ["dep:sigma_fun", "dep:bincode", "dep:rand_chacha"]
-bincode = [ "secp256kfun/bincode", "dep:bincode" ]
+adaptor = ["dep:sigma_fun", "bincode", "dep:rand_chacha"]
+bincode = [ "secp256kfun/bincode", "dep:bincode", "sigma_fun?/bincode" ]
 proptest = ["secp256kfun/proptest"]
 
 

ecdsa_fun/src/adaptor/encrypted_signature.rs

@@ -29,7 +29,7 @@ secp256kfun::impl_display_debug_serialize! {
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, bincode::Encode, bincode::Decode)]
 #[cfg_attr(
     feature = "serde",
     derive(crate::fun::serde::Deserialize, crate::fun::serde::Serialize),
@@ -52,20 +52,19 @@ pub(crate) struct EncryptedSignatureInternal {
 #[derive(Clone, PartialEq)]
 pub struct EncryptedSignature(pub(crate) EncryptedSignatureInternal);
 
-#[cfg(feature = "serde")]
 secp256kfun::impl_display_debug_serialize! {
     fn to_bytes(es: &EncryptedSignature) -> [u8;162] {
         let mut bytes = [0u8;162];
-        bytes.copy_from_slice(bincode::serialize(&es.0).unwrap().as_slice());
+        let size = bincode::encode_into_slice(&es.0, &mut bytes[..], bincode::config::legacy()).expect("infallible");
+        assert_eq!(size, 162);
         bytes
     }
 }
 
-#[cfg(feature = "serde")]
 secp256kfun::impl_fromstr_deserialize! {
     name => "ECDSA adaptor signature",
     fn from_bytes(bytes: [u8;162]) -> Option<EncryptedSignature> {
-        bincode::deserialize(&bytes[..]).ok().map(EncryptedSignature)
+        bincode::decode_from_slice(&bytes[..], bincode::config::legacy()).ok().map(|(v,_)| EncryptedSignature(v))
     }
 }
 
@@ -104,10 +103,18 @@ mod test {
             &encryption_key,
             b"hello world you are beautiful!!!",
         );
-        let serialized = bincode::serialize(&encrypted_signature).unwrap();
+        let serialized = bincode::encode_to_vec(
+            bincode::serde::Compat(&encrypted_signature),
+            bincode::config::standard(),
+        )
+        .unwrap();
         assert_eq!(serialized.len(), 33 + 33 + 32 + 64);
-        let deseriazed = bincode::deserialize::<EncryptedSignature>(&serialized[..]).unwrap();
+        let (deseriazed, _) = bincode::decode_from_slice::<
+            bincode::serde::Compat<EncryptedSignature>,
+            _,
+        >(&serialized[..], bincode::config::standard())
+        .unwrap();
 
-        assert_eq!(deseriazed, encrypted_signature);
+        assert_eq!(deseriazed.0, encrypted_signature);
     }
 }

ecdsa_fun/tests/adaptor_test_vectors.rs

@@ -46,7 +46,7 @@ struct Serialization {
 }
 
 #[test]
-fn run_test_vectors() {
+fn run_ecdsa_adaptor_test_vectors() {
     let ecdsa_adaptor = Adaptor::<HashTranscript<Sha256>, _>::verify_only();
     let test_vectors = serde_json::from_str::<Vec<TestVector>>(DLC_SPEC_JSON).unwrap();
     for t in test_vectors {

rustfmt.toml

@@ -1,4 +1,4 @@
-edition = "2021"
+edition = "2024"
 condense_wildcard_suffixes = true
 format_macro_matchers = true
 imports_granularity="Crate"

schnorr_fun/Cargo.toml

@@ -4,7 +4,7 @@ name = "schnorr_fun"
 version = "0.11.0"
 authors = ["LLFourn <lloyd.fourn@gmail.com>"]
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.64"
 license = "0BSD"
 homepage = "https://github.com/LLFourn/secp256kfun/tree/master/schnorr_fun"
 repository = "https://github.com/LLFourn/secp256kfun"
@@ -16,12 +16,12 @@ keywords = ["bitcoin", "schnorr"]
 [dependencies]
 secp256kfun = { path = "../secp256kfun", version = "0.11",  default-features = false }
 bech32 = { version = "0.11", optional = true, default-features = false, features = ["alloc"] }
+bincode = { workspace =  true, optional = true }
 
 [dev-dependencies]
 secp256kfun = { path = "../secp256kfun", version = "0.11",  features = ["proptest", "bincode", "alloc"] }
 rand = { version = "0.8" }
 lazy_static = "1.4"
-bincode = "1.0"
 sha2 = "0.10"
 serde_json = "1"
 rand_chacha = { version = "0.3" }
@@ -40,7 +40,7 @@ required-features = ["libsecp_compat"]
 default = ["std"]
 alloc = ["secp256kfun/alloc" ]
 std = ["alloc", "secp256kfun/std"]
-bincode = ["secp256kfun/bincode"]
+bincode = [ "dep:bincode", "secp256kfun/bincode"]
 serde = ["secp256kfun/serde"]
 libsecp_compat = ["libsecp_compat_0_30", "secp256kfun/libsecp_compat"]
 libsecp_compat_0_27 = ["secp256kfun/libsecp_compat_0_27"]

schnorr_fun/src/adaptor/encrypted_signature.rs

@@ -10,11 +10,7 @@ use secp256kfun::{marker::*, Point, Scalar};
     derive(crate::fun::serde::Deserialize, crate::fun::serde::Serialize),
     serde(crate = "crate::fun::serde")
 )]
-#[cfg_attr(
-    feature = "bincode",
-    derive(crate::fun::bincode::Encode, crate::fun::bincode::Decode),
-    bincode(crate = "crate::fun::bincode")
-)]
+#[cfg_attr(feature = "bincode", derive(bincode::Encode, bincode::Decode))]
 #[cfg_attr(docsrs, doc(cfg(feature = "serde")))]
 pub struct EncryptedSignature<S = Public> {
     /// The `R` point in the signature
@@ -56,9 +52,18 @@ mod test {
             &encryption_key,
             Message::<Public>::plain("test", b"foo"),
         );
-        let serialized = bincode::serialize(&encrypted_signature).unwrap();
+        let serialized = bincode::encode_to_vec(
+            bincode::serde::Compat(&encrypted_signature),
+            bincode::config::standard(),
+        )
+        .unwrap();
         assert_eq!(serialized.len(), 65);
-        let deserialized = bincode::deserialize::<EncryptedSignature>(&serialized).unwrap();
-        assert_eq!(encrypted_signature, deserialized);
+        let deserialized = bincode::decode_from_slice::<
+            bincode::serde::Compat<EncryptedSignature>,
+            _,
+        >(&serialized, bincode::config::standard())
+        .unwrap()
+        .0;
+        assert_eq!(encrypted_signature, deserialized.0);
     }
 }

schnorr_fun/src/adaptor/mod.rs

@@ -191,7 +191,6 @@ where
         g!(decryption_key * G).normalize()
     }
 
-    #[must_use]
     fn verify_encrypted_signature(
         &self,
         verification_key: &Point<EvenY, impl Secrecy>,