update runtime and crates

massa-api/Cargo.toml

@@ -13,7 +13,7 @@ jsonrpc-derive = "18.0"
 jsonrpc-http-server = "18.0"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_consensus_exports = { path = "../massa-consensus-exports" }

massa-async-pool/Cargo.toml

@@ -13,7 +13,7 @@ num = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.11", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 rand = "0.8"
 # custom modules
@@ -26,7 +26,7 @@ massa_time = { path = "../massa-time" }
 
 [dev-dependencies]
 pretty_assertions = "1.0"
-serial_test = "0.5"
+serial_test = "0.8"
 
 # for more information on what are the following features used for, see the cargo.toml at workspace level
 [features]

massa-bootstrap/Cargo.toml

@@ -17,7 +17,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
 parking_lot = "0.12"
-tokio = { version = "1.11", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 
 # custom modules
@@ -36,14 +36,14 @@ massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 
 [dev-dependencies]
-bitvec = { version = "0.22", features = ["serde"] }
-serial_test = "0.5"
+bitvec = { version = "1.0", features = ["serde"] }
+serial_test = "0.8"
 massa_final_state = { path = "../massa-final-state", features = ["testing"] }
 massa_async_pool = { path = "../massa-async-pool", features = ["testing"] }
 massa_ledger_worker = { path = "../massa-ledger-worker", features = [
     "testing",
 ] }
-lazy_static = "1.4.0"
+lazy_static = "1.4"
 
 
 # for more information on what are the following features used for, see the cargo.toml at workspace level

massa-bootstrap/src/tests/tools.rs

@@ -389,7 +389,7 @@ pub fn get_boot_state() -> (ExportProofOfStake, BootstrapableGraph) {
             .into_iter()
             .collect(),
         ),
-        rng_seed: bitvec![Lsb0, u8 ; 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1],
+        rng_seed: bitvec![u8, Lsb0 ; 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1],
         production_stats: vec![
             (get_random_address(), (1, 2)),
             (get_random_address(), (3, 4)),

massa-cipher/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 displaydoc = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-serde_qs = "0.8"
+serde_qs = "0.9"
 thiserror = "1.0"
 aes-gcm-siv = "0.10"
 rand = "0.8"

massa-client/Cargo.toml

@@ -11,16 +11,16 @@ atty = "0.2"
 console = "0.15"
 dialoguer = { version = "0.10", features = ["history", "completion"] }
 erased-serde = "0.3"
-glob = "0.3.0"
+glob = "0.3"
 lazy_static = "1.4"
 paw = "1.0"
 rev_lines = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 structopt = { version = "0.3", features = ["paw"] }
-strum = "0.22"
-strum_macros = "0.22"
-tokio = { version = "1.15", features = ["full"] }
+strum = "0.24"
+strum_macros = "0.24"
+tokio = { version = "1.19", features = ["full"] }
 # custom modules
 massa_models = { path = "../massa-models" }
 massa_signature = { path = "../massa-signature" }
@@ -29,10 +29,10 @@ massa_sdk = { path = "../massa-sdk" }
 massa_wallet = { path = "../massa-wallet" }
 
 [target.'cfg(not(windows))'.dependencies]
-tilde-expand = "0.1.1"
+tilde-expand = "0.1"
 
 [dev-dependencies]
-toml_edit = "0.8"
+toml_edit = "0.14"
 
 # for more information on what are the following features used for, see the cargo.toml at workspace level
 [features]

massa-consensus-exports/Cargo.toml

@@ -12,9 +12,9 @@ num = { version = "0.4", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
-tempfile = { version = "3.2", optional = true }    # use with testing feature
+tempfile = { version = "3.3", optional = true }    # use with testing feature
 # custom modules
 massa_cipher = { path = "../massa-cipher" }
 massa_execution_exports = { path = "../massa-execution-exports" }

massa-consensus-worker/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 
 [dependencies]
 serde_json = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_consensus_exports = { path = "../massa-consensus-exports" }
@@ -24,8 +24,8 @@ massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 
 [dev-dependencies]
-serial_test = "0.5"
-tempfile = "3.2"
+serial_test = "0.8"
+tempfile = "3.3"
 massa_models = { path = "../massa-models", features = ["testing"] }
 massa_execution_exports = { path = "../massa-execution-exports", features = [
     "testing",

massa-execution-worker/Cargo.toml

@@ -17,15 +17,15 @@ massa_execution_exports = { path = "../massa-execution-exports" }
 massa_models = { path = "../massa-models" }
 massa_storage = { path = "../massa-storage" }
 massa_hash = { path = "../massa-hash" }
-massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", tag = "v0.6.8" }
+massa-sc-runtime = { git = "https://github.com/massalabs/massa-sc-runtime", tag = "v0.6.9" }
 massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 massa_final_state = { path = "../massa-final-state" }
 massa_async_pool = { path = "../massa-async-pool" }
 massa_ledger_exports = { path = "../massa-ledger-exports" }
 
 [dev-dependencies]
-serial_test = "0.5"
+serial_test = "0.8"
 tempfile = "3.2"
 
 # custom modules with testing enabled

massa-graph/Cargo.toml

@@ -13,7 +13,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sled = "0.34"
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_execution_exports = { path = "../massa-execution-exports" }
@@ -27,7 +27,7 @@ massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 
 [dev-dependencies]
-serial_test = "0.5"
+serial_test = "0.8"
 
 # for more information on what are the following features used for, see the cargo.toml at workspace level
 [features]

massa-hash/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-blake3 = "1.3.1"
+blake3 = "1.3"
 bs58 = { version = "0.4", features = ["check"] }
 displaydoc = "0.2"
 serde = { version = "1.0", features = ["derive"] }
@@ -19,4 +19,4 @@ massa_serialization = { path = "../massa-serialization" }
 
 [dev-dependencies]
 serde_json = "1.0"
-serial_test = "0.5"
+serial_test = "0.8"

massa-ledger-exports/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 displaydoc = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tempfile = { version = "3.2", optional = true }    # use with testing feature
+tempfile = { version = "3.3", optional = true }    # use with testing feature
 thiserror = "1.0"
 nom = "7.1"
 

massa-ledger-worker/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 
 [dependencies]
 serde_json = "1.0"
-tempfile = { version = "3.2", optional = true } # use with testing feature
-rocksdb = "0.18.0"
+tempfile = { version = "3.3", optional = true } # use with testing feature
+rocksdb = "0.18"
 nom = "7.1"
 
 # custom modules

massa-logging/Cargo.toml

@@ -12,4 +12,4 @@ tracing = "0.1"
 
 [dev-dependencies]
 pretty_assertions = "1.0"
-serial_test = "0.5"
+serial_test = "0.8"

massa-models/Cargo.toml

@@ -25,7 +25,7 @@ massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 
 [dev-dependencies]
-serial_test = "0.5"
+serial_test = "0.8"
 
 # for more information on what are the following features used for, see the cargo.toml at workspace level
 [features]

massa-network-exports/Cargo.toml

@@ -10,16 +10,16 @@ displaydoc = "0.2"
 nom = "7.1"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
-enum-map = { version = "2.0.3", features = ["serde"] }
+tokio = { version = "1.19", features = ["full"] }
+enum-map = { version = "2.4", features = ["serde"] }
 # custom modules
 massa_hash = { path = "../massa-hash" }
 massa_models = { path = "../massa-models" }
 massa_time = { path = "../massa-time" }
 massa_serialization = { path = "../massa-serialization" }
 massa_signature = { path = "../massa-signature" }
 serde_json = "1.0"
-tempfile = { version = "3.2", optional = true }   #used with testing feature
+tempfile = { version = "3.3", optional = true }   #used with testing feature
 
 [dev-dependencies]
 massa_models = { path = "../massa-models", features = ["testing"] }

massa-network-worker/Cargo.toml

@@ -8,14 +8,14 @@ edition = "2021"
 
 [dependencies]
 async-speed-limit = { git = "https://github.com/adrien-zinger/async-speed-limit", rev = "36d79e0", features = ["default", "tokio"] }
-enum-map = { version = "2.0.3", features = ["serde"] }
+enum-map = { version = "2.4", features = ["serde"] }
 futures = "0.3"
 itertools = "0.10"
 num_enum = "0.5"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_hash = { path = "../massa-hash" }
@@ -28,8 +28,8 @@ massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 
 [dev-dependencies]
-serial_test = "0.5.1"
-tempfile = "3.2"
+serial_test = "0.8"
+tempfile = "3.3"
 massa_models = { path = "../massa-models", features = ["testing"] }
 massa_network_exports = { path = "../massa-network-exports", features = [
     "testing",

massa-node/Cargo.toml

@@ -8,11 +8,11 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0"
-lazy_static = "1.4.0"
+lazy_static = "1.4"
 parking_lot = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = { version = "0.1", features = [
     "max_level_debug",
     "release_max_level_debug",

massa-pool/Cargo.toml

@@ -10,7 +10,7 @@ num = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_logging = { path = "../massa-logging" }
@@ -19,7 +19,7 @@ massa_protocol_exports = { path = "../massa-protocol-exports" }
 massa_storage = { path = "../massa-storage" }
 
 [dev-dependencies]
-serial_test = "0.5"
+serial_test = "0.8"
 lazy_static = "1.4.0"
 massa_signature = { path = "../massa-signature" }
 massa_hash = { path = "../massa-hash" }

massa-proof-of-stake-exports/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bitvec = { version = "0.22", features = ["serde"] }
+bitvec = { version = "1.0", features = ["serde"] }
 displaydoc = "0.2"
 num = { version = "0.4", features = ["serde"] }
 nom = "7.1"
@@ -16,7 +16,7 @@ rand_xoshiro = "0.6"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_hash = { path = "../massa-hash" }

massa-protocol-exports/Cargo.toml

@@ -12,7 +12,7 @@ lazy_static = "1.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_hash = { path = "../massa-hash" }

massa-protocol-worker/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 [dependencies]
 itertools = "0.10"
 serde_json = "1.0"
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_hash = { path = "../massa-hash" }
@@ -24,7 +24,7 @@ massa_time = { path = "../massa-time" }
 lazy_static = "1.4"
 futures = "0.3"
 massa_signature = { path = "../massa-signature" }
-serial_test = "0.5"
+serial_test = "0.8"
 
 
 # for more information on what are the following features used for, see the cargo.toml at workspace level

massa-sdk/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 jsonrpc-core-client = { version = "18.0", features = ["http", "tls"] }
-tokio = { version = "1.15", features = ["full"] }
+tokio = { version = "1.19", features = ["full"] }
 massa_models = { path = "../massa-models" }
 massa_signature = { path = "../massa-signature" }
 serde = { version = "1.0", features = ["derive"] }

massa-signature/Cargo.toml

@@ -9,16 +9,17 @@ edition = "2021"
 [dependencies]
 bs58 = { version = "0.4", features = ["check"] }
 displaydoc = "0.2"
-secp256k1 = { version = "0.22", features = ["rand-std", "global-context"] }
+secp256k1 = { version = "0.23", features = ["rand-std", "global-context"] }
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
 nom = "7.1"
+rand = "0.8"
 # custom modules
 massa_hash = { path = "../massa-hash" }
 massa_serialization = { path = "../massa-serialization" }
 
 [dev-dependencies]
-serial_test = "0.5"
+serial_test = "0.8"
 serde_json = "1.0"
 
 # for more information on what are the following features used for, see the cargo.toml at workspace level

massa-signature/src/signature_impl.rs

@@ -854,7 +854,7 @@ impl Deserializer<Signature> for SignatureDeserializer {
 /// let public_key = derive_public_key(&private_key);
 /// ```
 pub fn derive_public_key(private_key: &PrivateKey) -> PublicKey {
-    PublicKey(private_key.0.public_key())
+    PublicKey(private_key.0.public_key().x_only_public_key().0)
 }
 
 /// Returns the Signature produced by signing
@@ -900,11 +900,9 @@ pub fn verify_signature(
 
 /// Generate a random private key from a RNG.
 pub fn generate_random_private_key() -> PrivateKey {
-    use secp256k1::rand::rngs::OsRng;
-    let mut rng = OsRng::new().expect("OsRng");
     PrivateKey(secp256k1::KeyPair::from_secret_key(
         SECP256K1,
-        secp256k1::SecretKey::new(&mut rng),
+        &secp256k1::SecretKey::new(&mut rand::thread_rng()),
     ))
 }