From d14b12aae499a958b681e3e5ce1d91b989f6b03d Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Thu, 17 May 2018 01:22:15 -0600 Subject: [PATCH] Switch to little endian encoding for everything. --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 5 +++-- src/rustzcash.rs | 25 ++++++------------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3730e78..437ae58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,7 +17,7 @@ dependencies = [ "futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pairing 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pairing 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -118,9 +118,9 @@ dependencies = [ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", - "pairing 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pairing 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "sapling-crypto 0.0.1 (git+https://github.com/zcash-hackworks/sapling-crypto?rev=7beeb52730e24724ee10ea2458ecf7776cb59c58)", + "sapling-crypto 0.0.1 (git+https://github.com/zcash-hackworks/sapling-crypto?rev=eb409fa3cf8df215ae8d35f5e385751a0c5ffb85)", ] [[package]] @@ -138,7 +138,7 @@ dependencies = [ [[package]] name = "pairing" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -158,13 +158,13 @@ dependencies = [ [[package]] name = "sapling-crypto" version = "0.0.1" -source = "git+https://github.com/zcash-hackworks/sapling-crypto?rev=7beeb52730e24724ee10ea2458ecf7776cb59c58#7beeb52730e24724ee10ea2458ecf7776cb59c58" +source = "git+https://github.com/zcash-hackworks/sapling-crypto?rev=eb409fa3cf8df215ae8d35f5e385751a0c5ffb85#eb409fa3cf8df215ae8d35f5e385751a0c5ffb85" dependencies = [ "bellman 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (git+https://github.com/gtank/blake2-rfc?rev=7a5b5fc99ae483a0043db7547fb79a6fa44b88a9)", "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pairing 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pairing 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -211,9 +211,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b" "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2" "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" -"checksum pairing 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06f21a403a78257de696b59a5bfafad56a3b3ab8f27741c8122750bf0ebbb9fa" +"checksum pairing 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ceda21136251c6d5a422d3d798d8ac22515a6e8d3521bb60c59a8349d36d0d57" "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" -"checksum sapling-crypto 0.0.1 (git+https://github.com/zcash-hackworks/sapling-crypto?rev=7beeb52730e24724ee10ea2458ecf7776cb59c58)" = "" +"checksum sapling-crypto 0.0.1 (git+https://github.com/zcash-hackworks/sapling-crypto?rev=eb409fa3cf8df215ae8d35f5e385751a0c5ffb85)" = "" "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" "checksum winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" diff --git a/Cargo.toml b/Cargo.toml index a3807db..beff1ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2" -pairing = "0.14.1" +pairing = "0.14.2" lazy_static = "1" bellman = "0.1" byteorder = "1" @@ -18,8 +18,9 @@ rand = "0.4" [dependencies.sapling-crypto] git = "https://github.com/zcash-hackworks/sapling-crypto" -rev = "7beeb52730e24724ee10ea2458ecf7776cb59c58" +rev = "eb409fa3cf8df215ae8d35f5e385751a0c5ffb85" [profile.release] lto = true panic = 'abort' +codegen-units = 1 diff --git a/src/rustzcash.rs b/src/rustzcash.rs index 21ce3c1..bb93869 100644 --- a/src/rustzcash.rs +++ b/src/rustzcash.rs @@ -13,8 +13,7 @@ use pairing::{BitIterator, Field, PrimeField, PrimeFieldRepr, bls12_381::{Bls12, use sapling_crypto::{circuit::multipack, jubjub::{edwards, FixedGenerators, JubjubBls12, JubjubParams, Unknown, fs::FsRepr}, - pedersen_hash::{pedersen_hash, Personalization}, - redjubjub::{self, Signature}, util::swap_bits_u64}; + pedersen_hash::{pedersen_hash, Personalization}, redjubjub::{self, Signature}}; use sapling_crypto::circuit::sprout::{self, TREE_DEPTH as SPROUT_TREE_DEPTH}; @@ -42,22 +41,15 @@ static mut SAPLING_SPEND_PARAMS: Option> = None; static mut SAPLING_OUTPUT_PARAMS: Option> = None; static mut SPROUT_GROTH16_PARAMS_PATH: Option = None; -fn is_small_order( - p: &edwards::Point -) -> bool { +fn is_small_order(p: &edwards::Point) -> bool { p.double(&JUBJUB).double(&JUBJUB).double(&JUBJUB) == edwards::Point::zero() } /// Writes an FrRepr to [u8] of length 32 -fn write_le(mut f: FrRepr, to: &mut [u8]) { +fn write_le(f: FrRepr, to: &mut [u8]) { assert_eq!(to.len(), 32); - f.as_mut().reverse(); - for b in f.as_mut() { - *b = swap_bits_u64(*b); - } - - f.write_be(to).expect("length is 32 bytes"); + f.write_le(to).expect("length is 32 bytes"); } /// Reads an FrRepr from a [u8] of length 32. @@ -67,12 +59,7 @@ fn read_le(from: &[u8]) -> FrRepr { assert_eq!(from.len(), 32); let mut f = FrRepr::default(); - f.read_be(from).expect("length is 32 bytes"); - - f.as_mut().reverse(); - for b in f.as_mut() { - *b = swap_bits_u64(*b); - } + f.read_le(from).expect("length is 32 bytes"); f } @@ -319,7 +306,7 @@ pub extern "system" fn librustzcash_sapling_check_spend( // Add the nullifier through multiscalar packing { - let nullifier = multipack::bytes_to_bits(nullifier); + let nullifier = multipack::bytes_to_bits_le(nullifier); let nullifier = multipack::compute_multipacking::(&nullifier); assert_eq!(nullifier.len(), 2);