Introduce entrance crate

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/ink",
     "crates/metadata",
     "crates/allocator",
     "crates/lang",

crates/ink/Cargo.toml

@@ -0,0 +1,40 @@
+[package]
+name = "ink"
+version = "3.0.1"
+authors = ["Parity Technologies <[email protected]>", "Robin Freyler <[email protected]>"]
+edition = "2021"
+
+license = "Apache-2.0"
+readme = "README.md"
+repository = "https://github.com/paritytech/ink"
+documentation = "https://docs.rs/ink_lang/"
+homepage = "https://www.parity.io/"
+description = "[ink!] Rust based eDSL for writing smart contracts for Substrate"
+keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
+categories = ["no-std", "embedded"]
+include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
+
+[dependencies]
+ink_env = { version = "3.0.1", path = "../env", default-features = false }
+ink_storage = { version = "3.0.1", path = "../storage", default-features = false }
+ink_primitives = { version = "3.0.1", path = "../primitives", default-features = false }
+ink_metadata = { version = "3.0.1", path = "../metadata", default-features = false, optional = true }
+ink_prelude = { version = "3.0.1", path = "../prelude", default-features = false }
+ink_lang = { version = "3.0.1", path = "../lang", default-features = false }
+
+scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] }
+scale-info = { version = "2", default-features = false, features = ["derive"], optional = true }
+
+[features]
+default = ["std"]
+std = [
+    "ink_metadata/std",
+    "ink_prelude/std",
+    "ink_primitives/std",
+    "ink_env/std",
+    "ink_storage/std",
+    "ink_lang/std",
+    "scale/std",
+    "scale-info/std",
+]
+show-codegen-docs = []

crates/ink/LICENSE

@@ -0,0 +1 @@
+../../LICENSE

crates/ink/README

@@ -0,0 +1 @@
+../../README.md

crates/ink/src/lib.rs

@@ -0,0 +1,33 @@
+// Copyright 2018-2022 Parity Technologies (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub use ink_env as env;
+pub use ink_lang as lang;
+#[cfg(feature = "std")]
+pub use ink_metadata as metadata;
+pub use ink_prelude as prelude;
+pub use ink_primitives as primitives;
+pub use ink_storage as storage;
+
+pub use scale;
+#[cfg(feature = "std")]
+pub use scale_info;
+
+// The top level macros:
+//  - `#[ink::contract]`
+//  - `#[ink::trait_definition]`
+pub use self::lang::{
+    contract,
+    trait_definition,
+};

crates/lang/codegen/src/generator/arg_list.rs

@@ -77,11 +77,11 @@ where
 {
     use syn::spanned::Spanned as _;
     args.into_iter().fold(
-        quote! { ::ink_env::call::utils::EmptyArgumentList },
+        quote! { ::ink::env::call::utils::EmptyArgumentList },
         |rest, arg| {
             let span = arg.span();
             quote_spanned!(span=>
-                ::ink_env::call::utils::ArgumentList<::ink_env::call::utils::Argument<#arg>, #rest>
+                ::ink::env::call::utils::ArgumentList<::ink::env::call::utils::Argument<#arg>, #rest>
             )
         }
     )
@@ -98,7 +98,7 @@ pub fn generate_reference_to_trait_info(
     trait_path: &syn::Path,
 ) -> TokenStream2 {
     quote_spanned!(span=>
-        <<::ink_lang::reflect::TraitDefinitionRegistry<Environment>
-            as #trait_path>::__ink_TraitInfo as ::ink_lang::reflect::TraitInfo>::ID
+        <<::ink::lang::reflect::TraitDefinitionRegistry<Environment>
+            as #trait_path>::__ink_TraitInfo as ::ink::lang::reflect::TraitInfo>::ID
     )
 }

crates/lang/codegen/src/generator/as_dependency/call_builder.rs

@@ -84,12 +84,12 @@ impl CallBuilder<'_> {
             #[repr(transparent)]
             #[cfg_attr(feature = "std", derive(
                 ::scale_info::TypeInfo,
-                ::ink_storage::traits::StorageLayout,
+                ::ink::storage::traits::StorageLayout,
             ))]
             #[derive(
                 ::core::fmt::Debug,
-                ::ink_storage::traits::SpreadLayout,
-                ::ink_storage::traits::PackedLayout,
+                ::ink::storage::traits::SpreadLayout,
+                ::ink::storage::traits::PackedLayout,
                 ::scale::Encode,
                 ::scale::Decode,
                 ::core::hash::Hash,
@@ -102,12 +102,12 @@ impl CallBuilder<'_> {
             }
 
             const _: () = {
-                impl ::ink_lang::codegen::ContractCallBuilder for #storage_ident {
+                impl ::ink::lang::codegen::ContractCallBuilder for #storage_ident {
                     type Type = #cb_ident;
                 }
 
-                impl ::ink_lang::reflect::ContractEnv for #cb_ident {
-                    type Env = <#storage_ident as ::ink_lang::reflect::ContractEnv>::Env;
+                impl ::ink::lang::reflect::ContractEnv for #cb_ident {
+                    type Env = <#storage_ident as ::ink::lang::reflect::ContractEnv>::Env;
                 }
             };
         )
@@ -121,14 +121,14 @@ impl CallBuilder<'_> {
         let span = self.contract.module().storage().span();
         let cb_ident = Self::call_builder_ident();
         quote_spanned!(span=>
-            impl ::ink_env::call::FromAccountId<Environment> for #cb_ident {
+            impl ::ink::env::call::FromAccountId<Environment> for #cb_ident {
                 #[inline]
                 fn from_account_id(account_id: AccountId) -> Self {
                     Self { account_id }
                 }
             }
 
