From d35b3d729eaedd685ca1343e7b4e2a53f787b804 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 16 Feb 2022 16:19:26 +0000 Subject: [PATCH] Update to parity-scale-codec `3` and scale-info `2` (#1132) * Update parity-scale-codec and scale-info dependencies * Add note to RELEASES.md * Fix UI tests --- RELEASES.md | 13 +++++++++++++ crates/engine/Cargo.toml | 2 +- crates/env/Cargo.toml | 4 ++-- crates/lang/Cargo.toml | 4 ++-- crates/lang/codegen/Cargo.toml | 2 +- crates/lang/macro/Cargo.toml | 4 ++-- .../contract/fail/message-returns-non-codec.stderr | 2 +- .../trait_def/fail/message_output_non_codec.stderr | 6 +++--- crates/metadata/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 4 ++-- crates/storage/Cargo.toml | 4 ++-- crates/storage/derive/Cargo.toml | 2 +- examples/contract-terminate/Cargo.toml | 4 ++-- examples/contract-transfer/Cargo.toml | 4 ++-- examples/delegator/Cargo.toml | 4 ++-- examples/delegator/accumulator/Cargo.toml | 4 ++-- examples/delegator/adder/Cargo.toml | 4 ++-- examples/delegator/subber/Cargo.toml | 4 ++-- examples/dns/Cargo.toml | 4 ++-- examples/erc1155/Cargo.toml | 4 ++-- examples/erc20/Cargo.toml | 4 ++-- examples/erc721/Cargo.toml | 4 ++-- examples/flipper/Cargo.toml | 4 ++-- examples/incrementer/Cargo.toml | 4 ++-- examples/multisig/Cargo.toml | 4 ++-- examples/proxy/Cargo.toml | 4 ++-- examples/rand-extension/Cargo.toml | 4 ++-- examples/trait-erc20/Cargo.toml | 4 ++-- examples/trait-flipper/Cargo.toml | 4 ++-- examples/trait-incrementer/Cargo.toml | 4 ++-- 30 files changed, 67 insertions(+), 54 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index fd3fea234e6..2d37ec0c919 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,16 @@ +# Unreleased + +### Please upgrade `scale-info` and `parity-scale-codec` in your contract's dependencies + +In this release candidate we upgraded `scale-info` and `parity-scale-codec`. You have to use a compatible +version in your contract's `Cargo.toml` as well; `cargo-contract` will throw an error otherwise. + +The `Cargo.toml` should contain +``` +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } +``` + # Version 3.0-rc8 This is the 8th release candidate for ink! 3.0. diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index 63428716e6e..089f7198c42 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -15,7 +15,7 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive", "full"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } sha2 = { version = "0.10" } diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index 3b27e5db791..9c642607a4a 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -20,7 +20,7 @@ ink_allocator = { version = "3.0.0-rc8", path = "../allocator/", default-feature ink_primitives = { version = "3.0.0-rc8", path = "../primitives/", default-features = false } ink_prelude = { version = "3.0.0-rc8", path = "../prelude/", default-features = false } -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive", "full"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } num-traits = { version = "0.2", default-features = false, features = ["i128"] } cfg-if = "1.0" @@ -47,7 +47,7 @@ secp256k1 = { version = "0.21.2", features = ["recovery", "global-context"], opt # Sadly couldn't be marked as dev-dependency. # Never use this crate outside the off-chain environment! rand = { version = "0.8", default-features = false, features = ["alloc"], optional = true } -scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [features] default = ["std"] diff --git a/crates/lang/Cargo.toml b/crates/lang/Cargo.toml index ec927257112..9f1e6edee36 100644 --- a/crates/lang/Cargo.toml +++ b/crates/lang/Cargo.toml @@ -23,7 +23,7 @@ ink_prelude = { version = "3.0.0-rc8", path = "../prelude", default-features = f ink_eth_compatibility = { version = "3.0.0-rc8", path = "../eth_compatibility", default-features = false } ink_lang_macro = { version = "3.0.0-rc8", path = "macro", default-features = false } -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive", "full"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from"] } [dev-dependencies] @@ -32,7 +32,7 @@ ink_metadata = { version = "3.0.0-rc8", default-features = false, path = "../met trybuild = { version = "1.0.52", features = ["diff"] } # Required for the doctest of `env_access::EnvAccess::instantiate_contract` -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"] } [features] default = ["std"] diff --git a/crates/lang/codegen/Cargo.toml b/crates/lang/codegen/Cargo.toml index 156c37af01c..c0435a18c8c 100644 --- a/crates/lang/codegen/Cargo.toml +++ b/crates/lang/codegen/Cargo.toml @@ -27,7 +27,7 @@ itertools = "0.10" either = { version = "1.5", default-features = false } blake2 = "0.10" heck = "0.4.0" -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive", "full"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } impl-serde = "0.3.1" [features] diff --git a/crates/lang/macro/Cargo.toml b/crates/lang/macro/Cargo.toml index 8023e556b07..9b1e05271ff 100644 --- a/crates/lang/macro/Cargo.toml +++ b/crates/lang/macro/Cargo.toml @@ -19,7 +19,7 @@ ink_lang_ir = { version = "3.0.0-rc8", path = "../ir", default-features = false ink_lang_codegen = { version = "3.0.0-rc8", path = "../codegen", default-features = false } ink_primitives = { version = "3.0.0-rc8", path = "../../primitives/", default-features = false } -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } syn = "1" proc-macro2 = "1" @@ -28,7 +28,7 @@ ink_metadata = { version = "3.0.0-rc8", path = "../../metadata/" } ink_env = { version = "3.0.0-rc8", path = "../../env/" } ink_storage = { version = "3.0.0-rc8", path = "../../storage/" } ink_lang = { version = "3.0.0-rc8", path = ".." } -scale-info = { version = "1.0", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"] } [lib] name = "ink_lang_macro" diff --git a/crates/lang/tests/ui/contract/fail/message-returns-non-codec.stderr b/crates/lang/tests/ui/contract/fail/message-returns-non-codec.stderr index 44cf44c34bb..bbaedf2a244 100644 --- a/crates/lang/tests/ui/contract/fail/message-returns-non-codec.stderr +++ b/crates/lang/tests/ui/contract/fail/message-returns-non-codec.stderr @@ -40,7 +40,7 @@ error[E0599]: the method `fire` exists for struct `ink_env::call::CallBuilder $CARGO/parity-scale-codec-2.3.1/src/codec.rs + --> $CARGO/parity-scale-codec-3.0.0/src/codec.rs | | / pub trait Decode: Sized { | | // !INTERNAL USE ONLY! diff --git a/crates/lang/tests/ui/trait_def/fail/message_output_non_codec.stderr b/crates/lang/tests/ui/trait_def/fail/message_output_non_codec.stderr index ffdb0343f25..102a12c5b8f 100644 --- a/crates/lang/tests/ui/trait_def/fail/message_output_non_codec.stderr +++ b/crates/lang/tests/ui/trait_def/fail/message_output_non_codec.stderr @@ -6,9 +6,9 @@ error[E0277]: the trait bound `NonCodec: WrapperTypeEncode` is not satisfied | = note: required because of the requirements on the impl of `Encode` for `NonCodec` note: required by a bound in `DispatchOutput` - --> src/codegen/dispatch/type_check.rs:69:8 + --> src/codegen/dispatch/type_check.rs | -69 | T: scale::Encode + 'static; + | T: scale::Encode + 'static; | ^^^^^^^^^^^^^ required by this bound in `DispatchOutput` error[E0599]: the method `fire` exists for struct `CallBuilder::AccountId>, Unset, Unset<::Balance>, Set>>, Set>>`, but its trait bounds were not satisfied @@ -24,7 +24,7 @@ error[E0599]: the method `fire` exists for struct `CallBuilder $CARGO/parity-scale-codec-2.3.1/src/codec.rs + --> $CARGO/parity-scale-codec-3.0.0/src/codec.rs | | / pub trait Decode: Sized { | | // !INTERNAL USE ONLY! diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml index 875ad8dcea5..365a17c5c13 100644 --- a/crates/metadata/Cargo.toml +++ b/crates/metadata/Cargo.toml @@ -21,7 +21,7 @@ ink_primitives = { version = "3.0.0-rc8", path = "../primitives/", default-featu serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] } impl-serde = "0.3.1" derive_more = { version = "0.99", default-features = false, features = ["from"] } -scale-info = { version = "1.0", default-features = false, features = ["derive", "serde", "decode"] } +scale-info = { version = "2", default-features = false, features = ["derive", "serde", "decode"] } [dev-dependencies] pretty_assertions = "1" diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 4486d1fffa0..b80efa1f1ea 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -16,8 +16,8 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] ink_prelude = { version = "3.0.0-rc8", path = "../prelude/", default-features = false } -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive", "full"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } cfg-if = "1" [dev-dependencies] diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 097fbf9700e..063541348ef 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -21,9 +21,9 @@ ink_primitives = { version = "3.0.0-rc8", path = "../primitives/", default-featu ink_storage_derive = { version = "3.0.0-rc8", path = "derive", default-features = false } ink_prelude = { version = "3.0.0-rc8", path = "../prelude/", default-features = false } -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive", "full"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } cfg-if = "1.0" array-init = { version = "2.0", default-features = false } diff --git a/crates/storage/derive/Cargo.toml b/crates/storage/derive/Cargo.toml index 921312a8d1f..9e5c49c308b 100644 --- a/crates/storage/derive/Cargo.toml +++ b/crates/storage/derive/Cargo.toml @@ -24,7 +24,7 @@ proc-macro2 = "1" synstructure = "0.12.4" [dev-dependencies] -scale = { package = "parity-scale-codec", version = "2.3", default-features = false, features = ["derive", "full"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } ink_env = { version = "3.0.0-rc8", path = "../../env" } ink_primitives = { version = "3.0.0-rc8", path = "../../primitives" } ink_metadata = { version = "3.0.0-rc8", path = "../../metadata" } diff --git a/examples/contract-terminate/Cargo.toml b/examples/contract-terminate/Cargo.toml index 3fda1cb347a..59802ca2f14 100644 --- a/examples/contract-terminate/Cargo.toml +++ b/examples/contract-terminate/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "contract_terminate" diff --git a/examples/contract-transfer/Cargo.toml b/examples/contract-transfer/Cargo.toml index dd3416d8bc4..a3eec338313 100644 --- a/examples/contract-transfer/Cargo.toml +++ b/examples/contract-transfer/Cargo.toml @@ -12,8 +12,8 @@ ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-fe ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } ink_prelude = { version = "3.0.0-rc8", path = "../../crates/prelude", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "contract_transfer" diff --git a/examples/delegator/Cargo.toml b/examples/delegator/Cargo.toml index ff36839be84..0d9be78692d 100644 --- a/examples/delegator/Cargo.toml +++ b/examples/delegator/Cargo.toml @@ -11,12 +11,12 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } adder = { version = "3.0.0-rc8", path = "adder", default-features = false, features = ["ink-as-dependency"] } subber = { version = "3.0.0-rc8", path = "subber", default-features = false, features = ["ink-as-dependency"] } accumulator = { version = "3.0.0-rc8", path = "accumulator", default-features = false, features = ["ink-as-dependency"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "delegator" diff --git a/examples/delegator/accumulator/Cargo.toml b/examples/delegator/accumulator/Cargo.toml index 5b83b551473..aa44450cc1c 100644 --- a/examples/delegator/accumulator/Cargo.toml +++ b/examples/delegator/accumulator/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../../crates/env", default-feature ink_storage = { version = "3.0.0-rc8", path = "../../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "accumulator" diff --git a/examples/delegator/adder/Cargo.toml b/examples/delegator/adder/Cargo.toml index 0d9633573e1..d134bd212d2 100644 --- a/examples/delegator/adder/Cargo.toml +++ b/examples/delegator/adder/Cargo.toml @@ -13,8 +13,8 @@ ink_lang = { version = "3.0.0-rc8", path = "../../../crates/lang", default-featu accumulator = { version = "3.0.0-rc8", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "adder" diff --git a/examples/delegator/subber/Cargo.toml b/examples/delegator/subber/Cargo.toml index 1af99693a92..9aba9e41d93 100644 --- a/examples/delegator/subber/Cargo.toml +++ b/examples/delegator/subber/Cargo.toml @@ -13,8 +13,8 @@ ink_lang = { version = "3.0.0-rc8", path = "../../../crates/lang", default-featu accumulator = { version = "3.0.0-rc8", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "subber" diff --git a/examples/dns/Cargo.toml b/examples/dns/Cargo.toml index 6a3184cfff4..fb95fe716d5 100644 --- a/examples/dns/Cargo.toml +++ b/examples/dns/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "dns" diff --git a/examples/erc1155/Cargo.toml b/examples/erc1155/Cargo.toml index 5167cfe6a13..fb62b82db67 100644 --- a/examples/erc1155/Cargo.toml +++ b/examples/erc1155/Cargo.toml @@ -12,8 +12,8 @@ ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-fe ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } ink_prelude = { version = "3.0.0-rc8", path = "../../crates/prelude", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "erc1155" diff --git a/examples/erc20/Cargo.toml b/examples/erc20/Cargo.toml index 450f86109c2..2c8443ce7ec 100644 --- a/examples/erc20/Cargo.toml +++ b/examples/erc20/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "erc20" diff --git a/examples/erc721/Cargo.toml b/examples/erc721/Cargo.toml index ed49044cc5b..d966c8439ea 100644 --- a/examples/erc721/Cargo.toml +++ b/examples/erc721/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "erc721" diff --git a/examples/flipper/Cargo.toml b/examples/flipper/Cargo.toml index 5d0c74c156a..93d25cd6b13 100644 --- a/examples/flipper/Cargo.toml +++ b/examples/flipper/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "flipper" diff --git a/examples/incrementer/Cargo.toml b/examples/incrementer/Cargo.toml index 2ff5829cee5..2cc40f4e8cf 100644 --- a/examples/incrementer/Cargo.toml +++ b/examples/incrementer/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "incrementer" diff --git a/examples/multisig/Cargo.toml b/examples/multisig/Cargo.toml index 9ee13e36d4a..028107621d8 100755 --- a/examples/multisig/Cargo.toml +++ b/examples/multisig/Cargo.toml @@ -12,8 +12,8 @@ ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-fe ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } ink_prelude = { version = "3.0.0-rc8", path = "../../crates/prelude", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "multisig" diff --git a/examples/proxy/Cargo.toml b/examples/proxy/Cargo.toml index f308e045f33..062504b9c56 100644 --- a/examples/proxy/Cargo.toml +++ b/examples/proxy/Cargo.toml @@ -12,8 +12,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] } -scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "proxy" diff --git a/examples/rand-extension/Cargo.toml b/examples/rand-extension/Cargo.toml index 4c33fda6121..0cbddbc0ef2 100755 --- a/examples/rand-extension/Cargo.toml +++ b/examples/rand-extension/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "rand_extension" diff --git a/examples/trait-erc20/Cargo.toml b/examples/trait-erc20/Cargo.toml index e00e5934ddb..2cfd63f5347 100644 --- a/examples/trait-erc20/Cargo.toml +++ b/examples/trait-erc20/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "trait_erc20" diff --git a/examples/trait-flipper/Cargo.toml b/examples/trait-flipper/Cargo.toml index a69b36598c3..4fc06ee3f9c 100644 --- a/examples/trait-flipper/Cargo.toml +++ b/examples/trait-flipper/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "trait_flipper" diff --git a/examples/trait-incrementer/Cargo.toml b/examples/trait-incrementer/Cargo.toml index 2db6dd29ed7..957ecb8b164 100644 --- a/examples/trait-incrementer/Cargo.toml +++ b/examples/trait-incrementer/Cargo.toml @@ -11,8 +11,8 @@ ink_env = { version = "3.0.0-rc8", path = "../../crates/env", default-features = ink_storage = { version = "3.0.0-rc8", path = "../../crates/storage", default-features = false } ink_lang = { version = "3.0.0-rc8", path = "../../crates/lang", default-features = false } -scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive"] } -scale-info = { version = "1", default-features = false, features = ["derive"], optional = true } +scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } +scale-info = { version = "2", default-features = false, features = ["derive"], optional = true } [lib] name = "trait_incrementer"