diff --git a/Cargo.lock b/Cargo.lock index 39c7b323b68..08893e69322 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2904,7 +2904,7 @@ dependencies = [ [[package]] name = "iroha" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "async-trait", "color-eyre", @@ -2945,7 +2945,7 @@ dependencies = [ [[package]] name = "iroha_cli_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "proc-macro2", "quote", @@ -2955,7 +2955,7 @@ dependencies = [ [[package]] name = "iroha_client" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "attohttpc", "base64 0.13.1", @@ -2995,7 +2995,7 @@ dependencies = [ [[package]] name = "iroha_client_cli" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "clap 3.2.25", "color-eyre", @@ -3014,7 +3014,7 @@ dependencies = [ [[package]] name = "iroha_config" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "cfg-if", "derive_more", @@ -3039,7 +3039,7 @@ dependencies = [ [[package]] name = "iroha_config_base" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "crossbeam", "displaydoc", @@ -3054,7 +3054,7 @@ dependencies = [ [[package]] name = "iroha_config_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_macro_utils", "proc-macro-error", @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "iroha_core" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "async-trait", "byte-unit", @@ -3105,7 +3105,7 @@ dependencies = [ [[package]] name = "iroha_core_wasm_codec_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "once_cell", "proc-macro-error", @@ -3116,7 +3116,7 @@ dependencies = [ [[package]] name = "iroha_crypto" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "derive_more", "getset", @@ -3136,7 +3136,7 @@ dependencies = [ [[package]] name = "iroha_data_model" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "base64 0.13.1", "criterion", @@ -3165,7 +3165,7 @@ dependencies = [ [[package]] name = "iroha_data_model_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_data_model", "iroha_macro_utils", @@ -3180,7 +3180,7 @@ dependencies = [ [[package]] name = "iroha_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "darling", "impls", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "iroha_derive_primitives" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "heck", "proc-macro2", @@ -3204,7 +3204,7 @@ dependencies = [ [[package]] name = "iroha_ffi" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "derive_more", "getset", @@ -3214,7 +3214,7 @@ dependencies = [ [[package]] name = "iroha_ffi_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "derive_more", "getset", @@ -3229,7 +3229,7 @@ dependencies = [ [[package]] name = "iroha_futures" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_config", "iroha_futures_derive", @@ -3243,7 +3243,7 @@ dependencies = [ [[package]] name = "iroha_futures_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "proc-macro-error", "proc-macro2", @@ -3253,7 +3253,7 @@ dependencies = [ [[package]] name = "iroha_genesis" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "derive_more", "eyre", @@ -3271,7 +3271,7 @@ dependencies = [ [[package]] name = "iroha_logger" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "color-eyre", "console-subscriber", @@ -3290,14 +3290,14 @@ dependencies = [ [[package]] name = "iroha_macro" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_derive", ] [[package]] name = "iroha_macro_utils" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "proc-macro-error", "proc-macro2", @@ -3307,7 +3307,7 @@ dependencies = [ [[package]] name = "iroha_p2p" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "aead", "async-stream", @@ -3331,7 +3331,7 @@ dependencies = [ [[package]] name = "iroha_primitives" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "derive_more", "displaydoc", @@ -3352,7 +3352,7 @@ dependencies = [ [[package]] name = "iroha_primitives_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_primitives", "manyhow", @@ -3363,7 +3363,7 @@ dependencies = [ [[package]] name = "iroha_schema" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "fixnum", "impls", @@ -3374,7 +3374,7 @@ dependencies = [ [[package]] name = "iroha_schema_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_schema", "proc-macro2", @@ -3385,7 +3385,7 @@ dependencies = [ [[package]] name = "iroha_schema_gen" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_crypto", "iroha_data_model", @@ -3396,11 +3396,11 @@ dependencies = [ [[package]] name = "iroha_substrate" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" [[package]] name = "iroha_telemetry" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "async-trait", "chrono", @@ -3423,7 +3423,7 @@ dependencies = [ [[package]] name = "iroha_telemetry_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_core", "proc-macro-error", @@ -3435,7 +3435,7 @@ dependencies = [ [[package]] name = "iroha_version" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_data_model", "iroha_logger", @@ -3450,7 +3450,7 @@ dependencies = [ [[package]] name = "iroha_version_derive" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "darling", "iroha_macro", @@ -3467,7 +3467,7 @@ dependencies = [ [[package]] name = "iroha_wasm_builder" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "eyre", "path-absolutize", @@ -3478,7 +3478,7 @@ dependencies = [ [[package]] name = "iroha_wasm_codec" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "iroha_core_wasm_codec_derive", "parity-scale-codec", @@ -3569,7 +3569,7 @@ dependencies = [ [[package]] name = "kagami" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "clap 4.3.15", "color-eyre", @@ -3618,7 +3618,7 @@ dependencies = [ [[package]] name = "kura_inspector" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "clap 4.3.15", "iroha_core", @@ -4090,7 +4090,7 @@ dependencies = [ [[package]] name = "parity_scale_decoder" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "clap 4.3.15", "colored", @@ -5154,9 +5154,9 @@ dependencies = [ [[package]] name = "sha256" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f894f93906f2a96d3a75a60362f790e71247c588d9f87e97796db1e94bcb808e" +checksum = "386f700b0c798d92ac20a53342c240ff9d58030c3b845fbaeb92eead3a774792" dependencies = [ "async-trait", "bytes", @@ -5486,7 +5486,7 @@ dependencies = [ [[package]] name = "test_network" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" dependencies = [ "eyre", "futures", diff --git a/Cargo.toml b/Cargo.toml index d6bb6c61f0f..59a339e8b25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace.package] edition = "2021" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" # TODO: teams are being deprecated update the authors URL authors = ["Iroha 2 team "] @@ -15,37 +15,37 @@ categories = ["cryptography::cryptocurrencies"] [workspace.dependencies] iroha = { path = "cli" } -iroha_cli_derive = { version = "=2.0.0-pre-rc.16", path = "cli/derive" } -iroha_macro_utils = { version = "=2.0.0-pre-rc.16", path = "macro/utils" } -iroha_wasm_builder = { version = "=2.0.0-pre-rc.16", path = "wasm_builder" } -iroha_telemetry = { version = "=2.0.0-pre-rc.16", path = "telemetry" } -iroha_telemetry_derive = { version = "=2.0.0-pre-rc.16", path = "telemetry/derive" } -iroha_p2p = { version = "=2.0.0-pre-rc.16", path = "p2p" } -iroha_data_model_derive = { version = "=2.0.0-pre-rc.16", path = "data_model/derive" } -iroha_core = { version = "=2.0.0-pre-rc.16", path = "core" } -iroha_primitives = { version = "=2.0.0-pre-rc.16", path = "primitives", default-features = false } -iroha_primitives_derive = { version = "=2.0.0-pre-rc.16", path = "primitives/derive" } -iroha_data_model = { version = "=2.0.0-pre-rc.16", path = "data_model" } -iroha_client = { version = "=2.0.0-pre-rc.16", path = "client" } -iroha_config = { version = "=2.0.0-pre-rc.16", path = "config" } -iroha_config_base = { version = "=2.0.0-pre-rc.16", path = "config/base" } -iroha_config_derive = { version = "=2.0.0-pre-rc.16", path = "config/base/derive" } -iroha_schema_gen = { version = "=2.0.0-pre-rc.16", path = "schema/gen" } -iroha_schema = { version = "=2.0.0-pre-rc.16", path = "schema", default-features = false } -iroha_schema_derive = { version = "=2.0.0-pre-rc.16", path = "schema/derive" } -iroha_logger = { version = "=2.0.0-pre-rc.16", path = "logger" } -iroha_crypto = { version = "=2.0.0-pre-rc.16", path = "crypto", default-features = false } -iroha_macro = { version = "=2.0.0-pre-rc.16", path = "macro", default-features = false } -iroha_derive = { version = "=2.0.0-pre-rc.16", path = "macro/derive" } -iroha_futures = { version = "=2.0.0-pre-rc.16", path = "futures" } -iroha_futures_derive = { version = "=2.0.0-pre-rc.16", path = "futures/derive" } -iroha_genesis = { version = "=2.0.0-pre-rc.16", path = "genesis" } -iroha_ffi = { version = "=2.0.0-pre-rc.16", path = "ffi" } -iroha_ffi_derive = { version = "=2.0.0-pre-rc.16", path = "ffi/derive" } -iroha_version = { version = "=2.0.0-pre-rc.16", path = "version", default-features = false } -iroha_version_derive = { version = "=2.0.0-pre-rc.16", path = "version/derive", default-features = false } -iroha_wasm_codec = { version = "=2.0.0-pre-rc.16", path = "wasm_codec" } -test_network = { version = "=2.0.0-pre-rc.16", path = "core/test_network" } +iroha_cli_derive = { version = "=2.0.0-pre-rc.18", path = "cli/derive" } +iroha_macro_utils = { version = "=2.0.0-pre-rc.18", path = "macro/utils" } +iroha_wasm_builder = { version = "=2.0.0-pre-rc.18", path = "wasm_builder" } +iroha_telemetry = { version = "=2.0.0-pre-rc.18", path = "telemetry" } +iroha_telemetry_derive = { version = "=2.0.0-pre-rc.18", path = "telemetry/derive" } +iroha_p2p = { version = "=2.0.0-pre-rc.18", path = "p2p" } +iroha_data_model_derive = { version = "=2.0.0-pre-rc.18", path = "data_model/derive" } +iroha_core = { version = "=2.0.0-pre-rc.18 ", path = "core" } +iroha_primitives = { version = "=2.0.0-pre-rc.18", path = "primitives", default-features = false } +iroha_primitives_derive = { version = "=2.0.0-pre-rc.18", path = "primitives/derive" } +iroha_data_model = { version = "=2.0.0-pre-rc.18", path = "data_model" } +iroha_client = { version = "=2.0.0-pre-rc.18", path = "client" } +iroha_config = { version = "=2.0.0-pre-rc.18", path = "config" } +iroha_config_base = { version = "=2.0.0-pre-rc.18", path = "config/base" } +iroha_config_derive = { version = "=2.0.0-pre-rc.18", path = "config/base/derive" } +iroha_schema_gen = { version = "=2.0.0-pre-rc.18", path = "schema/gen" } +iroha_schema = { version = "=2.0.0-pre-rc.18", path = "schema", default-features = false } +iroha_schema_derive = { version = "=2.0.0-pre-rc.18", path = "schema/derive" } +iroha_logger = { version = "=2.0.0-pre-rc.18", path = "logger" } +iroha_crypto = { version = "=2.0.0-pre-rc.18", path = "crypto", default-features = false } +iroha_macro = { version = "=2.0.0-pre-rc.18", path = "macro", default-features = false } +iroha_derive = { version = "=2.0.0-pre-rc.18", path = "macro/derive" } +iroha_futures = { version = "=2.0.0-pre-rc.18", path = "futures" } +iroha_futures_derive = { version = "=2.0.0-pre-rc.18", path = "futures/derive" } +iroha_genesis = { version = "=2.0.0-pre-rc.18", path = "genesis" } +iroha_ffi = { version = "=2.0.0-pre-rc.18", path = "ffi" } +iroha_ffi_derive = { version = "=2.0.0-pre-rc.18", path = "ffi/derive" } +iroha_version = { version = "=2.0.0-pre-rc.18", path = "version", default-features = false } +iroha_version_derive = { version = "=2.0.0-pre-rc.18", path = "version/derive", default-features = false } +iroha_wasm_codec = { version = "=2.0.0-pre-rc.18", path = "wasm_codec" } +test_network = { version = "=2.0.0-pre-rc.18", path = "core/test_network" } proc-macro-error = "1.0.4" proc-macro2 = "1.0.49" diff --git a/cli/derive/Cargo.toml b/cli/derive/Cargo.toml index f0ae4cb5992..60ea4adab49 100644 --- a/cli/derive/Cargo.toml +++ b/cli/derive/Cargo.toml @@ -11,7 +11,7 @@ license.workspace = true proc-macro = true [dependencies] -syn = { workspace = true, features = ["parsing", "printing", "extra-traits"] } +syn = { workspace = true, features = ["default", "parsing", "printing", "extra-traits"] } quote = { workspace = true } proc-macro2 = { workspace = true } diff --git a/client/tests/integration/smartcontracts/Cargo.toml b/client/tests/integration/smartcontracts/Cargo.toml index 8e58a6d6815..38484206ca8 100644 --- a/client/tests/integration/smartcontracts/Cargo.toml +++ b/client/tests/integration/smartcontracts/Cargo.toml @@ -1,6 +1,6 @@ [workspace.package] edition = "2021" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" # TODO: teams are being deprecated update the authors URL authors = ["Iroha 2 team "] @@ -27,9 +27,9 @@ opt-level = "z" # Optimize for size vs speed with "s"/"z"(removes vectorizat codegen-units = 1 # Further reduces binary size but increases compilation time [workspace.dependencies] -iroha_validator = { version = "=2.0.0-pre-rc.16", path = "../../../../wasm/validator", features = ["default-validator"] } -iroha_wasm = { version = "=2.0.0-pre-rc.16", path = "../../../../wasm", features = ["debug"]} -iroha_schema = { version = "=2.0.0-pre-rc.16", path = "../../../../schema" } +iroha_validator = { version = "=2.0.0-pre-rc.18", path = "../../../../wasm/validator", features = ["default-validator"] } +iroha_wasm = { version = "=2.0.0-pre-rc.18", path = "../../../../wasm", features = ["debug"]} +iroha_schema = { version = "=2.0.0-pre-rc.18", path = "../../../../schema" } parity-scale-codec = { version = "3.2.1", default-features = false } panic-halt = "0.2.0" diff --git a/config/base/Cargo.toml b/config/base/Cargo.toml index b73bfbf35cd..67734ac2ca7 100644 --- a/config/base/Cargo.toml +++ b/config/base/Cargo.toml @@ -9,10 +9,10 @@ license.workspace = true [dependencies] iroha_config_derive = { workspace = true } -iroha_crypto = { workspace = true } +iroha_crypto = { workspace = true, features = ["std"] } serde = { workspace = true, default-features = false, features = ["derive"] } -serde_json = { workspace = true } +serde_json = { workspace = true, features = ["alloc"] } json5 = { workspace = true } thiserror = { workspace = true } displaydoc = { workspace = true } diff --git a/config/src/client.rs b/config/src/client.rs index cde517f3c85..cf740a974de 100644 --- a/config/src/client.rs +++ b/config/src/client.rs @@ -262,7 +262,10 @@ mod tests { assert_eq!(arb_cfg.account_id, example_cfg.account_id); assert_eq!(arb_cfg.transaction_time_to_live_ms, example_cfg.transaction_time_to_live_ms); assert_eq!(arb_cfg.transaction_status_timeout_ms, example_cfg.transaction_status_timeout_ms); - assert_eq!(arb_cfg.transaction_limits, example_cfg.transaction_limits); + #[allow(deprecated)] // For testing purposes only + { + assert_eq!(arb_cfg.transaction_limits, example_cfg.transaction_limits); + } assert_eq!(arb_cfg.add_transaction_nonce, example_cfg.add_transaction_nonce); } } diff --git a/data_model/derive/Cargo.toml b/data_model/derive/Cargo.toml index c04d4e20c92..0fd8e83b862 100644 --- a/data_model/derive/Cargo.toml +++ b/data_model/derive/Cargo.toml @@ -11,7 +11,7 @@ license.workspace = true proc-macro = true [dependencies] -syn = { workspace = true, features = ["full", "extra-traits"] } +syn = { workspace = true, features = ["default", "full", "extra-traits"] } quote = { workspace = true } proc-macro2 = { workspace = true } proc-macro-error = { workspace = true } diff --git a/default_validator/Cargo.toml b/default_validator/Cargo.toml index 1b42a75ee63..19b1585ceba 100644 --- a/default_validator/Cargo.toml +++ b/default_validator/Cargo.toml @@ -2,7 +2,7 @@ name = "iroha_default_validator" edition = "2021" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" # TODO: teams are being deprecated update the authors URL authors = ["Iroha 2 team "] @@ -24,6 +24,6 @@ opt-level = "z" # Optimize for size vs speed with "s"/"z"(removes vectorizat codegen-units = 1 # Further reduces binary size but increases compilation time [dependencies] -iroha_validator = { version = "2.0.0-pre-rc.16", path = "../wasm/validator", features = ["debug", "default-validator"]} +iroha_validator = { version = "2.0.0-pre-rc.18", path = "../wasm/validator", features = ["debug", "default-validator"]} panic-halt = "0.2.0" diff --git a/derive_primitives/Cargo.toml b/derive_primitives/Cargo.toml index 88ed85efa73..1c929225587 100644 --- a/derive_primitives/Cargo.toml +++ b/derive_primitives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iroha_derive_primitives" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" edition = "2021" [dependencies] diff --git a/futures/derive/Cargo.toml b/futures/derive/Cargo.toml index 3c57c277e45..b1850f24d02 100644 --- a/futures/derive/Cargo.toml +++ b/futures/derive/Cargo.toml @@ -16,7 +16,7 @@ telemetry = [] proc-macro = true [dependencies] -syn = { workspace = true, features = ["full"] } +syn = { workspace = true, features = ["default", "full"] } quote = { workspace = true } proc-macro2 = { workspace = true } proc-macro-error = { workspace = true } diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml index afe0eb14154..b610ffb0bc4 100644 --- a/genesis/Cargo.toml +++ b/genesis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "iroha_genesis" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" authors = ["Iroha 2 team "] edition = "2021" diff --git a/macro/utils/Cargo.toml b/macro/utils/Cargo.toml index c9f09fe39a1..4f8ca144381 100644 --- a/macro/utils/Cargo.toml +++ b/macro/utils/Cargo.toml @@ -15,7 +15,7 @@ maintenance = { status = "actively-developed" } [features] [dependencies] -syn = { workspace = true, features = ["parsing", "printing"] } +syn = { workspace = true, features = ["default", "parsing", "printing"] } quote = { workspace = true } proc-macro2 = { workspace = true } proc-macro-error = { workspace = true } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index e862063cdd1..758888f1fde 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -11,13 +11,13 @@ categories = ["network-programming"] [dependencies] iroha_logger = { workspace = true } iroha_crypto = { workspace = true } -iroha_data_model = { workspace = true } +iroha_data_model = { workspace = true, features = ["transparent_api"] } iroha_primitives = { workspace = true } iroha_config_base = { workspace = true } iroha_data_model_derive = { workspace = true } rand = { workspace = true } -tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-util", "net"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-util", "net", "time"] } async-stream = { workspace = true } futures = { workspace = true, features = ["alloc"] } async-trait = { workspace = true } diff --git a/p2p/src/network.rs b/p2p/src/network.rs index 8edbe7ef646..a3b3da23294 100644 --- a/p2p/src/network.rs +++ b/p2p/src/network.rs @@ -288,7 +288,7 @@ impl NetworkBase { .into_iter() .map(|peer_id| { // Determine who is responsible for connecting - let peer_public_key_hash = blake2b_hash(peer_id.public_key.payload()); + let peer_public_key_hash = blake2b_hash(peer_id.public_key().payload()); let is_active = self_public_key_hash > peer_public_key_hash; (peer_id, is_active) }) @@ -303,8 +303,8 @@ impl NetworkBase { // Peer is not connected but should .filter_map(|(peer, is_active)| ( !self.peers.contains_key(&peer.public_key) - && !self.connecting_peers.values().any(|public_key| &peer.public_key == public_key) - && *is_active + && !self.connecting_peers.values().any(|public_key| peer.public_key == *public_key) + && *is_active ).then_some(peer)) .cloned() .collect::>(); @@ -333,7 +333,7 @@ impl NetworkBase { let conn_id = self.get_conn_id(); self.connecting_peers - .insert(conn_id, peer.public_key.clone()); + .insert(conn_id, peer.public_key().clone()); let service_message_sender = self.service_message_sender.clone(); connecting::( // NOTE: we intentionally use peer's address and our public key, it's used during handshake diff --git a/p2p/src/peer.rs b/p2p/src/peer.rs index c9ce7c99e36..e7dbd5b95bf 100644 --- a/p2p/src/peer.rs +++ b/p2p/src/peer.rs @@ -497,7 +497,7 @@ mod state { // We take our public key from our `id` and will replace it with theirs when we read it // Packing length and message in one network packet for efficiency - let data = peer_id.public_key.encode(); + let data = peer_id.public_key().encode(); let data = &cryptographer.encrypt(data.as_slice())?; diff --git a/schema/derive/Cargo.toml b/schema/derive/Cargo.toml index a4c4a9214d4..42b41542e73 100644 --- a/schema/derive/Cargo.toml +++ b/schema/derive/Cargo.toml @@ -11,7 +11,7 @@ license.workspace = true proc-macro = true [dependencies] -syn = { workspace = true, features = ["full"] } +syn = { workspace = true, features = ["default", "full"] } proc-macro2 = { workspace = true } quote = { workspace = true } diff --git a/telemetry/derive/Cargo.toml b/telemetry/derive/Cargo.toml index 2002d8bf5ed..6348a5683a7 100644 --- a/telemetry/derive/Cargo.toml +++ b/telemetry/derive/Cargo.toml @@ -16,7 +16,7 @@ is-it-maintained-open-issues = { repository = "https://github.com/hyperledger/ir maintenance = { status = "actively-developed" } [dependencies] -syn = { workspace = true, features = ["full"] } +syn = { workspace = true, features = ["default", "full"] } quote = { workspace = true } proc-macro2 = { workspace = true } proc-macro-error = { workspace = true } diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index e91f2322ed9..5634174df65 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -1,6 +1,6 @@ [workspace.package] edition = "2021" -version = "2.0.0-pre-rc.16" +version = "2.0.0-pre-rc.18" # TODO: teams are being deprecated update the authors URL authors = ["Iroha 2 team "] @@ -21,7 +21,7 @@ members = [ ] [workspace.dependencies] -iroha_derive_primitives = { version = "2.0.0-pre-rc.16", path = "../derive_primitives" } +iroha_derive_primitives = { version = "2.0.0-pre-rc.18", path = "../derive_primitives" } syn = { version = "1", default-features = false, features = ["full", "extra-traits", "derive"] } quote = "1.0" proc-macro2 = "1.0.49" @@ -42,8 +42,8 @@ license.workspace = true debug = [] [dependencies] -iroha_data_model = { version = "=2.0.0-pre-rc.16", path = "../data_model", default-features = false } -iroha_wasm_derive = { version = "=2.0.0-pre-rc.16", path = "derive" } +iroha_data_model = { version = "=2.0.0-pre-rc.18", path = "../data_model", default-features = false } +iroha_wasm_derive = { version = "=2.0.0-pre-rc.18", path = "derive" } parity-scale-codec = { version = "3.1.5", default-features = false } wee_alloc = "0.4.5" diff --git a/wasm/validator/Cargo.toml b/wasm/validator/Cargo.toml index b6447e35507..fff3273e9c3 100644 --- a/wasm/validator/Cargo.toml +++ b/wasm/validator/Cargo.toml @@ -14,9 +14,9 @@ debug = ["iroha_wasm/debug"] default-validator = ["dep:anyhow"] [dependencies] -iroha_wasm = { version = "2.0.0-pre-rc.16", path = ".." } -iroha_schema = { path = "../../schema", version = "=2.0.0-pre-rc.16" } -iroha_validator_derive = { version = "2.0.0-pre-rc.16", path = "derive" } +iroha_wasm = { version = "2.0.0-pre-rc.18", path = ".." } +iroha_schema = { path = "../../schema", version = "=2.0.0-pre-rc.18" } +iroha_validator_derive = { version = "2.0.0-pre-rc.18", path = "derive" } anyhow = {version = "1.0.71", default-features = false, optional = true} parity-scale-codec = { version = "3.1.5", default-features = false } diff --git a/wasm_builder/Cargo.toml b/wasm_builder/Cargo.toml index a8ef307a1c1..64954992991 100644 --- a/wasm_builder/Cargo.toml +++ b/wasm_builder/Cargo.toml @@ -10,7 +10,7 @@ categories = ["development-tools::build-utils"] [dependencies] eyre = { workspace = true } -serde_json = { workspace = true } -sha256 = "1.1.4" +serde_json = { workspace = true, features = ["std"] } +sha256 = "1.2.2" path-absolutize = { workspace = true } wasm-opt = "0.113.0" diff --git a/wasm_codec/Cargo.toml b/wasm_codec/Cargo.toml index cd4bdfd4a95..68a7680c432 100644 --- a/wasm_codec/Cargo.toml +++ b/wasm_codec/Cargo.toml @@ -8,7 +8,7 @@ license.workspace = true [dependencies] -iroha_core_wasm_codec_derive = { version = "=2.0.0-pre-rc.16", path = "derive" } +iroha_core_wasm_codec_derive = { version = "=2.0.0-pre-rc.18", path = "derive" } wasmtime = { workspace = true } parity-scale-codec = { workspace = true, features = ["derive"] } diff --git a/wasm_codec/derive/Cargo.toml b/wasm_codec/derive/Cargo.toml index 64e2fc26d55..5cbc4f6dbc4 100644 --- a/wasm_codec/derive/Cargo.toml +++ b/wasm_codec/derive/Cargo.toml @@ -10,7 +10,7 @@ license.workspace = true proc-macro = true [dependencies] -syn = { workspace = true, features = ["full", "extra-traits"] } +syn = { workspace = true, features = ["default", "full", "extra-traits", "parsing"] } quote = { workspace = true } proc-macro2 = { workspace = true } proc-macro-error = { workspace = true }