Merge branch 'paritytech:master' into feature/ink-ecdsa-recovery

Author: xgreenx

.config/cargo_spellcheck.dic

@@ -3,6 +3,7 @@
 ABI
 AST
 BLAKE2
+BLAKE2b
 DApp
 ECDSA
 ERC

.gitlab-ci.yml

@@ -220,10 +220,11 @@ codecov:
   variables:
     # For codecov it's sufficient to run the fuzz tests only once.
     QUICKCHECK_TESTS:              1
+    INK_COVERAGE_REPORTING:        "true"
     CARGO_INCREMENTAL:             0
     # Variables partly came from https://github.com/mozilla/grcov/blob/master/README.md
     RUSTFLAGS:                     "-Zprofile -Zmir-opt-level=0 -Ccodegen-units=1
-                                      -Copt-level=0 -Coverflow-checks=off"
+                                    -Clink-dead-code -Copt-level=0 -Coverflow-checks=off"
     # The `cargo-taurpalin` coverage reporting tool seems to have better code instrumentation and thus
     # produces better results for Rust codebases in general. However, unlike `grcov` it requires
     # running docker with `--security-opt seccomp=unconfined` which is why we use `grcov` instead.
@@ -236,6 +237,7 @@ codecov:
     - cargo clean
     # make sure there's no stale coverage artifacts
     - find . -name "*.profraw" -type f -delete
+    - find . -name "*.gcda" -type f -delete
   script:
     # RUSTFLAGS are the cause target cache can't be used here
     - cargo build --verbose --all-features --workspace
@@ -287,7 +289,7 @@ fmt:
   script:
     - cargo fmt --verbose --all -- --check
     # For the UI tests we need to disable the license check
