From c19a7fc39dd238f643b856c4b5dc802f0f502482 Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Thu, 8 Feb 2024 13:37:20 +0000 Subject: [PATCH 01/10] Release `5.0.0-rc.1` --- CHANGELOG.md | 2 ++ Cargo.toml | 28 +++++++++---------- crates/ink/codegen/Cargo.toml | 2 +- .../call-builder-return-value/Cargo.toml | 2 +- integration-tests/call-runtime/Cargo.toml | 2 +- .../combined-extension/Cargo.toml | 2 +- .../conditional-compilation/Cargo.toml | 2 +- .../contract-terminate/Cargo.toml | 2 +- .../contract-transfer/Cargo.toml | 2 +- .../cross-contract-calls/Cargo.toml | 2 +- .../other-contract/Cargo.toml | 2 +- integration-tests/custom-allocator/Cargo.toml | 2 +- .../custom-environment/Cargo.toml | 2 +- integration-tests/dns/Cargo.toml | 2 +- integration-tests/e2e-call-runtime/Cargo.toml | 2 +- .../e2e-runtime-only-backend/Cargo.toml | 2 +- integration-tests/erc1155/Cargo.toml | 2 +- integration-tests/erc20/Cargo.toml | 2 +- integration-tests/erc721/Cargo.toml | 2 +- integration-tests/events/Cargo.toml | 2 +- integration-tests/flipper/Cargo.toml | 2 +- integration-tests/incrementer/Cargo.toml | 2 +- .../call-builder-delegate/Cargo.toml | 2 +- .../call-builder/Cargo.toml | 2 +- .../constructors-return-value/Cargo.toml | 2 +- .../contract-ref/Cargo.toml | 2 +- .../integration-flipper/Cargo.toml | 2 +- .../mapping-integration-tests/Cargo.toml | 2 +- integration-tests/mother/Cargo.toml | 2 +- .../multi-contract-caller/Cargo.toml | 2 +- .../accumulator/Cargo.toml | 2 +- .../multi-contract-caller/adder/Cargo.toml | 2 +- .../multi-contract-caller/subber/Cargo.toml | 2 +- integration-tests/multisig/Cargo.toml | 2 +- integration-tests/payment-channel/Cargo.toml | 2 +- integration-tests/psp22-extension/Cargo.toml | 2 +- integration-tests/rand-extension/Cargo.toml | 2 +- .../sr25519-verification/Cargo.toml | 2 +- integration-tests/static-buffer/Cargo.toml | 2 +- .../trait-dyn-cross-contract-calls/Cargo.toml | 2 +- .../contracts/incrementer/Cargo.toml | 2 +- .../traits/Cargo.toml | 2 +- integration-tests/trait-erc20/Cargo.toml | 2 +- integration-tests/trait-flipper/Cargo.toml | 2 +- .../trait-incrementer/Cargo.toml | 2 +- .../trait-incrementer/traits/Cargo.toml | 2 +- .../delegator/Cargo.toml | 2 +- .../delegator/delegatee/Cargo.toml | 2 +- .../set-code-hash/Cargo.toml | 2 +- .../updated-incrementer/Cargo.toml | 2 +- .../wildcard-selector/Cargo.toml | 2 +- linting/Cargo.toml | 4 +-- linting/extra/Cargo.toml | 10 +++---- linting/mandatory/Cargo.toml | 10 +++---- 54 files changed, 77 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce2d2283b6..c5580e8129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## Version 5.0.0-rc.1 + ### Added - Custom signature topic in Events - [#2031](https://github.com/paritytech/ink/pull/2031) - [Linter] `non_fallible_api` lint - [#2004](https://github.com/paritytech/ink/pull/2004) diff --git a/Cargo.toml b/Cargo.toml index 798b2e26f7..c844c37f8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ homepage = "https://www.parity.io/" keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] license = "Apache-2.0" repository = "https://github.com/paritytech/ink" -version = "5.0.0-rc" +version = "5.0.0-rc.1" [workspace.dependencies] arrayref = { version = "0.3" } @@ -91,19 +91,19 @@ sp-runtime = { version = "26.0.0", default-features = false } sp-weights = { version = "22.0.0", default-features = false } # Local dependencies -ink = { version = "=5.0.0-rc", path = "crates/ink", default-features = false } -ink_allocator = { version = "=5.0.0-rc", path = "crates/allocator", default-features = false } -ink_codegen = { version = "=5.0.0-rc", path = "crates/ink/codegen", default-features = false } -ink_e2e_macro = { version = "=5.0.0-rc", path = "crates/e2e/macro", default-features = false } -ink_engine = { version = "=5.0.0-rc", path = "crates/engine", default-features = false } -ink_env = { version = "=5.0.0-rc", path = "crates/env", default-features = false } -ink_ir = { version = "=5.0.0-rc", path = "crates/ink/ir", default-features = false } -ink_macro = { version = "=5.0.0-rc", path = "crates/ink/macro", default-features = false } -ink_metadata = { version = "=5.0.0-rc", path = "crates/metadata", default-features = false } -ink_prelude = { version = "=5.0.0-rc", path = "crates/prelude", default-features = false } -ink_primitives = { version = "=5.0.0-rc", path = "crates/primitives", default-features = false } -ink_storage = { version = "=5.0.0-rc", path = "crates/storage", default-features = false } -ink_storage_traits = { version = "=5.0.0-rc", path = "crates/storage/traits", default-features = false } +ink = { version = "=5.0.0-rc.1", path = "crates/ink", default-features = false } +ink_allocator = { version = "=5.0.0-rc.1", path = "crates/allocator", default-features = false } +ink_codegen = { version = "=5.0.0-rc.1", path = "crates/ink/codegen", default-features = false } +ink_e2e_macro = { version = "=5.0.0-rc.1", path = "crates/e2e/macro", default-features = false } +ink_engine = { version = "=5.0.0-rc.1", path = "crates/engine", default-features = false } +ink_env = { version = "=5.0.0-rc.1", path = "crates/env", default-features = false } +ink_ir = { version = "=5.0.0-rc.1", path = "crates/ink/ir", default-features = false } +ink_macro = { version = "=5.0.0-rc.1", path = "crates/ink/macro", default-features = false } +ink_metadata = { version = "=5.0.0-rc.1", path = "crates/metadata", default-features = false } +ink_prelude = { version = "=5.0.0-rc.1", path = "crates/prelude", default-features = false } +ink_primitives = { version = "=5.0.0-rc.1", path = "crates/primitives", default-features = false } +ink_storage = { version = "=5.0.0-rc.1", path = "crates/storage", default-features = false } +ink_storage_traits = { version = "=5.0.0-rc.1", path = "crates/storage/traits", default-features = false } [profile.release] panic = "abort" diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index 531ce41d5f..a9d961cac3 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -19,7 +19,7 @@ name = "ink_codegen" [dependencies] ink_primitives = { workspace = true } -ir = { version = "=5.0.0-rc", package = "ink_ir", path = "../ir", default-features = false } +ir = { version = "=5.0.0-rc.1", package = "ink_ir", path = "../ir", default-features = false } quote = { workspace = true } syn = { workspace = true, features = ["parsing", "full", "extra-traits"] } proc-macro2 = { workspace = true } diff --git a/integration-tests/call-builder-return-value/Cargo.toml b/integration-tests/call-builder-return-value/Cargo.toml index b4723f34a9..de774a512b 100755 --- a/integration-tests/call-builder-return-value/Cargo.toml +++ b/integration-tests/call-builder-return-value/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "call_builder_return_value" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/call-runtime/Cargo.toml b/integration-tests/call-runtime/Cargo.toml index 5b2cf0a600..e3b6ada668 100644 --- a/integration-tests/call-runtime/Cargo.toml +++ b/integration-tests/call-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "call-runtime" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/combined-extension/Cargo.toml b/integration-tests/combined-extension/Cargo.toml index e93251606a..6d59f89413 100755 --- a/integration-tests/combined-extension/Cargo.toml +++ b/integration-tests/combined-extension/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "combined_extension" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/conditional-compilation/Cargo.toml b/integration-tests/conditional-compilation/Cargo.toml index 20e88882e8..db5eba91bf 100755 --- a/integration-tests/conditional-compilation/Cargo.toml +++ b/integration-tests/conditional-compilation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "conditional-compilation" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" diff --git a/integration-tests/contract-terminate/Cargo.toml b/integration-tests/contract-terminate/Cargo.toml index 23cc5b2e65..bd786a0104 100644 --- a/integration-tests/contract-terminate/Cargo.toml +++ b/integration-tests/contract-terminate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract_terminate" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/contract-transfer/Cargo.toml b/integration-tests/contract-transfer/Cargo.toml index b0c9e9a94b..18188c6283 100644 --- a/integration-tests/contract-transfer/Cargo.toml +++ b/integration-tests/contract-transfer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract_transfer" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/cross-contract-calls/Cargo.toml b/integration-tests/cross-contract-calls/Cargo.toml index ad17489b13..00f2c7c9ea 100755 --- a/integration-tests/cross-contract-calls/Cargo.toml +++ b/integration-tests/cross-contract-calls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cross-contract-calls" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/cross-contract-calls/other-contract/Cargo.toml b/integration-tests/cross-contract-calls/other-contract/Cargo.toml index c0b4748e22..5d6d970ab0 100755 --- a/integration-tests/cross-contract-calls/other-contract/Cargo.toml +++ b/integration-tests/cross-contract-calls/other-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "other-contract" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/custom-allocator/Cargo.toml b/integration-tests/custom-allocator/Cargo.toml index e3315fd7ca..44017b3e7b 100755 --- a/integration-tests/custom-allocator/Cargo.toml +++ b/integration-tests/custom-allocator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "custom-allocator" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/custom-environment/Cargo.toml b/integration-tests/custom-environment/Cargo.toml index d38008ea1e..06ebd33355 100644 --- a/integration-tests/custom-environment/Cargo.toml +++ b/integration-tests/custom-environment/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "custom-environment" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/dns/Cargo.toml b/integration-tests/dns/Cargo.toml index 007fd9203b..3c820380bd 100644 --- a/integration-tests/dns/Cargo.toml +++ b/integration-tests/dns/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dns" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/e2e-call-runtime/Cargo.toml b/integration-tests/e2e-call-runtime/Cargo.toml index d376a169a5..caee8e6895 100644 --- a/integration-tests/e2e-call-runtime/Cargo.toml +++ b/integration-tests/e2e-call-runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "e2e_call_runtime" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/e2e-runtime-only-backend/Cargo.toml b/integration-tests/e2e-runtime-only-backend/Cargo.toml index 34b769e03e..eace3ee675 100644 --- a/integration-tests/e2e-runtime-only-backend/Cargo.toml +++ b/integration-tests/e2e-runtime-only-backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "e2e-runtime-only-backend" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/erc1155/Cargo.toml b/integration-tests/erc1155/Cargo.toml index 5f3e2496f9..6d652fa61d 100644 --- a/integration-tests/erc1155/Cargo.toml +++ b/integration-tests/erc1155/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "erc1155" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/erc20/Cargo.toml b/integration-tests/erc20/Cargo.toml index 0991702fd8..7a25cb718e 100644 --- a/integration-tests/erc20/Cargo.toml +++ b/integration-tests/erc20/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "erc20" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/erc721/Cargo.toml b/integration-tests/erc721/Cargo.toml index 3895e12a47..9c05f97f15 100644 --- a/integration-tests/erc721/Cargo.toml +++ b/integration-tests/erc721/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "erc721" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/events/Cargo.toml b/integration-tests/events/Cargo.toml index ebc1e83715..cd5a14bb11 100644 --- a/integration-tests/events/Cargo.toml +++ b/integration-tests/events/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "events" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/flipper/Cargo.toml b/integration-tests/flipper/Cargo.toml index 9547f91c7e..1f39e32b9a 100644 --- a/integration-tests/flipper/Cargo.toml +++ b/integration-tests/flipper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "flipper" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/incrementer/Cargo.toml b/integration-tests/incrementer/Cargo.toml index 8080f0be9f..42c24e02ad 100644 --- a/integration-tests/incrementer/Cargo.toml +++ b/integration-tests/incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "incrementer" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/lang-err-integration-tests/call-builder-delegate/Cargo.toml b/integration-tests/lang-err-integration-tests/call-builder-delegate/Cargo.toml index b311b634e6..ad730fe2e4 100755 --- a/integration-tests/lang-err-integration-tests/call-builder-delegate/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/call-builder-delegate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "call_builder_delegate" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml b/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml index 823cb5e1ed..d9338b9c9d 100755 --- a/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "call_builder" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml b/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml index f2687c0315..6293a873cf 100644 --- a/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "constructors_return_value" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/lang-err-integration-tests/contract-ref/Cargo.toml b/integration-tests/lang-err-integration-tests/contract-ref/Cargo.toml index 89fe2d62c4..3a1156807c 100755 --- a/integration-tests/lang-err-integration-tests/contract-ref/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/contract-ref/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract_ref" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" diff --git a/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml b/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml index 0d1d08c1ab..4a5ee6a34f 100644 --- a/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "integration_flipper" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/mapping-integration-tests/Cargo.toml b/integration-tests/mapping-integration-tests/Cargo.toml index 7778efa2af..017dd53e0c 100755 --- a/integration-tests/mapping-integration-tests/Cargo.toml +++ b/integration-tests/mapping-integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mapping-integration-tests" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/mother/Cargo.toml b/integration-tests/mother/Cargo.toml index 2c6696e9ce..3eff622641 100755 --- a/integration-tests/mother/Cargo.toml +++ b/integration-tests/mother/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mother" description = "Mother of all contracts" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/multi-contract-caller/Cargo.toml b/integration-tests/multi-contract-caller/Cargo.toml index 5131088d41..0350ae726a 100644 --- a/integration-tests/multi-contract-caller/Cargo.toml +++ b/integration-tests/multi-contract-caller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multi-contract-caller" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/multi-contract-caller/accumulator/Cargo.toml b/integration-tests/multi-contract-caller/accumulator/Cargo.toml index e506880618..4b4ce8f731 100644 --- a/integration-tests/multi-contract-caller/accumulator/Cargo.toml +++ b/integration-tests/multi-contract-caller/accumulator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "accumulator" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" diff --git a/integration-tests/multi-contract-caller/adder/Cargo.toml b/integration-tests/multi-contract-caller/adder/Cargo.toml index ba2ea167a5..030ca988b5 100644 --- a/integration-tests/multi-contract-caller/adder/Cargo.toml +++ b/integration-tests/multi-contract-caller/adder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adder" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" diff --git a/integration-tests/multi-contract-caller/subber/Cargo.toml b/integration-tests/multi-contract-caller/subber/Cargo.toml index 7d7055a48c..a666df72db 100644 --- a/integration-tests/multi-contract-caller/subber/Cargo.toml +++ b/integration-tests/multi-contract-caller/subber/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subber" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" diff --git a/integration-tests/multisig/Cargo.toml b/integration-tests/multisig/Cargo.toml index d95ec88038..406de6c98e 100755 --- a/integration-tests/multisig/Cargo.toml +++ b/integration-tests/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multisig" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/payment-channel/Cargo.toml b/integration-tests/payment-channel/Cargo.toml index 977befcfb2..c3340501cf 100755 --- a/integration-tests/payment-channel/Cargo.toml +++ b/integration-tests/payment-channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "payment_channel" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/psp22-extension/Cargo.toml b/integration-tests/psp22-extension/Cargo.toml index 58890b6cd7..41dfaf4cd0 100755 --- a/integration-tests/psp22-extension/Cargo.toml +++ b/integration-tests/psp22-extension/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "psp22_extension" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/rand-extension/Cargo.toml b/integration-tests/rand-extension/Cargo.toml index 7b2f447dc5..fd60e1a603 100755 --- a/integration-tests/rand-extension/Cargo.toml +++ b/integration-tests/rand-extension/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rand_extension" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/sr25519-verification/Cargo.toml b/integration-tests/sr25519-verification/Cargo.toml index 1e459be247..ad76c31fb1 100644 --- a/integration-tests/sr25519-verification/Cargo.toml +++ b/integration-tests/sr25519-verification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sr25519_verification" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies ", "George Oastler "] edition = "2021" publish = false diff --git a/integration-tests/static-buffer/Cargo.toml b/integration-tests/static-buffer/Cargo.toml index e67d145623..812048d796 100644 --- a/integration-tests/static-buffer/Cargo.toml +++ b/integration-tests/static-buffer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "static-buffer" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml b/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml index 45dd72e971..faabdca25b 100644 --- a/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml +++ b/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait-incrementer-caller" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml b/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml index b4d45355e7..481cc348e5 100644 --- a/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml +++ b/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait-incrementer" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml b/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml index 7e91a177dd..74271ff082 100644 --- a/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml +++ b/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dyn-traits" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/trait-erc20/Cargo.toml b/integration-tests/trait-erc20/Cargo.toml index 3582068e68..b4b134c4a2 100644 --- a/integration-tests/trait-erc20/Cargo.toml +++ b/integration-tests/trait-erc20/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait_erc20" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/trait-flipper/Cargo.toml b/integration-tests/trait-flipper/Cargo.toml index 02c1b0d002..243a4fea0e 100644 --- a/integration-tests/trait-flipper/Cargo.toml +++ b/integration-tests/trait-flipper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait_flipper" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/trait-incrementer/Cargo.toml b/integration-tests/trait-incrementer/Cargo.toml index 360a11ac2d..9bc5e823a5 100644 --- a/integration-tests/trait-incrementer/Cargo.toml +++ b/integration-tests/trait-incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait-incrementer" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/trait-incrementer/traits/Cargo.toml b/integration-tests/trait-incrementer/traits/Cargo.toml index be488246a3..d69b0f9d02 100644 --- a/integration-tests/trait-incrementer/traits/Cargo.toml +++ b/integration-tests/trait-incrementer/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "traits" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/upgradeable-contracts/delegator/Cargo.toml b/integration-tests/upgradeable-contracts/delegator/Cargo.toml index ffcc328336..bf1cca71ed 100644 --- a/integration-tests/upgradeable-contracts/delegator/Cargo.toml +++ b/integration-tests/upgradeable-contracts/delegator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "delegator" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/upgradeable-contracts/delegator/delegatee/Cargo.toml b/integration-tests/upgradeable-contracts/delegator/delegatee/Cargo.toml index d18ce25dc3..1797d8d7b2 100644 --- a/integration-tests/upgradeable-contracts/delegator/delegatee/Cargo.toml +++ b/integration-tests/upgradeable-contracts/delegator/delegatee/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "delegatee" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/upgradeable-contracts/set-code-hash/Cargo.toml b/integration-tests/upgradeable-contracts/set-code-hash/Cargo.toml index 940914d88f..dd04272b2e 100644 --- a/integration-tests/upgradeable-contracts/set-code-hash/Cargo.toml +++ b/integration-tests/upgradeable-contracts/set-code-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "incrementer" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml b/integration-tests/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml index 128a54b2a9..310b5ff014 100644 --- a/integration-tests/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml +++ b/integration-tests/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "updated-incrementer" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/integration-tests/wildcard-selector/Cargo.toml b/integration-tests/wildcard-selector/Cargo.toml index e8db7c0101..a953a83b6d 100644 --- a/integration-tests/wildcard-selector/Cargo.toml +++ b/integration-tests/wildcard-selector/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wildcard-selector" -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/linting/Cargo.toml b/linting/Cargo.toml index 3f8eee646c..d623a59051 100644 --- a/linting/Cargo.toml +++ b/linting/Cargo.toml @@ -7,7 +7,7 @@ members = [ ] [workspace.package] -version = "5.0.0-rc" +version = "5.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" license = "Apache-2.0" @@ -16,7 +16,7 @@ homepage = "https://www.parity.io/" keywords = ["parity", "blockchain", "edsl", "dylint", "linting"] [workspace.dependencies] -ink_linting_utils = { version = "=5.0.0-rc", path = "utils" } +ink_linting_utils = { version = "=5.0.0-rc.1", path = "utils" } curve25519-dalek = { version = "=4.1.1", default-features = false, features = [ "digest", "zeroize", diff --git a/linting/extra/Cargo.toml b/linting/extra/Cargo.toml index 538b6da0a3..33cf026002 100644 --- a/linting/extra/Cargo.toml +++ b/linting/extra/Cargo.toml @@ -22,7 +22,7 @@ if_chain = "1.0.2" log = "0.4.14" regex = "1.5.4" ink_linting_utils = { workspace = true } -ink_env = { version = "=5.0.0-rc", path = "../../crates/env", default-features = false } +ink_env = { version = "=5.0.0-rc.1", path = "../../crates/env", default-features = false } [dev-dependencies] dylint_testing = "2.6.0" @@ -32,10 +32,10 @@ dylint_testing = "2.6.0" # # These cannot be moved to the workspace level because `cargo` does not provide # the `[[workspace.dev-dependencies]]` directive. -ink = { version = "=5.0.0-rc", path = "../../crates/ink", default-features = false, features = ["std"] } -ink_metadata = { version = "=5.0.0-rc", path = "../../crates/metadata", default-features = false } -ink_primitives = { version = "=5.0.0-rc", path = "../../crates/primitives", default-features = false } -ink_storage = { version = "=5.0.0-rc", path = "../../crates/storage", default-features = false } +ink = { version = "=5.0.0-rc.1", path = "../../crates/ink", default-features = false, features = ["std"] } +ink_metadata = { version = "=5.0.0-rc.1", path = "../../crates/metadata", default-features = false } +ink_primitives = { version = "=5.0.0-rc.1", path = "../../crates/primitives", default-features = false } +ink_storage = { version = "=5.0.0-rc.1", path = "../../crates/storage", default-features = false } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } scale-info = { version = "2.6", default-features = false, features = ["derive"] } diff --git a/linting/mandatory/Cargo.toml b/linting/mandatory/Cargo.toml index f38549ef98..28fe157422 100644 --- a/linting/mandatory/Cargo.toml +++ b/linting/mandatory/Cargo.toml @@ -32,11 +32,11 @@ dylint_testing = "2.6.0" # # These cannot be moved to the workspace level because `cargo` does not provide # the `[[workspace.dev-dependencies]]` directive. -ink = { version = "=5.0.0-rc", path = "../../crates/ink", default-features = false, features = ["std"] } -ink_env = { version = "=5.0.0-rc", path = "../../crates/env", default-features = false } -ink_metadata = { version = "=5.0.0-rc", path = "../../crates/metadata", default-features = false } -ink_primitives = { version = "=5.0.0-rc", path = "../../crates/primitives", default-features = false } -ink_storage = { version = "=5.0.0-rc", path = "../../crates/storage", default-features = false } +ink = { version = "=5.0.0-rc.1", path = "../../crates/ink", default-features = false, features = ["std"] } +ink_env = { version = "=5.0.0-rc.1", path = "../../crates/env", default-features = false } +ink_metadata = { version = "=5.0.0-rc.1", path = "../../crates/metadata", default-features = false } +ink_primitives = { version = "=5.0.0-rc.1", path = "../../crates/primitives", default-features = false } +ink_storage = { version = "=5.0.0-rc.1", path = "../../crates/storage", default-features = false } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } scale-info = { version = "2.6", default-features = false, features = ["derive"] } From c845223d129807a358cf141a198a6f3227f064d3 Mon Sep 17 00:00:00 2001 From: Sebastian Miasojed Date: Thu, 8 Feb 2024 16:06:26 +0100 Subject: [PATCH 02/10] Lock file update --- Cargo.lock | 144 ++++++++++++++++++++++++++--------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b28a171687..f44befa7fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1016,8 +1016,8 @@ dependencies = [ "escape8259", "hex", "indexmap 2.1.0", - "ink_env 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_metadata 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink_env 5.0.0-rc", + "ink_metadata 5.0.0-rc", "itertools 0.12.1", "nom", "nom-supreme", @@ -2539,16 +2539,16 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "ink" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "derive_more", "ink-pallet-contracts-uapi", - "ink_env 5.0.0-rc", + "ink_env 5.0.0-rc.1", "ink_ir", "ink_macro", - "ink_metadata 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "ink_storage", "parity-scale-codec", "scale-info", @@ -2569,24 +2569,24 @@ dependencies = [ [[package]] name = "ink_allocator" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1d2eddb445b3ef076dacaa9968a7ff5b80ad5b9b724966fab66a8f4e48bde4" dependencies = [ "cfg-if", - "quickcheck", - "quickcheck_macros", ] [[package]] name = "ink_allocator" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c1d2eddb445b3ef076dacaa9968a7ff5b80ad5b9b724966fab66a8f4e48bde4" +version = "5.0.0-rc.1" dependencies = [ "cfg-if", + "quickcheck", + "quickcheck_macros", ] [[package]] name = "ink_codegen" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "blake2", "derive_more", @@ -2594,7 +2594,7 @@ dependencies = [ "heck", "impl-serde", "ink_ir", - "ink_primitives 5.0.0-rc", + "ink_primitives 5.0.0-rc.1", "itertools 0.12.1", "parity-scale-codec", "proc-macro2", @@ -2606,7 +2606,7 @@ dependencies = [ [[package]] name = "ink_e2e" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "cargo_metadata", "contract-build", @@ -2615,8 +2615,8 @@ dependencies = [ "impl-serde", "ink", "ink_e2e_macro", - "ink_env 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_env 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "jsonrpsee", "pallet-contracts-primitives", "parity-scale-codec", @@ -2640,7 +2640,7 @@ dependencies = [ [[package]] name = "ink_e2e_macro" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "darling 0.20.5", "derive_more", @@ -2655,10 +2655,11 @@ dependencies = [ [[package]] name = "ink_engine" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99aae25c6820d9e9dae12f79df79a10cba3c961fe1204a68fefaf72f9ae7b14" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi", "ink_primitives 5.0.0-rc", "parity-scale-codec", "secp256k1 0.28.2", @@ -2668,13 +2669,12 @@ dependencies = [ [[package]] name = "ink_engine" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99aae25c6820d9e9dae12f79df79a10cba3c961fe1204a68fefaf72f9ae7b14" +version = "5.0.0-rc.1" dependencies = [ "blake2", "derive_more", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink-pallet-contracts-uapi", + "ink_primitives 5.0.0-rc.1", "parity-scale-codec", "secp256k1 0.28.2", "sha2 0.10.8", @@ -2684,13 +2684,13 @@ dependencies = [ [[package]] name = "ink_env" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8f814ac18100f5ba3d265fbc29e1639325660571883184bedf31dcfecd2428" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink", - "ink-pallet-contracts-uapi", "ink_allocator 5.0.0-rc", "ink_engine 5.0.0-rc", "ink_prelude 5.0.0-rc", @@ -2700,7 +2700,7 @@ dependencies = [ "parity-scale-codec", "paste", "rlibc", - "scale-decode 0.10.0", + "scale-decode 0.9.0", "scale-encode", "scale-info", "schnorrkel 0.11.4", @@ -2712,24 +2712,24 @@ dependencies = [ [[package]] name = "ink_env" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8f814ac18100f5ba3d265fbc29e1639325660571883184bedf31dcfecd2428" +version = "5.0.0-rc.1" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink_allocator 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_engine 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_storage_traits 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink", + "ink-pallet-contracts-uapi", + "ink_allocator 5.0.0-rc.1", + "ink_engine 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", + "ink_storage_traits 5.0.0-rc.1", "num-traits", "parity-scale-codec", "paste", "rlibc", - "scale-decode 0.9.0", + "scale-decode 0.10.0", "scale-encode", "scale-info", "schnorrkel 0.11.4", @@ -2741,12 +2741,12 @@ dependencies = [ [[package]] name = "ink_ir" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "blake2", "either", "impl-serde", - "ink_prelude 5.0.0-rc", + "ink_prelude 5.0.0-rc.1", "itertools 0.12.1", "proc-macro2", "quote", @@ -2755,15 +2755,15 @@ dependencies = [ [[package]] name = "ink_macro" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "ink", "ink_codegen", - "ink_env 5.0.0-rc", + "ink_env 5.0.0-rc.1", "ink_ir", - "ink_metadata 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "ink_storage", "parity-scale-codec", "proc-macro2", @@ -2776,48 +2776,48 @@ dependencies = [ [[package]] name = "ink_metadata" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75859c7142101f3ad30a763fd0e5468df164e3d424086df8de40531fb54940f3" dependencies = [ "derive_more", "impl-serde", "ink_prelude 5.0.0-rc", "ink_primitives 5.0.0-rc", "linkme", - "parity-scale-codec", - "pretty_assertions", "scale-info", "schemars", "serde", - "serde_json", ] [[package]] name = "ink_metadata" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75859c7142101f3ad30a763fd0e5468df164e3d424086df8de40531fb54940f3" +version = "5.0.0-rc.1" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "linkme", + "parity-scale-codec", + "pretty_assertions", "scale-info", "schemars", "serde", + "serde_json", ] [[package]] name = "ink_prelude" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3fbd55e0cf78e456ad4a92558d55b577bf65944bb37bf7debb8f03ed66a47b" dependencies = [ "cfg-if", ] [[package]] name = "ink_prelude" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3fbd55e0cf78e456ad4a92558d55b577bf65944bb37bf7debb8f03ed66a47b" +version = "5.0.0-rc.1" dependencies = [ "cfg-if", ] @@ -2825,11 +2825,13 @@ dependencies = [ [[package]] name = "ink_primitives" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c976554c1bd075c6722d0f30cc3a8337b7ebaf487b95a40c9e81097d995f921" dependencies = [ "derive_more", "ink_prelude 5.0.0-rc", "parity-scale-codec", - "scale-decode 0.10.0", + "scale-decode 0.9.0", "scale-encode", "scale-info", "xxhash-rust", @@ -2837,14 +2839,12 @@ dependencies = [ [[package]] name = "ink_primitives" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c976554c1bd075c6722d0f30cc3a8337b7ebaf487b95a40c9e81097d995f921" +version = "5.0.0-rc.1" dependencies = [ "derive_more", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink_prelude 5.0.0-rc.1", "parity-scale-codec", - "scale-decode 0.9.0", + "scale-decode 0.10.0", "scale-encode", "scale-info", "xxhash-rust", @@ -2852,18 +2852,18 @@ dependencies = [ [[package]] name = "ink_storage" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "array-init", "cfg-if", "derive_more", "ink", "ink-pallet-contracts-uapi", - "ink_env 5.0.0-rc", - "ink_metadata 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", - "ink_storage_traits 5.0.0-rc", + "ink_env 5.0.0-rc.1", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", + "ink_storage_traits 5.0.0-rc.1", "itertools 0.12.1", "parity-scale-codec", "quickcheck", @@ -2874,25 +2874,25 @@ dependencies = [ [[package]] name = "ink_storage_traits" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a469c01b48282a459130ca72a75e57feedbb69ab151639f532156d10d574353" dependencies = [ "ink_metadata 5.0.0-rc", "ink_prelude 5.0.0-rc", "ink_primitives 5.0.0-rc", "parity-scale-codec", - "paste", "scale-info", ] [[package]] name = "ink_storage_traits" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a469c01b48282a459130ca72a75e57feedbb69ab151639f532156d10d574353" +version = "5.0.0-rc.1" dependencies = [ - "ink_metadata 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "parity-scale-codec", + "paste", "scale-info", ] From e1b9d41b9125e35d8ca087502e8ddbeaddd12c2c Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Thu, 8 Feb 2024 16:45:34 +0000 Subject: [PATCH 03/10] update lock file and release cycle --- Cargo.lock | 685 ++++++++++++++++++++++-------------------- RELEASES_CHECKLIST.md | 59 ++-- 2 files changed, 390 insertions(+), 354 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b28a171687..7e51a4bb78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", ] @@ -64,7 +64,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -111,9 +111,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -125,9 +125,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -238,13 +238,13 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.2", - "event-listener-strategy", + "event-listener 5.0.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] @@ -255,11 +255,11 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "slab", ] @@ -297,18 +297,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling 3.4.0", + "rustix 0.38.31", "slab", "tracing", "windows-sys 0.52.0", @@ -325,12 +325,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.2", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -358,7 +358,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -368,13 +368,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.2", + "async-io 2.3.1", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.31", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -382,9 +382,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" @@ -394,7 +394,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -450,9 +450,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -512,9 +512,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -603,12 +603,12 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", + "async-channel 2.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "piper", "tracing", ] @@ -619,7 +619,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bollard-stubs", "bytes", "futures-core", @@ -703,9 +703,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b" [[package]] name = "byteorder" @@ -789,15 +789,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -812,9 +812,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.12" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", @@ -822,33 +822,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "codespan-reporting" @@ -912,7 +912,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "tiny-keccak", ] @@ -1015,9 +1015,9 @@ dependencies = [ "contract-metadata", "escape8259", "hex", - "indexmap 2.1.0", - "ink_env 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_metadata 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap 2.2.2", + "ink_env 5.0.0-rc", + "ink_metadata 5.0.0-rc", "itertools 0.12.1", "nom", "nom-supreme", @@ -1026,7 +1026,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "strsim", + "strsim 0.10.0", "thiserror", "tracing", ] @@ -1073,9 +1073,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1100,22 +1100,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -1123,7 +1119,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossterm_winapi", "libc", "mio", @@ -1219,9 +1215,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -1242,14 +1238,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "cxx" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ed3a27153f220bb42b96005947ca3b87266cfdae5b4b4d703642c3a565e9708" +checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" dependencies = [ "cc", "cxxbridge-flags", @@ -1259,9 +1255,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005721caedeb9869792e656d567695281c7e2bf2ac022d4ed95e5240b215f44d" +checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" dependencies = [ "cc", "codespan-reporting", @@ -1269,24 +1265,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "cxxbridge-flags" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6981d27196cca89f82c8a89fd495cca25066d2933c974e907f7c3699801e112" +checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" [[package]] name = "cxxbridge-macro" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7e7d41b675af76ee4844e8e4c1cec70b65555dbc4852eae7b11c9cd5525d60" +checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -1319,7 +1315,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -1333,8 +1329,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.46", + "strsim 0.10.0", + "syn 2.0.48", ] [[package]] @@ -1356,7 +1352,7 @@ checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ "darling_core 0.20.5", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -1477,7 +1473,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.46", + "syn 2.0.48", "termcolor", "toml", "walkdir", @@ -1518,17 +1514,18 @@ dependencies = [ [[package]] name = "drink-test-macro" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9425dcc749a80945d760092eec0ec91ed1c6d751dfa0eb8dba899b005c6cfb88" +checksum = "9f4463d6959118375d87065e1dae96c58ad65e98a62b71c86f65e1ad08715408" dependencies = [ "cargo_metadata", "contract-build", "contract-metadata", "convert_case 0.6.0", + "darling 0.20.5", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -1595,11 +1592,11 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "ed25519", "sha2 0.10.8", "subtle", @@ -1625,7 +1622,7 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "ed25519", "hashbrown 0.14.3", "hex", @@ -1719,9 +1716,20 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.2" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "218a870470cce1469024e9fb66b901aa983929d81304a1cdb299f28118e550d5" +checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" dependencies = [ "concurrent-queue", "parking", @@ -1734,7 +1742,17 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.2", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.0.0", "pin-project-lite", ] @@ -1748,7 +1766,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -1790,9 +1808,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "fixed-hash" @@ -1927,7 +1945,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -1940,7 +1958,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -1951,7 +1969,7 @@ checksum = "a4c7a09be6bd676fc01c5dd5ba057ba1f7e492e071d4a5fd7c579d99a96093d6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -2055,9 +2073,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "fastrand 2.0.1", "futures-core", @@ -2074,7 +2092,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -2146,9 +2164,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -2211,7 +2229,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.2", "slab", "tokio", "tokio-util", @@ -2270,9 +2288,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "hex" @@ -2418,9 +2436,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2522,9 +2540,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2539,16 +2557,16 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "ink" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "derive_more", "ink-pallet-contracts-uapi", - "ink_env 5.0.0-rc", + "ink_env 5.0.0-rc.1", "ink_ir", "ink_macro", - "ink_metadata 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "ink_storage", "parity-scale-codec", "scale-info", @@ -2569,24 +2587,24 @@ dependencies = [ [[package]] name = "ink_allocator" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1d2eddb445b3ef076dacaa9968a7ff5b80ad5b9b724966fab66a8f4e48bde4" dependencies = [ "cfg-if", - "quickcheck", - "quickcheck_macros", ] [[package]] name = "ink_allocator" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c1d2eddb445b3ef076dacaa9968a7ff5b80ad5b9b724966fab66a8f4e48bde4" +version = "5.0.0-rc.1" dependencies = [ "cfg-if", + "quickcheck", + "quickcheck_macros", ] [[package]] name = "ink_codegen" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "blake2", "derive_more", @@ -2594,19 +2612,19 @@ dependencies = [ "heck", "impl-serde", "ink_ir", - "ink_primitives 5.0.0-rc", + "ink_primitives 5.0.0-rc.1", "itertools 0.12.1", "parity-scale-codec", "proc-macro2", "quote", "serde", "serde_json", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "ink_e2e" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "cargo_metadata", "contract-build", @@ -2615,8 +2633,8 @@ dependencies = [ "impl-serde", "ink", "ink_e2e_macro", - "ink_env 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_env 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "jsonrpsee", "pallet-contracts-primitives", "parity-scale-codec", @@ -2640,7 +2658,7 @@ dependencies = [ [[package]] name = "ink_e2e_macro" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "darling 0.20.5", "derive_more", @@ -2648,17 +2666,18 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.46", + "syn 2.0.48", "tracing-subscriber 0.3.18", ] [[package]] name = "ink_engine" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99aae25c6820d9e9dae12f79df79a10cba3c961fe1204a68fefaf72f9ae7b14" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi", "ink_primitives 5.0.0-rc", "parity-scale-codec", "secp256k1 0.28.2", @@ -2668,13 +2687,12 @@ dependencies = [ [[package]] name = "ink_engine" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99aae25c6820d9e9dae12f79df79a10cba3c961fe1204a68fefaf72f9ae7b14" +version = "5.0.0-rc.1" dependencies = [ "blake2", "derive_more", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink-pallet-contracts-uapi", + "ink_primitives 5.0.0-rc.1", "parity-scale-codec", "secp256k1 0.28.2", "sha2 0.10.8", @@ -2684,13 +2702,13 @@ dependencies = [ [[package]] name = "ink_env" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8f814ac18100f5ba3d265fbc29e1639325660571883184bedf31dcfecd2428" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink", - "ink-pallet-contracts-uapi", "ink_allocator 5.0.0-rc", "ink_engine 5.0.0-rc", "ink_prelude 5.0.0-rc", @@ -2700,7 +2718,7 @@ dependencies = [ "parity-scale-codec", "paste", "rlibc", - "scale-decode 0.10.0", + "scale-decode 0.9.0", "scale-encode", "scale-info", "schnorrkel 0.11.4", @@ -2712,24 +2730,24 @@ dependencies = [ [[package]] name = "ink_env" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8f814ac18100f5ba3d265fbc29e1639325660571883184bedf31dcfecd2428" +version = "5.0.0-rc.1" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink_allocator 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_engine 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_storage_traits 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink", + "ink-pallet-contracts-uapi", + "ink_allocator 5.0.0-rc.1", + "ink_engine 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", + "ink_storage_traits 5.0.0-rc.1", "num-traits", "parity-scale-codec", "paste", "rlibc", - "scale-decode 0.9.0", + "scale-decode 0.10.0", "scale-encode", "scale-info", "schnorrkel 0.11.4", @@ -2741,83 +2759,83 @@ dependencies = [ [[package]] name = "ink_ir" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "blake2", "either", "impl-serde", - "ink_prelude 5.0.0-rc", + "ink_prelude 5.0.0-rc.1", "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "ink_macro" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "ink", "ink_codegen", - "ink_env 5.0.0-rc", + "ink_env 5.0.0-rc.1", "ink_ir", - "ink_metadata 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "ink_storage", "parity-scale-codec", "proc-macro2", "quote", "scale-info", - "syn 2.0.46", + "syn 2.0.48", "synstructure", ] [[package]] name = "ink_metadata" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75859c7142101f3ad30a763fd0e5468df164e3d424086df8de40531fb54940f3" dependencies = [ "derive_more", "impl-serde", "ink_prelude 5.0.0-rc", "ink_primitives 5.0.0-rc", "linkme", - "parity-scale-codec", - "pretty_assertions", "scale-info", "schemars", "serde", - "serde_json", ] [[package]] name = "ink_metadata" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75859c7142101f3ad30a763fd0e5468df164e3d424086df8de40531fb54940f3" +version = "5.0.0-rc.1" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "linkme", + "parity-scale-codec", + "pretty_assertions", "scale-info", "schemars", "serde", + "serde_json", ] [[package]] name = "ink_prelude" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3fbd55e0cf78e456ad4a92558d55b577bf65944bb37bf7debb8f03ed66a47b" dependencies = [ "cfg-if", ] [[package]] name = "ink_prelude" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3fbd55e0cf78e456ad4a92558d55b577bf65944bb37bf7debb8f03ed66a47b" +version = "5.0.0-rc.1" dependencies = [ "cfg-if", ] @@ -2825,11 +2843,13 @@ dependencies = [ [[package]] name = "ink_primitives" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c976554c1bd075c6722d0f30cc3a8337b7ebaf487b95a40c9e81097d995f921" dependencies = [ "derive_more", "ink_prelude 5.0.0-rc", "parity-scale-codec", - "scale-decode 0.10.0", + "scale-decode 0.9.0", "scale-encode", "scale-info", "xxhash-rust", @@ -2837,14 +2857,12 @@ dependencies = [ [[package]] name = "ink_primitives" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c976554c1bd075c6722d0f30cc3a8337b7ebaf487b95a40c9e81097d995f921" +version = "5.0.0-rc.1" dependencies = [ "derive_more", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink_prelude 5.0.0-rc.1", "parity-scale-codec", - "scale-decode 0.9.0", + "scale-decode 0.10.0", "scale-encode", "scale-info", "xxhash-rust", @@ -2852,18 +2870,18 @@ dependencies = [ [[package]] name = "ink_storage" -version = "5.0.0-rc" +version = "5.0.0-rc.1" dependencies = [ "array-init", "cfg-if", "derive_more", "ink", "ink-pallet-contracts-uapi", - "ink_env 5.0.0-rc", - "ink_metadata 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", - "ink_storage_traits 5.0.0-rc", + "ink_env 5.0.0-rc.1", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", + "ink_storage_traits 5.0.0-rc.1", "itertools 0.12.1", "parity-scale-codec", "quickcheck", @@ -2874,25 +2892,25 @@ dependencies = [ [[package]] name = "ink_storage_traits" version = "5.0.0-rc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a469c01b48282a459130ca72a75e57feedbb69ab151639f532156d10d574353" dependencies = [ "ink_metadata 5.0.0-rc", "ink_prelude 5.0.0-rc", "ink_primitives 5.0.0-rc", "parity-scale-codec", - "paste", "scale-info", ] [[package]] name = "ink_storage_traits" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a469c01b48282a459130ca72a75e57feedbb69ab151639f532156d10d574353" +version = "5.0.0-rc.1" dependencies = [ - "ink_metadata 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_prelude 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc (registry+https://github.com/rust-lang/crates.io-index)", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "parity-scale-codec", + "paste", "scale-info", ] @@ -2969,9 +2987,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] @@ -2984,9 +3002,9 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -3095,9 +3113,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -3108,9 +3126,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -3129,9 +3147,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" @@ -3213,7 +3231,7 @@ checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3239,9 +3257,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -3261,9 +3279,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ "hashbrown 0.14.3", ] @@ -3286,7 +3304,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3300,7 +3318,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3311,7 +3329,7 @@ checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3322,7 +3340,7 @@ checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3365,7 +3383,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.28", + "rustix 0.38.31", ] [[package]] @@ -3418,9 +3436,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -3528,13 +3546,19 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-format" version = "0.4.4" @@ -3547,11 +3571,10 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -3569,9 +3592,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -3715,7 +3738,7 @@ checksum = "fac3eb6be2d450fb3ca242f60f7766f86141b50e37bb3759f2add3757734fbf6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3841,22 +3864,22 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3911,7 +3934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db65a500d4adf574893c726ae365e37e4fbb7f2cbd403f6eaa1b665457456adc" dependencies = [ "polkavm-derive-impl", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3923,7 +3946,7 @@ dependencies = [ "polkavm-common", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3944,14 +3967,14 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.31", "tracing", "windows-sys 0.52.0", ] @@ -4053,7 +4076,7 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -4170,7 +4193,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -4214,18 +4237,18 @@ checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -4240,9 +4263,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -4278,7 +4301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin", "untrusted", @@ -4348,14 +4371,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -4389,7 +4412,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -4655,7 +4678,7 @@ dependencies = [ "aead", "arrayref", "arrayvec 0.7.4", - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "getrandom_or_panic", "merlin 3.0.0", "rand_core 0.6.4", @@ -4804,7 +4827,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -4837,7 +4860,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -4863,15 +4886,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.2", "serde", "serde_json", "time", @@ -5025,9 +5048,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smol" @@ -5053,9 +5076,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca99148e026936bbc444c3708748207033968e4ef1c33bfc885660ae4d44d21" dependencies = [ "arrayvec 0.7.4", - "async-lock 3.2.0", + "async-lock 3.3.0", "atomic-take", - "base64 0.21.5", + "base64 0.21.7", "bip39", "blake2-rfc", "bs58", @@ -5066,7 +5089,7 @@ dependencies = [ "either", "event-listener 3.1.0", "fnv", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "futures-util", "hashbrown 0.14.3", "hex", @@ -5107,16 +5130,16 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e6f1898682b618b81570047b9d870b3faaff6ae1891b468eddd94d7f903c2fe" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", - "base64 0.21.5", + "async-channel 2.2.0", + "async-lock 3.3.0", + "base64 0.21.7", "blake2-rfc", "derive_more", "either", "event-listener 3.1.0", "fnv", "futures-channel", - "futures-lite 2.1.0", + "futures-lite 2.2.0", "futures-util", "hashbrown 0.14.3", "hex", @@ -5206,7 +5229,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5321,7 +5344,7 @@ checksum = "5d8681fa136cf504ba2b722fcb10d78df147c15d201b997e06c4c8c72258001a" dependencies = [ "quote", "sp-core-hashing 11.0.0", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5332,7 +5355,7 @@ checksum = "b4b235a0ad7124d58e6f0a728c8354da5b185b77bcf18b131b3a480cdaa23d95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5499,7 +5522,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5637,7 +5660,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5688,9 +5711,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.44.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1" +checksum = "b1114ee5900b8569bbc8b1a014a942f937b752af4b44f4607430b5f86cedaac0" dependencies = [ "Inflector", "num-format", @@ -5719,6 +5742,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + [[package]] name = "strum" version = "0.24.1" @@ -5760,7 +5789,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5830,7 +5859,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata", - "syn 2.0.46", + "syn 2.0.48", "thiserror", "tokio", ] @@ -5862,7 +5891,7 @@ dependencies = [ "parity-scale-codec", "proc-macro-error", "subxt-codegen", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5913,9 +5942,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.46" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -5930,7 +5959,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5947,14 +5976,13 @@ checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -5970,9 +5998,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -5994,7 +6022,7 @@ checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -6009,12 +6037,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -6029,10 +6058,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -6104,7 +6134,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -6145,14 +6175,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.4", ] [[package]] @@ -6170,7 +6200,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "toml_datetime", "winnow", ] @@ -6181,18 +6211,18 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "toml_datetime", "winnow", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.2", "serde", "serde_spanned", "toml_datetime", @@ -6246,7 +6276,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -6413,9 +6443,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -6434,9 +6464,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -6545,9 +6575,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6555,24 +6585,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6580,28 +6610,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-encoder" -version = "0.38.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" +checksum = "e09bca7d6388637d27fb5edbeab11f56bfabcef8743c55ae34370e1e5030a071" dependencies = [ "leb128", ] @@ -6657,9 +6687,9 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acfc1e384a36ca532d070a315925887247f3c7e23567e23e0ac9b1c5d6b8bf76" +checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" dependencies = [ "smallvec", "spin", @@ -6670,9 +6700,9 @@ dependencies = [ [[package]] name = "wasmi_arena" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" +checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" [[package]] name = "wasmi_core" @@ -6839,10 +6869,11 @@ dependencies = [ [[package]] name = "wast" -version = "69.0.1" +version = "70.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ee37317321afde358e4d7593745942c48d6d17e0e6e943704de9bbee121e7a" +checksum = "a3d5061300042ff5065123dae1e27d00c03f567d34a2937c8472255148a216dc" dependencies = [ + "bumpalo", "leb128", "memchr", "unicode-width", @@ -6851,9 +6882,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb338ee8dee4d4cd05e6426683f21c5087dc7cfc8903e839ccf48d43332da3c" +checksum = "afd7357b6cc46d46a2509c43dcb1dd4131dafbf4e75562d87017b5a05ffad2d6" dependencies = [ "wast", ] @@ -6867,15 +6898,15 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] [[package]] name = "wide" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c" dependencies = [ "bytemuck", "safe_arch", @@ -7121,9 +7152,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.31" +version = "0.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" dependencies = [ "memchr", ] @@ -7139,11 +7170,11 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ - "curve25519-dalek 4.1.1", + "curve25519-dalek 4.1.2", "rand_core 0.6.4", "serde", "zeroize", @@ -7184,7 +7215,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -7204,7 +7235,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] diff --git a/RELEASES_CHECKLIST.md b/RELEASES_CHECKLIST.md index e4ee683c76..fade81586e 100644 --- a/RELEASES_CHECKLIST.md +++ b/RELEASES_CHECKLIST.md @@ -31,14 +31,14 @@ crates.io. ## Checklist -We'll be using [`cargo-release`](https://github.com/crate-ci/cargo-release) to release -ink!. There are still a few manual steps though, and we hope to make this more streamlined +We'll be using [`cargo-release`](https://github.com/crate-ci/cargo-release) to release +ink!. There are still a few manual steps though, and we hope to make this more streamlined in the future. 1. Create a new feature branch off `master`. 1. Copy the release notes that appear in the [`CHANGELOG.md`](https://github.com/paritytech/ink/blob/master/CHANGELOG.md) - into the PR description. - - This will cause the individual PRs to be linked to the release in which they are + into the PR description. + - This will cause the individual PRs to be linked to the release in which they are included. 1. Bump the version in all TOML files to the new version. ``` @@ -54,53 +54,58 @@ in the future. 1. Open a release PR - Wait for approvals from Core team members. - Ensure the entire CI pipeline is green. -1. Do a dry run with `cargo release [new_version] -v --no-tag --no-push` - - `[new_version]` should be the **exact** SemVer compatible version you are attempting - to release e.g. `4.0.0-alpha.3` - - It is possible to supply a SemVer level here e.g. `major`, `minor`, `patch` or - ``, however this will automatically bump and commit the changes - to the `Cargo.toml` manifests. We have already done that in an earlier step so it +1. Before releasing, take note of the release order: + - `ink_e2e` is dependent on the `cargo-contract` crates, which are dependent on the `ink` "core" crates. + - Therefore, first release all `ink` crates except `ink_e2e`. + - If there are new versions of the `cargo-contract` crates, release them. + - Release `ink_e2e` +2. Do a dry run with `cargo release [new_version] -v --no-tag --no-push` + - `[new_version]` should be the **exact** SemVer compatible version you are attempting + to release e.g. `5.0.0` + - It is possible to supply a SemVer level here e.g. `major`, `minor`, `patch` or + ``, however this will automatically bump and commit the changes + to the `Cargo.toml` manifests. We have already done that in an earlier step so it is not necessary. - We don't want `cargo-release` to create any releases or push any code, we'll do that manually once we've actually published to `crates.io`. -1. Check the output of the dry run: +3. Check the output of the dry run: - Does not show any automatic bumping of crate versions. - Runs without error. -1. Following a successful dry run, we can now publish to crates.io. +4. Following a successful dry run, we can now publish to crates.io. - This will be done from the release branch itself. - - This is because it is possible for the dry run to succeed but for the actual publish + - This is because it is possible for the dry run to succeed but for the actual publish to fail and require some changes. So before running the next step: - - Ensure there have been no new commits to `master` which are not included in this + - Ensure there have been no new commits to `master` which are not included in this branch. - - Notify core team members in the Element channel that no PRs should be merged to + - Notify core team members in the Element channel that no PRs should be merged to `master` during the release. - - The above are to ensure that the bundled code pushed to crates.io is the same as + - The above are to ensure that the bundled code pushed to crates.io is the same as the tagged release on GitHub. -1. Publish with `cargo release [new_version] -v --no-tag --no-push --execute` - - Ensure the same `[new_version]` as the dry run, which should be the **exact** SemVer +5. Publish with `cargo release [new_version] -v --no-tag --no-push --execute` + - Ensure the same `[new_version]` as the dry run, which should be the **exact** SemVer compatible version you are attempting to release e.g. `4.0.0-alpha.3`. - We add the grace period since crates depend on one another. - We add the `--execute` flag to _actually_ publish things to crates.io. -1. Following a successful release from the release PR branch, now the PR can be merged +6. Following a successful release from the release PR branch, now the PR can be merged into `master` - - Once merged, notify core team members in the Element channel that PRs can be merged + - Once merged, notify core team members in the Element channel that PRs can be merged again into `master` -1. Replace `vX.X.X` with the new version in the following command and then execute it: +7. Replace `vX.X.X` with the new version in the following command and then execute it: ``` git tag -s vX.X.X && git push origin vX.X.X ``` - Ensure your tag is signed with an offline GPG key! - - Alternatively, the `Create release` GitHub UI below allows creating this tag when + - Alternatively, the `Create release` GitHub UI below allows creating this tag when creating the release. -1. Update the [`ink-examples`](https://github.com/paritytech/ink-examples) repository with +8. Update the [`ink-examples`](https://github.com/paritytech/ink-examples) repository with the content of `integration-tests` (minus `mother`, `lang-err-integration-tests` and `mapping-integration-tests`). Besides copying those folders over, the only change you need to do manually is to switch the dependencies in the `Cargo.toml`'s to use the published version of your release. -1. Create a GitHub release for this tag. In the [tag overview](https://github.com/paritytech/ink/tags) - you'll see your new tag appear. Click the `…` on the right of the tag and then +9. Create a GitHub release for this tag. In the [tag overview](https://github.com/paritytech/ink/tags) + you'll see your new tag appear. Click the `…` on the right of the tag and then `Create release`. -1. Paste the release notes that appear in the [`CHANGELOG.md`](https://github.com/paritytech/ink/blob/master/CHANGELOG.md) +10. Paste the release notes that appear in the [`CHANGELOG.md`](https://github.com/paritytech/ink/blob/master/CHANGELOG.md) there. The title of the release should be `vX.X.X`. -1. Post an announcement to those Element channels: +11. Post an announcement to those Element channels: * [Smart Contracts & Parity ink!](https://matrix.to/#/#ink:matrix.parity.io) From 4225957432c7f34e53a3150f06a637b2b7813afb Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Fri, 9 Feb 2024 12:10:59 +0000 Subject: [PATCH 04/10] update release notes --- RELEASES_CHECKLIST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASES_CHECKLIST.md b/RELEASES_CHECKLIST.md index fade81586e..247525eb25 100644 --- a/RELEASES_CHECKLIST.md +++ b/RELEASES_CHECKLIST.md @@ -57,7 +57,7 @@ in the future. 1. Before releasing, take note of the release order: - `ink_e2e` is dependent on the `cargo-contract` crates, which are dependent on the `ink` "core" crates. - Therefore, first release all `ink` crates except `ink_e2e`. - - If there are new versions of the `cargo-contract` crates, release them. + - Release `cargo-contract` crates. - Release `ink_e2e` 2. Do a dry run with `cargo release [new_version] -v --no-tag --no-push` - `[new_version]` should be the **exact** SemVer compatible version you are attempting From 120531dd973407506f6a3960befcd40962893c1c Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Fri, 9 Feb 2024 16:37:07 +0000 Subject: [PATCH 05/10] update c-c build crate --- Cargo.lock | 242 +++++++++++++++++++++++++---------------------------- Cargo.toml | 2 +- 2 files changed, 117 insertions(+), 127 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6e92819933..dc8a575fb5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -703,9 +703,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.14.2" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -730,9 +730,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -763,9 +763,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", ] @@ -951,9 +951,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "contract-build" -version = "4.0.0-rc.1" +version = "4.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4998e19b98b55fb9c1b5f1c93bb1678ab64c96eb9216b4a10fdb9a521717fcf" +checksum = "5c478e9e5b73a2234c17f146a79b249242879c8a33b34fabea3008dd22c8795f" dependencies = [ "anyhow", "blake2", @@ -974,7 +974,7 @@ dependencies = [ "semver", "serde", "serde_json", - "strum 0.25.0", + "strum 0.26.1", "tempfile", "term_size", "tokio", @@ -982,18 +982,18 @@ dependencies = [ "toml", "tracing", "url", - "users", + "uzers", "walkdir", "wasm-opt", - "which", + "which 6.0.0", "zip", ] [[package]] name = "contract-metadata" -version = "4.0.0-rc.1" +version = "4.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f0ed28c6af5080a0cf0e4b943fc7eeb42731aee2e2154735b8c5ddd19cc412" +checksum = "7277c42205552340b5979d27301512e2ca85fb21a0555f786f10d3d5dcf817aa" dependencies = [ "anyhow", "impl-serde", @@ -1005,9 +1005,9 @@ dependencies = [ [[package]] name = "contract-transcode" -version = "4.0.0-rc.1" +version = "4.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5ec69b9877e7565a9bb95040358149637714d0a422f67be9eff5a42c1ee86e" +checksum = "414fce0008626b0e7835ec62caadc1e028bd8f8236a8962c9d38739829d97eb2" dependencies = [ "anyhow", "base58", @@ -1016,8 +1016,8 @@ dependencies = [ "escape8259", "hex", "indexmap 2.2.2", - "ink_env 5.0.0-rc", - "ink_metadata 5.0.0-rc", + "ink_env 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_metadata 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.12.1", "nom", "nom-supreme", @@ -1026,7 +1026,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "strsim 0.10.0", + "strsim 0.11.0", "thiserror", "tracing", ] @@ -2586,20 +2586,20 @@ dependencies = [ [[package]] name = "ink_allocator" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c1d2eddb445b3ef076dacaa9968a7ff5b80ad5b9b724966fab66a8f4e48bde4" +version = "5.0.0-rc.1" dependencies = [ "cfg-if", + "quickcheck", + "quickcheck_macros", ] [[package]] name = "ink_allocator" version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e66999b81e12f6e4e735594394f05e5e8ba8b5d887ce454f62bac9732527c738" dependencies = [ "cfg-if", - "quickcheck", - "quickcheck_macros", ] [[package]] @@ -2653,7 +2653,7 @@ dependencies = [ "tracing", "tracing-subscriber 0.3.18", "wasm-instrument", - "which", + "which 5.0.0", ] [[package]] @@ -2673,13 +2673,12 @@ dependencies = [ [[package]] name = "ink_engine" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99aae25c6820d9e9dae12f79df79a10cba3c961fe1204a68fefaf72f9ae7b14" +version = "5.0.0-rc.1" dependencies = [ "blake2", "derive_more", - "ink_primitives 5.0.0-rc", + "ink-pallet-contracts-uapi", + "ink_primitives 5.0.0-rc.1", "parity-scale-codec", "secp256k1 0.28.2", "sha2 0.10.8", @@ -2689,11 +2688,13 @@ dependencies = [ [[package]] name = "ink_engine" version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6311f58a385f6301aa0eb7766e13473ab6be7151b9ed90b0f01c6249fa6d29" dependencies = [ "blake2", "derive_more", "ink-pallet-contracts-uapi", - "ink_primitives 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", "secp256k1 0.28.2", "sha2 0.10.8", @@ -2702,24 +2703,24 @@ dependencies = [ [[package]] name = "ink_env" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8f814ac18100f5ba3d265fbc29e1639325660571883184bedf31dcfecd2428" +version = "5.0.0-rc.1" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink_allocator 5.0.0-rc", - "ink_engine 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", - "ink_storage_traits 5.0.0-rc", + "ink", + "ink-pallet-contracts-uapi", + "ink_allocator 5.0.0-rc.1", + "ink_engine 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", + "ink_storage_traits 5.0.0-rc.1", "num-traits", "parity-scale-codec", "paste", "rlibc", - "scale-decode 0.9.0", + "scale-decode", "scale-encode", "scale-info", "schnorrkel 0.11.4", @@ -2732,23 +2733,24 @@ dependencies = [ [[package]] name = "ink_env" version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de851cc0a0d017d69521e0e5d4aeefe78d8a7cb4363a8a22cf673325efd07b5a" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink", "ink-pallet-contracts-uapi", - "ink_allocator 5.0.0-rc.1", - "ink_engine 5.0.0-rc.1", - "ink_prelude 5.0.0-rc.1", - "ink_primitives 5.0.0-rc.1", - "ink_storage_traits 5.0.0-rc.1", + "ink_allocator 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_engine 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_prelude 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_primitives 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_storage_traits 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits", "parity-scale-codec", "paste", "rlibc", - "scale-decode 0.10.0", + "scale-decode", "scale-encode", "scale-info", "schnorrkel 0.11.4", @@ -2794,42 +2796,41 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75859c7142101f3ad30a763fd0e5468df164e3d424086df8de40531fb54940f3" +version = "5.0.0-rc.1" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "linkme", + "parity-scale-codec", + "pretty_assertions", "scale-info", "schemars", "serde", + "serde_json", ] [[package]] name = "ink_metadata" version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0400c331aab950f0483638962e45049f1e40bf0102d4a7bf8428e6d15c798278" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 5.0.0-rc.1", - "ink_primitives 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_primitives 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "linkme", "parity-scale-codec", - "pretty_assertions", "scale-info", "schemars", "serde", - "serde_json", ] [[package]] name = "ink_prelude" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3fbd55e0cf78e456ad4a92558d55b577bf65944bb37bf7debb8f03ed66a47b" +version = "5.0.0-rc.1" dependencies = [ "cfg-if", ] @@ -2837,20 +2838,20 @@ dependencies = [ [[package]] name = "ink_prelude" version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd2ed651848272442a9e41cd35405aa31c3ca9c6267254d2d84643c8163c69f3" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c976554c1bd075c6722d0f30cc3a8337b7ebaf487b95a40c9e81097d995f921" +version = "5.0.0-rc.1" dependencies = [ "derive_more", - "ink_prelude 5.0.0-rc", + "ink_prelude 5.0.0-rc.1", "parity-scale-codec", - "scale-decode 0.9.0", + "scale-decode", "scale-encode", "scale-info", "xxhash-rust", @@ -2859,11 +2860,13 @@ dependencies = [ [[package]] name = "ink_primitives" version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e6d5e9f34949655f4102916078ed8cef5d8c869f1d3a516b4d3683bf614415" dependencies = [ "derive_more", - "ink_prelude 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "scale-decode 0.10.0", + "scale-decode", "scale-encode", "scale-info", "xxhash-rust", @@ -2892,26 +2895,26 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "5.0.0-rc" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a469c01b48282a459130ca72a75e57feedbb69ab151639f532156d10d574353" +version = "5.0.0-rc.1" dependencies = [ - "ink_metadata 5.0.0-rc", - "ink_prelude 5.0.0-rc", - "ink_primitives 5.0.0-rc", + "ink_metadata 5.0.0-rc.1", + "ink_prelude 5.0.0-rc.1", + "ink_primitives 5.0.0-rc.1", "parity-scale-codec", + "paste", "scale-info", ] [[package]] name = "ink_storage_traits" version = "5.0.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566bca9c7755422c6aa87d13ff1bcd802e3f555ebfb4578272f5b0edeae115a" dependencies = [ - "ink_metadata 5.0.0-rc.1", - "ink_prelude 5.0.0-rc.1", - "ink_primitives 5.0.0-rc.1", + "ink_metadata 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_prelude 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_primitives 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "paste", "scale-info", ] @@ -4478,20 +4481,6 @@ dependencies = [ "serde", ] -[[package]] -name = "scale-decode" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7789f5728e4e954aaa20cadcc370b99096fb8645fca3c9333ace44bb18f30095" -dependencies = [ - "derive_more", - "parity-scale-codec", - "scale-bits", - "scale-decode-derive 0.9.0", - "scale-info", - "smallvec", -] - [[package]] name = "scale-decode" version = "0.10.0" @@ -4502,24 +4491,11 @@ dependencies = [ "parity-scale-codec", "primitive-types", "scale-bits", - "scale-decode-derive 0.10.0", + "scale-decode-derive", "scale-info", "smallvec", ] -[[package]] -name = "scale-decode-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27873eb6005868f8cc72dcfe109fae664cf51223d35387bc2f28be4c28d94c47" -dependencies = [ - "darling 0.14.4", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "scale-decode-derive" version = "0.10.0" @@ -4601,7 +4577,7 @@ dependencies = [ "frame-metadata 15.1.0", "parity-scale-codec", "scale-bits", - "scale-decode 0.10.0", + "scale-decode", "scale-encode", "scale-info", "serde", @@ -4887,9 +4863,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.6.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981" +checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ "base64 0.21.7", "chrono", @@ -4897,6 +4873,7 @@ dependencies = [ "indexmap 1.9.3", "indexmap 2.2.2", "serde", + "serde_derive", "serde_json", "time", ] @@ -5760,11 +5737,11 @@ dependencies = [ [[package]] name = "strum" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" dependencies = [ - "strum_macros 0.25.3", + "strum_macros 0.26.1", ] [[package]] @@ -5782,9 +5759,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck", "proc-macro2", @@ -5831,7 +5808,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "scale-bits", - "scale-decode 0.10.0", + "scale-decode", "scale-encode", "scale-info", "scale-value", @@ -6519,21 +6496,21 @@ dependencies = [ ] [[package]] -name = "users" -version = "0.11.0" +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uzers" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" +checksum = "76d283dc7e8c901e79e32d077866eaf599156cbf427fffa8289aecc52c5c3f63" dependencies = [ "libc", "log", ] -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - [[package]] name = "valuable" version = "0.1.0" @@ -6639,9 +6616,9 @@ checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-encoder" -version = "0.41.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09bca7d6388637d27fb5edbeab11f56bfabcef8743c55ae34370e1e5030a071" +checksum = "6ce14de623d48dda4c10698c4dadae2366b5c2c8e81bad981d5a0625a5fcf68c" dependencies = [ "leb128", ] @@ -6879,9 +6856,9 @@ dependencies = [ [[package]] name = "wast" -version = "70.0.2" +version = "71.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d5061300042ff5065123dae1e27d00c03f567d34a2937c8472255148a216dc" +checksum = "a10dad39ea4623ed4c304fb42bd455eca6d212f7e5e0cb59681fed7e4d128a2e" dependencies = [ "bumpalo", "leb128", @@ -6892,9 +6869,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd7357b6cc46d46a2509c43dcb1dd4131dafbf4e75562d87017b5a05ffad2d6" +checksum = "b724419d3bffeff174745b924f6ed053095ac58f9ae72e87d2e0f8ef6df6df96" dependencies = [ "wast", ] @@ -6912,6 +6889,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "which" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.31", + "windows-sys 0.52.0", +] + [[package]] name = "wide" version = "0.7.15" diff --git a/Cargo.toml b/Cargo.toml index c844c37f8a..81f316e9d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ array-init = { version = "2.0", default-features = false } blake2 = { version = "0.10" } cargo_metadata = { version = "0.18.0" } cfg-if = { version = "1.0" } -contract-build = { version = "4.0.0-rc.1" } +contract-build = { version = "4.0.0-rc.2" } darling = { version = "0.20.5" } derive_more = { version = "0.99.17", default-features = false } drink = { version = "=0.8.5" } From 1d13529542c2e2a26517f27dbb8cca62ee94c54a Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Sat, 10 Feb 2024 11:31:17 +0000 Subject: [PATCH 06/10] update drink --- Cargo.lock | 1053 ++++++++++++++++++++++++++++++++++++++++++---------- Cargo.toml | 2 +- 2 files changed, 865 insertions(+), 190 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc8a575fb5..db116aee54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -174,18 +174,147 @@ dependencies = [ [[package]] name = "aquamarine" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +checksum = "074b80d14d0240b6ce94d68f059a2d26a5d77280ae142662365a21ef6e2594ef" dependencies = [ "include_dir", "itertools 0.10.5", "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "ark-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "array-bytes" version = "6.2.2" @@ -494,6 +623,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", + "rand 0.8.5", + "rand_core 0.6.4", "serde", "unicode-normalization", ] @@ -949,6 +1080,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +[[package]] +name = "constcat" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" + [[package]] name = "contract-build" version = "4.0.0-rc.2" @@ -1243,9 +1380,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" +checksum = "8aff472b83efd22bfc0176aa8ba34617dd5c17364670eb201a5f06d339b8abf7" dependencies = [ "cc", "cxxbridge-flags", @@ -1255,9 +1392,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" +checksum = "bcf6e7a52c19013a9a0ec421c7d9c2d1125faf333551227e0a017288d71b47c3" dependencies = [ "cc", "codespan-reporting", @@ -1270,15 +1407,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" +checksum = "589e83d02fc1d4fb78f5ad56ca08835341e23499d086d2821315869426d618dc" [[package]] name = "cxxbridge-macro" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" +checksum = "e2cb1fd8ffae4230c7cfbbaf3698dbeaf750fa8c5dadf7ed897df581b9b572a5" dependencies = [ "proc-macro2", "quote", @@ -1487,9 +1624,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "drink" -version = "0.8.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c67a3581586495c81a0347a667f6ed5ca69af0125f3a3a138e48d4d0ee4201b" +checksum = "6fe74f1b23038c882501682b6ea1ba97be124960adb68a0aea5aa2128a5df2e0" dependencies = [ "contract-metadata", "contract-transcode", @@ -1498,25 +1635,25 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", - "pallet-contracts-for-drink", - "pallet-contracts-primitives", + "pallet-contracts", + "pallet-contracts-uapi", "pallet-timestamp", "parity-scale-codec", "parity-scale-codec-derive", "scale-info", "serde_json", - "sp-externalities", - "sp-io", - "sp-runtime-interface", + "sp-externalities 0.25.0", + "sp-io 30.0.0", + "sp-runtime-interface 24.0.0", "thiserror", "wat", ] [[package]] name = "drink-test-macro" -version = "0.8.6" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4463d6959118375d87065e1dae96c58ad65e98a62b71c86f65e1ad08715408" +checksum = "ea166fddef10682aa3ebd1ce9da0fd84e8ca9d5397b70e93fcebac877d53139c" dependencies = [ "cargo_metadata", "contract-build", @@ -1587,6 +1724,7 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "signature", ] @@ -1598,8 +1736,10 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.2", "ed25519", + "serde", "sha2 0.10.8", "subtle", + "zeroize", ] [[package]] @@ -1633,9 +1773,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elliptic-curve" @@ -1841,9 +1981,9 @@ dependencies = [ [[package]] name = "frame-benchmarking" -version = "23.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949ba5b5c9d552c37d7ad39bd837394c1d21727281ef32882539bc2ec6687b2d" +checksum = "2b16f7f853f64ec6fbc981b3e224cc3400752662da140ec62c160b5b859bab68" dependencies = [ "frame-support", "frame-support-procedural", @@ -1855,13 +1995,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-runtime-interface 24.0.0", + "sp-std 14.0.0", + "sp-storage 19.0.0", "static_assertions", ] @@ -1890,11 +2030,12 @@ dependencies = [ [[package]] name = "frame-support" -version = "23.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609125451f5ffb1675998e07e64e05e4b3dad330b1537952ace5897d6ed24f0a" +checksum = "e48b00bb3e82c465a435b08827e7abe5144345bc1a998848bdd7ce72fa203bb5" dependencies = [ "aquamarine", + "array-bytes", "bitflags 1.3.2", "docify", "environmental", @@ -1911,29 +2052,29 @@ dependencies = [ "serde_json", "smallvec", "sp-api", - "sp-arithmetic", - "sp-core", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", "sp-core-hashing-proc-macro", - "sp-debug-derive", + "sp-debug-derive 14.0.0", "sp-genesis-builder", "sp-inherents", - "sp-io", + "sp-io 30.0.0", "sp-metadata-ir", - "sp-runtime", + "sp-runtime 31.0.1", "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-weights", + "sp-state-machine 0.35.0", + "sp-std 14.0.0", + "sp-tracing 16.0.0", + "sp-weights 27.0.0", "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" -version = "18.0.0" +version = "23.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd22a1ed96e765ec763bbaef2089ed8bb5f8539df40181ddac57be7be74685c7" +checksum = "0be717139a0da9b31b559356db73f6ce48876d331e833ebdc32de3a9ad581e15" dependencies = [ "Inflector", "cfg-expr", @@ -1945,17 +2086,18 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", + "sp-core-hashing 15.0.0", "syn 2.0.48", ] [[package]] name = "frame-support-procedural-tools" -version = "7.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82858452d9332de312f5ff411fd8aecee2323a344b241078f565b8c3c2e47d38" +checksum = "3363df38464c47a73eb521a4f648bfcc7537a82d70347ef8af3f73b6d019e910" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.48", @@ -1963,9 +2105,9 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "8.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c7a09be6bd676fc01c5dd5ba057ba1f7e492e071d4a5fd7c579d99a96093d6" +checksum = "68672b9ec6fe72d259d3879dc212c5e42e977588cdac830c76f54d9f492aeb58" dependencies = [ "proc-macro2", "quote", @@ -1974,22 +2116,23 @@ dependencies = [ [[package]] name = "frame-system" -version = "23.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dc2f4182ad4c05275b0d3f38e3e74bd1cd17231f28ce1e879177fd9829887c" +checksum = "983b3215c8d97775b90dc1db88f858c46401682bd2fb8572bdd102ff8c2ca2a6" dependencies = [ "cfg-if", + "docify", "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", "sp-version", - "sp-weights", + "sp-weights 27.0.0", ] [[package]] @@ -2641,10 +2784,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core", + "sp-core 23.0.0", "sp-keyring", - "sp-runtime", - "sp-weights", + "sp-runtime 26.0.0", + "sp-weights 22.0.0", "subxt", "subxt-metadata", "subxt-signer", @@ -3301,9 +3444,9 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" dependencies = [ "macro_magic_core", "macro_magic_macros", @@ -3313,9 +3456,9 @@ dependencies = [ [[package]] name = "macro_magic_core" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", "derive-syn-parse", @@ -3327,9 +3470,9 @@ dependencies = [ [[package]] name = "macro_magic_core_macros" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" +checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", @@ -3338,9 +3481,9 @@ dependencies = [ [[package]] name = "macro_magic_macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", @@ -3676,9 +3819,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-balances" -version = "23.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0486a52507072bd738dc851acf7b42def3645db10777f93dccdaa5933e41269b" +checksum = "8406b5616e468d80972b6365f3cd8211d0dbf4d107b379fac85fddcfdf0b5562" dependencies = [ "frame-benchmarking", "frame-support", @@ -3686,15 +3829,15 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 31.0.1", + "sp-std 14.0.0", ] [[package]] -name = "pallet-contracts-for-drink" -version = "22.0.1" +name = "pallet-contracts" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f039ee77b4ff6ab8b4e427bab636dd23ba1257ed631616c98c0859a83a5e690" +checksum = "1c24580e4e9b9c000f62be094e1be4cd92cf1e0b5ec54b9b6fb78cc6ed8f3efc" dependencies = [ "bitflags 1.3.2", "environmental", @@ -3704,18 +3847,20 @@ dependencies = [ "impl-trait-for-tuples", "log", "pallet-balances", - "pallet-contracts-primitives", "pallet-contracts-proc-macro", + "pallet-contracts-uapi", "parity-scale-codec", "rand 0.8.5", "scale-info", "serde", "smallvec", "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", + "staging-xcm", + "staging-xcm-builder", "wasm-instrument", "wasmi", ] @@ -3729,28 +3874,42 @@ dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", - "sp-weights", + "sp-runtime 26.0.0", + "sp-std 10.0.0", + "sp-weights 22.0.0", ] [[package]] name = "pallet-contracts-proc-macro" -version = "14.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac3eb6be2d450fb3ca242f60f7766f86141b50e37bb3759f2add3757734fbf6" +checksum = "e65fc5412a9f0a56a9c53e5f6f73351086e6ca125b0d38c3f612eef7d251d007" dependencies = [ "proc-macro2", "quote", "syn 2.0.48", ] +[[package]] +name = "pallet-contracts-uapi" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a992d0815b9dc36acbe0800b05b4f875398bb9d9b1aa15c8b1afdcb87f66df2a" +dependencies = [ + "bitflags 1.3.2", + "parity-scale-codec", + "paste", + "polkavm-derive", + "scale-info", +] + [[package]] name = "pallet-timestamp" -version = "22.0.0" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924bc62e043df933e6067a2a70a71a16823253e46765e36800f0dc60a0a59018" +checksum = "688b89bdd377609b592bd094b304ebca33f4767fe72935465e2fd7db0e797968" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -3758,13 +3917,30 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", - "sp-storage", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", + "sp-storage 19.0.0", "sp-timestamp", ] +[[package]] +name = "pallet-transaction-payment" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18b4ca7a1af9b1f091900a354a96319c7614d7a32106ba86cb7f0b6f90239065" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", +] + [[package]] name = "parity-scale-codec" version = "3.6.9" @@ -3925,6 +4101,37 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +[[package]] +name = "polkadot-core-primitives" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda2b0f0c580c38f12445a4af10e0a23acf48381b2a95653e0be48ba787e10e5" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", +] + +[[package]] +name = "polkadot-parachain-primitives" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b37c55955147479e7b2f3c2e5385db4846ac3e3b997cd4a4ad52344524b5447" +dependencies = [ + "bounded-collections", + "derive_more", + "parity-scale-codec", + "polkadot-core-primitives", + "scale-info", + "serde", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", + "sp-weights 27.0.0", +] + [[package]] name = "polkavm-common" version = "0.4.0" @@ -4048,6 +4255,15 @@ dependencies = [ "toml_edit 0.20.7", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4074,9 +4290,9 @@ dependencies = [ [[package]] name = "proc-macro-warning" -version = "0.4.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", @@ -5009,6 +5225,12 @@ dependencies = [ "wide", ] +[[package]] +name = "simple-mermaid" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18" + [[package]] name = "siphasher" version = "1.0.0" @@ -5175,36 +5397,36 @@ dependencies = [ [[package]] name = "sp-api" -version = "21.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86901915aaf9c73f9a8588fae10072c6082e7bf169edae175950410b77ad8103" +checksum = "6dea138c6dbf282ab57756492f0232ea0a08575ca9cbe2b7b1ead49000f238a7" dependencies = [ "hash-db", "log", "parity-scale-codec", "scale-info", "sp-api-proc-macro", - "sp-core", - "sp-externalities", + "sp-core 28.0.0", + "sp-externalities 0.25.0", "sp-metadata-ir", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-std 14.0.0", + "sp-trie 29.0.0", "sp-version", "thiserror", ] [[package]] name = "sp-api-proc-macro" -version = "10.0.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972809a3e3a583423bca2ee6d08eb5397814ef6b265abf43e888c4ed9916ff83" +checksum = "0694be2891593450916d6b53a274d234bccbc86bcbada36ba23fc356989070c7" dependencies = [ "Inflector", "blake2", "expander", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.48", @@ -5219,9 +5441,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 23.0.0", + "sp-io 25.0.0", + "sp-std 10.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4fe7a9b7fa9da76272b201e2fb3c7900d97d32a46b66af9a04dad457f73c71" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-std 14.0.0", ] [[package]] @@ -5235,7 +5471,22 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 10.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f42721f072b421f292a072e8f52a3b3c0fbc27428f0c9fe24067bc47046bad63" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 14.0.0", "static_assertions", ] @@ -5273,11 +5524,11 @@ dependencies = [ "secrecy", "serde", "sp-core-hashing 11.0.0", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-debug-derive 10.0.0", + "sp-externalities 0.21.0", + "sp-runtime-interface 19.0.0", + "sp-std 10.0.0", + "sp-storage 15.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -5286,6 +5537,52 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-core" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f230cb12575455070da0fc174815958423a0b9a641d5e304a9457113c7cb4007" +dependencies = [ + "array-bytes", + "bip39", + "bitflags 1.3.2", + "blake2", + "bounded-collections", + "bs58", + "dyn-clonable", + "ed25519-zebra 3.1.0", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "itertools 0.10.5", + "libsecp256k1", + "log", + "merlin 3.0.0", + "parity-scale-codec", + "parking_lot", + "paste", + "primitive-types", + "rand 0.8.5", + "scale-info", + "schnorrkel 0.11.4", + "secp256k1 0.28.2", + "secrecy", + "serde", + "sp-core-hashing 15.0.0", + "sp-debug-derive 14.0.0", + "sp-externalities 0.25.0", + "sp-runtime-interface 24.0.0", + "sp-std 14.0.0", + "sp-storage 19.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tracing", + "w3f-bls", + "zeroize", +] + [[package]] name = "sp-core-hashing" version = "11.0.0" @@ -5315,17 +5612,31 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing-proc-macro" -version = "11.0.0" +name = "sp-core-hashing" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8681fa136cf504ba2b722fcb10d78df147c15d201b997e06c4c8c72258001a" +checksum = "1e0f4990add7b2cefdeca883c0efa99bb4d912cb2196120e1500c0cc099553b0" dependencies = [ - "quote", - "sp-core-hashing 11.0.0", - "syn 2.0.48", -] - -[[package]] + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.8", + "sha3", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing-proc-macro" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7527f8dda7667c41009b2cd0efaddcb81709b9741bd5ee6d17b11bad835cc698" +dependencies = [ + "quote", + "sp-core-hashing 15.0.0", + "syn 2.0.48", +] + +[[package]] name = "sp-debug-derive" version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5336,6 +5647,17 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "sp-debug-derive" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "sp-externalities" version = "0.21.0" @@ -5344,34 +5666,46 @@ checksum = "588cf40c36de918f545d712ad1a70631ae71653e4a321506dfcd8fa6fd26453c" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 10.0.0", + "sp-storage 15.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63867ec85950ced90d4ab1bba902a47db1b1efdf2829f653945669b2bb470a9c" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 14.0.0", + "sp-storage 19.0.0", ] [[package]] name = "sp-genesis-builder" -version = "0.2.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae51f8a24e1be6593be94581f3465a10d7c86ce403cbf9dcf703d14f35309d1" +checksum = "dfdc79df83221ec5a279cbbd08fd6f8be164b9b081c8e84593ce2c2ebd5d66c0" dependencies = [ "serde_json", "sp-api", - "sp-runtime", - "sp-std", + "sp-runtime 31.0.1", + "sp-std 14.0.0", ] [[package]] name = "sp-inherents" -version = "21.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4355b6a68001ff5308a09fe069c778c184030ee3b95271dd44841d056ecadf13" +checksum = "9a3caf2d1288549d7e6c32b453f2d4855d498bb88600101011e35653e022a6f2" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 31.0.1", + "sp-std 14.0.0", "thiserror", ] @@ -5388,14 +5722,39 @@ dependencies = [ "parity-scale-codec", "rustversion", "secp256k1 0.24.3", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", + "sp-core 23.0.0", + "sp-externalities 0.21.0", + "sp-keystore 0.29.0", + "sp-runtime-interface 19.0.0", + "sp-state-machine 0.30.0", + "sp-std 10.0.0", + "sp-tracing 12.0.0", + "sp-trie 24.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c55f26d89feedaf0faf81688b6e1e1e81329cd8b4c6a4fd6c5b97ed9dd068b8a" +dependencies = [ + "bytes", + "ed25519-dalek", + "libsecp256k1", + "log", + "parity-scale-codec", + "rustversion", + "secp256k1 0.28.2", + "sp-core 28.0.0", + "sp-externalities 0.25.0", + "sp-keystore 0.34.0", + "sp-runtime-interface 24.0.0", + "sp-state-machine 0.35.0", + "sp-std 14.0.0", + "sp-tracing 16.0.0", + "sp-trie 29.0.0", "tracing", "tracing-core", ] @@ -5407,8 +5766,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dfcca2fad349d5fd197a56b4deef229b872c9172a8267d77c81a9f45a38f18a" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 23.0.0", + "sp-runtime 26.0.0", "strum 0.24.1", ] @@ -5420,21 +5779,34 @@ checksum = "44f0f9546dd151881c60e75355806f1cbbc893f64aa465fc5bf87a47de59467b" dependencies = [ "parity-scale-codec", "parking_lot", - "sp-core", - "sp-externalities", + "sp-core 23.0.0", + "sp-externalities 0.21.0", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96806a28a62ed9ddecd0b28857b1344d029390f7c5c42a2ff9199cbf5638635c" +dependencies = [ + "parity-scale-codec", + "parking_lot", + "sp-core 28.0.0", + "sp-externalities 0.25.0", "thiserror", ] [[package]] name = "sp-metadata-ir" -version = "0.2.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d493f8324241f20d80cbc920fa0ab7a173907d0bf1a10812098a924cdff48d7" +checksum = "fa0b5e87e56c1bb26d9524d48dd127121d630f895bd5914a34f0b017489f7c1d" dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-std", + "sp-std 14.0.0", ] [[package]] @@ -5448,6 +5820,17 @@ dependencies = [ "regex", ] +[[package]] +name = "sp-panic-handler" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f5a17a0a11de029a8b811cb6e8b32ce7e02183cc04a3e965c383246798c416" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-runtime" version = "26.0.0" @@ -5463,12 +5846,37 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", - "sp-weights", + "sp-application-crypto 25.0.0", + "sp-arithmetic 18.0.0", + "sp-core 23.0.0", + "sp-io 25.0.0", + "sp-std 10.0.0", + "sp-weights 22.0.0", +] + +[[package]] +name = "sp-runtime" +version = "31.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3bb49a4475d390198dfd3d41bef4564ab569fbaf1b5e38ae69b35fc01199d91" +dependencies = [ + "docify", + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.8.5", + "scale-info", + "serde", + "simple-mermaid", + "sp-application-crypto 30.0.0", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-std 14.0.0", + "sp-weights 27.0.0", ] [[package]] @@ -5481,12 +5889,31 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.21.0", + "sp-runtime-interface-proc-macro 13.0.0", + "sp-std 10.0.0", + "sp-storage 15.0.0", + "sp-tracing 12.0.0", + "sp-wasm-interface 16.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "24.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f66b66d8cec3d785fa6289336c1d9cbd4305d5d84f7134378c4d79ed7983e6fb" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.25.0", + "sp-runtime-interface-proc-macro 17.0.0", + "sp-std 14.0.0", + "sp-storage 19.0.0", + "sp-tracing 16.0.0", + "sp-wasm-interface 20.0.0", "static_assertions", ] @@ -5503,19 +5930,33 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfaf6e85b2ec12a4b99cd6d8d57d083e30c94b7f1b0d8f93547121495aae6f0c" +dependencies = [ + "Inflector", + "expander", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "sp-staking" -version = "21.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb11c6a7765d2df277110fe25bba075f697aba999b29a6c9b55eb2b95401b0" +checksum = "c0e68be3fff84dd8ee552f9d13dd2e9eab3663e0bddfc6c6c88de02aaca1e311" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", ] [[package]] @@ -5530,14 +5971,36 @@ dependencies = [ "parking_lot", "rand 0.8.5", "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 23.0.0", + "sp-externalities 0.21.0", + "sp-panic-handler 10.0.0", + "sp-std 10.0.0", + "sp-trie 24.0.0", "thiserror", "tracing", - "trie-db", + "trie-db 0.27.1", +] + +[[package]] +name = "sp-state-machine" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718c779ad1d6fcc0be64c7ce030b33fa44b5c8914b3a1319ef63bb5f27fb98df" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot", + "rand 0.8.5", + "smallvec", + "sp-core 28.0.0", + "sp-externalities 0.25.0", + "sp-panic-handler 13.0.0", + "sp-std 14.0.0", + "sp-trie 29.0.0", + "thiserror", + "tracing", + "trie-db 0.28.0", ] [[package]] @@ -5546,6 +6009,12 @@ version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed09ef1760e8be9b64b7f739f1cf9a94528130be475d8e4f2d1be1e690c9f9c" +[[package]] +name = "sp-std" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" + [[package]] name = "sp-storage" version = "15.0.0" @@ -5556,21 +6025,35 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 10.0.0", + "sp-std 10.0.0", +] + +[[package]] +name = "sp-storage" +version = "19.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb92d7b24033a8a856d6e20dd980b653cbd7af7ec471cc988b1b7c1d2e3a32b" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 14.0.0", + "sp-std 14.0.0", ] [[package]] name = "sp-timestamp" -version = "21.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d60953f7fc9b4f51bbcbac8f0cd8d6e6266a7cc18f661330308bbcec1eb053" +checksum = "347eaddd5b07856ccec69ac3300e72e392a5efc3aea5fb4b7230888a0b447b9e" dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 31.0.1", + "sp-std 14.0.0", "thiserror", ] @@ -5581,7 +6064,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebabec43485ebdb2fdb5c6f9b388590d4797a3888024d74724ada2f16b2113b8" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 10.0.0", + "tracing", + "tracing-core", + "tracing-subscriber 0.2.25", +] + +[[package]] +name = "sp-tracing" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" +dependencies = [ + "parity-scale-codec", + "sp-std 14.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -5603,19 +6099,44 @@ dependencies = [ "parking_lot", "scale-info", "schnellru", - "sp-core", - "sp-std", + "sp-core 23.0.0", + "sp-std 10.0.0", + "thiserror", + "tracing", + "trie-db 0.27.1", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "29.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e4d24d84a0beb44a71dcac1b41980e1edf7fb722c7f3046710136a283cd479b" +dependencies = [ + "ahash 0.8.7", + "hash-db", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot", + "rand 0.8.5", + "scale-info", + "schnellru", + "sp-core 28.0.0", + "sp-externalities 0.25.0", + "sp-std 14.0.0", "thiserror", "tracing", - "trie-db", + "trie-db 0.28.0", "trie-root", ] [[package]] name = "sp-version" -version = "24.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a8d11b816cd2c68467c697aecca868ab5828af02ef093681a88554d045b878" +checksum = "afd1b053394347e22f541696bca4a9ac3ec848b50d1b86f5018d2b771f39f11a" dependencies = [ "impl-serde", "parity-scale-codec", @@ -5623,17 +6144,17 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", + "sp-runtime 31.0.1", + "sp-std 14.0.0", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "10.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de7bbf860de93bb9b0ccd8e4a74e0dc40089e7192c397bac2b357d4da74e20c" +checksum = "e9bc3fed32d6dacbbbfb28dd1fe0224affbb737cb6cbfca1d9149351c2b69a7d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -5651,7 +6172,21 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 10.0.0", + "wasmtime", +] + +[[package]] +name = "sp-wasm-interface" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 14.0.0", "wasmtime", ] @@ -5665,10 +6200,26 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-core", - "sp-debug-derive", - "sp-std", + "sp-arithmetic 18.0.0", + "sp-core 23.0.0", + "sp-debug-derive 10.0.0", + "sp-std 10.0.0", +] + +[[package]] +name = "sp-weights" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e874bdf9dd3fd3242f5b7867a4eaedd545b02f29041a46d222a9d9d5caaaa5c" +dependencies = [ + "bounded-collections", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 23.0.0", + "sp-debug-derive 14.0.0", + "sp-std 14.0.0", ] [[package]] @@ -5708,6 +6259,70 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "staging-xcm" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df18af00766d22926916bb443f14742c65cc6b2f0fe997b8f26da0d0f9ee9ca" +dependencies = [ + "array-bytes", + "bounded-collections", + "derivative", + "environmental", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-weights 27.0.0", + "xcm-procedural", +] + +[[package]] +name = "staging-xcm-builder" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f7a45adc5b85ac35d2245833967772cc74af10899143ebfa4df3c7eb494edb0" +dependencies = [ + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-arithmetic 23.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", + "sp-weights 27.0.0", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "staging-xcm-executor" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2493cf438497734b64cdeb55dbee9872bd598f7b08649e9a3bd56d7939360a80" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-std 14.0.0", + "sp-weights 27.0.0", + "staging-xcm", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -6203,6 +6818,17 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.2", + "toml_datetime", + "winnow", +] + [[package]] name = "toml_edit" version = "0.22.4" @@ -6361,6 +6987,19 @@ dependencies = [ "smallvec", ] +[[package]] +name = "trie-db" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" +dependencies = [ + "hash-db", + "hashbrown 0.13.2", + "log", + "rustc-hex", + "smallvec", +] + [[package]] name = "trie-root" version = "0.18.0" @@ -6523,6 +7162,30 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "w3f-bls" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331" +dependencies = [ + "ark-bls12-377", + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-serialize-derive", + "arrayref", + "constcat", + "digest 0.10.7", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "sha2 0.10.8", + "sha3", + "thiserror", + "zeroize", +] + [[package]] name = "waker-fn" version = "1.1.1" @@ -7180,6 +7843,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "xcm-procedural" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7998facd751c42ec9b11a4cf71fcdb41fb147c5c8db8bcd1281fe84f8760d515" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "xxhash-rust" version = "0.8.8" diff --git a/Cargo.toml b/Cargo.toml index 81f316e9d9..6368ef07ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ cfg-if = { version = "1.0" } contract-build = { version = "4.0.0-rc.2" } darling = { version = "0.20.5" } derive_more = { version = "0.99.17", default-features = false } -drink = { version = "=0.8.5" } +drink = { version = "=0.10.0" } either = { version = "1.5", default-features = false } funty = { version = "2.0.0" } heck = { version = "0.4.0" } From 5fee4a727e83343b9852a7c0d4192e1918ef24ba Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Sat, 10 Feb 2024 13:42:54 +0000 Subject: [PATCH 07/10] bump crates and update drink client --- Cargo.lock | 502 +++++------------- Cargo.toml | 13 +- crates/e2e/Cargo.toml | 1 - crates/e2e/src/backend.rs | 2 +- crates/e2e/src/backend_calls.rs | 30 +- crates/e2e/src/contract_build.rs | 2 +- crates/e2e/src/drink_client.rs | 82 +-- crates/e2e/src/subxt_client.rs | 2 +- crates/e2e/src/xts.rs | 8 +- .../contracts/incrementer/Cargo.toml-e | 22 + 10 files changed, 235 insertions(+), 429 deletions(-) create mode 100644 integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml-e diff --git a/Cargo.lock b/Cargo.lock index db116aee54..fc54bf850d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.12", + "getrandom", "once_cell", "version_check", ] @@ -64,7 +64,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.12", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -312,7 +312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -623,7 +623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", - "rand 0.8.5", + "rand", "rand_core 0.6.4", "serde", "unicode-normalization", @@ -1043,7 +1043,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.12", + "getrandom", "once_cell", "tiny-keccak", ] @@ -1959,7 +1959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -2062,7 +2062,7 @@ dependencies = [ "sp-metadata-ir", "sp-runtime 31.0.1", "sp-staking", - "sp-state-machine 0.35.0", + "sp-state-machine", "sp-std 14.0.0", "sp-tracing 16.0.0", "sp-weights 27.0.0", @@ -2294,17 +2294,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.12" @@ -2313,7 +2302,7 @@ checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -2322,7 +2311,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand 0.8.5", + "rand", "rand_core 0.6.4", ] @@ -2703,7 +2692,7 @@ name = "ink" version = "5.0.0-rc.1" dependencies = [ "derive_more", - "ink-pallet-contracts-uapi", + "ink-pallet-contracts-uapi 7.0.0", "ink_env 5.0.0-rc.1", "ink_ir", "ink_macro", @@ -2727,6 +2716,17 @@ dependencies = [ "polkavm-derive", ] +[[package]] +name = "ink-pallet-contracts-uapi" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfc87d7531f2d7bef23c005861c38af6d8573ed83c6a0cc911d4a5c19e885ca" +dependencies = [ + "bitflags 1.3.2", + "paste", + "polkavm-derive", +] + [[package]] name = "ink_allocator" version = "5.0.0-rc.1" @@ -2784,10 +2784,9 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 23.0.0", + "sp-core 28.0.0", "sp-keyring", - "sp-runtime 26.0.0", - "sp-weights 22.0.0", + "sp-runtime 31.0.1", "subxt", "subxt-metadata", "subxt-signer", @@ -2820,10 +2819,10 @@ version = "5.0.0-rc.1" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi", + "ink-pallet-contracts-uapi 7.0.0", "ink_primitives 5.0.0-rc.1", "parity-scale-codec", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", ] @@ -2836,10 +2835,10 @@ checksum = "5a6311f58a385f6301aa0eb7766e13473ab6be7151b9ed90b0f01c6249fa6d29" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi", + "ink-pallet-contracts-uapi 6.0.0", "ink_primitives 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", ] @@ -2853,7 +2852,7 @@ dependencies = [ "const_env", "derive_more", "ink", - "ink-pallet-contracts-uapi", + "ink-pallet-contracts-uapi 7.0.0", "ink_allocator 5.0.0-rc.1", "ink_engine 5.0.0-rc.1", "ink_prelude 5.0.0-rc.1", @@ -2867,7 +2866,7 @@ dependencies = [ "scale-encode", "scale-info", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", "static_assertions", @@ -2883,7 +2882,7 @@ dependencies = [ "cfg-if", "const_env", "derive_more", - "ink-pallet-contracts-uapi", + "ink-pallet-contracts-uapi 6.0.0", "ink_allocator 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "ink_engine 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "ink_prelude 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2897,7 +2896,7 @@ dependencies = [ "scale-encode", "scale-info", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", "static_assertions", @@ -3023,7 +3022,7 @@ dependencies = [ "cfg-if", "derive_more", "ink", - "ink-pallet-contracts-uapi", + "ink-pallet-contracts-uapi 7.0.0", "ink_env 5.0.0-rc.1", "ink_metadata 5.0.0-rc.1", "ink_prelude 5.0.0-rc.1", @@ -3317,7 +3316,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -3598,7 +3597,7 @@ checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -3850,7 +3849,7 @@ dependencies = [ "pallet-contracts-proc-macro", "pallet-contracts-uapi", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "smallvec", @@ -3867,16 +3866,16 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" -version = "26.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5c5653fe8f09fe71530a09078feaa6296f9852428fe8e0a1c9dfc2729d01bf7" +checksum = "a31e55b0b8df678f94af4b12bee8b3367d4217f4c5d90b2e531ec9bc15dfc39b" dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "scale-info", - "sp-runtime 26.0.0", - "sp-std 10.0.0", - "sp-weights 22.0.0", + "sp-runtime 29.0.0", + "sp-std 12.0.0", + "sp-weights 25.0.0", ] [[package]] @@ -4018,15 +4017,6 @@ dependencies = [ "crypto-mac 0.11.0", ] -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "pbkdf2" version = "0.12.2" @@ -4325,7 +4315,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ "env_logger", "log", - "rand 0.8.5", + "rand", ] [[package]] @@ -4354,19 +4344,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -4374,20 +4351,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -4403,9 +4370,6 @@ name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] [[package]] name = "rand_core" @@ -4413,16 +4377,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -4521,7 +4476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom", "libc", "spin", "untrusted", @@ -4853,9 +4808,7 @@ dependencies = [ "arrayref", "arrayvec 0.5.2", "curve25519-dalek 2.1.3", - "getrandom 0.1.16", "merlin 2.0.1", - "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", "subtle", @@ -4917,31 +4870,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" -dependencies = [ - "secp256k1-sys 0.6.1", -] - [[package]] name = "secp256k1" version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "secp256k1-sys 0.9.2", -] - -[[package]] -name = "secp256k1-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" -dependencies = [ - "cc", + "secp256k1-sys", ] [[package]] @@ -5306,8 +5241,8 @@ dependencies = [ "pbkdf2 0.12.2", "pin-project", "poly1305", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "ruzstd", "schnorrkel 0.11.4", "serde", @@ -5349,8 +5284,8 @@ dependencies = [ "no-std-net", "parking_lot", "pin-project", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "serde", "serde_json", "siphasher", @@ -5391,7 +5326,7 @@ dependencies = [ "futures", "httparse", "log", - "rand 0.8.5", + "rand", "sha-1", ] @@ -5410,9 +5345,9 @@ dependencies = [ "sp-externalities 0.25.0", "sp-metadata-ir", "sp-runtime 31.0.1", - "sp-state-machine 0.35.0", + "sp-state-machine", "sp-std 14.0.0", - "sp-trie 29.0.0", + "sp-trie", "sp-version", "thiserror", ] @@ -5434,16 +5369,15 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "25.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa730e4f3a2aec3f4ee777410599a86eb17067ee5410c58ab496e88d7bb840c" +checksum = "23030de8eae0272c705cf3e2ce0523a64708a6b53aa23f3cf9053ca63abd08d7" dependencies = [ "parity-scale-codec", "scale-info", - "serde", - "sp-core 23.0.0", - "sp-io 25.0.0", - "sp-std 10.0.0", + "sp-core 26.0.0", + "sp-io 28.0.0", + "sp-std 12.0.0", ] [[package]] @@ -5462,16 +5396,15 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "18.0.0" +version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3d3ff6d6d717d7563659e9e47e958d33ebd2d0b3d8b1a9961cf9832944375e" +checksum = "b9cf6e5c0c7c2e7be3a4a10af5316d2d40182915509a70f632a66c238a05c37b" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", - "serde", - "sp-std 10.0.0", + "sp-std 12.0.0", "static_assertions", ] @@ -5492,48 +5425,28 @@ dependencies = [ [[package]] name = "sp-core" -version = "23.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "412e2ec53b1bc63778e2d70c347224e6cd2e25c4bacb509585db85f0788747b7" +checksum = "d0db34a19be2efa0398a9506a365392d93a85220856d55e0eb78165ad2e1bedc" dependencies = [ - "array-bytes", - "arrayvec 0.7.4", + "bip39", "bitflags 1.3.2", - "blake2", "bounded-collections", - "bs58", - "dyn-clonable", - "ed25519-zebra 3.1.0", - "futures", "hash-db", "hash256-std-hasher", - "impl-serde", - "lazy_static", - "libsecp256k1", "log", "merlin 2.0.1", "parity-scale-codec", - "parking_lot", "paste", "primitive-types", - "rand 0.8.5", - "regex", "scale-info", "schnorrkel 0.9.1", - "secp256k1 0.24.3", "secrecy", - "serde", - "sp-core-hashing 11.0.0", - "sp-debug-derive 10.0.0", - "sp-externalities 0.21.0", - "sp-runtime-interface 19.0.0", - "sp-std 10.0.0", - "sp-storage 15.0.0", + "sp-debug-derive 12.0.0", + "sp-runtime-interface 22.0.0", + "sp-std 12.0.0", + "sp-storage 17.0.0", "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "tracing", "zeroize", ] @@ -5563,10 +5476,10 @@ dependencies = [ "parking_lot", "paste", "primitive-types", - "rand 0.8.5", + "rand", "scale-info", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "secrecy", "serde", "sp-core-hashing 15.0.0", @@ -5583,20 +5496,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558116d02341b6f28b033c19a2a5fa555afa3c52628639170087e7685d51e743" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "13.0.0" @@ -5638,9 +5537,9 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "10.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b235a0ad7124d58e6f0a728c8354da5b185b77bcf18b131b3a480cdaa23d95" +checksum = "50535e1a5708d3ba5c1195b59ebefac61cc8679c2c24716b87a86e8b7ed2e4a1" dependencies = [ "proc-macro2", "quote", @@ -5660,14 +5559,14 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588cf40c36de918f545d712ad1a70631ae71653e4a321506dfcd8fa6fd26453c" +checksum = "884d05160bc89d0943d1c9fb8006c3d44b80f37f8af607aeff8d4d9cc82e279a" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 10.0.0", - "sp-storage 15.0.0", + "sp-std 12.0.0", + "sp-storage 17.0.0", ] [[package]] @@ -5711,25 +5610,18 @@ dependencies = [ [[package]] name = "sp-io" -version = "25.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9926dba7d67d87e40f49e18ff6cfc01373d5be13e3d373f02182bb5ec8ab37b" +checksum = "301c0ce94f80b324465a6f6173183aa07b26bd71d67f94a44de1fd11dea4a7cb" dependencies = [ "bytes", - "ed25519-dalek", - "libsecp256k1", - "log", "parity-scale-codec", "rustversion", - "secp256k1 0.24.3", - "sp-core 23.0.0", - "sp-externalities 0.21.0", - "sp-keystore 0.29.0", - "sp-runtime-interface 19.0.0", - "sp-state-machine 0.30.0", - "sp-std 10.0.0", - "sp-tracing 12.0.0", - "sp-trie 24.0.0", + "sp-core 26.0.0", + "sp-externalities 0.23.0", + "sp-runtime-interface 22.0.0", + "sp-std 12.0.0", + "sp-tracing 14.0.0", "tracing", "tracing-core", ] @@ -5746,44 +5638,30 @@ dependencies = [ "log", "parity-scale-codec", "rustversion", - "secp256k1 0.28.2", + "secp256k1", "sp-core 28.0.0", "sp-externalities 0.25.0", - "sp-keystore 0.34.0", + "sp-keystore", "sp-runtime-interface 24.0.0", - "sp-state-machine 0.35.0", + "sp-state-machine", "sp-std 14.0.0", "sp-tracing 16.0.0", - "sp-trie 29.0.0", + "sp-trie", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "26.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfcca2fad349d5fd197a56b4deef229b872c9172a8267d77c81a9f45a38f18a" +checksum = "98165ce7c625a8cdb88d39c6bbd56fe8b32ada64ed0894032beba99795f557da" dependencies = [ - "lazy_static", - "sp-core 23.0.0", - "sp-runtime 26.0.0", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "strum 0.24.1", ] -[[package]] -name = "sp-keystore" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f0f9546dd151881c60e75355806f1cbbc893f64aa465fc5bf87a47de59467b" -dependencies = [ - "parity-scale-codec", - "parking_lot", - "sp-core 23.0.0", - "sp-externalities 0.21.0", - "thiserror", -] - [[package]] name = "sp-keystore" version = "0.34.0" @@ -5809,17 +5687,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-panic-handler" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261572cc0db4b41cf7587b4f7bdc15b8f83f748f17ae1c3c2f56a3e8e62ee913" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - [[package]] name = "sp-panic-handler" version = "13.0.0" @@ -5833,9 +5700,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "26.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f645e9e2c82d052ea48ed987a8789daca1c03f9b5ed1aa49cd080092eda85330" +checksum = "082bae4a164b8b629ce9cee79ff3c6b20e66d11d8ef37398796567d616325da4" dependencies = [ "either", "hash256-std-hasher", @@ -5843,15 +5710,13 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand 0.8.5", "scale-info", - "serde", - "sp-application-crypto 25.0.0", - "sp-arithmetic 18.0.0", - "sp-core 23.0.0", - "sp-io 25.0.0", - "sp-std 10.0.0", - "sp-weights 22.0.0", + "sp-application-crypto 28.0.0", + "sp-arithmetic 21.0.0", + "sp-core 26.0.0", + "sp-io 28.0.0", + "sp-std 12.0.0", + "sp-weights 25.0.0", ] [[package]] @@ -5867,7 +5732,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", "simple-mermaid", @@ -5881,20 +5746,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "19.0.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef767d6e400ee54a420bcbc570030741420c2d938a6e379d21cab9875a339c5" +checksum = "695bba5d981a6fd3131b098d65f620601bd822501612bfb65897d4bb660762b1" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.21.0", - "sp-runtime-interface-proc-macro 13.0.0", - "sp-std 10.0.0", - "sp-storage 15.0.0", - "sp-tracing 12.0.0", - "sp-wasm-interface 16.0.0", + "sp-externalities 0.23.0", + "sp-runtime-interface-proc-macro 15.0.0", + "sp-std 12.0.0", + "sp-storage 17.0.0", + "sp-tracing 14.0.0", + "sp-wasm-interface 18.0.0", "static_assertions", ] @@ -5919,9 +5784,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "13.0.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd795a4a2205b64d95da897f85b7c83a0044f30df22b0ea282f8387dc6ca428" +checksum = "9b2afcbd1bd18d323371111b66b7ac2870bdc1c86c3d7b0dae67b112ca52b4d8" dependencies = [ "Inflector", "proc-macro-crate 1.3.1", @@ -5959,28 +5824,6 @@ dependencies = [ "sp-std 14.0.0", ] -[[package]] -name = "sp-state-machine" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771dce7d78335718ab8475984b6dbc1f374777049ed1c308186679e611333be2" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand 0.8.5", - "smallvec", - "sp-core 23.0.0", - "sp-externalities 0.21.0", - "sp-panic-handler 10.0.0", - "sp-std 10.0.0", - "sp-trie 24.0.0", - "thiserror", - "tracing", - "trie-db 0.27.1", -] - [[package]] name = "sp-state-machine" version = "0.35.0" @@ -5991,23 +5834,23 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot", - "rand 0.8.5", + "rand", "smallvec", "sp-core 28.0.0", "sp-externalities 0.25.0", - "sp-panic-handler 13.0.0", + "sp-panic-handler", "sp-std 14.0.0", - "sp-trie 29.0.0", + "sp-trie", "thiserror", "tracing", - "trie-db 0.28.0", + "trie-db", ] [[package]] name = "sp-std" -version = "10.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed09ef1760e8be9b64b7f739f1cf9a94528130be475d8e4f2d1be1e690c9f9c" +checksum = "54c78c5a66682568cc7b153603c5d01a2cc8f5c221c7b1e921517a0eef18ae05" [[package]] name = "sp-std" @@ -6017,16 +5860,14 @@ checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" [[package]] name = "sp-storage" -version = "15.0.0" +version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20f503280c004d94033a32cb84274ede30ef0b4b634770b1e7d595f8245bda4" +checksum = "016f20812cc51bd479cc88d048c35d44cd3adde4accdb159d49d6050f2953595" dependencies = [ - "impl-serde", "parity-scale-codec", "ref-cast", - "serde", - "sp-debug-derive 10.0.0", - "sp-std 10.0.0", + "sp-debug-derive 12.0.0", + "sp-std 12.0.0", ] [[package]] @@ -6059,15 +5900,14 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "12.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebabec43485ebdb2fdb5c6f9b388590d4797a3888024d74724ada2f16b2113b8" +checksum = "0d727cb5265641ffbb7d4e42c18b63e29f6cfdbd240aae3bcf093c3d6eb29a19" dependencies = [ "parity-scale-codec", - "sp-std 10.0.0", + "sp-std 12.0.0", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", ] [[package]] @@ -6083,30 +5923,6 @@ dependencies = [ "tracing-subscriber 0.2.25", ] -[[package]] -name = "sp-trie" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78585a84d02d1c71e8eb8c00ed586c22a46ad4e773d9ff65c8ed3b8e98b9f51" -dependencies = [ - "ahash 0.8.7", - "hash-db", - "hashbrown 0.13.2", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "scale-info", - "schnellru", - "sp-core 23.0.0", - "sp-std 10.0.0", - "thiserror", - "tracing", - "trie-db 0.27.1", - "trie-root", -] - [[package]] name = "sp-trie" version = "29.0.0" @@ -6120,7 +5936,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot", - "rand 0.8.5", + "rand", "scale-info", "schnellru", "sp-core 28.0.0", @@ -6128,7 +5944,7 @@ dependencies = [ "sp-std 14.0.0", "thiserror", "tracing", - "trie-db 0.28.0", + "trie-db", "trie-root", ] @@ -6164,16 +5980,13 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee009ac79098027f5990984e0c5ee2fd4883b16bbd6ab97931f28c2148aaa3ea" +checksum = "d5d85813d46a22484cdf5e5afddbbe85442dd1b4d84d67a8c7792f92f9f93607" dependencies = [ - "anyhow", "impl-trait-for-tuples", - "log", "parity-scale-codec", - "sp-std 10.0.0", - "wasmtime", + "sp-std 12.0.0", ] [[package]] @@ -6192,18 +6005,17 @@ dependencies = [ [[package]] name = "sp-weights" -version = "22.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86566cae93412e40bea0db9e6b110a7379105412a9aed1af73b5d2fb69cb7000" +checksum = "1689f9594c2c4d09ede3d8a991a9eb900654e424fb00b62f2b370170af347acd" dependencies = [ "parity-scale-codec", "scale-info", - "serde", "smallvec", - "sp-arithmetic 18.0.0", - "sp-core 23.0.0", - "sp-debug-derive 10.0.0", - "sp-std 10.0.0", + "sp-arithmetic 21.0.0", + "sp-core 26.0.0", + "sp-debug-derive 12.0.0", + "sp-std 12.0.0", ] [[package]] @@ -6513,7 +6325,7 @@ dependencies = [ "pbkdf2 0.12.2", "regex", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "secrecy", "sha2 0.10.8", "sp-core-hashing 13.0.0", @@ -6668,25 +6480,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2 0.11.0", - "rand 0.8.5", - "rustc-hash", - "sha2 0.10.8", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -6974,19 +6767,6 @@ dependencies = [ "tracing-log 0.2.0", ] -[[package]] -name = "trie-db" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" -dependencies = [ - "hash-db", - "hashbrown 0.13.2", - "log", - "rustc-hex", - "smallvec", -] - [[package]] name = "trie-db" version = "0.28.0" @@ -7045,7 +6825,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -7177,8 +6957,8 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_core 0.6.4", "sha2 0.10.8", "sha3", @@ -7211,12 +6991,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -7497,7 +7271,7 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", diff --git a/Cargo.toml b/Cargo.toml index 6368ef07ce..6206f7331d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,12 +83,13 @@ xxhash-rust = { version = "0.8" } const_env = { version = "0.1"} # Substrate dependencies -pallet-contracts-primitives = { version = "26.0.0", default-features = false } -pallet-contracts-uapi = { package = "ink-pallet-contracts-uapi", version = "6.0.0", default-features = false } -sp-core = { version = "23.0.0", default-features = false } -sp-keyring = { version = "26.0.0", default-features = false } -sp-runtime = { version = "26.0.0", default-features = false } -sp-weights = { version = "22.0.0", default-features = false } +pallet-contracts-primitives = { version = "=29.0.0", default-features = false } +pallet-contracts-uapi = { package = "ink-pallet-contracts-uapi", version = "=7.0.0", default-features = false } +sp-core = { version = "=28.0.0", default-features = false } +sp-keyring = { version = "=31.0.0", default-features = false } +sp-runtime = { version = "=31.0.1", default-features = false } +sp-weights = { version = "=27.0.0", default-features = false } +sp-externalities = { version = "=0.25.0" } # Local dependencies ink = { version = "=5.0.0-rc.1", path = "crates/ink", default-features = false } diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index b13888e61b..4ab5b9af59 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -44,7 +44,6 @@ pallet-contracts-primitives = { workspace = true } sp-core = { workspace = true } sp-keyring = { workspace = true } sp-runtime = { workspace = true } -sp-weights = { workspace = true } [dev-dependencies] # Required for the doctest of `MessageBuilder::call` diff --git a/crates/e2e/src/backend.rs b/crates/e2e/src/backend.rs index b3de975510..023f6371a8 100644 --- a/crates/e2e/src/backend.rs +++ b/crates/e2e/src/backend.rs @@ -28,6 +28,7 @@ use crate::{ CallDryRunResult, UploadResult, }; +use drink::Weight; use ink_env::{ DefaultEnvironment, Environment, @@ -37,7 +38,6 @@ use scale::{ Decode, Encode, }; -use sp_weights::Weight; use subxt::dynamic::Value; /// Full E2E testing backend: combines general chain API and contract-specific operations. diff --git a/crates/e2e/src/backend_calls.rs b/crates/e2e/src/backend_calls.rs index 8fea6449d2..e59bac98c0 100644 --- a/crates/e2e/src/backend_calls.rs +++ b/crates/e2e/src/backend_calls.rs @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +use drink::Weight; use ink_env::Environment; use scale::{ Decode, Encode, }; -use sp_weights::Weight; use crate::{ backend::BuilderClient, @@ -153,11 +153,9 @@ where limit } else { let gas_required = dry_run.exec_result.gas_required; - if let Some(m) = self.extra_gas_portion { - gas_required + (gas_required / 100 * m) - } else { - gas_required - } + let proof_size = gas_required.proof_size(); + let ref_time = gas_required.ref_time(); + calculate_weight(proof_size, ref_time, self.extra_gas_portion) }; let call_result = B::bare_call( @@ -313,11 +311,9 @@ where limit } else { let gas_required = dry_run.contract_result.gas_required; - if let Some(m) = self.extra_gas_portion { - gas_required + (gas_required / 100 * m) - } else { - gas_required - } + let proof_size = gas_required.proof_size(); + let ref_time = gas_required.ref_time(); + calculate_weight(proof_size, ref_time, self.extra_gas_portion) }; let instantiate_result = B::bare_instantiate( @@ -403,3 +399,15 @@ where .await } } + +fn calculate_weight( + mut proof_size: u64, + mut ref_time: u64, + portion: Option, +) -> Weight { + if let Some(m) = portion { + ref_time += ref_time / 100 * m; + proof_size += proof_size / 100 * m; + } + Weight::from_parts(ref_time, proof_size) +} diff --git a/crates/e2e/src/contract_build.rs b/crates/e2e/src/contract_build.rs index a08a3b120c..f31bbe30a7 100644 --- a/crates/e2e/src/contract_build.rs +++ b/crates/e2e/src/contract_build.rs @@ -163,7 +163,7 @@ fn build_contract(path_to_cargo_toml: &Path) -> PathBuf { unstable_flags: UnstableFlags::default(), optimization_passes: Some(OptimizationPasses::default()), keep_debug_symbols: false, - dylint: false, + extra_lints: false, output_type: OutputType::HumanReadable, skip_wasm_validation: false, target: Target::Wasm, diff --git a/crates/e2e/src/drink_client.rs b/crates/e2e/src/drink_client.rs index 0f2ed54a16..b9787bb1f0 100644 --- a/crates/e2e/src/drink_client.rs +++ b/crates/e2e/src/drink_client.rs @@ -37,13 +37,11 @@ use drink::{ frame_support::traits::fungible::Inspect, pallet_balances, pallet_contracts, - runtime::{ - AccountIdFor, - Runtime as RuntimeT, - }, + runtime::AccountIdFor, BalanceOf, RuntimeCall, Sandbox, + SandboxConfig, Weight, DEFAULT_GAS_LIMIT, }; @@ -76,8 +74,8 @@ use subxt_signer::sr25519::Keypair; type ContractsBalanceOf = <::Currency as Inspect>>::Balance; -pub struct Client { - sandbox: Sandbox, +pub struct Client { + sandbox: Sandbox, contracts: ContractsRegistry, _phantom: PhantomData<(AccountId, Hash)>, } @@ -85,15 +83,15 @@ pub struct Client { // While it is not necessary true that `Client` is `Send`, it will not be used in a way // that would violate this bound. In particular, all `Client` instances will be operating // synchronously. -unsafe impl Send - for Client +unsafe impl Send + for Client { } -impl Client +impl Client where - Runtime: RuntimeT + pallet_balances::Config + pallet_contracts::Config, - AccountIdFor: From<[u8; 32]>, - BalanceOf: From, + Config::Runtime: pallet_balances::Config + pallet_contracts::Config, + AccountIdFor: From<[u8; 32]>, + BalanceOf: From, { pub fn new>(contracts: impl IntoIterator) -> Self { let mut sandbox = Sandbox::new().expect("Failed to initialize Drink! sandbox"); @@ -106,7 +104,7 @@ where } } - fn fund_accounts(sandbox: &mut Sandbox) { + fn fund_accounts(sandbox: &mut Sandbox) { const TOKENS: u128 = 1_000_000_000_000_000; let accounts = [ @@ -130,14 +128,14 @@ where } #[async_trait] -impl + Send, Hash, Runtime> ChainBackend - for Client +impl + Send, Hash, Config: SandboxConfig> ChainBackend + for Client where - Runtime: RuntimeT + pallet_balances::Config, - AccountIdFor: From<[u8; 32]>, + Config::Runtime: pallet_balances::Config, + AccountIdFor: From<[u8; 32]>, { type AccountId = AccountId; - type Balance = BalanceOf; + type Balance = BalanceOf; type Error = DrinkErr; type EventLog = (); @@ -159,7 +157,7 @@ where &mut self, account: Self::AccountId, ) -> Result { - let account = AccountIdFor::::from(*account.as_ref()); + let account = AccountIdFor::::from(*account.as_ref()); Ok(self.sandbox.free_balance(&account)) } @@ -177,7 +175,7 @@ where // Get metadata of the drink! runtime, so that we can encode the call object. // Panic on error - metadata of the static im-memory runtime should always be // available. - let raw_metadata: Vec = Runtime::get_metadata().into(); + let raw_metadata: Vec = Config::get_metadata().into(); let metadata = subxt_metadata::Metadata::decode(&mut raw_metadata.as_slice()) .expect("Failed to decode metadata"); @@ -190,14 +188,15 @@ where // Decode the call object. // Panic on error - we just encoded a validated call object, so it should be // decodable. - let decoded_call = RuntimeCall::::decode(&mut encoded_call.as_slice()) - .expect("Failed to decode runtime call"); + let decoded_call = + RuntimeCall::::decode(&mut encoded_call.as_slice()) + .expect("Failed to decode runtime call"); // Execute the call. self.sandbox .runtime_call( decoded_call, - Runtime::convert_account_to_origin(keypair_to_account(origin)), + Config::convert_account_to_origin(keypair_to_account(origin)), ) .map_err(|_| DrinkErr)?; @@ -209,16 +208,17 @@ where impl< AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, Hash: Copy + From<[u8; 32]>, - Runtime: RuntimeT + pallet_balances::Config + pallet_contracts::Config, + Config: SandboxConfig, E: Environment< AccountId = AccountId, - Balance = ContractsBalanceOf, + Balance = ContractsBalanceOf, Hash = Hash, > + 'static, - > BuilderClient for Client + > BuilderClient for Client where - AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, - ContractsBalanceOf: Send + Sync, + Config::Runtime: pallet_balances::Config + pallet_contracts::Config, + AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, + ContractsBalanceOf: Send + Sync, { async fn bare_instantiate( &mut self, @@ -245,7 +245,7 @@ where let account_id_raw = match &result.result { Err(err) => { log_error(&format!("Instantiation failed: {err:?}")); - return Err(DrinkErr) // todo: make a proper error type + return Err(DrinkErr); // todo: make a proper error type } Ok(res) => *res.account_id.as_ref(), }; @@ -320,7 +320,7 @@ where Ok(result) => result, Err(err) => { log_error(&format!("Upload failed: {err:?}")); - return Err(DrinkErr) // todo: make a proper error type + return Err(DrinkErr); // todo: make a proper error type } }; @@ -372,7 +372,7 @@ where .result .is_err() { - return Err(DrinkErr) + return Err(DrinkErr); } Ok(()) @@ -420,16 +420,17 @@ where impl< AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, Hash: Copy + From<[u8; 32]>, - Runtime: RuntimeT + pallet_balances::Config + pallet_contracts::Config, + Config: SandboxConfig, E: Environment< AccountId = AccountId, - Balance = ContractsBalanceOf, + Balance = ContractsBalanceOf, Hash = Hash, > + 'static, - > E2EBackend for Client + > E2EBackend for Client where - AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, - ContractsBalanceOf: Send + Sync, + Config::Runtime: pallet_balances::Config + pallet_contracts::Config, + AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, + ContractsBalanceOf: Send + Sync, { } @@ -441,15 +442,16 @@ fn keypair_to_account>(keypair: &Keypair) -> AccountId impl< AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, Hash: Copy + From<[u8; 32]>, - Runtime: RuntimeT + pallet_balances::Config + pallet_contracts::Config, + Config: SandboxConfig, E: Environment< AccountId = AccountId, - Balance = ContractsBalanceOf, + Balance = ContractsBalanceOf, Hash = Hash, > + 'static, - > ContractsBackend for Client + > ContractsBackend for Client where - AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, + Config::Runtime: pallet_balances::Config + pallet_contracts::Config, + AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, { type Error = DrinkErr; type EventLog = (); diff --git a/crates/e2e/src/subxt_client.rs b/crates/e2e/src/subxt_client.rs index f887ae0bfc..5d26456855 100644 --- a/crates/e2e/src/subxt_client.rs +++ b/crates/e2e/src/subxt_client.rs @@ -38,6 +38,7 @@ use crate::{ UploadResult, }, }; +use drink::Weight; use ink_env::{ call::{ utils::{ @@ -55,7 +56,6 @@ use scale::{ Decode, Encode, }; -use sp_weights::Weight; #[cfg(feature = "std")] use std::fmt::Debug; use std::path::PathBuf; diff --git a/crates/e2e/src/xts.rs b/crates/e2e/src/xts.rs index 568f26aadf..99f07270f0 100644 --- a/crates/e2e/src/xts.rs +++ b/crates/e2e/src/xts.rs @@ -65,8 +65,8 @@ pub struct Weight { proof_size: u64, } -impl From for Weight { - fn from(weight: sp_weights::Weight) -> Self { +impl From for Weight { + fn from(weight: drink::Weight) -> Self { Self { ref_time: weight.ref_time(), proof_size: weight.proof_size(), @@ -74,9 +74,9 @@ impl From for Weight { } } -impl From for sp_weights::Weight { +impl From for drink::Weight { fn from(weight: Weight) -> Self { - sp_weights::Weight::from_parts(weight.ref_time, weight.proof_size) + drink::Weight::from_parts(weight.ref_time, weight.proof_size) } } diff --git a/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml-e b/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml-e new file mode 100644 index 0000000000..b4d45355e7 --- /dev/null +++ b/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml-e @@ -0,0 +1,22 @@ +[package] +name = "trait-incrementer" +version = "5.0.0-rc" +authors = ["Parity Technologies "] +edition = "2021" +publish = false + +[dependencies] +ink = { path = "../../../../crates/ink", default-features = false } + +dyn-traits = { path = "../../traits", default-features = false } + +[lib] +path = "lib.rs" + +[features] +default = ["std"] +std = [ + "ink/std", + "dyn-traits/std", +] +ink-as-dependency = [] From be1d9018e57fb55f384398ddb02b1a2eb298297a Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Sat, 10 Feb 2024 14:52:41 +0000 Subject: [PATCH 08/10] attempt to update dependencies --- Cargo.lock | 793 ++++++++++++++++++++------------ Cargo.toml | 15 +- crates/e2e/Cargo.toml | 1 + crates/e2e/src/backend.rs | 2 +- crates/e2e/src/backend_calls.rs | 6 +- crates/e2e/src/drink_client.rs | 4 +- crates/e2e/src/subxt_client.rs | 2 +- crates/e2e/src/xts.rs | 8 +- 8 files changed, 515 insertions(+), 316 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc54bf850d..31f9b658b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom", + "getrandom 0.2.12", "once_cell", "version_check", ] @@ -64,7 +64,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -312,7 +312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", ] [[package]] @@ -354,17 +354,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-channel" version = "2.2.0" @@ -387,41 +376,20 @@ dependencies = [ "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock 3.3.0", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", + "futures-lite", ] [[package]] @@ -434,9 +402,9 @@ dependencies = [ "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "parking", - "polling 3.4.0", + "polling", "rustix 0.38.31", "slab", "tracing", @@ -465,30 +433,31 @@ dependencies = [ [[package]] name = "async-net" -version = "1.8.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 1.13.0", + "async-io", "blocking", - "futures-lite 1.13.0", + "futures-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "15c1cd5d253ecac3d3cf15e390fd96bd92a13b1d14497d81abf077304794fb04" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock 3.3.0", "async-signal", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", + "event-listener 4.0.3", + "futures-lite", "rustix 0.38.31", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -497,7 +466,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.1", + "async-io", "async-lock 2.8.0", "atomic-waker", "cfg-if", @@ -623,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", - "rand", + "rand 0.8.5", "rand_core 0.6.4", "serde", "unicode-normalization", @@ -734,12 +703,12 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.2.0", + "async-channel", "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "piper", "tracing", ] @@ -1043,7 +1012,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom", + "getrandom 0.2.12", "once_cell", "tiny-keccak", ] @@ -1843,17 +1812,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - [[package]] name = "event-listener" version = "4.0.3" @@ -1921,15 +1879,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -1959,7 +1908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -1998,7 +1947,7 @@ dependencies = [ "sp-application-crypto 30.0.0", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-runtime-interface 24.0.0", "sp-std 14.0.0", "sp-storage 19.0.0", @@ -2060,9 +2009,9 @@ dependencies = [ "sp-inherents", "sp-io 30.0.0", "sp-metadata-ir", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-staking", - "sp-state-machine", + "sp-state-machine 0.35.0", "sp-std 14.0.0", "sp-tracing 16.0.0", "sp-weights 27.0.0", @@ -2129,7 +2078,7 @@ dependencies = [ "serde", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "sp-version", "sp-weights 27.0.0", @@ -2199,28 +2148,13 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-lite" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -2294,6 +2228,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + [[package]] name = "getrandom" version = "0.2.12" @@ -2302,7 +2247,7 @@ checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -2311,7 +2256,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand", + "rand 0.8.5", "rand_core 0.6.4", ] @@ -2530,7 +2475,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio", "tower-service", "tracing", @@ -2547,10 +2492,10 @@ dependencies = [ "http", "hyper", "log", - "rustls", - "rustls-native-certs", + "rustls 0.21.10", + "rustls-native-certs 0.6.3", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -2692,7 +2637,7 @@ name = "ink" version = "5.0.0-rc.1" dependencies = [ "derive_more", - "ink-pallet-contracts-uapi 7.0.0", + "ink-pallet-contracts-uapi", "ink_env 5.0.0-rc.1", "ink_ir", "ink_macro", @@ -2716,17 +2661,6 @@ dependencies = [ "polkavm-derive", ] -[[package]] -name = "ink-pallet-contracts-uapi" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc87d7531f2d7bef23c005861c38af6d8573ed83c6a0cc911d4a5c19e885ca" -dependencies = [ - "bitflags 1.3.2", - "paste", - "polkavm-derive", -] - [[package]] name = "ink_allocator" version = "5.0.0-rc.1" @@ -2778,15 +2712,16 @@ dependencies = [ "ink_e2e_macro", "ink_env 5.0.0-rc.1", "ink_primitives 5.0.0-rc.1", - "jsonrpsee", + "jsonrpsee 0.20.3", "pallet-contracts-primitives", "parity-scale-codec", "scale-info", "serde", "serde_json", - "sp-core 28.0.0", + "sp-core 26.0.0", "sp-keyring", - "sp-runtime 31.0.1", + "sp-runtime 29.0.0", + "sp-weights 27.0.0", "subxt", "subxt-metadata", "subxt-signer", @@ -2819,10 +2754,10 @@ version = "5.0.0-rc.1" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi 7.0.0", + "ink-pallet-contracts-uapi", "ink_primitives 5.0.0-rc.1", "parity-scale-codec", - "secp256k1", + "secp256k1 0.28.2", "sha2 0.10.8", "sha3", ] @@ -2835,10 +2770,10 @@ checksum = "5a6311f58a385f6301aa0eb7766e13473ab6be7151b9ed90b0f01c6249fa6d29" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi 6.0.0", + "ink-pallet-contracts-uapi", "ink_primitives 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "secp256k1", + "secp256k1 0.28.2", "sha2 0.10.8", "sha3", ] @@ -2852,7 +2787,7 @@ dependencies = [ "const_env", "derive_more", "ink", - "ink-pallet-contracts-uapi 7.0.0", + "ink-pallet-contracts-uapi", "ink_allocator 5.0.0-rc.1", "ink_engine 5.0.0-rc.1", "ink_prelude 5.0.0-rc.1", @@ -2866,7 +2801,7 @@ dependencies = [ "scale-encode", "scale-info", "schnorrkel 0.11.4", - "secp256k1", + "secp256k1 0.28.2", "sha2 0.10.8", "sha3", "static_assertions", @@ -2882,7 +2817,7 @@ dependencies = [ "cfg-if", "const_env", "derive_more", - "ink-pallet-contracts-uapi 6.0.0", + "ink-pallet-contracts-uapi", "ink_allocator 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "ink_engine 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "ink_prelude 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2896,7 +2831,7 @@ dependencies = [ "scale-encode", "scale-info", "schnorrkel 0.11.4", - "secp256k1", + "secp256k1 0.28.2", "sha2 0.10.8", "sha3", "static_assertions", @@ -3022,7 +2957,7 @@ dependencies = [ "cfg-if", "derive_more", "ink", - "ink-pallet-contracts-uapi 7.0.0", + "ink-pallet-contracts-uapi", "ink_env 5.0.0-rc.1", "ink_metadata 5.0.0-rc.1", "ink_prelude 5.0.0-rc.1", @@ -3107,15 +3042,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -3161,13 +3087,23 @@ version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-http-client", - "jsonrpsee-types", + "jsonrpsee-core 0.20.3", + "jsonrpsee-types 0.20.3", "jsonrpsee-ws-client", ] +[[package]] +name = "jsonrpsee" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9579d0ca9fb30da026bac2f0f7d9576ec93489aeb7cd4971dd5b4617d82c79b2" +dependencies = [ + "jsonrpsee-client-transport 0.21.0", + "jsonrpsee-core 0.21.0", + "jsonrpsee-http-client", + "jsonrpsee-types 0.21.0", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.20.3" @@ -3176,13 +3112,34 @@ checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" dependencies = [ "futures-util", "http", - "jsonrpsee-core", + "jsonrpsee-core 0.20.3", "pin-project", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "soketto", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9f9ed46590a8d5681975f126e22531698211b926129a40a2db47cbca429220" +dependencies = [ + "futures-util", + "http", + "jsonrpsee-core 0.21.0", + "pin-project", + "rustls-native-certs 0.7.0", + "rustls-pki-types", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.25.0", "tokio-util", "tracing", "url", @@ -3200,27 +3157,50 @@ dependencies = [ "beef", "futures-timer", "futures-util", + "jsonrpsee-types 0.20.3", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c" +dependencies = [ + "anyhow", + "async-lock 3.3.0", + "async-trait", + "beef", + "futures-timer", + "futures-util", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.21.0", + "pin-project", "rustc-hash", "serde", "serde_json", "thiserror", "tokio", + "tokio-stream", "tracing", ] [[package]] name = "jsonrpsee-http-client" -version = "0.20.3" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572" dependencies = [ "async-trait", "hyper", "hyper-rustls", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.21.0", + "jsonrpsee-types 0.21.0", "serde", "serde_json", "thiserror", @@ -3244,6 +3224,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "jsonrpsee-ws-client" version = "0.20.3" @@ -3251,9 +3244,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ "http", - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-client-transport 0.20.3", + "jsonrpsee-core 0.20.3", + "jsonrpsee-types 0.20.3", "url", ] @@ -3316,7 +3309,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand", + "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", @@ -3395,12 +3388,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -3597,7 +3584,7 @@ checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -3828,7 +3815,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", ] @@ -3849,14 +3836,14 @@ dependencies = [ "pallet-contracts-proc-macro", "pallet-contracts-uapi", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "serde", "smallvec", "sp-api", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", @@ -3917,7 +3904,7 @@ dependencies = [ "scale-info", "sp-inherents", "sp-io 30.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "sp-storage 19.0.0", "sp-timestamp", @@ -3936,7 +3923,7 @@ dependencies = [ "serde", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", ] @@ -4071,7 +4058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -4100,7 +4087,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core 28.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", ] @@ -4117,7 +4104,7 @@ dependencies = [ "scale-info", "serde", "sp-core 28.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "sp-weights 27.0.0", ] @@ -4150,22 +4137,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - [[package]] name = "polling" version = "3.4.0" @@ -4315,7 +4286,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ "env_logger", "log", - "rand", + "rand 0.8.5", ] [[package]] @@ -4344,6 +4315,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -4351,10 +4335,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", + "rand_chacha 0.3.1", "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -4370,6 +4364,9 @@ name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] [[package]] name = "rand_core" @@ -4377,7 +4374,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.12", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -4476,7 +4482,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom", + "getrandom 0.2.12", "libc", "spin", "untrusted", @@ -4530,20 +4536,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.31" @@ -4565,10 +4557,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -4576,7 +4582,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.0.0", + "rustls-pki-types", "schannel", "security-framework", ] @@ -4590,6 +4609,22 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4600,6 +4635,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -4735,6 +4781,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "scale-typegen" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00860983481ac590ac87972062909bef0d6a658013b592ccc0f2feb272feab11" +dependencies = [ + "proc-macro2", + "quote", + "scale-info", + "syn 2.0.48", + "thiserror", +] + [[package]] name = "scale-value" version = "0.13.0" @@ -4808,7 +4867,9 @@ dependencies = [ "arrayref", "arrayvec 0.5.2", "curve25519-dalek 2.1.3", + "getrandom 0.1.16", "merlin 2.0.1", + "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", "subtle", @@ -4870,13 +4931,31 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secp256k1" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +dependencies = [ + "secp256k1-sys 0.6.1", +] + [[package]] name = "secp256k1" version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "secp256k1-sys", + "secp256k1-sys 0.9.2", +] + +[[package]] +name = "secp256k1-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +dependencies = [ + "cc", ] [[package]] @@ -5189,26 +5268,26 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smol" -version = "1.3.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +checksum = "e635339259e51ef85ac7aa29a1cd991b957047507288697a690e80ab97d07cad" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock 3.3.0", "async-net", "async-process", "blocking", - "futures-lite 1.13.0", + "futures-lite", ] [[package]] name = "smoldot" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca99148e026936bbc444c3708748207033968e4ef1c33bfc885660ae4d44d21" +checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9" dependencies = [ "arrayvec 0.7.4", "async-lock 3.3.0", @@ -5222,14 +5301,14 @@ dependencies = [ "derive_more", "ed25519-zebra 4.0.3", "either", - "event-listener 3.1.0", + "event-listener 4.0.3", "fnv", - "futures-lite 2.2.0", + "futures-lite", "futures-util", "hashbrown 0.14.3", "hex", "hmac 0.12.1", - "itertools 0.11.0", + "itertools 0.12.1", "libm", "libsecp256k1", "merlin 3.0.0", @@ -5241,8 +5320,8 @@ dependencies = [ "pbkdf2 0.12.2", "pin-project", "poly1305", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "ruzstd", "schnorrkel 0.11.4", "serde", @@ -5261,31 +5340,31 @@ dependencies = [ [[package]] name = "smoldot-light" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e6f1898682b618b81570047b9d870b3faaff6ae1891b468eddd94d7f903c2fe" +checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7" dependencies = [ - "async-channel 2.2.0", + "async-channel", "async-lock 3.3.0", "base64 0.21.7", "blake2-rfc", "derive_more", "either", - "event-listener 3.1.0", + "event-listener 4.0.3", "fnv", "futures-channel", - "futures-lite 2.2.0", + "futures-lite", "futures-util", "hashbrown 0.14.3", "hex", - "itertools 0.11.0", + "itertools 0.12.1", "log", "lru", "no-std-net", "parking_lot", "pin-project", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "serde", "serde_json", "siphasher", @@ -5295,16 +5374,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.5" @@ -5326,7 +5395,7 @@ dependencies = [ "futures", "httparse", "log", - "rand", + "rand 0.8.5", "sha-1", ] @@ -5344,10 +5413,10 @@ dependencies = [ "sp-core 28.0.0", "sp-externalities 0.25.0", "sp-metadata-ir", - "sp-runtime 31.0.1", - "sp-state-machine", + "sp-runtime 31.0.0", + "sp-state-machine 0.35.0", "sp-std 14.0.0", - "sp-trie", + "sp-trie 29.0.0", "sp-version", "thiserror", ] @@ -5375,6 +5444,7 @@ checksum = "23030de8eae0272c705cf3e2ce0523a64708a6b53aa23f3cf9053ca63abd08d7" dependencies = [ "parity-scale-codec", "scale-info", + "serde", "sp-core 26.0.0", "sp-io 28.0.0", "sp-std 12.0.0", @@ -5404,6 +5474,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "scale-info", + "serde", "sp-std 12.0.0", "static_assertions", ] @@ -5429,24 +5500,45 @@ version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0db34a19be2efa0398a9506a365392d93a85220856d55e0eb78165ad2e1bedc" dependencies = [ + "array-bytes", "bip39", "bitflags 1.3.2", + "blake2", "bounded-collections", + "bs58", + "dyn-clonable", + "ed25519-zebra 3.1.0", + "futures", "hash-db", "hash256-std-hasher", + "impl-serde", + "itertools 0.10.5", + "lazy_static", + "libsecp256k1", "log", "merlin 2.0.1", "parity-scale-codec", + "parking_lot", "paste", "primitive-types", + "rand 0.8.5", + "regex", "scale-info", "schnorrkel 0.9.1", + "secp256k1 0.24.3", "secrecy", + "serde", + "sp-core-hashing 13.0.0", "sp-debug-derive 12.0.0", + "sp-externalities 0.23.0", "sp-runtime-interface 22.0.0", "sp-std 12.0.0", "sp-storage 17.0.0", "ss58-registry", + "substrate-bip39", + "thiserror", + "tracing", + "w3f-bls", "zeroize", ] @@ -5476,10 +5568,10 @@ dependencies = [ "parking_lot", "paste", "primitive-types", - "rand", + "rand 0.8.5", "scale-info", "schnorrkel 0.11.4", - "secp256k1", + "secp256k1 0.28.2", "secrecy", "serde", "sp-core-hashing 15.0.0", @@ -5589,7 +5681,7 @@ checksum = "dfdc79df83221ec5a279cbbd08fd6f8be164b9b081c8e84593ce2c2ebd5d66c0" dependencies = [ "serde_json", "sp-api", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", ] @@ -5603,7 +5695,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "thiserror", ] @@ -5615,13 +5707,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301c0ce94f80b324465a6f6173183aa07b26bd71d67f94a44de1fd11dea4a7cb" dependencies = [ "bytes", + "ed25519-dalek", + "libsecp256k1", + "log", "parity-scale-codec", "rustversion", + "secp256k1 0.24.3", "sp-core 26.0.0", "sp-externalities 0.23.0", + "sp-keystore 0.32.0", "sp-runtime-interface 22.0.0", + "sp-state-machine 0.33.0", "sp-std 12.0.0", "sp-tracing 14.0.0", + "sp-trie 27.0.0", "tracing", "tracing-core", ] @@ -5638,30 +5737,44 @@ dependencies = [ "log", "parity-scale-codec", "rustversion", - "secp256k1", + "secp256k1 0.28.2", "sp-core 28.0.0", "sp-externalities 0.25.0", - "sp-keystore", + "sp-keystore 0.34.0", "sp-runtime-interface 24.0.0", - "sp-state-machine", + "sp-state-machine 0.35.0", "sp-std 14.0.0", "sp-tracing 16.0.0", - "sp-trie", + "sp-trie 29.0.0", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "31.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98165ce7c625a8cdb88d39c6bbd56fe8b32ada64ed0894032beba99795f557da" +checksum = "674ebf2c64039465e8d55d4d92cb079d2214932a4d101473e1fbded29e5488cc" dependencies = [ - "sp-core 28.0.0", - "sp-runtime 31.0.1", + "lazy_static", + "sp-core 26.0.0", + "sp-runtime 29.0.0", "strum 0.24.1", ] +[[package]] +name = "sp-keystore" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db18ab01b2684856904c973d2be7dbf9ab3607cf706a7bd6648812662e5e7c5" +dependencies = [ + "parity-scale-codec", + "parking_lot", + "sp-core 26.0.0", + "sp-externalities 0.23.0", + "thiserror", +] + [[package]] name = "sp-keystore" version = "0.34.0" @@ -5687,6 +5800,17 @@ dependencies = [ "sp-std 14.0.0", ] +[[package]] +name = "sp-panic-handler" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00e40857ed3e0187f145b037c733545c5633859f1bd1d1b09deb52805fa696a" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-panic-handler" version = "13.0.0" @@ -5710,7 +5834,9 @@ dependencies = [ "log", "parity-scale-codec", "paste", + "rand 0.8.5", "scale-info", + "serde", "sp-application-crypto 28.0.0", "sp-arithmetic 21.0.0", "sp-core 26.0.0", @@ -5721,9 +5847,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "31.0.1" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bb49a4475d390198dfd3d41bef4564ab569fbaf1b5e38ae69b35fc01199d91" +checksum = "0046b92e2b0213f0f305ea87e058fb726bab21a929f1d15166eaaf54ebe02b72" dependencies = [ "docify", "either", @@ -5732,7 +5858,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand", + "rand 0.8.5", "scale-info", "serde", "simple-mermaid", @@ -5820,10 +5946,32 @@ dependencies = [ "scale-info", "serde", "sp-core 28.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", ] +[[package]] +name = "sp-state-machine" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df7c6680d9342c22c10d8272ebf9f0339b0e439b3e67b68f5627f9dfc6926a07" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot", + "rand 0.8.5", + "smallvec", + "sp-core 26.0.0", + "sp-externalities 0.23.0", + "sp-panic-handler 12.0.0", + "sp-std 12.0.0", + "sp-trie 27.0.0", + "thiserror", + "tracing", + "trie-db", +] + [[package]] name = "sp-state-machine" version = "0.35.0" @@ -5834,13 +5982,13 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot", - "rand", + "rand 0.8.5", "smallvec", "sp-core 28.0.0", "sp-externalities 0.25.0", - "sp-panic-handler", + "sp-panic-handler 13.0.0", "sp-std 14.0.0", - "sp-trie", + "sp-trie 29.0.0", "thiserror", "tracing", "trie-db", @@ -5864,8 +6012,10 @@ version = "17.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "016f20812cc51bd479cc88d048c35d44cd3adde4accdb159d49d6050f2953595" dependencies = [ + "impl-serde", "parity-scale-codec", "ref-cast", + "serde", "sp-debug-derive 12.0.0", "sp-std 12.0.0", ] @@ -5893,7 +6043,7 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "thiserror", ] @@ -5908,6 +6058,7 @@ dependencies = [ "sp-std 12.0.0", "tracing", "tracing-core", + "tracing-subscriber 0.2.25", ] [[package]] @@ -5923,6 +6074,31 @@ dependencies = [ "tracing-subscriber 0.2.25", ] +[[package]] +name = "sp-trie" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c4bf89a5bd74f696cd1f23d83bb6abe6bd0abad1f3c70d4b0d7ebec4098cfe" +dependencies = [ + "ahash 0.8.7", + "hash-db", + "hashbrown 0.13.2", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot", + "rand 0.8.5", + "scale-info", + "schnellru", + "sp-core 26.0.0", + "sp-std 12.0.0", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + [[package]] name = "sp-trie" version = "29.0.0" @@ -5936,7 +6112,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot", - "rand", + "rand 0.8.5", "scale-info", "schnellru", "sp-core 28.0.0", @@ -5960,7 +6136,7 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "sp-version-proc-macro", "thiserror", @@ -5984,9 +6160,12 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5d85813d46a22484cdf5e5afddbbe85442dd1b4d84d67a8c7792f92f9f93607" dependencies = [ + "anyhow", "impl-trait-for-tuples", + "log", "parity-scale-codec", "sp-std 12.0.0", + "wasmtime", ] [[package]] @@ -6011,6 +6190,7 @@ checksum = "1689f9594c2c4d09ede3d8a991a9eb900654e424fb00b62f2b370170af347acd" dependencies = [ "parity-scale-codec", "scale-info", + "serde", "smallvec", "sp-arithmetic 21.0.0", "sp-core 26.0.0", @@ -6106,7 +6286,7 @@ dependencies = [ "scale-info", "sp-arithmetic 23.0.0", "sp-io 30.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "sp-weights 27.0.0", "staging-xcm", @@ -6129,7 +6309,7 @@ dependencies = [ "sp-arithmetic 23.0.0", "sp-core 28.0.0", "sp-io 30.0.0", - "sp-runtime 31.0.1", + "sp-runtime 31.0.0", "sp-std 14.0.0", "sp-weights 27.0.0", "staging-xcm", @@ -6218,9 +6398,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subxt" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7cf683962113b84ce5226bdf6f27d7f92a7e5bb408a5231f6c205407fbb20df" +checksum = "b3323d5c27898b139d043dc1ee971f602f937b99354ee33ee933bd90e0009fbd" dependencies = [ "async-trait", "base58", @@ -6231,7 +6411,8 @@ dependencies = [ "futures", "hex", "impl-serde", - "jsonrpsee", + "instant", + "jsonrpsee 0.21.0", "parity-scale-codec", "primitive-types", "scale-bits", @@ -6241,28 +6422,31 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core-hashing 13.0.0", + "sp-core-hashing 15.0.0", "subxt-lightclient", "subxt-macro", "subxt-metadata", "thiserror", + "tokio-util", "tracing", + "url", ] [[package]] name = "subxt-codegen" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12800ad6128b4bfc93d2af89b7d368bff7ea2f6604add35f96f6a8c06c7f9abf" +checksum = "2d0e58c3f88651cff26aa52bae0a0a85f806a2e923a20eb438c16474990743ea" dependencies = [ "frame-metadata 16.0.0", "heck", "hex", - "jsonrpsee", + "jsonrpsee 0.21.0", "parity-scale-codec", "proc-macro2", "quote", "scale-info", + "scale-typegen", "subxt-metadata", "syn 2.0.48", "thiserror", @@ -6271,9 +6455,9 @@ dependencies = [ [[package]] name = "subxt-lightclient" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243765099b60d97dc7fc80456ab951758a07ed0decb5c09283783f06ca04fc69" +checksum = "ecec7066ba7bc0c3608fcd1d0c7d9584390990cd06095b6ae4f114f74c4b8550" dependencies = [ "futures", "futures-util", @@ -6288,35 +6472,37 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5086ce2a90e723083ff19b77f06805d00e732eac3e19c86f6cd643d4255d334" +checksum = "365251668613323064803427af8c7c7bc366cd8b28e33639640757669dafebd5" dependencies = [ "darling 0.20.5", "parity-scale-codec", "proc-macro-error", + "quote", + "scale-typegen", "subxt-codegen", "syn 2.0.48", ] [[package]] name = "subxt-metadata" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19dc60f779bcab44084053e12d4ad5ac18ee217dbe8e26c919e7086fc0228d30" +checksum = "c02aca8d39a1f6c55fff3a8fd81557d30a610fedc1cef03f889a81bc0f8f0b52" dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-core-hashing 13.0.0", + "sp-core-hashing 15.0.0", "thiserror", ] [[package]] name = "subxt-signer" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cc81461f8262b62acf7bfe178a45f22a40336a6ace6a3093bd3e22d7012ba3" +checksum = "f88a76a5d114bfae2f6f9cc1491c46173ecc3fb2b9e53948eb3c8d43d4b43ab5" dependencies = [ "bip39", "hex", @@ -6325,10 +6511,10 @@ dependencies = [ "pbkdf2 0.12.2", "regex", "schnorrkel 0.11.4", - "secp256k1", + "secp256k1 0.28.2", "secrecy", "sha2 0.10.8", - "sp-core-hashing 13.0.0", + "sp-core-hashing 15.0.0", "subxt", "thiserror", "zeroize", @@ -6395,7 +6581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", - "fastrand 2.0.1", + "fastrand", "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -6516,7 +6702,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -6538,7 +6724,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.2", + "rustls-pki-types", "tokio", ] @@ -6825,7 +7022,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand", + "rand 0.8.5", "static_assertions", ] @@ -6957,8 +7154,8 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_core 0.6.4", "sha2 0.10.8", "sha3", @@ -6966,12 +7163,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" version = "2.4.0" @@ -6991,6 +7182,12 @@ dependencies = [ "try-lock", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -7271,7 +7468,7 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand", + "rand 0.8.5", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", diff --git a/Cargo.toml b/Cargo.toml index 6206f7331d..973bda47a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,9 +67,9 @@ serde_json = { version = "1.0.113" } sha2 = { version = "0.10" } sha3 = { version = "0.10" } static_assertions = { version = "1.1" } -subxt = { version = "0.33.0 " } -subxt-metadata = { version = "0.33.0" } -subxt-signer = { version = "0.33.0" } +subxt = { version = "0.34.0 " } +subxt-metadata = { version = "0.34.0" } +subxt-signer = { version = "0.34.0" } syn = { version = "2" } synstructure = { version = "0.13.1" } thiserror = { version = "1.0.50" } @@ -84,12 +84,11 @@ const_env = { version = "0.1"} # Substrate dependencies pallet-contracts-primitives = { version = "=29.0.0", default-features = false } -pallet-contracts-uapi = { package = "ink-pallet-contracts-uapi", version = "=7.0.0", default-features = false } -sp-core = { version = "=28.0.0", default-features = false } -sp-keyring = { version = "=31.0.0", default-features = false } -sp-runtime = { version = "=31.0.1", default-features = false } +pallet-contracts-uapi = { package = "ink-pallet-contracts-uapi", version = "=6.0.0", default-features = false } +sp-core = { version = "=26.0.0", default-features = false } +sp-keyring = { version = "=29.0.0", default-features = false } +sp-runtime = { version = "=29.0.0", default-features = false } sp-weights = { version = "=27.0.0", default-features = false } -sp-externalities = { version = "=0.25.0" } # Local dependencies ink = { version = "=5.0.0-rc.1", path = "crates/ink", default-features = false } diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 4ab5b9af59..b13888e61b 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -44,6 +44,7 @@ pallet-contracts-primitives = { workspace = true } sp-core = { workspace = true } sp-keyring = { workspace = true } sp-runtime = { workspace = true } +sp-weights = { workspace = true } [dev-dependencies] # Required for the doctest of `MessageBuilder::call` diff --git a/crates/e2e/src/backend.rs b/crates/e2e/src/backend.rs index 023f6371a8..b3de975510 100644 --- a/crates/e2e/src/backend.rs +++ b/crates/e2e/src/backend.rs @@ -28,7 +28,6 @@ use crate::{ CallDryRunResult, UploadResult, }; -use drink::Weight; use ink_env::{ DefaultEnvironment, Environment, @@ -38,6 +37,7 @@ use scale::{ Decode, Encode, }; +use sp_weights::Weight; use subxt::dynamic::Value; /// Full E2E testing backend: combines general chain API and contract-specific operations. diff --git a/crates/e2e/src/backend_calls.rs b/crates/e2e/src/backend_calls.rs index e59bac98c0..ebf30f6c2b 100644 --- a/crates/e2e/src/backend_calls.rs +++ b/crates/e2e/src/backend_calls.rs @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -use drink::Weight; use ink_env::Environment; use scale::{ Decode, Encode, }; +use sp_weights::Weight; use crate::{ backend::BuilderClient, @@ -109,7 +109,7 @@ where /// Overwrites any values specified for `extra_gas_portion`. /// The gas estimate fro dry-run will be ignored. pub fn gas_limit(&mut self, limit: Weight) -> &mut Self { - if limit == Weight::from(0) { + if limit == Weight::from_parts(0, 0) { self.gas_limit = None } else { self.gas_limit = Some(limit) @@ -269,7 +269,7 @@ where /// Overwrites any values specified for `extra_gas_portion`. /// The gas estimate fro dry-run will be ignored. pub fn gas_limit(&mut self, limit: Weight) -> &mut Self { - if limit == Weight::from(0) { + if limit == Weight::from_parts(0, 0) { self.gas_limit = None } else { self.gas_limit = Some(limit) diff --git a/crates/e2e/src/drink_client.rs b/crates/e2e/src/drink_client.rs index b9787bb1f0..f628850265 100644 --- a/crates/e2e/src/drink_client.rs +++ b/crates/e2e/src/drink_client.rs @@ -42,9 +42,11 @@ use drink::{ RuntimeCall, Sandbox, SandboxConfig, - Weight, DEFAULT_GAS_LIMIT, }; + +use sp_weigths::Weight; + use pallet_contracts_primitives::ContractResult; use ink_env::Environment; diff --git a/crates/e2e/src/subxt_client.rs b/crates/e2e/src/subxt_client.rs index 5d26456855..f887ae0bfc 100644 --- a/crates/e2e/src/subxt_client.rs +++ b/crates/e2e/src/subxt_client.rs @@ -38,7 +38,6 @@ use crate::{ UploadResult, }, }; -use drink::Weight; use ink_env::{ call::{ utils::{ @@ -56,6 +55,7 @@ use scale::{ Decode, Encode, }; +use sp_weights::Weight; #[cfg(feature = "std")] use std::fmt::Debug; use std::path::PathBuf; diff --git a/crates/e2e/src/xts.rs b/crates/e2e/src/xts.rs index 99f07270f0..568f26aadf 100644 --- a/crates/e2e/src/xts.rs +++ b/crates/e2e/src/xts.rs @@ -65,8 +65,8 @@ pub struct Weight { proof_size: u64, } -impl From for Weight { - fn from(weight: drink::Weight) -> Self { +impl From for Weight { + fn from(weight: sp_weights::Weight) -> Self { Self { ref_time: weight.ref_time(), proof_size: weight.proof_size(), @@ -74,9 +74,9 @@ impl From for Weight { } } -impl From for drink::Weight { +impl From for sp_weights::Weight { fn from(weight: Weight) -> Self { - drink::Weight::from_parts(weight.ref_time, weight.proof_size) + sp_weights::Weight::from_parts(weight.ref_time, weight.proof_size) } } From c53aef53fcfbbfbb6b97f0c3d79620b355013aef Mon Sep 17 00:00:00 2001 From: German Nikolishin Date: Mon, 12 Feb 2024 09:38:05 +0000 Subject: [PATCH 09/10] use pallet-contracts crate --- Cargo.lock | 765 +++++++---------------------- Cargo.toml | 10 +- crates/e2e/Cargo.toml | 14 +- crates/e2e/macro/Cargo.toml | 1 + crates/e2e/src/contract_results.rs | 2 +- crates/e2e/src/drink_client.rs | 7 +- crates/e2e/src/error.rs | 2 +- crates/e2e/src/lib.rs | 2 +- crates/e2e/src/subxt_client.rs | 2 +- crates/e2e/src/xts.rs | 2 +- 10 files changed, 201 insertions(+), 606 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 31f9b658b5..fd98be0fa9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,7 +52,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.12", + "getrandom", "once_cell", "version_check", ] @@ -64,7 +64,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.12", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -312,7 +312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -592,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes", - "rand 0.8.5", + "rand", "rand_core 0.6.4", "serde", "unicode-normalization", @@ -1012,7 +1012,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.12", + "getrandom", "once_cell", "tiny-keccak", ] @@ -1611,9 +1611,9 @@ dependencies = [ "parity-scale-codec-derive", "scale-info", "serde_json", - "sp-externalities 0.25.0", - "sp-io 30.0.0", - "sp-runtime-interface 24.0.0", + "sp-externalities", + "sp-io", + "sp-runtime-interface", "thiserror", "wat", ] @@ -1908,7 +1908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -1944,13 +1944,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 30.0.0", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.0", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", "static_assertions", ] @@ -2001,20 +2001,20 @@ dependencies = [ "serde_json", "smallvec", "sp-api", - "sp-arithmetic 23.0.0", - "sp-core 28.0.0", + "sp-arithmetic", + "sp-core", "sp-core-hashing-proc-macro", - "sp-debug-derive 14.0.0", + "sp-debug-derive", "sp-genesis-builder", "sp-inherents", - "sp-io 30.0.0", + "sp-io", "sp-metadata-ir", - "sp-runtime 31.0.0", + "sp-runtime", "sp-staking", - "sp-state-machine 0.35.0", - "sp-std 14.0.0", - "sp-tracing 16.0.0", - "sp-weights 27.0.0", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-weights", "static_assertions", "tt-call", ] @@ -2035,7 +2035,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "sp-core-hashing 15.0.0", + "sp-core-hashing", "syn 2.0.48", ] @@ -2076,12 +2076,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "sp-version", - "sp-weights 27.0.0", + "sp-weights", ] [[package]] @@ -2228,17 +2228,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.12" @@ -2247,7 +2236,7 @@ checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -2256,7 +2245,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand 0.8.5", + "rand", "rand_core 0.6.4", ] @@ -2713,15 +2702,15 @@ dependencies = [ "ink_env 5.0.0-rc.1", "ink_primitives 5.0.0-rc.1", "jsonrpsee 0.20.3", - "pallet-contracts-primitives", + "pallet-contracts", "parity-scale-codec", "scale-info", "serde", "serde_json", - "sp-core 26.0.0", + "sp-core", "sp-keyring", - "sp-runtime 29.0.0", - "sp-weights 27.0.0", + "sp-runtime", + "sp-weights", "subxt", "subxt-metadata", "subxt-signer", @@ -2757,7 +2746,7 @@ dependencies = [ "ink-pallet-contracts-uapi", "ink_primitives 5.0.0-rc.1", "parity-scale-codec", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", ] @@ -2773,7 +2762,7 @@ dependencies = [ "ink-pallet-contracts-uapi", "ink_primitives 5.0.0-rc.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", ] @@ -2801,7 +2790,7 @@ dependencies = [ "scale-encode", "scale-info", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", "static_assertions", @@ -2831,7 +2820,7 @@ dependencies = [ "scale-encode", "scale-info", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "sha2 0.10.8", "sha3", "static_assertions", @@ -3309,7 +3298,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -3584,7 +3573,7 @@ checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -3815,8 +3804,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -3836,35 +3825,21 @@ dependencies = [ "pallet-contracts-proc-macro", "pallet-contracts-uapi", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "smallvec", "sp-api", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", "staging-xcm", "staging-xcm-builder", "wasm-instrument", "wasmi", ] -[[package]] -name = "pallet-contracts-primitives" -version = "29.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31e55b0b8df678f94af4b12bee8b3367d4217f4c5d90b2e531ec9bc15dfc39b" -dependencies = [ - "bitflags 1.3.2", - "parity-scale-codec", - "scale-info", - "sp-runtime 29.0.0", - "sp-std 12.0.0", - "sp-weights 25.0.0", -] - [[package]] name = "pallet-contracts-proc-macro" version = "18.0.0" @@ -3903,10 +3878,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io 30.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-io", + "sp-runtime", + "sp-std", + "sp-storage", "sp-timestamp", ] @@ -3921,10 +3896,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -4086,9 +4061,9 @@ checksum = "bda2b0f0c580c38f12445a4af10e0a23acf48381b2a95653e0be48ba787e10e5" dependencies = [ "parity-scale-codec", "scale-info", - "sp-core 28.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -4103,10 +4078,10 @@ dependencies = [ "polkadot-core-primitives", "scale-info", "serde", - "sp-core 28.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", - "sp-weights 27.0.0", + "sp-core", + "sp-runtime", + "sp-std", + "sp-weights", ] [[package]] @@ -4286,7 +4261,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ "env_logger", "log", - "rand 0.8.5", + "rand", ] [[package]] @@ -4315,19 +4290,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -4335,20 +4297,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -4364,9 +4316,6 @@ name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] [[package]] name = "rand_core" @@ -4374,16 +4323,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -4482,7 +4422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom", "libc", "spin", "untrusted", @@ -4867,9 +4807,7 @@ dependencies = [ "arrayref", "arrayvec 0.5.2", "curve25519-dalek 2.1.3", - "getrandom 0.1.16", "merlin 2.0.1", - "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", "subtle", @@ -4931,31 +4869,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" -dependencies = [ - "secp256k1-sys 0.6.1", -] - [[package]] name = "secp256k1" version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "secp256k1-sys 0.9.2", -] - -[[package]] -name = "secp256k1-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" -dependencies = [ - "cc", + "secp256k1-sys", ] [[package]] @@ -5320,8 +5240,8 @@ dependencies = [ "pbkdf2 0.12.2", "pin-project", "poly1305", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "ruzstd", "schnorrkel 0.11.4", "serde", @@ -5363,8 +5283,8 @@ dependencies = [ "no-std-net", "parking_lot", "pin-project", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "serde", "serde_json", "siphasher", @@ -5395,7 +5315,7 @@ dependencies = [ "futures", "httparse", "log", - "rand 0.8.5", + "rand", "sha-1", ] @@ -5410,13 +5330,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api-proc-macro", - "sp-core 28.0.0", - "sp-externalities 0.25.0", + "sp-core", + "sp-externalities", "sp-metadata-ir", - "sp-runtime 31.0.0", - "sp-state-machine 0.35.0", - "sp-std 14.0.0", - "sp-trie 29.0.0", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "sp-version", "thiserror", ] @@ -5436,20 +5356,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-application-crypto" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23030de8eae0272c705cf3e2ce0523a64708a6b53aa23f3cf9053ca63abd08d7" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 26.0.0", - "sp-io 28.0.0", - "sp-std 12.0.0", -] - [[package]] name = "sp-application-crypto" version = "30.0.0" @@ -5459,24 +5365,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-std 14.0.0", -] - -[[package]] -name = "sp-arithmetic" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cf6e5c0c7c2e7be3a4a10af5316d2d40182915509a70f632a66c238a05c37b" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 12.0.0", - "static_assertions", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -5490,58 +5381,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0", + "sp-std", "static_assertions", ] -[[package]] -name = "sp-core" -version = "26.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0db34a19be2efa0398a9506a365392d93a85220856d55e0eb78165ad2e1bedc" -dependencies = [ - "array-bytes", - "bip39", - "bitflags 1.3.2", - "blake2", - "bounded-collections", - "bs58", - "dyn-clonable", - "ed25519-zebra 3.1.0", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "itertools 0.10.5", - "lazy_static", - "libsecp256k1", - "log", - "merlin 2.0.1", - "parity-scale-codec", - "parking_lot", - "paste", - "primitive-types", - "rand 0.8.5", - "regex", - "scale-info", - "schnorrkel 0.9.1", - "secp256k1 0.24.3", - "secrecy", - "serde", - "sp-core-hashing 13.0.0", - "sp-debug-derive 12.0.0", - "sp-externalities 0.23.0", - "sp-runtime-interface 22.0.0", - "sp-std 12.0.0", - "sp-storage 17.0.0", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tracing", - "w3f-bls", - "zeroize", -] - [[package]] name = "sp-core" version = "28.0.0" @@ -5568,18 +5411,18 @@ dependencies = [ "parking_lot", "paste", "primitive-types", - "rand 0.8.5", + "rand", "scale-info", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "secrecy", "serde", - "sp-core-hashing 15.0.0", - "sp-debug-derive 14.0.0", - "sp-externalities 0.25.0", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", @@ -5588,20 +5431,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "13.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb8524f01591ee58b46cd83c9dbc0fcffd2fd730dabec4f59326cd58a00f17e2" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "15.0.0" @@ -5623,18 +5452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7527f8dda7667c41009b2cd0efaddcb81709b9741bd5ee6d17b11bad835cc698" dependencies = [ "quote", - "sp-core-hashing 15.0.0", - "syn 2.0.48", -] - -[[package]] -name = "sp-debug-derive" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50535e1a5708d3ba5c1195b59ebefac61cc8679c2c24716b87a86e8b7ed2e4a1" -dependencies = [ - "proc-macro2", - "quote", + "sp-core-hashing", "syn 2.0.48", ] @@ -5649,18 +5467,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-externalities" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884d05160bc89d0943d1c9fb8006c3d44b80f37f8af607aeff8d4d9cc82e279a" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 12.0.0", - "sp-storage 17.0.0", -] - [[package]] name = "sp-externalities" version = "0.25.0" @@ -5669,8 +5475,8 @@ checksum = "63867ec85950ced90d4ab1bba902a47db1b1efdf2829f653945669b2bb470a9c" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-std", + "sp-storage", ] [[package]] @@ -5681,8 +5487,8 @@ checksum = "dfdc79df83221ec5a279cbbd08fd6f8be164b9b081c8e84593ce2c2ebd5d66c0" dependencies = [ "serde_json", "sp-api", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-runtime", + "sp-std", ] [[package]] @@ -5695,36 +5501,11 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-io" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301c0ce94f80b324465a6f6173183aa07b26bd71d67f94a44de1fd11dea4a7cb" -dependencies = [ - "bytes", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "rustversion", - "secp256k1 0.24.3", - "sp-core 26.0.0", - "sp-externalities 0.23.0", - "sp-keystore 0.32.0", - "sp-runtime-interface 22.0.0", - "sp-state-machine 0.33.0", - "sp-std 12.0.0", - "sp-tracing 14.0.0", - "sp-trie 27.0.0", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "30.0.0" @@ -5737,44 +5518,30 @@ dependencies = [ "log", "parity-scale-codec", "rustversion", - "secp256k1 0.28.2", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "sp-keystore 0.34.0", - "sp-runtime-interface 24.0.0", - "sp-state-machine 0.35.0", - "sp-std 14.0.0", - "sp-tracing 16.0.0", - "sp-trie 29.0.0", + "secp256k1", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "29.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674ebf2c64039465e8d55d4d92cb079d2214932a4d101473e1fbded29e5488cc" +checksum = "98165ce7c625a8cdb88d39c6bbd56fe8b32ada64ed0894032beba99795f557da" dependencies = [ - "lazy_static", - "sp-core 26.0.0", - "sp-runtime 29.0.0", + "sp-core", + "sp-runtime", "strum 0.24.1", ] -[[package]] -name = "sp-keystore" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db18ab01b2684856904c973d2be7dbf9ab3607cf706a7bd6648812662e5e7c5" -dependencies = [ - "parity-scale-codec", - "parking_lot", - "sp-core 26.0.0", - "sp-externalities 0.23.0", - "thiserror", -] - [[package]] name = "sp-keystore" version = "0.34.0" @@ -5783,8 +5550,8 @@ checksum = "96806a28a62ed9ddecd0b28857b1344d029390f7c5c42a2ff9199cbf5638635c" dependencies = [ "parity-scale-codec", "parking_lot", - "sp-core 28.0.0", - "sp-externalities 0.25.0", + "sp-core", + "sp-externalities", "thiserror", ] @@ -5797,18 +5564,7 @@ dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-std 14.0.0", -] - -[[package]] -name = "sp-panic-handler" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00e40857ed3e0187f145b037c733545c5633859f1bd1d1b09deb52805fa696a" -dependencies = [ - "backtrace", - "lazy_static", - "regex", + "sp-std", ] [[package]] @@ -5824,32 +5580,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "29.0.0" +version = "31.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082bae4a164b8b629ce9cee79ff3c6b20e66d11d8ef37398796567d616325da4" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.8.5", - "scale-info", - "serde", - "sp-application-crypto 28.0.0", - "sp-arithmetic 21.0.0", - "sp-core 26.0.0", - "sp-io 28.0.0", - "sp-std 12.0.0", - "sp-weights 25.0.0", -] - -[[package]] -name = "sp-runtime" -version = "31.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046b92e2b0213f0f305ea87e058fb726bab21a929f1d15166eaaf54ebe02b72" +checksum = "a3bb49a4475d390198dfd3d41bef4564ab569fbaf1b5e38ae69b35fc01199d91" dependencies = [ "docify", "either", @@ -5858,35 +5591,16 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", "simple-mermaid", - "sp-application-crypto 30.0.0", - "sp-arithmetic 23.0.0", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-std 14.0.0", - "sp-weights 27.0.0", -] - -[[package]] -name = "sp-runtime-interface" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695bba5d981a6fd3131b098d65f620601bd822501612bfb65897d4bb660762b1" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.23.0", - "sp-runtime-interface-proc-macro 15.0.0", - "sp-std 12.0.0", - "sp-storage 17.0.0", - "sp-tracing 14.0.0", - "sp-wasm-interface 18.0.0", - "static_assertions", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", + "sp-weights", ] [[package]] @@ -5899,28 +5613,15 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.25.0", - "sp-runtime-interface-proc-macro 17.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2afcbd1bd18d323371111b66b7ac2870bdc1c86c3d7b0dae67b112ca52b4d8" -dependencies = [ - "Inflector", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" @@ -5945,31 +5646,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", -] - -[[package]] -name = "sp-state-machine" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df7c6680d9342c22c10d8272ebf9f0339b0e439b3e67b68f5627f9dfc6926a07" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand 0.8.5", - "smallvec", - "sp-core 26.0.0", - "sp-externalities 0.23.0", - "sp-panic-handler 12.0.0", - "sp-std 12.0.0", - "sp-trie 27.0.0", - "thiserror", - "tracing", - "trie-db", + "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -5982,44 +5661,24 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot", - "rand 0.8.5", + "rand", "smallvec", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "sp-panic-handler 13.0.0", - "sp-std 14.0.0", - "sp-trie 29.0.0", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", "tracing", "trie-db", ] -[[package]] -name = "sp-std" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c78c5a66682568cc7b153603c5d01a2cc8f5c221c7b1e921517a0eef18ae05" - [[package]] name = "sp-std" version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" -[[package]] -name = "sp-storage" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016f20812cc51bd479cc88d048c35d44cd3adde4accdb159d49d6050f2953595" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 12.0.0", - "sp-std 12.0.0", -] - [[package]] name = "sp-storage" version = "19.0.0" @@ -6030,8 +5689,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0", - "sp-std 14.0.0", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -6043,24 +5702,11 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-tracing" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d727cb5265641ffbb7d4e42c18b63e29f6cfdbd240aae3bcf093c3d6eb29a19" -dependencies = [ - "parity-scale-codec", - "sp-std 12.0.0", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - [[package]] name = "sp-tracing" version = "16.0.0" @@ -6068,37 +5714,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" dependencies = [ "parity-scale-codec", - "sp-std 14.0.0", + "sp-std", "tracing", "tracing-core", "tracing-subscriber 0.2.25", ] -[[package]] -name = "sp-trie" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c4bf89a5bd74f696cd1f23d83bb6abe6bd0abad1f3c70d4b0d7ebec4098cfe" -dependencies = [ - "ahash 0.8.7", - "hash-db", - "hashbrown 0.13.2", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "rand 0.8.5", - "scale-info", - "schnellru", - "sp-core 26.0.0", - "sp-std 12.0.0", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - [[package]] name = "sp-trie" version = "29.0.0" @@ -6112,12 +5733,12 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot", - "rand 0.8.5", + "rand", "scale-info", "schnellru", - "sp-core 28.0.0", - "sp-externalities 0.25.0", - "sp-std 14.0.0", + "sp-core", + "sp-externalities", + "sp-std", "thiserror", "tracing", "trie-db", @@ -6136,8 +5757,8 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 31.0.0", - "sp-std 14.0.0", + "sp-runtime", + "sp-std", "sp-version-proc-macro", "thiserror", ] @@ -6154,20 +5775,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "sp-wasm-interface" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d85813d46a22484cdf5e5afddbbe85442dd1b4d84d67a8c7792f92f9f93607" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 12.0.0", - "wasmtime", -] - [[package]] name = "sp-wasm-interface" version = "20.0.0" @@ -6178,26 +5785,10 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 14.0.0", + "sp-std", "wasmtime", ] -[[package]] -name = "sp-weights" -version = "25.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1689f9594c2c4d09ede3d8a991a9eb900654e424fb00b62f2b370170af347acd" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 21.0.0", - "sp-core 26.0.0", - "sp-debug-derive 12.0.0", - "sp-std 12.0.0", -] - [[package]] name = "sp-weights" version = "27.0.0" @@ -6209,9 +5800,9 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 23.0.0", - "sp-debug-derive 14.0.0", - "sp-std 14.0.0", + "sp-arithmetic", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -6266,7 +5857,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-weights 27.0.0", + "sp-weights", "xcm-procedural", ] @@ -6284,11 +5875,11 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "scale-info", - "sp-arithmetic 23.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", - "sp-weights 27.0.0", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", "staging-xcm", "staging-xcm-executor", ] @@ -6306,12 +5897,12 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-arithmetic 23.0.0", - "sp-core 28.0.0", - "sp-io 30.0.0", - "sp-runtime 31.0.0", - "sp-std 14.0.0", - "sp-weights 27.0.0", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", "staging-xcm", ] @@ -6422,7 +6013,7 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core-hashing 15.0.0", + "sp-core-hashing", "subxt-lightclient", "subxt-macro", "subxt-metadata", @@ -6494,7 +6085,7 @@ dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-core-hashing 15.0.0", + "sp-core-hashing", "thiserror", ] @@ -6511,10 +6102,10 @@ dependencies = [ "pbkdf2 0.12.2", "regex", "schnorrkel 0.11.4", - "secp256k1 0.28.2", + "secp256k1", "secrecy", "sha2 0.10.8", - "sp-core-hashing 15.0.0", + "sp-core-hashing", "subxt", "thiserror", "zeroize", @@ -7022,7 +6613,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -7154,8 +6745,8 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_core 0.6.4", "sha2 0.10.8", "sha3", @@ -7182,12 +6773,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -7468,7 +7053,7 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", diff --git a/Cargo.toml b/Cargo.toml index 973bda47a0..8e28e82e7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,12 +83,12 @@ xxhash-rust = { version = "0.8" } const_env = { version = "0.1"} # Substrate dependencies -pallet-contracts-primitives = { version = "=29.0.0", default-features = false } +pallet-contracts = { version = "27.0.0", default-features = false } pallet-contracts-uapi = { package = "ink-pallet-contracts-uapi", version = "=6.0.0", default-features = false } -sp-core = { version = "=26.0.0", default-features = false } -sp-keyring = { version = "=29.0.0", default-features = false } -sp-runtime = { version = "=29.0.0", default-features = false } -sp-weights = { version = "=27.0.0", default-features = false } +sp-core = { version = "28.0.0", default-features = false } +sp-keyring = { version = "31.0.0", default-features = false } +sp-runtime = { version = "31.0.1", default-features = false } +sp-weights = { version = "27.0.0", default-features = false } # Local dependencies ink = { version = "=5.0.0-rc.1", path = "crates/ink", default-features = false } diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index b13888e61b..543c9fd057 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -40,7 +40,7 @@ wasm-instrument = { workspace = true } which = { workspace = true } # Substrate -pallet-contracts-primitives = { workspace = true } +pallet-contracts = { workspace = true } sp-core = { workspace = true } sp-keyring = { workspace = true } sp-runtime = { workspace = true } @@ -52,7 +52,17 @@ scale-info = { workspace = true, features = ["derive"] } [features] default = ["std"] -std = [] +std = [ + "impl-serde/std", + "pallet-contracts/std", + "scale/std", + "scale-info/std", + "serde/std", + "sp-core/std", + "sp-runtime/std", + "sp-weights/std", + "ink_e2e_macro/std" +] drink = [ "dep:drink", "subxt-metadata", diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 12857dee3d..5f1dead24f 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -32,4 +32,5 @@ quote = { workspace = true } temp-env = "0.3.6" [features] +std = [] drink = [] diff --git a/crates/e2e/src/contract_results.rs b/crates/e2e/src/contract_results.rs index fc0e12b3e8..2d358499e7 100644 --- a/crates/e2e/src/contract_results.rs +++ b/crates/e2e/src/contract_results.rs @@ -21,7 +21,7 @@ use ink_primitives::{ ConstructorResult, MessageResult, }; -use pallet_contracts_primitives::{ +use pallet_contracts::{ CodeUploadResult, ContractExecResult, ContractInstantiateResult, diff --git a/crates/e2e/src/drink_client.rs b/crates/e2e/src/drink_client.rs index f628850265..ec8cdbddda 100644 --- a/crates/e2e/src/drink_client.rs +++ b/crates/e2e/src/drink_client.rs @@ -42,16 +42,15 @@ use drink::{ RuntimeCall, Sandbox, SandboxConfig, + Weight, DEFAULT_GAS_LIMIT, }; -use sp_weigths::Weight; - -use pallet_contracts_primitives::ContractResult; +use pallet_contracts::ContractResult; use ink_env::Environment; use jsonrpsee::core::async_trait; -use pallet_contracts_primitives::{ +use pallet_contracts::{ CodeUploadReturnValue, ContractInstantiateResult, InstantiateReturnValue, diff --git a/crates/e2e/src/error.rs b/crates/e2e/src/error.rs index 7554a03319..b41b7d4d9e 100644 --- a/crates/e2e/src/error.rs +++ b/crates/e2e/src/error.rs @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -use pallet_contracts_primitives::ContractExecResult; +use pallet_contracts::ContractExecResult; use std::fmt; diff --git a/crates/e2e/src/lib.rs b/crates/e2e/src/lib.rs index f1e73a8135..35f538281a 100644 --- a/crates/e2e/src/lib.rs +++ b/crates/e2e/src/lib.rs @@ -85,7 +85,7 @@ use ink_env::{ ContractEnv, Environment, }; -use pallet_contracts_primitives::{ +use pallet_contracts::{ ContractExecResult, ContractInstantiateResult, }; diff --git a/crates/e2e/src/subxt_client.rs b/crates/e2e/src/subxt_client.rs index f887ae0bfc..7c68a122d2 100644 --- a/crates/e2e/src/subxt_client.rs +++ b/crates/e2e/src/subxt_client.rs @@ -50,7 +50,7 @@ use ink_env::{ Environment, }; use jsonrpsee::core::async_trait; -use pallet_contracts_primitives::ContractResult; +use pallet_contracts::ContractResult; use scale::{ Decode, Encode, diff --git a/crates/e2e/src/xts.rs b/crates/e2e/src/xts.rs index 568f26aadf..28e64f3ae7 100644 --- a/crates/e2e/src/xts.rs +++ b/crates/e2e/src/xts.rs @@ -22,7 +22,7 @@ use super::{ use ink_env::Environment; use core::marker::PhantomData; -use pallet_contracts_primitives::CodeUploadResult; +use pallet_contracts::CodeUploadResult; use sp_core::H256; use subxt::{ backend::{ From 85b59e4db90195ee2a6251c1a36e6a4d1f4696ce Mon Sep 17 00:00:00 2001 From: Sebastian Miasojed Date: Tue, 13 Feb 2024 14:51:03 +0100 Subject: [PATCH 10/10] Use of MultiAddress instead of AccountId --- integration-tests/e2e-runtime-only-backend/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/e2e-runtime-only-backend/lib.rs b/integration-tests/e2e-runtime-only-backend/lib.rs index 7c64f27dbd..d4ca9d2033 100644 --- a/integration-tests/e2e-runtime-only-backend/lib.rs +++ b/integration-tests/e2e-runtime-only-backend/lib.rs @@ -121,7 +121,7 @@ pub mod flipper { // when let call_data = vec![ - Value::from_bytes(&contract.account_id), + Value::unnamed_variant("Id", [Value::from_bytes(contract.account_id)]), Value::u128(ENDOWMENT), ]; client