Skip to content

Commit

Permalink
fix: address build failures in some contracts (#24)
Browse files Browse the repository at this point in the history
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 #24
  • Loading branch information
0xf333 committed Aug 10, 2023
1 parent 3254a29 commit f47703a
Show file tree
Hide file tree
Showing 48 changed files with 89 additions and 108 deletions.
4 changes: 2 additions & 2 deletions basic_contract_caller/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions basic_contract_caller/other_contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions call-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions conditional-compilation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions contract-terminate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions contract-transfer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions custom-environment/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions custom_allocator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"
Expand Down
21 changes: 10 additions & 11 deletions delegator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand All @@ -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 = []
Expand Down
12 changes: 3 additions & 9 deletions delegator/accumulator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"]
Expand All @@ -26,4 +20,4 @@ std = [
"scale/std",
"scale-info/std",
]
ink-as-dependency = []
ink-as-dependency = []
2 changes: 1 addition & 1 deletion delegator/accumulator/lib.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
10 changes: 2 additions & 8 deletions delegator/adder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"] }

Expand All @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion delegator/adder/lib.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 4 additions & 4 deletions delegator/build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion delegator/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]

#[ink::contract]
mod delegator {
Expand Down
10 changes: 2 additions & 8 deletions delegator/subber/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"] }

Expand All @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion delegator/subber/lib.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion dns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions e2e-call-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion erc1155/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions erc20/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion erc721/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions flipper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion incrementer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Loading

0 comments on commit f47703a

Please sign in to comment.