Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

De/Serialize signatures (for slate consumption) to compressed format rather than raw (#2852)

Browse source 
* Serialize signatures in custom secp serializer as compact format instead of raw

* rustfmt
This commit is contained in:
Yeastplume 2019-05-28 16:48:24 +01:00 committed by GitHub
parent ee9b9fe763
commit bb793defa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
core/src/libtx/secp_ser.rs
View file

@ -55,8 +55,7 @@ pub mod pubkey_serde {
/// Serializes an Option<secp::Signature> to and from hex /// Serializes an Option<secp::Signature> to and from hex
pub mod option_sig_serde { pub mod option_sig_serde {
use crate::serde::{Deserialize, Deserializer, Serializer}; use crate::serde::{Deserialize, Deserializer, Serializer};
use crate::util::secp; use crate::util::{from_hex, secp, static_secp_instance, to_hex};
use crate::util::{from_hex, to_hex};
use serde::de::Error; use serde::de::Error;
/// ///
@ -64,8 +63,12 @@ pub mod option_sig_serde {
where where
S: Serializer, S: Serializer,
{ {
let static_secp = static_secp_instance();
let static_secp = static_secp.lock();
match sig { match sig {
Some(sig) => serializer.serialize_str(&to_hex(sig.to_raw_data().to_vec())), Some(sig) => {
serializer.serialize_str(&to_hex(sig.serialize_compact(&static_secp).to_vec()))
}
None => serializer.serialize_none(), None => serializer.serialize_none(),
} }
} }
@ -75,13 +78,15 @@ pub mod option_sig_serde {
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let static_secp = static_secp_instance();
let static_secp = static_secp.lock();
Option::<String>::deserialize(deserializer).and_then(|res| match res { Option::<String>::deserialize(deserializer).and_then(|res| match res {
Some(string) => from_hex(string.to_string()) Some(string) => from_hex(string.to_string())
.map_err(|err| Error::custom(err.to_string())) .map_err(|err| Error::custom(err.to_string()))
.and_then(|bytes: Vec<u8>| { .and_then(|bytes: Vec<u8>| {
let mut b = [0u8; 64]; let mut b = [0u8; 64];
b.copy_from_slice(&bytes[0..64]); b.copy_from_slice(&bytes[0..64]);
secp::Signature::from_raw_data(&b) secp::Signature::from_compact(&static_secp, &b)
.map(|val| Some(val)) .map(|val| Some(val))
.map_err(|err| Error::custom(err.to_string())) .map_err(|err| Error::custom(err.to_string()))
}), }),
@ -94,8 +99,7 @@ pub mod option_sig_serde {
/// Serializes a secp::Signature to and from hex /// Serializes a secp::Signature to and from hex
pub mod sig_serde { pub mod sig_serde {
use crate::serde::{Deserialize, Deserializer, Serializer}; use crate::serde::{Deserialize, Deserializer, Serializer};
use crate::util::secp; use crate::util::{from_hex, secp, static_secp_instance, to_hex};
use crate::util::{from_hex, to_hex};
use serde::de::Error; use serde::de::Error;
/// ///
@ -103,7 +107,9 @@ pub mod sig_serde {
where where
S: Serializer, S: Serializer,
{ {
serializer.serialize_str(&to_hex(sig.to_raw_data().to_vec())) let static_secp = static_secp_instance();
let static_secp = static_secp.lock();
serializer.serialize_str(&to_hex(sig.serialize_compact(&static_secp).to_vec()))
} }
/// ///
@ -111,12 +117,15 @@ pub mod sig_serde {
where where
D: Deserializer<'de>, D: Deserializer<'de>,
{ {
let static_secp = static_secp_instance();
let static_secp = static_secp.lock();
String::deserialize(deserializer) String::deserialize(deserializer)
.and_then(|string| from_hex(string).map_err(|err| Error::custom(err.to_string()))) .and_then(|string| from_hex(string).map_err(|err| Error::custom(err.to_string())))
.and_then(|bytes: Vec<u8>| { .and_then(|bytes: Vec<u8>| {
let mut b = [0u8; 64]; let mut b = [0u8; 64];
b.copy_from_slice(&bytes[0..64]); b.copy_from_slice(&bytes[0..64]);
secp::Signature::from_raw_data(&b).map_err(|err| Error::custom(err.to_string())) secp::Signature::from_compact(&static_secp, &b)
.map_err(|err| Error::custom(err.to_string()))
}) })
} }
} }