From 1d32daae297532f32257ab4c55c98f5e3e86bec7 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 16:03:24 +0300 Subject: [PATCH 01/18] manifests: Update edition to 2024 --- Cargo.toml | 2 +- crates/ink/tests/trybuild_wrapper/Cargo.toml | 2 +- integration-tests/all-abi/events/Cargo.toml | 2 +- integration-tests/all-abi/events/event-def-unused/Cargo.toml | 2 +- integration-tests/all-abi/events/event-def/Cargo.toml | 2 +- integration-tests/all-abi/events/event-def2/Cargo.toml | 2 +- .../internal/call-builder-return-value/Cargo.toml | 2 +- .../internal/e2e-runtime-only-backend/Cargo.toml | 2 +- .../internal/lang-err/call-builder-delegate/Cargo.toml | 2 +- integration-tests/internal/lang-err/call-builder/Cargo.toml | 2 +- .../internal/lang-err/constructors-return-value/Cargo.toml | 2 +- integration-tests/internal/lang-err/contract-ref/Cargo.toml | 2 +- .../internal/lang-err/integration-flipper/Cargo.toml | 2 +- integration-tests/internal/mapping/Cargo.toml | 2 +- integration-tests/internal/mother/Cargo.toml | 2 +- integration-tests/internal/sr25519-verification/Cargo.toml | 2 +- integration-tests/internal/static-buffer/Cargo.toml | 2 +- integration-tests/internal/storage-types/Cargo.toml | 2 +- integration-tests/internal/system-precompile/Cargo.toml | 2 +- .../public/complex-storage-structures/Cargo.toml | 2 +- integration-tests/public/conditional-compilation/Cargo.toml | 2 +- integration-tests/public/contract-invocation/Cargo.toml | 2 +- .../public/contract-invocation/contract1/Cargo.toml | 2 +- .../public/contract-invocation/contract2/Cargo.toml | 2 +- .../public/contract-invocation/virtual_contract/Cargo.toml | 2 +- .../contract-invocation/virtual_contract_ver1/Cargo.toml | 2 +- .../contract-invocation/virtual_contract_ver2/Cargo.toml | 2 +- integration-tests/public/contract-storage/Cargo.toml | 2 +- integration-tests/public/contract-terminate/Cargo.toml | 2 +- integration-tests/public/contract-transfer/Cargo.toml | 2 +- integration-tests/public/contract-xcm/Cargo.toml | 2 +- integration-tests/public/cross-contract-calls/Cargo.toml | 2 +- .../public/cross-contract-calls/other-contract/Cargo.toml | 2 +- integration-tests/public/custom-allocator/Cargo.toml | 2 +- integration-tests/public/custom-environment/Cargo.toml | 2 +- integration-tests/public/debugging-strategies/Cargo.toml | 2 +- integration-tests/public/dns/Cargo.toml | 2 +- integration-tests/public/e2e-call-runtime/Cargo.toml | 2 +- integration-tests/public/erc1155/Cargo.toml | 2 +- integration-tests/public/erc20/Cargo.toml | 2 +- integration-tests/public/erc721/Cargo.toml | 2 +- integration-tests/public/events/Cargo.toml | 2 +- integration-tests/public/events/event-def-unused/Cargo.toml | 2 +- integration-tests/public/events/event-def/Cargo.toml | 2 +- integration-tests/public/events/event-def2/Cargo.toml | 2 +- integration-tests/public/flipper/Cargo.toml | 2 +- integration-tests/public/fuzz-testing/Cargo.toml | 2 +- integration-tests/public/incrementer/Cargo.toml | 2 +- integration-tests/public/lazyvec/Cargo.toml | 2 +- integration-tests/public/multi-contract-caller/Cargo.toml | 2 +- .../public/multi-contract-caller/accumulator/Cargo.toml | 2 +- .../public/multi-contract-caller/adder/Cargo.toml | 2 +- .../public/multi-contract-caller/subber/Cargo.toml | 2 +- integration-tests/public/multisig/Cargo.toml | 2 +- integration-tests/public/own-code-hash/Cargo.toml | 2 +- integration-tests/public/payment-channel/Cargo.toml | 2 +- integration-tests/public/runtime-call-contract/Cargo.toml | 4 ++-- .../public/runtime-call-contract/traits/Cargo.toml | 2 +- .../public/trait-dyn-cross-contract-calls/Cargo.toml | 2 +- .../contracts/incrementer/Cargo.toml | 2 +- .../public/trait-dyn-cross-contract-calls/traits/Cargo.toml | 2 +- integration-tests/public/trait-erc20/Cargo.toml | 2 +- integration-tests/public/trait-flipper/Cargo.toml | 2 +- integration-tests/public/trait-incrementer/Cargo.toml | 2 +- integration-tests/public/trait-incrementer/traits/Cargo.toml | 2 +- .../public/upgradeable-contracts/delegator/Cargo.toml | 2 +- .../upgradeable-contracts/delegator/delegatee/Cargo.toml | 2 +- .../upgradeable-contracts/delegator/delegatee2/Cargo.toml | 2 +- .../upgradeable-contracts/set-code-hash-migration/Cargo.toml | 2 +- .../set-code-hash-migration/migration/Cargo.toml | 2 +- .../set-code-hash-migration/updated-incrementer/Cargo.toml | 2 +- .../public/upgradeable-contracts/set-code-hash/Cargo.toml | 2 +- .../set-code-hash/updated-incrementer/Cargo.toml | 2 +- integration-tests/public/wildcard-selector/Cargo.toml | 2 +- integration-tests/solidity-abi/events/Cargo.toml | 2 +- .../solidity-abi/events/event-def-unused/Cargo.toml | 2 +- integration-tests/solidity-abi/events/event-def/Cargo.toml | 2 +- integration-tests/solidity-abi/events/event-def2/Cargo.toml | 2 +- integration-tests/solidity-abi/fallible-setter/Cargo.toml | 2 +- integration-tests/solidity-abi/sol-cross-contract/Cargo.toml | 2 +- .../sol-cross-contract/other-contract-sol/Cargo.toml | 2 +- integration-tests/solidity-abi/sol-encoding/Cargo.toml | 2 +- .../solidity-abi/solidity-calls-flipper/Cargo.toml | 2 +- .../solidity-abi/trait-dyn-cross-contract-calls/Cargo.toml | 2 +- .../contracts/incrementer/Cargo.toml | 2 +- .../trait-dyn-cross-contract-calls/traits/Cargo.toml | 2 +- integration-tests/solidity-abi/trait-flipper/Cargo.toml | 2 +- linting/Cargo.toml | 2 +- 88 files changed, 89 insertions(+), 89 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1fdd422f389..362661ae47e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ exclude = [ [workspace.package] authors = ["Use Ink "] categories = ["no-std", "embedded"] -edition = "2021" +edition = "2024" homepage = "https://use.ink" keywords = ["polkavm", "ink", "riscv", "blockchain", "edsl"] license = "Apache-2.0" diff --git a/crates/ink/tests/trybuild_wrapper/Cargo.toml b/crates/ink/tests/trybuild_wrapper/Cargo.toml index bd2c082ab34..07c75c7b770 100644 --- a/crates/ink/tests/trybuild_wrapper/Cargo.toml +++ b/crates/ink/tests/trybuild_wrapper/Cargo.toml @@ -2,7 +2,7 @@ name = "trybuild_wrapper" version = "0.1.0" authors = ["David Semakula ", "Use Ink "] -edition = "2021" +edition = "2024" [dependencies] trybuild = { version = "1.0.110", features = ["diff"] } diff --git a/integration-tests/all-abi/events/Cargo.toml b/integration-tests/all-abi/events/Cargo.toml index 0848edcb846..3f3303a0818 100644 --- a/integration-tests/all-abi/events/Cargo.toml +++ b/integration-tests/all-abi/events/Cargo.toml @@ -2,7 +2,7 @@ name = "events" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/all-abi/events/event-def-unused/Cargo.toml b/integration-tests/all-abi/events/event-def-unused/Cargo.toml index e48177631c1..137ff3b8dca 100644 --- a/integration-tests/all-abi/events/event-def-unused/Cargo.toml +++ b/integration-tests/all-abi/events/event-def-unused/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def-unused" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/all-abi/events/event-def/Cargo.toml b/integration-tests/all-abi/events/event-def/Cargo.toml index 90fc3d43b20..ff8816e8987 100644 --- a/integration-tests/all-abi/events/event-def/Cargo.toml +++ b/integration-tests/all-abi/events/event-def/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/all-abi/events/event-def2/Cargo.toml b/integration-tests/all-abi/events/event-def2/Cargo.toml index f8e697ad7f8..caab3031f8b 100644 --- a/integration-tests/all-abi/events/event-def2/Cargo.toml +++ b/integration-tests/all-abi/events/event-def2/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def2" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/internal/call-builder-return-value/Cargo.toml b/integration-tests/internal/call-builder-return-value/Cargo.toml index 9f25494214d..4ec33969624 100755 --- a/integration-tests/internal/call-builder-return-value/Cargo.toml +++ b/integration-tests/internal/call-builder-return-value/Cargo.toml @@ -2,7 +2,7 @@ name = "call_builder_return_value" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/e2e-runtime-only-backend/Cargo.toml b/integration-tests/internal/e2e-runtime-only-backend/Cargo.toml index e06963d0a0d..89495c660ae 100644 --- a/integration-tests/internal/e2e-runtime-only-backend/Cargo.toml +++ b/integration-tests/internal/e2e-runtime-only-backend/Cargo.toml @@ -2,7 +2,7 @@ name = "e2e-runtime-only-backend" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/lang-err/call-builder-delegate/Cargo.toml b/integration-tests/internal/lang-err/call-builder-delegate/Cargo.toml index 5dd023d87fc..a45acd1864f 100755 --- a/integration-tests/internal/lang-err/call-builder-delegate/Cargo.toml +++ b/integration-tests/internal/lang-err/call-builder-delegate/Cargo.toml @@ -2,7 +2,7 @@ name = "call_builder_delegate" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/lang-err/call-builder/Cargo.toml b/integration-tests/internal/lang-err/call-builder/Cargo.toml index 149d79e49c5..3d6d68c9737 100755 --- a/integration-tests/internal/lang-err/call-builder/Cargo.toml +++ b/integration-tests/internal/lang-err/call-builder/Cargo.toml @@ -2,7 +2,7 @@ name = "call_builder" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/lang-err/constructors-return-value/Cargo.toml b/integration-tests/internal/lang-err/constructors-return-value/Cargo.toml index 73ba85a9da9..85c40b7cd66 100644 --- a/integration-tests/internal/lang-err/constructors-return-value/Cargo.toml +++ b/integration-tests/internal/lang-err/constructors-return-value/Cargo.toml @@ -2,7 +2,7 @@ name = "constructors_return_value" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/lang-err/contract-ref/Cargo.toml b/integration-tests/internal/lang-err/contract-ref/Cargo.toml index abf86f6aa79..fefa65cc816 100755 --- a/integration-tests/internal/lang-err/contract-ref/Cargo.toml +++ b/integration-tests/internal/lang-err/contract-ref/Cargo.toml @@ -2,7 +2,7 @@ name = "contract_ref" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/internal/lang-err/integration-flipper/Cargo.toml b/integration-tests/internal/lang-err/integration-flipper/Cargo.toml index 4070ff471b2..e52a5555fb2 100644 --- a/integration-tests/internal/lang-err/integration-flipper/Cargo.toml +++ b/integration-tests/internal/lang-err/integration-flipper/Cargo.toml @@ -2,7 +2,7 @@ name = "integration_flipper" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/mapping/Cargo.toml b/integration-tests/internal/mapping/Cargo.toml index 95405d17e58..f661b14439f 100755 --- a/integration-tests/internal/mapping/Cargo.toml +++ b/integration-tests/internal/mapping/Cargo.toml @@ -2,7 +2,7 @@ name = "mapping" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/mother/Cargo.toml b/integration-tests/internal/mother/Cargo.toml index be716757f5d..167860154a1 100755 --- a/integration-tests/internal/mother/Cargo.toml +++ b/integration-tests/internal/mother/Cargo.toml @@ -3,7 +3,7 @@ name = "mother" description = "Mother of all contracts" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/sr25519-verification/Cargo.toml b/integration-tests/internal/sr25519-verification/Cargo.toml index 92e38afe1ba..d308259dfec 100644 --- a/integration-tests/internal/sr25519-verification/Cargo.toml +++ b/integration-tests/internal/sr25519-verification/Cargo.toml @@ -2,7 +2,7 @@ name = "sr25519_verification" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/static-buffer/Cargo.toml b/integration-tests/internal/static-buffer/Cargo.toml index ab68e831408..98bcd75b7cd 100644 --- a/integration-tests/internal/static-buffer/Cargo.toml +++ b/integration-tests/internal/static-buffer/Cargo.toml @@ -2,7 +2,7 @@ name = "static-buffer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/storage-types/Cargo.toml b/integration-tests/internal/storage-types/Cargo.toml index 9d52fa12afc..ebca15735b7 100755 --- a/integration-tests/internal/storage-types/Cargo.toml +++ b/integration-tests/internal/storage-types/Cargo.toml @@ -2,7 +2,7 @@ name = "storage-types" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/internal/system-precompile/Cargo.toml b/integration-tests/internal/system-precompile/Cargo.toml index 95405d17e58..f661b14439f 100755 --- a/integration-tests/internal/system-precompile/Cargo.toml +++ b/integration-tests/internal/system-precompile/Cargo.toml @@ -2,7 +2,7 @@ name = "mapping" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/complex-storage-structures/Cargo.toml b/integration-tests/public/complex-storage-structures/Cargo.toml index 142324e5e4c..2d7de46c80d 100644 --- a/integration-tests/public/complex-storage-structures/Cargo.toml +++ b/integration-tests/public/complex-storage-structures/Cargo.toml @@ -2,7 +2,7 @@ name = "complex_storage_structures" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/conditional-compilation/Cargo.toml b/integration-tests/public/conditional-compilation/Cargo.toml index 08d085f57c1..d31f9a166b1 100755 --- a/integration-tests/public/conditional-compilation/Cargo.toml +++ b/integration-tests/public/conditional-compilation/Cargo.toml @@ -2,7 +2,7 @@ name = "conditional-compilation" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../crates/ink", default-features = false } diff --git a/integration-tests/public/contract-invocation/Cargo.toml b/integration-tests/public/contract-invocation/Cargo.toml index 05632314097..0bfab0d36e8 100644 --- a/integration-tests/public/contract-invocation/Cargo.toml +++ b/integration-tests/public/contract-invocation/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "instantiate_contract" version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Víctor M. González "] [lib] diff --git a/integration-tests/public/contract-invocation/contract1/Cargo.toml b/integration-tests/public/contract-invocation/contract1/Cargo.toml index d9e1843bd53..7684bf47312 100644 --- a/integration-tests/public/contract-invocation/contract1/Cargo.toml +++ b/integration-tests/public/contract-invocation/contract1/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "contract1" version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Víctor M. González "] [lib] diff --git a/integration-tests/public/contract-invocation/contract2/Cargo.toml b/integration-tests/public/contract-invocation/contract2/Cargo.toml index 94f32e9f0d1..68188e17d0e 100644 --- a/integration-tests/public/contract-invocation/contract2/Cargo.toml +++ b/integration-tests/public/contract-invocation/contract2/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "contract2" version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Víctor M. González "] [lib] diff --git a/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml index bd172ba60cd..a19323d3151 100644 --- a/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "virtual_contract" version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Víctor M. González "] [lib] diff --git a/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml index 46863d468f5..9d87cf305f1 100644 --- a/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "virtual_contract_ver1" version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Víctor M. González "] [lib] diff --git a/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml index 860b820bdf5..e221139ffc8 100644 --- a/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "virtual_contract_ver2" version = "0.1.0" -edition = "2021" +edition = "2024" authors = ["Víctor M. González "] [lib] diff --git a/integration-tests/public/contract-storage/Cargo.toml b/integration-tests/public/contract-storage/Cargo.toml index 43e87e674d1..cddc00f34e8 100755 --- a/integration-tests/public/contract-storage/Cargo.toml +++ b/integration-tests/public/contract-storage/Cargo.toml @@ -2,7 +2,7 @@ name = "contract-storage" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/contract-terminate/Cargo.toml b/integration-tests/public/contract-terminate/Cargo.toml index f174ff4fbab..706a93b7ba4 100644 --- a/integration-tests/public/contract-terminate/Cargo.toml +++ b/integration-tests/public/contract-terminate/Cargo.toml @@ -2,7 +2,7 @@ name = "contract_terminate" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/contract-transfer/Cargo.toml b/integration-tests/public/contract-transfer/Cargo.toml index d7163514eb5..8277a60ea24 100644 --- a/integration-tests/public/contract-transfer/Cargo.toml +++ b/integration-tests/public/contract-transfer/Cargo.toml @@ -2,7 +2,7 @@ name = "contract_transfer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/contract-xcm/Cargo.toml b/integration-tests/public/contract-xcm/Cargo.toml index 2409647e0a8..67e9206e1b7 100644 --- a/integration-tests/public/contract-xcm/Cargo.toml +++ b/integration-tests/public/contract-xcm/Cargo.toml @@ -2,7 +2,7 @@ name = "contract-xcm" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/cross-contract-calls/Cargo.toml b/integration-tests/public/cross-contract-calls/Cargo.toml index 3782c5ab494..fbc7b7d945a 100755 --- a/integration-tests/public/cross-contract-calls/Cargo.toml +++ b/integration-tests/public/cross-contract-calls/Cargo.toml @@ -2,7 +2,7 @@ name = "cross-contract-calls" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/cross-contract-calls/other-contract/Cargo.toml b/integration-tests/public/cross-contract-calls/other-contract/Cargo.toml index 7968a231212..45ca4cf77fa 100755 --- a/integration-tests/public/cross-contract-calls/other-contract/Cargo.toml +++ b/integration-tests/public/cross-contract-calls/other-contract/Cargo.toml @@ -2,7 +2,7 @@ name = "other-contract" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/custom-allocator/Cargo.toml b/integration-tests/public/custom-allocator/Cargo.toml index 6d36717cbda..2133b7bd99b 100755 --- a/integration-tests/public/custom-allocator/Cargo.toml +++ b/integration-tests/public/custom-allocator/Cargo.toml @@ -2,7 +2,7 @@ name = "custom-allocator" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/custom-environment/Cargo.toml b/integration-tests/public/custom-environment/Cargo.toml index f8d073e55f8..dc4e7e8b400 100644 --- a/integration-tests/public/custom-environment/Cargo.toml +++ b/integration-tests/public/custom-environment/Cargo.toml @@ -2,7 +2,7 @@ name = "custom-environment" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/debugging-strategies/Cargo.toml b/integration-tests/public/debugging-strategies/Cargo.toml index 8c9d9ef1c55..838143c04cf 100755 --- a/integration-tests/public/debugging-strategies/Cargo.toml +++ b/integration-tests/public/debugging-strategies/Cargo.toml @@ -3,7 +3,7 @@ name = "debugging_strategies" description = "Illustrates different debugging strategies" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/dns/Cargo.toml b/integration-tests/public/dns/Cargo.toml index f5b325e249f..c72006f3e6e 100644 --- a/integration-tests/public/dns/Cargo.toml +++ b/integration-tests/public/dns/Cargo.toml @@ -2,7 +2,7 @@ name = "dns" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/e2e-call-runtime/Cargo.toml b/integration-tests/public/e2e-call-runtime/Cargo.toml index 47c3ef1a73f..a79bb9117a4 100644 --- a/integration-tests/public/e2e-call-runtime/Cargo.toml +++ b/integration-tests/public/e2e-call-runtime/Cargo.toml @@ -2,7 +2,7 @@ name = "e2e_call_runtime" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/erc1155/Cargo.toml b/integration-tests/public/erc1155/Cargo.toml index 7ee2b545dd8..ec5dca73dd2 100644 --- a/integration-tests/public/erc1155/Cargo.toml +++ b/integration-tests/public/erc1155/Cargo.toml @@ -2,7 +2,7 @@ name = "erc1155" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/erc20/Cargo.toml b/integration-tests/public/erc20/Cargo.toml index 8d58e1995a1..c604da5f309 100644 --- a/integration-tests/public/erc20/Cargo.toml +++ b/integration-tests/public/erc20/Cargo.toml @@ -2,7 +2,7 @@ name = "erc20" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/erc721/Cargo.toml b/integration-tests/public/erc721/Cargo.toml index 4e1a8ff5cdd..9ee59fcb57b 100644 --- a/integration-tests/public/erc721/Cargo.toml +++ b/integration-tests/public/erc721/Cargo.toml @@ -2,7 +2,7 @@ name = "erc721" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/events/Cargo.toml b/integration-tests/public/events/Cargo.toml index ae20188d0f7..0657a70f464 100644 --- a/integration-tests/public/events/Cargo.toml +++ b/integration-tests/public/events/Cargo.toml @@ -2,7 +2,7 @@ name = "events" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/events/event-def-unused/Cargo.toml b/integration-tests/public/events/event-def-unused/Cargo.toml index 789da31f6f2..fadd10ffd02 100644 --- a/integration-tests/public/events/event-def-unused/Cargo.toml +++ b/integration-tests/public/events/event-def-unused/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def-unused" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/public/events/event-def/Cargo.toml b/integration-tests/public/events/event-def/Cargo.toml index 2cda89e4260..efa8d773a9c 100644 --- a/integration-tests/public/events/event-def/Cargo.toml +++ b/integration-tests/public/events/event-def/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/public/events/event-def2/Cargo.toml b/integration-tests/public/events/event-def2/Cargo.toml index f68ea3030a9..8130de82adb 100644 --- a/integration-tests/public/events/event-def2/Cargo.toml +++ b/integration-tests/public/events/event-def2/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def2" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/public/flipper/Cargo.toml b/integration-tests/public/flipper/Cargo.toml index 738bb460ca5..660edd9def1 100644 --- a/integration-tests/public/flipper/Cargo.toml +++ b/integration-tests/public/flipper/Cargo.toml @@ -2,7 +2,7 @@ name = "flipper" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/fuzz-testing/Cargo.toml b/integration-tests/public/fuzz-testing/Cargo.toml index 08779467bfa..2fa596c3aa3 100644 --- a/integration-tests/public/fuzz-testing/Cargo.toml +++ b/integration-tests/public/fuzz-testing/Cargo.toml @@ -2,7 +2,7 @@ name = "fuzz_testing" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/incrementer/Cargo.toml b/integration-tests/public/incrementer/Cargo.toml index 9a3f4c7079e..da1032934bf 100644 --- a/integration-tests/public/incrementer/Cargo.toml +++ b/integration-tests/public/incrementer/Cargo.toml @@ -2,7 +2,7 @@ name = "incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/lazyvec/Cargo.toml b/integration-tests/public/lazyvec/Cargo.toml index 60596c6d251..3a87f6c8a8e 100755 --- a/integration-tests/public/lazyvec/Cargo.toml +++ b/integration-tests/public/lazyvec/Cargo.toml @@ -2,7 +2,7 @@ name = "lazyvec" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/multi-contract-caller/Cargo.toml b/integration-tests/public/multi-contract-caller/Cargo.toml index df0f4b0445e..58d9f93f015 100644 --- a/integration-tests/public/multi-contract-caller/Cargo.toml +++ b/integration-tests/public/multi-contract-caller/Cargo.toml @@ -2,7 +2,7 @@ name = "multi-contract-caller" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/multi-contract-caller/accumulator/Cargo.toml b/integration-tests/public/multi-contract-caller/accumulator/Cargo.toml index ca22255035f..b460f3beb89 100644 --- a/integration-tests/public/multi-contract-caller/accumulator/Cargo.toml +++ b/integration-tests/public/multi-contract-caller/accumulator/Cargo.toml @@ -2,7 +2,7 @@ name = "accumulator" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/public/multi-contract-caller/adder/Cargo.toml b/integration-tests/public/multi-contract-caller/adder/Cargo.toml index 3888e834187..2cedf4a03c0 100644 --- a/integration-tests/public/multi-contract-caller/adder/Cargo.toml +++ b/integration-tests/public/multi-contract-caller/adder/Cargo.toml @@ -2,7 +2,7 @@ name = "adder" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/public/multi-contract-caller/subber/Cargo.toml b/integration-tests/public/multi-contract-caller/subber/Cargo.toml index 5d03771d84f..7a8827cec22 100644 --- a/integration-tests/public/multi-contract-caller/subber/Cargo.toml +++ b/integration-tests/public/multi-contract-caller/subber/Cargo.toml @@ -2,7 +2,7 @@ name = "subber" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/public/multisig/Cargo.toml b/integration-tests/public/multisig/Cargo.toml index ef9286e02de..76fdfbc1bcb 100755 --- a/integration-tests/public/multisig/Cargo.toml +++ b/integration-tests/public/multisig/Cargo.toml @@ -2,7 +2,7 @@ name = "multisig" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/own-code-hash/Cargo.toml b/integration-tests/public/own-code-hash/Cargo.toml index 87edf14918e..3bbcb63484e 100644 --- a/integration-tests/public/own-code-hash/Cargo.toml +++ b/integration-tests/public/own-code-hash/Cargo.toml @@ -2,7 +2,7 @@ name = "own-code-hash" version = "4.3.0" authors = ["Parity Technologies "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/payment-channel/Cargo.toml b/integration-tests/public/payment-channel/Cargo.toml index 2eab863f39d..84016a43d55 100755 --- a/integration-tests/public/payment-channel/Cargo.toml +++ b/integration-tests/public/payment-channel/Cargo.toml @@ -2,7 +2,7 @@ name = "payment_channel" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/runtime-call-contract/Cargo.toml b/integration-tests/public/runtime-call-contract/Cargo.toml index fe5e3472435..4461636dd88 100644 --- a/integration-tests/public/runtime-call-contract/Cargo.toml +++ b/integration-tests/public/runtime-call-contract/Cargo.toml @@ -3,7 +3,7 @@ members = ["sandbox-runtime", "traits"] [workspace.package] authors = ["Use Ink "] -edition = "2021" +edition = "2024" homepage = "https://use.ink" license = "Apache-2.0" repository = "https://github.com/use-ink/ink" @@ -25,7 +25,7 @@ scale-info = { version = "2.11.1", default-features = false } name = "runtime-call-contract" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/runtime-call-contract/traits/Cargo.toml b/integration-tests/public/runtime-call-contract/traits/Cargo.toml index 75c7cd4bc2c..2627a226f0e 100644 --- a/integration-tests/public/runtime-call-contract/traits/Cargo.toml +++ b/integration-tests/public/runtime-call-contract/traits/Cargo.toml @@ -2,7 +2,7 @@ name = "flipper-traits" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/trait-dyn-cross-contract-calls/Cargo.toml b/integration-tests/public/trait-dyn-cross-contract-calls/Cargo.toml index 7abec232f38..1b55b104360 100644 --- a/integration-tests/public/trait-dyn-cross-contract-calls/Cargo.toml +++ b/integration-tests/public/trait-dyn-cross-contract-calls/Cargo.toml @@ -2,7 +2,7 @@ name = "trait-incrementer-caller" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml b/integration-tests/public/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml index 4b39fcb6bd9..738f3db3595 100644 --- a/integration-tests/public/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml +++ b/integration-tests/public/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml @@ -2,7 +2,7 @@ name = "trait-incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/trait-dyn-cross-contract-calls/traits/Cargo.toml b/integration-tests/public/trait-dyn-cross-contract-calls/traits/Cargo.toml index 29f8d2efe2d..4390f2ecb4f 100644 --- a/integration-tests/public/trait-dyn-cross-contract-calls/traits/Cargo.toml +++ b/integration-tests/public/trait-dyn-cross-contract-calls/traits/Cargo.toml @@ -2,7 +2,7 @@ name = "dyn-traits" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/trait-erc20/Cargo.toml b/integration-tests/public/trait-erc20/Cargo.toml index ebfaea493c2..c799f8b5468 100644 --- a/integration-tests/public/trait-erc20/Cargo.toml +++ b/integration-tests/public/trait-erc20/Cargo.toml @@ -2,7 +2,7 @@ name = "trait_erc20" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/trait-flipper/Cargo.toml b/integration-tests/public/trait-flipper/Cargo.toml index a73e5965f3a..f39bcd66763 100644 --- a/integration-tests/public/trait-flipper/Cargo.toml +++ b/integration-tests/public/trait-flipper/Cargo.toml @@ -2,7 +2,7 @@ name = "trait_flipper" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/trait-incrementer/Cargo.toml b/integration-tests/public/trait-incrementer/Cargo.toml index 50cbb2d45c5..a215e734484 100644 --- a/integration-tests/public/trait-incrementer/Cargo.toml +++ b/integration-tests/public/trait-incrementer/Cargo.toml @@ -2,7 +2,7 @@ name = "trait-incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/trait-incrementer/traits/Cargo.toml b/integration-tests/public/trait-incrementer/traits/Cargo.toml index 191ddd1f0f0..9d4f4c4ddbf 100644 --- a/integration-tests/public/trait-incrementer/traits/Cargo.toml +++ b/integration-tests/public/trait-incrementer/traits/Cargo.toml @@ -2,7 +2,7 @@ name = "traits" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/delegator/Cargo.toml b/integration-tests/public/upgradeable-contracts/delegator/Cargo.toml index 6e37bf9a745..b7c317c29bf 100644 --- a/integration-tests/public/upgradeable-contracts/delegator/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/delegator/Cargo.toml @@ -2,7 +2,7 @@ name = "delegator" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/delegator/delegatee/Cargo.toml b/integration-tests/public/upgradeable-contracts/delegator/delegatee/Cargo.toml index fe48de1cab8..079d79b6f57 100644 --- a/integration-tests/public/upgradeable-contracts/delegator/delegatee/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/delegator/delegatee/Cargo.toml @@ -2,7 +2,7 @@ name = "delegatee" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/delegator/delegatee2/Cargo.toml b/integration-tests/public/upgradeable-contracts/delegator/delegatee2/Cargo.toml index d5f301cf8e5..d9c38dda9f8 100644 --- a/integration-tests/public/upgradeable-contracts/delegator/delegatee2/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/delegator/delegatee2/Cargo.toml @@ -2,7 +2,7 @@ name = "delegatee2" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/set-code-hash-migration/Cargo.toml b/integration-tests/public/upgradeable-contracts/set-code-hash-migration/Cargo.toml index 19e1643ccf0..5419209a401 100644 --- a/integration-tests/public/upgradeable-contracts/set-code-hash-migration/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/set-code-hash-migration/Cargo.toml @@ -2,7 +2,7 @@ name = "incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/set-code-hash-migration/migration/Cargo.toml b/integration-tests/public/upgradeable-contracts/set-code-hash-migration/migration/Cargo.toml index f36654c253b..8d083abeb1d 100644 --- a/integration-tests/public/upgradeable-contracts/set-code-hash-migration/migration/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/set-code-hash-migration/migration/Cargo.toml @@ -2,7 +2,7 @@ name = "migration" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/set-code-hash-migration/updated-incrementer/Cargo.toml b/integration-tests/public/upgradeable-contracts/set-code-hash-migration/updated-incrementer/Cargo.toml index a2de2d0cc5c..6381abcb26b 100644 --- a/integration-tests/public/upgradeable-contracts/set-code-hash-migration/updated-incrementer/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/set-code-hash-migration/updated-incrementer/Cargo.toml @@ -2,7 +2,7 @@ name = "updated-incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/set-code-hash/Cargo.toml b/integration-tests/public/upgradeable-contracts/set-code-hash/Cargo.toml index 1c1dc97efb7..86b18b8969f 100644 --- a/integration-tests/public/upgradeable-contracts/set-code-hash/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/set-code-hash/Cargo.toml @@ -2,7 +2,7 @@ name = "incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml b/integration-tests/public/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml index a2de2d0cc5c..6381abcb26b 100644 --- a/integration-tests/public/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml +++ b/integration-tests/public/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml @@ -2,7 +2,7 @@ name = "updated-incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/public/wildcard-selector/Cargo.toml b/integration-tests/public/wildcard-selector/Cargo.toml index 0b68ff7a69c..17fb99c1aa3 100644 --- a/integration-tests/public/wildcard-selector/Cargo.toml +++ b/integration-tests/public/wildcard-selector/Cargo.toml @@ -2,7 +2,7 @@ name = "wildcard-selector" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/events/Cargo.toml b/integration-tests/solidity-abi/events/Cargo.toml index 5a64062ed13..8ea1f16b137 100644 --- a/integration-tests/solidity-abi/events/Cargo.toml +++ b/integration-tests/solidity-abi/events/Cargo.toml @@ -2,7 +2,7 @@ name = "events" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/events/event-def-unused/Cargo.toml b/integration-tests/solidity-abi/events/event-def-unused/Cargo.toml index e48177631c1..137ff3b8dca 100644 --- a/integration-tests/solidity-abi/events/event-def-unused/Cargo.toml +++ b/integration-tests/solidity-abi/events/event-def-unused/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def-unused" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/solidity-abi/events/event-def/Cargo.toml b/integration-tests/solidity-abi/events/event-def/Cargo.toml index 90fc3d43b20..ff8816e8987 100644 --- a/integration-tests/solidity-abi/events/event-def/Cargo.toml +++ b/integration-tests/solidity-abi/events/event-def/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/solidity-abi/events/event-def2/Cargo.toml b/integration-tests/solidity-abi/events/event-def2/Cargo.toml index f8e697ad7f8..caab3031f8b 100644 --- a/integration-tests/solidity-abi/events/event-def2/Cargo.toml +++ b/integration-tests/solidity-abi/events/event-def2/Cargo.toml @@ -2,7 +2,7 @@ name = "event-def2" authors = ["Use Ink "] version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] ink = { path = "../../../../crates/ink", default-features = false } diff --git a/integration-tests/solidity-abi/fallible-setter/Cargo.toml b/integration-tests/solidity-abi/fallible-setter/Cargo.toml index 3c68334f59c..2930e7b9916 100644 --- a/integration-tests/solidity-abi/fallible-setter/Cargo.toml +++ b/integration-tests/solidity-abi/fallible-setter/Cargo.toml @@ -2,7 +2,7 @@ name = "fallible-setter" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/sol-cross-contract/Cargo.toml b/integration-tests/solidity-abi/sol-cross-contract/Cargo.toml index b67f34936dc..63bbaddcae2 100755 --- a/integration-tests/solidity-abi/sol-cross-contract/Cargo.toml +++ b/integration-tests/solidity-abi/sol-cross-contract/Cargo.toml @@ -2,7 +2,7 @@ name = "sol-cross-contract" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/sol-cross-contract/other-contract-sol/Cargo.toml b/integration-tests/solidity-abi/sol-cross-contract/other-contract-sol/Cargo.toml index 65f663fa8f5..ff0ba948a25 100755 --- a/integration-tests/solidity-abi/sol-cross-contract/other-contract-sol/Cargo.toml +++ b/integration-tests/solidity-abi/sol-cross-contract/other-contract-sol/Cargo.toml @@ -2,7 +2,7 @@ name = "other-contract-sol" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/sol-encoding/Cargo.toml b/integration-tests/solidity-abi/sol-encoding/Cargo.toml index 46922b3e759..5a11a418261 100755 --- a/integration-tests/solidity-abi/sol-encoding/Cargo.toml +++ b/integration-tests/solidity-abi/sol-encoding/Cargo.toml @@ -2,7 +2,7 @@ name = "sol-encoding" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/solidity-calls-flipper/Cargo.toml b/integration-tests/solidity-abi/solidity-calls-flipper/Cargo.toml index 167960e8229..300deaaca77 100644 --- a/integration-tests/solidity-abi/solidity-calls-flipper/Cargo.toml +++ b/integration-tests/solidity-abi/solidity-calls-flipper/Cargo.toml @@ -2,7 +2,7 @@ name = "flipper" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/Cargo.toml b/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/Cargo.toml index b614c76615b..773e2b5a879 100644 --- a/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/Cargo.toml +++ b/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/Cargo.toml @@ -2,7 +2,7 @@ name = "trait-incrementer-caller" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml b/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml index 578bea5aede..5d260d24abe 100644 --- a/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml +++ b/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml @@ -2,7 +2,7 @@ name = "trait-incrementer" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/traits/Cargo.toml b/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/traits/Cargo.toml index 3f848b69697..d702ddb5eaa 100644 --- a/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/traits/Cargo.toml +++ b/integration-tests/solidity-abi/trait-dyn-cross-contract-calls/traits/Cargo.toml @@ -2,7 +2,7 @@ name = "dyn-traits" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/integration-tests/solidity-abi/trait-flipper/Cargo.toml b/integration-tests/solidity-abi/trait-flipper/Cargo.toml index f4e45b718a2..b7522d22e47 100644 --- a/integration-tests/solidity-abi/trait-flipper/Cargo.toml +++ b/integration-tests/solidity-abi/trait-flipper/Cargo.toml @@ -2,7 +2,7 @@ name = "trait_flipper" version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" publish = false [dependencies] diff --git a/linting/Cargo.toml b/linting/Cargo.toml index 5768ef01c3e..5791e4ca5d6 100644 --- a/linting/Cargo.toml +++ b/linting/Cargo.toml @@ -9,7 +9,7 @@ members = [ [workspace.package] version = "6.0.0-alpha.1" authors = ["Use Ink "] -edition = "2021" +edition = "2024" license = "Apache-2.0" repository = "https://github.com/use-ink/ink" homepage = "https://use.ink" From 1abb375a5be6529bc683ea4f6b7d02d578bc88f3 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 16:04:06 +0300 Subject: [PATCH 02/18] rustfmt: Update edition to 2024 --- .rustfmt.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index 90456fa14ec..ad7b0d27345 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -43,8 +43,8 @@ trailing_comma = "Vertical" match_block_trailing_comma = false blank_lines_upper_bound = 1 blank_lines_lower_bound = 0 -edition = "2021" # changed -style_edition = "2021" +edition = "2024" # changed +style_edition = "2024" merge_derives = true use_try_shorthand = true # changed use_field_init_shorthand = true # changed From 69373dece944a5658ba252adc348248ae2a68816 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 16:21:20 +0300 Subject: [PATCH 03/18] manifest: Update rust-version to 1.88 --- Cargo.toml | 3 ++- crates/env/Cargo.toml | 2 +- crates/ink/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 362661ae47e..50d0d42da9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "crates/allocator", "crates/e2e", @@ -31,6 +31,7 @@ keywords = ["polkavm", "ink", "riscv", "blockchain", "edsl"] license = "Apache-2.0" repository = "https://github.com/use-ink/ink" version = "6.0.0-alpha.1" +rust-version = "1.88" [workspace.dependencies] arrayref = { version = "0.3" } diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index 6d339689ec8..2605d1bf76e 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -3,7 +3,7 @@ name = "ink_env" version.workspace = true authors = ["Use Ink "] edition.workspace = true -rust-version = "1.81" +rust-version.workspace = true license.workspace = true readme = "README.md" diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index b5aa5bae434..f285d788459 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -3,7 +3,7 @@ name = "ink" version.workspace = true authors = ["Use Ink "] edition.workspace = true -rust-version = "1.63" +rust-version.workspace = true license.workspace = true readme = "README.md" From 69b3db4207b307146bf9ddde9d1e4d2703cf2f3d Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 16:22:53 +0300 Subject: [PATCH 04/18] env: Return `Vec` for `ink::env::test::recorded_events` --- crates/env/src/engine/off_chain/test_api.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/env/src/engine/off_chain/test_api.rs b/crates/env/src/engine/off_chain/test_api.rs index d60f7e47038..b05ef330c92 100644 --- a/crates/env/src/engine/off_chain/test_api.rs +++ b/crates/env/src/engine/off_chain/test_api.rs @@ -291,12 +291,12 @@ pub struct DefaultAccounts { } /// Returns the recorded emitted events in order. -pub fn recorded_events() -> impl Iterator { +pub fn recorded_events() -> Vec { ::on_instance(|instance| { instance .engine .get_emitted_events() - .map(|evt: ink_engine::test_api::EmittedEvent| evt.into()) + .map(|evt: ink_engine::test_api::EmittedEvent| evt.into()).collect() }) } From 9cb4f4cdf9184890887c996501cd4a70f9e7d4d7 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 16:31:01 +0300 Subject: [PATCH 05/18] codegen: Update `#[no_mangle]` to `#[unsafe(no_mangle)]` --- crates/ink/codegen/src/generator/metadata.rs | 2 +- crates/ink/codegen/src/generator/sol/metadata.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/ink/codegen/src/generator/metadata.rs b/crates/ink/codegen/src/generator/metadata.rs index 1a6b53a33a2..fb03056d85d 100644 --- a/crates/ink/codegen/src/generator/metadata.rs +++ b/crates/ink/codegen/src/generator/metadata.rs @@ -51,7 +51,7 @@ impl GenerateCode for Metadata<'_> { #[cfg(not(feature = "ink-as-dependency"))] #[cfg(not(ink_abi = "sol"))] const _: () = { - #[no_mangle] + #[unsafe(no_mangle)] pub fn __ink_generate_metadata() -> ::ink::metadata::InkProject { let layout = #layout; ::ink::metadata::layout::ValidateLayout::validate(&layout).unwrap_or_else(|error| { diff --git a/crates/ink/codegen/src/generator/sol/metadata.rs b/crates/ink/codegen/src/generator/sol/metadata.rs index 43f41f29d0a..89202450a9e 100644 --- a/crates/ink/codegen/src/generator/sol/metadata.rs +++ b/crates/ink/codegen/src/generator/sol/metadata.rs @@ -49,7 +49,7 @@ impl GenerateCode for SolidityMetadata<'_> { #[cfg(not(feature = "ink-as-dependency"))] #[cfg(any(ink_abi = "sol", ink_abi = "all"))] const _: () = { - #[no_mangle] + #[unsafe(no_mangle)] pub fn __ink_generate_solidity_metadata() -> ::ink::metadata::sol::ContractMetadata { ::ink::metadata::sol::ContractMetadata { name: #name.into(), From d93d296492187c658b0cddd6a160ad2c7cf04a5c Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 16:31:10 +0300 Subject: [PATCH 06/18] linting: Update `#[no_mangle]` to `#[unsafe(no_mangle)]` --- linting/extra/src/lib.rs | 2 +- linting/mandatory/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linting/extra/src/lib.rs b/linting/extra/src/lib.rs index fe42f11941c..0f37d945cbb 100644 --- a/linting/extra/src/lib.rs +++ b/linting/extra/src/lib.rs @@ -39,7 +39,7 @@ mod storage_never_freed; mod strict_balance_equality; #[doc(hidden)] -#[no_mangle] +#[unsafe(no_mangle)] pub fn register_lints( _sess: &rustc_session::Session, lint_store: &mut rustc_lint::LintStore, diff --git a/linting/mandatory/src/lib.rs b/linting/mandatory/src/lib.rs index f054963bfad..2ebe9e54dab 100644 --- a/linting/mandatory/src/lib.rs +++ b/linting/mandatory/src/lib.rs @@ -34,7 +34,7 @@ extern crate rustc_span; mod no_main; #[doc(hidden)] -#[no_mangle] +#[unsafe(no_mangle)] pub fn register_lints( _sess: &rustc_session::Session, lint_store: &mut rustc_lint::LintStore, From 89bcd463a28781819027331d1b11640ebc43e642 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 16:25:07 +0300 Subject: [PATCH 07/18] tests: Update usages of `ink::env::test::recorded_events` --- integration-tests/all-abi/events/lib.rs | 10 ++++----- .../public/custom-environment/lib.rs | 2 +- integration-tests/public/erc20/lib.rs | 18 +++++++-------- integration-tests/public/erc721/lib.rs | 6 ++--- integration-tests/public/events/lib.rs | 10 ++++----- integration-tests/public/multisig/lib.rs | 22 +++++++++---------- integration-tests/public/trait-erc20/lib.rs | 16 +++++++------- integration-tests/solidity-abi/events/lib.rs | 10 ++++----- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/integration-tests/all-abi/events/lib.rs b/integration-tests/all-abi/events/lib.rs index 68420147513..65bc78443bf 100644 --- a/integration-tests/all-abi/events/lib.rs +++ b/integration-tests/all-abi/events/lib.rs @@ -228,7 +228,7 @@ pub mod events { let mut events = Events::new(false); events.flip_with_foreign_event(); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); // 2 events, one each per ABI. assert_eq!(2, emitted_events.len()); @@ -253,7 +253,7 @@ pub mod events { let events = Events::new(false); events.emit_32_byte_topic_event(Some(ink::sol::FixedBytes([0xAA; 32]))); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); // 2 events, one each per ABI. assert_eq!(2, emitted_events.len()); @@ -295,7 +295,7 @@ pub mod events { let events = Events::new(false); events.emit_32_byte_topic_event(None); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); // 2 events, one each per ABI. assert_eq!(2, emitted_events.len()); @@ -335,7 +335,7 @@ pub mod events { let mut events = Events::new(false); events.flip_with_inline_custom_event(); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); // 2 events, one each per ABI. assert_eq!(2, emitted_events.len()); @@ -359,7 +359,7 @@ pub mod events { let topic = ink::sol::FixedBytes([0x42; 32]); events.emit_anonymous_events(topic); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); // 6 events, each event is emitted twice, i.e. a separate event for each ABI. assert_eq!(6, emitted_events.len()); diff --git a/integration-tests/public/custom-environment/lib.rs b/integration-tests/public/custom-environment/lib.rs index 239a6e3b92d..da6305353fe 100644 --- a/integration-tests/public/custom-environment/lib.rs +++ b/integration-tests/public/custom-environment/lib.rs @@ -63,7 +63,7 @@ mod runtime_call { let mut contract = Topics::new(); contract.trigger(); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(emitted_events.len(), 1); let emitted_event = ::decode( diff --git a/integration-tests/public/erc20/lib.rs b/integration-tests/public/erc20/lib.rs index 4ddc60dc250..f2b51b2bfea 100644 --- a/integration-tests/public/erc20/lib.rs +++ b/integration-tests/public/erc20/lib.rs @@ -288,7 +288,7 @@ mod erc20 { let _erc20 = Erc20::new(100.into()); // Transfer event triggered during initial construction. - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); assert_transfer_event( @@ -306,7 +306,7 @@ mod erc20 { set_caller(Address::from([0x01; 20])); let erc20 = Erc20::new(100.into()); // Transfer event triggered during initial construction. - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_transfer_event( &emitted_events[0], None, @@ -326,7 +326,7 @@ mod erc20 { // Constructor works let erc20 = Erc20::new(100.into()); // Transfer event triggered during initial construction - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_transfer_event( &emitted_events[0], None, @@ -354,7 +354,7 @@ mod erc20 { // Bob owns 10 tokens. assert_eq!(erc20.balance_of(accounts.bob), U256::from(10)); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(emitted_events.len(), 2); // Check first transfer event related to ERC-20 instantiation. assert_transfer_event( @@ -399,7 +399,7 @@ mod erc20 { assert_eq!(erc20.balance_of(accounts.eve), U256::zero()); // Transfer event triggered during initial construction. - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(emitted_events.len(), 1); assert_transfer_event( &emitted_events[0], @@ -426,7 +426,7 @@ mod erc20 { assert_eq!(erc20.approve(accounts.bob, 10.into()), Ok(())); // The approve event takes place. - assert_eq!(ink::env::test::recorded_events().count(), 2); + assert_eq!(ink::env::test::recorded_events().len(), 2); // Set the contract as callee and Bob as caller. let contract = ink::env::address(); @@ -442,7 +442,7 @@ mod erc20 { assert_eq!(erc20.balance_of(accounts.eve), U256::from(10)); // Check all transfer events that happened during the previous calls: - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(emitted_events.len(), 3); assert_transfer_event( &emitted_events[0], @@ -477,7 +477,7 @@ mod erc20 { ink::env::test::set_caller(accounts.bob); // Bob tries to transfer tokens from Alice to Eve. - let emitted_events_before = ink::env::test::recorded_events().count(); + let emitted_events_before = ink::env::test::recorded_events().len(); assert_eq!( erc20.transfer_from( accounts.alice, @@ -494,7 +494,7 @@ mod erc20 { // No more events must have been emitted assert_eq!( emitted_events_before, - ink::env::test::recorded_events().count() + ink::env::test::recorded_events().len() ) } diff --git a/integration-tests/public/erc721/lib.rs b/integration-tests/public/erc721/lib.rs index b435dfe3e02..0c6eb6657a5 100644 --- a/integration-tests/public/erc721/lib.rs +++ b/integration-tests/public/erc721/lib.rs @@ -421,7 +421,7 @@ mod erc721 { // Create token Id 1. assert_eq!(erc721.mint(1), Ok(())); // The first Transfer event takes place - assert_eq!(1, ink::env::test::recorded_events().count()); + assert_eq!(1, ink::env::test::recorded_events().len()); // Alice owns 1 token. assert_eq!(erc721.balance_of(accounts.alice), 1); // Alice owns token Id 1. @@ -444,11 +444,11 @@ mod erc721 { // Bob does not owns any token assert_eq!(erc721.balance_of(accounts.bob), 0); // The first Transfer event takes place - assert_eq!(1, ink::env::test::recorded_events().count()); + assert_eq!(1, ink::env::test::recorded_events().len()); // Alice transfers token 1 to Bob assert_eq!(erc721.transfer(accounts.bob, 1), Ok(())); // The second Transfer event takes place - assert_eq!(2, ink::env::test::recorded_events().count()); + assert_eq!(2, ink::env::test::recorded_events().len()); // Bob owns token 1 assert_eq!(erc721.balance_of(accounts.bob), 1); } diff --git a/integration-tests/public/events/lib.rs b/integration-tests/public/events/lib.rs index d373bb1103b..a163549d01a 100644 --- a/integration-tests/public/events/lib.rs +++ b/integration-tests/public/events/lib.rs @@ -166,7 +166,7 @@ pub mod events { let mut events = Events::new(false); events.flip_with_foreign_event(); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let event = &emitted_events[0]; @@ -180,7 +180,7 @@ pub mod events { let events = Events::new(false); events.emit_32_byte_topic_event(Some([0xAA; 32])); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let event = &emitted_events[0]; @@ -200,7 +200,7 @@ pub mod events { let events = Events::new(false); events.emit_32_byte_topic_event(None); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let event = &emitted_events[0]; @@ -221,7 +221,7 @@ pub mod events { let mut events = Events::new(false); events.flip_with_inline_custom_event(); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let signature_topic = @@ -236,7 +236,7 @@ pub mod events { let topic = [0x42; 32]; events.emit_anonymous_events(topic); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(3, emitted_events.len()); let event = &emitted_events[0]; diff --git a/integration-tests/public/multisig/lib.rs b/integration-tests/public/multisig/lib.rs index 7a45768bfbf..db08dc9cf6e 100755 --- a/integration-tests/public/multisig/lib.rs +++ b/integration-tests/public/multisig/lib.rs @@ -802,7 +802,7 @@ mod multisig { set_from_owner(); contract.submit_transaction(Transaction::change_requirement(1)); assert_eq!(contract.transaction_list.transactions.len(), 1); - assert_eq!(test::recorded_events().count(), 2); + assert_eq!(test::recorded_events().len(), 2); let transaction = contract.transactions.get(0).unwrap(); assert_eq!(transaction, Transaction::change_requirement(1)); contract.confirmations.get((0, accounts.alice)).unwrap(); @@ -861,7 +861,7 @@ mod multisig { contract.add_owner(accounts.frank); assert_eq!(contract.owners.len(), owners + 1); assert!(contract.is_owner.contains(accounts.frank)); - assert_eq!(test::recorded_events().count(), 1); + assert_eq!(test::recorded_events().len(), 1); } #[ink::test] @@ -891,7 +891,7 @@ mod multisig { contract.remove_owner(accounts.alice); assert_eq!(contract.owners.len(), owners - 1); assert!(!contract.is_owner.contains(accounts.alice)); - assert_eq!(test::recorded_events().count(), 1); + assert_eq!(test::recorded_events().len(), 1); } #[ink::test] @@ -922,7 +922,7 @@ mod multisig { assert_eq!(contract.owners.len(), owners); assert!(!contract.is_owner.contains(accounts.alice)); assert!(contract.is_owner.contains(accounts.django)); - assert_eq!(test::recorded_events().count(), 2); + assert_eq!(test::recorded_events().len(), 2); } #[ink::test] @@ -959,7 +959,7 @@ mod multisig { set_from_wallet(); contract.change_requirement(3); assert_eq!(contract.requirement, 3); - assert_eq!(test::recorded_events().count(), 1); + assert_eq!(test::recorded_events().len(), 1); } #[ink::test] @@ -1005,7 +1005,7 @@ mod multisig { set_from_wallet(); contract.cancel_transaction(0); assert_eq!(contract.transaction_list.transactions.len(), 0); - assert_eq!(test::recorded_events().count(), 3); + assert_eq!(test::recorded_events().len(), 3); } #[ink::test] @@ -1014,7 +1014,7 @@ mod multisig { set_from_wallet(); contract.cancel_transaction(1); assert_eq!(contract.transaction_list.transactions.len(), 1); - assert_eq!(test::recorded_events().count(), 2); + assert_eq!(test::recorded_events().len(), 2); } #[ink::test] @@ -1030,7 +1030,7 @@ mod multisig { let accounts = default_accounts(); set_caller(accounts.bob); contract.confirm_transaction(0); - assert_eq!(test::recorded_events().count(), 3); + assert_eq!(test::recorded_events().len(), 3); contract.confirmations.get((0, accounts.bob)).unwrap(); assert_eq!(contract.confirmation_count.get(0).unwrap(), 2); } @@ -1062,7 +1062,7 @@ mod multisig { let accounts = default_accounts(); set_caller(accounts.alice); contract.confirm_transaction(0); - assert_eq!(test::recorded_events().count(), 2); + assert_eq!(test::recorded_events().len(), 2); contract.confirmations.get((0, accounts.alice)).unwrap(); assert_eq!(contract.confirmation_count.get(0).unwrap(), 1); } @@ -1081,7 +1081,7 @@ mod multisig { let accounts = default_accounts(); set_caller(accounts.alice); contract.revoke_confirmation(0); - assert_eq!(test::recorded_events().count(), 3); + assert_eq!(test::recorded_events().len(), 3); assert!(!contract.confirmations.contains((0, accounts.alice))); assert_eq!(contract.confirmation_count.get(0).unwrap(), 0); } @@ -1092,7 +1092,7 @@ mod multisig { let accounts = default_accounts(); set_caller(accounts.bob); contract.revoke_confirmation(0); - assert_eq!(test::recorded_events().count(), 2); + assert_eq!(test::recorded_events().len(), 2); assert!(contract.confirmations.contains((0, accounts.alice))); assert_eq!(contract.confirmation_count.get(0).unwrap(), 1); } diff --git a/integration-tests/public/trait-erc20/lib.rs b/integration-tests/public/trait-erc20/lib.rs index c240c9d1d30..b3fdfdfa1d2 100644 --- a/integration-tests/public/trait-erc20/lib.rs +++ b/integration-tests/public/trait-erc20/lib.rs @@ -347,7 +347,7 @@ mod erc20 { assert_eq!(::total_supply(&erc20), initial_supply); // Transfer event triggered during initial construction. - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); assert_transfer_event( @@ -366,7 +366,7 @@ mod erc20 { let initial_supply = 100.into(); let erc20 = Erc20::new(initial_supply); // Transfer event triggered during initial construction. - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_transfer_event( &emitted_events[0], None, @@ -387,7 +387,7 @@ mod erc20 { let initial_supply = 100.into(); let erc20 = Erc20::new(initial_supply); // Transfer event triggered during initial construction - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_transfer_event( &emitted_events[0], None, @@ -415,7 +415,7 @@ mod erc20 { // Bob owns 10 tokens. assert_eq!(erc20.balance_of(accounts.bob), U256::from(10)); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(emitted_events.len(), 2); // Check first transfer event related to ERC-20 instantiation. assert_transfer_event( @@ -457,7 +457,7 @@ mod erc20 { assert_eq!(erc20.balance_of(accounts.eve), U256::zero()); // Transfer event triggered during initial construction. - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(emitted_events.len(), 1); assert_transfer_event( &emitted_events[0], @@ -488,7 +488,7 @@ mod erc20 { assert_eq!(erc20.approve(accounts.bob, U256::from(10)), Ok(())); // The approve event takes place. - assert_eq!(ink::env::test::recorded_events().count(), 2); + assert_eq!(ink::env::test::recorded_events().len(), 2); // Set Bob as caller. set_caller(accounts.bob); @@ -502,7 +502,7 @@ mod erc20 { assert_eq!(erc20.balance_of(accounts.eve), U256::from(10)); // Check all transfer events that happened during the previous calls: - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(emitted_events.len(), 3); assert_transfer_event( &emitted_events[0], @@ -552,7 +552,7 @@ mod erc20 { ); // No more events must have been emitted let emitted_events_after = ink::env::test::recorded_events(); - assert_eq!(emitted_events_before.count(), emitted_events_after.count()); + assert_eq!(emitted_events_before.len(), emitted_events_after.len()); } fn set_caller(sender: Address) { diff --git a/integration-tests/solidity-abi/events/lib.rs b/integration-tests/solidity-abi/events/lib.rs index 9d674a7fd6c..f7e62c5ef52 100644 --- a/integration-tests/solidity-abi/events/lib.rs +++ b/integration-tests/solidity-abi/events/lib.rs @@ -159,7 +159,7 @@ pub mod events { let mut events = Events::new(false); events.flip_with_foreign_event(); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let event = &emitted_events[0]; @@ -173,7 +173,7 @@ pub mod events { let events = Events::new(false); events.emit_32_byte_topic_event(Some(ink::sol::FixedBytes([0xAA; 32]))); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let event = &emitted_events[0]; @@ -199,7 +199,7 @@ pub mod events { let events = Events::new(false); events.emit_32_byte_topic_event(None); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let event = &emitted_events[0]; @@ -222,7 +222,7 @@ pub mod events { let mut events = Events::new(false); events.flip_with_inline_custom_event(); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(1, emitted_events.len()); let signature_topic = @@ -240,7 +240,7 @@ pub mod events { let topic = ink::sol::FixedBytes([0x42; 32]); events.emit_anonymous_events(topic); - let emitted_events = ink::env::test::recorded_events().collect::>(); + let emitted_events = ink::env::test::recorded_events(); assert_eq!(2, emitted_events.len()); let event = &emitted_events[0]; From a7a82488200727ae6f57ee997d66b8cdfef4496a Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 17:23:05 +0300 Subject: [PATCH 08/18] ink: refactor `AsOption` lifetimes --- crates/ink/src/option_info.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/ink/src/option_info.rs b/crates/ink/src/option_info.rs index 3574118e33c..8c2cc3ad43b 100644 --- a/crates/ink/src/option_info.rs +++ b/crates/ink/src/option_info.rs @@ -14,30 +14,30 @@ pub struct AsOption<'lt, T>(pub &'lt T); -impl AsOption<'_, ::core::option::Option> { +impl<'lt, T> AsOption<'lt, ::core::option::Option> { #[inline] // We need to allow for dead code at this point because // the Rust compiler thinks this function is unused even // though it acts as the specialized case for detection. #[allow(dead_code)] - pub fn value(&self) -> Option<&T> { + pub fn value(&self) -> Option<&'lt T> { self.0.as_ref() } } impl<'lt, T> AsOption<'lt, &'lt ::core::option::Option> { #[inline] - pub fn value(&self) -> Option<&T> { + pub fn value(&self) -> Option<&'lt T> { self.0.as_ref() } } -pub trait AsOptionFallback { - fn value(&self) -> Option<&T>; +pub trait AsOptionFallback<'lt, T> { + fn value(&self) -> Option<&'lt T>; } -impl AsOptionFallback for AsOption<'_, T> { +impl<'lt, T> AsOptionFallback<'lt, T> for AsOption<'lt, T> { #[inline] - fn value(&self) -> Option<&T> { + fn value(&self) -> Option<&'lt T> { Some(self.0) } } From 739381a62d59b51cc8935842587a5bc0f6464c2d Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 17:08:27 +0300 Subject: [PATCH 09/18] codegen: unsafe extern --- crates/ink/codegen/src/generator/trait_def/trait_registry.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ink/codegen/src/generator/trait_def/trait_registry.rs b/crates/ink/codegen/src/generator/trait_def/trait_registry.rs index f09c4fece91..9f8ea7b0481 100644 --- a/crates/ink/codegen/src/generator/trait_def/trait_registry.rs +++ b/crates/ink/codegen/src/generator/trait_def/trait_registry.rs @@ -214,7 +214,7 @@ impl TraitRegistry<'_> { quote! { /// We enforce linking errors in case this is ever actually called. /// These linker errors are properly resolved by the cargo-contract tool. - extern { + unsafe extern { fn #linker_error_ident() -> !; } unsafe { #linker_error_ident() } From 5c552dd94b4781169bb83240269d6fdcffe14e04 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 17:08:45 +0300 Subject: [PATCH 10/18] tests: unsafe extern --- crates/ink/tests/events_metadata.rs | 2 +- crates/ink/tests/return_type_metadata.rs | 2 +- crates/ink/tests/ui/abi/all/pass/message-name-override.rs | 2 +- crates/ink/tests/ui/abi/all/pass/message-selector-precedence.rs | 2 +- crates/ink/tests/ui/abi/sol/pass/message-name-override.rs | 2 +- .../ui/contract/pass/constructor/constructor-name-override.rs | 2 +- .../ink/tests/ui/contract/pass/message/message-name-override.rs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/ink/tests/events_metadata.rs b/crates/ink/tests/events_metadata.rs index 82470e38c90..9e0cc5ef706 100644 --- a/crates/ink/tests/events_metadata.rs +++ b/crates/ink/tests/events_metadata.rs @@ -56,7 +56,7 @@ mod contract { #[cfg(test)] mod tests { fn generate_metadata() -> ink_metadata::InkProject { - extern "Rust" { + unsafe extern "Rust" { fn __ink_generate_metadata() -> ink_metadata::InkProject; } diff --git a/crates/ink/tests/return_type_metadata.rs b/crates/ink/tests/return_type_metadata.rs index ab0f4775ada..a83984be83d 100644 --- a/crates/ink/tests/return_type_metadata.rs +++ b/crates/ink/tests/return_type_metadata.rs @@ -52,7 +52,7 @@ mod tests { }; fn generate_metadata() -> ink_metadata::InkProject { - extern "Rust" { + unsafe extern "Rust" { fn __ink_generate_metadata() -> ink_metadata::InkProject; } diff --git a/crates/ink/tests/ui/abi/all/pass/message-name-override.rs b/crates/ink/tests/ui/abi/all/pass/message-name-override.rs index 532a36f2a5f..7b3d5738ed5 100644 --- a/crates/ink/tests/ui/abi/all/pass/message-name-override.rs +++ b/crates/ink/tests/ui/abi/all/pass/message-name-override.rs @@ -18,7 +18,7 @@ mod contract { } } -extern "Rust" { +unsafe extern "Rust" { fn __ink_generate_metadata() -> ink::metadata::InkProject; fn __ink_generate_solidity_metadata() -> ink::metadata::sol::ContractMetadata; diff --git a/crates/ink/tests/ui/abi/all/pass/message-selector-precedence.rs b/crates/ink/tests/ui/abi/all/pass/message-selector-precedence.rs index c23b570f384..25622c4c0b5 100644 --- a/crates/ink/tests/ui/abi/all/pass/message-selector-precedence.rs +++ b/crates/ink/tests/ui/abi/all/pass/message-selector-precedence.rs @@ -18,7 +18,7 @@ mod contract { } } -extern "Rust" { +unsafe extern "Rust" { fn __ink_generate_metadata() -> ink::metadata::InkProject; fn __ink_generate_solidity_metadata() -> ink::metadata::sol::ContractMetadata; diff --git a/crates/ink/tests/ui/abi/sol/pass/message-name-override.rs b/crates/ink/tests/ui/abi/sol/pass/message-name-override.rs index df3883e93ae..ff575ab505e 100644 --- a/crates/ink/tests/ui/abi/sol/pass/message-name-override.rs +++ b/crates/ink/tests/ui/abi/sol/pass/message-name-override.rs @@ -18,7 +18,7 @@ mod contract { } } -extern "Rust" { +unsafe extern "Rust" { fn __ink_generate_solidity_metadata() -> ink::metadata::sol::ContractMetadata; } diff --git a/crates/ink/tests/ui/contract/pass/constructor/constructor-name-override.rs b/crates/ink/tests/ui/contract/pass/constructor/constructor-name-override.rs index 7aaaaf7e037..73d3d6814c9 100644 --- a/crates/ink/tests/ui/contract/pass/constructor/constructor-name-override.rs +++ b/crates/ink/tests/ui/contract/pass/constructor/constructor-name-override.rs @@ -18,7 +18,7 @@ mod contract { } } -extern "Rust" { +unsafe extern "Rust" { fn __ink_generate_metadata() -> ink::metadata::InkProject; } diff --git a/crates/ink/tests/ui/contract/pass/message/message-name-override.rs b/crates/ink/tests/ui/contract/pass/message/message-name-override.rs index 4e9daf23174..fb3e8d299e3 100644 --- a/crates/ink/tests/ui/contract/pass/message/message-name-override.rs +++ b/crates/ink/tests/ui/contract/pass/message/message-name-override.rs @@ -18,7 +18,7 @@ mod contract { } } -extern "Rust" { +unsafe extern "Rust" { fn __ink_generate_metadata() -> ink::metadata::InkProject; } From ea8e4f98683e490f2dbb7d19800362dfc7647576 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 18:23:52 +0300 Subject: [PATCH 11/18] tests: unsafe static mut --- integration-tests/public/custom-allocator/lib.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/integration-tests/public/custom-allocator/lib.rs b/integration-tests/public/custom-allocator/lib.rs index 128d5762ac5..81970fa694f 100755 --- a/integration-tests/public/custom-allocator/lib.rs +++ b/integration-tests/public/custom-allocator/lib.rs @@ -64,11 +64,13 @@ static mut MEMORY: Option> = None; unsafe impl GlobalAlloc for BumpAllocator { #[allow(static_mut_refs)] unsafe fn alloc(&self, layout: Layout) -> *mut u8 { - if MEMORY.is_none() { - MEMORY = Some(SyncUnsafeCell::new(BumpMemory { - buffer: [0; 1024 * 1024], - offset: 0, - })); + unsafe { + if MEMORY.is_none() { + MEMORY = Some(SyncUnsafeCell::new(BumpMemory { + buffer: [0; 1024 * 1024], + offset: 0, + })); + } } let memory = unsafe { &mut *MEMORY.as_ref().unwrap().get() }; let start = memory.offset; From 920ab808e7c31898dddf84686c7d5f0e273c02db Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 18:23:10 +0300 Subject: [PATCH 12/18] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f483523a0a7..00df5639167 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Synchronize with `polkadot-sdk/c40b36c3a7c208f9a6837b80812473af3d9ba7f7` ‒ [2589](https://github.com/use-ink/ink/pull/2589) - Synchronize with `polkadot-sdk/a71ec19a94702ea71767ba5ac97603ea6c6305c1` ‒ [2619](https://github.com/use-ink/ink/pull/2619) - Refactor multi ABI interfaces - [#2618](https://github.com/use-ink/ink/pull/2618) +- Upgrade to Rust edition 2024 - [#2624](https://github.com/use-ink/ink/pull/2624) ### Removed - Removed functionalities around calling into the runtime and chain extensions ‒ [2621](https://github.com/use-ink/ink/pull/2621) From 24a7105b6559e5d27d3e179780f2d2db587bd456 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 17:30:41 +0300 Subject: [PATCH 13/18] tests: Update `Cargo.lock` for `trybuild_wrapper` --- crates/ink/tests/trybuild_wrapper/Cargo.lock | 64 +++++++++++++++++--- 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/crates/ink/tests/trybuild_wrapper/Cargo.lock b/crates/ink/tests/trybuild_wrapper/Cargo.lock index f614c8b4026..486ebfe291a 100644 --- a/crates/ink/tests/trybuild_wrapper/Cargo.lock +++ b/crates/ink/tests/trybuild_wrapper/Cargo.lock @@ -227,6 +227,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83" +dependencies = [ + "serde", +] + [[package]] name = "strsim" version = "0.11.1" @@ -266,11 +275,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae" dependencies = [ "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.8", + "toml_datetime 0.6.9", "toml_edit", ] +[[package]] +name = "toml" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" +dependencies = [ + "indexmap", + "serde", + "serde_spanned 1.0.0", + "toml_datetime 0.7.0", + "toml_parser", + "toml_writer", + "winnow", +] + [[package]] name = "toml_datetime" version = "0.6.9" @@ -280,6 +304,15 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" version = "0.22.26" @@ -288,23 +321,38 @@ checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" dependencies = [ "indexmap", "serde", - "serde_spanned", - "toml_datetime", + "serde_spanned 0.6.8", + "toml_datetime 0.6.9", "toml_write", "winnow", ] +[[package]] +name = "toml_parser" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" +dependencies = [ + "winnow", +] + [[package]] name = "toml_write" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076" +[[package]] +name = "toml_writer" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" + [[package]] name = "trybuild" -version = "1.0.105" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9bf9513a2f4aeef5fdac8677d7d349c79fdbcc03b9c86da6e9d254f1e43be2" +checksum = "32e257d7246e7a9fd015fb0b28b330a8d4142151a33f03e6a497754f4b1f6a8e" dependencies = [ "dissimilar", "glob", @@ -313,7 +361,7 @@ dependencies = [ "serde_json", "target-triple", "termcolor", - "toml", + "toml 0.9.5", ] [[package]] @@ -321,7 +369,7 @@ name = "trybuild_wrapper" version = "0.1.0" dependencies = [ "clap", - "toml", + "toml 0.8.22", "trybuild", ] From 5f87947744b9f07b82f2005f459ea8a7d03fbaec Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 17:46:38 +0300 Subject: [PATCH 14/18] chore: clippy fix --- crates/e2e/sandbox/src/api/revive_api.rs | 4 ++-- crates/e2e/sandbox/src/lib.rs | 2 +- crates/e2e/src/sandbox_client.rs | 10 +++------- crates/e2e/src/xts.rs | 6 +++--- .../codegen/src/generator/trait_def/trait_registry.rs | 6 +++--- crates/ink/ir/src/ir/attrs.rs | 5 ++--- crates/ink/ir/src/ir/item_impl/message.rs | 5 ++--- crates/ink/ir/src/ir/item_mod.rs | 5 ++--- crates/ink/ir/src/ir/utils.rs | 10 ++++------ crates/ink/macro/src/sol/error.rs | 6 +++--- 10 files changed, 25 insertions(+), 34 deletions(-) diff --git a/crates/e2e/sandbox/src/api/revive_api.rs b/crates/e2e/sandbox/src/api/revive_api.rs index 78e2e3edaaf..6de4abe28a9 100644 --- a/crates/e2e/sandbox/src/api/revive_api.rs +++ b/crates/e2e/sandbox/src/api/revive_api.rs @@ -308,10 +308,10 @@ mod tests { /// /// This function funds the account with the existential deposit /// (i.e. minimum balance). - fn warm_up(sandbox: &mut T) + fn warm_up(sandbox: &mut T) where ::Runtime: pallet_revive::Config + pallet_balances::Config, - T: BalanceAPI, + T: BalanceAPI + Sandbox, { let acc = pallet_revive::Pallet::<::Runtime>::account_id(); let ed = pallet_balances::Pallet::<::Runtime>::minimum_balance(); diff --git a/crates/e2e/sandbox/src/lib.rs b/crates/e2e/sandbox/src/lib.rs index e7de5df0c7b..f78aa681d81 100644 --- a/crates/e2e/sandbox/src/lib.rs +++ b/crates/e2e/sandbox/src/lib.rs @@ -168,5 +168,5 @@ where let native_to_eth_ratio: U256 = ::NativeToEthRatio::get().into(); let evm_value: U256 = value.into(); - native_to_eth_ratio.saturating_mul(evm_value.into()) + native_to_eth_ratio.saturating_mul(evm_value) } diff --git a/crates/e2e/src/sandbox_client.rs b/crates/e2e/src/sandbox_client.rs index 5f6cf0e9572..36ae3586fa5 100644 --- a/crates/e2e/src/sandbox_client.rs +++ b/crates/e2e/src/sandbox_client.rs @@ -487,15 +487,11 @@ where }); if result.result.is_err() { let res = result.result.clone().unwrap_err(); - if let DispatchError::Module(m) = res { - let msg = m.message; - if msg.is_some() { - let s = msg.unwrap(); - if s.contains("AccountUnmapped") { + if let DispatchError::Module(m) = res + && let Some(s) = m.message + && s.contains("AccountUnmapped") { panic!("something is wrong, we mapped the account before") } - } - } } // todo error when `AccountUnmapped` Ok(CallDryRunResult { diff --git a/crates/e2e/src/xts.rs b/crates/e2e/src/xts.rs index 52ac9af3912..dcae0692684 100644 --- a/crates/e2e/src/xts.rs +++ b/crates/e2e/src/xts.rs @@ -442,7 +442,8 @@ where // todo let tx_index: usize = match (extrinsic_hash, extrinsic) { (Some(hash), None) => { - let index = block_details + + block_details .block .extrinsics .iter() @@ -456,8 +457,7 @@ where } None }) - .expect("the extrinsic hash was not found in the block"); - index + .expect("the extrinsic hash was not found in the block") } (None, Some(extrinsic)) => { exts.push( diff --git a/crates/ink/codegen/src/generator/trait_def/trait_registry.rs b/crates/ink/codegen/src/generator/trait_def/trait_registry.rs index 9f8ea7b0481..76196b7b65a 100644 --- a/crates/ink/codegen/src/generator/trait_def/trait_registry.rs +++ b/crates/ink/codegen/src/generator/trait_def/trait_registry.rs @@ -124,10 +124,10 @@ impl TraitRegistry<'_> { fn generate_registry_messages(&self) -> TokenStream2 { let messages = self.trait_def.trait_def.item().iter_items().filter_map( |(item, selector)| { - let ret = item.filter_map_message().map(|message| { + + item.filter_map_message().map(|message| { self.generate_registry_for_message(&message, selector) - }); - ret + }) }, ); quote! { diff --git a/crates/ink/ir/src/ir/attrs.rs b/crates/ink/ir/src/ir/attrs.rs index e0f0ac039de..1de43356730 100644 --- a/crates/ink/ir/src/ir/attrs.rs +++ b/crates/ink/ir/src/ir/attrs.rs @@ -62,11 +62,10 @@ impl IsDocAttribute for syn::Attribute { } match &self.meta { syn::Meta::NameValue(nv) => { - if let syn::Expr::Lit(l) = &nv.value { - if let syn::Lit::Str(s) = &l.lit { + if let syn::Expr::Lit(l) = &nv.value + && let syn::Lit::Str(s) = &l.lit { return Some(s.value()); } - } } _ => return None, } diff --git a/crates/ink/ir/src/ir/item_impl/message.rs b/crates/ink/ir/src/ir/item_impl/message.rs index 0699eafb700..42c6ab57b80 100644 --- a/crates/ink/ir/src/ir/item_impl/message.rs +++ b/crates/ink/ir/src/ir/item_impl/message.rs @@ -169,14 +169,13 @@ impl Message { match &method_item.sig.output { syn::ReturnType::Default => (), syn::ReturnType::Type(_arrow, ret_type) => { - if let syn::Type::Path(type_path) = &**ret_type { - if type_path.path.is_ident("Self") { + if let syn::Type::Path(type_path) = &**ret_type + && type_path.path.is_ident("Self") { return Err(format_err!( ret_type, "ink! messages must not return `Self`" )) } - } } } Ok(()) diff --git a/crates/ink/ir/src/ir/item_mod.rs b/crates/ink/ir/src/ir/item_mod.rs index e05f503b83e..b6b444b6af1 100644 --- a/crates/ink/ir/src/ir/item_mod.rs +++ b/crates/ink/ir/src/ir/item_mod.rs @@ -298,11 +298,10 @@ impl ItemMod { fn verify_attr(a: &syn::Attribute) -> Result<(), syn::Error> { match &a.meta { syn::Meta::List(list) => { - if let Some(ident) = list.path.get_ident() { - if ident.eq("cfg") { + if let Some(ident) = list.path.get_ident() + && ident.eq("cfg") { return list.parse_nested_meta(verify_cfg_attrs); } - } unreachable!("`verify_attr` can only be called for `#[cfg(…)]`, not for other `List`"); } syn::Meta::Path(_) => { diff --git a/crates/ink/ir/src/ir/utils.rs b/crates/ink/ir/src/ir/utils.rs index c23b071fac4..bd1e61821d1 100644 --- a/crates/ink/ir/src/ir/utils.rs +++ b/crates/ink/ir/src/ir/utils.rs @@ -153,18 +153,16 @@ where /// In most cases it is the parent storage key or the auto-generated storage key. pub fn find_storage_key_salt(input: &syn::DeriveInput) -> Option { input.generics.params.iter().find_map(|param| { - if let syn::GenericParam::Type(type_param) = param { - if let Some(syn::TypeParamBound::Trait(trait_bound)) = + if let syn::GenericParam::Type(type_param) = param + && let Some(syn::TypeParamBound::Trait(trait_bound)) = type_param.bounds.first() { let segments = &trait_bound.path.segments; - if let Some(last) = segments.last() { - if last.ident == "StorageKey" { + if let Some(last) = segments.last() + && last.ident == "StorageKey" { return Some(type_param.clone()) } - } } - } None }) } diff --git a/crates/ink/macro/src/sol/error.rs b/crates/ink/macro/src/sol/error.rs index 66a129769ad..9f0c58ded99 100644 --- a/crates/ink/macro/src/sol/error.rs +++ b/crates/ink/macro/src/sol/error.rs @@ -286,7 +286,8 @@ fn sol_error_encode_derive_enum(s: synstructure::Structure) -> syn::Result syn::Result Date: Mon, 8 Sep 2025 19:34:04 +0300 Subject: [PATCH 15/18] chore: fmt --- crates/allocator/src/bump.rs | 2 +- crates/e2e/macro/src/config.rs | 2 +- crates/e2e/macro/src/ir.rs | 2 +- crates/e2e/sandbox/src/api/revive_api.rs | 16 +- crates/e2e/sandbox/src/api/system_api.rs | 6 +- crates/e2e/sandbox/src/api/timestamp_api.rs | 2 +- crates/e2e/sandbox/src/lib.rs | 2 +- crates/e2e/sandbox/src/macros.rs | 10 +- crates/e2e/src/backend.rs | 14 +- crates/e2e/src/backend_calls.rs | 14 +- crates/e2e/src/builders.rs | 8 +- crates/e2e/src/contract_build.rs | 2 +- crates/e2e/src/contract_results.rs | 8 +- crates/e2e/src/lib.rs | 6 +- crates/e2e/src/node_proc.rs | 4 +- crates/e2e/src/sandbox_client.rs | 86 ++++---- crates/e2e/src/subxt_client.rs | 28 ++- crates/e2e/src/xts.rs | 8 +- crates/engine/src/ext.rs | 4 +- crates/engine/src/hashing.rs | 8 +- crates/engine/src/test_api.rs | 4 +- crates/engine/src/tests.rs | 4 +- crates/env/src/api.rs | 12 +- crates/env/src/backend.rs | 14 +- crates/env/src/call/call_builder/call.rs | 10 +- crates/env/src/call/call_builder/delegate.rs | 10 +- crates/env/src/call/call_builder/mod.rs | 6 +- crates/env/src/call/common.rs | 4 +- crates/env/src/call/create_builder.rs | 14 +- crates/env/src/call/execution.rs | 4 +- crates/env/src/call/mod.rs | 14 +- crates/env/src/engine/mod.rs | 8 +- crates/env/src/engine/off_chain/impls.rs | 26 +-- crates/env/src/engine/off_chain/test_api.rs | 5 +- crates/env/src/engine/off_chain/tests.rs | 4 +- crates/env/src/engine/off_chain/types.rs | 2 +- .../env/src/engine/on_chain/pallet_revive.rs | 42 ++-- crates/env/src/tests.rs | 4 +- .../generator/as_dependency/call_builder.rs | 2 +- .../generator/as_dependency/contract_ref.rs | 2 +- .../src/generator/as_dependency/mod.rs | 2 +- crates/ink/codegen/src/generator/contract.rs | 2 +- crates/ink/codegen/src/generator/dispatch.rs | 2 +- crates/ink/codegen/src/generator/event.rs | 4 +- .../ink/codegen/src/generator/item_impls.rs | 2 +- crates/ink/codegen/src/generator/metadata.rs | 6 +- crates/ink/codegen/src/generator/mod.rs | 2 +- crates/ink/codegen/src/generator/sol/utils.rs | 2 +- .../ink/codegen/src/generator/storage_item.rs | 4 +- .../src/generator/trait_def/trait_registry.rs | 8 +- crates/ink/ir/src/ast/attr_args.rs | 2 +- crates/ink/ir/src/ast/meta.rs | 8 +- crates/ink/ir/src/ir/attrs.rs | 87 ++++---- crates/ink/ir/src/ir/blake2.rs | 2 +- crates/ink/ir/src/ir/config.rs | 6 +- crates/ink/ir/src/ir/item_impl/constructor.rs | 2 +- crates/ink/ir/src/ir/item_impl/impl_item.rs | 13 +- crates/ink/ir/src/ir/item_impl/message.rs | 15 +- crates/ink/ir/src/ir/item_mod.rs | 62 +++--- crates/ink/ir/src/ir/mod.rs | 10 +- crates/ink/ir/src/ir/sha3.rs | 2 +- crates/ink/ir/src/ir/storage_item/mod.rs | 2 +- crates/ink/ir/src/ir/trait_def/config.rs | 2 +- crates/ink/ir/src/ir/trait_def/item/iter.rs | 2 +- crates/ink/ir/src/ir/trait_def/item/mod.rs | 10 +- .../ir/src/ir/trait_def/item/trait_item.rs | 14 +- crates/ink/ir/src/ir/utils.rs | 11 +- crates/ink/ir/src/lib.rs | 6 +- crates/ink/macro/src/event/mod.rs | 2 +- crates/ink/macro/src/selector.rs | 2 +- crates/ink/macro/src/sol/codec.rs | 2 +- crates/ink/macro/src/sol/error.rs | 3 +- crates/ink/macro/src/sol/utils.rs | 2 +- crates/ink/macro/src/storage/storable_hint.rs | 4 +- crates/ink/macro/src/storage/storage_key.rs | 2 +- crates/ink/src/codegen/implies_return.rs | 8 +- crates/ink/src/codegen/mod.rs | 2 +- crates/ink/src/contract_ref.rs | 2 +- crates/ink/src/env_access.rs | 38 ++-- crates/ink/src/lib.rs | 18 +- crates/ink/src/message_builder.rs | 2 +- crates/ink/tests/compile_tests.rs | 4 +- crates/ink/tests/return_type_metadata.rs | 2 +- crates/metadata/src/layout/mod.rs | 10 +- crates/metadata/src/lib.rs | 2 +- crates/metadata/src/specs.rs | 8 +- crates/metadata/src/tests.rs | 190 ++++++++++-------- crates/primitives/src/arithmetic.rs | 2 +- crates/primitives/src/sol.rs | 2 +- crates/primitives/src/sol/bytes.rs | 20 +- crates/primitives/src/sol/encodable.rs | 4 +- crates/primitives/src/sol/error.rs | 6 +- crates/primitives/src/sol/params.rs | 10 +- crates/primitives/src/sol/tests.rs | 16 +- crates/primitives/src/sol/types.rs | 12 +- crates/storage/src/lazy/mapping.rs | 4 +- crates/storage/src/lazy/mod.rs | 2 +- crates/storage/traits/src/layout/impls.rs | 2 +- crates/storage/traits/src/lib.rs | 2 +- 99 files changed, 581 insertions(+), 517 deletions(-) diff --git a/crates/allocator/src/bump.rs b/crates/allocator/src/bump.rs index c3c97c58180..670f225b199 100644 --- a/crates/allocator/src/bump.rs +++ b/crates/allocator/src/bump.rs @@ -330,8 +330,8 @@ mod tests { mod fuzz_tests { use super::*; use quickcheck::{ - quickcheck, TestResult, + quickcheck, }; use std::mem::size_of; diff --git a/crates/e2e/macro/src/config.rs b/crates/e2e/macro/src/config.rs index b798b14822c..1bad6b8a12d 100644 --- a/crates/e2e/macro/src/config.rs +++ b/crates/e2e/macro/src/config.rs @@ -135,8 +135,8 @@ impl E2EConfig { mod tests { use super::*; use darling::{ - ast::NestedMeta, FromMeta, + ast::NestedMeta, }; use quote::quote; diff --git a/crates/e2e/macro/src/ir.rs b/crates/e2e/macro/src/ir.rs index ccbd4a71170..7cbc623e08b 100644 --- a/crates/e2e/macro/src/ir.rs +++ b/crates/e2e/macro/src/ir.rs @@ -14,8 +14,8 @@ use crate::config::E2EConfig; use darling::{ - ast::NestedMeta, FromMeta, + ast::NestedMeta, }; use proc_macro2::TokenStream as TokenStream2; diff --git a/crates/e2e/sandbox/src/api/revive_api.rs b/crates/e2e/sandbox/src/api/revive_api.rs index 6de4abe28a9..09019cc1921 100644 --- a/crates/e2e/sandbox/src/api/revive_api.rs +++ b/crates/e2e/sandbox/src/api/revive_api.rs @@ -1,17 +1,17 @@ use crate::{ - balance_to_evm_value, AccountIdFor, ContractExecResultFor, ContractResultInstantiate, - Sandbox, H256, + Sandbox, + balance_to_evm_value, }; use frame_support::{ pallet_prelude::DispatchError, sp_runtime::traits::Bounded, traits::{ - fungible::Inspect, Time, + fungible::Inspect, }, weights::Weight, }; @@ -21,13 +21,13 @@ use ink_primitives::{ DepositLimit, }; use pallet_revive::{ + BumpNonce, + Code, + CodeUploadResult, evm::{ Tracer, TracerType, }, - BumpNonce, - Code, - CodeUploadResult, }; use sp_core::U256; use std::ops::Not; @@ -147,11 +147,9 @@ impl ContractAPI for T where T: Sandbox, T::Runtime: pallet_revive::Config, - BalanceOf: Into + TryFrom + Bounded, MomentOf: Into, <::Runtime as frame_system::Config>::Nonce: Into, - // todo <::Runtime as frame_system::Config>::Hash: frame_support::traits::IsType, @@ -283,9 +281,9 @@ pub fn decode_debug_buffer(buffer: &[u8]) -> Vec { mod tests { use super::*; use crate::{ - api::prelude::*, DefaultSandbox, RuntimeEventOf, + api::prelude::*, }; const STORAGE_DEPOSIT_LIMIT: DepositLimit = DepositLimit::UnsafeOnlyForDryRun; diff --git a/crates/e2e/sandbox/src/api/system_api.rs b/crates/e2e/sandbox/src/api/system_api.rs index c743afe28a5..ac333fab8fd 100644 --- a/crates/e2e/sandbox/src/api/system_api.rs +++ b/crates/e2e/sandbox/src/api/system_api.rs @@ -4,11 +4,11 @@ use crate::{ Sandbox, }; use frame_support::sp_runtime::{ + DispatchResultWithInfo, traits::{ Dispatchable, Saturating, }, - DispatchResultWithInfo, }; use frame_system::pallet_prelude::BlockNumberFor; @@ -100,17 +100,17 @@ where #[cfg(test)] mod tests { use crate::{ - api::prelude::*, DefaultSandbox, RuntimeCall, RuntimeEventOf, RuntimeOf, Sandbox, + api::prelude::*, }; use frame_support::sp_runtime::{ - traits::Dispatchable, AccountId32, DispatchResultWithInfo, + traits::Dispatchable, }; fn make_transfer( diff --git a/crates/e2e/sandbox/src/api/timestamp_api.rs b/crates/e2e/sandbox/src/api/timestamp_api.rs index ea8a2679fac..e2c4f7e730a 100644 --- a/crates/e2e/sandbox/src/api/timestamp_api.rs +++ b/crates/e2e/sandbox/src/api/timestamp_api.rs @@ -40,8 +40,8 @@ where #[cfg(test)] mod tests { use crate::{ - api::prelude::*, DefaultSandbox, + api::prelude::*, }; #[test] diff --git a/crates/e2e/sandbox/src/lib.rs b/crates/e2e/sandbox/src/lib.rs index f78aa681d81..3cae6bb33d9 100644 --- a/crates/e2e/sandbox/src/lib.rs +++ b/crates/e2e/sandbox/src/lib.rs @@ -10,11 +10,11 @@ use frame_support::{ traits::fungible::Inspect, }; use frame_system::{ + EventRecord, pallet_prelude::{ BlockNumberFor, OriginFor, }, - EventRecord, }; use ink_primitives::U256; pub use macros::{ diff --git a/crates/e2e/sandbox/src/macros.rs b/crates/e2e/sandbox/src/macros.rs index 6be6559cfb6..18303f18c69 100644 --- a/crates/e2e/sandbox/src/macros.rs +++ b/crates/e2e/sandbox/src/macros.rs @@ -2,11 +2,11 @@ use std::time::SystemTime; use frame_support::{ sp_runtime::{ + BuildStorage, traits::{ Header, One, }, - BuildStorage, }, traits::Hooks, }; @@ -17,10 +17,10 @@ use sp_io::TestExternalities; pub struct BlockBuilder(std::marker::PhantomData); impl< - T: pallet_balances::Config - + pallet_timestamp::Config - + pallet_revive::Config, - > BlockBuilder + T: pallet_balances::Config + + pallet_timestamp::Config + + pallet_revive::Config, +> BlockBuilder { /// Create a new externalities with the given balances. pub fn new_ext(balances: Vec<(T::AccountId, T::Balance)>) -> TestExternalities { diff --git a/crates/e2e/src/backend.rs b/crates/e2e/src/backend.rs index f1fcbafde1e..4f99babc4da 100644 --- a/crates/e2e/src/backend.rs +++ b/crates/e2e/src/backend.rs @@ -13,13 +13,13 @@ // limitations under the License. use ink_env::{ - call::utils::DecodeMessageResult, DefaultEnvironment, Environment, + call::utils::DecodeMessageResult, }; use ink_primitives::{ - abi::AbiEncodeWith, DepositLimit, + abi::AbiEncodeWith, }; use jsonrpsee::core::async_trait; use pallet_revive::evm::CallTrace; @@ -27,11 +27,15 @@ use sp_weights::Weight; use subxt::dynamic::Value; use super::{ + H256, InstantiateDryRunResult, Keypair, - H256, }; use crate::{ + CallBuilder, + CallBuilderFinal, + CallDryRunResult, + UploadResult, backend_calls::{ InstantiateBuilder, RemoveCodeBuilder, @@ -39,10 +43,6 @@ use crate::{ }, builders::CreateBuilderPartial, contract_results::BareInstantiationResult, - CallBuilder, - CallBuilderFinal, - CallDryRunResult, - UploadResult, }; /// 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 cd7bb77bfaf..0800f89633e 100644 --- a/crates/e2e/src/backend_calls.rs +++ b/crates/e2e/src/backend_calls.rs @@ -15,31 +15,31 @@ use std::marker::PhantomData; use ink_env::{ - call::utils::DecodeMessageResult, Environment, + call::utils::DecodeMessageResult, }; use ink_primitives::{ - abi::AbiEncodeWith, DepositLimit, + abi::AbiEncodeWith, }; use sp_weights::Weight; use super::{ - balance_to_deposit_limit, - balance_to_deposit_limit_dry_run, InstantiateDryRunResult, Keypair, + balance_to_deposit_limit, + balance_to_deposit_limit_dry_run, }; use crate::{ - backend::BuilderClient, - builders::CreateBuilderPartial, CallBuilderFinal, CallDryRunResult, CallResult, ContractsBackend, + H256, InstantiationResult, UploadResult, - H256, + backend::BuilderClient, + builders::CreateBuilderPartial, }; /// Allows to build an end-to-end call using a builder pattern. diff --git a/crates/e2e/src/builders.rs b/crates/e2e/src/builders.rs index 361ddcd317f..d9dd03ccfab 100644 --- a/crates/e2e/src/builders.rs +++ b/crates/e2e/src/builders.rs @@ -13,16 +13,16 @@ // limitations under the License. use ink_env::{ + Environment, call::{ + CreateBuilder, + ExecutionInput, + LimitParamsV2, utils::{ ReturnType, Set, }, - CreateBuilder, - ExecutionInput, - LimitParamsV2, }, - Environment, }; use ink_primitives::abi::AbiEncodeWith; diff --git a/crates/e2e/src/contract_build.rs b/crates/e2e/src/contract_build.rs index d4652642b75..f96959c14c5 100644 --- a/crates/e2e/src/contract_build.rs +++ b/crates/e2e/src/contract_build.rs @@ -14,8 +14,8 @@ use std::{ collections::{ - hash_map::Entry, HashMap, + hash_map::Entry, }, env, path::{ diff --git a/crates/e2e/src/contract_results.rs b/crates/e2e/src/contract_results.rs index 2086850f0d7..2dcb3f83a1c 100644 --- a/crates/e2e/src/contract_results.rs +++ b/crates/e2e/src/contract_results.rs @@ -24,24 +24,24 @@ use frame_support::pallet_prelude::{ }; use ink::codegen::ContractCallBuilder; use ink_env::{ + Environment, call::{ - utils::DecodeMessageResult, FromAddr, + utils::DecodeMessageResult, }, - Environment, }; use ink_primitives::{ Address, ConstructorResult, - MessageResult, H256, + MessageResult, }; use pallet_revive::{ - evm::CallTrace, CodeUploadResult, ExecReturnValue, InstantiateReturnValue, StorageDeposit, + evm::CallTrace, }; use sp_runtime::{ DispatchError, diff --git a/crates/e2e/src/lib.rs b/crates/e2e/src/lib.rs index 5cab93a9ed3..a8dc6308e97 100644 --- a/crates/e2e/src/lib.rs +++ b/crates/e2e/src/lib.rs @@ -60,8 +60,8 @@ pub use node_proc::{ pub use pallet_revive::evm::CallTrace; #[cfg(feature = "sandbox")] pub use sandbox_client::{ - preset, Client as SandboxClient, + preset, }; pub use sp_keyring::Sr25519Keyring; pub use subxt::{ @@ -77,8 +77,8 @@ pub use subxt_signer::{ self, sr25519::{ self, - dev::*, Keypair, + dev::*, }, }; pub use tokio; @@ -90,9 +90,9 @@ pub use ink_sandbox::DefaultSandbox; use ink::codegen::ContractCallBuilder; use ink_env::{ - call::FromAddr, ContractEnv, Environment, + call::FromAddr, }; use ink_primitives::{ Address, diff --git a/crates/e2e/src/node_proc.rs b/crates/e2e/src/node_proc.rs index 26276c80570..8aaa142d114 100644 --- a/crates/e2e/src/node_proc.rs +++ b/crates/e2e/src/node_proc.rs @@ -26,9 +26,9 @@ use std::{ process, }; use subxt::{ - backend::rpc::RpcClient, Config, OnlineClient, + backend::rpc::RpcClient, }; /// Spawn a local substrate node for testing. @@ -246,8 +246,8 @@ fn find_substrate_port_from_output(r: impl Read + Send + 'static) -> u16 { mod tests { use super::*; use subxt::{ - backend::legacy::LegacyRpcMethods, PolkadotConfig as SubxtConfig, + backend::legacy::LegacyRpcMethods, }; #[tokio::test] diff --git a/crates/e2e/src/sandbox_client.rs b/crates/e2e/src/sandbox_client.rs index 36ae3586fa5..715f5239602 100644 --- a/crates/e2e/src/sandbox_client.rs +++ b/crates/e2e/src/sandbox_client.rs @@ -21,31 +21,34 @@ use frame_support::{ dispatch::RawOrigin, pallet_prelude::DispatchError, traits::{ - fungible::Inspect, IsType, + fungible::Inspect, }, }; use ink_env::{ - call::utils::DecodeMessageResult, Environment, + call::utils::DecodeMessageResult, }; use ink_primitives::{ - abi::AbiEncodeWith, DepositLimit, + abi::AbiEncodeWith, }; use ink_sandbox::{ + AccountIdFor, + RuntimeCall, + Sandbox, + Weight, api::prelude::*, frame_system, frame_system::pallet_prelude::OriginFor, pallet_balances, pallet_revive, - AccountIdFor, - RuntimeCall, - Sandbox, - Weight, }; use jsonrpsee::core::async_trait; use pallet_revive::{ + CodeUploadReturnValue, + InstantiateReturnValue, + MomentOf, evm::{ CallTrace, CallTracerConfig, @@ -53,14 +56,11 @@ use pallet_revive::{ TracerType, U256, }, - CodeUploadReturnValue, - InstantiateReturnValue, - MomentOf, }; use scale::Decode; use sp_core::{ - sr25519::Pair, Pair as _, + sr25519::Pair, }; use sp_runtime::traits::Bounded; use subxt::{ @@ -70,14 +70,22 @@ use subxt::{ use subxt_signer::sr25519::Keypair; use crate::{ + CallBuilderFinal, + CallDryRunResult, + ChainBackend, + ContractsBackend, + E2EBackend, + H256, + InstantiateDryRunResult, + UploadResult, backend::BuilderClient, builders::{ - constructor_exec_input, CreateBuilderPartial, + constructor_exec_input, }, client_utils::{ - salt, ContractsRegistry, + salt, }, contract_results::{ BareInstantiationResult, @@ -86,14 +94,6 @@ use crate::{ }, error::SandboxErr, log_error, - CallBuilderFinal, - CallDryRunResult, - ChainBackend, - ContractsBackend, - E2EBackend, - InstantiateDryRunResult, - UploadResult, - H256, }; type BalanceOf = ::Balance; @@ -237,21 +237,18 @@ where #[async_trait] impl< - AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, - S: Sandbox, - E: Environment> - + 'static, - > BuilderClient for Client + AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, + S: Sandbox, + E: Environment> + + 'static, +> BuilderClient for Client where S::Runtime: pallet_balances::Config + pallet_revive::Config, AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, ContractsBalanceOf: Send + Sync, - ContractsBalanceOf: Into + TryFrom + Bounded, MomentOf: Into, - <::Runtime as frame_system::Config>::Nonce: Into, - // todo <::Runtime as frame_system::Config>::Hash: frame_support::traits::IsType, @@ -489,9 +486,10 @@ where let res = result.result.clone().unwrap_err(); if let DispatchError::Module(m) = res && let Some(s) = m.message - && s.contains("AccountUnmapped") { - panic!("something is wrong, we mapped the account before") - } + && s.contains("AccountUnmapped") + { + panic!("something is wrong, we mapped the account before") + } } // todo error when `AccountUnmapped` Ok(CallDryRunResult { @@ -530,22 +528,18 @@ where } impl< - AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, - Config: Sandbox, - E: Environment< - AccountId = AccountId, - Balance = ContractsBalanceOf, - > + 'static, - > E2EBackend for Client + AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, + Config: Sandbox, + E: Environment> + + 'static, +> E2EBackend for Client where Config::Runtime: pallet_balances::Config + pallet_revive::Config, AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, ContractsBalanceOf: Send + Sync, ContractsBalanceOf: Into + TryFrom + Bounded, MomentOf: Into, - ::Nonce: Into, - // todo ::Hash: IsType, { @@ -568,11 +562,11 @@ where #[async_trait] impl< - AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, - S: Sandbox, - E: Environment> - + 'static, - > ContractsBackend for Client + AccountId: Clone + Send + Sync + From<[u8; 32]> + AsRef<[u8; 32]>, + S: Sandbox, + E: Environment> + + 'static, +> ContractsBackend for Client where S::Runtime: pallet_balances::Config + pallet_revive::Config, AccountIdFor: From<[u8; 32]> + AsRef<[u8; 32]>, diff --git a/crates/e2e/src/subxt_client.rs b/crates/e2e/src/subxt_client.rs index 92e81b73f65..b513aaedb9f 100644 --- a/crates/e2e/src/subxt_client.rs +++ b/crates/e2e/src/subxt_client.rs @@ -18,21 +18,21 @@ use std::path::PathBuf; use ink::H160; use ink_env::{ + Environment, call::{ + Call, + ExecutionInput, utils::{ DecodeMessageResult, ReturnType, Set, }, - Call, - ExecutionInput, }, - Environment, }; use ink_primitives::{ + DepositLimit, abi::AbiEncodeWith, types::AccountIdMapper, - DepositLimit, }; use jsonrpsee::core::async_trait; use pallet_revive::evm::CallTrace; @@ -59,9 +59,13 @@ use subxt::{ }; use super::{ + H256, + InstantiateDryRunResult, + Keypair, + ReviveApi, builders::{ - constructor_exec_input, CreateBuilderPartial, + constructor_exec_input, }, deposit_limit_to_balance, events::{ @@ -71,19 +75,17 @@ use super::{ log_error, log_info, sr25519, - InstantiateDryRunResult, - Keypair, - ReviveApi, - H256, }; use crate::{ + ContractsBackend, + E2EBackend, backend::{ BuilderClient, ChainBackend, }, client_utils::{ - salt, ContractsRegistry, + salt, }, contract_results::{ BareInstantiationResult, @@ -94,8 +96,6 @@ use crate::{ }, error::DryRunError, events, - ContractsBackend, - E2EBackend, }; pub type Error = crate::error::Error; @@ -382,7 +382,6 @@ where C::Address: Send + Sync, >::Params: From< as ExtrinsicParams>::Params>, - E: Environment, E::AccountId: Debug + Send + Sync, E::Balance: Clone @@ -521,7 +520,6 @@ where C::Address: Send + Sync, >::Params: From< as ExtrinsicParams>::Params>, - E: Environment, E::AccountId: Debug + Send + Sync, E::EventRecord: Debug, @@ -803,7 +801,6 @@ where C::Address: From, C::Signature: From, C::Address: Send + Sync, - E: Environment, E::AccountId: Debug + Send + Sync, E::Balance: @@ -830,7 +827,6 @@ where C::Address: Send + Sync, >::Params: From< as ExtrinsicParams>::Params>, - E: Environment, E::AccountId: Debug + Send + Sync, E::EventRecord: Debug, diff --git a/crates/e2e/src/xts.rs b/crates/e2e/src/xts.rs index dcae0692684..74279ec219a 100644 --- a/crates/e2e/src/xts.rs +++ b/crates/e2e/src/xts.rs @@ -13,9 +13,9 @@ // limitations under the License. use super::{ + Keypair, log_info, sr25519, - Keypair, }; use ink_env::Environment; @@ -30,17 +30,18 @@ use ink_primitives::{ DepositLimit, }; use pallet_revive::{ + CodeUploadResult, evm::{ CallTrace, CallTracerConfig, Trace, TracerType, }, - CodeUploadResult, }; use sp_core::H256; use sp_runtime::OpaqueExtrinsic; use subxt::{ + OnlineClient, backend::{ legacy::LegacyRpcMethods, rpc::RpcClient, @@ -62,7 +63,6 @@ use subxt::{ SubmittableTransaction, TxStatus, }, - OnlineClient, }; /// Copied from `sp_weight` to additionally implement `scale_encode::EncodeAsType`. @@ -238,7 +238,6 @@ where C::Signature: From, >::Params: From< as ExtrinsicParams>::Params>, - E: Environment, E::Balance: scale::HasCompact + serde::Serialize, { @@ -442,7 +441,6 @@ where // todo let tx_index: usize = match (extrinsic_hash, extrinsic) { (Some(hash), None) => { - block_details .block .extrinsics diff --git a/crates/engine/src/ext.rs b/crates/engine/src/ext.rs index 9f0c9712d6c..c4c95bd5d88 100644 --- a/crates/engine/src/ext.rs +++ b/crates/engine/src/ext.rs @@ -350,12 +350,12 @@ impl Engine { output: &mut [u8; 33], ) -> Result<(), Error> { use secp256k1::{ + Message, + SECP256K1, ecdsa::{ RecoverableSignature, RecoveryId, }, - Message, - SECP256K1, }; // In most implementations, the v is just 0 or 1 internally, but 27 was added diff --git a/crates/engine/src/hashing.rs b/crates/engine/src/hashing.rs index c05fd37e38e..387b633a7ad 100644 --- a/crates/engine/src/hashing.rs +++ b/crates/engine/src/hashing.rs @@ -17,8 +17,8 @@ /// Conduct the BLAKE2 256-bit hash and place the result into `output`. pub fn blake2b_256(input: &[u8], output: &mut [u8; 32]) { use ::blake2::digest::{ - consts::U32, Digest as _, + consts::U32, }; type Blake2b256 = ::blake2::Blake2b; @@ -32,8 +32,8 @@ pub fn blake2b_256(input: &[u8], output: &mut [u8; 32]) { /// Conduct the BLAKE2 128-bit hash and place the result into `output`. pub fn blake2b_128(input: &[u8], output: &mut [u8; 16]) { use ::blake2::digest::{ - consts::U16, Digest as _, + consts::U16, }; type Blake2b128 = ::blake2::Blake2b; @@ -47,8 +47,8 @@ pub fn blake2b_128(input: &[u8], output: &mut [u8; 16]) { /// Conduct the KECCAK 256-bit hash and place the result into `output`. pub fn keccak_256(input: &[u8], output: &mut [u8; 32]) { use sha3::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha3::Keccak256::new(); hasher.update(input); @@ -58,8 +58,8 @@ pub fn keccak_256(input: &[u8], output: &mut [u8; 32]) { /// Conduct the SHA-2 256-bit hash and place the result into `output`. pub fn sha2_256(input: &[u8], output: &mut [u8; 32]) { use sha2::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha2::Sha256::new(); hasher.update(input); diff --git a/crates/engine/src/test_api.rs b/crates/engine/src/test_api.rs index b658bd1e33b..88b89f034c9 100644 --- a/crates/engine/src/test_api.rs +++ b/crates/engine/src/test_api.rs @@ -13,14 +13,14 @@ // limitations under the License. use crate::{ + AccountError, + Error, ext::Engine, types::{ Balance, BlockNumber, BlockTimestamp, }, - AccountError, - Error, }; use ink_primitives::{ AccountId, diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index 9f86d8131b1..383c71c0663 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -21,11 +21,11 @@ use ink_primitives::{ U256, }; use secp256k1::{ - ecdsa::RecoverableSignature, Message, PublicKey, - SecretKey, SECP256K1, + SecretKey, + ecdsa::RecoverableSignature, }; /// The public methods of the `contracts` pallet write their result into an diff --git a/crates/env/src/api.rs b/crates/env/src/api.rs index 553aa2b5156..bccf47458e6 100644 --- a/crates/env/src/api.rs +++ b/crates/env/src/api.rs @@ -15,22 +15,24 @@ //! The public raw interface towards the host engine. use ink_primitives::{ - abi::AbiEncodeWith, Address, - SolEncode, H256, + SolEncode, U256, + abi::AbiEncodeWith, }; use ink_storage_traits::Storable; use pallet_revive_uapi::ReturnFlags; use crate::{ + DecodeDispatch, + DispatchError, + Result, backend::{ EnvBackend, TypedEnvBackend, }, call::{ - utils::DecodeMessageResult, Call, CallParams, ConstructorReturnType, @@ -38,6 +40,7 @@ use crate::{ DelegateCall, FromAddr, LimitParamsV2, + utils::DecodeMessageResult, }, engine::{ EnvInstance, @@ -55,9 +58,6 @@ use crate::{ Environment, Gas, }, - DecodeDispatch, - DispatchError, - Result, }; /// Returns the address of the caller of the executed contract. diff --git a/crates/env/src/backend.rs b/crates/env/src/backend.rs index b6af9139f43..52c71070ba0 100644 --- a/crates/env/src/backend.rs +++ b/crates/env/src/backend.rs @@ -13,19 +13,21 @@ // limitations under the License. use ink_primitives::{ - abi::AbiEncodeWith, - types::Environment, Address, - SolEncode, H256, + SolEncode, U256, + abi::AbiEncodeWith, + types::Environment, }; use ink_storage_traits::Storable; pub use pallet_revive_uapi::ReturnFlags; use crate::{ + DecodeDispatch, + DispatchError, + Result, call::{ - utils::DecodeMessageResult, Call, CallParams, ConstructorReturnType, @@ -33,6 +35,7 @@ use crate::{ DelegateCall, FromAddr, LimitParamsV2, + utils::DecodeMessageResult, }, event::{ Event, @@ -42,9 +45,6 @@ use crate::{ CryptoHash, HashOutput, }, - DecodeDispatch, - DispatchError, - Result, }; /// Environmental contract functionality that does not require `Environment`. diff --git a/crates/env/src/call/call_builder/call.rs b/crates/env/src/call/call_builder/call.rs index 5de767c0e86..7f5b625ed2b 100644 --- a/crates/env/src/call/call_builder/call.rs +++ b/crates/env/src/call/call_builder/call.rs @@ -13,14 +13,18 @@ // limitations under the License. use ink_primitives::{ - abi::AbiEncodeWith, Address, U256, + abi::AbiEncodeWith, }; use pallet_revive_uapi::CallFlags; use crate::{ + Error, call::{ + CallBuilder, + CallParams, + ExecutionInput, common::{ ReturnType, Set, @@ -28,15 +32,11 @@ use crate::{ }, execution::EmptyArgumentList, utils::DecodeMessageResult, - CallBuilder, - CallParams, - ExecutionInput, }, types::{ Environment, Gas, }, - Error, }; /// The default call type for cross-contract calls, for calling into the latest `call` diff --git a/crates/env/src/call/call_builder/delegate.rs b/crates/env/src/call/call_builder/delegate.rs index 5fa8fdb1004..a86a7349fdf 100644 --- a/crates/env/src/call/call_builder/delegate.rs +++ b/crates/env/src/call/call_builder/delegate.rs @@ -13,13 +13,17 @@ // limitations under the License. use ink_primitives::{ - abi::AbiEncodeWith, Address, + abi::AbiEncodeWith, }; use pallet_revive_uapi::CallFlags; use crate::{ + Error, call::{ + CallBuilder, + CallParams, + ExecutionInput, common::{ ReturnType, Set, @@ -27,12 +31,8 @@ use crate::{ }, execution::EmptyArgumentList, utils::DecodeMessageResult, - CallBuilder, - CallParams, - ExecutionInput, }, types::Environment, - Error, }; /// The `delegatecall` call type. Performs a call with the given code hash. diff --git a/crates/env/src/call/call_builder/mod.rs b/crates/env/src/call/call_builder/mod.rs index 69cb53b1530..674def28f89 100644 --- a/crates/env/src/call/call_builder/mod.rs +++ b/crates/env/src/call/call_builder/mod.rs @@ -21,23 +21,23 @@ pub use delegate::DelegateCall; use core::marker::PhantomData; use ink_primitives::{ + Address, abi::{ Ink, Sol, }, - Address, }; use crate::{ call::{ + Execution, + ExecutionInput, utils::{ EmptyArgumentList, ReturnType, Set, Unset, }, - Execution, - ExecutionInput, }, types::Environment, }; diff --git a/crates/env/src/call/common.rs b/crates/env/src/call/common.rs index 86e0a0ef5ec..c2c25e38cad 100644 --- a/crates/env/src/call/common.rs +++ b/crates/env/src/call/common.rs @@ -17,6 +17,8 @@ use core::marker::PhantomData; use ink_primitives::{ + LangError, + MessageResult, abi::{ Ink, Sol, @@ -26,8 +28,6 @@ use ink_primitives::{ SolResultDecode, SolResultDecodeError, }, - LangError, - MessageResult, }; use pallet_revive_uapi::ReturnErrorCode; use scale::{ diff --git a/crates/env/src/call/create_builder.rs b/crates/env/src/call/create_builder.rs index f4e365536df..c9d3c582634 100644 --- a/crates/env/src/call/create_builder.rs +++ b/crates/env/src/call/create_builder.rs @@ -15,18 +15,22 @@ use core::marker::PhantomData; use ink_primitives::{ + Address, + H256, + U256, abi::{ AbiEncodeWith, Ink, Sol, }, - Address, - H256, - U256, }; use crate::{ + ContractEnv, + Error, call::{ + ExecutionInput, + Selector, utils::{ DecodeConstructorError, EmptyArgumentList, @@ -34,12 +38,8 @@ use crate::{ Set, Unset, }, - ExecutionInput, - Selector, }, types::Environment, - ContractEnv, - Error, }; pub mod state { diff --git a/crates/env/src/call/execution.rs b/crates/env/src/call/execution.rs index ec2052e5fce..f97305c25f4 100644 --- a/crates/env/src/call/execution.rs +++ b/crates/env/src/call/execution.rs @@ -15,12 +15,12 @@ use core::marker::PhantomData; use ink_prelude::vec::Vec; use ink_primitives::{ + SolEncode, abi::{ AbiEncodeWith, Ink, Sol, }, - SolEncode, }; use super::{ @@ -414,7 +414,7 @@ trait SolEncodeArgsList { /// /// Ref: fn encode_args(&self, head: &mut Vec, tail: &mut Vec) - -> usize; + -> usize; } /// Head info for Solidity ABI encoding `ArgumentList`. diff --git a/crates/env/src/call/mod.rs b/crates/env/src/call/mod.rs index 78e8fef4923..7437f663f0e 100644 --- a/crates/env/src/call/mod.rs +++ b/crates/env/src/call/mod.rs @@ -44,24 +44,24 @@ pub mod utils { pub use self::{ call_builder::{ - build_call, - build_call_ink, - build_call_sol, Call, CallBuilder, CallParams, DelegateCall, + build_call, + build_call_ink, + build_call_sol, }, create_builder::{ - build_create, - build_create_ink, - build_create_sol, - state, ConstructorReturnType, CreateBuilder, CreateParams, FromAddr, LimitParamsV2, + build_create, + build_create_ink, + build_create_sol, + state, }, execution::{ Execution, diff --git a/crates/env/src/engine/mod.rs b/crates/env/src/engine/mod.rs index 6041db75eda..cb46d79a315 100644 --- a/crates/env/src/engine/mod.rs +++ b/crates/env/src/engine/mod.rs @@ -17,20 +17,20 @@ use ink_primitives::ConstructorResult; use pallet_revive_uapi::ReturnErrorCode; use crate::{ + Error, + Result as EnvResult, backend::{ EnvBackend, TypedEnvBackend, }, call::{ + ConstructorReturnType, + FromAddr, utils::{ ConstructorError, DecodeConstructorError, }, - ConstructorReturnType, - FromAddr, }, - Error, - Result as EnvResult, }; /// Convert a slice into an array reference. diff --git a/crates/env/src/engine/off_chain/impls.rs b/crates/env/src/engine/off_chain/impls.rs index 7211506eb25..55c63e81d8d 100644 --- a/crates/env/src/engine/off_chain/impls.rs +++ b/crates/env/src/engine/off_chain/impls.rs @@ -14,6 +14,10 @@ use ink_engine::ext::Engine; use ink_primitives::{ + Address, + H256, + SolEncode, + U256, abi::{ AbiEncodeWith, Ink, @@ -23,14 +27,10 @@ use ink_primitives::{ AccountIdMapper, Environment, }, - Address, - SolEncode, - H256, - U256, }; use ink_storage_traits::{ - decode_all, Storable, + decode_all, }; use pallet_revive_uapi::{ ReturnErrorCode, @@ -44,8 +44,12 @@ use schnorrkel::{ use super::EnvInstance; use crate::{ + DecodeDispatch, + DispatchError, + EnvBackend, + Result, + TypedEnvBackend, call::{ - utils::DecodeMessageResult, Call, CallParams, ConstructorReturnType, @@ -53,6 +57,7 @@ use crate::{ DelegateCall, FromAddr, LimitParamsV2, + utils::DecodeMessageResult, }, event::{ Event, @@ -68,11 +73,6 @@ use crate::{ Sha2x256, }, test::callee, - DecodeDispatch, - DispatchError, - EnvBackend, - Result, - TypedEnvBackend, }; /// The capacity of the static buffer. @@ -458,12 +458,12 @@ impl EnvBackend for EnvInstance { output: &mut [u8; 33], ) -> Result<()> { use secp256k1::{ + Message, + SECP256K1, ecdsa::{ RecoverableSignature, RecoveryId, }, - Message, - SECP256K1, }; // In most implementations, the v is just 0 or 1 internally, but 27 was added diff --git a/crates/env/src/engine/off_chain/test_api.rs b/crates/env/src/engine/off_chain/test_api.rs index b05ef330c92..461ab26d99f 100644 --- a/crates/env/src/engine/off_chain/test_api.rs +++ b/crates/env/src/engine/off_chain/test_api.rs @@ -19,8 +19,8 @@ use super::{ OnInstance, }; use crate::{ - types::Environment, Result, + types::Environment, }; use core::fmt::Debug; use std::panic::UnwindSafe; @@ -296,7 +296,8 @@ pub fn recorded_events() -> Vec { instance .engine .get_emitted_events() - .map(|evt: ink_engine::test_api::EmittedEvent| evt.into()).collect() + .map(|evt: ink_engine::test_api::EmittedEvent| evt.into()) + .collect() }) } diff --git a/crates/env/src/engine/off_chain/tests.rs b/crates/env/src/engine/off_chain/tests.rs index 1bef666bb6a..6cc9626acb5 100644 --- a/crates/env/src/engine/off_chain/tests.rs +++ b/crates/env/src/engine/off_chain/tests.rs @@ -13,13 +13,13 @@ // limitations under the License. use crate::{ + DefaultEnvironment, + Result, engine::off_chain::{ impls::TopicsBuilder, test_api::set_account_balance, }, event::TopicsBuilderBackend, - DefaultEnvironment, - Result, }; use ink::{ Address, diff --git a/crates/env/src/engine/off_chain/types.rs b/crates/env/src/engine/off_chain/types.rs index 60c40e27f53..9ab3db7eb0a 100644 --- a/crates/env/src/engine/off_chain/types.rs +++ b/crates/env/src/engine/off_chain/types.rs @@ -16,10 +16,10 @@ //! of this crate. use super::{ - test_api::EmittedEvent, AccountError, Error, OffChainError, + test_api::EmittedEvent, }; impl From for EmittedEvent { diff --git a/crates/env/src/engine/on_chain/pallet_revive.rs b/crates/env/src/engine/on_chain/pallet_revive.rs index 7747d12fc75..ac764d11a7a 100644 --- a/crates/env/src/engine/on_chain/pallet_revive.rs +++ b/crates/env/src/engine/on_chain/pallet_revive.rs @@ -13,19 +13,19 @@ // limitations under the License. use ink_primitives::{ + Address, + H256, + SolEncode, + U256, abi::{ AbiEncodeWith, Ink, Sol, }, - Address, - SolEncode, - H256, - U256, }; use ink_storage_traits::{ - decode_all, Storable, + decode_all, }; use pallet_revive_uapi::{ CallFlags, @@ -39,8 +39,13 @@ use pallet_revive_uapi::{ use xcm::VersionedXcm; use crate::{ + DecodeDispatch, + DispatchError, + EnvBackend, + Environment, + Result, + TypedEnvBackend, call::{ - utils::DecodeMessageResult, Call, CallParams, ConstructorReturnType, @@ -48,6 +53,7 @@ use crate::{ DelegateCall, FromAddr, LimitParamsV2, + utils::DecodeMessageResult, }, engine::on_chain::{ EncodeScope, @@ -68,12 +74,6 @@ use crate::{ Sha2x256, }, types::FromLittleEndian, - DecodeDispatch, - DispatchError, - EnvBackend, - Environment, - Result, - TypedEnvBackend, }; impl CryptoHash for Blake2x128 { @@ -528,9 +528,11 @@ fn call_storage_precompile( // todo @cmichi check if we might better return `None` in this situation. perhaps a // zero sized key is legal? - debug_assert!(encoded_bytes_len >= SOL_BYTES_ENCODING_OVERHEAD + 32, + debug_assert!( + encoded_bytes_len >= SOL_BYTES_ENCODING_OVERHEAD + 32, "the `bytes` encoding length was < 96, meaning we didn't encode a 32 byte `key`. \ - calling this function without `key` does not make sense and is unexpected."); + calling this function without `key` does not make sense and is unexpected." + ); // `output` needs to hold at least 32 bytes, for the len field of `bytes`. // if no `bytes` are returned from the delegate call we will at the minimum @@ -1155,7 +1157,9 @@ impl TypedEnvBackend for EnvInstance { #[cfg(feature = "unstable-hostfn")] fn is_contract(&mut self, _addr: &Address) -> bool { - panic!("todo call code() precompile, see https://github.com/paritytech/polkadot-sdk/pull/9001"); + panic!( + "todo call code() precompile, see https://github.com/paritytech/polkadot-sdk/pull/9001" + ); } fn caller_is_origin(&mut self) -> bool @@ -1220,7 +1224,9 @@ impl TypedEnvBackend for EnvInstance { E: Environment, Call: scale::Encode, { - panic!("todo Native ink! XCM functions are not supported yet, you have to call the pre-compile contracts for XCM directly until then."); + panic!( + "todo Native ink! XCM functions are not supported yet, you have to call the pre-compile contracts for XCM directly until then." + ); /* let mut scope = self.scoped_buffer(); @@ -1242,7 +1248,9 @@ impl TypedEnvBackend for EnvInstance { E: Environment, Call: scale::Encode, { - panic!("todo Native ink! XCM functions are not supported yet, you have to call the pre-compile contracts for XCM directly until then."); + panic!( + "todo Native ink! XCM functions are not supported yet, you have to call the pre-compile contracts for XCM directly until then." + ); /* let mut scope = self.scoped_buffer(); let output = scope.take(32); diff --git a/crates/env/src/tests.rs b/crates/env/src/tests.rs index b73460d146a..07ba15b86c8 100644 --- a/crates/env/src/tests.rs +++ b/crates/env/src/tests.rs @@ -59,6 +59,8 @@ fn test_hash_blake2_128() { crate::hash_bytes::(TEST_INPUT, &mut output); assert_eq!( output, - [180, 158, 48, 21, 171, 163, 217, 175, 145, 160, 25, 159, 213, 142, 103, 242] + [ + 180, 158, 48, 21, 171, 163, 217, 175, 145, 160, 25, 159, 213, 142, 103, 242 + ] ); } diff --git a/crates/ink/codegen/src/generator/as_dependency/call_builder.rs b/crates/ink/codegen/src/generator/as_dependency/call_builder.rs index c9dc2dbb74e..d8974cf5ac7 100644 --- a/crates/ink/codegen/src/generator/as_dependency/call_builder.rs +++ b/crates/ink/codegen/src/generator/as_dependency/call_builder.rs @@ -24,9 +24,9 @@ use quote::{ use syn::spanned::Spanned as _; use crate::{ + GenerateCode, generator, generator::sol, - GenerateCode, }; /// Generates code for the call builder of the ink! smart contract. diff --git a/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs b/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs index d4451d8e013..fcf29ec5f8e 100644 --- a/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs +++ b/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs @@ -28,8 +28,8 @@ use quote::{ use syn::spanned::Spanned as _; use crate::{ - generator, GenerateCode, + generator, }; /// Generates code for the contract reference of the ink! smart contract. diff --git a/crates/ink/codegen/src/generator/as_dependency/mod.rs b/crates/ink/codegen/src/generator/as_dependency/mod.rs index 5a1965957e0..2ee6584e885 100644 --- a/crates/ink/codegen/src/generator/as_dependency/mod.rs +++ b/crates/ink/codegen/src/generator/as_dependency/mod.rs @@ -20,8 +20,8 @@ use self::{ contract_ref::ContractRef, }; use crate::{ - traits::GenerateCodeUsing, GenerateCode, + traits::GenerateCodeUsing, }; use derive_more::From; use proc_macro2::TokenStream as TokenStream2; diff --git a/crates/ink/codegen/src/generator/contract.rs b/crates/ink/codegen/src/generator/contract.rs index 75a9d77e2c4..c0849e6821d 100644 --- a/crates/ink/codegen/src/generator/contract.rs +++ b/crates/ink/codegen/src/generator/contract.rs @@ -13,9 +13,9 @@ // limitations under the License. use crate::{ - generator, GenerateCode, GenerateCodeUsing, + generator, }; use derive_more::From; use proc_macro2::TokenStream as TokenStream2; diff --git a/crates/ink/codegen/src/generator/dispatch.rs b/crates/ink/codegen/src/generator/dispatch.rs index 336420113b0..ae45a2d430c 100644 --- a/crates/ink/codegen/src/generator/dispatch.rs +++ b/crates/ink/codegen/src/generator/dispatch.rs @@ -36,9 +36,9 @@ use quote::{ use syn::spanned::Spanned as _; use crate::{ + GenerateCode, generator, generator::sol, - GenerateCode, }; /// A message to be dispatched. diff --git a/crates/ink/codegen/src/generator/event.rs b/crates/ink/codegen/src/generator/event.rs index efce25b6823..2d5d5564a0c 100644 --- a/crates/ink/codegen/src/generator/event.rs +++ b/crates/ink/codegen/src/generator/event.rs @@ -17,13 +17,13 @@ use derive_more::From; use ir::IsDocAttribute; use proc_macro2::TokenStream as TokenStream2; use quote::quote; -use syn::spanned::Spanned; #[cfg(all(feature = "std", any(ink_abi = "sol", ink_abi = "all")))] use syn::Fields; +use syn::spanned::Spanned; +use crate::GenerateCode; #[cfg(all(feature = "std", any(ink_abi = "sol", ink_abi = "all")))] use crate::generator::sol; -use crate::GenerateCode; /// Generates code for the event item. #[derive(From, Copy, Clone)] diff --git a/crates/ink/codegen/src/generator/item_impls.rs b/crates/ink/codegen/src/generator/item_impls.rs index 2ea2cd4c89d..cc8d7f7310a 100644 --- a/crates/ink/codegen/src/generator/item_impls.rs +++ b/crates/ink/codegen/src/generator/item_impls.rs @@ -22,10 +22,10 @@ use ir::Callable as _; use ir::HexLiteral; use proc_macro2::TokenStream as TokenStream2; use quote::{ + ToTokens, format_ident, quote, quote_spanned, - ToTokens, }; use syn::spanned::Spanned as _; diff --git a/crates/ink/codegen/src/generator/metadata.rs b/crates/ink/codegen/src/generator/metadata.rs index fb03056d85d..5a953d79d13 100644 --- a/crates/ink/codegen/src/generator/metadata.rs +++ b/crates/ink/codegen/src/generator/metadata.rs @@ -436,12 +436,14 @@ mod tests { * many lines */ )]), - vec![r" + vec![ + r" * Multi-line comments * may span many, * many lines " - .to_string()], + .to_string() + ], ); assert_eq!( extract_doc_attributes(&[ diff --git a/crates/ink/codegen/src/generator/mod.rs b/crates/ink/codegen/src/generator/mod.rs index 1ec251b113b..3bbb11619ef 100644 --- a/crates/ink/codegen/src/generator/mod.rs +++ b/crates/ink/codegen/src/generator/mod.rs @@ -67,8 +67,8 @@ pub use self::{ ink_test::InkTest, item_impls::ItemImpls, metadata::{ - generate_type_spec, Metadata, + generate_type_spec, }, selector::{ SelectorBytes, diff --git a/crates/ink/codegen/src/generator/sol/utils.rs b/crates/ink/codegen/src/generator/sol/utils.rs index d6639d56c5d..64ddc0a33de 100644 --- a/crates/ink/codegen/src/generator/sol/utils.rs +++ b/crates/ink/codegen/src/generator/sol/utils.rs @@ -24,9 +24,9 @@ use quote::{ quote_spanned, }; use syn::{ - spanned::Spanned, Attribute, Type, + spanned::Spanned, }; /// Returns the equivalent Solidity ABI type for the given Rust/ink! type. diff --git a/crates/ink/codegen/src/generator/storage_item.rs b/crates/ink/codegen/src/generator/storage_item.rs index 97f70d393b2..701556a3c1f 100644 --- a/crates/ink/codegen/src/generator/storage_item.rs +++ b/crates/ink/codegen/src/generator/storage_item.rs @@ -20,13 +20,12 @@ use proc_macro2::{ TokenStream, }; use quote::{ + ToTokens, format_ident, quote, quote_spanned, - ToTokens, }; use syn::{ - spanned::Spanned, Data, DataEnum, DataStruct, @@ -34,6 +33,7 @@ use syn::{ Field, Fields, Type, + spanned::Spanned, }; /// Generates code for the storage item. diff --git a/crates/ink/codegen/src/generator/trait_def/trait_registry.rs b/crates/ink/codegen/src/generator/trait_def/trait_registry.rs index 76196b7b65a..2cb384453e3 100644 --- a/crates/ink/codegen/src/generator/trait_def/trait_registry.rs +++ b/crates/ink/codegen/src/generator/trait_def/trait_registry.rs @@ -37,10 +37,10 @@ use syn::{ use super::TraitDefinition; use crate::{ + EnforcedErrors, generator, generator::sol, traits::GenerateCode, - EnforcedErrors, }; impl TraitDefinition<'_> { @@ -124,10 +124,8 @@ impl TraitRegistry<'_> { fn generate_registry_messages(&self) -> TokenStream2 { let messages = self.trait_def.trait_def.item().iter_items().filter_map( |(item, selector)| { - - item.filter_map_message().map(|message| { - self.generate_registry_for_message(&message, selector) - }) + item.filter_map_message() + .map(|message| self.generate_registry_for_message(&message, selector)) }, ); quote! { diff --git a/crates/ink/ir/src/ast/attr_args.rs b/crates/ink/ir/src/ast/attr_args.rs index c1be7c25ba9..4705201883f 100644 --- a/crates/ink/ir/src/ast/attr_args.rs +++ b/crates/ink/ir/src/ast/attr_args.rs @@ -14,12 +14,12 @@ use super::Meta; use syn::{ + Token, parse::{ Parse, ParseStream, }, punctuated::Punctuated, - Token, }; /// The attribute arguments for the configuration of an ink! smart contract. diff --git a/crates/ink/ir/src/ast/meta.rs b/crates/ink/ir/src/ast/meta.rs index 5a80179853e..78a609e7b0d 100644 --- a/crates/ink/ir/src/ast/meta.rs +++ b/crates/ink/ir/src/ast/meta.rs @@ -18,6 +18,10 @@ use proc_macro2::{ }; use quote::ToTokens; use syn::{ + LitBool, + LitInt, + LitStr, + Token, ext::IdentExt as _, parse::{ Parse, @@ -25,10 +29,6 @@ use syn::{ }, punctuated::Punctuated, spanned::Spanned, - LitBool, - LitInt, - LitStr, - Token, }; /// Content of a compile-time structured attribute. diff --git a/crates/ink/ir/src/ir/attrs.rs b/crates/ink/ir/src/ir/attrs.rs index 1de43356730..b5258a78df6 100644 --- a/crates/ink/ir/src/ir/attrs.rs +++ b/crates/ink/ir/src/ir/attrs.rs @@ -22,13 +22,13 @@ use proc_macro2::{ }; use quote::ToTokens; use syn::{ + Token, parse::{ Parse, ParseStream, }, punctuated::Punctuated, spanned::Spanned, - Token, }; use crate::{ @@ -36,8 +36,8 @@ use crate::{ error::ExtError as _, ir, ir::{ - event::SignatureTopic, Selector, + event::SignatureTopic, }, utils::extract_name_override, }; @@ -63,9 +63,10 @@ impl IsDocAttribute for syn::Attribute { match &self.meta { syn::Meta::NameValue(nv) => { if let syn::Expr::Lit(l) = &nv.value - && let syn::Lit::Str(s) = &l.lit { - return Some(s.value()); - } + && let syn::Lit::Str(s) = &l.lit + { + return Some(s.value()); + } } _ => return None, } @@ -583,7 +584,9 @@ impl TryFrom<&ast::MetaValue> for SelectorOrWildcard { ast::MetaValue::Symbol(symbol) => { match symbol { ast::Symbol::Underscore(_) => Ok(SelectorOrWildcard::Wildcard), - ast::Symbol::AtSign(_) => Ok(SelectorOrWildcard::wildcard_complement()), + ast::Symbol::AtSign(_) => { + Ok(SelectorOrWildcard::wildcard_complement()) + } } } ast::MetaValue::Path(path) => { @@ -979,33 +982,45 @@ impl Parse for AttributeFrag { "payable" => Ok(AttributeArg::Payable), "default" => Ok(AttributeArg::Default), "impl" => Ok(AttributeArg::Implementation), - _ => match ident.to_string().as_str() { - "function" => Err(format_err_spanned!( - path, - "encountered #[ink(function)] that is missing its `id` parameter. \ + _ => { + match ident.to_string().as_str() { + "function" => { + Err(format_err_spanned!( + path, + "encountered #[ink(function)] that is missing its `id` parameter. \ Did you mean #[ink(function = id: u16)] ?" - )), - "namespace" => Err(format_err_spanned!( - path, - "encountered #[ink(namespace)] that is missing its string parameter. \ + )) + } + "namespace" => { + Err(format_err_spanned!( + path, + "encountered #[ink(namespace)] that is missing its string parameter. \ Did you mean #[ink(namespace = name: str)] ?" - )), - "selector" => Err(format_err_spanned!( - path, - "encountered #[ink(selector)] that is missing its u32 parameter. \ + )) + } + "selector" => { + Err(format_err_spanned!( + path, + "encountered #[ink(selector)] that is missing its u32 parameter. \ Did you mean #[ink(selector = value: u32)] ?" - )), - "name" => Err(format_err_spanned!( - path, - "expected a string literal value for `name` \ + )) + } + "name" => { + Err(format_err_spanned!( + path, + "expected a string literal value for `name` \ attribute argument" - )), - _ => Err(format_err_spanned!( - path, - "encountered unknown ink! attribute argument: {}", - ident - )), - }, + )) + } + _ => { + Err(format_err_spanned!( + path, + "encountered unknown ink! attribute argument: {}", + ident + )) + } + } + } } } }?; @@ -1220,10 +1235,8 @@ mod tests { syn::parse_quote! { #[ink(selector = 0xFFFF_FFFF_FFFF_FFFF)] }, - Err( - "selector value out of range. \ - selector must be a valid `u32` integer: number too large to fit in target type" - ), + Err("selector value out of range. \ + selector must be a valid `u32` integer: number too large to fit in target type"), ); } @@ -1233,7 +1246,9 @@ mod tests { syn::parse_quote! { #[ink(selector = true)] }, - Err("expected 4-digit hexcode for `selector` argument, e.g. #[ink(selector = 0xC0FEBABE]"), + Err( + "expected 4-digit hexcode for `selector` argument, e.g. #[ink(selector = 0xC0FEBABE]", + ), ); } @@ -1275,7 +1290,9 @@ mod tests { syn::parse_quote! { #[ink(namespace = 42)] }, - Err("expected string type for `namespace` argument, e.g. #[ink(namespace = \"hello\")]"), + Err( + "expected string type for `namespace` argument, e.g. #[ink(namespace = \"hello\")]", + ), ); } diff --git a/crates/ink/ir/src/ir/blake2.rs b/crates/ink/ir/src/ir/blake2.rs index 18c9c6a66e3..457001deade 100644 --- a/crates/ink/ir/src/ir/blake2.rs +++ b/crates/ink/ir/src/ir/blake2.rs @@ -18,8 +18,8 @@ use syn::spanned::Spanned as _; /// Computes the BLAKE-2b 256-bit hash for the given input and stores it in output. pub fn blake2b_256(input: &[u8], output: &mut [u8; 32]) { use ::blake2::digest::{ - consts::U32, Digest as _, + consts::U32, }; type Blake2b256 = ::blake2::Blake2b; diff --git a/crates/ink/ir/src/ir/config.rs b/crates/ink/ir/src/ir/config.rs index 3942071262b..3f574a794cc 100644 --- a/crates/ink/ir/src/ir/config.rs +++ b/crates/ink/ir/src/ir/config.rs @@ -15,8 +15,8 @@ use crate::{ ast, utils::{ - duplicate_config_err, WhitelistedAttributes, + duplicate_config_err, }, }; @@ -212,7 +212,9 @@ mod tests { fn keep_attr_missing_value_fails() { assert_try_from( syn::parse_quote! { keep_attr }, - Err("expected a string literal value for `keep_attr` ink! configuration argument"), + Err( + "expected a string literal value for `keep_attr` ink! configuration argument", + ), ); } } diff --git a/crates/ink/ir/src/ir/item_impl/constructor.rs b/crates/ink/ir/src/ir/item_impl/constructor.rs index 3c3729ff7bb..e9694b13f3c 100644 --- a/crates/ink/ir/src/ir/item_impl/constructor.rs +++ b/crates/ink/ir/src/ir/item_impl/constructor.rs @@ -13,11 +13,11 @@ // limitations under the License. use super::{ - ensure_callable_invariants, Callable, CallableKind, InputsIter, Visibility, + ensure_callable_invariants, }; use crate::{ ir, diff --git a/crates/ink/ir/src/ir/item_impl/impl_item.rs b/crates/ink/ir/src/ir/item_impl/impl_item.rs index f405dfc0e5a..4f4c3091915 100644 --- a/crates/ink/ir/src/ir/item_impl/impl_item.rs +++ b/crates/ink/ir/src/ir/item_impl/impl_item.rs @@ -69,18 +69,19 @@ impl TryFrom for ImplItem { .expect("missing expected ink! attribute for fn"); match attr.first().kind() { ir::AttributeArg::Message => { - >::try_from(fn_item) - .map(Self::Message) + >::try_from(fn_item).map(Self::Message) } ir::AttributeArg::Constructor => { >::try_from(fn_item) .map(Self::Constructor) } - _ => Err(format_err_spanned!( - fn_item, - "encountered invalid ink! attribute at this point, expected either \ + _ => { + Err(format_err_spanned!( + fn_item, + "encountered invalid ink! attribute at this point, expected either \ #[ink(message)] or #[ink(constructor) attributes" - )), + )) + } } } other_item => { diff --git a/crates/ink/ir/src/ir/item_impl/message.rs b/crates/ink/ir/src/ir/item_impl/message.rs index 42c6ab57b80..5cc2a05bcae 100644 --- a/crates/ink/ir/src/ir/item_impl/message.rs +++ b/crates/ink/ir/src/ir/item_impl/message.rs @@ -13,11 +13,11 @@ // limitations under the License. use super::{ - ensure_callable_invariants, Callable, CallableKind, InputsIter, Visibility, + ensure_callable_invariants, }; use crate::ir::{ self, @@ -170,12 +170,13 @@ impl Message { syn::ReturnType::Default => (), syn::ReturnType::Type(_arrow, ret_type) => { if let syn::Type::Path(type_path) = &**ret_type - && type_path.path.is_ident("Self") { - return Err(format_err!( - ret_type, - "ink! messages must not return `Self`" - )) - } + && type_path.path.is_ident("Self") + { + return Err(format_err!( + ret_type, + "ink! messages must not return `Self`" + )) + } } } Ok(()) diff --git a/crates/ink/ir/src/ir/item_mod.rs b/crates/ink/ir/src/ir/item_mod.rs index b6b444b6af1..4d83141b52b 100644 --- a/crates/ink/ir/src/ir/item_mod.rs +++ b/crates/ink/ir/src/ir/item_mod.rs @@ -13,10 +13,10 @@ // limitations under the License. use crate::{ + Callable, error::ExtError as _, ir, ir::idents_lint, - Callable, }; use proc_macro2::{ Ident, @@ -299,18 +299,25 @@ impl ItemMod { match &a.meta { syn::Meta::List(list) => { if let Some(ident) = list.path.get_ident() - && ident.eq("cfg") { - return list.parse_nested_meta(verify_cfg_attrs); - } - unreachable!("`verify_attr` can only be called for `#[cfg(…)]`, not for other `List`"); + && ident.eq("cfg") + { + return list.parse_nested_meta(verify_cfg_attrs); + } + unreachable!( + "`verify_attr` can only be called for `#[cfg(…)]`, not for other `List`" + ); } syn::Meta::Path(_) => { // not relevant, we are only looking at `#[cfg(…)]` - unreachable!("`verify_attr` can only be called for `#[cfg(…)]`, not for `Path`"); + unreachable!( + "`verify_attr` can only be called for `#[cfg(…)]`, not for `Path`" + ); } syn::Meta::NameValue(_) => { // not relevant, we are only looking at `#[cfg(…)]` - unreachable!("`verify_attr` can only be called for `#[cfg(…)]`, not for `NameValue`"); + unreachable!( + "`verify_attr` can only be called for `#[cfg(…)]`, not for `NameValue`" + ); } } } @@ -401,13 +408,18 @@ impl ItemMod { if let Some(wildcard) = wildcard_selector { match other_messages.len() as u32 { - 0 => return Err(format_err!( - wildcard.span(), - "missing definition of another message with TODO in tandem with a wildcard \ + 0 => { + return Err(format_err!( + wildcard.span(), + "missing definition of another message with TODO in tandem with a wildcard \ selector", - )), + )) + } 1 => { - if !other_messages[0].callable().has_wildcard_complement_selector() { + if !other_messages[0] + .callable() + .has_wildcard_complement_selector() + { return Err(format_err!( other_messages[0].callable().span(), "when using a wildcard selector `selector = _` for an ink! message \ @@ -1150,7 +1162,8 @@ mod tests { #[test] fn wildcard_selector_without_other_message_fails() { - assert_fail(syn::parse_quote! { + assert_fail( + syn::parse_quote! { mod my_module { #[ink(storage)] pub struct MyStorage {} @@ -1164,13 +1177,14 @@ mod tests { } } }, - "missing definition of another message with TODO in tandem with a wildcard selector" + "missing definition of another message with TODO in tandem with a wildcard selector", ) } #[test] fn wildcard_selector_and_one_other_message_without_well_known_selector_fails() { - assert_fail(syn::parse_quote! { + assert_fail( + syn::parse_quote! { mod my_module { #[ink(storage)] pub struct MyStorage {} @@ -1187,8 +1201,8 @@ mod tests { } } }, -"when using a wildcard selector `selector = _` for an ink! message then the other \ - message must use the wildcard complement `selector = @`" + "when using a wildcard selector `selector = _` for an ink! message then the other \ + message must use the wildcard complement `selector = @`", ); } @@ -1316,9 +1330,10 @@ mod tests { let res = >::try_from(item_mod) .map_err(|err| err.to_string()); assert!(res.is_err()); - assert!(res - .unwrap_err() - .starts_with("The feature `std` is not allowed in `cfg`.")); + assert!( + res.unwrap_err() + .starts_with("The feature `std` is not allowed in `cfg`.") + ); } #[test] @@ -1384,8 +1399,9 @@ mod tests { let res = >::try_from(item_mod) .map_err(|err| err.to_string()); assert!(res.is_err()); - assert!(res - .unwrap_err() - .starts_with("This `cfg` attribute is not allowed.")); + assert!( + res.unwrap_err() + .starts_with("This `cfg` attribute is not allowed.") + ); } } diff --git a/crates/ink/ir/src/ir/mod.rs b/crates/ink/ir/src/ir/mod.rs index 6ed8c574b68..b2962cecaa9 100644 --- a/crates/ink/ir/src/ir/mod.rs +++ b/crates/ink/ir/src/ir/mod.rs @@ -44,15 +44,15 @@ pub mod marker { use self::attrs::Attribute; use self::attrs::{ + AttributeArg, + AttributeArgKind, + AttributeFrag, + InkAttribute, contains_ink_attributes, first_ink_attribute, partition_attributes, sanitize_attributes, sanitize_optional_attributes, - AttributeArg, - AttributeArgKind, - AttributeFrag, - InkAttribute, }; pub use self::{ attrs::{ @@ -60,8 +60,8 @@ pub use self::{ Namespace, }, blake2::{ - blake2b_256, Blake2x256Macro, + blake2b_256, }, config::Config, contract::Contract, diff --git a/crates/ink/ir/src/ir/sha3.rs b/crates/ink/ir/src/ir/sha3.rs index 9e995506e67..abe498cad50 100644 --- a/crates/ink/ir/src/ir/sha3.rs +++ b/crates/ink/ir/src/ir/sha3.rs @@ -15,8 +15,8 @@ /// Computes the KECCAK 256-bit hash for the given input and stores it in output. pub fn keccak_256(input: &[u8], output: &mut [u8; 32]) { use sha3::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha3::Keccak256::new(); hasher.update(input); diff --git a/crates/ink/ir/src/ir/storage_item/mod.rs b/crates/ink/ir/src/ir/storage_item/mod.rs index a37a8f0efc2..56f829bfa2c 100644 --- a/crates/ink/ir/src/ir/storage_item/mod.rs +++ b/crates/ink/ir/src/ir/storage_item/mod.rs @@ -18,8 +18,8 @@ use crate::utils::find_storage_key_salt; use config::StorageItemConfig; use proc_macro2::TokenStream as TokenStream2; use quote::{ - quote, ToTokens, + quote, }; use std::collections::HashSet; diff --git a/crates/ink/ir/src/ir/trait_def/config.rs b/crates/ink/ir/src/ir/trait_def/config.rs index acde019fc1c..e0471414826 100644 --- a/crates/ink/ir/src/ir/trait_def/config.rs +++ b/crates/ink/ir/src/ir/trait_def/config.rs @@ -15,8 +15,8 @@ use crate::{ ast, utils::{ - duplicate_config_err, WhitelistedAttributes, + duplicate_config_err, }, }; diff --git a/crates/ink/ir/src/ir/trait_def/item/iter.rs b/crates/ink/ir/src/ir/trait_def/item/iter.rs index b630a4e14b9..cb59cd62e24 100644 --- a/crates/ink/ir/src/ir/trait_def/item/iter.rs +++ b/crates/ink/ir/src/ir/trait_def/item/iter.rs @@ -13,11 +13,11 @@ // limitations under the License. use crate::{ - ir, InkItemTrait, InkTraitItem, InkTraitMessage, Selector, + ir, }; use std::collections::HashMap; diff --git a/crates/ink/ir/src/ir/trait_def/item/mod.rs b/crates/ink/ir/src/ir/trait_def/item/mod.rs index 6d3712dfa0f..ccc4a77bc4d 100644 --- a/crates/ink/ir/src/ir/trait_def/item/mod.rs +++ b/crates/ink/ir/src/ir/trait_def/item/mod.rs @@ -25,12 +25,12 @@ pub use self::{ }; use super::TraitDefinitionConfig; use crate::{ + Selector, ir, ir::{ attrs::SelectorOrWildcard, idents_lint, }, - Selector, }; use ir::TraitPrefix; use proc_macro2::{ @@ -39,8 +39,8 @@ use proc_macro2::{ }; use std::collections::HashMap; use syn::{ - spanned::Spanned as _, Result, + spanned::Spanned as _, }; /// A checked ink! trait definition without its configuration. @@ -183,9 +183,9 @@ impl InkItemTrait { } syn::TraitItem::Type(type_trait_item) => { return Err(format_err_spanned!( - type_trait_item, - "associated types in ink! trait definitions are not supported, yet" - )) + type_trait_item, + "associated types in ink! trait definitions are not supported, yet" + )) } syn::TraitItem::Verbatim(verbatim) => { return Err(format_err_spanned!( diff --git a/crates/ink/ir/src/ir/trait_def/item/trait_item.rs b/crates/ink/ir/src/ir/trait_def/item/trait_item.rs index cd7186d34a6..d637b7a4389 100644 --- a/crates/ink/ir/src/ir/trait_def/item/trait_item.rs +++ b/crates/ink/ir/src/ir/trait_def/item/trait_item.rs @@ -14,22 +14,22 @@ use super::super::InkAttribute; use crate::{ + InputsIter, + Receiver, ir::{ self, attrs::SelectorOrWildcard, utils, utils::extract_cfg_attributes, }, - InputsIter, - Receiver, }; use proc_macro2::{ Span, TokenStream, }; use syn::{ - spanned::Spanned as _, Result, + spanned::Spanned as _, }; /// An ink! item within an ink! trait definition. @@ -88,8 +88,12 @@ impl<'a> InkTraitMessage<'a> { &ir::AttributeArgKind::Message, |arg| { match arg.kind() { - ir::AttributeArg::Selector(SelectorOrWildcard::Wildcard) => - Err(Some(format_err!(arg.span(), "wildcard selectors are only supported for inherent ink! messages or constructors, not for traits."))), + ir::AttributeArg::Selector(SelectorOrWildcard::Wildcard) => { + Err(Some(format_err!( + arg.span(), + "wildcard selectors are only supported for inherent ink! messages or constructors, not for traits." + ))) + } ir::AttributeArg::Message | ir::AttributeArg::Payable | ir::AttributeArg::Default diff --git a/crates/ink/ir/src/ir/utils.rs b/crates/ink/ir/src/ir/utils.rs index bd1e61821d1..16af4820acd 100644 --- a/crates/ink/ir/src/ir/utils.rs +++ b/crates/ink/ir/src/ir/utils.rs @@ -156,13 +156,14 @@ pub fn find_storage_key_salt(input: &syn::DeriveInput) -> Option if let syn::GenericParam::Type(type_param) = param && let Some(syn::TypeParamBound::Trait(trait_bound)) = type_param.bounds.first() + { + let segments = &trait_bound.path.segments; + if let Some(last) = segments.last() + && last.ident == "StorageKey" { - let segments = &trait_bound.path.segments; - if let Some(last) = segments.last() - && last.ident == "StorageKey" { - return Some(type_param.clone()) - } + return Some(type_param.clone()) } + } None }) } diff --git a/crates/ink/ir/src/lib.rs b/crates/ink/ir/src/lib.rs index b1c05830595..ad0a5f50c70 100644 --- a/crates/ink/ir/src/lib.rs +++ b/crates/ink/ir/src/lib.rs @@ -41,9 +41,6 @@ mod literal; pub use self::{ ir::{ - blake2b_256, - marker, - utils, Blake2x256Macro, Callable, CallableKind, @@ -79,6 +76,9 @@ pub use self::{ Storage, StorageItem, Visibility, + blake2b_256, + marker, + utils, }, literal::HexLiteral, }; diff --git a/crates/ink/macro/src/event/mod.rs b/crates/ink/macro/src/event/mod.rs index 256359c3c27..56f84076a25 100644 --- a/crates/ink/macro/src/event/mod.rs +++ b/crates/ink/macro/src/event/mod.rs @@ -25,9 +25,9 @@ use quote::{ quote_spanned, }; use syn::{ + Token, punctuated::Punctuated, spanned::Spanned, - Token, }; /// Generate code from the `#[ink::event]` attribute. This expands to the required diff --git a/crates/ink/macro/src/selector.rs b/crates/ink/macro/src/selector.rs index 3274575cde2..cb25e979ce8 100644 --- a/crates/ink/macro/src/selector.rs +++ b/crates/ink/macro/src/selector.rs @@ -14,11 +14,11 @@ use ink_codegen::generate_code; use ink_ir::{ + SelectorMacro, marker::{ SelectorBytes, SelectorId, }, - SelectorMacro, }; use proc_macro2::TokenStream as TokenStream2; use syn::Result; diff --git a/crates/ink/macro/src/sol/codec.rs b/crates/ink/macro/src/sol/codec.rs index f8139c5cc74..93c8dd2659a 100644 --- a/crates/ink/macro/src/sol/codec.rs +++ b/crates/ink/macro/src/sol/codec.rs @@ -15,12 +15,12 @@ use proc_macro2::TokenStream as TokenStream2; use quote::quote; use syn::{ - spanned::Spanned, Expr, Field, Fields, GenericParam, Lit, + spanned::Spanned, }; use synstructure::VariantInfo; diff --git a/crates/ink/macro/src/sol/error.rs b/crates/ink/macro/src/sol/error.rs index 9f0c58ded99..91cc2941cba 100644 --- a/crates/ink/macro/src/sol/error.rs +++ b/crates/ink/macro/src/sol/error.rs @@ -22,10 +22,10 @@ use quote::{ quote, }; use syn::{ - spanned::Spanned, Attribute, Field, Fields, + spanned::Spanned, }; use super::utils; @@ -286,7 +286,6 @@ fn sol_error_encode_derive_enum(s: synstructure::Structure) -> syn::Result TokenStream2 { diff --git a/crates/ink/macro/src/storage/storage_key.rs b/crates/ink/macro/src/storage/storage_key.rs index 3a0c4e54542..929ef15444d 100644 --- a/crates/ink/macro/src/storage/storage_key.rs +++ b/crates/ink/macro/src/storage/storage_key.rs @@ -15,8 +15,8 @@ use ink_ir::utils::find_storage_key_salt; use proc_macro2::TokenStream as TokenStream2; use quote::{ - quote, ToTokens, + quote, }; pub fn storage_key_derive(mut s: synstructure::Structure) -> TokenStream2 { diff --git a/crates/ink/src/codegen/implies_return.rs b/crates/ink/src/codegen/implies_return.rs index f51079f98ff..bd9ad310994 100644 --- a/crates/ink/src/codegen/implies_return.rs +++ b/crates/ink/src/codegen/implies_return.rs @@ -13,16 +13,16 @@ // limitations under the License. use ink_env::{ + Environment, call::{ + CallBuilder, + Execution, + ExecutionInput, utils::{ ReturnType, Set, }, - CallBuilder, - Execution, - ExecutionInput, }, - Environment, }; /// Trait used as bound for the outputs of ink! trait definition messages. diff --git a/crates/ink/src/codegen/mod.rs b/crates/ink/src/codegen/mod.rs index 226f5e7101d..70db388abac 100644 --- a/crates/ink/src/codegen/mod.rs +++ b/crates/ink/src/codegen/mod.rs @@ -23,12 +23,12 @@ pub mod utils; pub use self::{ dispatch::{ - deny_payment, ContractCallBuilder, DispatchInput, DispatchInputSol, DispatchOutput, DispatchOutputSol, + deny_payment, }, env::{ Env, diff --git a/crates/ink/src/contract_ref.rs b/crates/ink/src/contract_ref.rs index d86548bf17b..ca9de5055c3 100644 --- a/crates/ink/src/contract_ref.rs +++ b/crates/ink/src/contract_ref.rs @@ -31,8 +31,8 @@ use ink_primitives::Address; /// #[ink::contract] /// mod trait_caller { /// use ink::{ -/// contract_ref, /// U256, +/// contract_ref, /// }; /// /// #[ink::trait_definition] diff --git a/crates/ink/src/env_access.rs b/crates/ink/src/env_access.rs index 13b59ca98ba..c32f710c52d 100644 --- a/crates/ink/src/env_access.rs +++ b/crates/ink/src/env_access.rs @@ -15,8 +15,9 @@ use core::marker::PhantomData; use ink_env::{ + Environment, + Result, call::{ - utils::DecodeMessageResult, Call, CallParams, ConstructorReturnType, @@ -24,23 +25,22 @@ use ink_env::{ DelegateCall, FromAddr, LimitParamsV2, + utils::DecodeMessageResult, }, hash::{ CryptoHash, HashOutput, }, - Environment, - Result, }; use ink_primitives::{ + Address, + H256, + U256, abi::{ AbiEncodeWith, Ink, Sol, }, - Address, - H256, - U256, }; use pallet_revive_uapi::ReturnErrorCode; @@ -519,7 +519,6 @@ where ContractRef: FromAddr + ink_env::ContractReverseReference, ::Type: ink_env::reflect::ContractConstructorDecoder, - Args: AbiEncodeWith, R: ConstructorReturnType, { @@ -534,12 +533,12 @@ where /// # #[ink::contract] /// # pub mod my_contract { /// use ink::env::{ + /// DefaultEnvironment, /// call::{ - /// build_call, /// ExecutionInput, /// Selector, + /// build_call, /// }, - /// DefaultEnvironment, /// }; /// /// # @@ -603,14 +602,14 @@ where /// # #[ink::contract] /// # pub mod my_contract { /// use ink::env::{ + /// DefaultEnvironment, /// call::{ - /// build_call, - /// utils::ReturnType, /// DelegateCall, /// ExecutionInput, /// Selector, + /// build_call, + /// utils::ReturnType, /// }, - /// DefaultEnvironment, /// }; /// use ink_primitives::Clear; /// @@ -879,17 +878,22 @@ where /// #[ink(message)] /// pub fn ecdsa_to_eth_address(&self) { /// let pub_key = [ - /// 3, 110, 192, 35, 209, 24, 189, 55, 218, 250, 100, 89, 40, 76, 222, 208, 202, 127, - /// 31, 13, 58, 51, 242, 179, 13, 63, 19, 22, 252, 164, 226, 248, 98, + /// 3, 110, 192, 35, 209, 24, 189, 55, 218, 250, 100, 89, 40, 76, 222, 208, 202, + /// 127, 31, 13, 58, 51, 242, 179, 13, 63, 19, 22, 252, 164, 226, 248, 98, /// ]; /// let EXPECTED_ETH_ADDRESS = [ - /// 253, 240, 181, 194, 143, 66, 163, 109, 18, 211, 78, 49, 177, 94, 159, 79, 207, - /// 37, 21, 191, + /// 253, 240, 181, 194, 143, 66, 163, 109, 18, 211, 78, 49, 177, 94, 159, 79, + /// 207, 37, 21, 191, /// ]; /// let output = self /// .env() /// .ecdsa_to_eth_address(&pub_key) - /// .unwrap_or_else(|err| panic!("must return an Ethereum address for the compressed public key: {:?}", err)); + /// .unwrap_or_else(|err| { + /// panic!( + /// "must return an Ethereum address for the compressed public key: {:?}", + /// err + /// ) + /// }); /// assert_eq!(output, EXPECTED_ETH_ADDRESS); /// } /// # diff --git a/crates/ink/src/lib.rs b/crates/ink/src/lib.rs index b87939a3f38..e34600f1717 100644 --- a/crates/ink/src/lib.rs +++ b/crates/ink/src/lib.rs @@ -74,6 +74,13 @@ pub use self::{ prelude::IIP2_WILDCARD_COMPLEMENT_SELECTOR, }; pub use ink_macro::{ + Event, + EventMetadata, + SolDecode, + SolEncode, + SolErrorDecode, + SolErrorEncode, + SolErrorMetadata, blake2x256, contract, error, @@ -84,23 +91,16 @@ pub use ink_macro::{ storage_item, test, trait_definition, - Event, - EventMetadata, - SolDecode, - SolEncode, - SolErrorDecode, - SolErrorEncode, - SolErrorMetadata, }; pub use ink_primitives::{ Address, ConstructorResult, + H160, + H256, LangError, MessageResult, SolDecode, SolEncode, - H160, - H256, U256, }; diff --git a/crates/ink/src/message_builder.rs b/crates/ink/src/message_builder.rs index 25a4c678a6c..557c4822536 100644 --- a/crates/ink/src/message_builder.rs +++ b/crates/ink/src/message_builder.rs @@ -46,11 +46,11 @@ /// ```rust /// use ink::message_builder; /// use ink_env::{ +/// DefaultEnvironment, /// call::{ /// ExecutionInput, /// Executor, /// }, -/// DefaultEnvironment, /// }; /// use ink_primitives::{ /// AccountId, diff --git a/crates/ink/tests/compile_tests.rs b/crates/ink/tests/compile_tests.rs index fa8c057078e..2087264d29c 100644 --- a/crates/ink/tests/compile_tests.rs +++ b/crates/ink/tests/compile_tests.rs @@ -279,7 +279,9 @@ fn trybuild_wrapper_test( cmd.env("CARGO", wrapper); // Set ABI `cfg` flags that will be passed to `cargo` by the `trybuild` wrapper. - let abi_cfg = format!("--cfg\x1fink_abi=\"{abi}\"\x1f--check-cfg\x1fcfg(ink_abi,values(\"ink\",\"sol\",\"all\"))"); + let abi_cfg = format!( + "--cfg\x1fink_abi=\"{abi}\"\x1f--check-cfg\x1fcfg(ink_abi,values(\"ink\",\"sol\",\"all\"))" + ); cmd.env("TRYBUILD_WRAPPER_ENCODED_FLAGS", abi_cfg); // Enable `std` and `unstable-hostfn` features (needed by events and metadata tests). diff --git a/crates/ink/tests/return_type_metadata.rs b/crates/ink/tests/return_type_metadata.rs index a83984be83d..6083ec916f0 100644 --- a/crates/ink/tests/return_type_metadata.rs +++ b/crates/ink/tests/return_type_metadata.rs @@ -44,11 +44,11 @@ mod contract { #[cfg(test)] mod tests { use scale_info::{ - form::PortableForm, Type, TypeDef, TypeDefPrimitive, TypeDefTuple, + form::PortableForm, }; fn generate_metadata() -> ink_metadata::InkProject { diff --git a/crates/metadata/src/layout/mod.rs b/crates/metadata/src/layout/mod.rs index b019d21a9b6..3d168abc39c 100644 --- a/crates/metadata/src/layout/mod.rs +++ b/crates/metadata/src/layout/mod.rs @@ -34,24 +34,24 @@ use scale::{ Encode, }; use scale_info::{ + IntoPortable, + Registry, + TypeInfo, form::{ Form, MetaForm, PortableForm, }, meta_type, - IntoPortable, - Registry, - TypeInfo, }; use schemars::JsonSchema; use serde::{ + Deserialize, + Serialize, de::{ DeserializeOwned, Error, }, - Deserialize, - Serialize, }; /// Represents the static storage layout of an ink! smart contract. diff --git a/crates/metadata/src/lib.rs b/crates/metadata/src/lib.rs index 04e414d8543..41740604f9e 100644 --- a/crates/metadata/src/lib.rs +++ b/crates/metadata/src/lib.rs @@ -59,10 +59,10 @@ pub use scale_info::TypeInfo; #[cfg(feature = "derive")] use scale_info::{ - form::PortableForm, IntoPortable as _, PortableRegistry, Registry, + form::PortableForm, }; use schemars::JsonSchema; use serde::{ diff --git a/crates/metadata/src/specs.rs b/crates/metadata/src/specs.rs index e19290d0186..3e8d1917675 100644 --- a/crates/metadata/src/specs.rs +++ b/crates/metadata/src/specs.rs @@ -35,21 +35,21 @@ use core::{ marker::PhantomData, }; use scale_info::{ + IntoPortable, + Registry, + TypeInfo, form::{ Form, MetaForm, PortableForm, }, meta_type, - IntoPortable, - Registry, - TypeInfo, }; use schemars::JsonSchema; use serde::{ - de::DeserializeOwned, Deserialize, Serialize, + de::DeserializeOwned, }; #[cfg(feature = "std")] use std::{ diff --git a/crates/metadata/src/tests.rs b/crates/metadata/src/tests.rs index 497a0a7698d..29ec7e01daf 100644 --- a/crates/metadata/src/tests.rs +++ b/crates/metadata/src/tests.rs @@ -69,31 +69,37 @@ fn spec_constructor_selector_must_serialize_to_hex() { #[should_panic(expected = "only one default message is allowed")] fn spec_contract_only_one_default_message_allowed() { ContractSpec::new() - .constructors(vec![ConstructorSpec::from_label("new") - .selector([94u8, 189u8, 136u8, 214u8]) - .payable(true) - .args(vec![MessageParamSpec::new("init_value") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) - .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< - ink_primitives::ConstructorResult<()>, - >( - "ink_primitives::ConstructorResult" - ))) - .docs(Vec::new()) - .done()]) + .constructors(vec![ + ConstructorSpec::from_label("new") + .selector([94u8, 189u8, 136u8, 214u8]) + .payable(true) + .args(vec![ + MessageParamSpec::new("init_value") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) + .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< + ink_primitives::ConstructorResult<()>, + >( + "ink_primitives::ConstructorResult" + ))) + .docs(Vec::new()) + .done(), + ]) .messages(vec![ MessageSpec::from_label("inc") .selector([231u8, 208u8, 89u8, 15u8]) .mutates(true) .payable(true) - .args(vec![MessageParamSpec::new("by") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) + .args(vec![ + MessageParamSpec::new("by") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< ink_primitives::MessageResult<()>, >( @@ -130,11 +136,13 @@ fn spec_contract_only_one_default_constructor_allowed() { ConstructorSpec::from_label("new") .selector([94u8, 189u8, 136u8, 214u8]) .payable(true) - .args(vec![MessageParamSpec::new("init_value") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) + .args(vec![ + MessageParamSpec::new("init_value") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< ink_primitives::ConstructorResult<()>, >( @@ -156,22 +164,26 @@ fn spec_contract_only_one_default_constructor_allowed() { .default(true) .done(), ]) - .messages(vec![MessageSpec::from_label("inc") - .selector([231u8, 208u8, 89u8, 15u8]) - .mutates(true) - .payable(true) - .args(vec![MessageParamSpec::new("by") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) - .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< - ink_primitives::MessageResult<()>, - >( - "ink_primitives::MessageResult" - ))) - .default(true) - .done()]) + .messages(vec![ + MessageSpec::from_label("inc") + .selector([231u8, 208u8, 89u8, 15u8]) + .mutates(true) + .payable(true) + .args(vec![ + MessageParamSpec::new("by") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) + .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< + ink_primitives::MessageResult<()>, + >( + "ink_primitives::MessageResult" + ))) + .default(true) + .done(), + ]) .events(Vec::new()) .lang_error(TypeSpec::with_name_segs::( ::core::iter::Iterator::map( @@ -192,38 +204,46 @@ fn spec_contract_event_definition_signature_topic_collision() { const NATIVE_TO_ETH_RATIO: u32 = 100000000; ContractSpec::new() - .constructors(vec![ConstructorSpec::from_label("new") - .selector([94u8, 189u8, 136u8, 214u8]) - .payable(true) - .args(vec![MessageParamSpec::new("init_value") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) - .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< - ink_primitives::ConstructorResult<()>, - >( - "ink_primitives::ConstructorResult" - ))) - .docs(Vec::new()) - .default(true) - .done()]) - .messages(vec![MessageSpec::from_label("inc") - .selector([231u8, 208u8, 89u8, 15u8]) - .mutates(true) - .payable(true) - .args(vec![MessageParamSpec::new("by") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) - .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< - ink_primitives::MessageResult<()>, - >( - "ink_primitives::MessageResult" - ))) - .default(true) - .done()]) + .constructors(vec![ + ConstructorSpec::from_label("new") + .selector([94u8, 189u8, 136u8, 214u8]) + .payable(true) + .args(vec![ + MessageParamSpec::new("init_value") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) + .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< + ink_primitives::ConstructorResult<()>, + >( + "ink_primitives::ConstructorResult" + ))) + .docs(Vec::new()) + .default(true) + .done(), + ]) + .messages(vec![ + MessageSpec::from_label("inc") + .selector([231u8, 208u8, 89u8, 15u8]) + .mutates(true) + .payable(true) + .args(vec![ + MessageParamSpec::new("by") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) + .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< + ink_primitives::MessageResult<()>, + >( + "ink_primitives::MessageResult" + ))) + .default(true) + .done(), + ]) .events(vec![ EventSpec::new("Event") .module_path("path::to") @@ -273,11 +293,13 @@ fn spec_contract_json() { ConstructorSpec::from_label("new") .selector([94u8, 189u8, 136u8, 214u8]) .payable(true) - .args(vec![MessageParamSpec::new("init_value") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) + .args(vec![ + MessageParamSpec::new("init_value") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< ink_primitives::ConstructorResult<()>, >( @@ -314,11 +336,13 @@ fn spec_contract_json() { .selector([231u8, 208u8, 89u8, 15u8]) .mutates(true) .payable(true) - .args(vec![MessageParamSpec::new("by") - .of_type(TypeSpec::with_name_segs::( - vec!["i32"].into_iter().map(AsRef::as_ref), - )) - .done()]) + .args(vec![ + MessageParamSpec::new("by") + .of_type(TypeSpec::with_name_segs::( + vec!["i32"].into_iter().map(AsRef::as_ref), + )) + .done(), + ]) .returns(ReturnTypeSpec::new(TypeSpec::with_name_str::< ink_primitives::MessageResult<()>, >( diff --git a/crates/primitives/src/arithmetic.rs b/crates/primitives/src/arithmetic.rs index 482d26a5297..0d9a5d2f595 100644 --- a/crates/primitives/src/arithmetic.rs +++ b/crates/primitives/src/arithmetic.rs @@ -25,12 +25,12 @@ use core::ops::{ SubAssign, }; use num_traits::{ - checked_pow, Bounded, CheckedMul, One, Unsigned, Zero, + checked_pow, }; /// Types that allow for simple arithmetic operations. diff --git a/crates/primitives/src/sol.rs b/crates/primitives/src/sol.rs index 202544f4013..ca58c07a7b9 100644 --- a/crates/primitives/src/sol.rs +++ b/crates/primitives/src/sol.rs @@ -92,8 +92,8 @@ use crate::types::{ /// /// ``` /// use ink_primitives::{ -/// sol::Error, /// SolDecode, +/// sol::Error, /// }; /// /// // Example arbitrary type. diff --git a/crates/primitives/src/sol/bytes.rs b/crates/primitives/src/sol/bytes.rs index 41ef4da45d2..373b855d4eb 100644 --- a/crates/primitives/src/sol/bytes.rs +++ b/crates/primitives/src/sol/bytes.rs @@ -18,12 +18,12 @@ use core::{ }; use alloy_sol_types::{ + SolType as AlloySolType, abi::token::{ PackedSeqToken, WordToken, }, sol_data, - SolType as AlloySolType, }; use ink_prelude::{ boxed::Box, @@ -37,6 +37,12 @@ use scale::{ use scale_info::TypeInfo; use crate::sol::{ + Error, + SolDecode, + SolEncode, + SolTopicEncode, + SolTypeDecode, + SolTypeEncode, encodable::{ DynSizeDefault, FixedSizeDefault, @@ -46,12 +52,6 @@ use crate::sol::{ append_non_empty_member_topic_bytes, non_zero_multiple_of_32, }, - Error, - SolDecode, - SolEncode, - SolTopicEncode, - SolTypeDecode, - SolTypeEncode, }; /// Newtype wrapper for Solidity ABI encoding/decoding `[u8; N]` for `1 <= N <= 32` as @@ -88,7 +88,7 @@ where // unpacked to `[u8; N]`. // Ref: Ok(Self( - token.0 .0[..N] + token.0.0[..N] .try_into() .expect("Expected a slice of N bytes"), )) @@ -120,11 +120,11 @@ where where H: Fn(&[u8], &mut [u8; 32]), { - self.tokenize().0 .0 + self.tokenize().0.0 } fn topic_preimage(&self, buffer: &mut Vec) { - buffer.extend(self.tokenize().0 .0); + buffer.extend(self.tokenize().0.0); } fn default_topic_preimage(buffer: &mut Vec) { diff --git a/crates/primitives/src/sol/encodable.rs b/crates/primitives/src/sol/encodable.rs index 0317f92e660..f5b25c565a3 100644 --- a/crates/primitives/src/sol/encodable.rs +++ b/crates/primitives/src/sol/encodable.rs @@ -13,7 +13,9 @@ // limitations under the License. use alloy_sol_types::{ + Word, abi::{ + Encoder, token::{ DynSeqToken, FixedSeqToken, @@ -21,9 +23,7 @@ use alloy_sol_types::{ Token, WordToken, }, - Encoder, }, - Word, }; use ink_prelude::vec::Vec; diff --git a/crates/primitives/src/sol/error.rs b/crates/primitives/src/sol/error.rs index 2c8785d291a..aa70551f7cc 100644 --- a/crates/primitives/src/sol/error.rs +++ b/crates/primitives/src/sol/error.rs @@ -38,11 +38,7 @@ impl SolErrorDecode for () { where Self: Sized, { - if data.is_empty() { - Ok(()) - } else { - Err(Error) - } + if data.is_empty() { Ok(()) } else { Err(Error) } } } diff --git a/crates/primitives/src/sol/params.rs b/crates/primitives/src/sol/params.rs index 9536b8498b0..39966d4ff82 100644 --- a/crates/primitives/src/sol/params.rs +++ b/crates/primitives/src/sol/params.rs @@ -13,25 +13,25 @@ // limitations under the License. use alloy_sol_types::{ + SolType as AlloySolType, abi::{ self, Encoder, }, - SolType as AlloySolType, }; use impl_trait_for_tuples::impl_for_tuples; use ink_prelude::vec::Vec; use super::{ - encodable::{ - Encodable, - EncodableParams, - }, Error, SolDecode, SolEncode, SolTypeDecode, SolTypeEncode, + encodable::{ + Encodable, + EncodableParams, + }, }; /// Solidity ABI decode from parameter data (e.g. function, event or error parameters). diff --git a/crates/primitives/src/sol/tests.rs b/crates/primitives/src/sol/tests.rs index e46fedc5888..a83a6aee91a 100644 --- a/crates/primitives/src/sol/tests.rs +++ b/crates/primitives/src/sol/tests.rs @@ -16,17 +16,17 @@ //! `SolEncode` implementations match alloy's `SolValue` equivalents. use alloy_sol_types::{ + EventTopic, + SolType as AlloySolType, + SolValue, private::{ - keccak256, Address as AlloyAddress, Bytes as AlloyBytes, FixedBytes as AlloyFixedBytes, U256 as AlloyU256, + keccak256, }, sol_data, - EventTopic, - SolType as AlloySolType, - SolValue, }; use ink_prelude::{ string::String, @@ -38,9 +38,8 @@ use primitive_types::{ }; use crate::{ + Weight, sol::{ - decode_sequence, - encode_sequence, ByteSlice, DynBytes, Error, @@ -52,13 +51,14 @@ use crate::{ SolTopicEncode, SolTypeDecode, SolTypeEncode, + decode_sequence, + encode_sequence, }, types::{ AccountId, Address, Hash, }, - Weight, }; macro_rules! test_case_codec { @@ -1056,5 +1056,5 @@ fn event_topic_works() { ); let encoded_alloy = <(sol_data::Uint<8>, sol_data::Bool, sol_data::String) as EventTopic>::encode_topic(&(100u8, true, String::from("Hello, world!"))); - assert_eq!(encoded, encoded_alloy.0 .0); + assert_eq!(encoded, encoded_alloy.0.0); } diff --git a/crates/primitives/src/sol/types.rs b/crates/primitives/src/sol/types.rs index e89d6890b13..4e37d9ea6d1 100644 --- a/crates/primitives/src/sol/types.rs +++ b/crates/primitives/src/sol/types.rs @@ -15,16 +15,16 @@ use core::clone::Clone; use alloy_sol_types::{ + SolType as AlloySolType, abi::{ self, + Encoder, token::{ PackedSeqToken, WordToken, }, - Encoder, }, sol_data, - SolType as AlloySolType, }; use impl_trait_for_tuples::impl_for_tuples; use ink_prelude::{ @@ -42,6 +42,7 @@ use primitive_types::U256; use crate::{ sol::{ + Error, encodable::{ DynSizeDefault, Encodable, @@ -52,7 +53,6 @@ use crate::{ append_non_empty_member_topic_bytes, non_zero_multiple_of_32, }, - Error, }, types::Address, }; @@ -471,7 +471,7 @@ impl SolTypeDecode for Address { // just taking the last 20 bytes of `alloy_sol_types::abi::token::WordToken` as // well anyway. // Ref: - Ok(Address::from_slice(&token.0 .0[12..])) + Ok(Address::from_slice(&token.0.0[12..])) } } @@ -507,7 +507,7 @@ impl SolTypeDecode for U256 { fn detokenize( token: ::Token<'_>, ) -> Result { - Ok(U256::from_big_endian(token.0 .0.as_slice())) + Ok(U256::from_big_endian(token.0.0.as_slice())) } } @@ -866,7 +866,7 @@ impl SolTypeEncode for Option { impl SolTopicEncode for Option { fn topic_preimage(&self, buffer: &mut Vec) { // `bool` variant encoded bytes. - buffer.extend(self.is_some().tokenize().0 .0); + buffer.extend(self.is_some().tokenize().0.0); // "Actual value" encoded bytes. match self { None => T::default_topic_preimage(buffer), diff --git a/crates/storage/src/lazy/mapping.rs b/crates/storage/src/lazy/mapping.rs index 02f45618d5d..212ca22a8db 100644 --- a/crates/storage/src/lazy/mapping.rs +++ b/crates/storage/src/lazy/mapping.rs @@ -51,11 +51,11 @@ use scale::{ /// # #[ink::contract] /// # mod my_module { /// use ink::{ +/// U256, /// storage::{ -/// traits::ManualKey, /// Mapping, +/// traits::ManualKey, /// }, -/// U256, /// }; /// /// #[ink(storage)] diff --git a/crates/storage/src/lazy/mod.rs b/crates/storage/src/lazy/mod.rs index df7a33893df..61bba3a12d4 100644 --- a/crates/storage/src/lazy/mod.rs +++ b/crates/storage/src/lazy/mod.rs @@ -68,8 +68,8 @@ use scale::{ /// # #[ink::contract] /// # mod my_module { /// use ink::storage::{ -/// traits::ManualKey, /// Lazy, +/// traits::ManualKey, /// }; /// /// #[ink(storage)] diff --git a/crates/storage/traits/src/layout/impls.rs b/crates/storage/traits/src/layout/impls.rs index 3c8afeceac2..f02b70ee368 100644 --- a/crates/storage/traits/src/layout/impls.rs +++ b/crates/storage/traits/src/layout/impls.rs @@ -39,9 +39,9 @@ use ink_prelude::{ use ink_primitives::{ AccountId, Address, + H256, Hash, Key, - H256, U256, }; use scale_info::TypeInfo; diff --git a/crates/storage/traits/src/lib.rs b/crates/storage/traits/src/lib.rs index 589afffe0c5..d7f4ab23bf5 100644 --- a/crates/storage/traits/src/lib.rs +++ b/crates/storage/traits/src/lib.rs @@ -47,11 +47,11 @@ pub use self::{ ResolverKey, }, storage::{ - decode_all, AutoStorableHint, Packed, Storable, StorableHint, StorageKey, + decode_all, }, }; From 7734d0b87fab0aca6477f4ab1d1b100dc1ee47c4 Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Mon, 8 Sep 2025 20:06:43 +0300 Subject: [PATCH 16/18] chore: fmt --- integration-tests/all-abi/events/lib.rs | 112 +++++++++++------- .../internal/call-builder-return-value/lib.rs | 2 +- .../internal/e2e-runtime-only-backend/lib.rs | 2 +- .../lang-err/call-builder-delegate/lib.rs | 8 +- .../internal/lang-err/call-builder/lib.rs | 10 +- integration-tests/internal/mapping/lib.rs | 2 +- .../internal/system-precompile/lib.rs | 2 +- .../public/complex-storage-structures/lib.rs | 2 +- .../public/contract-invocation/lib.rs | 8 +- .../virtual_contract/lib.rs | 2 +- .../public/debugging-strategies/lib.rs | 11 +- integration-tests/public/dns/lib.rs | 2 +- .../public/e2e-call-runtime/lib.rs | 2 +- integration-tests/public/erc1155/lib.rs | 34 +++--- integration-tests/public/erc20/lib.rs | 2 +- integration-tests/public/events/lib.rs | 72 ++++++----- integration-tests/public/multisig/lib.rs | 12 +- integration-tests/public/trait-erc20/lib.rs | 2 +- .../delegator/delegatee/lib.rs | 2 +- .../delegator/delegatee2/lib.rs | 2 +- .../upgradeable-contracts/delegator/lib.rs | 8 +- integration-tests/solidity-abi/events/lib.rs | 32 +++-- .../sol-cross-contract/e2e_tests.rs | 6 +- .../solidity-abi/sol-cross-contract/lib.rs | 8 +- .../solidity-abi/sol-encoding/e2e_tests.rs | 8 +- .../solidity-calls-flipper/e2e_tests.rs | 12 +- .../solidity-calls-flipper/lib.rs | 6 +- 27 files changed, 218 insertions(+), 153 deletions(-) diff --git a/integration-tests/all-abi/events/lib.rs b/integration-tests/all-abi/events/lib.rs index 65bc78443bf..4c361d6fc95 100644 --- a/integration-tests/all-abi/events/lib.rs +++ b/integration-tests/all-abi/events/lib.rs @@ -156,36 +156,54 @@ pub mod events { assert_eq!(9, event_specs.len()); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"ForeignFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineCustomFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"ThirtyTwoByteTopics")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"EventDefAnotherCrate")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"AnonymousEvent")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineAnonymousEvent")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineAnonymousEventHashedTopic")); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"ForeignFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineCustomFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"ThirtyTwoByteTopics") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"EventDefAnotherCrate") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"AnonymousEvent") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineAnonymousEvent") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineAnonymousEventHashedTopic") + ); // The event is not used directly in the code, but is included in the metadata // because we implement the trait from the `event_def_unused` crate. - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"EventDefUnused")); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"EventDefUnused") + ); } #[test] @@ -196,22 +214,32 @@ pub mod events { assert!(event_specs.iter().any(|evt| evt.name == "ForeignFlipped")); assert!(event_specs.iter().any(|evt| evt.name == "InlineFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "InlineCustomFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "ThirtyTwoByteTopics")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "EventDefAnotherCrate")); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "InlineCustomFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "ThirtyTwoByteTopics") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "EventDefAnotherCrate") + ); assert!(event_specs.iter().any(|evt| evt.name == "AnonymousEvent")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "InlineAnonymousEvent")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "InlineAnonymousEventHashedTopic")); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "InlineAnonymousEvent") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "InlineAnonymousEventHashedTopic") + ); assert!(event_specs.iter().any(|evt| evt.name == "EventDefUnused")); assert!(event_specs.iter().any(|evt| { diff --git a/integration-tests/internal/call-builder-return-value/lib.rs b/integration-tests/internal/call-builder-return-value/lib.rs index 3fb1a106c90..a81bc033aa6 100755 --- a/integration-tests/internal/call-builder-return-value/lib.rs +++ b/integration-tests/internal/call-builder-return-value/lib.rs @@ -7,11 +7,11 @@ mod call_builder { use ink::{ env::{ + DefaultEnvironment, call::{ ExecutionInput, Selector, }, - DefaultEnvironment, }, prelude::{ format, diff --git a/integration-tests/internal/e2e-runtime-only-backend/lib.rs b/integration-tests/internal/e2e-runtime-only-backend/lib.rs index 0240a8de4cb..53a1fb68f53 100644 --- a/integration-tests/internal/e2e-runtime-only-backend/lib.rs +++ b/integration-tests/internal/e2e-runtime-only-backend/lib.rs @@ -51,9 +51,9 @@ pub mod flipper { use super::*; use ink::env::Environment; use ink_e2e::{ - subxt::dynamic::Value, ChainBackend, ContractsBackend, + subxt::dynamic::Value, }; type E2EResult = std::result::Result>; diff --git a/integration-tests/internal/lang-err/call-builder-delegate/lib.rs b/integration-tests/internal/lang-err/call-builder-delegate/lib.rs index bf6208daf01..064c4f5ea3f 100755 --- a/integration-tests/internal/lang-err/call-builder-delegate/lib.rs +++ b/integration-tests/internal/lang-err/call-builder-delegate/lib.rs @@ -19,12 +19,12 @@ #[ink::contract] mod call_builder { use ink::env::{ + DefaultEnvironment, call::{ - build_call, ExecutionInput, Selector, + build_call, }, - DefaultEnvironment, }; #[ink(storage)] @@ -172,7 +172,9 @@ mod call_builder { let call_result = client.call(&origin, &call).dry_run().await?; assert!(call_result.did_revert()); let err_msg = String::from_utf8_lossy(call_result.return_data()); - assert!(err_msg.contains("Cross-contract call failed with CouldNotReadInput")); + assert!( + err_msg.contains("Cross-contract call failed with CouldNotReadInput") + ); Ok(()) } diff --git a/integration-tests/internal/lang-err/call-builder/lib.rs b/integration-tests/internal/lang-err/call-builder/lib.rs index 1e26633712e..c8c0499421c 100755 --- a/integration-tests/internal/lang-err/call-builder/lib.rs +++ b/integration-tests/internal/lang-err/call-builder/lib.rs @@ -20,15 +20,15 @@ mod call_builder { use constructors_return_value::ConstructorsReturnValueRef; use ink::{ + H256, env::{ + DefaultEnvironment, call::{ - build_call, ExecutionInput, Selector, + build_call, }, - DefaultEnvironment, }, - H256, }; #[ink(storage)] @@ -259,7 +259,9 @@ mod call_builder { let call_result = client.call(&ink_e2e::bob(), &call).dry_run().await?; assert!(call_result.did_revert()); let err_msg = String::from_utf8_lossy(call_result.return_data()); - assert!(err_msg.contains("Cross-contract call failed with CouldNotReadInput")); + assert!( + err_msg.contains("Cross-contract call failed with CouldNotReadInput") + ); Ok(()) } diff --git a/integration-tests/internal/mapping/lib.rs b/integration-tests/internal/mapping/lib.rs index 5d78429e67c..cf59d8dc87d 100755 --- a/integration-tests/internal/mapping/lib.rs +++ b/integration-tests/internal/mapping/lib.rs @@ -5,12 +5,12 @@ #[ink::contract] mod mapping { use ink::{ + U256, prelude::{ string::String, vec::Vec, }, storage::Mapping, - U256, }; #[derive(Debug, PartialEq)] diff --git a/integration-tests/internal/system-precompile/lib.rs b/integration-tests/internal/system-precompile/lib.rs index 5d78429e67c..cf59d8dc87d 100755 --- a/integration-tests/internal/system-precompile/lib.rs +++ b/integration-tests/internal/system-precompile/lib.rs @@ -5,12 +5,12 @@ #[ink::contract] mod mapping { use ink::{ + U256, prelude::{ string::String, vec::Vec, }, storage::Mapping, - U256, }; #[derive(Debug, PartialEq)] diff --git a/integration-tests/public/complex-storage-structures/lib.rs b/integration-tests/public/complex-storage-structures/lib.rs index 6193ce07715..6e02e888f9c 100644 --- a/integration-tests/public/complex-storage-structures/lib.rs +++ b/integration-tests/public/complex-storage-structures/lib.rs @@ -3,6 +3,7 @@ #[ink::contract] pub mod complex_structures { use ink::storage::{ + Mapping, traits::{ AutoKey, ManualKey, @@ -10,7 +11,6 @@ pub mod complex_structures { StorableHint, StorageKey, }, - Mapping, }; /// Non-packed type usage diff --git a/integration-tests/public/contract-invocation/lib.rs b/integration-tests/public/contract-invocation/lib.rs index b044238d2b7..e4fa439b310 100644 --- a/integration-tests/public/contract-invocation/lib.rs +++ b/integration-tests/public/contract-invocation/lib.rs @@ -5,13 +5,13 @@ mod instantiate_contract { use contract1::Contract1Ref; use contract2::Contract2Ref; use ink::{ + H256, env::call::{ - build_call, - build_create, ExecutionInput, Selector, + build_call, + build_create, }, - H256, }; #[ink(storage)] @@ -362,8 +362,8 @@ mod instantiate_contract { InstantiationResult, }; use virtual_contract::{ - virtual_contract::VirtualContract, VirtualContractRef, + virtual_contract::VirtualContract, }; use virtual_contract_ver1::VirtualContractVer1Ref; use virtual_contract_ver2::VirtualContractVer2Ref; diff --git a/integration-tests/public/contract-invocation/virtual_contract/lib.rs b/integration-tests/public/contract-invocation/virtual_contract/lib.rs index d3696fcca09..09329751299 100644 --- a/integration-tests/public/contract-invocation/virtual_contract/lib.rs +++ b/integration-tests/public/contract-invocation/virtual_contract/lib.rs @@ -5,9 +5,9 @@ pub use self::virtual_contract::VirtualContractRef; #[ink::contract] pub mod virtual_contract { use ink::env::call::{ - build_call, ExecutionInput, Selector, + build_call, }; #[ink(storage)] diff --git a/integration-tests/public/debugging-strategies/lib.rs b/integration-tests/public/debugging-strategies/lib.rs index 08d8195ebb6..f3666861bde 100755 --- a/integration-tests/public/debugging-strategies/lib.rs +++ b/integration-tests/public/debugging-strategies/lib.rs @@ -12,10 +12,10 @@ #[ink::contract] mod debugging_strategies { use ink::env::call::{ - build_call, - build_create, ExecutionInput, Selector, + build_call, + build_create, }; #[cfg(feature = "debug")] use ink::prelude::{ @@ -222,8 +222,11 @@ mod debugging_strategies { let return_data = call_res.return_data(); assert!(call_res.did_revert()); let revert_msg = String::from_utf8_lossy(return_data); - assert!(revert_msg - .contains("dispatching ink! message failed: paid an unpayable message")); + assert!( + revert_msg.contains( + "dispatching ink! message failed: paid an unpayable message" + ) + ); Ok(()) } diff --git a/integration-tests/public/dns/lib.rs b/integration-tests/public/dns/lib.rs index 8e1c14d24c2..b51a6f51eed 100644 --- a/integration-tests/public/dns/lib.rs +++ b/integration-tests/public/dns/lib.rs @@ -3,8 +3,8 @@ #[ink::contract] mod dns { use ink::{ - storage::Mapping, H256, + storage::Mapping, }; /// Emitted whenever a new name is being registered. diff --git a/integration-tests/public/e2e-call-runtime/lib.rs b/integration-tests/public/e2e-call-runtime/lib.rs index d079822fcf0..e9a69e337e3 100644 --- a/integration-tests/public/e2e-call-runtime/lib.rs +++ b/integration-tests/public/e2e-call-runtime/lib.rs @@ -30,9 +30,9 @@ pub mod e2e_call_runtime { use super::*; use ink::env::Environment; use ink_e2e::{ - subxt::dynamic::Value, ChainBackend, ContractsBackend, + subxt::dynamic::Value, }; type E2EResult = std::result::Result>; diff --git a/integration-tests/public/erc1155/lib.rs b/integration-tests/public/erc1155/lib.rs index 82f94339794..feae2c9b0e1 100644 --- a/integration-tests/public/erc1155/lib.rs +++ b/integration-tests/public/erc1155/lib.rs @@ -1,9 +1,9 @@ #![cfg_attr(not(feature = "std"), no_std, no_main)] use ink::{ - prelude::vec::Vec, Address, U256, + prelude::vec::Vec, }; // This is the return value that we expect if a smart contract supports receiving ERC-1155 @@ -192,8 +192,8 @@ mod erc1155 { use super::*; use ink::{ - storage::Mapping, U256, + storage::Mapping, }; type Owner = Address; @@ -380,9 +380,9 @@ mod erc1155 { #[cfg(not(test))] { use ink::env::call::{ - build_call, ExecutionInput, Selector, + build_call, }; // If our recipient is a smart contract we need to see if they accept or @@ -707,15 +707,17 @@ mod erc1155 { fn can_send_tokens_between_accounts() { let mut erc = init_contract(); - assert!(erc - .safe_transfer_from(alice(), bob(), 1, 5.into(), vec![]) - .is_ok()); + assert!( + erc.safe_transfer_from(alice(), bob(), 1, 5.into(), vec![]) + .is_ok() + ); assert_eq!(erc.balance_of(alice(), 1), U256::from(5)); assert_eq!(erc.balance_of(bob(), 1), U256::from(15)); - assert!(erc - .safe_transfer_from(alice(), bob(), 2, 5.into(), vec![]) - .is_ok()); + assert!( + erc.safe_transfer_from(alice(), bob(), 2, 5.into(), vec![]) + .is_ok() + ); assert_eq!(erc.balance_of(alice(), 2), U256::from(15)); assert_eq!(erc.balance_of(bob(), 2), U256::from(5)); } @@ -739,15 +741,16 @@ mod erc1155 { #[ink::test] fn can_send_batch_tokens() { let mut erc = init_contract(); - assert!(erc - .safe_batch_transfer_from( + assert!( + erc.safe_batch_transfer_from( alice(), bob(), vec![1, 2], vec![U256::from(5), U256::from(10)], vec![] ) - .is_ok()); + .is_ok() + ); let balances = erc.balance_of_batch(vec![alice(), bob()], vec![1, 2]); assert_eq!( @@ -788,9 +791,10 @@ mod erc1155 { assert!(erc.set_approval_for_all(operator, true).is_ok()); set_sender(operator); - assert!(erc - .safe_transfer_from(owner, charlie(), 1, 5.into(), vec![]) - .is_ok()); + assert!( + erc.safe_transfer_from(owner, charlie(), 1, 5.into(), vec![]) + .is_ok() + ); assert_eq!(erc.balance_of(alice(), 1), U256::from(5)); assert_eq!(erc.balance_of(charlie(), 1), U256::from(5)); } diff --git a/integration-tests/public/erc20/lib.rs b/integration-tests/public/erc20/lib.rs index f2b51b2bfea..19028cfa996 100644 --- a/integration-tests/public/erc20/lib.rs +++ b/integration-tests/public/erc20/lib.rs @@ -3,8 +3,8 @@ #[ink::contract] mod erc20 { use ink::{ - storage::Mapping, U256, + storage::Mapping, }; /// A simple ERC-20 contract. diff --git a/integration-tests/public/events/lib.rs b/integration-tests/public/events/lib.rs index a163549d01a..95d63361568 100644 --- a/integration-tests/public/events/lib.rs +++ b/integration-tests/public/events/lib.rs @@ -127,36 +127,54 @@ pub mod events { fn collects_specs_for_all_linked_and_used_events() { let event_specs = ink::collect_events(); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"ForeignFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineCustomFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"ThirtyTwoByteTopics")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"EventDefAnotherCrate")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"AnonymousEvent")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineAnonymousEvent")); - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"InlineAnonymousEventHashedTopic")); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"ForeignFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineCustomFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"ThirtyTwoByteTopics") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"EventDefAnotherCrate") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"AnonymousEvent") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineAnonymousEvent") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"InlineAnonymousEventHashedTopic") + ); // The event is not used directly in the code, but is included in the metadata // because we implement the trait from the `event_def_unused` crate. - assert!(event_specs - .iter() - .any(|evt| evt.label() == &"EventDefUnused")); + assert!( + event_specs + .iter() + .any(|evt| evt.label() == &"EventDefUnused") + ); assert_eq!(9, event_specs.len()); } diff --git a/integration-tests/public/multisig/lib.rs b/integration-tests/public/multisig/lib.rs index db08dc9cf6e..f7bf38a5b05 100755 --- a/integration-tests/public/multisig/lib.rs +++ b/integration-tests/public/multisig/lib.rs @@ -64,17 +64,17 @@ pub use self::multisig::{ #[ink::contract] mod multisig { use ink::{ + U256, env::{ + CallFlags, call::{ - build_call, ExecutionInput, + build_call, }, - CallFlags, }, prelude::vec::Vec, scale::Output, storage::Mapping, - U256, }; /// Tune this to your liking but be wary that allowing too many owners will not @@ -304,15 +304,15 @@ mod multisig { /// ```should_panic /// use ink::{ /// env::{ + /// DefaultEnvironment as Env, + /// Environment, /// call::{ - /// utils::ArgumentList, /// Call, /// CallParams, /// ExecutionInput, /// Selector, + /// utils::ArgumentList, /// }, - /// DefaultEnvironment as Env, - /// Environment, /// }, /// scale::Encode, /// selector_bytes, diff --git a/integration-tests/public/trait-erc20/lib.rs b/integration-tests/public/trait-erc20/lib.rs index b3fdfdfa1d2..b4b59eb6688 100644 --- a/integration-tests/public/trait-erc20/lib.rs +++ b/integration-tests/public/trait-erc20/lib.rs @@ -3,8 +3,8 @@ #[ink::contract] mod erc20 { use ink::{ - storage::Mapping, U256, + storage::Mapping, }; /// The ERC-20 error types. diff --git a/integration-tests/public/upgradeable-contracts/delegator/delegatee/lib.rs b/integration-tests/public/upgradeable-contracts/delegator/delegatee/lib.rs index 72d591280d2..5111d13201e 100644 --- a/integration-tests/public/upgradeable-contracts/delegator/delegatee/lib.rs +++ b/integration-tests/public/upgradeable-contracts/delegator/delegatee/lib.rs @@ -3,8 +3,8 @@ #[ink::contract] pub mod delegatee { use ink::storage::{ - traits::ManualKey, Mapping, + traits::ManualKey, }; #[ink(storage)] pub struct Delegatee { diff --git a/integration-tests/public/upgradeable-contracts/delegator/delegatee2/lib.rs b/integration-tests/public/upgradeable-contracts/delegator/delegatee2/lib.rs index 6fe9d375bf7..54d5f801182 100644 --- a/integration-tests/public/upgradeable-contracts/delegator/delegatee2/lib.rs +++ b/integration-tests/public/upgradeable-contracts/delegator/delegatee2/lib.rs @@ -3,8 +3,8 @@ #[ink::contract] pub mod delegatee2 { use ink::storage::{ - traits::ManualKey, Mapping, + traits::ManualKey, }; #[ink(storage)] pub struct Delegatee2 { diff --git a/integration-tests/public/upgradeable-contracts/delegator/lib.rs b/integration-tests/public/upgradeable-contracts/delegator/lib.rs index d957e1221b9..82bcfbbb71a 100644 --- a/integration-tests/public/upgradeable-contracts/delegator/lib.rs +++ b/integration-tests/public/upgradeable-contracts/delegator/lib.rs @@ -4,19 +4,19 @@ pub mod delegator { use ink::{ env::{ + CallFlags, + DefaultEnvironment, call::{ - build_call, ExecutionInput, Selector, + build_call, }, - CallFlags, - DefaultEnvironment, }, primitives::H256, storage::{ - traits::ManualKey, Lazy, Mapping, + traits::ManualKey, }, }; diff --git a/integration-tests/solidity-abi/events/lib.rs b/integration-tests/solidity-abi/events/lib.rs index f7e62c5ef52..239809fb292 100644 --- a/integration-tests/solidity-abi/events/lib.rs +++ b/integration-tests/solidity-abi/events/lib.rs @@ -130,19 +130,27 @@ pub mod events { assert!(event_specs.iter().any(|evt| evt.name == "ForeignFlipped")); assert!(event_specs.iter().any(|evt| evt.name == "InlineFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "InlineCustomFlipped")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "ThirtyTwoByteTopics")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "EventDefAnotherCrate")); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "InlineCustomFlipped") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "ThirtyTwoByteTopics") + ); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "EventDefAnotherCrate") + ); assert!(event_specs.iter().any(|evt| evt.name == "AnonymousEvent")); - assert!(event_specs - .iter() - .any(|evt| evt.name == "InlineAnonymousEvent")); + assert!( + event_specs + .iter() + .any(|evt| evt.name == "InlineAnonymousEvent") + ); assert!(event_specs.iter().any(|evt| evt.name == "EventDefUnused")); assert!(event_specs.iter().any(|evt| { diff --git a/integration-tests/solidity-abi/sol-cross-contract/e2e_tests.rs b/integration-tests/solidity-abi/sol-cross-contract/e2e_tests.rs index 838c84abf78..741cbbe6b0a 100644 --- a/integration-tests/solidity-abi/sol-cross-contract/e2e_tests.rs +++ b/integration-tests/solidity-abi/sol-cross-contract/e2e_tests.rs @@ -1,16 +1,16 @@ use super::sol_cross_contract::*; use ink_e2e::ContractsRegistry; use ink_sandbox::{ - api::prelude::*, DefaultSandbox, Sandbox, + api::prelude::*, }; use ink::{ - primitives::DepositLimit, Address, SolDecode, SolEncode, + primitives::DepositLimit, }; use ink_sandbox::frame_system::pallet_prelude::OriginFor; use pallet_revive::ExecReturnValue; @@ -179,8 +179,8 @@ impl ContractSandbox { fn keccak_selector(input: &[u8]) -> Vec { let mut output = [0; 32]; use sha3::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha3::Keccak256::new(); hasher.update(input); diff --git a/integration-tests/solidity-abi/sol-cross-contract/lib.rs b/integration-tests/solidity-abi/sol-cross-contract/lib.rs index db00bdc1a73..48b16b5c275 100755 --- a/integration-tests/solidity-abi/sol-cross-contract/lib.rs +++ b/integration-tests/solidity-abi/sol-cross-contract/lib.rs @@ -7,14 +7,14 @@ mod sol_cross_contract { use crate::keccak_selector; use ink::{ + U256, env::{ + CallFlags, call::{ - build_call_sol, ExecutionInput, + build_call_sol, }, - CallFlags, }, - U256, }; #[ink(storage)] @@ -48,8 +48,8 @@ mod sol_cross_contract { fn keccak_selector(input: &[u8]) -> [u8; 4] { let mut output = [0; 32]; use sha3::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha3::Keccak256::new(); hasher.update(input); diff --git a/integration-tests/solidity-abi/sol-encoding/e2e_tests.rs b/integration-tests/solidity-abi/sol-encoding/e2e_tests.rs index 8f01be00648..ba753d52518 100644 --- a/integration-tests/solidity-abi/sol-encoding/e2e_tests.rs +++ b/integration-tests/solidity-abi/sol-encoding/e2e_tests.rs @@ -1,16 +1,16 @@ use crate::sol_encoding::SolEncodingRef; use ink::{ - primitives::DepositLimit, Address, SolDecode, SolEncode, + primitives::DepositLimit, }; use ink_e2e::ContractsRegistry; use ink_sandbox::{ - api::prelude::*, - frame_system::pallet_prelude::OriginFor, DefaultSandbox, Sandbox, + api::prelude::*, + frame_system::pallet_prelude::OriginFor, }; use pallet_revive::ExecReturnValue; @@ -131,8 +131,8 @@ impl ContractSandbox { fn keccak_selector(input: &[u8]) -> Vec { let mut output = [0; 32]; use sha3::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha3::Keccak256::new(); hasher.update(input); diff --git a/integration-tests/solidity-abi/solidity-calls-flipper/e2e_tests.rs b/integration-tests/solidity-abi/solidity-calls-flipper/e2e_tests.rs index 6f6d3bc53d2..4b05ad8f54d 100644 --- a/integration-tests/solidity-abi/solidity-calls-flipper/e2e_tests.rs +++ b/integration-tests/solidity-abi/solidity-calls-flipper/e2e_tests.rs @@ -1,18 +1,18 @@ use crate::flipper::FlipperRef; use ink::{ + Address, + SolDecode, + SolEncode, env::{ Balance, DefaultEnvironment, }, - Address, - SolDecode, - SolEncode, }; use ink_e2e::{ - subxt::tx::Signer, - subxt_signer, PolkadotConfig, Weight, + subxt::tx::Signer, + subxt_signer, }; use std::{ error::Error, @@ -324,8 +324,8 @@ impl Drop for SolidityHandler { fn keccak_selector(input: &[u8]) -> Vec { let mut output = [0; 32]; use sha3::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha3::Keccak256::new(); hasher.update(input); diff --git a/integration-tests/solidity-abi/solidity-calls-flipper/lib.rs b/integration-tests/solidity-abi/solidity-calls-flipper/lib.rs index 6132b7fe44b..3034ea7abb8 100644 --- a/integration-tests/solidity-abi/solidity-calls-flipper/lib.rs +++ b/integration-tests/solidity-abi/solidity-calls-flipper/lib.rs @@ -4,11 +4,11 @@ pub mod flipper { use crate::keccak_selector; use ink::env::{ + CallFlags, call::{ - build_call_sol, ExecutionInput, + build_call_sol, }, - CallFlags, }; #[ink(storage)] pub struct Flipper { @@ -85,8 +85,8 @@ pub mod flipper { fn keccak_selector(input: &[u8]) -> [u8; 4] { let mut output = [0; 32]; use sha3::{ - digest::generic_array::GenericArray, Digest as _, + digest::generic_array::GenericArray, }; let mut hasher = sha3::Keccak256::new(); hasher.update(input); From fe7515be28aee77130636f0302f5de0de85398da Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Tue, 9 Sep 2025 03:55:02 +0300 Subject: [PATCH 17/18] Update `Cargo.lock` --- Cargo.lock | 1345 +++++++++------------------------------------------- 1 file changed, 214 insertions(+), 1131 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c94f3e61e4..aef42524b78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -1055,16 +1055,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "binary-merkle-tree" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", -] - [[package]] name = "bip32" version = "0.5.3" @@ -1688,7 +1678,7 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "contract-build" version = "6.0.0-alpha.1" -source = "git+https://github.com/use-ink/cargo-contract?branch=master#3111d4769cef197c23d81f46a8f538d7e91633f1" +source = "git+https://github.com/use-ink/cargo-contract?branch=master#d844358fc1a5e289be71ca105d718a7aba3f3c52" dependencies = [ "alloy-json-abi", "anyhow", @@ -1730,7 +1720,7 @@ dependencies = [ [[package]] name = "contract-metadata" version = "6.0.0-alpha.1" -source = "git+https://github.com/use-ink/cargo-contract?branch=master#3111d4769cef197c23d81f46a8f538d7e91633f1" +source = "git+https://github.com/use-ink/cargo-contract?branch=master#d844358fc1a5e289be71ca105d718a7aba3f3c52" dependencies = [ "anyhow", "impl-serde", @@ -2395,14 +2385,6 @@ dependencies = [ "alloy-core", ] -[[package]] -name = "ethereum-standards" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "alloy-core", -] - [[package]] name = "ethereum-types" version = "0.15.1" @@ -2559,70 +2541,32 @@ name = "frame-benchmarking" version = "28.0.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-support-procedural 23.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-system 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-support", + "frame-support-procedural", + "frame-system", "linregress", "log", "parity-scale-codec", "paste", "scale-info", "serde", - "sp-api 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-application-crypto 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-storage 19.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-storage", "static_assertions", ] -[[package]] -name = "frame-benchmarking" -version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "frame-support 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "frame-support-procedural 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "frame-system 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "linregress", - "log", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "sp-api 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "static_assertions", -] - -[[package]] -name = "frame-decode" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cb8796f93fa038f979a014234d632e9688a120e745f936e2635123c77537f7" -dependencies = [ - "frame-metadata 21.0.0", - "parity-scale-codec", - "scale-decode", - "scale-info", - "scale-type-resolver", - "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "frame-decode" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e56c0e51972d7b26ff76966c4d0f2307030df9daa5ce0885149ece1ab7ca5ad" dependencies = [ - "frame-metadata 23.0.0", + "frame-metadata", "parity-scale-codec", "scale-decode", "scale-info", @@ -2636,7 +2580,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c470df86cf28818dd3cd2fc4667b80dbefe2236c722c3dc1d09e7c6c82d6dfcd" dependencies = [ - "frame-metadata 23.0.0", + "frame-metadata", "parity-scale-codec", "scale-decode", "scale-encode", @@ -2646,28 +2590,6 @@ dependencies = [ "thiserror 2.0.16", ] -[[package]] -name = "frame-metadata" -version = "20.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26de808fa6461f2485dc51811aefed108850064994fb4a62b3ac21ffa62ac8df" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", -] - -[[package]] -name = "frame-metadata" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20dfd1d7eae1d94e32e869e2fb272d81f52dd8db57820a373adb83ea24d7d862" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", -] - [[package]] name = "frame-metadata" version = "23.0.0" @@ -2687,53 +2609,12 @@ source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea717 dependencies = [ "aquamarine", "array-bytes", - "binary-merkle-tree 13.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "bitflags 1.3.2", - "docify", - "environmental", - "frame-metadata 23.0.0", - "frame-support-procedural 23.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "impl-trait-for-tuples", - "k256", - "log", - "macro_magic", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "serde_json", - "sp-api 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-arithmetic 23.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-genesis-builder 0.8.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-inherents 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-metadata-ir 0.6.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-staking 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-state-machine 0.35.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-tracing 16.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-trie 29.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-weights 27.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "tt-call", -] - -[[package]] -name = "frame-support" -version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "aquamarine", - "array-bytes", - "binary-merkle-tree 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "binary-merkle-tree", "bitflags 1.3.2", "docify", "environmental", - "frame-metadata 23.0.0", - "frame-support-procedural 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "frame-metadata", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -2743,22 +2624,22 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-api 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-genesis-builder 0.8.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-inherents 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-metadata-ir 0.6.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-staking 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-crypto-hashing-proc-macro", + "sp-debug-derive", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-metadata-ir", + "sp-runtime", + "sp-staking", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-weights", "tt-call", ] @@ -2772,7 +2653,7 @@ dependencies = [ "derive-syn-parse", "docify", "expander", - "frame-support-procedural-tools 10.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-support-procedural-tools", "itertools 0.11.0", "macro_magic", "proc-macro-warning", @@ -2782,44 +2663,12 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "frame-support-procedural" -version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "Inflector", - "cfg-expr", - "derive-syn-parse", - "docify", - "expander", - "frame-support-procedural-tools 10.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "itertools 0.11.0", - "macro_magic", - "proc-macro-warning", - "proc-macro2", - "quote", - "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "syn 2.0.106", -] - [[package]] name = "frame-support-procedural-tools" version = "10.0.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ - "frame-support-procedural-tools-derive 11.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "frame-support-procedural-tools-derive 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", @@ -2836,16 +2685,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "frame-system" version = "28.0.0" @@ -2853,35 +2692,16 @@ source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea717 dependencies = [ "cfg-if", "docify", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-version 29.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-weights 27.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "frame-system" -version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "cfg-if", - "docify", - "frame-support 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-version 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-version", + "sp-weights", ] [[package]] @@ -3626,12 +3446,12 @@ dependencies = [ "ink_storage", "keccak-const", "linkme", - "pallet-revive-uapi 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive-uapi", "parity-scale-codec", "polkavm-derive 0.26.0", "scale-info", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-io", + "sp-runtime-interface", "staging-xcm", "tokio", "trybuild", @@ -3674,7 +3494,7 @@ dependencies = [ "cargo_metadata 0.21.0", "contract-build", "deranged 0.4.0", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-support", "funty", "impl-serde", "ink", @@ -3684,19 +3504,19 @@ dependencies = [ "ink_sandbox", "itertools 0.14.0", "jsonrpsee", - "pallet-revive 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive", "parity-scale-codec", "regex", "scale-info", "serde", "serde_json", "sha3", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-weights 27.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-runtime", + "sp-runtime-interface", + "sp-weights", "subxt", "subxt-metadata 0.44.0", "subxt-signer 0.44.0", @@ -3732,8 +3552,8 @@ dependencies = [ "derive_more 2.0.1", "hex-literal 1.0.0", "ink_primitives 6.0.0-alpha.1", - "pallet-revive 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "pallet-revive-uapi 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive", + "pallet-revive-uapi", "parity-scale-codec", "secp256k1 0.30.0", "sha2 0.10.9", @@ -3757,8 +3577,8 @@ dependencies = [ "ink_primitives 6.0.0-alpha.1", "ink_storage_traits", "num-traits", - "pallet-revive 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "pallet-revive-uapi 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive", + "pallet-revive-uapi", "parity-scale-codec", "polkavm-derive 0.26.0", "scale-decode", @@ -3768,8 +3588,8 @@ dependencies = [ "secp256k1 0.30.0", "sha2 0.10.9", "sha3", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-io", + "sp-runtime-interface", "staging-xcm", "static_assertions", ] @@ -3828,7 +3648,7 @@ dependencies = [ [[package]] name = "ink_metadata" version = "6.0.0-alpha.1" -source = "git+https://github.com/use-ink/ink?branch=master#23103110df9b552eda9335b700196662a4a0dd29" +source = "git+https://github.com/use-ink/ink?branch=master#aa8c0cabef2b11b512446264b7c12fd5fd72f709" dependencies = [ "derive_more 2.0.1", "impl-serde", @@ -3850,7 +3670,7 @@ dependencies = [ [[package]] name = "ink_prelude" version = "6.0.0-alpha.1" -source = "git+https://github.com/use-ink/ink?branch=master#23103110df9b552eda9335b700196662a4a0dd29" +source = "git+https://github.com/use-ink/ink?branch=master#aa8c0cabef2b11b512446264b7c12fd5fd72f709" dependencies = [ "cfg-if", ] @@ -3868,8 +3688,8 @@ dependencies = [ "ink_prelude 6.0.0-alpha.1", "itertools 0.14.0", "num-traits", - "pallet-revive 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "pallet-revive-uapi 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive", + "pallet-revive-uapi", "parity-scale-codec", "paste", "primitive-types 0.13.1", @@ -3877,17 +3697,17 @@ dependencies = [ "scale-encode", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-weights 27.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-core", + "sp-io", + "sp-runtime-interface", + "sp-weights", "xxhash-rust", ] [[package]] name = "ink_primitives" version = "6.0.0-alpha.1" -source = "git+https://github.com/use-ink/ink?branch=master#23103110df9b552eda9335b700196662a4a0dd29" +source = "git+https://github.com/use-ink/ink?branch=master#aa8c0cabef2b11b512446264b7c12fd5fd72f709" dependencies = [ "alloy-sol-types", "cfg-if", @@ -3896,8 +3716,8 @@ dependencies = [ "ink_prelude 6.0.0-alpha.1 (git+https://github.com/use-ink/ink?branch=master)", "itertools 0.14.0", "num-traits", - "pallet-revive 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "pallet-revive-uapi 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "pallet-revive", + "pallet-revive-uapi", "parity-scale-codec", "paste", "primitive-types 0.13.1", @@ -3905,10 +3725,10 @@ dependencies = [ "scale-encode", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-io", + "sp-runtime-interface", + "sp-weights", "xxhash-rust", ] @@ -3916,20 +3736,20 @@ dependencies = [ name = "ink_sandbox" version = "6.0.0-alpha.1" dependencies = [ - "frame-metadata 23.0.0", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-system 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-metadata", + "frame-support", + "frame-system", "ink_primitives 6.0.0-alpha.1", "pallet-balances", - "pallet-revive 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive", "pallet-timestamp", "parity-scale-codec", "paste", "scale-info", "sha3", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-core", + "sp-externalities", + "sp-io", ] [[package]] @@ -3946,7 +3766,7 @@ dependencies = [ "ink_primitives 6.0.0-alpha.1", "ink_storage_traits", "itertools 0.14.0", - "pallet-revive-uapi 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive-uapi", "parity-scale-codec", "quickcheck", "quickcheck_macros", @@ -3963,8 +3783,8 @@ dependencies = [ "parity-scale-codec", "paste", "scale-info", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-io", + "sp-runtime-interface", ] [[package]] @@ -4776,14 +4596,14 @@ version = "28.0.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ "docify", - "frame-benchmarking 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-system 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-core", + "sp-runtime", ] [[package]] @@ -4794,11 +4614,11 @@ dependencies = [ "alloy-core", "derive_more 0.99.20", "environmental", - "ethereum-standards 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "ethereum-standards", "ethereum-types", - "frame-benchmarking 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-system 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-benchmarking", + "frame-support", + "frame-system", "hex-literal 0.4.1", "humantime-serde", "impl-trait-for-tuples", @@ -4806,13 +4626,13 @@ dependencies = [ "num-bigint", "num-integer", "num-traits", - "pallet-revive-fixtures 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "pallet-revive-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "pallet-revive-uapi 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "pallet-transaction-payment 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive-fixtures", + "pallet-revive-proc-macro", + "pallet-revive-uapi", + "pallet-transaction-payment", "parity-scale-codec", "paste", - "polkavm 0.27.0", + "polkavm", "polkavm-common 0.27.0", "rand 0.8.5", "revm", @@ -4820,63 +4640,18 @@ dependencies = [ "rlp 0.6.1", "scale-info", "serde", - "sp-api 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-arithmetic 23.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-consensus-aura 0.32.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-consensus-babe 0.32.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-consensus-slots 0.32.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-api", + "sp-arithmetic", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-slots", + "sp-core", + "sp-io", + "sp-runtime", "substrate-bn", "subxt-signer 0.43.0", ] -[[package]] -name = "pallet-revive" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "alloy-core", - "derive_more 0.99.20", - "environmental", - "ethereum-standards 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "ethereum-types", - "frame-benchmarking 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "frame-support 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "frame-system 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "hex-literal 0.4.1", - "humantime-serde", - "impl-trait-for-tuples", - "log", - "num-bigint", - "num-integer", - "num-traits", - "pallet-revive-fixtures 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "pallet-revive-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "pallet-revive-uapi 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "pallet-transaction-payment 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "parity-scale-codec", - "paste", - "polkavm 0.26.0", - "polkavm-common 0.26.0", - "rand 0.8.5", - "ripemd", - "rlp 0.6.1", - "scale-info", - "serde", - "sp-api 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-consensus-aura 0.32.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-consensus-babe 0.32.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-consensus-slots 0.32.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "substrate-bn", - "subxt-signer 0.41.0", -] - [[package]] name = "pallet-revive-fixtures" version = "0.1.0" @@ -4886,25 +4661,11 @@ dependencies = [ "anyhow", "cargo_metadata 0.15.4", "hex", - "pallet-revive-uapi 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive-uapi", "polkavm-linker 0.27.0", "serde_json", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "toml 0.8.23", -] - -[[package]] -name = "pallet-revive-fixtures" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "anyhow", - "cargo_metadata 0.15.4", - "pallet-revive-uapi 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "polkavm-linker 0.26.0", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-io", "toml 0.8.23", ] @@ -4918,16 +4679,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "pallet-revive-proc-macro" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "pallet-revive-uapi" version = "0.1.0" @@ -4936,40 +4687,28 @@ dependencies = [ "bitflags 1.3.2", "const-crypto", "hex-literal 0.4.1", - "pallet-revive-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "pallet-revive-proc-macro", "parity-scale-codec", "polkavm-derive 0.27.0", "scale-info", ] -[[package]] -name = "pallet-revive-uapi" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "bitflags 1.3.2", - "pallet-revive-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "parity-scale-codec", - "polkavm-derive 0.26.0", - "scale-info", -] - [[package]] name = "pallet-timestamp" version = "27.0.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ "docify", - "frame-benchmarking 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-system 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-benchmarking", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-storage 19.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-timestamp 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-inherents", + "sp-runtime", + "sp-storage", + "sp-timestamp", ] [[package]] @@ -4977,29 +4716,14 @@ name = "pallet-transaction-payment" version = "28.0.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ - "frame-benchmarking 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "frame-system 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "pallet-transaction-payment" -version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "frame-benchmarking 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "frame-support 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "frame-system 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "frame-benchmarking", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-io", + "sp-runtime", ] [[package]] @@ -5228,19 +4952,6 @@ dependencies = [ "spki", ] -[[package]] -name = "polkavm" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa028f713d0613f0f08b8b3367402cb859218854f6b96fcbe39a501862894d6f" -dependencies = [ - "libc", - "log", - "polkavm-assembler 0.26.0", - "polkavm-common 0.26.0", - "polkavm-linux-raw 0.26.0", -] - [[package]] name = "polkavm" version = "0.27.0" @@ -5249,18 +4960,9 @@ checksum = "6ef5796e5aaa109df210fed7c6ff82e89c7bf94c28f6332d57bd0efb865fdc2a" dependencies = [ "libc", "log", - "polkavm-assembler 0.27.0", + "polkavm-assembler", "polkavm-common 0.27.0", - "polkavm-linux-raw 0.27.0", -] - -[[package]] -name = "polkavm-assembler" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4859a29e1f4ad64610c4bc2bfc40bb9a535068a034933a5b56b5e7a0febf105a" -dependencies = [ - "log", + "polkavm-linux-raw", ] [[package]] @@ -5277,11 +4979,6 @@ name = "polkavm-common" version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a5794b695626ba70d29e66e3f4f4835767452a6723f3a0bc20884b07088fe8" -dependencies = [ - "blake3", - "log", - "polkavm-assembler 0.26.0", -] [[package]] name = "polkavm-common" @@ -5291,7 +4988,7 @@ checksum = "a19805789e7bf778ac5855f6fe9350353f6a1697c2aab9bfb6fc7c831be54fad" dependencies = [ "blake3", "log", - "polkavm-assembler 0.27.0", + "polkavm-assembler", ] [[package]] @@ -5361,22 +5058,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "polkavm-linker" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb896023e5bd89bba40311797d8d42490fa4a1fd5256c74820753c5722d1e67" -dependencies = [ - "dirs", - "gimli", - "hashbrown 0.14.5", - "log", - "object", - "polkavm-common 0.26.0", - "regalloc2", - "rustc-demangle", -] - [[package]] name = "polkavm-linker" version = "0.27.0" @@ -5408,12 +5089,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "polkavm-linux-raw" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28919f542476f4158cc71e6c072b1051f38f4b514253594ac3ad80e3c0211fc8" - [[package]] name = "polkavm-linux-raw" version = "0.27.0" @@ -7199,37 +6874,15 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro 15.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-metadata-ir 0.6.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-state-machine 0.35.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-trie 29.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-version 29.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "thiserror 1.0.69", -] - -[[package]] -name = "sp-api" -version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "docify", - "hash-db", - "log", - "parity-scale-codec", - "scale-info", - "sp-api-proc-macro 15.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-metadata-ir 0.6.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-version 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-api-proc-macro", + "sp-core", + "sp-externalities", + "sp-metadata-ir", + "sp-runtime", + "sp-runtime-interface", + "sp-state-machine", + "sp-trie", + "sp-version", "thiserror 1.0.69", ] @@ -7248,41 +6901,15 @@ dependencies = [ ] [[package]] -name = "sp-api-proc-macro" -version = "15.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "Inflector", - "blake2", - "expander", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "sp-application-crypto" -version = "30.0.0" -source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" +name = "sp-application-crypto" +version = "30.0.0" +source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-application-crypto" -version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-io", ] [[package]] @@ -7299,20 +6926,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-arithmetic" -version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "docify", - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "static_assertions", -] - [[package]] name = "sp-consensus-aura" version = "0.32.0" @@ -7321,28 +6934,12 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-application-crypto 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-consensus-slots 0.32.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-inherents 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-timestamp 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-consensus-aura" -version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "async-trait", - "parity-scale-codec", - "scale-info", - "sp-api 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-consensus-slots 0.32.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-inherents 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-timestamp 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-api", + "sp-application-crypto", + "sp-consensus-slots", + "sp-inherents", + "sp-runtime", + "sp-timestamp", ] [[package]] @@ -7354,31 +6951,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-application-crypto 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-consensus-slots 0.32.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-inherents 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-timestamp 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-consensus-babe" -version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "async-trait", - "parity-scale-codec", - "scale-info", - "serde", - "sp-api 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-consensus-slots 0.32.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-inherents 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-timestamp 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-api", + "sp-application-crypto", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-timestamp", ] [[package]] @@ -7389,18 +6968,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-timestamp 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-consensus-slots" -version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-timestamp 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-timestamp", ] [[package]] @@ -7438,59 +7006,12 @@ dependencies = [ "serde", "sha2 0.10.9", "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-storage 19.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "ss58-registry", - "substrate-bip39 0.4.7 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "thiserror 1.0.69", - "tracing", - "w3f-bls", - "zeroize", -] - -[[package]] -name = "sp-core" -version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "ark-vrf", - "array-bytes", - "bitflags 1.3.2", - "blake2", - "bounded-collections", - "bs58", - "dyn-clone", - "ed25519-zebra", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "itertools 0.11.0", - "k256", - "libsecp256k1", - "log", - "merlin", - "parity-bip39", - "parity-scale-codec", - "parking_lot", - "paste", - "primitive-types 0.13.1", - "rand 0.8.5", - "scale-info", - "schnorrkel", - "secp256k1 0.28.2", - "secrecy 0.8.0", - "serde", - "sha2 0.10.9", - "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-debug-derive", + "sp-externalities", + "sp-std", + "sp-storage", "ss58-registry", - "substrate-bip39 0.4.7 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "substrate-bip39", "thiserror 1.0.69", "tracing", "w3f-bls", @@ -7524,19 +7045,6 @@ dependencies = [ "twox-hash 1.6.3", ] -[[package]] -name = "sp-crypto-hashing" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.9", - "sha3", - "twox-hash 1.6.3", -] - [[package]] name = "sp-crypto-hashing-proc-macro" version = "0.1.0" @@ -7547,16 +7055,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "sp-crypto-hashing-proc-macro" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "quote", - "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "syn 2.0.106", -] - [[package]] name = "sp-debug-derive" version = "14.0.0" @@ -7567,16 +7065,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "sp-debug-derive" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "sp-externalities" version = "0.25.0" @@ -7584,17 +7072,7 @@ source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea717 dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 19.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-externalities" -version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-storage", ] [[package]] @@ -7605,20 +7083,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde_json", - "sp-api 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-genesis-builder" -version = "0.8.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde_json", - "sp-api 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-api", + "sp-runtime", ] [[package]] @@ -7630,20 +7096,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "thiserror 1.0.69", -] - -[[package]] -name = "sp-inherents" -version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-runtime", "thiserror 1.0.69", ] @@ -7661,40 +7114,14 @@ dependencies = [ "polkavm-derive 0.26.0", "rustversion", "secp256k1 0.28.2", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-core", "sp-crypto-hashing 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-keystore 0.34.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface 24.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-state-machine 0.35.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-tracing 16.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-trie 29.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-io" -version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "bytes", - "docify", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "polkavm-derive 0.26.0", - "rustversion", - "secp256k1 0.28.2", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-tracing", + "sp-trie", "tracing", "tracing-core", ] @@ -7704,8 +7131,8 @@ name = "sp-keyring" version = "31.0.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-core", + "sp-runtime", "strum", ] @@ -7716,19 +7143,8 @@ source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea717 dependencies = [ "parity-scale-codec", "parking_lot", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-keystore" -version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "parity-scale-codec", - "parking_lot", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-externalities", ] [[package]] @@ -7736,17 +7152,7 @@ name = "sp-metadata-ir" version = "0.6.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ - "frame-metadata 23.0.0", - "parity-scale-codec", - "scale-info", -] - -[[package]] -name = "sp-metadata-ir" -version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "frame-metadata 23.0.0", + "frame-metadata", "parity-scale-codec", "scale-info", ] @@ -7760,50 +7166,12 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-panic-handler" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "backtrace", - "regex", -] - [[package]] name = "sp-runtime" version = "31.0.1" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" dependencies = [ - "binary-merkle-tree 13.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "docify", - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "num-traits", - "parity-scale-codec", - "paste", - "rand 0.8.5", - "scale-info", - "serde", - "simple-mermaid", - "sp-application-crypto 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-arithmetic 23.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-io 30.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-trie 29.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-weights 27.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "tracing", - "tuplex", -] - -[[package]] -name = "sp-runtime" -version = "31.0.1" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "binary-merkle-tree 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "binary-merkle-tree", "docify", "either", "hash256-std-hasher", @@ -7816,13 +7184,13 @@ dependencies = [ "scale-info", "serde", "simple-mermaid", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", + "sp-trie", + "sp-weights", "tracing", "tuplex", ] @@ -7836,30 +7204,12 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "polkavm-derive 0.26.0", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-storage 19.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-tracing 16.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-wasm-interface 20.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "polkavm-derive 0.26.0", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -7876,19 +7226,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "Inflector", - "expander", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "sp-staking" version = "26.0.0" @@ -7898,21 +7235,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-staking" -version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-runtime", ] [[package]] @@ -7926,30 +7250,10 @@ dependencies = [ "parking_lot", "rand 0.8.5", "smallvec", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-panic-handler 13.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-trie 29.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "thiserror 1.0.69", - "tracing", - "trie-db", -] - -[[package]] -name = "sp-state-machine" -version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand 0.8.5", - "smallvec", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-trie", "thiserror 1.0.69", "tracing", "trie-db", @@ -7960,11 +7264,6 @@ name = "sp-std" version = "14.0.0" source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1#a71ec19a94702ea71767ba5ac97603ea6c6305c1" -[[package]] -name = "sp-std" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" - [[package]] name = "sp-storage" version = "19.0.0" @@ -7974,19 +7273,7 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-storage" -version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-debug-derive", ] [[package]] @@ -7996,20 +7283,8 @@ source = "git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea717 dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents 26.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "thiserror 1.0.69", -] - -[[package]] -name = "sp-timestamp" -version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "async-trait", - "parity-scale-codec", - "sp-inherents 26.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-inherents", + "sp-runtime", "thiserror 1.0.69", ] @@ -8025,18 +7300,6 @@ dependencies = [ "tracing-subscriber 0.3.20", ] -[[package]] -name = "sp-tracing" -version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "parity-scale-codec", - "regex", - "tracing", - "tracing-core", - "tracing-subscriber 0.3.20", -] - [[package]] name = "sp-trie" version = "29.0.0" @@ -8053,34 +7316,9 @@ dependencies = [ "rand 0.8.5", "scale-info", "schnellru", - "sp-core 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-externalities 0.25.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "thiserror 1.0.69", - "tracing", - "trie-db", - "trie-root", -] - -[[package]] -name = "sp-trie" -version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "ahash", - "foldhash", - "hash-db", - "hashbrown 0.15.5", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "rand 0.8.5", - "scale-info", - "schnellru", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "substrate-prometheus-endpoint 0.17.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-core", + "sp-externalities", + "substrate-prometheus-endpoint", "thiserror 1.0.69", "tracing", "trie-db", @@ -8097,27 +7335,10 @@ dependencies = [ "parity-wasm", "scale-info", "serde", - "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-std 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-version-proc-macro 13.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "thiserror 1.0.69", -] - -[[package]] -name = "sp-version" -version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-crypto-hashing-proc-macro 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-version-proc-macro 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-crypto-hashing-proc-macro", + "sp-runtime", + "sp-std", + "sp-version-proc-macro", "thiserror 1.0.69", ] @@ -8133,18 +7354,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "sp-version-proc-macro" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "parity-scale-codec", - "proc-macro-warning", - "proc-macro2", - "quote", - "syn 2.0.106", -] - [[package]] name = "sp-wasm-interface" version = "20.0.0" @@ -8156,17 +7365,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", -] - [[package]] name = "sp-weights" version = "27.0.0" @@ -8177,22 +7375,8 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 23.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-debug-derive 14.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", -] - -[[package]] -name = "sp-weights" -version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "bounded-collections", - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7)", + "sp-arithmetic", + "sp-debug-derive", ] [[package]] @@ -8241,14 +7425,14 @@ dependencies = [ "bounded-collections", "derive-where", "environmental", - "frame-support 28.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "frame-support", "hex-literal 0.4.1", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 31.0.1 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", - "sp-weights 27.0.0 (git+https://github.com/use-ink/polkadot-sdk.git?rev=a71ec19a94702ea71767ba5ac97603ea6c6305c1)", + "sp-runtime", + "sp-weights", "tracing", "xcm-procedural", ] @@ -8299,18 +7483,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "substrate-bip39" -version = "0.4.7" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "hmac 0.12.1", - "pbkdf2", - "schnorrkel", - "sha2 0.10.9", - "zeroize", -] - [[package]] name = "substrate-bn" version = "0.6.0" @@ -8338,20 +7510,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "substrate-prometheus-endpoint" -version = "0.17.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?rev=c40b36c3a7c208f9a6837b80812473af3d9ba7f7#c40b36c3a7c208f9a6837b80812473af3d9ba7f7" -dependencies = [ - "http-body-util", - "hyper", - "hyper-util", - "log", - "prometheus", - "thiserror 1.0.69", - "tokio", -] - [[package]] name = "subtle" version = "2.6.1" @@ -8367,7 +7525,7 @@ dependencies = [ "async-trait", "derive-where", "either", - "frame-metadata 23.0.0", + "frame-metadata", "futures", "hex", "jsonrpsee", @@ -8412,36 +7570,6 @@ dependencies = [ "thiserror 2.0.16", ] -[[package]] -name = "subxt-core" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66ef00be9d64885ec94e478a58e4e39d222024b20013ae7df4fc6ece545391aa" -dependencies = [ - "base58", - "blake2", - "derive-where", - "frame-decode 0.7.1", - "frame-metadata 20.0.0", - "hashbrown 0.14.5", - "hex", - "impl-serde", - "keccak-hash", - "parity-scale-codec", - "primitive-types 0.13.1", - "scale-bits", - "scale-decode", - "scale-encode", - "scale-info", - "scale-value", - "serde", - "serde_json", - "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "subxt-metadata 0.41.0", - "thiserror 2.0.16", - "tracing", -] - [[package]] name = "subxt-core" version = "0.43.0" @@ -8452,7 +7580,7 @@ dependencies = [ "blake2", "derive-where", "frame-decode 0.8.3", - "frame-metadata 23.0.0", + "frame-metadata", "hashbrown 0.14.5", "hex", "impl-serde", @@ -8482,7 +7610,7 @@ dependencies = [ "blake2", "derive-where", "frame-decode 0.9.0", - "frame-metadata 23.0.0", + "frame-metadata", "hashbrown 0.14.5", "hex", "impl-serde", @@ -8536,21 +7664,6 @@ dependencies = [ "syn 2.0.106", ] -[[package]] -name = "subxt-metadata" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff4591673600c4388e21305788282414d26c791b4dee21b7cb0b19c10076f98" -dependencies = [ - "frame-decode 0.7.1", - "frame-metadata 20.0.0", - "hashbrown 0.14.5", - "parity-scale-codec", - "scale-info", - "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 2.0.16", -] - [[package]] name = "subxt-metadata" version = "0.43.0" @@ -8558,7 +7671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c134068711c0c46906abc0e6e4911204420331530738e18ca903a5469364d9f" dependencies = [ "frame-decode 0.8.3", - "frame-metadata 23.0.0", + "frame-metadata", "hashbrown 0.14.5", "parity-scale-codec", "scale-info", @@ -8573,7 +7686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01fb7c0bfafad78dda7084c6a2444444744af3bbf7b2502399198b9b4c20eddf" dependencies = [ "frame-decode 0.9.0", - "frame-metadata 23.0.0", + "frame-metadata", "hashbrown 0.14.5", "parity-scale-codec", "scale-info", @@ -8588,7 +7701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab68a9c20ecedb0cb7d62d64f884e6add91bb70485783bf40aa8eac5c389c6e0" dependencies = [ "derive-where", - "frame-metadata 23.0.0", + "frame-metadata", "futures", "hex", "impl-serde", @@ -8605,36 +7718,6 @@ dependencies = [ "url", ] -[[package]] -name = "subxt-signer" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a2370298a210ed1df26152db7209a85e0ed8cfbce035309c3b37f7b61755377" -dependencies = [ - "base64", - "bip32", - "bip39", - "cfg-if", - "crypto_secretbox", - "hex", - "hmac 0.12.1", - "keccak-hash", - "parity-scale-codec", - "pbkdf2", - "regex", - "schnorrkel", - "scrypt", - "secp256k1 0.30.0", - "secrecy 0.10.3", - "serde", - "serde_json", - "sha2 0.10.9", - "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "subxt-core 0.41.0", - "thiserror 2.0.16", - "zeroize", -] - [[package]] name = "subxt-signer" version = "0.43.0" From e704ddd89dd0b278c42d7319f57222ef18df38fd Mon Sep 17 00:00:00 2001 From: davidsemakula Date: Tue, 9 Sep 2025 08:52:35 +0300 Subject: [PATCH 18/18] allocate: `unsafe_op_in_unsafe_fn` --- crates/allocator/src/bump.rs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/crates/allocator/src/bump.rs b/crates/allocator/src/bump.rs index 670f225b199..90f3965f831 100644 --- a/crates/allocator/src/bump.rs +++ b/crates/allocator/src/bump.rs @@ -40,16 +40,18 @@ unsafe impl GlobalAlloc for BumpAllocator { #[inline] #[allow(static_mut_refs)] unsafe fn alloc(&self, layout: Layout) -> *mut u8 { - if INNER.is_none() { - INNER = Some(InnerAlloc::new()); - }; - match INNER - .as_mut() - .expect("We just set the value above; qed") - .alloc(layout) - { - Some(start) => start as *mut u8, - None => core::ptr::null_mut(), + unsafe { + if INNER.is_none() { + INNER = Some(InnerAlloc::new()); + }; + match INNER + .as_mut() + .expect("We just set the value above; qed") + .alloc(layout) + { + Some(start) => start as *mut u8, + None => core::ptr::null_mut(), + } } } @@ -60,7 +62,7 @@ unsafe impl GlobalAlloc for BumpAllocator { // use our regular `alloc` call here and save a bit of work. // // See: https://webassembly.github.io/spec/core/exec/modules.html#growing-memories - self.alloc(layout) + unsafe { self.alloc(layout) } } #[inline]