diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acfa3024b..30864bc1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,22 +72,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install wasm-opt - if: ${{ runner.os == 'Linux' }} - run: sudo apt-get install binaryen - - - name: Install wasm-opt - if: ${{ runner.os == 'macOS' }} - run: brew install binaryen - - - name: Install wasm-opt - if: ${{ runner.os == 'Windows' }} - uses: engineerd/configurator@v0.0.9 - with: - name: wasm-opt.exe - url: https://github.com/WebAssembly/binaryen/releases/download/version_109/binaryen-version_109-x86_64-windows.tar.gz - pathInArchive: binaryen-version_109/bin/wasm-opt.exe - - name: Install stable toolchain uses: actions-rs/toolchain@v1 with: @@ -100,17 +84,6 @@ jobs: - name: Cache uses: Swatinem/rust-cache@v2 - - name: Install cargo-dylint - uses: baptiste0928/cargo-install@v1 - with: - crate: cargo-dylint - version: 2 - - - name: Install dylint-link - uses: baptiste0928/cargo-install@v1 - with: - crate: dylint-link - version: 2 - name: Run Tests uses: actions-rs/cargo@v1 @@ -129,22 +102,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Install wasm-opt - if: ${{ runner.os == 'Linux' }} - run: sudo apt-get install binaryen - - - name: Install wasm-opt - if: ${{ runner.os == 'macOS' }} - run: brew install binaryen - - - name: Install wasm-opt - if: ${{ runner.os == 'Windows' }} - uses: engineerd/configurator@v0.0.9 - with: - name: wasm-opt.exe - url: https://github.com/WebAssembly/binaryen/releases/download/version_109/binaryen-version_109-x86_64-windows.tar.gz - pathInArchive: binaryen-version_109/bin/wasm-opt.exe - - name: Install stable toolchain uses: actions-rs/toolchain@v1 with: @@ -157,23 +114,9 @@ jobs: - name: Cache uses: Swatinem/rust-cache@v2 - - name: Install cargo-dylint - uses: baptiste0928/cargo-install@v1 - with: - crate: cargo-dylint - version: 2 - - - name: Install dylint-link - uses: baptiste0928/cargo-install@v1 - with: - crate: dylint-link - version: 2 - - name: Check Template run: >- - wasm-opt --version && cargo -vV && - cargo dylint --version && cargo run --profile debug-ci -- contract --version && cargo run --profile debug-ci -- contract new --target-dir ${{ runner.temp }} foobar && cargo run --profile debug-ci -- contract build --manifest-path=${{ runner.temp }}/foobar/Cargo.toml && diff --git a/CHANGELOG.md b/CHANGELOG.md index 8979fe575..003c1c78a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ 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). +## [2.0.0-rc.1] - 2023-02-01 +Second release candidate compatible with `ink! 4.0.0-rc`. + +### Changed +- Upgrade `subxt` to `0.26` [#924](https://github.com/paritytech/cargo-contract/pull/924) +- Display detailed cause of an error [#931](https://github.com/paritytech/cargo-contract/pull/931) +- Use package name instead of lib name, default to "rlib" [#929](https://github.com/paritytech/cargo-contract/pull/929) + +### Fixed +- Miscellaneous extrinsics display improvements [#916](https://github.com/paritytech/cargo-contract/pull/916) +- Fix decoding of `LangError` [#919](https://github.com/paritytech/cargo-contract/pull/919) + ## [2.0.0-rc] - 2023-01-12 First release candidate for compatibility with `ink! 4.0-rc`. diff --git a/Cargo.lock b/Cargo.lock index 4c7f825c0..011cb8d47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -528,7 +528,7 @@ dependencies = [ [[package]] name = "cargo-contract" -version = "2.0.0-rc" +version = "2.0.0-rc.1" dependencies = [ "anyhow", "assert_cmd", @@ -697,7 +697,7 @@ dependencies = [ [[package]] name = "contract-build" -version = "2.0.0-rc" +version = "2.0.0-rc.1" dependencies = [ "anyhow", "blake2", @@ -728,7 +728,7 @@ dependencies = [ [[package]] name = "contract-metadata" -version = "2.0.0-rc" +version = "2.0.0-rc.1" dependencies = [ "anyhow", "impl-serde", @@ -741,7 +741,7 @@ dependencies = [ [[package]] name = "contract-transcode" -version = "2.0.0-rc" +version = "2.0.0-rc.1" dependencies = [ "anyhow", "assert_matches", @@ -1727,9 +1727,9 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bc74e9a793c07d301b0a0dd11ca6c6232e26771efa7561576dbf72db7a1d8e1" +checksum = "2414262fb43c11e05f0514ef7641766ef960503cef6daf63e2e079c52e93fcee" dependencies = [ "derive_more", "ink_env", @@ -1743,18 +1743,18 @@ dependencies = [ [[package]] name = "ink_allocator" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9246c3c68829d1411a7b8f9dc134064be051774cd10cf4b9b6b6fb1fb3ed5ae2" +checksum = "11052c064f6177fe58103f97cd544088a2fd2ef4d4a3c200dd06a1c139dbd0c9" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b103ebe273c690d38120794462f5bb7e59358f6e41826260e88a63699f3571a9" +checksum = "d072700af985983e2a5271d8fbdf17ac39db83900b01e94ba9c5d9f9cdf98315" dependencies = [ "blake2", "derive_more", @@ -1776,9 +1776,9 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdca870f3b3b7a90775444721303fbcf5a0f140d32fb2e82ecbc7920ac91c33" +checksum = "abd293e256cb0b2577fd3eac036f9c308efee5d5c80015a11008c40251a1b2f3" dependencies = [ "blake2", "derive_more", @@ -1791,9 +1791,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5f9e40b2ecaf3e2300b90df5585a800697f1b24df6e646714bc9e86356b767" +checksum = "aea2051c33b1cb8bce136b8464a4b75ee57b343c4407e07db3adbb7b2bf24a26" dependencies = [ "arrayref", "blake2", @@ -1818,9 +1818,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83aa14d3698d8995e6739bc3272f4df3090693d8d2445b04a8ab530ef0890ab4" +checksum = "05975c7e8ecea25d41321fca38682366f330ee153432c4a83f66ceb332a58b71" dependencies = [ "blake2", "either", @@ -1832,9 +1832,9 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92f3ed7554cdd920f169c7deaf631647088c232a7bc6dc6fd88afdfe15ffa359" +checksum = "f35209197c81dacbbf9db5ba0a0a32c7dbee64718e6403f380a1204e004887e8" dependencies = [ "ink_codegen", "ink_ir", @@ -1848,9 +1848,9 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2388a808f432dcd4ee8253afea6e03898ef9c14dabf60202fb44845f5fc9eca9" +checksum = "5e35b68ef9563f20a8494068f95a1e66648fc1e73187ce611f3b8df3c9b6d6bc" dependencies = [ "derive_more", "impl-serde", @@ -1862,18 +1862,18 @@ dependencies = [ [[package]] name = "ink_prelude" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42cfdf1db7078d0e2e01e5fb129144001aaacc68f0791ad294ff21a72373019" +checksum = "e61cefa8cd1ed242647d59e568b55c5a9dcfc5d9d656def37c5923e81662fcbe" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2012114a5879fb102aeed780d4b5438429ae04522776655c35659b28d6cfcd87" +checksum = "2561d0e37396960a562be695ca4cb373469b78a47056c625b1aa877c6e1a66ac" dependencies = [ "derive_more", "ink_prelude", @@ -1884,9 +1884,9 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84d64cd54388f8cbe80925380df84a1e93523adb870bea87f94a0abd26fffcb" +checksum = "097ad62bb06083012591cc1f9902a0174f9fc105297e729ab6188cb1c5242aa1" dependencies = [ "array-init", "cfg-if", @@ -1902,9 +1902,9 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta.1" +version = "4.0.0-rc" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1334db9344a24fb43aeb17c0db78ac6444acf6e53a89add842fee48d872e5a9e" +checksum = "9efba89e9fb390228a0c0bff27320bf54f293ac179b4f8700acbb0f765041723" dependencies = [ "ink_metadata", "ink_prelude", diff --git a/crates/build/Cargo.toml b/crates/build/Cargo.toml index 16df6d875..6e0a33e9f 100644 --- a/crates/build/Cargo.toml +++ b/crates/build/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract-build" -version = "2.0.0-rc" +version = "2.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" @@ -36,7 +36,7 @@ wasm-opt = "0.111.0" which = "4.4.0" zip = { version = "0.6.4", default-features = false } -contract-metadata = { version = "2.0.0-rc", path = "../metadata" } +contract-metadata = { version = "2.0.0-rc.1", path = "../metadata" } [build-dependencies] anyhow = "1.0.68" diff --git a/crates/build/templates/new/_Cargo.toml b/crates/build/templates/new/_Cargo.toml index 292b48367..e44835bfd 100644 --- a/crates/build/templates/new/_Cargo.toml +++ b/crates/build/templates/new/_Cargo.toml @@ -5,7 +5,7 @@ authors = ["[your_name] <[your_email]>"] edition = "2021" [dependencies] -ink = { version = "4.0.0-beta.1", default-features = false } +ink = { version = "4.0.0-rc", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } diff --git a/crates/cargo-contract/Cargo.toml b/crates/cargo-contract/Cargo.toml index 1940e8d27..d342a3c14 100644 --- a/crates/cargo-contract/Cargo.toml +++ b/crates/cargo-contract/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-contract" -version = "2.0.0-rc" +version = "2.0.0-rc.1" authors = ["Parity Technologies "] build = "build.rs" edition = "2021" @@ -18,9 +18,9 @@ include = [ ] [dependencies] -contract-build = { version = "2.0.0-rc", path = "../build" } -contract-metadata = { version = "2.0.0-rc", path = "../metadata" } -contract-transcode = { version = "2.0.0-rc", path = "../transcode" } +contract-build = { version = "2.0.0-rc.1", path = "../build" } +contract-metadata = { version = "2.0.0-rc.1", path = "../metadata" } +contract-transcode = { version = "2.0.0-rc.1", path = "../transcode" } anyhow = "1.0.68" clap = { version = "4.1.4", features = ["derive", "env"] } diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml index 04f170b80..80cdf93ac 100644 --- a/crates/metadata/Cargo.toml +++ b/crates/metadata/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract-metadata" -version = "2.0.0-rc" +version = "2.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" diff --git a/crates/transcode/Cargo.toml b/crates/transcode/Cargo.toml index 69afeadfe..5468b8a4c 100644 --- a/crates/transcode/Cargo.toml +++ b/crates/transcode/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "contract-transcode" -version = "2.0.0-rc" +version = "2.0.0-rc.1" authors = ["Parity Technologies "] edition = "2021" @@ -18,12 +18,12 @@ path = "src/lib.rs" [dependencies] anyhow = "1.0.68" -contract-metadata = { version = "2.0.0-rc", path = "../metadata" } +contract-metadata = { version = "2.0.0-rc.1", path = "../metadata" } escape8259 = "0.5.2" hex = "0.4.3" indexmap = "1.9.2" -ink_env = "4.0.0-beta.1" -ink_metadata = "4.0.0-beta.1" +ink_env = "4.0.0-rc" +ink_metadata = "4.0.0-rc" itertools = "0.10.5" tracing = "0.1.37" nom = "7.1.3" @@ -37,7 +37,7 @@ sp-runtime = "12.0.0" [dev-dependencies] assert_matches = "1.5.0" -ink = "4.0.0-beta.1" +ink = "4.0.0-rc" [features] # This `std` feature is required for testing using an inline contract's metadata, because `ink!` annotates the metadata