Merge branch 'main' into fix/5027/local_genesis

Cargo.toml

@@ -116,7 +116,7 @@ dashmap = "5.5.3"
 rustc-hash = "1.1.0"
 
 serde = { version = "1.0.204", default-features = false }
-serde_json = { version = "1.0.121", default-features = false }
+serde_json = { version = "1.0.121", default-features = false, features = ["alloc"] }
 serde_with = { version = "3.9.0", default-features = false }
 parity-scale-codec = { version = "3.6.12", default-features = false }
 json5 = "0.4.1"

crates/iroha/tests/queries/mod.rs

@@ -41,9 +41,9 @@ fn find_blocks_reversed() -> eyre::Result<()> {
 
     let blocks = client.query(FindBlocks).execute_all()?;
     assert_eq!(blocks.len(), 2);
-    assert_eq!(blocks[1].header().prev_block_hash, None);
+    assert_eq!(blocks[1].header().prev_block_hash(), None);
     assert_eq!(
-        blocks[0].header().prev_block_hash,
+        blocks[0].header().prev_block_hash(),
         Some(blocks[1].header().hash())
     );
 

crates/iroha_cli/src/main.rs

@@ -1260,7 +1260,7 @@ mod multisig {
                 .parse()
                 .unwrap();
             let args = MultisigAccountArgs {
-                account: account.signatory.clone(),
+                account: account.signatory().clone(),
                 signatories: signatories.into_iter().zip(weights).collect(),
                 quorum,
                 transaction_ttl_ms: transaction_ttl
@@ -1377,7 +1377,7 @@ mod multisig {
 
         for role_id in multisig_roles {
             let super_account: AccountId = role_id
-                .name
+                .name()
                 .as_ref()
                 .strip_prefix("multisig_signatory_")
                 .unwrap()
@@ -1388,7 +1388,7 @@ mod multisig {
             trace_back_from(super_account, client, context)?;
 
             let transactions_registry_id: TriggerId = role_id
-                .name
+                .name()
                 .as_ref()
                 .replace("signatory", "transactions")
                 .parse()

crates/iroha_config/Cargo.toml

@@ -13,8 +13,8 @@ workspace = true
 [dependencies]
 iroha_config_base = { workspace = true }
 iroha_data_model = { workspace = true }
-iroha_primitives = { workspace = true }
-iroha_crypto = { workspace = true }
+iroha_primitives = { workspace = true, features = ["std"] }
+iroha_crypto = { workspace = true, features = ["std"] }
 
 error-stack = { workspace = true }
 tracing = { workspace = true }
@@ -23,7 +23,7 @@ url = { workspace = true, features = ["serde"] }
 
 serde = { workspace = true, features = ["derive"] }
 serde_with = { workspace = true }
-strum = { workspace = true, features = ["derive"] }
+strum = { workspace = true, features = ["derive", "std"] }
 serde_json = { workspace = true }
 json5 = { workspace = true }
 thiserror = { workspace = true }

crates/iroha_numeric/Cargo.toml

@@ -40,4 +40,4 @@ displaydoc = { workspace = true }
 rust_decimal = { version = "1.35", default-features = false, features = ["serde", "serde-with-str"] }
 
 [dev-dependencies]
-serde_json = { workspace = true, features = ["alloc"] }
+serde_json = { workspace = true }

crates/iroha_primitives/Cargo.toml

@@ -47,5 +47,4 @@ serde_json = { workspace = true }
 
 
 [dev-dependencies]
-serde_json = { workspace = true, features = ["alloc"] }
 trybuild = { workspace = true }

crates/iroha_schema/Cargo.toml

@@ -17,5 +17,5 @@ serde = { workspace = true, features = ["derive", "alloc"] }
 
 [dev-dependencies]
 parity-scale-codec = { workspace = true, default-features = false, features = ["derive", "full"] }
-serde_json = { workspace = true, features = ["alloc"] }
+serde_json = { workspace = true }
 impls = { workspace = true }

crates/iroha_version/Cargo.toml

@@ -28,7 +28,7 @@ iroha_version_derive = { path = "../iroha_version_derive", default-features = fa
 iroha_macro = { workspace = true }
 
 parity-scale-codec = { workspace = true, optional = true, features = ["derive"] }
-serde_json = { workspace = true, optional = true, features = ["alloc"] }
+serde_json = { workspace = true, optional = true }
 serde = { workspace = true, optional = true, features = ["derive"] }
 thiserror = { workspace = true, optional = true }
 

crates/iroha_version_derive/Cargo.toml

@@ -25,7 +25,7 @@ iroha_version = { workspace = true, features = ["scale", "json"] }
 iroha_macro = { workspace = true }
 
 parity-scale-codec = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true, features = ["alloc"] }
+serde_json = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
 trybuild = { workspace = true }

crates/iroha_wasm_builder/src/main.rs

@@ -59,20 +59,28 @@ fn main() -> color_eyre::Result<()> {
             };
 
             let output = if optimize {
-                let mut sp = spinoff::Spinner::new_with_stream(
-                    spinoff::spinners::Binary,
-                    "Optimizing the output",
-                    None,
-                    spinoff::Streams::Stderr,
-                );
+                let sp = if std::env::var("CI").is_err() {
+                    Some(spinoff::Spinner::new_with_stream(
+                        spinoff::spinners::Binary,
+                        "Optimizing the output",
+                        None,
+                        spinoff::Streams::Stderr,
+                    ))
+                } else {
+                    None
+                };
 
                 match output.optimize() {
                     Ok(optimized) => {
-                        sp.success("Output is optimized");
+                        if let Some(mut sp) = sp {
+                            sp.success("Output is optimized");
+                        }
                         optimized
                     }
                     err => {
-                        sp.fail("Optimization failed");
+                        if let Some(mut sp) = sp {
+                            sp.fail("Optimization failed");
+                        }
                         err?
                     }
                 }

crates/iroha_wasm_codec/Cargo.toml

@@ -14,4 +14,4 @@ iroha_wasm_codec_derive = { path = "../iroha_wasm_codec_derive" }
 
 thiserror = { workspace = true }
 wasmtime = { workspace = true }
-parity-scale-codec = { workspace = true, features = ["derive"] }
+parity-scale-codec = { workspace = true, features = ["derive", "std"] }