fix: address build failures in some contracts (use-ink#24)

Description
===========
The build process for some contracts was failing due
to issues in certain Cargo.toml files.

Changes
=======
- Commented out `crate-type` in `Cargo.toml` files.
  There's a conflict with this setting when using
  the updated version of the Ink contract compiler.

- Added `no_main` attribute in `lib.rs`. This was
  missing in some contracts, and the updated version
  of the compiler is printing warning messages when
  it's missing.

This commit addresses issue use-ink#24

basic_contract_caller/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
@@ -17,7 +17,7 @@ scale-info = { version = "2.5", default-features = false, features = ["derive"],
 other_contract = { path = "other_contract", default-features = false, features = ["ink-as-dependency"] }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

basic_contract_caller/other_contract/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { path = "../../../crates/e2e" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

call-runtime/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false, features = ["call-runtime"] }
+ink = { version = "4.2.0", default-features = false, features = ["call-runtime"] }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
@@ -21,7 +21,7 @@ sp-io = { version = "22.0.0", default-features = false, features = ["disable_pan
 sp-runtime = { version = "23.0.0", default-features = false }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

conditional-compilation/Cargo.toml

@@ -5,13 +5,13 @@ authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

contract-terminate/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

contract-transfer/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

custom-environment/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

custom_allocator/Cargo.toml

@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 # We're going to use a different allocator than the one provided by ink!. To do that we
 # first need to disable the included memory allocator.
-ink = { version = "4.2", default-features = false, features = ["no-allocator"]  }
+ink = { version = "4.2.0", default-features = false, features = ["no-allocator"]  }
 
 # This is going to be our new global memory allocator.
 dlmalloc = {version = "0.2", default-features = false, features = ["global"] }
@@ -17,7 +17,7 @@ scale = { package = "parity-scale-codec", version = "3", default-features = fals
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

delegator/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "delegator"
-version = "4.1.0"
+version = "4.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.1", default-features = false }
+ink = { version = "4.2.0", 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 }
@@ -15,24 +15,23 @@ adder = { path = "adder", default-features = false, features = ["ink-as-dependen
 subber = { path = "subber", default-features = false, features = ["ink-as-dependency"] }
 accumulator = { path = "accumulator", default-features = false, features = ["ink-as-dependency"] }
 
+
 [dev-dependencies]
-ink_e2e = { version = "4.1" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 name = "delegator"
 path = "lib.rs"
-crate-type = ["cdylib"]
 
 [features]
 default = ["std"]
 std = [
-    "ink/std",
-    "scale/std",
-    "scale-info/std",
-
-    "adder/std",
-    "subber/std",
-    "accumulator/std",
+    "ink/std", 
+    "scale/std", 
+    "scale-info/std", 
+    "adder/std", 
+    "subber/std", 
+    "accumulator/std"
 ]
 ink-as-dependency = []
 e2e-tests = []

delegator/accumulator/Cargo.toml

@@ -1,23 +1,17 @@
 [package]
 name = "accumulator"
-version = "4.1.0"
+version = "4.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-ink = { version = "4.1", default-features = false }
+ink = { version = "4.2.0", 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 }
 
 [lib]
 name = "accumulator"
 path = "lib.rs"
-crate-type = [
-    # Used for normal contract Wasm blobs.
-    "cdylib",
-    # Used for ABI generation.
-    "rlib",
-]
 
 [features]
 default = ["std"]
@@ -26,4 +20,4 @@ std = [
     "scale/std",
     "scale-info/std",
 ]
-ink-as-dependency = []
+ink-as-dependency = []

delegator/accumulator/lib.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(not(feature = "std"), no_std, no_main)]
 
 pub use self::accumulator::{
     Accumulator,

delegator/adder/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "adder"
-version = "4.1.0"
+version = "4.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-ink = { version = "4.1", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 accumulator = { path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }
 
@@ -15,12 +15,6 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"],
 [lib]
 name = "adder"
 path = "lib.rs"
-crate-type = [
-    # Used for normal contract Wasm blobs.
-    "cdylib",
-    # Used for ABI generation.
-    "rlib",
-]
 
 [features]
 default = ["std"]

delegator/adder/lib.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(not(feature = "std"), no_std, no_main)]
 
 pub use self::adder::{
     Adder,

delegator/build-all.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-cargo +stable contract build --manifest-path accumulator/Cargo.toml
-cargo +stable contract build --manifest-path adder/Cargo.toml
-cargo +stable contract build --manifest-path subber/Cargo.toml
-cargo +stable contract build
+cargo contract build --manifest-path accumulator/Cargo.toml --release
+cargo contract build --manifest-path adder/Cargo.toml --release
+cargo contract build --manifest-path subber/Cargo.toml --release
+cargo contract build --release

delegator/lib.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(not(feature = "std"), no_std, no_main)]
 
 #[ink::contract]
 mod delegator {

delegator/subber/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "subber"
-version = "4.1.0"
+version = "4.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-ink = { version = "4.1", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 accumulator = { path = "../accumulator", default-features = false, features = ["ink-as-dependency"] }
 
@@ -15,12 +15,6 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"],
 [lib]
 name = "subber"
 path = "lib.rs"
-crate-type = [
-    # Used for normal contract Wasm blobs.
-    "cdylib",
-    # Used for ABI generation.
-    "rlib",
-]
 
 [features]
 default = ["std"]

delegator/subber/lib.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(not(feature = "std"), no_std, no_main)]
 
 pub use self::subber::{
     Subber,

dns/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }

e2e-call-runtime/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 subxt = { version = "0.28.0", default-features = false }
 
 [lib]

erc1155/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }

erc20/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

erc721/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }

flipper/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
-ink_e2e = { version = "4.2" }
+ink_e2e = { version = "4.2.0" }
 
 [lib]
 path = "lib.rs"

incrementer/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-ink = { version = "4.2", default-features = false }
+ink = { version = "4.2.0", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5", default-features = false, features = ["derive"], optional = true }