Merge pull request #2021 from mintlayer/prepare-release-v1.2.1

Prepare release v1.2.1

Author: ImplOfAnImpl

Cargo.lock

@@ -5,7 +5,7 @@ homepage = "https://mintlayer.org"
 repository = "https://github.com/mintlayer/mintlayer-core"
 readme = "README.md"
 license = "MIT"
-version = "1.2.0"
+version = "1.2.1"
 authors = ["Samer Afach <samer.afach@mintlayer.org>", "Ben Marsh <benjamin.marsh@mintlayer.org>", "Enrico Rubboli <enrico.rubboli@mintlayer.org>"]
 edition = "2021"
 
@@ -127,7 +127,7 @@ utxo = { path = "utxo" }
 [workspace.package]
 edition = "2021"
 rust-version = "1.88"
-version = "1.2.0"
+version = "1.2.1"
 license = "MIT"
 
 [workspace.dependencies]
@@ -173,14 +173,16 @@ heck = "0.5"
 hex = "0.4"
 hex-literal = "0.4"
 hmac = "0.12"
+http = "1.3"
+hyper = "1.7"
 iced = "0.13"
 # Note: we need this fix - https://github.com/iced-rs/iced_aw/pull/329
 # TODO: switch back to a released version of iced_aw once the fix is released (need version > 0.12)
 iced_aw = { git = "https://github.com/iced-rs/iced_aw", branch = "main" }
 iced_fonts = "0.1"
 indoc = "2.0"
 itertools = "0.14"
-jsonrpsee = { version = "0.22", default-features = false }
+jsonrpsee = { version = "0.26", default-features = false }
 lazy_static = "1.4"
 libtest-mimic = "0.8"
 log = "0.4"
@@ -207,6 +209,7 @@ reedline = "0.38"
 ref-cast = "1.0"
 regex = "1.10"
 replace_with = "0.1"
+reqwest = "0.12"
 rfd = { version = "0.15", default-features = false }
 ripemd = "0.1"
 rlimit = "0.10"
@@ -243,8 +246,8 @@ tokio-socks = "0.5"
 tokio-stream = "0.1"
 tokio-util = { version = "0.7", default-features = false }
 toml = "0.8"
-tower = "0.4"
-tower-http-axum = { package = "tower-http", version = "0.5" }
+tower = "0.5"
+tower-http = "0.5"
 hickory-client = "0.24"
 hickory-server = "0.24"
 zeroize = "1.5"

Cargo.toml

@@ -25,7 +25,7 @@ async-trait.workspace = true
 axum.workspace = true
 hex.workspace = true
 libtest-mimic.workspace = true
-reqwest = "0.11"
+reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 tokio = { workspace = true, features = ["full"] }

api-server/stack-test-suite/Cargo.toml

@@ -29,4 +29,4 @@ serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true }
-tower-http-axum = { workspace = true, features = ["cors"] }
+tower-http = { workspace = true, features = ["cors"] }

api-server/web-server/Cargo.toml

@@ -27,7 +27,7 @@ use axum::{http::Method, response::IntoResponse, routing::get, Json, Router};
 use serde_json::json;
 use std::sync::Arc;
 use tokio::net::TcpListener;
-use tower_http_axum::cors::{AllowMethods, Any, CorsLayer};
+use tower_http::cors::{AllowMethods, Any, CorsLayer};
 
 #[allow(clippy::unused_async)]
 async fn bad_request() -> Result<(), ApiServerWebServerError> {

api-server/web-server/src/api/mod.rs

@@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet-dns-server
 
 # Dockerhub username, from which the docker images will be pulled.
 ML_DOCKERHUB_USERNAME=mintlayer
-# The image tag to use, e.g. "v1.2.0" or "latest".
+# The image tag to use, e.g. "v1.2.1" or "latest".
 ML_DOCKER_IMAGE_TAG=latest
 
 # The user and group ids that will be used to run the software.

build-tools/docker/example-mainnet-dns-server/.env

@@ -4,7 +4,7 @@ COMPOSE_PROJECT_NAME=mintlayer-mainnet
 
 # Dockerhub username, from which the docker images will be pulled.
 ML_DOCKERHUB_USERNAME=mintlayer
-# The image tag to use, e.g. "v1.2.0" or "latest".
+# The image tag to use, e.g. "v1.2.1" or "latest".
 ML_DOCKER_IMAGE_TAG=latest
 
 # The user and group ids that will be used to run the software.

build-tools/docker/example-mainnet/.env

@@ -19,16 +19,12 @@ use chainstate::ChainstateConfig;
 
 /// Storage type to use
 #[must_use]
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub enum StorageBackendConfig {
+    #[default]
     Lmdb,
-    InMemory,
-}
 
-impl Default for StorageBackendConfig {
-    fn default() -> Self {
-        Self::Lmdb
-    }
+    InMemory,
 }
 
 impl StorageBackendConfig {

chainstate/launcher/src/config.rs

@@ -1379,14 +1379,14 @@ impl<'a> RandomTxMaker<'a> {
                         PrivateKey::new_from_rng(rng, KeyKind::Secp256k1Schnorr);
 
                     *dummy_pool_id = pool_id;
-                    *pool_data = Box::new(StakePoolData::new(
+                    **pool_data = StakePoolData::new(
                         pool_data.pledge(),
                         Destination::PublicKey(staker_pk),
                         vrf_pk,
                         Destination::AnyoneCanSpend,
                         pool_data.margin_ratio_per_thousand(),
                         pool_data.cost_per_block(),
-                    ));
+                    );
                     let _ = pos_accounting_cache
                         .create_pool(pool_id, pool_data.as_ref().clone().into())
                         .unwrap();

chainstate/test-framework/src/random_tx_maker.rs

@@ -22,12 +22,12 @@ use super::hexified::HexifiedAddress;
 
 #[allow(clippy::let_and_return)]
 pub fn dehexify_all_addresses(conf: &ChainConfig, input: &str) -> String {
-    let result = HexifiedAddress::<Destination>::replace_with_address(conf, input).to_string();
-    let result = HexifiedAddress::<PoolId>::replace_with_address(conf, &result).to_string();
-    let result = HexifiedAddress::<DelegationId>::replace_with_address(conf, &result).to_string();
-    let result = HexifiedAddress::<TokenId>::replace_with_address(conf, &result).to_string();
-    let result = HexifiedAddress::<OrderId>::replace_with_address(conf, &result).to_string();
-    let result = HexifiedAddress::<VRFPublicKey>::replace_with_address(conf, &result).to_string();
+    let result = HexifiedAddress::<Destination>::replace_with_address(conf, input).clone();
+    let result = HexifiedAddress::<PoolId>::replace_with_address(conf, &result).clone();
+    let result = HexifiedAddress::<DelegationId>::replace_with_address(conf, &result).clone();
+    let result = HexifiedAddress::<TokenId>::replace_with_address(conf, &result).clone();
+    let result = HexifiedAddress::<OrderId>::replace_with_address(conf, &result).clone();
+    let result = HexifiedAddress::<VRFPublicKey>::replace_with_address(conf, &result).clone();
 
     result
 }