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.

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

Chore(deps): bump webpki from 0.22.0 to 0.22.2 #121

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
name: Install rustup
command: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
- run:
name: Install Rust 1.64
command: rustup install 1.64.0 && rustup default 1.64.0
name: Install Rust 1.73
command: rustup install 1.73.0 && rustup default 1.73.0
- run:
name: Install iOS targets
command: rustup target add aarch64-apple-ios x86_64-apple-ios
Expand All @@ -37,7 +37,7 @@ jobs:

test:
docker:
- image: cimg/rust:1.64.0
- image: cimg/rust:1.73.0
resource_class: large
steps:
- checkout
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:

wasm:
docker:
- image: cimg/rust:1.64.0
- image: cimg/rust:1.73.0
steps:
- checkout
- run:
Expand All @@ -78,7 +78,7 @@ jobs:

cross-android:
docker:
- image: cimg/rust:1.64.0
- image: cimg/rust:1.73.0
working_directory: ~/work
steps:
- checkout
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"

members = [
"crates/dkg-cli",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Build with `cargo build (--release)`.
Test with `cargo test`.

All crates require Rust 2021 edition and are tested on the following channels:
- `1.64.0`
- `1.73.0`

If you do not have Rust installed, run: `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`

## Android and iOS

The library compiles to Android and iOS. This has been tested with Rust v1.64.0.
The library compiles to Android and iOS. This has been tested with Rust v1.73.0.

To compile to Android:

Expand Down
2 changes: 1 addition & 1 deletion crates/dkg-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/rust:1.65.0
FROM cimg/rust:1.73.0

ENV HOME=/home/circleci
ENV PATH=$HOME/bin:$PATH
Expand Down
8 changes: 4 additions & 4 deletions crates/dkg-cli/src/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ where
{
let wallet = Wallet::new(rng);
let output = CeloKeypairJson {
private_key: hex::encode(&wallet.signer().to_bytes()),
private_key: hex::encode(wallet.signer().to_bytes()),
address: wallet.address(),
};

Expand Down Expand Up @@ -355,9 +355,9 @@ fn parse_bundle<D: serde::de::DeserializeOwned>(

fn write_output<C: Curve, W: Write>(writer: W, out: &DKGOutput<C>) -> Result<()> {
let output = OutputJson {
public_key: hex::encode(&bincode::serialize(&out.public.public_key())?),
public_polynomial: hex::encode(&bincode::serialize(&out.public)?),
share: hex::encode(&bincode::serialize(&out.share)?),
public_key: hex::encode(bincode::serialize(&out.public.public_key())?),
public_polynomial: hex::encode(bincode::serialize(&out.public)?),
share: hex::encode(bincode::serialize(&out.share)?),
};
serde_json::to_writer(writer, &output)?;
Ok(())
Expand Down
2 changes: 1 addition & 1 deletion crates/dkg-core/src/primitives/resharing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ mod tests {
return b;
}
let msg = vec![1, 9, 6, 9];
b.shares[((b.dealer_idx + 1) as usize % group.len()) as usize].secret =
b.shares[(b.dealer_idx + 1) as usize % group.len()].secret =
ecies::encrypt::<BCurve, _>(
&G1::rand(&mut thread_rng()),
&msg,
Expand Down
2 changes: 1 addition & 1 deletion crates/threshold-bls-ffi/src/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ pub unsafe extern "C" fn destroy_privkey(private_key: *mut PrivateKey) {
///
/// The pointer must point to a valid instance of the data type
pub unsafe extern "C" fn free_vector(bytes: *mut u8, len: usize) {
drop(unsafe { Vec::from_raw_parts(bytes, len as usize, len as usize) });
drop(unsafe { Vec::from_raw_parts(bytes, len, len) });
}

#[no_mangle]
Expand Down
4 changes: 2 additions & 2 deletions crates/threshold-bls/src/poly.rs
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ pub mod tests {
.map(|i| poly.eval(i as Idx))
.collect::<Vec<Eval<Sc>>>();
let now = SystemTime::now();
Poly::<Sc>::recover(threshold as usize, shares).unwrap();
Poly::<Sc>::recover(threshold, shares).unwrap();
match now.elapsed() {
Ok(e) => println!("single recover: time elapsed {:?}", e),
Err(e) => panic!("{}", e),
Expand All @@ -526,7 +526,7 @@ pub mod tests {
.collect::<Vec<Eval<Sc>>>();

let now = SystemTime::now();
Poly::<Sc>::full_recover(threshold as usize, shares).unwrap();
Poly::<Sc>::full_recover(threshold, shares).unwrap();
match now.elapsed() {
Ok(e) => println!("full_recover: time elapsed {:?}", e),
Err(e) => panic!("{}", e),
Expand Down