Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: address build failures in some contracts (#24) #35

Merged
merged 1 commit into from
Aug 14, 2023
Merged

fix: address build failures in some contracts (#24) #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion basic_contract_caller/other_contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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 = { path = "../../../crates/e2e" }
ink_e2e = { version = "4.2" }

[lib]
path = "lib.rs"
Expand Down
21 changes: 10 additions & 11 deletions delegator/Cargo.toml
View file
Open in desktop
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", 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" }

[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
View file
Open in desktop
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", 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
View file
Open in desktop
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
View file
Open in desktop
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"
0xf333 marked this conversation as resolved.
Show resolved Hide resolved
authors = ["Parity Technologies <[email protected]>"]
edition = "2021"

[dependencies]
ink = { version = "4.1", default-features = false }
ink = { version = "4.2", 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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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", 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
View file
Open in desktop
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
1 change: 0 additions & 1 deletion multi_contract_caller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ std = [
"ink/std",
"scale/std",
"scale-info/std",

"adder/std",
"subber/std",
"accumulator/std",
Expand Down
1 change: 0 additions & 1 deletion multi_contract_caller/adder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ std = [
"ink/std",
"scale/std",
"scale-info/std",

"accumulator/std",
]
ink-as-dependency = []
1 change: 0 additions & 1 deletion multi_contract_caller/subber/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ std = [
"ink/std",
"scale/std",
"scale-info/std",

"accumulator/std",
]
ink-as-dependency = []
1 change: 0 additions & 1 deletion trait-dyn-cross-contract-calls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ std = [
"ink/std",
"scale/std",
"scale-info/std",

"dyn-traits/std",
]
e2e-tests = []
Expand Down
2 changes: 1 addition & 1 deletion trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
publish = false

[dependencies]
ink = { path = "../../../../crates/ink", default-features = false }
ink = { version = "4.2", 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
1 change: 0 additions & 1 deletion trait-incrementer/traits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ scale-info = { version = "2.5", default-features = false, features = ["derive"],
[lib]
name = "traits"
path = "lib.rs"
crate-type = ["rlib"]

[features]
default = ["std"]
Expand Down
5 changes: 2 additions & 3 deletions upgradeable-contracts/forward-calls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
[package]
name = "forward_calls"
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", 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 = "forward_calls"
path = "lib.rs"
crate-type = ["cdylib"]

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion upgradeable-contracts/forward-calls/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//! Note though that the contract to which calls are forwarded still
//! contains it's own state.

#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), no_std, no_main)]

#[ink::contract]
pub mod proxy {
Expand Down
5 changes: 2 additions & 3 deletions upgradeable-contracts/set-code-hash/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
[package]
name = "incrementer"
version = "4.1.0"
version = "4.2.0"
edition = "2021"
authors = ["Parity Technologies <[email protected]>"]
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ink = { version = "4.1", default-features = false }
ink = { version = "4.2", 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 = "incrementer"
path = "lib.rs"
crate-type = ["cdylib"]

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion upgradeable-contracts/set-code-hash/lib.rs
View file
Open in desktop
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]
pub mod incrementer {
Expand Down
5 changes: 2 additions & 3 deletions upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
[package]
name = "updated-incrementer"
version = "4.1.0"
version = "4.2.0"
edition = "2021"
authors = ["Parity Technologies <[email protected]>"]
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ink = { version = "4.1", default-features = false }
ink = { version = "4.2", 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 = "updated_incrementer"
path = "lib.rs"
crate-type = ["cdylib"]

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion upgradeable-contracts/set-code-hash/updated-incrementer/lib.rs
View file
Open in desktop
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]
pub mod incrementer {
Expand Down