diff --git a/Cargo.lock b/Cargo.lock index debbb82..2067978 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2222,7 +2222,7 @@ checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d" [[package]] name = "grin_api" -version = "5.5.1" +version = "5.5.2" dependencies = [ "bytes 1.12.0", "easy-jsonrpc-mw", @@ -2254,7 +2254,7 @@ dependencies = [ [[package]] name = "grin_chain" -version = "5.5.1" +version = "5.5.2" dependencies = [ "bit-vec", "bitflags 1.3.2", @@ -2278,7 +2278,7 @@ dependencies = [ [[package]] name = "grin_core" -version = "5.5.1" +version = "5.5.2" dependencies = [ "blake2-rfc", "byteorder", @@ -2304,7 +2304,7 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "5.5.1" +version = "5.5.2" dependencies = [ "blake2-rfc", "byteorder", @@ -2325,7 +2325,7 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "5.5.1" +version = "5.5.2" dependencies = [ "bitflags 1.3.2", "built", @@ -2348,7 +2348,7 @@ dependencies = [ [[package]] name = "grin_pool" -version = "5.5.1" +version = "5.5.2" dependencies = [ "blake2-rfc", "chrono", @@ -2365,9 +2365,9 @@ dependencies = [ [[package]] name = "grin_secp256k1zkp" -version = "0.7.15" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7bb95f155b1eede2648a1b9afbba82bc3d9f2af0518b478767559a572bd973" +checksum = "57e0a5f761e8c56db5be865f79832677d3badb3be91d7172d468e448f3d69f82" dependencies = [ "arrayvec 0.7.8", "cc", @@ -2380,7 +2380,7 @@ dependencies = [ [[package]] name = "grin_store" -version = "5.5.1" +version = "5.5.2" dependencies = [ "byteorder", "chrono", @@ -2402,7 +2402,7 @@ dependencies = [ [[package]] name = "grin_util" -version = "5.5.1" +version = "5.5.2" dependencies = [ "anyhow", "backtrace", diff --git a/grin b/grin index d5f3235..dbaff34 160000 --- a/grin +++ b/grin @@ -1 +1 @@ -Subproject commit d5f32350ab548736c17c1db7ff51457917fe4e96 +Subproject commit dbaff34f7751ee23316fbbfe5806b47c546776ca diff --git a/libwallet/src/mwixnet/onion/mod.rs b/libwallet/src/mwixnet/onion/mod.rs index e1eb424..c23ada3 100644 --- a/libwallet/src/mwixnet/onion/mod.rs +++ b/libwallet/src/mwixnet/onion/mod.rs @@ -170,6 +170,7 @@ pub mod test_util { None, None, ) + .expect("failed to generate test bulletproof") } pub fn proof( @@ -187,14 +188,16 @@ pub mod test_util { let out_value = value - (fee as u64); - let rp = secp.bullet_proof( - out_value, - blind.clone(), - secp::random_secret(false), - secp::random_secret(false), - None, - None, - ); + let rp = secp + .bullet_proof( + out_value, + blind.clone(), + secp::random_secret(false), + secp::random_secret(false), + None, + None, + ) + .expect("failed to generate test bulletproof"); (secp::commit(out_value, &blind).unwrap(), rp) } diff --git a/libwallet/src/mwixnet/onion/onion.rs b/libwallet/src/mwixnet/onion/onion.rs index 2540dae..8159232 100644 --- a/libwallet/src/mwixnet/onion/onion.rs +++ b/libwallet/src/mwixnet/onion/onion.rs @@ -397,14 +397,16 @@ pub mod tests { final_commit = secp::add_excess(&final_commit, &excess).unwrap(); let proof = if i == 4 { let n1 = random_secret(false); - let rp = secp.bullet_proof( - out_value, - final_blind.clone(), - n1.clone(), - n1.clone(), - None, - None, - ); + let rp = secp + .bullet_proof( + out_value, + final_blind.clone(), + n1.clone(), + n1.clone(), + None, + None, + ) + .expect("failed to generate test bulletproof"); assert!(secp.verify_bullet_proof(final_commit, rp, None).is_ok()); Some(rp) } else {