Fix clippy warnings and format README (#71)

* Fix key_gen.rs clippy warnings and format README

* Fix more clippy warnings and add .rustfmt.toml

* Fix more clippy warnings

* Improve test

* Improve test

* Shebang for demo/run.sh

* Improve demo/run.sh

* Fix readme table

* Improve sm_manager.rs

* Move demo to examples folder

* Finish fix clippy warnings

* Minor fix on keygen client

* improve keygen client

* usize t, n => u16 t, n

* Switch to Rust 2018

* aes encrypt/decrypt wrapper

* Update Readme

* Refactor examples

* Minor fix on keygen client

* Move rust-crypto and hex to dev-dep

* unify message traits in gg_2018

* 2018 bench

* fix curv & paillier dep

* temporarily disable travis cache

* fix tests

* disable travis cache due to getting stuck

* test multi sig against secp256k1

* backup examples

* update readme

* fix cclst

* default features false of rocket

* fix bench

* fix pk slice

Author: kigawas

.gitignore

@@ -11,3 +11,7 @@ Cargo.lock
 
 .idea
 .DS_Store
+
+keys*.store
+signature
+params.json

.rustfmt.toml

@@ -0,0 +1 @@
+edition = "2018"

.travis.yml

@@ -1,5 +1,5 @@
 language: rust
-cache: cargo
+cache: false
 rust:
   - nightly
 

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "multi-party-ecdsa"
 version = "0.2.4"
+edition = "2018"
 authors = [
     "Gary <[email protected]>",
     "Omer <[email protected]>"
@@ -13,7 +14,8 @@ keywords = [
     "secret-shares",
     "blockchain",
     "cryptography",
-    "cryptocurrency"]
+    "cryptocurrency"
+]
 
 homepage = "https://github.com/KZen-networks/multi-party-ecdsa"
 repository = "https://github.com/KZen-networks/multi-party-ecdsa"
@@ -23,18 +25,16 @@ categories = ["cryptography"]
 [lib]
 crate-type = ["lib"]
 
-
-[dependencies]
-paillier = { git = "https://github.com/KZen-networks/rust-paillier", tag = "v0.3.3" }
-zk-paillier = { git = "https://github.com/KZen-networks/zk-paillier", tag = "v0.2.4" }
-subtle = {version = "2", features = ["nightly"]}
-serde = "1.0"
-serde_derive = "1.0"
-zeroize = "0.10"
-
 [features]
 cclst = ["class_group"]
 
+[dependencies]
+paillier = { git = "https://github.com/KZen-networks/rust-paillier", tag = "v0.3.3"}
+zk-paillier = { git = "https://github.com/KZen-networks/zk-paillier", tag = "v0.2.4"}
+subtle = { version = "2", features = ["nightly"] }
+serde = { version = "1.0", features = ["derive"] }
+zeroize = "0.10.1"
+
 [dependencies.curv]
 git = "https://github.com/KZen-networks/curv"
 tag = "v0.2.2"
@@ -49,36 +49,44 @@ git = "https://github.com/KZen-networks/class-groups"
 tag = "v0.1.5"
 optional = true
 
-[dependencies.rocket]
-version = "0.4.2"
-default-features = false
-optional = true
-
-
+[dev-dependencies]
+criterion = "0.3"
+rust-crypto = "0.2"
+hex = "0.4"
+rocket = { version = "0.4.2", default-features = false }
+rocket_contrib = "0.4.2"
+reqwest = { version = "0.9", default-features = false }
+uuid = { version = "0.8", features = ["v4"] }
+serde_json = "1.0"
+libsecp256k1 = "0.3.2"
 
 [patch.crates-io]
 rust-gmp = { version = "0.5.0", features = ["serde_support"], git = "https://github.com/KZen-networks/rust-gmp" }
 
-[dev-dependencies]
-criterion = "0.2"
-hex = "0.3.2"
-rocket_contrib = {version = "0.4.2",default-features = false,features = ["json"]}
-rocket = {version = "0.4.2", default-features = false}
-reqwest = {version = "0.9.5", default-features = false}
-uuid = { version = "0.7", features = ["v4"] }
-rust-crypto = "^0.2"
-serde_json = "1.0"
-
 [[example]]
 name = "sm_manager"
 
+[[example]]
+name = "gg18_sign_client"
+
 [[example]]
 name = "gg18_keygen_client"
 
 [[example]]
-name = "gg18_sign_client"
+name = "common"
+crate-type = ["lib"]
 
 [[bench]]
-name = "keygen"
+name = "cclst"
 path = "benches/two_party_ecdsa/cclst_2019/keygen.rs"
 harness = false
+
+[[bench]]
+name = "gg18"
+path = "benches/multi_party_ecdsa/gg18/keygen.rs"
+harness = false
+
+[[bench]]
+name = "lindel2017"
+path = "benches/two_party_ecdsa/lindell_2017/keygen.rs"
+harness = false

README.md

@@ -1,72 +1,72 @@
+# Multi-party ECDSA
+
 [![Build Status](https://travis-ci.com/KZen-networks/multi-party-ecdsa.svg?branch=master)](https://travis-ci.com/KZen-networks/multi-party-ecdsa)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
-Multi-party ECDSA
-=====================================
-
 This project is a Rust implementation of {t,n}-threshold ECDSA (elliptic curve digital signature algorithm).
 
 Threshold ECDSA includes two protocols:
 
-* Key Generation for creating secret shares.
-* Signing for using the secret shares to generate a signature. 
+-   Key Generation for creating secret shares.
+-   Signing for using the secret shares to generate a signature.
 
-ECDSA is used extensively for crypto-currencies such as Bitcoin, Ethereum (secp256k1 curve), NEO (NIST P-256 curve) and much more. 
+ECDSA is used extensively for crypto-currencies such as Bitcoin, Ethereum (secp256k1 curve), NEO (NIST P-256 curve) and much more.
 This library can be used to create MultiSig and ThresholdSig crypto wallet.
 
-Project Status
--------
-* The library supports **2P-ECDSA** based on Lindell's crypto 2017 paper [1]. Project [Gotham-city](https://github.com/KZen-networks/gotham-city) is a proof of concept for a full two-party Bitcoin wallet that uses this library. See benchmarks and white paper there.
+## Project Status
 
-* The library supports Gennaro and Goldfeder CCS 2018 protocol [2] for **{t,n}-threshold ECDSA**. 
+-   The library supports **2P-ECDSA** based on Lindell's crypto 2017 paper [1]. Project [Gotham-city](https://github.com/KZen-networks/gotham-city) is a proof of concept for a full two-party Bitcoin wallet that uses this library. See benchmarks and white paper there.
 
-* The library supports **2P-ECDSA** based on Castagnos et. al. crypto 2019 paper [3]. To Enable build with `--features=cclst`.
+-   The library supports Gennaro and Goldfeder CCS 2018 protocol [2] for **{t,n}-threshold ECDSA**.
 
-Run Demo
--------
-The following steps are for setup, key generation with `n` parties and signing with `t+1` parties. 
+-   The library supports **2P-ECDSA** based on Castagnos et. al. crypto 2019 paper [3]. To Enable build with `--features=cclst`.
 
-**Setup** 
-1) We use shared state machine architecture (see [white city](https://github.com/KZen-networks/white-city)). The parameters `parties` and `threshold` can be configured by changing the file: `param`. a keygen will run with `parties` parties and signing will run with any subset of `threshold + 1` parties. `param` file should be located in the same path of the client softwares.
-2) Install [Rust](https://www.rust-lang.org/en-US/install.html),[Nightly Rust](https://doc.rust-lang.org/1.5.0/book/nightly-rust.html).  Run `cargo build --release --examples` ( it will build into `/target/release/examples`)
-3) Run the shared state machine: `./sm_manager`. Currently configured to be in `127.0.0.1:8001`, this can be changed in `Rocket.toml` file. The `Rocket.toml` file should be in the same folder you run `sm_manager` from. 
+## Run Demo
 
-**KeyGen**
+The following steps are for setup, key generation with `n` parties and signing with `t+1` parties.
 
-run `gg18_keygen_client` as follows: `./gg18_keygen_client http://127.0.0.1:8001 keys.store`. Replace IP and port with the ones configured in setup. Once `n` parties join the application will run till finish. At the end each party will get a local keys file `keys.store` (change filename in command line). This contain secret and public data of the party after keygen. The file therefore should remain private. 
+### Setup
 
-**Sign**
+1.  We use shared state machine architecture (see [white city](https://github.com/KZen-networks/white-city)). The parameters `parties` and `threshold` can be configured by changing the file: `param`. a keygen will run with `parties` parties and signing will run with any subset of `threshold + 1` parties. `param` file should be located in the same path of the client softwares.
 
-Run `./gg18_sign_client`. The application should be in the same folder as the `keys.store` file (or custom filename generated in keygen). the application takes three arguments: `IP:port` as in keygen, `filename` and message to be signed: `./gg18_sign_client http://127.0.0.1:8001 keys.store "KZen Networks"`. The same message should be used by all signers. Once `t+1` parties join the protocol will run and will output to screen signatue (R,s). 
+2.  Install [Rust](https://rustup.rs/). Run `cargo build --release --examples` (it will build into `/target/release/examples/`)
 
-**Full demo**
+3.  Run the shared state machine: `./sm_manager`. Currently configured to be in `127.0.0.1:8001`, this can be changed in `Rocket.toml` file. The `Rocket.toml` file should be in the same folder you run `sm_manager` from.
 
-Run `./run.sh` (located in `/demo` folder) in the same folder as the excutables (usually `/target/release/examples`). It will spawn a shared state machine, clients in the number of parties and signing requests for the `threshold + 1` first parties.
+### KeyGen
+
+run `gg18_keygen_client` as follows: `./gg18_keygen_client http://127.0.0.1:8001 keys.store`. Replace IP and port with the ones configured in setup. Once `n` parties join the application will run till finish. At the end each party will get a local keys file `keys.store` (change filename in command line). This contain secret and public data of the party after keygen. The file therefore should remain private.
+
+### Sign
 
+Run `./gg18_sign_client`. The application should be in the same folder as the `keys.store` file (or custom filename generated in keygen). the application takes three arguments: `IP:port` as in keygen, `filename` and message to be signed: `./gg18_sign_client http://127.0.0.1:8001 keys.store "KZen Networks"`. The same message should be used by all signers. Once `t+1` parties join the protocol will run and will output to screen signatue (R,s).
 
+### Full demo
 
-|![Demo](https://raw.githubusercontent.com/KZen-networks/multi-party-ecdsa/master/demo/MP-ECDSA%20demo.gif "Multiparty ECDSA Demo")|
-|:--:| 
-| *A 5 parties setup with 3 signers (threshold = 2)* |
+Run `./run.sh` (located in `/demo` folder) in the same folder as the excutables (usually `/target/release/examples`). It will spawn a shared state machine, clients in the number of parties and signing requests for the `threshold + 1` first parties.
+
+|          !["Multiparty ECDSA Demo"][demo]          |
+| :------------------------------------------------: |
+| _A 5 parties setup with 3 signers (threshold = 2)_ |
+
+[demo]: https://raw.githubusercontent.com/KZen-networks/multi-party-ecdsa/master/demo/MP-ECDSA%20demo.gif
 
+## Contributions & Development Process
 
-Contributions & Development Process
--------------------
 The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md), in addition **the [Rust utilities wiki](https://github.com/KZen-networks/rust-utils/wiki) contains information on workflow and environment set-up**.
 
-License
--------
+## License
+
 Multi-party ECDSA is released under the terms of the GPL-3.0 license. See [LICENSE](LICENSE) for more information.
 
-Contact
--------------------
-Feel free to [reach out](mailto:[email protected]) or join the KZen Research [Telegram]( https://t.me/kzen_research) for discussions on code and research.
+## Contact
+
+Feel free to [reach out](mailto:[email protected]) or join the KZen Research [Telegram](https://t.me/kzen_research) for discussions on code and research.
 
-References
--------------------
+## References
 
-[1] https://eprint.iacr.org/2017/552.pdf
+[1] <https://eprint.iacr.org/2017/552.pdf>
 
-[2] https://eprint.iacr.org/2019/114.pdf
+[2] <https://eprint.iacr.org/2019/114.pdf>
 
-[3] https://eprint.iacr.org/2019/503.pdf
+[3] <https://eprint.iacr.org/2019/503.pdf>

benches/multi_party_ecdsa/gg18/keygen.rs

@@ -1,10 +1,7 @@
-#[macro_use]
-extern crate criterion;
-extern crate curv;
-extern crate multi_party_ecdsa;
+use criterion::criterion_main;
 
 mod bench {
-    use criterion::Criterion;
+    use criterion::{criterion_group, Criterion};
     use curv::cryptographic_primitives::secret_sharing::feldman_vss::VerifiableSS;
     use curv::elliptic::curves::traits::*;
     use curv::{FE, GE};
@@ -24,37 +21,35 @@ mod bench {
         });
     }
     pub fn keygen_t_n_parties(
-        t: usize,
-        n: usize,
+        t: u16,
+        n: u16,
     ) -> (Vec<Keys>, Vec<SharedKeys>, Vec<GE>, GE, VerifiableSS) {
         let parames = Parameters {
             threshold: t,
-            share_count: n.clone(),
+            share_count: n,
         };
-        let party_keys_vec = (0..n.clone())
-            .map(|i| Keys::create(i))
-            .collect::<Vec<Keys>>();
+        let (t, n) = (t as usize, n as usize);
+        let party_keys_vec = (0..n).map(Keys::create).collect::<Vec<Keys>>();
 
         let mut bc1_vec = Vec::new();
         let mut decom_vec = Vec::new();
-        for i in 0..n.clone() {
-            let (bc1, decom1) = party_keys_vec[i].phase1_broadcast_phase3_proof_of_correct_key();
+
+        for key in &party_keys_vec {
+            let (bc1, decom1) = key.phase1_broadcast_phase3_proof_of_correct_key();
             bc1_vec.push(bc1);
             decom_vec.push(decom1);
         }
 
-        let y_vec = (0..n.clone())
-            .map(|i| decom_vec[i].y_i.clone())
-            .collect::<Vec<GE>>();
+        let y_vec = (0..n).map(|i| decom_vec[i].y_i).collect::<Vec<GE>>();
         let mut y_vec_iter = y_vec.iter();
         let head = y_vec_iter.next().unwrap();
         let tail = y_vec_iter;
         let y_sum = tail.fold(head.clone(), |acc, x| acc + x);
         let mut vss_scheme_vec = Vec::new();
         let mut secret_shares_vec = Vec::new();
         let mut index_vec = Vec::new();
-        for i in 0..n.clone() {
-            let (vss_scheme, secret_shares, index) = party_keys_vec[i]
+        for key in &party_keys_vec {
+            let (vss_scheme, secret_shares, index) = key
                 .phase1_verify_com_phase3_verify_correct_key_phase2_distribute(
                     &parames, &decom_vec, &bc1_vec,
                 )
@@ -65,50 +60,44 @@ mod bench {
         }
         let vss_scheme_for_test = vss_scheme_vec.clone();
 
-        let party_shares = (0..n.clone())
+        let party_shares = (0..n)
             .map(|i| {
-                (0..n.clone())
+                (0..n)
                     .map(|j| {
                         let vec_j = &secret_shares_vec[j];
-                        vec_j[i].clone()
+                        vec_j[i]
                     })
                     .collect::<Vec<FE>>()
             })
             .collect::<Vec<Vec<FE>>>();
 
         let mut shared_keys_vec = Vec::new();
         let mut dlog_proof_vec = Vec::new();
-        for i in 0..n.clone() {
+        for i in 0..n {
             let (shared_keys, dlog_proof) = party_keys_vec[i]
                 .phase2_verify_vss_construct_keypair_phase3_pok_dlog(
                     &parames,
                     &y_vec,
                     &party_shares[i],
                     &vss_scheme_vec,
-                    &(&index_vec[i] + 1),
+                    &index_vec[i] + 1,
                 )
                 .expect("invalid vss");
             shared_keys_vec.push(shared_keys);
             dlog_proof_vec.push(dlog_proof);
         }
 
-        let pk_vec = (0..n.clone())
-            .map(|i| dlog_proof_vec[i].pk.clone())
-            .collect::<Vec<GE>>();
+        let pk_vec = (0..n).map(|i| dlog_proof_vec[i].pk).collect::<Vec<GE>>();
 
         //both parties run:
         Keys::verify_dlog_proofs(&parames, &dlog_proof_vec, &y_vec).expect("bad dlog proof");
 
         //test
-        let xi_vec = (0..t.clone() + 1)
-            .map(|i| shared_keys_vec[i].x_i.clone())
-            .collect::<Vec<FE>>();
+        let xi_vec = (0..=t).map(|i| shared_keys_vec[i].x_i).collect::<Vec<FE>>();
         let x = vss_scheme_for_test[0]
             .clone()
-            .reconstruct(&index_vec[0..t.clone() + 1], &xi_vec);
-        let sum_u_i = party_keys_vec
-            .iter()
-            .fold(FE::zero(), |acc, x| acc + &x.u_i);
+            .reconstruct(&index_vec[0..=t], &xi_vec);
+        let sum_u_i = party_keys_vec.iter().fold(FE::zero(), |acc, x| acc + x.u_i);
         assert_eq!(x, sum_u_i);
 
         (

benches/two_party_ecdsa/cclst_2019/keygen.rs

@@ -1,14 +1,11 @@
-#[macro_use]
-extern crate criterion;
-extern crate curv;
-extern crate multi_party_ecdsa;
+use criterion::criterion_main;
 
 mod bench {
-    use criterion::Criterion;
+    use criterion::{criterion_group, Criterion};
     use curv::arithmetic::traits::Samplable;
     use curv::elliptic::curves::traits::*;
     use curv::BigInt;
-    use multi_party_ecdsa::protocols::two_party_ecdsa::cclst_2019::*;
+    use multi_party_ecdsa::protocols::two_party_ecdsa::cclst_2019::{party_one, party_two};
 
     pub fn bench_full_keygen_party_one_two(c: &mut Criterion) {
         c.bench_function("keygen", move |b| {