-    - cargo fmt --verbose --all -- --check --config=license_template_path="" crates/lang/macro/tests/ui/{pass,fail}/*.rs
+    - cargo fmt --verbose --all -- --check --config=license_template_path="" crates/lang/macro/tests/ui/contract/{pass,fail}/*.rs
 
 
 #### stage:                        examples

crates/engine/Cargo.toml

@@ -15,7 +15,7 @@ categories = ["no-std", "embedded"]
 include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 
 [dependencies]
-scale = { package = "parity-scale-codec", version = "2.0", default-features = false, features = ["derive", "full"] }
+scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
 derive_more = { version = "0.99", default-features = false, features = ["from", "display"] }
 
 sha2 = { version = "0.9" }

crates/engine/src/ext.rs

@@ -464,13 +464,12 @@ impl Engine {
 ///
 /// Panics if the slice is too large and does not fit.
 fn set_output(output: &mut &mut [u8], slice: &[u8]) {
-    if slice.len() > output.len() {
-        panic!(
-            "the output buffer is too small! the decoded storage is of size {} bytes, \
-            but the output buffer has only room for {}.",
-            slice.len(),
-            output.len()
-        );
-    }
+    assert!(
+        slice.len() <= output.len(),
+        "the output buffer is too small! the decoded storage is of size {} bytes, \
+        but the output buffer has only room for {}.",
+        slice.len(),
+        output.len(),
+    );
     output[..slice.len()].copy_from_slice(slice);
 }

crates/env/Cargo.toml

@@ -21,7 +21,7 @@ ink_allocator = { version = "3.0.0-rc5", path = "../allocator/", default-feature
 ink_primitives = { version = "3.0.0-rc5", path = "../primitives/", default-features = false }
 ink_prelude = { version = "3.0.0-rc5", path = "../prelude/", default-features = false }
 
-scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
+scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
 derive_more = { version = "0.99", default-features = false, features = ["from", "display"] }
 num-traits = { version = "0.2", default-features = false, features = ["i128"] }
 cfg-if = "1.0"

crates/env/src/engine/off_chain/db/exec_context.rs

@@ -148,9 +148,7 @@ where
     ///
     /// If there has already been set a caller.
     pub fn caller(mut self, caller: T::AccountId) -> Self {
-        if self.caller.is_some() {
-            panic!("already has a caller");
-        }
+        assert!(self.caller.is_none(), "already has a caller");
         self.caller = Some(caller);
         self
     }
@@ -161,9 +159,7 @@ where
     ///
     /// If there has already been set a callee.
     pub fn callee(mut self, callee: T::AccountId) -> Self {
-        if self.callee.is_some() {
-            panic!("already has a callee");
-        }
+        assert!(self.callee.is_none(), "already has a callee");
         self.callee = Some(callee);
         self
     }
@@ -174,9 +170,7 @@ where
     ///
     /// If there has already been set provided gas.
     pub fn gas(mut self, gas: u64) -> Self {
-        if self.gas.is_some() {
-            panic!("already has provided gas");
-        }
+        assert!(self.gas.is_none(), "already has provided gas");
         self.gas = Some(gas);
         self
     }
@@ -187,9 +181,10 @@ where
     ///
     /// If there has already been set transferred value (endowment).
     pub fn transferred_value(mut self, transferred_value: T::Balance) -> Self {
-        if self.transferred_value.is_some() {
-            panic!("already has set transferred value (endowment)");
-        }
+        assert!(
+            self.transferred_value.is_none(),
+            "already has set transferred value (endowment)"
+        );
         self.transferred_value = Some(transferred_value);
         self
     }
@@ -200,9 +195,7 @@ where
     ///
     /// If there has already been set call data.
     pub fn call_data(mut self, call_data: CallData) -> Self {
-        if self.call_data.is_some() {
-            panic!("already has set call data");
-        }
+        assert!(self.call_data.is_none(), "already has set call data");
         self.call_data = Some(call_data);
         self
     }

crates/env/src/engine/off_chain/impls.rs

@@ -157,7 +157,7 @@ impl EnvBackend for EnvInstance {
     {
         self.exec_context()
             .map(|exec_ctx| &exec_ctx.call_data)
-            .map(|call_data| scale::Encode::encode(call_data))
+            .map(scale::Encode::encode)
             .map_err(Into::into)
             .and_then(|encoded| {
                 <T as scale::Decode>::decode(&mut &encoded[..])
@@ -247,12 +247,12 @@ impl EnvBackend for EnvInstance {
         D: FnOnce(&[u8]) -> ::core::result::Result<T, E>,
     {
         let encoded_input = input.encode();
-        let (status_code, mut output) = self
+        let (status_code, output) = self
             .chain_extension_handler
             .eval(func_id, &encoded_input)
             .expect("encountered unexpected missing chain extension method");
         status_to_result(status_code)?;
-        let decoded = decode_to_result(&mut output)?;
+        let decoded = decode_to_result(output)?;
         Ok(decoded)
     }
 }

crates/lang/Cargo.toml

@@ -23,7 +23,7 @@ ink_prelude = { version = "3.0.0-rc5", path = "../prelude", default-features = f
 ink_eth_compatibility = { version = "3.0.0-rc5", path = "../eth_compatibility", default-features = false }
 ink_lang_macro = { version = "3.0.0-rc5", path = "macro", default-features = false }
 
-scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
+scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
 derive_more = { version = "0.99", default-features = false, features = ["from"] }
 static_assertions = "1.1"
 

crates/lang/codegen/Cargo.toml

@@ -27,7 +27,7 @@ itertools = "0.10"
 either = { version = "1.5", default-features = false }
 blake2 = "0.9"
 heck = "0.3.1"
-scale = { package = "parity-scale-codec", version = "2.1", default-features = false, features = ["derive", "full"] }
+scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
 impl-serde = "0.3.1"
 
 [features]

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

@@ -0,0 +1,38 @@
+// Copyright 2018-2021 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.
+
+use crate::GenerateCode;
+use derive_more::From;
+use ir::HexLiteral;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote_spanned;
+
+/// Generates code for the `selector_id!` macro.
+#[derive(From)]
+pub struct Blake2x256<'a> {
+    /// The `blake2x256!` macro input.
+    macro_input: &'a ir::Blake2x256Macro,
+}
+
+impl GenerateCode for Blake2x256<'_> {
+    /// Generates `selector_id!` macro code.
+    fn generate_code(&self) -> TokenStream2 {
+        let span = self.macro_input.input().span();
+        let hash_bytes = self
+            .macro_input
+            .hash()
+            .map(|byte| byte.hex_padded_suffixed());
+        quote_spanned!(span=> [ #( #hash_bytes ),* ] )
+    }
+}

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

@@ -27,12 +27,7 @@ pub struct Contract<'a> {
     /// The contract to generate code for.
     contract: &'a ir::Contract,
 }
-
-impl AsRef<ir::Contract> for Contract<'_> {
-    fn as_ref(&self) -> &ir::Contract {
-        self.contract
-    }
-}
+impl_as_ref_for_generator!(Contract);
 
 impl GenerateCode for Contract<'_> {
     /// Generates ink! contract code.

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

@@ -243,6 +243,25 @@ impl CrossCalling<'_> {
             ir::Receiver::Ref => None,
             ir::Receiver::RefMut => Some(quote! { mut }),
         };
+        let error_ident = match option_env!("INK_COVERAGE_REPORTING") {
+            Some("true") => {
+                quote! {
+                    // The code coverage reporting CI stage links dead code,
+                    // hence we have to provide an `unreachable!` here. If
+                    // the invalid implementation above is linked this results
+                    // in a linker error.
+                    ::core::unreachable!("this is an invalid ink! message call which should never be possible.");
+                }
+            }
+            _ => {
+                quote! {
+                    extern {
+                        fn #linker_error_ident() -> !;
+                    }
+                    unsafe { #linker_error_ident() }
+                }
+            }
+        };
         quote_spanned!(span=>
             type #output_ident = #output_ty;
 
@@ -253,10 +272,7 @@ impl CrossCalling<'_> {
                 & #mut_tok self,
                 #( #input_bindings : #input_types ),*
             ) -> Self::#output_ident {
-                extern {
-                    fn #linker_error_ident() -> !;
-                }
-                unsafe { #linker_error_ident() }
+                #error_ident
             }
         )
     }
@@ -377,6 +393,25 @@ impl CrossCalling<'_> {
             .inputs()
             .map(|pat_type| &*pat_type.ty)
             .collect::<Vec<_>>();
+        let error_ident = match option_env!("INK_COVERAGE_REPORTING") {
+            Some("true") => {
+                quote! {
+                    // The code coverage reporting CI stage links dead code,
+                    // hence we have to provide an `unreachable!` here. If
+                    // the invalid implementation above is linked this results
+                    // in a linker error.
+                    ::core::unreachable!("this is an invalid ink! message call which should never be possible.");
+                }
+            }
+            _ => {
+                quote! {
+                    extern {
+                        fn #linker_error_ident() -> !;
+                    }
+                    unsafe { #linker_error_ident() }
+                }
+            }
+        };
         quote_spanned!(span =>
             type #output_ident = ::ink_lang::NeverReturns;
 
@@ -386,10 +421,7 @@ impl CrossCalling<'_> {
             fn #ident(
                 #( #input_bindings : #input_types ),*
             ) -> Self::#output_ident {
-                extern {
-                    fn #linker_error_ident() -> !;
-                }
-                unsafe { #linker_error_ident() }
+                #error_ident
             }
         )
     }