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

chore!: reinstate 2 min blocks for dibbler #3720

Merged
merged 3 commits into from
Jan 20, 2022
Merged

chore!: reinstate 2 min blocks for dibbler #3720

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8e368b
chore!: reinstate 2 min blocks for dibbler
sdbondi Jan 20, 2022
a0c9207
correct weatherwax values
sdbondi Jan 20, 2022
556d79c
review comments
sdbondi Jan 20, 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
2 changes: 1 addition & 1 deletion base_layer/core/src/blocks/genesis_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ fn get_dibbler_genesis_block_raw() -> Block {
);
body.sort();
// set genesis timestamp
let genesis = DateTime::parse_from_rfc2822("07 Jan 2022 00:00:00 +0200").unwrap();
let genesis = DateTime::parse_from_rfc2822("20 Jan 2022 00:00:00 +0200").unwrap();
let timestamp = genesis.timestamp() as u64;
Block {
header: BlockHeader {
Expand Down
12 changes: 6 additions & 6 deletions base_layer/core/src/consensus/consensus_constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ impl ConsensusConstants {
// setting sha3/monero to 40/60 split
algos.insert(PowAlgorithm::Sha3, PowAlgorithmConstants {
max_target_time: 180,
sdbondi marked this conversation as resolved.
Show resolved Hide resolved
min_difficulty: 60_00.into(),
min_difficulty: 60_000_000.into(),
max_difficulty: u64::MAX.into(),
target_time: 30,
target_time: 300,
});
algos.insert(PowAlgorithm::Monero, PowAlgorithmConstants {
max_target_time: 1200,
Expand Down Expand Up @@ -320,15 +320,15 @@ impl ConsensusConstants {
// sha3/monero to 40/60 split
algos.insert(PowAlgorithm::Sha3, PowAlgorithmConstants {
max_target_time: 1800,
min_difficulty: 60_000.into(),
min_difficulty: 60_000_000.into(),
max_difficulty: u64::MAX.into(),
target_time: 30,
target_time: 300,
});
algos.insert(PowAlgorithm::Monero, PowAlgorithmConstants {
max_target_time: 1200,
min_difficulty: 60.into(),
min_difficulty: 60_000.into(),
max_difficulty: u64::MAX.into(),
target_time: 20,
target_time: 200,
});
vec![ConsensusConstants {
effective_from_height: 0,
Expand Down