Merge pull request #2104 from massalabs/prepare_v6

prepare v6
massalabs · Jan 9, 2022 · c6926dc · c6926dc
2 parents f9cfbb0 + f8807d1
commit c6926dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/massa-consensus/src/settings.rs b/massa-consensus/src/settings.rs
@@ -24,11 +24,11 @@ lazy_static::lazy_static! {
     pub static ref GENESIS_TIMESTAMP: MassaTime = if cfg!(feature = "test") {
         MassaTime::now().unwrap().saturating_add(MassaTime::from(1000 * 60 * 3))
     } else {
-        1638460800000.into()
+        1641744000000.into()
     };
 
     /// TESTNET: time when the blockclique is ended.
-    pub static ref END_TIMESTAMP: Option<MassaTime> = if cfg!(feature = "test") {None} else {Some(1640883600000.into())};
+    pub static ref END_TIMESTAMP: Option<MassaTime> = if cfg!(feature = "test") {None} else {Some(1643644800000.into())};
 
     /// Time between the periods in the same thread.
     pub static ref T0: MassaTime = 16000.into();

diff --git a/massa-node/src/settings.rs b/massa-node/src/settings.rs
@@ -12,7 +12,7 @@ use massa_protocol_exports::ProtocolSettings;
 use serde::Deserialize;
 
 lazy_static::lazy_static! {
-    pub static ref VERSION: Version = "TEST.5.0".parse().unwrap();
+    pub static ref VERSION: Version = "TEST.6.0".parse().unwrap();
     // TODO: this code is duplicated from /massa-client/settings.rs and should be part of a custom crate
     pub static ref SETTINGS: Settings = {
         let mut settings = config::Config::default();