Skip to content

Commit

Permalink
Merge pull request #2108 from massalabs/prepare_test.6.3
Browse files Browse the repository at this point in the history
prepare_6.3
  • Loading branch information
damip authored Jan 9, 2022
2 parents c83c982 + bcb5513 commit 591c2cb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion massa-consensus/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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 {
1641744000000.into()
1641754800000.into()
};

/// TESTNET: time when the blockclique is ended.
Expand Down
2 changes: 1 addition & 1 deletion massa-execution/src/spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fn _call(shared_env: &SharedExecutionContext, addr: Address, func_name: String,

// update context
(*exec_context_guard).max_gas = max_gas;
(*exec_context_guard).coins = Amount::from_raw(0); // TODO maybe allow sending coins in the call
(*exec_context_guard).coins = AMOUNT_ZERO; // TODO maybe allow sending coins in the call
(*exec_context_guard).call_stack.push_back(addr);
}

Expand Down
2 changes: 1 addition & 1 deletion massa-node/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use massa_protocol_exports::ProtocolSettings;
use serde::Deserialize;

lazy_static::lazy_static! {
pub static ref VERSION: Version = "TEST.6.2".parse().unwrap();
pub static ref VERSION: Version = "TEST.6.3".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();
Expand Down

0 comments on commit 591c2cb

Please sign in to comment.