Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(serde): add alias v for yParity #801

Merged
merged 4 commits into from
Nov 1, 2024
Merged

fix(serde): add alias v for yParity #801

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e127567
add alias for yParity
klkvr Nov 1, 2024
58e6de0
fix
klkvr Nov 1, 2024
a661fd2
fix
klkvr Nov 1, 2024
7ff1dbd
always serialize v
klkvr Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions crates/primitives/src/signature/primitive_sig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,9 @@ mod signature_serde {
r: U256,
s: U256,
#[serde(rename = "yParity")]
y_parity: U64,
y_parity: Option<U64>,
#[serde(default, skip_serializing_if = "Option::is_none")]
v: Option<U64>,
}

#[derive(Serialize, Deserialize)]
Expand All @@ -355,7 +357,8 @@ mod signature_serde {
// if the serializer is human readable, serialize as a map, otherwise as a tuple
if serializer.is_human_readable() {
HumanReadableRepr {
y_parity: U64::from(self.y_parity as u64),
y_parity: Some(U64::from(self.y_parity as u64)),
v: Some(U64::from(self.y_parity as u64)),
r: self.r,
s: self.s,
}
Expand All @@ -373,7 +376,10 @@ mod signature_serde {
D: Deserializer<'de>,
{
let (y_parity, r, s) = if deserializer.is_human_readable() {
let HumanReadableRepr { y_parity, r, s } = <_>::deserialize(deserializer)?;
let HumanReadableRepr { y_parity, v, r, s } = <_>::deserialize(deserializer)?;
let y_parity = y_parity
.or(v)
.ok_or_else(|| serde::de::Error::custom("missing `yParity` or `v`"))?;
(y_parity, r, s)
} else {
let NonHumanReadableRepr((r, s, y_parity)) = <_>::deserialize(deserializer)?;
Expand Down Expand Up @@ -473,7 +479,7 @@ mod tests {
let serialized = serde_json::to_string(&signature).unwrap();
assert_eq!(
serialized,
r#"{"r":"0xc569c92f176a3be1a6352dd5005bfc751dcb32f57623dd2a23693e64bf4447b0","s":"0x1a891b566d369e79b7a66eecab1e008831e22daa15f91a0a0cf4f9f28f47ee05","yParity":"0x1"}"#
r#"{"r":"0xc569c92f176a3be1a6352dd5005bfc751dcb32f57623dd2a23693e64bf4447b0","s":"0x1a891b566d369e79b7a66eecab1e008831e22daa15f91a0a0cf4f9f28f47ee05","yParity":"0x1","v":"0x1"}"#
);
}

Expand All @@ -489,7 +495,7 @@ mod tests {
true,
);

let expected = r#"{"r":"0xc569c92f176a3be1a6352dd5005bfc751dcb32f57623dd2a23693e64bf4447b0","s":"0x1a891b566d369e79b7a66eecab1e008831e22daa15f91a0a0cf4f9f28f47ee05","yParity":"0x1"}"#;
let expected = r#"{"r":"0xc569c92f176a3be1a6352dd5005bfc751dcb32f57623dd2a23693e64bf4447b0","s":"0x1a891b566d369e79b7a66eecab1e008831e22daa15f91a0a0cf4f9f28f47ee05","yParity":"0x1","v":"0x1"}"#;

let serialized = serde_json::to_string(&signature).unwrap();
assert_eq!(serialized, expected);
Expand Down