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

Jump to bottom

Encrypted Slatepack Metadata #428

Merged
merged 4 commits into from
Jun 10, 2020
Merged

Encrypted Slatepack Metadata #428

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4e0504
addition of slatepack metadata
yeastplume Jun 8, 2020
d0cc30b
finish adding tests ensuring forwards compatibility
yeastplume Jun 9, 2020
beb5bc2
fix to version check
yeastplume Jun 9, 2020
2aef5c5
updates based on review feedback
yeastplume Jun 10, 2020
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
2 changes: 1 addition & 1 deletion controller/tests/slatepack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ fn slatepack_exchange_armored() {
let test_dir = "test_output/slatepack_exchange_armored";
setup(test_dir);
// Bin output
if let Err(e) = slatepack_exchange_test_impl(test_dir, true, true, false) {
if let Err(e) = slatepack_exchange_test_impl(test_dir, true, true, true) {
panic!("Libwallet Error: {} - {}", e, e.backtrace().unwrap());
}
clean_output_dir(test_dir);
Expand Down
4 changes: 1 addition & 3 deletions libwallet/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ strum = "0.15"
strum_macros = "0.15"
ed25519-dalek = "1.0.0-pre.1"
x25519-dalek = "0.6"
byteorder = "1"
base64 = "0.9"
regex = "1.3"
sha2 = "0.8"
Expand All @@ -35,9 +34,8 @@ age = "0.4"
curve25519-dalek = "2.0.0"
secrecy = "0.6"
bech32 = "0.7"
byteorder = "1.3"

grin_wallet_util = { path = "../util", version = "4.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "4.0.0-beta.1" }

[dev-dependencies]
byteorder = "1.3"
2 changes: 1 addition & 1 deletion libwallet/src/slatepack/address.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use std::convert::TryFrom;
use std::fmt::{self, Display};

/// Definition of a Slatepack address
#[derive(Debug, Clone, Eq, PartialEq)]
#[derive(Eq, PartialEq, Debug, Clone)]
quentinlesceller marked this conversation as resolved.
Show resolved Hide resolved
pub struct SlatepackAddress {
/// Human-readable prefix
pub hrp: String,
Expand Down
Loading