zecfoundation
/
libbolt
mirror of https://github.com/ZcashFoundation/libbolt.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into nizk

This commit is contained in:
Gijs Van Laer 2019-07-08 16:54:35 -04:00
parent 4c5a764a23 7c91bdcf58
commit eb5827a4d7
2 changed files with 3 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib.rs
View File

@ -341,7 +341,7 @@ fn convert_int_to_fr(value: i32) -> Fr {
#[derive(Clone, Serialize, Deserialize)]
pub struct RefundMessage {
pub msgtype: String, // purpose type of message
#[serde(deserialize_with = "serialization_wrappers::deserialize_public_key")]
//#[serde(deserialize_with = "serialization_wrappers::deserialize_public_key")]
pub wpk: secp256k1::PublicKey,
pub balance: usize, // the balance
#[serde(serialize_with = "serialization_wrappers::serialize_generic_encodable_option", deserialize_with = "serialization_wrappers::deserialize_optional_fr")]
@ -391,7 +391,7 @@ impl RefundMessage {
#[derive(Clone, Serialize, Deserialize)]
pub struct RevokedMessage {
pub msgtype: String,
#[serde(deserialize_with = "serialization_wrappers::deserialize_public_key")]
//#[serde(deserialize_with = "serialization_wrappers::deserialize_public_key")]
pub wpk: secp256k1::PublicKey,
#[serde(serialize_with = "serialization_wrappers::serialize_fixed_byte_array_option", deserialize_with = "serialization_wrappers::deserialize_optional_fixed_64_byte_array")]
pub sig: Option<[u8; 64]> // represents revocation token serialized compact bytes
@ -688,9 +688,7 @@ pub mod bidirectional {
sk: clsigs::SecretKeyD, // the secret key for the signature scheme (Is it possible to make this a generic field?)
#[serde(serialize_with = "serialization_wrappers::serialize_generic_encodable", deserialize_with = "serialization_wrappers::deserialize_fr")]
cid: Fr, // channel Id
#[serde(deserialize_with = "serialization_wrappers::deserialize_public_key")]
wpk: secp256k1::PublicKey, // signature verification key
#[serde(deserialize_with = "serialization_wrappers::deserialize_secret_key")]
wsk: secp256k1::SecretKey, // signature signing key
#[serde(serialize_with = "serialization_wrappers::serialize_generic_encodable", deserialize_with = "serialization_wrappers::deserialize_fr")]
h_wpk: Fr,
@ -729,7 +727,6 @@ pub mod bidirectional {
// part of channel state
#[derive(Clone, Serialize, Deserialize)]
pub struct PubKeyMap {
#[serde(deserialize_with = "serialization_wrappers::deserialize_public_key")]
wpk: secp256k1::PublicKey,
revoke_token: Option<secp256k1::Signature>
}
@ -821,7 +818,6 @@ pub mod bidirectional {
proof3: ProofVB, // range proof that balance - balance_inc is between (0, val_max)
#[serde(serialize_with = "serialization_wrappers::serialize_generic_encodable", deserialize_with = "serialization_wrappers::deserialize_g_two")]
old_com_base: G2,
#[serde(deserialize_with = "serialization_wrappers::deserialize_public_key")]
wpk: secp256k1::PublicKey, // verification key for old wallet
wallet_sig: clsigs::SignatureD, // blinded signature for old wallet
pub bal_proof: BalanceProof
@ -830,7 +826,7 @@ pub mod bidirectional {
#[derive(Serialize, Deserialize)]
pub struct RevokeToken {
message: RevokedMessage,
#[serde(deserialize_with = "serialization_wrappers::deserialize_secp_signature")]
//#[serde(deserialize_with = "serialization_wrappers::deserialize_secp_signature")]
pub signature: secp256k1::Signature
}

107
src/serialization_wrappers.rs
View File

@ -562,110 +562,3 @@ where
Ok(a.unwrap())
}
// -------------
// These are hot fixes because secp256k1's implemenetation seems to be very very broken
// TODO THIS NEED TO BE FIXED UPSTREAM !!!
struct SignatureVisitor;
impl<'de> Visitor<'de> for SignatureVisitor {
type Value = secp256k1::Signature;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("Sequence of usize for a BulletproofGens")
}
fn visit_seq<A: SeqAccess<'de>>(self, mut seq: A) -> Result<Self::Value, A::Error> {
let mut bytes = Vec::new();
loop {
let tmp = seq.next_element::<u8>();
if let Ok(Some(b)) = tmp {
bytes.push(b)
} else {
break;
}
}
Ok(secp256k1::Signature::from_der(bytes.as_slice()).unwrap())
}
}
pub fn deserialize_secp_signature<'de, D>(deserializer: D) -> Result<secp256k1::Signature, D::Error>
where
D: Deserializer<'de>
{
let a = deserializer.deserialize_seq(SignatureVisitor);
Ok(a.unwrap())
}
struct PublicKeyVisitor;
impl<'de> Visitor<'de> for PublicKeyVisitor {
type Value = secp256k1::PublicKey;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("Sequence of usize for a BulletproofGens")
}
fn visit_seq<A: SeqAccess<'de>>(self, mut seq: A) -> Result<Self::Value, A::Error> {
let mut bytes = Vec::new();
loop {
let tmp = seq.next_element::<u8>();
if let Ok(Some(b)) = tmp {
bytes.push(b)
} else {
break;
}
}
Ok(secp256k1::PublicKey::from_slice(bytes.as_slice()).unwrap())
}
}
pub fn deserialize_public_key<'de, D>(deserializer: D) -> Result<secp256k1::PublicKey, D::Error>
where
D: Deserializer<'de>
{
let a = deserializer.deserialize_seq(PublicKeyVisitor);
Ok(a.unwrap())
}
struct SecretKeyVisitor;
impl<'de> Visitor<'de> for SecretKeyVisitor {
type Value = secp256k1::SecretKey;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("Sequence of usize for a BulletproofGens")
}
fn visit_seq<A: SeqAccess<'de>>(self, mut seq: A) -> Result<Self::Value, A::Error> {
let mut bytes = Vec::new();
loop {
let tmp = seq.next_element::<u8>();
if let Ok(Some(b)) = tmp {
bytes.push(b)
} else {
break;
}
}
Ok(secp256k1::SecretKey::from_slice(bytes.as_slice()).unwrap())
}
}
pub fn deserialize_secret_key<'de, D>(deserializer: D) -> Result<secp256k1::SecretKey, D::Error>
where
D: Deserializer<'de>
{
let a = deserializer.deserialize_seq(SecretKeyVisitor);
Ok(a.unwrap())
}