Skip to content

Commit 1645903

Browse files
SkymanOneMichael Müllerpgherveoucmichi
authored
Release 5.0.0 (#2133)
* Release `5.0.0` * update lock file * add release summary * fix typos * update changelog * update changelog * update release notes * typo * add migration guide notice * fix typo * Apply suggestions from code review Co-authored-by: Michael Müller <michi@parity.io> * finish merge * update changelog * Bump drink to 14.0.0 and fix drink_client Note that there is a breaking API change in this commit The new syntax to specify a custom sandbox is now: ```diff - #[ink_e2e::test(backend(runtime_only(runtime = ink_e2e::MinimalRuntime)))] + #[ink_e2e::test(backend(runtime_only(sandbox = ink_e2e::MinimalSandbox)))] ``` * replace the export * Reexport `subxt_signer` --------- Co-authored-by: Michael Müller <michi@parity.io> Co-authored-by: PG Herveou <pgherveou@gmail.com> Co-authored-by: Michael Mueller <mich@elmueller.net>
1 parent 4206c76 commit 1645903

63 files changed

Lines changed: 944 additions & 199 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 138 additions & 26 deletions
Large diffs are not rendered by default.

‎Cargo.lock‎

Lines changed: 576 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ homepage = "https://www.parity.io/"
2929
keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
3030
license = "Apache-2.0"
3131
repository = "https://github.com/paritytech/ink"
32-
version = "5.0.0-rc.3"
32+
version = "5.0.0"
3333

3434
[workspace.dependencies]
3535
arrayref = { version = "0.3" }
@@ -40,7 +40,7 @@ cfg-if = { version = "1.0" }
4040
contract-build = { version = "4.0.0" }
4141
darling = { version = "0.20.8" }
4242
derive_more = { version = "0.99.17", default-features = false }
43-
drink = { version = "=0.13.0", default-features = false, features = ["std"] }
43+
drink = { version = "=0.14.0", default-features = false, features = ["std"] }
4444
either = { version = "1.5", default-features = false }
4545
funty = { version = "2.0.0" }
4646
heck = { version = "0.4.0" }
@@ -83,28 +83,29 @@ xxhash-rust = { version = "0.8" }
8383
const_env = { version = "0.1"}
8484

8585
# Substrate dependencies
86-
# Substrate dependencies
86+
frame-support = { version = "30.0.0", default-features = false }
8787
pallet-contracts = { version = "29.0.0", default-features = false }
8888
pallet-contracts-uapi = { package = "pallet-contracts-uapi-next", version = "=6.0.3", default-features = false }
89+
pallet-contracts-mock-network = { version = "5.0.0", default-features = false }
8990
sp-core = { version = "30.0.0", default-features = false }
9091
sp-keyring = { version = "33.0.0", default-features = false }
9192
sp-runtime = { version = "33.0.0", default-features = false }
9293
sp-weights = { version = "29.0.0", default-features = false }
9394

9495
# Local dependencies
95-
ink = { version = "=5.0.0-rc.3", path = "crates/ink", default-features = false }
96-
ink_allocator = { version = "=5.0.0-rc.3", path = "crates/allocator", default-features = false }
97-
ink_codegen = { version = "=5.0.0-rc.3", path = "crates/ink/codegen", default-features = false }
98-
ink_e2e_macro = { version = "=5.0.0-rc.3", path = "crates/e2e/macro", default-features = false }
99-
ink_engine = { version = "=5.0.0-rc.3", path = "crates/engine", default-features = false }
100-
ink_env = { version = "=5.0.0-rc.3", path = "crates/env", default-features = false }
101-
ink_ir = { version = "=5.0.0-rc.3", path = "crates/ink/ir", default-features = false }
102-
ink_macro = { version = "=5.0.0-rc.3", path = "crates/ink/macro", default-features = false }
103-
ink_metadata = { version = "=5.0.0-rc.3", path = "crates/metadata", default-features = false }
104-
ink_prelude = { version = "=5.0.0-rc.3", path = "crates/prelude", default-features = false }
105-
ink_primitives = { version = "=5.0.0-rc.3", path = "crates/primitives", default-features = false }
106-
ink_storage = { version = "=5.0.0-rc.3", path = "crates/storage", default-features = false }
107-
ink_storage_traits = { version = "=5.0.0-rc.3", path = "crates/storage/traits", default-features = false }
96+
ink = { version = "=5.0.0", path = "crates/ink", default-features = false }
97+
ink_allocator = { version = "=5.0.0", path = "crates/allocator", default-features = false }
98+
ink_codegen = { version = "=5.0.0", path = "crates/ink/codegen", default-features = false }
99+
ink_e2e_macro = { version = "=5.0.0", path = "crates/e2e/macro", default-features = false }
100+
ink_engine = { version = "=5.0.0", path = "crates/engine", default-features = false }
101+
ink_env = { version = "=5.0.0", path = "crates/env", default-features = false }
102+
ink_ir = { version = "=5.0.0", path = "crates/ink/ir", default-features = false }
103+
ink_macro = { version = "=5.0.0", path = "crates/ink/macro", default-features = false }
104+
ink_metadata = { version = "=5.0.0", path = "crates/metadata", default-features = false }
105+
ink_prelude = { version = "=5.0.0", path = "crates/prelude", default-features = false }
106+
ink_primitives = { version = "=5.0.0", path = "crates/primitives", default-features = false }
107+
ink_storage = { version = "=5.0.0", path = "crates/storage", default-features = false }
108+
ink_storage_traits = { version = "=5.0.0", path = "crates/storage/traits", default-features = false }
108109

109110
[profile.release]
110111
panic = "abort"

‎crates/e2e/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ ink_primitives = { workspace = true, default-features = true }
2323
cargo_metadata = { workspace = true }
2424
contract-build = { workspace = true }
2525
drink = { workspace = true, optional = true }
26+
pallet-contracts-mock-network = { workspace = true, optional = true }
2627
funty = { workspace = true }
2728
impl-serde = { workspace = true }
2829
jsonrpsee = { workspace = true, features = ["ws-client"] }
@@ -40,6 +41,7 @@ wasm-instrument = { workspace = true }
4041
which = { workspace = true }
4142

4243
# Substrate
44+
frame-support = { workspace = true }
4345
pallet-contracts = { workspace = true }
4446
sp-core = { workspace = true }
4547
sp-keyring = { workspace = true }
@@ -66,5 +68,6 @@ std = [
6668
drink = [
6769
"dep:drink",
6870
"subxt-metadata",
71+
"pallet-contracts-mock-network",
6972
"ink_e2e_macro/drink",
7073
]

‎crates/e2e/macro/src/config.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ pub enum RuntimeOnly {
6969
#[darling(word)]
7070
#[darling(skip)]
7171
Default,
72-
Runtime(syn::Path),
72+
Sandbox(syn::Path),
7373
}
7474

7575
#[cfg(any(test, feature = "drink"))]
7676
impl From<RuntimeOnly> for syn::Path {
7777
fn from(value: RuntimeOnly) -> Self {
7878
match value {
79-
RuntimeOnly::Default => syn::parse_quote! { ::ink_e2e::MinimalRuntime },
80-
RuntimeOnly::Runtime(path) => path,
79+
RuntimeOnly::Default => syn::parse_quote! { ::ink_e2e::MinimalSandbox },
80+
RuntimeOnly::Sandbox(path) => path,
8181
}
8282
}
8383
}
@@ -151,15 +151,15 @@ mod tests {
151151
#[test]
152152
fn config_works_runtime_only_with_custom_backend() {
153153
let input = quote! {
154-
backend(runtime_only(runtime = ::ink_e2e::MinimalRuntime)),
154+
backend(runtime_only(sandbox = ::ink_e2e::MinimalSandbox)),
155155
};
156156
let config =
157157
E2EConfig::from_list(&NestedMeta::parse_meta_list(input).unwrap()).unwrap();
158158

159159
assert_eq!(
160160
config.backend(),
161-
Backend::RuntimeOnly(RuntimeOnly::Runtime(
162-
syn::parse_quote! { ::ink_e2e::MinimalRuntime }
161+
Backend::RuntimeOnly(RuntimeOnly::Sandbox(
162+
syn::parse_quote! { ::ink_e2e::MinimalSandbox }
163163
))
164164
);
165165
}

0 commit comments

Comments
 (0)