Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to scale-info 1.0, introduce metadata format versioning #845

Merged
merged 26 commits into from
Oct 11, 2021
Merged

Update to scale-info 1.0, introduce metadata format versioning #845

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
12cc986
Bump scale-info requirement to 0.9
ascjones Jul 7, 2021
b803ad3
Update manual TypeInfo impls
ascjones Jul 7, 2021
b5bf2f6
Use decode feature of scale-info
ascjones Jul 7, 2021
f6510ee
scale-info 1.0
ascjones Sep 2, 2021
2ea963b
Merge branch 'master' into aj-upgrade-scale-info
ascjones Sep 2, 2021
af5c447
Fix tests, 0 indexing on type registry
ascjones Sep 2, 2021
21840d4
Update some missing examples
ascjones Sep 2, 2021
7d2e874
Merge branch 'master' into aj-upgrade-scale-info
ascjones Sep 9, 2021
8e99c6b
TMP: use ink rc5 for compat with cargo-contract
ascjones Sep 9, 2021
076c826
Merge branch 'master' into aj-upgrade-scale-info
ascjones Sep 9, 2021
ca128db
Update RELEASES.md
ascjones Sep 14, 2021
ec4267e
Merge branch 'master' into aj-upgrade-scale-info
ascjones Sep 14, 2021
19e0657
Merge branch 'master' into aj-upgrade-scale-info
ascjones Sep 20, 2021
0bff439
Merge branch 'master' into aj-upgrade-scale-info
ascjones Sep 20, 2021
00b8e8b
Merge branch 'master' into aj-upgrade-scale-info
ascjones Sep 23, 2021
7cb8738
Bump versions back to 1.0
ascjones Sep 23, 2021
63f8d71
Introduce versioning of ink metadata format
ascjones Sep 23, 2021
cf74e21
Update RELEASES.md
ascjones Sep 23, 2021
f0cefa7
Update crates/metadata/src/lib.rs
ascjones Sep 23, 2021
3d5e67d
Clippy: allow large enum variant
ascjones Sep 23, 2021
c18b1a4
Merge remote-tracking branch 'origin/aj-upgrade-scale-info' into aj-u…
ascjones Sep 23, 2021
51372f2
[storage] Allow one variant enum to derive SpreadLayout (#942)
tash-2s Sep 27, 2021
faa729b
CI: remove gcda files from cache (#943)
TriplEight Sep 28, 2021
45edc50
Update pretty_assertions requirement from 0.7.1 to 1.0.0 (#944)
dependabot[bot] Sep 29, 2021
94d1cd6
Merge branch 'master' into aj-upgrade-scale-info
ascjones Oct 11, 2021
405888c
Add 'versioning' to spellcheck dict
ascjones Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ This is the 6th release candidate for ink! 3.0.

## Changed

- Update to scale-info 1.0 - [#845](https://github.com/paritytech/ink/pull/845).
ascjones marked this conversation as resolved.
Show resolved Hide resolved
- Message and constructor selectors no longer take their inputs as string but as `u32` decodable integer. For example:

- It is no longer possible to specify a selector as `#[ink(selector = "0xC0DECAFE")]`.
Expand Down
2 changes: 1 addition & 1 deletion crates/env/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ blake2 = { version = "0.9", optional = true }
# 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 = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion crates/lang/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static_assertions = "1.1"

[dev-dependencies]
# required for the doctest of `env_access::EnvAccess::instantiate_contract`
scale-info = { version = "0.6", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion crates/lang/macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ink_lang = { version = "3.0.0-rc5", path = ".." }
ink_prelude = { version = "3.0.0-rc5", path = "../../prelude/" }

trybuild = "1.0.24"
scale-info = { version = "0.6", default-features = false, features = ["derive"] }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }

[lib]
name = "ink_lang_macro"
Expand Down
2 changes: 1 addition & 1 deletion crates/metadata/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ink_primitives = { version = "3.0.0-rc5", 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 = "0.6", default-features = false, features = ["derive", "serde"] }
scale-info = { version = "1.0", default-features = false, features = ["derive", "serde", "decode"] }

[dev-dependencies]
pretty_assertions = "0.7.1"
Expand Down
18 changes: 9 additions & 9 deletions crates/metadata/src/layout/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fn named_fields_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 1,
"ty": 0,
}
},
"name": "a",
Expand All @@ -71,7 +71,7 @@ fn named_fields_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 2,
"ty": 1,
}
},
"name": "b",
Expand Down Expand Up @@ -115,7 +115,7 @@ fn tuple_struct_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 1,
"ty": 0,
}
},
"name": null,
Expand All @@ -128,7 +128,7 @@ fn tuple_struct_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 2,
"ty": 1,
}
},
"name": null,
Expand Down Expand Up @@ -261,7 +261,7 @@ fn mixed_enum_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 1,
"ty": 0,
}
},
"name": null,
Expand All @@ -274,7 +274,7 @@ fn mixed_enum_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 2,
"ty": 1,
}
},
"name": null,
Expand All @@ -291,7 +291,7 @@ fn mixed_enum_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 1,
"ty": 0,
}
},
"name": "a",
Expand All @@ -304,7 +304,7 @@ fn mixed_enum_work() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 2,
"ty": 1,
}
},
"name": "b",
Expand Down Expand Up @@ -348,7 +348,7 @@ fn unbounded_layout_works() {
0000000000000000\
0000000000000000\
0000000000000000",
"ty": 1
"ty": 0
}
},
"offset": "0x\
Expand Down
6 changes: 3 additions & 3 deletions crates/metadata/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ fn spec_contract_json() {
"displayName": [
"i32"
],
"type": 1
"type": 0
}
}
],
Expand All @@ -140,7 +140,7 @@ fn spec_contract_json() {
"displayName": [
"i32"
],
"type": 1
"type": 0
}
}
],
Expand All @@ -161,7 +161,7 @@ fn spec_contract_json() {
"displayName": [
"i32"
],
"type": 1
"type": 0
},
"selector": "0x25444afe"
}
Expand Down
2 changes: 1 addition & 1 deletion crates/primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]
[dependencies]
ink_prelude = { version = "3.0.0-rc5", path = "../prelude/", default-features = false }
scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[dev-dependencies]
criterion = "0.3.1"
Expand Down
4 changes: 3 additions & 1 deletion crates/primitives/src/key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ const _: () = {
fn type_info() -> Type {
Type::builder()
.path(Path::new("Key", "ink_primitives"))
.composite(Fields::unnamed().field_of::<[u8; 32]>("[u8; 32]"))
.composite(
Fields::unnamed().field(|f| f.ty::<[u8; 32]>().type_name("[u8; 32]")),
)
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion crates/storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ink_prelude = { version = "3.0.0-rc5", path = "../prelude/", default-features =

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
derive_more = { version = "0.99", default-features = false, features = ["from", "display"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }
cfg-if = "1.0"
array-init = { version = "2.0", default-features = false }

Expand Down
7 changes: 5 additions & 2 deletions crates/storage/src/alloc/boxed/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,11 @@ const _: () = {
// .type_params(vec![scale_info::MetaType::new::<T>()])
.composite(
scale_info::build::Fields::named()
.field_of::<DynamicAllocation>("allocation", "DynamicAllocation"),
)
.field(|f| f
.name("allocation")
.ty::<DynamicAllocation>()
.type_name("DynamicAllocation"),
))
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion examples/contract-terminate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "contract_terminate"
Expand Down
2 changes: 1 addition & 1 deletion examples/contract-transfer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features
ink_prelude = { version = "3.0.0-rc5", path = "../../crates/prelude", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "contract_transfer"
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ scale = { package = "parity-scale-codec", version = "2.1", default-features = fa
adder = { version = "3.0.0-rc5", path = "adder", default-features = false, features = ["ink-as-dependency"] }
subber = { version = "3.0.0-rc5", path = "subber", default-features = false, features = ["ink-as-dependency"] }
accumulator = { version = "3.0.0-rc5", path = "accumulator", default-features = false, features = ["ink-as-dependency"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "delegator"
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/accumulator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../../crates/storage", default
ink_lang = { version = "3.0.0-rc5", path = "../../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "accumulator"
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/adder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ink_lang = { version = "3.0.0-rc5", path = "../../../crates/lang", default-featu
accumulator = { version = "3.0.0-rc5", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "adder"
Expand Down
2 changes: 1 addition & 1 deletion examples/delegator/subber/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ink_lang = { version = "3.0.0-rc5", path = "../../../crates/lang", default-featu
accumulator = { version = "3.0.0-rc5", path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "subber"
Expand Down
2 changes: 1 addition & 1 deletion examples/dns/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "dns"
Expand Down
2 changes: 1 addition & 1 deletion examples/erc1155/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features
ink_prelude = { version = "3.0.0-rc5", path = "../../crates/prelude", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "erc1155"
Expand Down
2 changes: 1 addition & 1 deletion examples/erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "erc20"
Expand Down
2 changes: 1 addition & 1 deletion examples/erc721/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "erc721"
Expand Down
2 changes: 1 addition & 1 deletion examples/flipper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "flipper"
Expand Down
2 changes: 1 addition & 1 deletion examples/incrementer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "incrementer"
Expand Down
2 changes: 1 addition & 1 deletion examples/multisig_plain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features
ink_prelude = { version = "3.0.0-rc5", path = "../../crates/prelude", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "multisig_plain"
Expand Down
2 changes: 1 addition & 1 deletion examples/rand-extension/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { path = "../../crates/storage", default-features = false }
ink_lang = { path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "rand_extension"
Expand Down
2 changes: 1 addition & 1 deletion examples/trait-erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "trait_erc20"
Expand Down
2 changes: 1 addition & 1 deletion examples/trait-flipper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ink_storage = { version = "3.0.0-rc5", path = "../../crates/storage", default-fe
ink_lang = { version = "3.0.0-rc5", path = "../../crates/lang", default-features = false }

scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive"] }
scale-info = { version = "0.6", default-features = false, features = ["derive"], optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }

[lib]
name = "trait_flipper"
Expand Down