Skip to content

feat(wasm-mps): use bincode 2 for serialization #304

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

Open
johnoliverdriscoll wants to merge 1 commit into
base: master
Choose a base branch
from
+99 −31
Open

feat(wasm-mps): use bincode 2 for serialization #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions packages/wasm-mps/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/wasm-mps/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ crate-type = ["cdylib"]
all = "warn"

[dependencies]
bincode = "1.3"
bincode = { version = "2.0.1", features = ["serde"] }
crypto_box = "0.9"
getrandom = { version = "0.2", features = ["js"] }
js-sys = "0.3"
Expand Down
101 changes: 73 additions & 28 deletions packages/wasm-mps/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,10 @@ mod mps {
};

Ok(MsgState {
msg: bincode::serialize(&msg1).map_err(|_| MpsError::SerializationError)?,
state: bincode::serialize(&state).map_err(|_| MpsError::SerializationError)?,
msg: bincode::serde::encode_to_vec(msg1, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
state: bincode::serde::encode_to_vec(&state, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
})
}

Expand Down Expand Up @@ -227,13 +229,23 @@ mod mps {
{
// Parse state
let state: DkgStateR1<G> =
bincode::deserialize(state).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(state, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;

// Parse messages
let i0_msg1: KeygenMsg1 = bincode::deserialize(round1_messages[0].as_slice())
.map_err(|_| MpsError::DeserializationError)?;
let i1_msg1: KeygenMsg1 = bincode::deserialize(round1_messages[1].as_slice())
.map_err(|_| MpsError::DeserializationError)?;
let i0_msg1: KeygenMsg1 = bincode::serde::decode_from_slice(
round1_messages[0].as_slice(),
bincode::config::standard(),
)
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;
let i1_msg1: KeygenMsg1 = bincode::serde::decode_from_slice(
round1_messages[1].as_slice(),
bincode::config::standard(),
)
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;
let msgs = vec![i0_msg1, i1_msg1, state.msg];

// Process all round0 messages together
Expand All @@ -249,8 +261,10 @@ mod mps {
};

Ok(MsgState {
msg: bincode::serialize(&msg2).map_err(|_| MpsError::SerializationError)?,
state: bincode::serialize(&state).map_err(|_| MpsError::SerializationError)?,
msg: bincode::serde::encode_to_vec(&msg2, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
state: bincode::serde::encode_to_vec(&state, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
})
}

Expand Down Expand Up @@ -280,14 +294,24 @@ mod mps {
G::Scalar: ScalarReduce<[u8; 32]> + Serializable,
{
// Deserialize round2 messages from other parties
let i0_msg2: KeygenMsg2<G> = bincode::deserialize(round2_messages[0].as_slice())
.map_err(|_| MpsError::DeserializationError)?;
let i1_msg2: KeygenMsg2<G> = bincode::deserialize(round2_messages[1].as_slice())
.map_err(|_| MpsError::DeserializationError)?;
let i0_msg2: KeygenMsg2<G> = bincode::serde::decode_from_slice(
round2_messages[0].as_slice(),
bincode::config::standard(),
)
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;
let i1_msg2: KeygenMsg2<G> = bincode::serde::decode_from_slice(
round2_messages[1].as_slice(),
bincode::config::standard(),
)
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;

// Deserialize state
let state: DkgStateR2<G> =
bincode::deserialize(state).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(state, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;

// Generate share
let share = state
Expand All @@ -310,7 +334,8 @@ mod mps {
let state = rem_prefix("mps-ed25519-dkg-round2-state$", &state.to_vec())?;
let share = internal_dkg_round2_process::<EdwardsPoint>(&[i0_msg2, i1_msg2], &state)?;
Ok(Share {
share: bincode::serialize(&share).map_err(|_| MpsError::SerializationError)?,
share: bincode::serde::encode_to_vec(&share, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
pk: share.public_key.compress().to_bytes(),
chaincode: share.root_chain_code,
})
Expand All @@ -331,8 +356,10 @@ mod mps {
};

Ok(MsgState {
msg: bincode::serialize(&msg1).map_err(|_| MpsError::SerializationError)?,
state: bincode::serialize(&state).map_err(|_| MpsError::SerializationError)?,
msg: bincode::serde::encode_to_vec(&msg1, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
state: bincode::serde::encode_to_vec(&state, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
})
}

Expand All @@ -347,7 +374,9 @@ mod mps {
) -> Result<MsgState, MpsError> {
// Deserialize share
let keyshare: Keyshare<EdwardsPoint> =
bincode::deserialize(share).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(share, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;

// Create signer party
let p0 = SignerParty::<DsgR0, EdwardsPoint>::new_with_format::<_, Bip32Public>(
Expand Down Expand Up @@ -377,11 +406,15 @@ mod mps {
{
// Parse state
let state: DsgStateR1<G> =
bincode::deserialize(state).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(state, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;

// Parse messages
let i0_msg1: SignMsg1 =
bincode::deserialize(round1_message).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(round1_message, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;
let msgs = vec![i0_msg1, state.msg];

// Process all round1 messages together
Expand All @@ -397,8 +430,10 @@ mod mps {
};

Ok(MsgState {
msg: bincode::serialize(&msg2).map_err(|_| MpsError::SerializationError)?,
state: bincode::serialize(&state).map_err(|_| MpsError::SerializationError)?,
msg: bincode::serde::encode_to_vec(&msg2, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
state: bincode::serde::encode_to_vec(&state, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
})
}

Expand Down Expand Up @@ -436,11 +471,15 @@ mod mps {

// Parse state
let state: DsgStateR2<EdwardsPoint> =
bincode::deserialize(&state).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(&state, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;

// Parse messages
let i0_msg2: SignMsg2<EdwardsPoint> =
bincode::deserialize(&round2_message).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(&round2_message, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;
let msgs = vec![i0_msg2, state.msg];

// Process all round2 messages together
Expand All @@ -461,11 +500,13 @@ mod mps {
Ok(MsgState {
msg: add_prefix(
"mps-ed25519-dsg-round3-message$",
&bincode::serialize(&msg3).map_err(|_| MpsError::SerializationError)?,
&bincode::serde::encode_to_vec(&msg3, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
),
state: add_prefix(
"mps-ed25519-dsg-round3-state$",
&bincode::serialize(&state).map_err(|_| MpsError::SerializationError)?,
&bincode::serde::encode_to_vec(&state, bincode::config::standard())
.map_err(|_| MpsError::SerializationError)?,
),
})
}
Expand All @@ -484,11 +525,15 @@ mod mps {

// Parse state
let state: DsgStateR3<EdwardsPoint> =
bincode::deserialize(&state).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(&state, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;

// Parse messages
let i0_msg3: SignMsg3<EdwardsPoint> =
bincode::deserialize(&round3_message).map_err(|_| MpsError::DeserializationError)?;
bincode::serde::decode_from_slice(&round3_message, bincode::config::standard())
.map(|(v, _)| v)
.map_err(|_| MpsError::DeserializationError)?;
let msgs = vec![i0_msg3, state.msg];

// Process all round2 messages together
Expand Down
Loading