Commit-encode for bulletproofs

.github/workflows/build.yml

@@ -17,6 +17,7 @@ jobs:
       matrix:
         feature:
           - elgamal
+          - bulletproofs
           - serde
     steps:
       - uses: actions/checkout@v2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lnpbp"
-version = "0.3.0-beta.1+1"
+version = "0.3.0-beta.1+5"
 license = "MIT"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 description = "LNP/BP Core Library implementing LNPBP specifications & standards"
@@ -64,11 +64,12 @@ lazy_static = "~1.4.0"
 # ========
 [features]
 default = []
-all = ["serde", "elgamal"]
+all = ["serde", "elgamal", "bulletproofs"]
 serde = ["serde_crate", "serde_with", "serde_with_macros", "amplify/serde",
          "bitcoin/use-serde", "bitcoin_hashes/serde", "miniscript/serde",
          "descriptor-wallet/serde"]
 elgamal = [] # Provides ElGamal encryption module from this library
+bulletproofs = ["client_side_validation/bulletproofs"]
 
 [workspace]
 members = [".", "strict_encoding", "strict_encoding/derive", "client_side_validation"]

client_side_validation/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "client_side_validation"
-version = "1.0.0-rc.2"
+version = "1.0.0-rc.2+1"
 license = "Apache-2.0"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 description = "Client-side validation library"
@@ -22,5 +22,9 @@ amplify = "3"
 amplify_derive = "2.4.3"
 strict_encoding = { version = "1.0.0-rc.3", features = [] }
 bitcoin_hashes = "0.9"
+grin_secp256k1zkp = { version = "0.7", optional = true }
 
 [features]
+default = []
+all = ["bulletproofs"]
+bulletproofs = ["grin_secp256k1zkp"]

contrib/test.sh

@@ -4,7 +4,7 @@ AS_DEPENDENCY=true
 DO_LINT=true
 
 # Library components
-FEATURES="serde elgamal"
+FEATURES="serde elgamal bulletproofs"
 
 
 # Use toolchain if explicitly specified

strict_encoding/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "strict_encoding"
-version = "1.0.0-rc.6"
+version = "1.0.0-rc.6+2"
 license = "Apache-2.0"
 authors = ["Dr. Maxim Orlovsky <[email protected]>"]
 description = "Strict encoding: deterministic binary serialization for networking & client-side validation"

strict_encoding/src/macros.rs

@@ -75,7 +75,7 @@ macro_rules! impl_enum_strict_encoding {
             }
         }
 
-        impl $crate::strict_encoding::StrictDecode for $type {
+        impl ::strict_encoding::StrictDecode for $type {
             #[inline]
             fn strict_decode<D: ::std::io::Read>(
                 d: D,

strict_encoding/src/test_helpers.rs

@@ -30,8 +30,8 @@ macro_rules! test_enum_u8_exhaustive {
         for x in 0..=core::u8::MAX {
             if !set.contains(&x) {
                 assert_eq!($enum::from_u8(x), None);
-                let decoded: Result<$enum, _> = $crate::strict_encoding::strict_deserialize(&[x]);
-                assert_eq!(decoded.unwrap_err(), $crate::strict_encoding::Error::EnumValueNotKnown(stringify!($enum).to_string(), x));
+                let decoded: Result<$enum, _> = ::strict_encoding::strict_deserialize(&[x]);
+                assert_eq!(decoded.unwrap_err(), ::strict_encoding::Error::EnumValueNotKnown(stringify!($enum).to_string(), x));
             }
         }
         let mut all = ::std::collections::BTreeSet::new();
@@ -43,8 +43,8 @@ macro_rules! test_enum_u8_exhaustive {
                 assert!(a < b);
             }
         }
-        $( assert_eq!($crate::strict_encoding::strict_serialize(&$item).unwrap(), &[$val]); )+
-        $( assert_eq!($item, $crate::strict_encoding::strict_deserialize(&[$val]).unwrap()); )+
+        $( assert_eq!(::strict_encoding::strict_serialize(&$item).unwrap(), &[$val]); )+
+        $( assert_eq!($item, ::strict_encoding::strict_deserialize(&[$val]).unwrap()); )+
     } };
 }
 
@@ -55,7 +55,7 @@ macro_rules! test_encode {
         {
             $(
                 let object = <$ty>::strict_decode(&$x[..]).unwrap();
-                test_suite(&object, &$x[..], $x.to_vec().len());
+                ::strict_encoding::test_helpers::test_suite(&object, &$x[..], $x.to_vec().len());
             )*
         }
     );
@@ -72,7 +72,7 @@ macro_rules! test_garbage_exhaustive {
                 cp[0] = byte as u8;
                 assert_eq!(
                     <$ty>::strict_decode(&cp[..]).unwrap_err(),
-                    internet2::strict_encoding::Error::EnumValueNotKnown($err.to_string(), byte)
+                    ::strict_encoding::Error::EnumValueNotKnown($err.to_string(), byte)
                 );
             }
         )+}