Merge branch 'master' into hc-simple-mapping-primitive

Author: HCastano

.config/cargo_spellcheck.dic

@@ -1,4 +1,4 @@
-100
+110
 
 ABI
 AST
@@ -37,8 +37,8 @@ defrag
 defragmentation
 deploy
 dereferencing
-deserializes
-dispatchable
+deserialize/S
+dispatchable/S
 encodable
 evaluable
 fuzzer
@@ -65,6 +65,7 @@ v3
 validator
 variadic
 versa
+versioned
 versioning
 Verbatim
 metadata
@@ -95,4 +96,9 @@ runtime/S
 struct/S
 vec/S
 vector/S
+implementer/S
+deduplicated
 wildcard/S
+natively
+payability
+unpayable

.gitlab-ci.yml

@@ -289,7 +289,8 @@ 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/contract/{pass,fail}/*.rs
+    - cargo fmt --verbose --all -- --check --config=license_template_path="" crates/lang/tests/ui/contract/{pass,fail}/*.rs
+    - cargo fmt --verbose --all -- --check --config=license_template_path="" crates/lang/tests/ui/trait_def/{pass,fail}/*.rs
 
 
 #### stage:                        examples

.rustfmt.toml

@@ -43,7 +43,7 @@ trailing_comma = "Vertical"
 match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
-edition = "2018" # changed
+edition = "2021" # changed
 version = "One"
 merge_derives = true
 use_try_shorthand = true # changed

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "crates/metadata",
     "crates/allocator",

RELEASES.md

@@ -1,7 +1,85 @@
+# Version 3.0-rc7 (UNRELEASED)
+
+This is the 7th release candidate for ink! 3.0.
+
+## Added
+
+- The ink! codegen now heavily relies on static type information based on traits defined in `ink_lang`.
+    - Some of those traits and their carried information can be used for static reflection of ink!
+      smart contracts. Those types and traits reside in the new `ink_lang::reflect` module and is
+      publicly usable by ink! smart contract authors.
+
+## Changed
+
+- ink! Contract via `#[ink::contract]`:
+    - ink! smart contracts now always generated two contract types. Given `MyContract`:
+
+    - `MyContract` will still be the storage struct.
+      However, it can now additionally be used as static dependency in other smart contracts.
+      Static dependencies can be envisioned as being directly embedded into a smart contract.
+    - `MyContractRef` is pretty much the same of what we had gotten with the old `ink-as-dependency`.
+      It is a typed thin-wrapper around an `AccountId` that is mirroring the ink! smart contract's API
+      and implemented traits.
+- ink! Trait Definitions via `#[ink::trait_definition]`:
+    - ink! trait definitions no longer can define trait constructors.
+    - ink! trait implementations now inherit `selector` and `payable` properties for trait messages.
+        - Now explicitly setting `selector` or `payable` property for an implemented ink! trait method
+          will only act as a guard that the set property is in fact the same as defined by the ink!
+          trait definition.
+- Improve quite a few ink! specific compile errors:
+    - For example when using ink! messages and constructors that have inputs or outputs that cannot
+      be encoded or decoded using the SCALE codec.
+- Simplified selector computation for ink! trait methods.
+    - Now selectors are encoded as `blake2b({namespace}::{trait_identifier}::{message_identifier})[0..4]`.
+      If no `namespace` is set for the ink! trait definition then the formula is
+      `blake2b({trait_identifier}::{message_identifier})[0..4]`.
+      Where `trait_identifier` and `message_identifier` both refer to the identifiers of the ink! trait
+      definition and ink! trait message respectively.
+
+## Fixed
+
+- Contracts that are compiled as root (the default) now properly revert the transaction if a message
+  returned `Result::Err`.
+    - This does not apply to ink! smart contracts that are used as dependencies. Therefore it is still possible to match against a result return type for a called dependency.
+
 # Version 3.0-rc6
 
 This is the 6th release candidate for ink! 3.0.
 
+## Compatibility
+
+### Please upgrade `cargo-contract`
+
+You need to update to the latest `cargo-contract` in order to use this release:
+```
+cargo install cargo-contract --vers ^0.15 --force --locked
+```
+
+If you build contracts from this release candidate with an older `cargo-contract`,
+the UI's won't display all contract-relevant fields.
+
+### Please upgrade `scale-info` in your contract's dependencies
+
+In this release candidate we upgraded `scale-info`. You have to use a compatible
+version in your contract's `Cargo.toml` as well; `cargo-contract` will throw
+an error otherwise.
+
+The `Cargo.toml` should contain
+```
+scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }
+scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
+```
+
+### New metadata format
+
+There are breaking changes to the metadata format in this release. 
+
+- Removes top level `metadataVersion` field from the contract metadata (https://github.com/paritytech/cargo-contract/pull/342/files).
+- Introduces new top level versioned metadata [enum](https://github.com/paritytech/ink/blob/master/crates/metadata/src/lib.rs#L68). 
+- Upgrades to `scale-info` version `1.0` (https://github.com/paritytech/ink/pull/845). 
+  - The previous supported version was `0.6`, so check release notes for all changes since then: https://github.com/paritytech/ink/pull/845
+  - One of the main changes to be aware of is the change to 0 based type lookup ids: https://github.com/paritytech/scale-info/pull/90
+
 ## Added
 - Added an Ethereum-compatibility function to recover a public key from an ECDSA signature and message hash - [#914](https://github.com/paritytech/ink/pull/914) (thanks [@xgreenx](https://github.com/xgreenx)).
 - Added new utility proc. macros to `ink_lang` crate - [#947](https://github.com/paritytech/ink/pull/947):

crates/allocator/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ink_allocator"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <[email protected]>", "Robin Freyler <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"

crates/engine/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ink_engine"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <[email protected]>", "Michael Müller <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
@@ -23,7 +23,7 @@ sha3 = { version = "0.9" }
 blake2 = { version = "0.9" }
 
 # ECDSA for the off-chain environment.
-libsecp256k1 = { version = "0.3.5", default-features = false }
+libsecp256k1 = { version = "0.7.0" }
 
 [features]
 default = ["std"]

crates/engine/src/ext.rs

@@ -428,7 +428,7 @@ impl Engine {
         message_hash: &[u8; 32],
         output: &mut [u8; 33],
     ) -> Result {
-        use secp256k1::{
+        use libsecp256k1::{
             recover,
             Message,
             RecoveryId,
@@ -443,7 +443,7 @@ impl Engine {
             signature[64]
         };
         let message = Message::parse(message_hash);
-        let signature = Signature::parse_slice(&signature[0..64])
+        let signature = Signature::parse_standard_slice(&signature[0..64])
             .unwrap_or_else(|error| panic!("Unable to parse the signature: {}", error));
 
         let recovery_id = RecoveryId::parse(recovery_byte)

crates/engine/src/tests.rs

@@ -16,6 +16,11 @@ use crate::ext::{
     Engine,
     Error,
 };
+use libsecp256k1::{
+    Message,
+    PublicKey,
+    SecretKey,
+};
 
 /// The public methods of the `contracts` pallet write their result into an
 /// `output` buffer instead of returning them. Since we aim to emulate this
@@ -192,3 +197,74 @@ fn must_panic_when_buffer_too_small() {
     // then
     unreachable!("`get_storage` must already have panicked");
 }
+
+#[test]
+fn ecdsa_recovery_test_from_contracts_pallet() {
+    // given
+    let mut engine = Engine::new();
+    #[rustfmt::skip]
+    let signature: [u8; 65] = [
+        161, 234, 203,  74, 147, 96,  51, 212,   5, 174, 231,   9, 142,  48, 137, 201,
+        162, 118, 192,  67, 239, 16,  71, 216, 125,  86, 167, 139,  70,   7,  86, 241,
+         33,  87, 154, 251,  81, 29, 160,   4, 176, 239,  88, 211, 244, 232, 232,  52,
+        211, 234, 100, 115, 230, 47,  80,  44, 152, 166,  62,  50,   8,  13,  86, 175,
+         28,
+    ];
+    #[rustfmt::skip]
+    let message_hash: [u8; 32] = [
+        162, 28, 244, 179, 96, 76, 244, 178, 188,  83, 230, 248, 143, 106,  77, 117,
+        239, 95, 244, 171, 65, 95,  62, 153, 174, 166, 182,  28, 130,  73, 196, 208
+    ];
+
+    // when
+    let mut output = [0; 33];
+    engine
+        .ecdsa_recover(&signature, &message_hash, &mut output)
+        .expect("must work");
+
+    // then
+    #[rustfmt::skip]
+    const EXPECTED_COMPRESSED_PUBLIC_KEY: [u8; 33] = [
+          2, 121, 190, 102, 126, 249, 220, 187, 172, 85, 160,  98, 149, 206, 135, 11,
+          7,   2, 155, 252, 219,  45, 206,  40, 217, 89, 242, 129,  91,  22, 248, 23,
+        152,
+    ];
+    assert_eq!(output, EXPECTED_COMPRESSED_PUBLIC_KEY);
+}
+
+#[test]
+fn ecdsa_recovery_with_secp256k1_crate() {
+    // given
+    let mut engine = Engine::new();
+    let seckey = [
+        59, 148, 11, 85, 134, 130, 61, 253, 2, 174, 59, 70, 27, 180, 51, 107, 94, 203,
+        174, 253, 102, 39, 170, 146, 46, 252, 4, 143, 236, 12, 136, 28,
+    ];
+    let pubkey = PublicKey::parse_compressed(&[
+        2, 29, 21, 35, 7, 198, 183, 43, 14, 208, 65, 139, 14, 112, 205, 128, 231, 245,
+        41, 91, 141, 134, 245, 114, 45, 63, 82, 19, 251, 210, 57, 79, 54,
+    ])
+    .expect("pubkey creation failed");
+
+    let mut msg_hash = [0; 32];
+    crate::hashing::sha2_256(b"Some message", &mut msg_hash);
+
+    let msg = Message::parse(&msg_hash);
+    let seckey = SecretKey::parse(&seckey).expect("secret key creation failed");
+    let (signature, recovery_id) = libsecp256k1::sign(&msg, &seckey);
+
+    let mut signature = signature.serialize().to_vec();
+    signature.push(recovery_id.serialize());
+    let signature_with_recovery_id: [u8; 65] = signature
+        .try_into()
+        .expect("unable to create signature with recovery id");
+
+    // when
+    let mut output = [0; 33];
+    engine
+        .ecdsa_recover(&signature_with_recovery_id, &msg.serialize(), &mut output)
+        .expect("ecdsa recovery failed");
+
+    // then
+    assert_eq!(output, pubkey.serialize_compressed());
+}

crates/env/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ink_env"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <[email protected]>", "Robin Freyler <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
@@ -15,7 +15,6 @@ categories = ["no-std", "embedded"]
 include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 
 [dependencies]
-ink_engine = { version = "3.0.0-rc6", path = "../engine/", default-features = false, optional = true }
 ink_metadata = { version = "3.0.0-rc6", path = "../metadata/", default-features = false, features = ["derive"], optional = true }
 ink_allocator = { version = "3.0.0-rc6", path = "../allocator/", default-features = false }
 ink_primitives = { version = "3.0.0-rc6", path = "../primitives/", default-features = false }
@@ -30,13 +29,19 @@ arrayref = "0.3"
 static_assertions = "1.1"
 sp-arithmetic = { version = "3.0", default-features = false }
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+libsecp256k1 = { version = "0.7.0", default-features = false }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+ink_engine = { version = "3.0.0-rc6", path = "../engine/", default-features = false, optional = true }
+
 # Hashes for the off-chain environment.
 sha2 = { version = "0.9", optional = true }
 sha3 = { version = "0.9", optional = true }
 blake2 = { version = "0.9", optional = true }
 
 # ECDSA for the off-chain environment.
-libsecp256k1 = { version = "0.3.5", default-features = false }
+libsecp256k1 = { version = "0.7.0" }
 
 # Only used in the off-chain environment.
 #