Use new ink entrance crate

.github/workflows/ci.yml

@@ -32,6 +32,8 @@ jobs:
 
   clippy:
     runs-on: ubuntu-latest
+    env:
+      RUSTC_BOOTSTRAP: 1
     steps:
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
@@ -67,6 +69,7 @@ jobs:
         os: ["ubuntu-22.04", "macos-12", "windows-2022"]
     runs-on: ${{ matrix.os }}
     env:
+      RUSTC_BOOTSTRAP: 1
       RUST_BACKTRACE: full
     steps:
       - name: Checkout

CHANGELOG.md

@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 - `--output-json` support for `call`, `instantiate` and `upload` commands - [#722](https://github.com/paritytech/cargo-contract/pull/722)
+- Use new ink entrance crate - [#728](https://github.com/paritytech/cargo-contract/pull/728)
 
 ## [2.0.0-alpha.2] - 2022-09-02
 

crates/cargo-contract/src/cmd/build/mod.rs

@@ -295,7 +295,7 @@ fn exec_cargo_for_wasm_target(
             args.push("--offline");
         }
         if build_mode == BuildMode::Debug {
-            args.push("--features=ink_env/ink-debug");
+            args.push("--features=ink/ink-debug");
         } else {
             args.push("-Zbuild-std-features=panic_immediate_abort");
         }

crates/cargo-contract/src/crate_metadata.rs

@@ -100,16 +100,16 @@ impl CrateMetadata {
             .packages
             .iter()
             .find_map(|package| {
-                if package.name == "ink_lang" {
+                if package.name == "ink" {
                     Some(
                         Version::parse(&package.version.to_string())
-                            .expect("Invalid ink_lang version string"),
+                            .expect("Invalid ink crate version string"),
                     )
                 } else {
                     None
                 }
             })
-            .ok_or_else(|| anyhow::anyhow!("No 'ink_lang' dependency found"))?;
+            .ok_or_else(|| anyhow::anyhow!("No 'ink' dependency found"))?;
 
         let ExtraMetadata {
             documentation,