diff --git a/CHANGELOG.md b/CHANGELOG.md index 01f5a7383c4..36d0808797e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +## [2.0.0-pre-rc.21.1] - 2024-05-01 + +- add RawGenesisBlock to schema (#4538) +- remove nested option on `TransactionEventFilter::block_height` (#4538) + ## [2.0.0-pre-rc.21] - 2024-04-19 ### Added diff --git a/Cargo.lock b/Cargo.lock index 9c6ea3ac983..a2f8935b57d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2700,7 +2700,7 @@ dependencies = [ [[package]] name = "iroha" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "assertables", "clap", @@ -2735,7 +2735,7 @@ dependencies = [ [[package]] name = "iroha_client" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "attohttpc", "base64", @@ -2780,7 +2780,7 @@ dependencies = [ [[package]] name = "iroha_client_cli" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "clap", "color-eyre", @@ -2797,7 +2797,7 @@ dependencies = [ [[package]] name = "iroha_config" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "cfg-if", "derive_more", @@ -2830,7 +2830,7 @@ dependencies = [ [[package]] name = "iroha_config_base" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "derive_more", "drop_bomb", @@ -2846,7 +2846,7 @@ dependencies = [ [[package]] name = "iroha_core" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "async-trait", "byte-unit", @@ -2888,7 +2888,7 @@ dependencies = [ [[package]] name = "iroha_core_wasm_codec_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_macro_utils", "manyhow", @@ -2900,7 +2900,7 @@ dependencies = [ [[package]] name = "iroha_crypto" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "aead", "amcl", @@ -2942,7 +2942,7 @@ dependencies = [ [[package]] name = "iroha_data_model" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "base64", "criterion", @@ -2970,7 +2970,7 @@ dependencies = [ [[package]] name = "iroha_data_model_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "derive_more", @@ -2989,7 +2989,7 @@ dependencies = [ [[package]] name = "iroha_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "impls", @@ -3003,7 +3003,7 @@ dependencies = [ [[package]] name = "iroha_executor" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_executor_derive", "iroha_schema", @@ -3015,7 +3015,7 @@ dependencies = [ [[package]] name = "iroha_executor_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "iroha_macro_utils", @@ -3027,7 +3027,7 @@ dependencies = [ [[package]] name = "iroha_ffi" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "derive_more", "getset", @@ -3037,7 +3037,7 @@ dependencies = [ [[package]] name = "iroha_ffi_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "getset", @@ -3054,7 +3054,7 @@ dependencies = [ [[package]] name = "iroha_futures" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_config", "iroha_futures_derive", @@ -3068,7 +3068,7 @@ dependencies = [ [[package]] name = "iroha_futures_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_macro_utils", "manyhow", @@ -3079,7 +3079,7 @@ dependencies = [ [[package]] name = "iroha_genesis" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "derive_more", "eyre", @@ -3094,7 +3094,7 @@ dependencies = [ [[package]] name = "iroha_logger" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "color-eyre", "console-subscriber", @@ -3114,14 +3114,14 @@ dependencies = [ [[package]] name = "iroha_macro" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_derive", ] [[package]] name = "iroha_macro_utils" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "drop_bomb", @@ -3133,7 +3133,7 @@ dependencies = [ [[package]] name = "iroha_numeric" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "derive_more", "displaydoc", @@ -3149,7 +3149,7 @@ dependencies = [ [[package]] name = "iroha_p2p" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "async-trait", "bytes", @@ -3172,7 +3172,7 @@ dependencies = [ [[package]] name = "iroha_primitives" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "derive_more", "displaydoc", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "iroha_primitives_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_numeric", "iroha_primitives", @@ -3206,7 +3206,7 @@ dependencies = [ [[package]] name = "iroha_schema" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "impls", "iroha_schema_derive", @@ -3217,7 +3217,7 @@ dependencies = [ [[package]] name = "iroha_schema_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "iroha_schema", @@ -3230,7 +3230,7 @@ dependencies = [ [[package]] name = "iroha_schema_gen" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_crypto", "iroha_data_model", @@ -3241,7 +3241,7 @@ dependencies = [ [[package]] name = "iroha_smart_contract" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "derive_more", "getrandom", @@ -3255,7 +3255,7 @@ dependencies = [ [[package]] name = "iroha_smart_contract_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_macro_utils", "manyhow", @@ -3266,7 +3266,7 @@ dependencies = [ [[package]] name = "iroha_smart_contract_utils" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_data_model", "parity-scale-codec", @@ -3275,7 +3275,7 @@ dependencies = [ [[package]] name = "iroha_swarm" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "clap", "color-eyre", @@ -3297,7 +3297,7 @@ dependencies = [ [[package]] name = "iroha_telemetry" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "async-trait", "chrono", @@ -3323,7 +3323,7 @@ dependencies = [ [[package]] name = "iroha_telemetry_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_core", "iroha_macro_utils", @@ -3336,7 +3336,7 @@ dependencies = [ [[package]] name = "iroha_torii" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "async-trait", "displaydoc", @@ -3366,14 +3366,14 @@ dependencies = [ [[package]] name = "iroha_torii_const" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_primitives", ] [[package]] name = "iroha_torii_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "manyhow", "proc-macro2", @@ -3384,7 +3384,7 @@ dependencies = [ [[package]] name = "iroha_trigger" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_smart_contract", "iroha_smart_contract_utils", @@ -3393,7 +3393,7 @@ dependencies = [ [[package]] name = "iroha_trigger_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "iroha_macro_utils", @@ -3405,7 +3405,7 @@ dependencies = [ [[package]] name = "iroha_version" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_data_model", "iroha_logger", @@ -3420,7 +3420,7 @@ dependencies = [ [[package]] name = "iroha_version_derive" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "darling", "iroha_macro", @@ -3437,7 +3437,7 @@ dependencies = [ [[package]] name = "iroha_wasm_builder" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "eyre", "path-absolutize", @@ -3448,7 +3448,7 @@ dependencies = [ [[package]] name = "iroha_wasm_builder_cli" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "clap", "color-eyre", @@ -3459,7 +3459,7 @@ dependencies = [ [[package]] name = "iroha_wasm_codec" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "iroha_core_wasm_codec_derive", "parity-scale-codec", @@ -3469,7 +3469,7 @@ dependencies = [ [[package]] name = "iroha_wasm_test_runner" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "anyhow", "wasmtime", @@ -3580,7 +3580,7 @@ dependencies = [ [[package]] name = "kagami" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "clap", "color-eyre", @@ -3607,7 +3607,7 @@ dependencies = [ [[package]] name = "kura_inspector" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "clap", "iroha_core", @@ -4148,7 +4148,7 @@ dependencies = [ [[package]] name = "parity_scale_decoder" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "clap", "colored", @@ -5494,7 +5494,7 @@ dependencies = [ [[package]] name = "test_network" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" dependencies = [ "eyre", "futures", diff --git a/Cargo.toml b/Cargo.toml index baf09ebf681..c945937f26f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace.package] edition = "2021" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" # TODO: teams are being deprecated update the authors URL authors = ["Iroha 2 team "] @@ -15,45 +15,45 @@ categories = ["cryptography::cryptocurrencies"] [workspace.dependencies] iroha = { path = "cli" } -iroha_torii = { version = "=2.0.0-pre-rc.21", path = "torii" } -iroha_torii_derive = { version = "=2.0.0-pre-rc.21", path = "torii/derive" } -iroha_torii_const = { version = "=2.0.0-pre-rc.21", path = "torii/const" } -iroha_macro_utils = { version = "=2.0.0-pre-rc.21", path = "macro/utils" } -iroha_telemetry = { version = "=2.0.0-pre-rc.21", path = "telemetry" } -iroha_telemetry_derive = { version = "=2.0.0-pre-rc.21", path = "telemetry/derive" } -iroha_p2p = { version = "=2.0.0-pre-rc.21", path = "p2p" } -iroha_core = { version = "=2.0.0-pre-rc.21 ", path = "core" } -iroha_primitives = { version = "=2.0.0-pre-rc.21", path = "primitives", default-features = false } -iroha_primitives_derive = { version = "=2.0.0-pre-rc.21", path = "primitives/derive" } -iroha_data_model = { version = "=2.0.0-pre-rc.21", path = "data_model", default-features = false } -iroha_data_model_derive = { version = "=2.0.0-pre-rc.21", path = "data_model/derive" } -iroha_client = { version = "=2.0.0-pre-rc.21", path = "client" } -iroha_config = { version = "=2.0.0-pre-rc.21", path = "config" } -iroha_config_base = { version = "=2.0.0-pre-rc.21", path = "config/base" } -iroha_schema_gen = { version = "=2.0.0-pre-rc.21", path = "schema/gen" } -iroha_schema = { version = "=2.0.0-pre-rc.21", path = "schema", default-features = false } -iroha_schema_derive = { version = "=2.0.0-pre-rc.21", path = "schema/derive" } -iroha_logger = { version = "=2.0.0-pre-rc.21", path = "logger" } -iroha_crypto = { version = "=2.0.0-pre-rc.21", path = "crypto", default-features = false } -iroha_macro = { version = "=2.0.0-pre-rc.21", path = "macro", default-features = false } -iroha_derive = { version = "=2.0.0-pre-rc.21", path = "macro/derive" } -iroha_futures = { version = "=2.0.0-pre-rc.21", path = "futures" } -iroha_futures_derive = { version = "=2.0.0-pre-rc.21", path = "futures/derive" } -iroha_genesis = { version = "=2.0.0-pre-rc.21", path = "genesis" } -iroha_ffi = { version = "=2.0.0-pre-rc.21", path = "ffi" } -iroha_ffi_derive = { version = "=2.0.0-pre-rc.21", path = "ffi/derive" } -iroha_version = { version = "=2.0.0-pre-rc.21", path = "version", default-features = false } -iroha_version_derive = { version = "=2.0.0-pre-rc.21", path = "version/derive", default-features = false } -iroha_wasm_codec = { version = "=2.0.0-pre-rc.21", path = "wasm_codec" } -iroha_wasm_builder = { version = "=2.0.0-pre-rc.21", path = "wasm_builder" } - -iroha_smart_contract = { version = "=2.0.0-pre-rc.21", path = "smart_contract" } -iroha_smart_contract_derive = { version = "=2.0.0-pre-rc.21", path = "smart_contract/derive" } -iroha_smart_contract_utils = { version = "=2.0.0-pre-rc.21", path = "smart_contract/utils" } -iroha_executor_derive = { version = "=2.0.0-pre-rc.21", path = "smart_contract/executor/derive" } -iroha_trigger_derive = { version = "=2.0.0-pre-rc.21", path = "smart_contract/trigger/derive" } - -test_network = { version = "=2.0.0-pre-rc.21", path = "core/test_network" } +iroha_torii = { version = "=2.0.0-pre-rc.21.1", path = "torii" } +iroha_torii_derive = { version = "=2.0.0-pre-rc.21.1", path = "torii/derive" } +iroha_torii_const = { version = "=2.0.0-pre-rc.21.1", path = "torii/const" } +iroha_macro_utils = { version = "=2.0.0-pre-rc.21.1", path = "macro/utils" } +iroha_telemetry = { version = "=2.0.0-pre-rc.21.1", path = "telemetry" } +iroha_telemetry_derive = { version = "=2.0.0-pre-rc.21.1", path = "telemetry/derive" } +iroha_p2p = { version = "=2.0.0-pre-rc.21.1", path = "p2p" } +iroha_core = { version = "=2.0.0-pre-rc.21.1 ", path = "core" } +iroha_primitives = { version = "=2.0.0-pre-rc.21.1", path = "primitives", default-features = false } +iroha_primitives_derive = { version = "=2.0.0-pre-rc.21.1", path = "primitives/derive" } +iroha_data_model = { version = "=2.0.0-pre-rc.21.1", path = "data_model", default-features = false } +iroha_data_model_derive = { version = "=2.0.0-pre-rc.21.1", path = "data_model/derive" } +iroha_client = { version = "=2.0.0-pre-rc.21.1", path = "client" } +iroha_config = { version = "=2.0.0-pre-rc.21.1", path = "config" } +iroha_config_base = { version = "=2.0.0-pre-rc.21.1", path = "config/base" } +iroha_schema_gen = { version = "=2.0.0-pre-rc.21.1", path = "schema/gen" } +iroha_schema = { version = "=2.0.0-pre-rc.21.1", path = "schema", default-features = false } +iroha_schema_derive = { version = "=2.0.0-pre-rc.21.1", path = "schema/derive" } +iroha_logger = { version = "=2.0.0-pre-rc.21.1", path = "logger" } +iroha_crypto = { version = "=2.0.0-pre-rc.21.1", path = "crypto", default-features = false } +iroha_macro = { version = "=2.0.0-pre-rc.21.1", path = "macro", default-features = false } +iroha_derive = { version = "=2.0.0-pre-rc.21.1", path = "macro/derive" } +iroha_futures = { version = "=2.0.0-pre-rc.21.1", path = "futures" } +iroha_futures_derive = { version = "=2.0.0-pre-rc.21.1", path = "futures/derive" } +iroha_genesis = { version = "=2.0.0-pre-rc.21.1", path = "genesis" } +iroha_ffi = { version = "=2.0.0-pre-rc.21.1", path = "ffi" } +iroha_ffi_derive = { version = "=2.0.0-pre-rc.21.1", path = "ffi/derive" } +iroha_version = { version = "=2.0.0-pre-rc.21.1", path = "version", default-features = false } +iroha_version_derive = { version = "=2.0.0-pre-rc.21.1", path = "version/derive", default-features = false } +iroha_wasm_codec = { version = "=2.0.0-pre-rc.21.1", path = "wasm_codec" } +iroha_wasm_builder = { version = "=2.0.0-pre-rc.21.1", path = "wasm_builder" } + +iroha_smart_contract = { version = "=2.0.0-pre-rc.21.1", path = "smart_contract" } +iroha_smart_contract_derive = { version = "=2.0.0-pre-rc.21.1", path = "smart_contract/derive" } +iroha_smart_contract_utils = { version = "=2.0.0-pre-rc.21.1", path = "smart_contract/utils" } +iroha_executor_derive = { version = "=2.0.0-pre-rc.21.1", path = "smart_contract/executor/derive" } +iroha_trigger_derive = { version = "=2.0.0-pre-rc.21.1", path = "smart_contract/trigger/derive" } + +test_network = { version = "=2.0.0-pre-rc.21.1", path = "core/test_network" } proc-macro2 = "1.0.81" syn = { version = "2.0.60", default-features = false } quote = "1.0.36" diff --git a/client/tests/integration/smartcontracts/Cargo.toml b/client/tests/integration/smartcontracts/Cargo.toml index 663956a73a0..579d7d1d26e 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.21" +version = "2.0.0-pre-rc.21.1" # TODO: teams are being deprecated update the authors URL authors = ["Iroha 2 team "] @@ -28,10 +28,10 @@ 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_smart_contract = { version = "=2.0.0-pre-rc.21", path = "../../../../smart_contract", features = ["debug"]} -iroha_trigger = { version = "=2.0.0-pre-rc.21", path = "../../../../smart_contract/trigger", features = ["debug"]} -iroha_executor = { version = "=2.0.0-pre-rc.21", path = "../../../../smart_contract/executor" } -iroha_schema = { version = "=2.0.0-pre-rc.21", path = "../../../../schema" } +iroha_smart_contract = { version = "=2.0.0-pre-rc.21.1", path = "../../../../smart_contract", features = ["debug"]} +iroha_trigger = { version = "=2.0.0-pre-rc.21.1", path = "../../../../smart_contract/trigger", features = ["debug"]} +iroha_executor = { version = "=2.0.0-pre-rc.21.1", path = "../../../../smart_contract/executor" } +iroha_schema = { version = "=2.0.0-pre-rc.21.1", path = "../../../../schema" } parity-scale-codec = { version = "3.2.1", default-features = false } anyhow = { version = "1.0.71", default-features = false } diff --git a/default_executor/Cargo.toml b/default_executor/Cargo.toml index 9c83a1f69a1..ba1bee70035 100644 --- a/default_executor/Cargo.toml +++ b/default_executor/Cargo.toml @@ -2,7 +2,7 @@ name = "iroha_default_executor" edition = "2021" -version = "2.0.0-pre-rc.21" +version = "2.0.0-pre-rc.21.1" # TODO: teams are being deprecated update the authors URL authors = ["Iroha 2 team "] @@ -24,7 +24,7 @@ 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_executor = { version = "2.0.0-pre-rc.21", path = "../smart_contract/executor", features = ["debug"] } +iroha_executor = { version = "2.0.0-pre-rc.21.1", path = "../smart_contract/executor", features = ["debug"] } getrandom = { version = "0.2", features = ["custom"] } lol_alloc = "0.4.0" diff --git a/wasm_codec/Cargo.toml b/wasm_codec/Cargo.toml index 309267f0264..478c6c85483 100644 --- a/wasm_codec/Cargo.toml +++ b/wasm_codec/Cargo.toml @@ -10,7 +10,7 @@ license.workspace = true workspace = true [dependencies] -iroha_core_wasm_codec_derive = { version = "=2.0.0-pre-rc.21", path = "derive" } +iroha_core_wasm_codec_derive = { version = "=2.0.0-pre-rc.21.1", path = "derive" } thiserror = { workspace = true } wasmtime = { workspace = true }