diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index c40a8ba382b..18f42631d70 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -40,7 +40,7 @@ sp-weights = "14.0.0" [dev-dependencies] # Required for the doctest of `MessageBuilder::call` -scale-info = { version = "2.3", default-features = false, features = ["derive"] } +scale-info = { version = "2.5", default-features = false, features = ["derive"] } [features] default = ["std"] diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index 504758ee928..7157be4b9e6 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -48,7 +48,7 @@ secp256k1 = { version = "0.27.0", features = ["recovery", "global-context"], opt # # Sadly couldn't be marked as dev-dependency. # Never use this crate outside the off-chain environment! -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink = { path = "../ink" } diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index 08742746d1e..1dd74ad93c3 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -32,7 +32,7 @@ ink_metadata = { path = "../metadata", default-features = false } trybuild = { version = "1.0.60", features = ["diff"] } # Required for the doctest of `env_access::EnvAccess::instantiate_contract` -scale-info = { version = "2.3", default-features = false, features = ["derive"] } +scale-info = { version = "2.5", default-features = false, features = ["derive"] } [features] default = ["std"] diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index 957853742d8..e5146f97eb5 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -31,7 +31,7 @@ ink = { path = ".." } ink_metadata = { path = "../../metadata" } ink_prelude = { path = "../../prelude" } ink_storage = { path = "../../storage" } -scale-info = { version = "2.3", default-features = false, features = ["derive"] } +scale-info = { version = "2.5", default-features = false, features = ["derive"] } [lib] name = "ink_macro" diff --git a/crates/ink/tests/return_type_metadata.rs b/crates/ink/tests/return_type_metadata.rs index cd956899f72..d7f41a9bb93 100644 --- a/crates/ink/tests/return_type_metadata.rs +++ b/crates/ink/tests/return_type_metadata.rs @@ -66,21 +66,21 @@ mod tests { ) -> (&'a Type, &'a Type) { assert_eq!( "Result", - format!("{}", ty.path()), + format!("{}", ty.path), "Message return type should be a Result" ); - match ty.type_def() { + match &ty.type_def { TypeDef::Variant(variant) => { - assert_eq!(2, variant.variants().len()); - let ok_variant = &variant.variants()[0]; - let ok_field = &ok_variant.fields()[0]; - let ok_ty = resolve_type(metadata, ok_field.ty().id()); - assert_eq!("Ok", ok_variant.name()); + assert_eq!(2, variant.variants.len()); + let ok_variant = &variant.variants[0]; + let ok_field = &ok_variant.fields[0]; + let ok_ty = resolve_type(metadata, ok_field.ty.id); + assert_eq!("Ok", ok_variant.name); - let err_variant = &variant.variants()[1]; - let err_field = &err_variant.fields()[0]; - let err_ty = resolve_type(metadata, err_field.ty().id()); - assert_eq!("Err", err_variant.name()); + let err_variant = &variant.variants[1]; + let err_field = &err_variant.fields[0]; + let err_ty = resolve_type(metadata, err_field.ty.id); + assert_eq!("Err", err_variant.name); (ok_ty, err_ty) } @@ -107,10 +107,10 @@ mod tests { assert_eq!("TraitDefinition::get_value", message.label()); let type_spec = message.return_type().opt_type().unwrap(); - let ty = resolve_type(&metadata, type_spec.ty().id()); + let ty = resolve_type(&metadata, type_spec.ty().id); let (ok_ty, _) = extract_result(&metadata, ty); - assert_eq!(&TypeDef::Primitive(TypeDefPrimitive::U32), ok_ty.type_def()); + assert_eq!(TypeDef::Primitive(TypeDefPrimitive::U32), ok_ty.type_def); } #[test] @@ -125,19 +125,18 @@ mod tests { format!("{}", type_spec.display_name()) ); - let outer_result_ty = resolve_type(&metadata, type_spec.ty().id()); + let outer_result_ty = resolve_type(&metadata, type_spec.ty().id); let (outer_ok_ty, outer_err_ty) = extract_result(&metadata, outer_result_ty); let (inner_ok_ty, _) = extract_result(&metadata, outer_ok_ty); assert_eq!( - format!("{}", outer_err_ty.path()), + format!("{}", outer_err_ty.path), "ink_primitives::LangError" ); let unit_ty = TypeDef::Tuple(TypeDefTuple::new_portable(vec![])); assert_eq!( - &unit_ty, - inner_ok_ty.type_def(), + unit_ty, inner_ok_ty.type_def, "Ok variant should be a unit `()` type" ); } diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml index ec81cc398d9..ce9f27cd6e2 100644 --- a/crates/metadata/Cargo.toml +++ b/crates/metadata/Cargo.toml @@ -21,7 +21,7 @@ ink_primitives = { version = "4.1.0", path = "../primitives/", default-features serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] } impl-serde = "0.4.0" derive_more = { version = "0.99", default-features = false, features = ["from"] } -scale-info = { version = "2.3", default-features = false, features = ["derive", "serde", "decode"] } +scale-info = { version = "2.5", 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 86f852a49e7..b004b5e3788 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -18,7 +18,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } ink_prelude = { version = "4.1.0", path = "../prelude/", default-features = false } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } xxhash-rust = { version = "0.8", features = ["const_xxh32"] } [features] diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index ccbe4dabe2b..af9809a87ff 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -23,7 +23,7 @@ ink_prelude = { version = "4.1.0", path = "../prelude/", default-features = fals scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } cfg-if = "1.0" array-init = { version = "2.0", default-features = false } diff --git a/crates/storage/traits/Cargo.toml b/crates/storage/traits/Cargo.toml index f09c8a7db0c..99199608437 100644 --- a/crates/storage/traits/Cargo.toml +++ b/crates/storage/traits/Cargo.toml @@ -19,7 +19,7 @@ ink_metadata = { version = "4.1.0", path = "../../metadata", default-features = ink_primitives = { version = "4.1.0", path = "../../primitives", default-features = false } ink_prelude = { version = "4.1.0", path = "../../prelude", default-features = false } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] paste = "1.0" diff --git a/integration-tests/basic_contract_caller/Cargo.toml b/integration-tests/basic_contract_caller/Cargo.toml index b51296a1a2a..ed758b63844 100755 --- a/integration-tests/basic_contract_caller/Cargo.toml +++ b/integration-tests/basic_contract_caller/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } # Note: We **need** to specify the `ink-as-dependency` feature. # diff --git a/integration-tests/basic_contract_caller/other_contract/Cargo.toml b/integration-tests/basic_contract_caller/other_contract/Cargo.toml index 05ffc8c7860..6bb3f3e3089 100755 --- a/integration-tests/basic_contract_caller/other_contract/Cargo.toml +++ b/integration-tests/basic_contract_caller/other_contract/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../../crates/e2e" } diff --git a/integration-tests/call-runtime/Cargo.toml b/integration-tests/call-runtime/Cargo.toml index 72aa67835a9..84538775554 100644 --- a/integration-tests/call-runtime/Cargo.toml +++ b/integration-tests/call-runtime/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false, features = ["call-runtime"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } # Substrate # diff --git a/integration-tests/conditional-compilation/Cargo.toml b/integration-tests/conditional-compilation/Cargo.toml index 121375b9a46..ca4a0f77e20 100755 --- a/integration-tests/conditional-compilation/Cargo.toml +++ b/integration-tests/conditional-compilation/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/contract-terminate/Cargo.toml b/integration-tests/contract-terminate/Cargo.toml index 4b86542b62b..31238bf1473 100644 --- a/integration-tests/contract-terminate/Cargo.toml +++ b/integration-tests/contract-terminate/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/contract-transfer/Cargo.toml b/integration-tests/contract-transfer/Cargo.toml index d1ef6b38380..f6f5403ab61 100644 --- a/integration-tests/contract-transfer/Cargo.toml +++ b/integration-tests/contract-transfer/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/custom-environment/Cargo.toml b/integration-tests/custom-environment/Cargo.toml index c227f9e42f4..f05547dfe9b 100644 --- a/integration-tests/custom-environment/Cargo.toml +++ b/integration-tests/custom-environment/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/custom_allocator/Cargo.toml b/integration-tests/custom_allocator/Cargo.toml index 958b0642599..2d7f50453c9 100755 --- a/integration-tests/custom_allocator/Cargo.toml +++ b/integration-tests/custom_allocator/Cargo.toml @@ -14,7 +14,7 @@ ink = { path = "../../crates/ink", default-features = false, features = ["no-all dlmalloc = {version = "0.2", default-features = false, features = ["global"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/dns/Cargo.toml b/integration-tests/dns/Cargo.toml index 30d9de47bc0..bb86e8a155d 100644 --- a/integration-tests/dns/Cargo.toml +++ b/integration-tests/dns/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/erc1155/Cargo.toml b/integration-tests/erc1155/Cargo.toml index 9bfffca136c..1901d76aecb 100644 --- a/integration-tests/erc1155/Cargo.toml +++ b/integration-tests/erc1155/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/erc20/Cargo.toml b/integration-tests/erc20/Cargo.toml index 1b7bbdc1f47..85ba2d1c664 100644 --- a/integration-tests/erc20/Cargo.toml +++ b/integration-tests/erc20/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/erc721/Cargo.toml b/integration-tests/erc721/Cargo.toml index 396cb40c23f..3140985e945 100644 --- a/integration-tests/erc721/Cargo.toml +++ b/integration-tests/erc721/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/flipper/Cargo.toml b/integration-tests/flipper/Cargo.toml index 926bb25a061..028546ed4e9 100644 --- a/integration-tests/flipper/Cargo.toml +++ b/integration-tests/flipper/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/incrementer/Cargo.toml b/integration-tests/incrementer/Cargo.toml index 4d8a246e14d..dafef93c08c 100644 --- a/integration-tests/incrementer/Cargo.toml +++ b/integration-tests/incrementer/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml b/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml index acb38dd323c..bc1373e3391 100755 --- a/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/call-builder/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } constructors_return_value = { path = "../constructors-return-value", default-features = false, features = ["ink-as-dependency"] } integration_flipper = { path = "../integration-flipper", default-features = false, features = ["ink-as-dependency"] } diff --git a/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml b/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml index 4213d171654..b2151fd70a7 100644 --- a/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/constructors-return-value/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../../crates/e2e" } diff --git a/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml b/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml index 5e00edae9c4..d54e93e1a51 100644 --- a/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml +++ b/integration-tests/lang-err-integration-tests/integration-flipper/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../../crates/e2e" } diff --git a/integration-tests/mapping_integration_tests/Cargo.toml b/integration-tests/mapping_integration_tests/Cargo.toml index 5f29d461860..2f7bf28621e 100755 --- a/integration-tests/mapping_integration_tests/Cargo.toml +++ b/integration-tests/mapping_integration_tests/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/multi_contract_caller/Cargo.toml b/integration-tests/multi_contract_caller/Cargo.toml index a06c4f60cab..a80507b60cf 100644 --- a/integration-tests/multi_contract_caller/Cargo.toml +++ b/integration-tests/multi_contract_caller/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } adder = { path = "adder", default-features = false, features = ["ink-as-dependency"] } subber = { path = "subber", default-features = false, features = ["ink-as-dependency"] } diff --git a/integration-tests/multi_contract_caller/accumulator/Cargo.toml b/integration-tests/multi_contract_caller/accumulator/Cargo.toml index 85c50df5d10..87171ee7400 100644 --- a/integration-tests/multi_contract_caller/accumulator/Cargo.toml +++ b/integration-tests/multi_contract_caller/accumulator/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/multi_contract_caller/adder/Cargo.toml b/integration-tests/multi_contract_caller/adder/Cargo.toml index d7c09f4f72d..5d7fc33cd88 100644 --- a/integration-tests/multi_contract_caller/adder/Cargo.toml +++ b/integration-tests/multi_contract_caller/adder/Cargo.toml @@ -10,7 +10,7 @@ ink = { path = "../../../crates/ink", default-features = false } accumulator = { path = "../accumulator", default-features = false, features = ["ink-as-dependency"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/multi_contract_caller/subber/Cargo.toml b/integration-tests/multi_contract_caller/subber/Cargo.toml index d6ddbd30b55..2f0319c9893 100644 --- a/integration-tests/multi_contract_caller/subber/Cargo.toml +++ b/integration-tests/multi_contract_caller/subber/Cargo.toml @@ -10,7 +10,7 @@ ink = { path = "../../../crates/ink", default-features = false } accumulator = { path = "../accumulator", default-features = false, features = ["ink-as-dependency"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/multisig/Cargo.toml b/integration-tests/multisig/Cargo.toml index ed51e523e94..c79fb84293b 100755 --- a/integration-tests/multisig/Cargo.toml +++ b/integration-tests/multisig/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/payment-channel/Cargo.toml b/integration-tests/payment-channel/Cargo.toml index 01701f12d6b..79d5a760f9a 100755 --- a/integration-tests/payment-channel/Cargo.toml +++ b/integration-tests/payment-channel/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"] } +scale-info = { version = "2.5", default-features = false, features = ["derive"] } [dev-dependencies] hex-literal = { version = "0.3" } diff --git a/integration-tests/psp22-extension/Cargo.toml b/integration-tests/psp22-extension/Cargo.toml index 7a6394d7ad2..12964d1aa88 100755 --- a/integration-tests/psp22-extension/Cargo.toml +++ b/integration-tests/psp22-extension/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/rand-extension/Cargo.toml b/integration-tests/rand-extension/Cargo.toml index e4738d9bba4..dea3f279c91 100755 --- a/integration-tests/rand-extension/Cargo.toml +++ b/integration-tests/rand-extension/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/set_code_hash/Cargo.toml b/integration-tests/set_code_hash/Cargo.toml index 01cc383d557..ad7348a92be 100644 --- a/integration-tests/set_code_hash/Cargo.toml +++ b/integration-tests/set_code_hash/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [dev-dependencies] ink_e2e = { path = "../../crates/e2e" } diff --git a/integration-tests/set_code_hash/updated_incrementer/Cargo.toml b/integration-tests/set_code_hash/updated_incrementer/Cargo.toml index c5e65e6893d..f7581edb4fe 100644 --- a/integration-tests/set_code_hash/updated_incrementer/Cargo.toml +++ b/integration-tests/set_code_hash/updated_incrementer/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml b/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml index 3069b485467..8d98b2cd65a 100644 --- a/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml +++ b/integration-tests/trait-dyn-cross-contract-calls/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } dyn-traits = { path = "./traits", default-features = false } diff --git a/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml b/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml index 0edecf89580..0cf71da988f 100644 --- a/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml +++ b/integration-tests/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } dyn-traits = { path = "../../traits", default-features = false } diff --git a/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml b/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml index 10f172681a1..6908901455b 100644 --- a/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml +++ b/integration-tests/trait-dyn-cross-contract-calls/traits/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/trait-erc20/Cargo.toml b/integration-tests/trait-erc20/Cargo.toml index 76146dcefba..5b950a06fa2 100644 --- a/integration-tests/trait-erc20/Cargo.toml +++ b/integration-tests/trait-erc20/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/trait-flipper/Cargo.toml b/integration-tests/trait-flipper/Cargo.toml index 73dbd6bf368..357f76754e5 100644 --- a/integration-tests/trait-flipper/Cargo.toml +++ b/integration-tests/trait-flipper/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] path = "lib.rs" diff --git a/integration-tests/trait-incrementer/Cargo.toml b/integration-tests/trait-incrementer/Cargo.toml index bc9761fcda5..c3a1d209050 100644 --- a/integration-tests/trait-incrementer/Cargo.toml +++ b/integration-tests/trait-incrementer/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } traits = { path = "./traits", default-features = false } [lib] diff --git a/integration-tests/trait-incrementer/traits/Cargo.toml b/integration-tests/trait-incrementer/traits/Cargo.toml index bbac5ffa143..b9b09761d9a 100644 --- a/integration-tests/trait-incrementer/traits/Cargo.toml +++ b/integration-tests/trait-incrementer/traits/Cargo.toml @@ -9,7 +9,7 @@ publish = false ink = { path = "../../../crates/ink", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true } [lib] name = "traits" diff --git a/linting/Cargo.toml b/linting/Cargo.toml index c9de2a2080d..37675fca597 100644 --- a/linting/Cargo.toml +++ b/linting/Cargo.toml @@ -34,7 +34,7 @@ ink_metadata = { path = "../crates/metadata", default-features = false } ink_primitives = { path = "../crates/primitives", default-features = false } ink_storage = { path = "../crates/storage", default-features = false } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -scale-info = { version = "2.3", default-features = false, features = ["derive"] } +scale-info = { version = "2.5", default-features = false, features = ["derive"] } # For the moment we have to include the tests as examples and # then use `dylint_testing::ui_test_examples`.