Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: old time crate use 0..11 as the month, make mistake when switching to chrono Utc.ymd (#1304) (#1305)

Browse source
This commit is contained in:
Gary Yu 2018-08-01 00:35:57 +08:00 committed by Ignotus Peverell
parent 84e46c2872
commit b040aaa434
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chain/src/pipe.rs
View file

@ -297,9 +297,9 @@ fn validate_header(header: &BlockHeader, ctx: &mut BlockContext) -> Result<(), E
if target_difficulty != network_difficulty.clone() { if target_difficulty != network_difficulty.clone() {
error!( error!(
LOGGER, LOGGER,
"validate_header: BANNABLE OFFENCE: header cumulative difficulty {} != {}", "validate_header: BANNABLE OFFENCE: header target difficulty {} != {}",
target_difficulty.to_num(), target_difficulty.to_num(),
prev.total_difficulty.to_num() + network_difficulty.to_num() network_difficulty.to_num()
); );
return Err(ErrorKind::WrongTotalDifficulty.into()); return Err(ErrorKind::WrongTotalDifficulty.into());
} }

10
core/src/genesis.rs
View file

@ -29,7 +29,7 @@ pub fn genesis_dev() -> core::Block {
header: core::BlockHeader { header: core::BlockHeader {
height: 0, height: 0,
previous: core::hash::Hash([0xff; 32]), previous: core::hash::Hash([0xff; 32]),
timestamp: Utc.ymd(1997, 7, 4).and_hms(0, 0, 0), timestamp: Utc.ymd(1997, 8, 4).and_hms(0, 0, 0),
nonce: global::get_genesis_nonce(), nonce: global::get_genesis_nonce(),
..Default::default() ..Default::default()
}, },
@ -46,7 +46,7 @@ pub fn genesis_testnet1() -> core::Block {
header: core::BlockHeader { header: core::BlockHeader {
height: 0, height: 0,
previous: core::hash::Hash([0xff; 32]), previous: core::hash::Hash([0xff; 32]),
timestamp: Utc.ymd(2017, 10, 16).and_hms(20, 0, 0), timestamp: Utc.ymd(2017, 11, 16).and_hms(20, 0, 0),
nonce: 28205, nonce: 28205,
pow: core::Proof::new(vec![ pow: core::Proof::new(vec![
0x21e, 0x7a2, 0xeae, 0x144e, 0x1b1c, 0x1fbd, 0x203a, 0x214b, 0x293b, 0x2b74, 0x21e, 0x7a2, 0xeae, 0x144e, 0x1b1c, 0x1fbd, 0x203a, 0x214b, 0x293b, 0x2b74,
@ -69,7 +69,7 @@ pub fn genesis_testnet2() -> core::Block {
header: core::BlockHeader { header: core::BlockHeader {
height: 0, height: 0,
previous: core::hash::Hash([0xff; 32]), previous: core::hash::Hash([0xff; 32]),
timestamp: Utc.ymd(2018, 2, 26).and_hms(16, 0, 0), timestamp: Utc.ymd(2018, 3, 26).and_hms(16, 0, 0),
total_difficulty: Difficulty::from_num(global::initial_block_difficulty()), total_difficulty: Difficulty::from_num(global::initial_block_difficulty()),
nonce: 1060, nonce: 1060,
pow: core::Proof::new(vec![ pow: core::Proof::new(vec![
@ -94,7 +94,7 @@ pub fn genesis_testnet3() -> core::Block {
header: core::BlockHeader { header: core::BlockHeader {
height: 0, height: 0,
previous: core::hash::Hash([0xff; 32]), previous: core::hash::Hash([0xff; 32]),
timestamp: Utc.ymd(2018, 6, 8).and_hms(18, 0, 0), timestamp: Utc.ymd(2018, 7, 8).and_hms(18, 0, 0),
total_difficulty: Difficulty::from_num(global::initial_block_difficulty()), total_difficulty: Difficulty::from_num(global::initial_block_difficulty()),
nonce: 4956988373127691, nonce: 4956988373127691,
pow: core::Proof::new(vec![ pow: core::Proof::new(vec![
@ -121,7 +121,7 @@ pub fn genesis_main() -> core::Block {
header: core::BlockHeader { header: core::BlockHeader {
height: 0, height: 0,
previous: core::hash::Hash([0xff; 32]), previous: core::hash::Hash([0xff; 32]),
timestamp: Utc.ymd(2018, 7, 14).and_hms(0, 0, 0), timestamp: Utc.ymd(2018, 8, 14).and_hms(0, 0, 0),
total_difficulty: Difficulty::from_num(global::initial_block_difficulty()), total_difficulty: Difficulty::from_num(global::initial_block_difficulty()),
nonce: global::get_genesis_nonce(), nonce: global::get_genesis_nonce(),
pow: core::Proof::zero(consensus::PROOFSIZE), pow: core::Proof::zero(consensus::PROOFSIZE),