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

Improve code quality in gg18 examples #162

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+660 −557
Open

Improve code quality in gg18 examples #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d3c6fb
Implement a client and move duplicate codes into functions
HRezaei Jan 21, 2022
4bc7c62
Break down the gg18 sign rounds into separate functions
HRezaei Jan 24, 2022
b9a41dc
Refactor gg18 key generation example to be more readable
HRezaei Jan 24, 2022
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
6 changes: 5 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ hex = "0.4"
tokio = { version = "1", default-features = false, features = ["macros"] }
futures = "0.3"
rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] }
reqwest = { version = "0.9", default-features = false }
reqwest = { version = "0.10.1", default-features = false, features = ["native-tls", "json", "blocking"] }
uuid = { version = "0.8", features = ["v4"] }
serde_json = "1.0"
rand = "0.8"
Expand All @@ -84,6 +84,10 @@ name = "gg18_keygen_client"
name = "common"
crate-type = ["lib"]

[[example]]
name = "party_client"
crate-type = ["lib"]

[[bench]]
name = "cclst_keygen"
path = "benches/two_party_ecdsa/cclst_2019/keygen.rs"
Expand Down
119 changes: 3 additions & 116 deletions examples/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#![allow(dead_code)]

use std::{env, thread, time, time::Duration};

use aes_gcm::aead::{Aead, NewAead};
use aes_gcm::{Aes256Gcm, Nonce};
use rand::{rngs::OsRng, RngCore};
Expand All @@ -12,7 +10,6 @@ use curv::{
BigInt,
};

use reqwest::Client;
use serde::{Deserialize, Serialize};

pub type Key = String;
Expand Down Expand Up @@ -43,7 +40,7 @@ pub struct Entry {
pub value: String,
}

#[derive(Serialize, Deserialize)]
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Params {
pub parties: String,
pub threshold: String,
Expand Down Expand Up @@ -78,124 +75,14 @@ pub fn aes_decrypt(key: &[u8], aead_pack: AEAD) -> Vec<u8> {
out.unwrap()
}

pub fn postb<T>(client: &Client, path: &str, body: T) -> Option<String>
where
T: serde::ser::Serialize,
{
let addr = env::args()
.nth(1)
.unwrap_or_else(|| "http://127.0.0.1:8001".to_string());
let retries = 3;
let retry_delay = time::Duration::from_millis(250);
for _i in 1..retries {
let res = client
.post(&format!("{}/{}", addr, path))
.json(&body)
.send();

if let Ok(mut res) = res {
return Some(res.text().unwrap());
}
thread::sleep(retry_delay);
}
None
}

pub fn broadcast(
client: &Client,
party_num: u16,
round: &str,
data: String,
sender_uuid: String,
) -> Result<(), ()> {
let key = format!("{}-{}-{}", party_num, round, sender_uuid);
let entry = Entry { key, value: data };

let res_body = postb(client, "set", entry).unwrap();
serde_json::from_str(&res_body).unwrap()
}

pub fn sendp2p(
client: &Client,
party_from: u16,
party_to: u16,
round: &str,
data: String,
sender_uuid: String,
) -> Result<(), ()> {
let key = format!("{}-{}-{}-{}", party_from, party_to, round, sender_uuid);

let entry = Entry { key, value: data };

let res_body = postb(client, "set", entry).unwrap();
serde_json::from_str(&res_body).unwrap()
}

pub fn poll_for_broadcasts(
client: &Client,
party_num: u16,
n: u16,
delay: Duration,
round: &str,
sender_uuid: String,
) -> Vec<String> {
let mut ans_vec = Vec::new();
for i in 1..=n {
if i != party_num {
let key = format!("{}-{}-{}", i, round, sender_uuid);
let index = Index { key };
loop {
// add delay to allow the server to process request:
thread::sleep(delay);
let res_body = postb(client, "get", index.clone()).unwrap();
let answer: Result<Entry, ()> = serde_json::from_str(&res_body).unwrap();
if let Ok(answer) = answer {
ans_vec.push(answer.value);
println!("[{:?}] party {:?} => party {:?}", round, i, party_num);
break;
}
}
}
}
ans_vec
}

pub fn poll_for_p2p(
client: &Client,
party_num: u16,
n: u16,
delay: Duration,
round: &str,
sender_uuid: String,
) -> Vec<String> {
let mut ans_vec = Vec::new();
for i in 1..=n {
if i != party_num {
let key = format!("{}-{}-{}-{}", i, party_num, round, sender_uuid);
let index = Index { key };
loop {
// add delay to allow the server to process request:
thread::sleep(delay);
let res_body = postb(client, "get", index.clone()).unwrap();
let answer: Result<Entry, ()> = serde_json::from_str(&res_body).unwrap();
if let Ok(answer) = answer {
ans_vec.push(answer.value);
println!("[{:?}] party {:?} => party {:?}", round, i, party_num);
break;
}
}
}
}
ans_vec
}

#[allow(dead_code)]
pub fn check_sig(
r: &Scalar<Secp256k1>,
s: &Scalar<Secp256k1>,
msg: &BigInt,
pk: &Point<Secp256k1>,
) {
)
{
use secp256k1::{verify, Message, PublicKey, PublicKeyFormat, Signature};

let raw_msg = BigInt::to_bytes(msg);
Expand Down
Loading