From 894013c7a5dfe5476d185478ed0e3decd33b06ac Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 18 Nov 2022 10:25:08 +0000 Subject: [PATCH 1/6] Bump version --- crates/allocator/Cargo.toml | 2 +- crates/e2e/Cargo.toml | 6 +++--- crates/e2e/macro/Cargo.toml | 4 ++-- crates/engine/Cargo.toml | 4 ++-- crates/env/Cargo.toml | 14 +++++++------- crates/ink/Cargo.toml | 14 +++++++------- crates/ink/codegen/Cargo.toml | 6 +++--- crates/ink/ir/Cargo.toml | 2 +- crates/ink/macro/Cargo.toml | 8 ++++---- crates/metadata/Cargo.toml | 6 +++--- crates/prelude/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 4 ++-- crates/storage/Cargo.toml | 12 ++++++------ crates/storage/traits/Cargo.toml | 8 ++++---- examples/contract-terminate/Cargo.toml | 2 +- examples/contract-transfer/Cargo.toml | 2 +- examples/delegator/Cargo.toml | 2 +- examples/delegator/accumulator/Cargo.toml | 2 +- examples/delegator/adder/Cargo.toml | 2 +- examples/delegator/subber/Cargo.toml | 2 +- examples/dns/Cargo.toml | 2 +- examples/erc1155/Cargo.toml | 2 +- examples/erc20/Cargo.toml | 2 +- examples/erc721/Cargo.toml | 2 +- examples/flipper/Cargo.toml | 2 +- examples/incrementer/Cargo.toml | 2 +- .../call-builder/Cargo.toml | 2 +- .../constructors-return-value/Cargo.toml | 2 +- .../contract-ref/Cargo.toml | 2 +- .../integration-flipper/Cargo.toml | 2 +- examples/mother/Cargo.toml | 2 +- examples/multisig/Cargo.toml | 2 +- examples/payment-channel/Cargo.toml | 2 +- examples/psp22-extension/Cargo.toml | 2 +- examples/rand-extension/Cargo.toml | 2 +- examples/trait-erc20/Cargo.toml | 2 +- examples/trait-flipper/Cargo.toml | 2 +- examples/trait-incrementer/Cargo.toml | 2 +- examples/trait-incrementer/traits/Cargo.toml | 2 +- .../upgradeable-contracts/forward-calls/Cargo.toml | 2 +- .../upgradeable-contracts/set-code-hash/Cargo.toml | 2 +- .../set-code-hash/updated-incrementer/Cargo.toml | 2 +- linting/Cargo.toml | 2 +- 43 files changed, 75 insertions(+), 75 deletions(-) diff --git a/crates/allocator/Cargo.toml b/crates/allocator/Cargo.toml index 80286b8088..0603cee314 100644 --- a/crates/allocator/Cargo.toml +++ b/crates/allocator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_allocator" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 493e361ad6..1db797435c 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_e2e" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" @@ -15,8 +15,8 @@ categories = ["no-std", "embedded"] include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] -ink_e2e_macro = { version = "4.0.0-alpha.3", path = "./macro" } -ink_env = { version = "4.0.0-alpha.3", path = "../env" } +ink_e2e_macro = { version = "4.0.0-beta", path = "./macro" } +ink_env = { version = "4.0.0-beta", path = "../env" } contract-metadata = { version = "2.0.0-alpha.4" } impl-serde = { version = "0.3.1", default-features = false } diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 9f8398b847..4357480e12 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_e2e_macro" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" @@ -19,7 +19,7 @@ name = "ink_e2e_macro" proc-macro = true [dependencies] -ink_ir = { version = "4.0.0-alpha.3", path = "../../ink/ir" } +ink_ir = { version = "4.0.0-beta", path = "../../ink/ir" } derive_more = "0.99.17" env_logger = "0.9.1" log = "0.4.17" diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index 262ba058cf..8f7c4be846 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_engine" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Michael Müller "] edition = "2021" @@ -15,7 +15,7 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_primitives = { version = "4.0.0-alpha.3", path = "../../crates/primitives", default-features = false } +ink_primitives = { version = "4.0.0-beta", path = "../../crates/primitives", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index ba0806f1e9..99b345f08c 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_env" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" @@ -15,11 +15,11 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_metadata = { version = "4.0.0-alpha.3", path = "../metadata", default-features = false, features = ["derive"], optional = true } -ink_allocator = { version = "4.0.0-alpha.3", path = "../allocator", default-features = false } -ink_storage_traits = { version = "4.0.0-alpha.3", path = "../storage/traits", default-features = false } -ink_prelude = { version = "4.0.0-alpha.3", path = "../prelude", default-features = false } -ink_primitives = { version = "4.0.0-alpha.3", path = "../primitives", default-features = false } +ink_metadata = { version = "4.0.0-beta", path = "../metadata", default-features = false, features = ["derive"], optional = true } +ink_allocator = { version = "4.0.0-beta", path = "../allocator", default-features = false } +ink_storage_traits = { version = "4.0.0-beta", path = "../storage/traits", default-features = false } +ink_prelude = { version = "4.0.0-beta", path = "../prelude", default-features = false } +ink_primitives = { version = "4.0.0-beta", path = "../primitives", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } @@ -33,7 +33,7 @@ static_assertions = "1.1" rlibc = "1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -ink_engine = { version = "4.0.0-alpha.3", path = "../engine/", optional = true } +ink_engine = { version = "4.0.0-beta", path = "../engine/", optional = true } # Hashes for the off-chain environment. sha2 = { version = "0.10", optional = true } diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index 65334979e1..11f6db3d82 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" @@ -15,12 +15,12 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_env = { version = "4.0.0-alpha.3", path = "../env", default-features = false } -ink_storage = { version = "4.0.0-alpha.3", path = "../storage", default-features = false } -ink_primitives = { version = "4.0.0-alpha.3", path = "../primitives", default-features = false } -ink_metadata = { version = "4.0.0-alpha.3", path = "../metadata", default-features = false, optional = true } -ink_prelude = { version = "4.0.0-alpha.3", path = "../prelude", default-features = false } -ink_macro = { version = "4.0.0-alpha.3", path = "macro", default-features = false } +ink_env = { version = "4.0.0-beta", path = "../env", default-features = false } +ink_storage = { version = "4.0.0-beta", path = "../storage", default-features = false } +ink_primitives = { version = "4.0.0-beta", path = "../primitives", default-features = false } +ink_metadata = { version = "4.0.0-beta", path = "../metadata", default-features = false, optional = true } +ink_prelude = { version = "4.0.0-beta", path = "../prelude", default-features = false } +ink_macro = { version = "4.0.0-beta", path = "macro", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from"] } diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index 4183fcc51c..01e84bbbe4 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_codegen" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" @@ -18,8 +18,8 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] name = "ink_codegen" [dependencies] -ink_primitives = { version = "4.0.0-alpha.3", path = "../../primitives" } -ir = { version = "4.0.0-alpha.3", package = "ink_ir", path = "../ir", default-features = false } +ink_primitives = { version = "4.0.0-beta", path = "../../primitives" } +ir = { version = "4.0.0-beta", package = "ink_ir", path = "../ir", default-features = false } quote = "1" syn = { version = "1.0", features = ["parsing", "full", "extra-traits"] } proc-macro2 = "1.0" diff --git a/crates/ink/ir/Cargo.toml b/crates/ink/ir/Cargo.toml index 33012fe95a..cfdbf47994 100644 --- a/crates/ink/ir/Cargo.toml +++ b/crates/ink/ir/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_ir" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index 5e753675c9..f2d1d9b745 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_macro" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" @@ -15,9 +15,9 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_ir = { version = "4.0.0-alpha.3", path = "../ir", default-features = false } -ink_codegen = { version = "4.0.0-alpha.3", path = "../codegen", default-features = false } -ink_primitives = { version = "4.0.0-alpha.3", path = "../../primitives/", default-features = false } +ink_ir = { version = "4.0.0-beta", path = "../ir", default-features = false } +ink_codegen = { version = "4.0.0-beta", path = "../codegen", default-features = false } +ink_primitives = { version = "4.0.0-beta", path = "../../primitives/", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } syn = "1" diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml index 7fc22dc550..6136d28992 100644 --- a/crates/metadata/Cargo.toml +++ b/crates/metadata/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_metadata" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" @@ -15,8 +15,8 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_prelude = { version = "4.0.0-alpha.3", path = "../prelude/", default-features = false } -ink_primitives = { version = "4.0.0-alpha.3", path = "../primitives/", default-features = false } +ink_prelude = { version = "4.0.0-beta", path = "../prelude/", default-features = false } +ink_primitives = { version = "4.0.0-beta", path = "../primitives/", default-features = false } serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] } impl-serde = "0.4.0" diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml index 87e1f86273..e2985cfe39 100644 --- a/crates/prelude/Cargo.toml +++ b/crates/prelude/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_prelude" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index ef91e25555..39628d8f29 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_primitives" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" @@ -16,7 +16,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } -ink_prelude = { version = "4.0.0-alpha.3", path = "../prelude/", default-features = false } +ink_prelude = { version = "4.0.0-beta", path = "../prelude/", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } xxhash-rust = { version = "0.8", features = ["const_xxh32"] } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index bec90fea90..f88b9b33ac 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_storage" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies ", "Robin Freyler "] edition = "2021" @@ -15,11 +15,11 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_env = { version = "4.0.0-alpha.3", path = "../env/", default-features = false } -ink_metadata = { version = "4.0.0-alpha.3", path = "../metadata/", default-features = false, features = ["derive"], optional = true } -ink_primitives = { version = "4.0.0-alpha.3", path = "../primitives/", default-features = false } -ink_storage_traits = { version = "4.0.0-alpha.3", path = "traits", default-features = false } -ink_prelude = { version = "4.0.0-alpha.3", path = "../prelude/", default-features = false } +ink_env = { version = "4.0.0-beta", path = "../env/", default-features = false } +ink_metadata = { version = "4.0.0-beta", path = "../metadata/", default-features = false, features = ["derive"], optional = true } +ink_primitives = { version = "4.0.0-beta", path = "../primitives/", default-features = false } +ink_storage_traits = { version = "4.0.0-beta", path = "traits", default-features = false } +ink_prelude = { version = "4.0.0-beta", path = "../prelude/", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } diff --git a/crates/storage/traits/Cargo.toml b/crates/storage/traits/Cargo.toml index 9c6e7583ab..dfe91043e3 100644 --- a/crates/storage/traits/Cargo.toml +++ b/crates/storage/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_storage_traits" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" @@ -15,9 +15,9 @@ categories = ["no-std", "embedded"] include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_metadata = { version = "4.0.0-alpha.3", path = "../../metadata", default-features = false, features = ["derive"], optional = true } -ink_primitives = { version = "4.0.0-alpha.3", path = "../../primitives", default-features = false } -ink_prelude = { version = "4.0.0-alpha.3", path = "../../prelude", default-features = false } +ink_metadata = { version = "4.0.0-beta", path = "../../metadata", default-features = false, features = ["derive"], optional = true } +ink_primitives = { version = "4.0.0-beta", path = "../../primitives", default-features = false } +ink_prelude = { version = "4.0.0-beta", path = "../../prelude", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } syn = { version = "1", features = ["full"] } diff --git a/examples/contract-terminate/Cargo.toml b/examples/contract-terminate/Cargo.toml index 9d21de7b33..ac77b429b6 100644 --- a/examples/contract-terminate/Cargo.toml +++ b/examples/contract-terminate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract_terminate" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/contract-transfer/Cargo.toml b/examples/contract-transfer/Cargo.toml index 8c1d1d2aba..8ec070e17f 100644 --- a/examples/contract-transfer/Cargo.toml +++ b/examples/contract-transfer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract_transfer" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/delegator/Cargo.toml b/examples/delegator/Cargo.toml index 2c02d47a46..f5258179fc 100644 --- a/examples/delegator/Cargo.toml +++ b/examples/delegator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "delegator" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/delegator/accumulator/Cargo.toml b/examples/delegator/accumulator/Cargo.toml index 2f2076a098..dac4671af4 100644 --- a/examples/delegator/accumulator/Cargo.toml +++ b/examples/delegator/accumulator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "accumulator" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" diff --git a/examples/delegator/adder/Cargo.toml b/examples/delegator/adder/Cargo.toml index e91fcd0b0e..5c1c7be228 100644 --- a/examples/delegator/adder/Cargo.toml +++ b/examples/delegator/adder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adder" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" diff --git a/examples/delegator/subber/Cargo.toml b/examples/delegator/subber/Cargo.toml index 0f2a60f7ee..6aa7a4e825 100644 --- a/examples/delegator/subber/Cargo.toml +++ b/examples/delegator/subber/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subber" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" diff --git a/examples/dns/Cargo.toml b/examples/dns/Cargo.toml index 9d60fd74d2..5f9b41bd30 100644 --- a/examples/dns/Cargo.toml +++ b/examples/dns/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dns" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/erc1155/Cargo.toml b/examples/erc1155/Cargo.toml index 3387a93aba..5c6e6b1565 100644 --- a/examples/erc1155/Cargo.toml +++ b/examples/erc1155/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "erc1155" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/erc20/Cargo.toml b/examples/erc20/Cargo.toml index 7af8d29481..ba257a9bb0 100644 --- a/examples/erc20/Cargo.toml +++ b/examples/erc20/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "erc20" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/erc721/Cargo.toml b/examples/erc721/Cargo.toml index 3db33e5bda..398c4879f2 100644 --- a/examples/erc721/Cargo.toml +++ b/examples/erc721/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "erc721" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/flipper/Cargo.toml b/examples/flipper/Cargo.toml index ec8865dcb5..61fc563bab 100644 --- a/examples/flipper/Cargo.toml +++ b/examples/flipper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "flipper" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/incrementer/Cargo.toml b/examples/incrementer/Cargo.toml index c21681b48f..27489b4b2d 100644 --- a/examples/incrementer/Cargo.toml +++ b/examples/incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "incrementer" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/lang-err-integration-tests/call-builder/Cargo.toml b/examples/lang-err-integration-tests/call-builder/Cargo.toml index 01bdb28cc3..e25301189a 100755 --- a/examples/lang-err-integration-tests/call-builder/Cargo.toml +++ b/examples/lang-err-integration-tests/call-builder/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "call_builder" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/lang-err-integration-tests/constructors-return-value/Cargo.toml b/examples/lang-err-integration-tests/constructors-return-value/Cargo.toml index c9aaa7f5ef..70078f4555 100644 --- a/examples/lang-err-integration-tests/constructors-return-value/Cargo.toml +++ b/examples/lang-err-integration-tests/constructors-return-value/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "constructors_return_value" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/lang-err-integration-tests/contract-ref/Cargo.toml b/examples/lang-err-integration-tests/contract-ref/Cargo.toml index 0c00cff43e..a677509bdc 100755 --- a/examples/lang-err-integration-tests/contract-ref/Cargo.toml +++ b/examples/lang-err-integration-tests/contract-ref/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract_ref" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" diff --git a/examples/lang-err-integration-tests/integration-flipper/Cargo.toml b/examples/lang-err-integration-tests/integration-flipper/Cargo.toml index 7ca0071a07..8ed793d23a 100644 --- a/examples/lang-err-integration-tests/integration-flipper/Cargo.toml +++ b/examples/lang-err-integration-tests/integration-flipper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "integration_flipper" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/mother/Cargo.toml b/examples/mother/Cargo.toml index c59daabe09..4f4811da28 100755 --- a/examples/mother/Cargo.toml +++ b/examples/mother/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mother" description = "Mother of all contracts" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/multisig/Cargo.toml b/examples/multisig/Cargo.toml index ffe0345e02..2e682eae74 100755 --- a/examples/multisig/Cargo.toml +++ b/examples/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multisig" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/payment-channel/Cargo.toml b/examples/payment-channel/Cargo.toml index d69d8ecf73..1995f63676 100755 --- a/examples/payment-channel/Cargo.toml +++ b/examples/payment-channel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "payment_channel" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/psp22-extension/Cargo.toml b/examples/psp22-extension/Cargo.toml index bc538e1523..576ab61666 100755 --- a/examples/psp22-extension/Cargo.toml +++ b/examples/psp22-extension/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "psp22_extension" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/rand-extension/Cargo.toml b/examples/rand-extension/Cargo.toml index ce5a0e2c8e..90bca51abb 100755 --- a/examples/rand-extension/Cargo.toml +++ b/examples/rand-extension/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rand_extension" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/trait-erc20/Cargo.toml b/examples/trait-erc20/Cargo.toml index 29f1b99f10..72fcd5c9e0 100644 --- a/examples/trait-erc20/Cargo.toml +++ b/examples/trait-erc20/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait_erc20" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/trait-flipper/Cargo.toml b/examples/trait-flipper/Cargo.toml index 326f75e9e5..285c82cd63 100644 --- a/examples/trait-flipper/Cargo.toml +++ b/examples/trait-flipper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait_flipper" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/trait-incrementer/Cargo.toml b/examples/trait-incrementer/Cargo.toml index 521a7c8ce4..1d668accaf 100644 --- a/examples/trait-incrementer/Cargo.toml +++ b/examples/trait-incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trait-incrementer" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/trait-incrementer/traits/Cargo.toml b/examples/trait-incrementer/traits/Cargo.toml index 97cbb67ec1..82954e8389 100644 --- a/examples/trait-incrementer/traits/Cargo.toml +++ b/examples/trait-incrementer/traits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "traits" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/upgradeable-contracts/forward-calls/Cargo.toml b/examples/upgradeable-contracts/forward-calls/Cargo.toml index 4b5fdea8f6..d906890b1e 100644 --- a/examples/upgradeable-contracts/forward-calls/Cargo.toml +++ b/examples/upgradeable-contracts/forward-calls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "forward_calls" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false diff --git a/examples/upgradeable-contracts/set-code-hash/Cargo.toml b/examples/upgradeable-contracts/set-code-hash/Cargo.toml index dc80904e6c..10168f5b2c 100644 --- a/examples/upgradeable-contracts/set-code-hash/Cargo.toml +++ b/examples/upgradeable-contracts/set-code-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "incrementer" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" edition = "2021" authors = ["Parity Technologies "] publish = false diff --git a/examples/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml b/examples/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml index 2dfc635c9c..8731cebe19 100644 --- a/examples/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml +++ b/examples/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "updated-incrementer" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" edition = "2021" authors = ["Parity Technologies "] publish = false diff --git a/linting/Cargo.toml b/linting/Cargo.toml index 6e9f403fb1..339e511a6a 100644 --- a/linting/Cargo.toml +++ b/linting/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ink_linting" -version = "4.0.0-alpha.3" +version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" publish = false From 476e8047ab59a5f88ff928118a82b01e753cbaf3 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 18 Nov 2022 10:44:27 +0000 Subject: [PATCH 2/6] WIP update CHANGELOG.md --- CHANGELOG.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2af99c01a1..4c455d0fe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] -- Allows to use `Result` as a return type in constructors - [#1446](https://github.com/paritytech/ink/pull/1446) -- Checks if `#[ink_e2e::test(ws_url = "…")]` is reachable and throws meaningful error otherwise - [#1490](https://github.com/paritytech/ink/pull/1490) -- Fix E2E dry-run for `Mapping::insert()` - [#1494](https://github.com/paritytech/ink/pull/1494) +## Version 4.0.0-beta + +The focus of the first `beta` release is to establish the stable ABI for the final `4.0.0` +release. It means that whilst subsequent `beta` releases may contain breaking contract +*code* changes, the ABI will remain the same so that any contract compiled and deployed +with `4.0.0-beta` continue to be compatible with all future `4.0.0` versions. ### Breaking Changes +## Constructors and Messages return types + +TODO: Describe update to Result with LangError return types: https://github.com/paritytech/ink/issues/1207 + +## Random function removed We had to remove [`ink_env::random`](https://docs.rs/ink_env/3.3.1/ink_env/fn.random.html) with [#1442](https://github.com/paritytech/ink/pull/1442). This function allowed contract developers getting random entropy. @@ -28,11 +35,12 @@ protocol for future versions of Polkadot. ### Added - Allow using `Result` as a return type in constructors ‒ [#1446](https://github.com/paritytech/ink/pull/1446) -- Introduce conditional compilation for messages, constructors and events ‒ [#1458](https://github.com/paritytech/ink/pull/1458) - Add `Mapping::take()` function allowing to get a value removing it from storage ‒ [#1461](https://github.com/paritytech/ink/pull/1461) ### Changed +- Add support for language level errors (`LangError`) ‒ [#1450](https://github.com/paritytech/ink/pull/1450) +- Return `LangError`s from constructors ‒ [#1467](https://github.com/paritytech/ink/pull/1504) - Update `scale-info` requirement to `2.3` ‒ [#1467](https://github.com/paritytech/ink/pull/1467) - Merge `Mapping::insert(key, val)` and `Mapping::insert_return_size(key, val)` into one method - [#1463](https://github.com/paritytech/ink/pull/1463) From 847e2100282a8121e2ced1fec7bbbaea4e4fbc22 Mon Sep 17 00:00:00 2001 From: Hernando Castano Date: Mon, 21 Nov 2022 17:27:55 -0500 Subject: [PATCH 3/6] Fill out section regarding `LangError`s --- CHANGELOG.md | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c455d0fe6..900c11262a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,14 +8,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 The focus of the first `beta` release is to establish the stable ABI for the final `4.0.0` release. It means that whilst subsequent `beta` releases may contain breaking contract -*code* changes, the ABI will remain the same so that any contract compiled and deployed +*code* changes, the ABI will remain the same so that any contract compiled and deployed with `4.0.0-beta` continue to be compatible with all future `4.0.0` versions. ### Breaking Changes -## Constructors and Messages return types +## Constructors and Messages now return `LangError`s -TODO: Describe update to Result with LangError return types: https://github.com/paritytech/ink/issues/1207 +We have added a way to handle errors that are neither specific to a particular contract, +nor from the underlying execution environment (e.g `pallet-contracts`). Instead these are +errors that may come from the smart contracting language itself. + +For example, take the case where a contract message is called using an invalid selector. +This is not something a smart contract author should need to define as failure case, nor +is it something that the Contracts pallet needs to be aware of. + +Previously, the contract execution would trap if an invalid selector was used, leaving +callers with no way to handle the error gracefully. This can now be handled with the help +of the newly added `LangError`. + +In short, this change means that all ink! messages and constructors now return a +`Result`, where `R` is the original return type. Contract callers can +choose to handle the `LangError`. + +In order to make this error compatible with other languages we have also added a +`lang_error` field to the metadata format. This will be the central registry of all the +different error variants which languages may want to emit in the future. + +Related pull-requests: +- https://github.com/paritytech/ink/pull/1450 +- https://github.com/paritytech/ink/pull/1504 + +Related discussions: +- https://github.com/paritytech/ink/issues/1207 +- https://github.com/paritytech/substrate/issues/11018 +- https://github.com/paritytech/ink/issues/1002 ## Random function removed We had to remove [`ink_env::random`](https://docs.rs/ink_env/3.3.1/ink_env/fn.random.html) @@ -37,10 +64,9 @@ protocol for future versions of Polkadot. - Allow using `Result` as a return type in constructors ‒ [#1446](https://github.com/paritytech/ink/pull/1446) - Add `Mapping::take()` function allowing to get a value removing it from storage ‒ [#1461](https://github.com/paritytech/ink/pull/1461) - ### Changed - Add support for language level errors (`LangError`) ‒ [#1450](https://github.com/paritytech/ink/pull/1450) -- Return `LangError`s from constructors ‒ [#1467](https://github.com/paritytech/ink/pull/1504) +- Return `LangError`s from constructors ‒ [#1504](https://github.com/paritytech/ink/pull/1504) - Update `scale-info` requirement to `2.3` ‒ [#1467](https://github.com/paritytech/ink/pull/1467) - Merge `Mapping::insert(key, val)` and `Mapping::insert_return_size(key, val)` into one method - [#1463](https://github.com/paritytech/ink/pull/1463) From 7ebfc9854db7ed8fce266c33327b899b4b9c3fdd Mon Sep 17 00:00:00 2001 From: Hernando Castano Date: Mon, 21 Nov 2022 17:38:25 -0500 Subject: [PATCH 4/6] Mention E2E testing --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 900c11262a..7788b1b12b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -60,7 +60,19 @@ We hope to bring this function back in a future release of ink!, the best hope right now is that it could come back with [Sassafras](https://wiki.polkadot.network/docs/learn-consensus#badass-babe-sassafras), a block production protocol for future versions of Polkadot. +### End-to-End Testing + +You can now use the `ink_e2e` crate and accompanying `#[ink_e2e::test]` macro to write +integration tests directly in Rust 🎉 + +The contracts in the `examples/lang-err-integration-tests` folder make use of the +end-to-end testing framework, so check it out if you need some example usage. + +Note that it's still pretty fresh off the press, so there are some sharp edges. Feel free +to file an issue if you come across any. + ### Added +- Add E2E testing framework MVP ‒ [#1395](https://github.com/paritytech/ink/pull/1395) - Allow using `Result` as a return type in constructors ‒ [#1446](https://github.com/paritytech/ink/pull/1446) - Add `Mapping::take()` function allowing to get a value removing it from storage ‒ [#1461](https://github.com/paritytech/ink/pull/1461) From 81d93817ff15ec70e0c00671efa6d34cfcbfa115 Mon Sep 17 00:00:00 2001 From: Hernando Castano Date: Mon, 21 Nov 2022 17:49:08 -0500 Subject: [PATCH 5/6] Add some compatiblity notes --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7788b1b12b..f431e6fb99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,22 @@ release. It means that whilst subsequent `beta` releases may contain breaking co *code* changes, the ABI will remain the same so that any contract compiled and deployed with `4.0.0-beta` continue to be compatible with all future `4.0.0` versions. +### Compatibility +In order to build contracts which use ink! `v4.0.0-beta` you need to use +`cargo-contract` +[`v2.0.0-beta`](https://github.com/paritytech/cargo-contract/releases/tag/v2.0.0-beta). +You can install it as follows: + +`cargo install cargo-contract --version 2.0.0-beta` + +You will also need to use a version of [`pallet-contracts`](https://github.com/paritytech/substrate/tree/master/frame/contracts) +later than [265e3f1](https://github.com/paritytech/substrate/commit/265e3f12a2937fe4f71280b3652471627609d04f) +(Nov 3, 2022) in your node. + +The [`v0.22.1`](https://github.com/paritytech/substrate-contracts-node/releases/tag/v0.22.1) +release of the [`substrate-contracts-node`](https://github.com/paritytech/substrate-contracts-node) is +compatible with the ink! `4.0.0-beta` release. + ### Breaking Changes ## Constructors and Messages now return `LangError`s From 6ccd3aa2908d3fef7d72222bc999a82484114476 Mon Sep 17 00:00:00 2001 From: Hernando Castano Date: Mon, 21 Nov 2022 18:15:36 -0500 Subject: [PATCH 6/6] Remove E2E tests from release Looks like we need to wait on a `smart-bench` release to be published before we can publish the E2E testing crate. --- CHANGELOG.md | 15 +++------------ crates/e2e/Cargo.toml | 1 + crates/e2e/macro/Cargo.toml | 3 ++- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f431e6fb99..57198bfd2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased +- Add E2E testing framework MVP ‒ [#1395](https://github.com/paritytech/ink/pull/1395) + ## Version 4.0.0-beta The focus of the first `beta` release is to establish the stable ABI for the final `4.0.0` @@ -76,19 +79,7 @@ We hope to bring this function back in a future release of ink!, the best hope right now is that it could come back with [Sassafras](https://wiki.polkadot.network/docs/learn-consensus#badass-babe-sassafras), a block production protocol for future versions of Polkadot. -### End-to-End Testing - -You can now use the `ink_e2e` crate and accompanying `#[ink_e2e::test]` macro to write -integration tests directly in Rust 🎉 - -The contracts in the `examples/lang-err-integration-tests` folder make use of the -end-to-end testing framework, so check it out if you need some example usage. - -Note that it's still pretty fresh off the press, so there are some sharp edges. Feel free -to file an issue if you come across any. - ### Added -- Add E2E testing framework MVP ‒ [#1395](https://github.com/paritytech/ink/pull/1395) - Allow using `Result` as a return type in constructors ‒ [#1446](https://github.com/paritytech/ink/pull/1446) - Add `Mapping::take()` function allowing to get a value removing it from storage ‒ [#1461](https://github.com/paritytech/ink/pull/1461) diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 1db797435c..975537dbe6 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -3,6 +3,7 @@ name = "ink_e2e" version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" +publish = false license = "Apache-2.0" readme = "README.md" diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 4357480e12..c81d605fda 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -3,9 +3,10 @@ name = "ink_e2e_macro" version = "4.0.0-beta" authors = ["Parity Technologies "] edition = "2021" +publish = false license = "Apache-2.0" -readme = "README.md" +readme = "../README.md" repository = "https://github.com/paritytech/ink" documentation = "https://docs.rs/ink_macro/" homepage = "https://www.parity.io/"