Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge branch 'master' into gn/5.0.0
  • Loading branch information
SkymanOne committed Mar 11, 2024
commit 47ac7ad12ccf1e88cb87c521131cc05af31ce0fd
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ See [the compatibility section](https://use.ink/faq/migrating-from-ink-4-to-5/#c
- [Drink backend] Abstract error and result structs - [#1844](https://github.com/paritytech/ink/pull/1844)

#### Changed
- Use name-only syntax for `anonymous` ink! event item configuration argument - [#2140](https://github.com/paritytech/ink/pull/2140)
- Restrict syntax for setting default ink! e2e test runtime-only emulator - [#2143](https://github.com/paritytech/ink/pull/2143)
- Restrict syntax for setting ink! e2e test node to auto - [#2146](https://github.com/paritytech/ink/pull/2146)
- Bump Substrate crates - [#2141](https://github.com/paritytech/ink/pull/2141)
- Minor fixes - [#2144](https://github.com/paritytech/ink/pull/2144),
[#2137](https://github.com/paritytech/ink/pull/2137), [#2132](https://github.com/paritytech/ink/pull/2132)
- Bump metadata version to 5 [#2126](https://github.com/paritytech/ink/pull/2126)
- Use `MaxEncodedLen` for output buffer size [#2128](https://github.com/paritytech/ink/pull/2128)
- `Mapping`: Reflect all possible failure cases in comments ‒ [#2079](https://github.com/paritytech/ink/pull/2079)
Expand Down Expand Up @@ -112,6 +118,15 @@ See [the compatibility section](https://use.ink/faq/migrating-from-ink-4-to-5/#c
- ERC-721: `transfer_token_from` now ensures the token owner is correct - [#2093](https://github.com/paritytech/ink/pull/2093)
- `RootLayout::new()` is generic again to allow using `ink_metadata` in pure `PortableForm` contexts - [#1989](https://github.com/paritytech/ink/pull/1989)

## Version 5.0.0-rc.3

### Changed
- Use name-only syntax for `anonymous` ink! event item configuration argument - [#2140](https://github.com/paritytech/ink/pull/2140)
- Restrict syntax for setting default ink! e2e test runtime-only emulator - [#2143](https://github.com/paritytech/ink/pull/2143)
- Restrict syntax for setting ink! e2e test node to auto - [#2146](https://github.com/paritytech/ink/pull/2146)
- Bump Substrate crates - [#2141](https://github.com/paritytech/ink/pull/2141)
- Minor fixes - [#2144](https://github.com/paritytech/ink/pull/2144),
[#2137](https://github.com/paritytech/ink/pull/2137), [#2132](https://github.com/paritytech/ink/pull/2132)

## Version 5.0.0-rc.2

Expand Down
90 changes: 58 additions & 32 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions integration-tests/call-builder-return-value/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "call_builder_return_value"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/call-runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "call-runtime"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/combined-extension/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "combined_extension"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/conditional-compilation/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "conditional-compilation"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"

Expand Down
4 changes: 4 additions & 0 deletions integration-tests/contract-storage/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "contract-storage"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/contract-terminate/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "contract_terminate"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/contract-transfer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "contract_transfer"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/cross-contract-calls/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "cross-contract-calls"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "other-contract"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/custom-allocator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "custom-allocator"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/custom-environment/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "custom-environment"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/dns/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "dns"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
4 changes: 4 additions & 0 deletions integration-tests/e2e-call-runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[package]
name = "e2e_call_runtime"
<<<<<<< HEAD
version = "5.0.0"
=======
version = "5.0.0-rc.3"
>>>>>>> master
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
publish = false
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.