diff --git a/Cargo.lock b/Cargo.lock index 842c6d2b19e..e12ec258308 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,9 +66,8 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "as-ffi-bindings" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d345183a879e22e047d16a0e4dea292384d546a00212e8218bee5130aad83e6" +version = "0.2.1" +source = "git+https://github.com/massalabs/as-ffi-bindings.git?branch=fix_memory_errors#a0860c12b4a4544a20ce5612064254730bfce012" dependencies = [ "anyhow", "wasmer", @@ -1354,7 +1353,7 @@ dependencies = [ [[package]] name = "massa-sc-runtime" version = "0.3.0" -source = "git+https://github.com/massalabs/massa-sc-runtime?tag=v0.6.0#be3ce552619dd7510e43293c1bc45cb864380ab7" +source = "git+https://github.com/massalabs/massa-sc-runtime?tag=v0.6.1#6e722eedff8c90ca86e000ad95d9c86ec0be4d92" dependencies = [ "anyhow", "as-ffi-bindings", diff --git a/massa-models/src/node_configuration/default.rs b/massa-models/src/node_configuration/default.rs index be03e284965..8c3e849d5cd 100644 --- a/massa-models/src/node_configuration/default.rs +++ b/massa-models/src/node_configuration/default.rs @@ -43,14 +43,14 @@ lazy_static::lazy_static! { .saturating_add(MassaTime::from(1000 * 60 * 3)) ) } else { - 1646334000000.into() + 1649358000000.into() // Thu Apr 07 2022 19:00:00 GMT+0000 }; /// TESTNET: time when the blockclique is ended. pub static ref END_TIMESTAMP: Option = if cfg!(feature = "sandbox") { None } else { - Some(1648764000000.into()) + Some(1651345200000.into()) // Sat Apr 30 2022 19:00:00 GMT+0000 }; /// Private_key to sign genesis blocks. pub static ref GENESIS_KEY: PrivateKey = "SGoTK5TJ9ZcCgQVmdfma88UdhS6GK94aFEYAsU3F1inFayQ6S" @@ -63,7 +63,7 @@ lazy_static::lazy_static! { if cfg!(feature = "sandbox") { "SAND.0.0" } else { - "TEST.8.0" + "TEST.9.0" } .parse() .unwrap() @@ -143,7 +143,7 @@ pub const BOOTSTRAP_RANDOMNESS_SIZE_BYTES: usize = 32; /// Maximum of GAS allowed for a block pub const MAX_GAS_PER_BLOCK: u64 = 100_000_000; /// Maximum of GAS allowed for async messages exection on one slot -pub const MAX_ASYNC_GAS: u64 = 10_000_000; +pub const MAX_ASYNC_GAS: u64 = 100_000_000; // // Constants used in network diff --git a/massa-node/base_config/config.toml b/massa-node/base_config/config.toml index 480683609cd..7cbcd646d8c 100644 --- a/massa-node/base_config/config.toml +++ b/massa-node/base_config/config.toml @@ -16,7 +16,7 @@ [execution] # max number of generated events kept in RAM - max_final_events = 100 + max_final_events = 10000 # maximum length of the read-only execution requests queue readonly_queue_length = 10 # by how many milliseconds shoud the execution lag behind real time @@ -39,7 +39,7 @@ # max number of blocks waiting for dependencies max_dependency_blocks = 2048 # number of final periods that must be kept at all times (increase to more resilience to short network disconnections, high values will increase RAM usage.) - force_keep_final_periods = 30 + force_keep_final_periods = 20 # max number of batches of pool operations to scan when generating a block max_operations_fill_attempts = 102400 @@ -84,7 +84,7 @@ # max cache size for which blocks a foreign node asked for max_node_wanted_blocks_size = 1024 # max number of blocks we can ask simultaneously per node - max_simultaneous_ask_blocks_per_node = 2048 + max_simultaneous_ask_blocks_per_node = 128 # max millis to wait while sending an event before dropping it max_send_wait = 500 # max cache size for which operations a foreign node knows about @@ -167,8 +167,8 @@ # timeout to establish a bootstrap connection connect_timeout = 15000 # delay in milliseconds to wait between consecutive bootstrap attempts - retry_delay = 5000 - # if ping is too high bootstrap will be inturrupted after max_ping milliseconds + retry_delay = 600000 + # if ping is too high bootstrap will be interrupted after max_ping milliseconds max_ping = 10000 # timeout for incoming message readout read_timeout = 10000 @@ -183,7 +183,7 @@ # max size of recently bootstrapped IP cache ip_list_max_size = 10000 # refuse consecutive bootstrap attempts from a given IP when the interval between them is lower than per_ip_min_interval milliseconds - per_ip_min_interval = 86400000 + per_ip_min_interval = 180000 [pool] # max number of operations kept per thread