-            impl ::ink_lang::ToAccountId<Environment> for #cb_ident {
+            impl ::ink::lang::ToAccountId<Environment> for #cb_ident {
                 #[inline]
                 fn to_account_id(&self) -> AccountId {
                     <AccountId as ::core::clone::Clone>::clone(&self.account_id)
@@ -185,8 +185,8 @@ impl CallBuilder<'_> {
         let trait_info_id = generator::generate_reference_to_trait_info(span, trait_path);
         quote_spanned!(span=>
             #[doc(hidden)]
-            impl ::ink_lang::codegen::TraitCallForwarderFor<{#trait_info_id}> for #cb_ident {
-                type Forwarder = <<Self as #trait_path>::__ink_TraitInfo as ::ink_lang::codegen::TraitCallForwarder>::Forwarder;
+            impl ::ink::lang::codegen::TraitCallForwarderFor<{#trait_info_id}> for #cb_ident {
+                type Forwarder = <<Self as #trait_path>::__ink_TraitInfo as ::ink::lang::codegen::TraitCallForwarder>::Forwarder;
 
                 #[inline]
                 fn forward(&self) -> &Self::Forwarder {
@@ -215,18 +215,18 @@ impl CallBuilder<'_> {
                 }
 
                 #[inline]
-                fn build(&self) -> &<Self::Forwarder as ::ink_lang::codegen::TraitCallBuilder>::Builder {
-                    <_ as ::ink_lang::codegen::TraitCallBuilder>::call(
-                        <Self as ::ink_lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::forward(self)
+                fn build(&self) -> &<Self::Forwarder as ::ink::lang::codegen::TraitCallBuilder>::Builder {
+                    <_ as ::ink::lang::codegen::TraitCallBuilder>::call(
+                        <Self as ::ink::lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::forward(self)
                     )
                 }
 
                 #[inline]
                 fn build_mut(&mut self)
-                    -> &mut <Self::Forwarder as ::ink_lang::codegen::TraitCallBuilder>::Builder
+                    -> &mut <Self::Forwarder as ::ink::lang::codegen::TraitCallBuilder>::Builder
                 {
-                    <_ as ::ink_lang::codegen::TraitCallBuilder>::call_mut(
-                        <Self as ::ink_lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::forward_mut(self)
+                    <_ as ::ink::lang::codegen::TraitCallBuilder>::call_mut(
+                        <Self as ::ink::lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::forward_mut(self)
                     )
                 }
             }
@@ -246,7 +246,7 @@ impl CallBuilder<'_> {
             .map(|message| self.generate_ink_trait_impl_for_message(trait_path, message));
         quote_spanned!(span=>
             impl #trait_path for #cb_ident {
-                type __ink_TraitInfo = <::ink_lang::reflect::TraitDefinitionRegistry<Environment>
+                type __ink_TraitInfo = <::ink::lang::reflect::TraitDefinitionRegistry<Environment>
                     as #trait_path>::__ink_TraitInfo;
 
                 #( #messages )*
@@ -287,8 +287,8 @@ impl CallBuilder<'_> {
         quote_spanned!(span=>
             type #output_ident = <<<
                 Self
-                as ::ink_lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::Forwarder
-                as ::ink_lang::codegen::TraitCallBuilder>::Builder
+                as ::ink::lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::Forwarder
+                as ::ink::lang::codegen::TraitCallBuilder>::Builder
                 as #trait_path>::#output_ident;
 
             #[inline]
@@ -298,7 +298,7 @@ impl CallBuilder<'_> {
                 #( , #input_bindings: #input_types )*
             ) -> Self::#output_ident {
                 <_ as #trait_path>::#message_ident(
-                    <Self as ::ink_lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::#build_cmd(self)
+                    <Self as ::ink::lang::codegen::TraitCallForwarderFor<{#trait_info_id}>>::#build_cmd(self)
                     #( , #input_bindings )*
                 )
             }
@@ -376,11 +376,11 @@ impl CallBuilder<'_> {
             output.map_or_else(|| quote! { () }, |output| quote! { #output });
         let output_span = output.span();
         let output_type = quote_spanned!(output_span=>
-            ::ink_env::call::CallBuilder<
+            ::ink::env::call::CallBuilder<
                 Environment,
-                ::ink_env::call::utils::Set< ::ink_env::call::Call< Environment > >,
-                ::ink_env::call::utils::Set< ::ink_env::call::ExecutionInput<#arg_list> >,
-                ::ink_env::call::utils::Set< ::ink_env::call::utils::ReturnType<#return_type> >,
+                ::ink::env::call::utils::Set< ::ink::env::call::Call< Environment > >,
+                ::ink::env::call::utils::Set< ::ink::env::call::ExecutionInput<#arg_list> >,
+                ::ink::env::call::utils::Set< ::ink::env::call::utils::ReturnType<#return_type> >,
             >
         );
         quote_spanned!(span=>
@@ -391,11 +391,11 @@ impl CallBuilder<'_> {
                 & #mut_tok self
                 #( , #input_bindings : #input_types )*
             ) -> #output_type {
-                ::ink_env::call::build_call::<Environment>()
-                    .call_type(::ink_env::call::Call::new().callee(::ink_lang::ToAccountId::to_account_id(self)))
+                ::ink::env::call::build_call::<Environment>()
+                    .call_type(::ink::env::call::Call::new().callee(::ink::lang::ToAccountId::to_account_id(self)))
                     .exec_input(
-                        ::ink_env::call::ExecutionInput::new(
-                            ::ink_env::call::Selector::new([ #( #selector_bytes ),* ])
+                        ::ink::env::call::ExecutionInput::new(
+                            ::ink::env::call::Selector::new([ #( #selector_bytes ),* ])
                         )
                         #(
                             .push_arg(#input_bindings)