Skip to content

Commit

Permalink
Release 5.0.0 (#2133)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@SkymanOne @cmichi @pgherveou
4 people committed Mar 13, 2024
1 parent 4206c76 commit 1645903
Show file tree
Hide file tree
Showing 63 changed files with 944 additions and 199 deletions.
164 changes: 138 additions & 26 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

610 changes: 576 additions & 34 deletions Cargo.lock
View file

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ homepage = "https://www.parity.io/"
keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
license = "Apache-2.0"
repository = "https://github.com/paritytech/ink"
version = "5.0.0-rc.3"
version = "5.0.0"

[workspace.dependencies]
arrayref = { version = "0.3" }
Expand All @@ -40,7 +40,7 @@ cfg-if = { version = "1.0" }
contract-build = { version = "4.0.0" }
darling = { version = "0.20.8" }
derive_more = { version = "0.99.17", default-features = false }
drink = { version = "=0.13.0", default-features = false, features = ["std"] }
drink = { version = "=0.14.0", default-features = false, features = ["std"] }
either = { version = "1.5", default-features = false }
funty = { version = "2.0.0" }
heck = { version = "0.4.0" }
Expand Down Expand Up @@ -83,28 +83,29 @@ xxhash-rust = { version = "0.8" }
const_env = { version = "0.1"}

# Substrate dependencies
# Substrate dependencies
frame-support = { version = "30.0.0", default-features = false }
pallet-contracts = { version = "29.0.0", default-features = false }
pallet-contracts-uapi = { package = "pallet-contracts-uapi-next", version = "=6.0.3", default-features = false }
pallet-contracts-mock-network = { version = "5.0.0", default-features = false }
sp-core = { version = "30.0.0", default-features = false }
sp-keyring = { version = "33.0.0", default-features = false }
sp-runtime = { version = "33.0.0", default-features = false }
sp-weights = { version = "29.0.0", default-features = false }

# Local dependencies
ink = { version = "=5.0.0-rc.3", path = "crates/ink", default-features = false }
ink_allocator = { version = "=5.0.0-rc.3", path = "crates/allocator", default-features = false }
ink_codegen = { version = "=5.0.0-rc.3", path = "crates/ink/codegen", default-features = false }
ink_e2e_macro = { version = "=5.0.0-rc.3", path = "crates/e2e/macro", default-features = false }
ink_engine = { version = "=5.0.0-rc.3", path = "crates/engine", default-features = false }
ink_env = { version = "=5.0.0-rc.3", path = "crates/env", default-features = false }
ink_ir = { version = "=5.0.0-rc.3", path = "crates/ink/ir", default-features = false }
ink_macro = { version = "=5.0.0-rc.3", path = "crates/ink/macro", default-features = false }
ink_metadata = { version = "=5.0.0-rc.3", path = "crates/metadata", default-features = false }
ink_prelude = { version = "=5.0.0-rc.3", path = "crates/prelude", default-features = false }
ink_primitives = { version = "=5.0.0-rc.3", path = "crates/primitives", default-features = false }
ink_storage = { version = "=5.0.0-rc.3", path = "crates/storage", default-features = false }
ink_storage_traits = { version = "=5.0.0-rc.3", path = "crates/storage/traits", default-features = false }
ink = { version = "=5.0.0", path = "crates/ink", default-features = false }
ink_allocator = { version = "=5.0.0", path = "crates/allocator", default-features = false }
ink_codegen = { version = "=5.0.0", path = "crates/ink/codegen", default-features = false }
ink_e2e_macro = { version = "=5.0.0", path = "crates/e2e/macro", default-features = false }
ink_engine = { version = "=5.0.0", path = "crates/engine", default-features = false }
ink_env = { version = "=5.0.0", path = "crates/env", default-features = false }
ink_ir = { version = "=5.0.0", path = "crates/ink/ir", default-features = false }
ink_macro = { version = "=5.0.0", path = "crates/ink/macro", default-features = false }
ink_metadata = { version = "=5.0.0", path = "crates/metadata", default-features = false }
ink_prelude = { version = "=5.0.0", path = "crates/prelude", default-features = false }
ink_primitives = { version = "=5.0.0", path = "crates/primitives", default-features = false }
ink_storage = { version = "=5.0.0", path = "crates/storage", default-features = false }
ink_storage_traits = { version = "=5.0.0", path = "crates/storage/traits", default-features = false }

[profile.release]
panic = "abort"
Expand Down
3 changes: 3 additions & 0 deletions crates/e2e/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ ink_primitives = { workspace = true, default-features = true }
cargo_metadata = { workspace = true }
contract-build = { workspace = true }
drink = { workspace = true, optional = true }
pallet-contracts-mock-network = { workspace = true, optional = true }
funty = { workspace = true }
impl-serde = { workspace = true }
jsonrpsee = { workspace = true, features = ["ws-client"] }
Expand All @@ -40,6 +41,7 @@ wasm-instrument = { workspace = true }
which = { workspace = true }

# Substrate
frame-support = { workspace = true }
pallet-contracts = { workspace = true }
sp-core = { workspace = true }
sp-keyring = { workspace = true }
Expand All @@ -66,5 +68,6 @@ std = [
drink = [
"dep:drink",
"subxt-metadata",
"pallet-contracts-mock-network",
"ink_e2e_macro/drink",
]
12 changes: 6 additions & 6 deletions crates/e2e/macro/src/config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ pub enum RuntimeOnly {
#[darling(word)]
#[darling(skip)]
Default,
Runtime(syn::Path),
Sandbox(syn::Path),
}

#[cfg(any(test, feature = "drink"))]
impl From<RuntimeOnly> for syn::Path {
fn from(value: RuntimeOnly) -> Self {
match value {
RuntimeOnly::Default => syn::parse_quote! { ::ink_e2e::MinimalRuntime },
RuntimeOnly::Runtime(path) => path,
RuntimeOnly::Default => syn::parse_quote! { ::ink_e2e::MinimalSandbox },
RuntimeOnly::Sandbox(path) => path,
}
}
}
Expand Down Expand Up @@ -151,15 +151,15 @@ mod tests {
#[test]
fn config_works_runtime_only_with_custom_backend() {
let input = quote! {
backend(runtime_only(runtime = ::ink_e2e::MinimalRuntime)),
backend(runtime_only(sandbox = ::ink_e2e::MinimalSandbox)),
};
let config =
E2EConfig::from_list(&NestedMeta::parse_meta_list(input).unwrap()).unwrap();

assert_eq!(
config.backend(),
Backend::RuntimeOnly(RuntimeOnly::Runtime(
syn::parse_quote! { ::ink_e2e::MinimalRuntime }
Backend::RuntimeOnly(RuntimeOnly::Sandbox(
syn::parse_quote! { ::ink_e2e::MinimalSandbox }
))
);
}
Expand Down

0 comments on commit 1645903

Please sign in to comment.