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

fix: add more recent zero point for wallet birthday (see issue #4176) #4275

Merged
merged 13 commits into from
Aug 2, 2022
Merged

fix: add more recent zero point for wallet birthday (see issue #4176) #4275

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4fe2390
merge with upstream development
jorgeantonio21 Jul 11, 2022
ab3999a
update cargo.toml
jorgeantonio21 Jul 11, 2022
860d4a8
add default method to birthday
jorgeantonio21 Jul 11, 2022
795850c
remove unused import
jorgeantonio21 Jul 11, 2022
680a624
run cargo fmt
jorgeantonio21 Jul 11, 2022
cc1b1ed
Merge branch 'development' into ja-harcode-more-recent-zero-point-for…
jorgeantonio21 Jul 13, 2022
b51ffbd
merge development
jorgeantonio21 Jul 13, 2022
30eac14
add changes for review
jorgeantonio21 Jul 14, 2022
430c2f3
merge development
jorgeantonio21 Jul 31, 2022
3e7b564
hardcode more recent birthday version
jorgeantonio21 Jul 31, 2022
9d95bb0
remove tari-common dependency
jorgeantonio21 Jul 31, 2022
9ed12e9
run cargo fmt
jorgeantonio21 Jul 31, 2022
88bd803
Merge branch 'development' into ja-harcode-more-recent-zero-point-for…
stringhandler Aug 2, 2022
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
12 changes: 10 additions & 2 deletions base_layer/key_manager/src/cipher_seed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
use std::{
convert::TryFrom,
mem::size_of,
time::{SystemTime, UNIX_EPOCH},
ops::Add,
time::{Duration, SystemTime, UNIX_EPOCH},
};

use argon2::{
Expand Down Expand Up @@ -54,6 +55,8 @@ use crate::{
};

const CIPHER_SEED_VERSION: u8 = 0u8;
// seconds elapsed from unix epoch until '2022-01-01' == 60 * 60 * 24 * 365 * 52
pub const BIRTHDAY_GENESIS_FROM_UNIX_EPOCH: u64 = 1639872000;
pub const DEFAULT_CIPHER_SEED_PASSPHRASE: &str = "TARI_CIPHER_SEED";
const ARGON2_SALT_BYTES: usize = 16;
pub const CIPHER_SEED_BIRTHDAY_BYTES: usize = 2;
Expand Down Expand Up @@ -119,7 +122,12 @@ impl CipherSeed {
#[cfg(not(target_arch = "wasm32"))]
pub fn new() -> Self {
const SECONDS_PER_DAY: u64 = 24 * 60 * 60;
let days = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_secs() / SECONDS_PER_DAY;
let birthday_genesis_date = UNIX_EPOCH.add(Duration::from_secs(BIRTHDAY_GENESIS_FROM_UNIX_EPOCH));
let days = SystemTime::now()
.duration_since(birthday_genesis_date)
.unwrap()
.as_secs() /
SECONDS_PER_DAY;
let birthday = u16::try_from(days).unwrap_or(0u16);
CipherSeed::new_with_birthday(birthday)
}
Expand Down