diff --git a/basic_contract_caller/Cargo.toml b/basic_contract_caller/Cargo.toml index fc4a7f93..2428652f 100755 --- a/basic_contract_caller/Cargo.toml +++ b/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" diff --git a/basic_contract_caller/other_contract/Cargo.toml b/basic_contract_caller/other_contract/Cargo.toml index 70a068ed..dbdd5387 100755 --- a/basic_contract_caller/other_contract/Cargo.toml +++ b/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" diff --git a/call-runtime/Cargo.toml b/call-runtime/Cargo.toml index c9d7540a..e308b271 100644 --- a/call-runtime/Cargo.toml +++ b/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" diff --git a/conditional-compilation/Cargo.toml b/conditional-compilation/Cargo.toml index 7b0d0111..4f37c84d 100755 --- a/conditional-compilation/Cargo.toml +++ b/conditional-compilation/Cargo.toml @@ -5,13 +5,13 @@ authors = ["Parity Technologies "] 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" diff --git a/contract-terminate/Cargo.toml b/contract-terminate/Cargo.toml index 5dd0b994..3f24a440 100644 --- a/contract-terminate/Cargo.toml +++ b/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" diff --git a/contract-transfer/Cargo.toml b/contract-transfer/Cargo.toml index 976f3ff6..3efc6394 100644 --- a/contract-transfer/Cargo.toml +++ b/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" diff --git a/custom-environment/Cargo.toml b/custom-environment/Cargo.toml index 43030d99..edf8f8b7 100644 --- a/custom-environment/Cargo.toml +++ b/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" diff --git a/custom_allocator/Cargo.toml b/custom_allocator/Cargo.toml index 56ccd1ed..2fa8c830 100755 --- a/custom_allocator/Cargo.toml +++ b/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" diff --git a/delegator/Cargo.toml b/delegator/Cargo.toml index 403e4a12..9cf82c6e 100644 --- a/delegator/Cargo.toml +++ b/delegator/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "delegator" -version = "4.1.0" +version = "4.2.0" authors = ["Parity Technologies "] 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 = [] diff --git a/delegator/accumulator/Cargo.toml b/delegator/accumulator/Cargo.toml index da0d2bec..4b50c012 100644 --- a/delegator/accumulator/Cargo.toml +++ b/delegator/accumulator/Cargo.toml @@ -1,23 +1,17 @@ [package] name = "accumulator" -version = "4.1.0" +version = "4.2.0" authors = ["Parity Technologies "] 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 = [] \ No newline at end of file diff --git a/delegator/accumulator/lib.rs b/delegator/accumulator/lib.rs index 244ad388..9986f4dc 100644 --- a/delegator/accumulator/lib.rs +++ b/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, diff --git a/delegator/adder/Cargo.toml b/delegator/adder/Cargo.toml index be362ad2..3fc259cf 100644 --- a/delegator/adder/Cargo.toml +++ b/delegator/adder/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "adder" -version = "4.1.0" +version = "4.2.0" authors = ["Parity Technologies "] 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"] diff --git a/delegator/adder/lib.rs b/delegator/adder/lib.rs index 839915c6..72529d7d 100644 --- a/delegator/adder/lib.rs +++ b/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, diff --git a/delegator/build-all.sh b/delegator/build-all.sh index 9597fc71..c0eb6acb 100755 --- a/delegator/build-all.sh +++ b/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 diff --git a/delegator/lib.rs b/delegator/lib.rs index 880c3dcb..c546df91 100644 --- a/delegator/lib.rs +++ b/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 { diff --git a/delegator/subber/Cargo.toml b/delegator/subber/Cargo.toml index bc0ab985..8dc6707c 100644 --- a/delegator/subber/Cargo.toml +++ b/delegator/subber/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "subber" -version = "4.1.0" +version = "4.2.0" authors = ["Parity Technologies "] 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"] diff --git a/delegator/subber/lib.rs b/delegator/subber/lib.rs index 37629aca..aee051bf 100644 --- a/delegator/subber/lib.rs +++ b/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, diff --git a/dns/Cargo.toml b/dns/Cargo.toml index 3478583b..c8a6c142 100644 --- a/dns/Cargo.toml +++ b/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 } diff --git a/e2e-call-runtime/Cargo.toml b/e2e-call-runtime/Cargo.toml index 12ae5c9f..16bb45d1 100644 --- a/e2e-call-runtime/Cargo.toml +++ b/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] diff --git a/erc1155/Cargo.toml b/erc1155/Cargo.toml index 826b6787..c3dd9d89 100644 --- a/erc1155/Cargo.toml +++ b/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 } diff --git a/erc20/Cargo.toml b/erc20/Cargo.toml index d8aed9d6..0f01ab7f 100644 --- a/erc20/Cargo.toml +++ b/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" diff --git a/erc721/Cargo.toml b/erc721/Cargo.toml index 374cc2fa..74bd5f53 100644 --- a/erc721/Cargo.toml +++ b/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 } diff --git a/flipper/Cargo.toml b/flipper/Cargo.toml index 2e7e31ed..1af1726b 100644 --- a/flipper/Cargo.toml +++ b/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" diff --git a/incrementer/Cargo.toml b/incrementer/Cargo.toml index b5ecaf28..0544f6ed 100644 --- a/incrementer/Cargo.toml +++ b/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 } diff --git a/multi_contract_caller/Cargo.toml b/multi_contract_caller/Cargo.toml index 14269e91..decf3bf8 100644 --- a/multi_contract_caller/Cargo.toml +++ b/multi_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 } @@ -16,7 +16,7 @@ subber = { path = "subber", default-features = false, features = ["ink-as-depend accumulator = { path = "accumulator", default-features = false, features = ["ink-as-dependency"] } [dev-dependencies] -ink_e2e = { version = "4.2" } +ink_e2e = { version = "4.2.0" } [lib] path = "lib.rs" @@ -27,7 +27,6 @@ std = [ "ink/std", "scale/std", "scale-info/std", - "adder/std", "subber/std", "accumulator/std", diff --git a/multi_contract_caller/accumulator/Cargo.toml b/multi_contract_caller/accumulator/Cargo.toml index 5492ca97..6d107f91 100644 --- a/multi_contract_caller/accumulator/Cargo.toml +++ b/multi_contract_caller/accumulator/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] 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 } diff --git a/multi_contract_caller/adder/Cargo.toml b/multi_contract_caller/adder/Cargo.toml index 616945b0..75b2e7c3 100644 --- a/multi_contract_caller/adder/Cargo.toml +++ b/multi_contract_caller/adder/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -ink = { version = "4.2", default-features = false } +ink = { version = "4.2.0", default-features = false } accumulator = { path = "../accumulator", default-features = false, features = ["ink-as-dependency"] } @@ -21,7 +21,6 @@ std = [ "ink/std", "scale/std", "scale-info/std", - "accumulator/std", ] ink-as-dependency = [] diff --git a/multi_contract_caller/subber/Cargo.toml b/multi_contract_caller/subber/Cargo.toml index 8579d13b..f6882316 100644 --- a/multi_contract_caller/subber/Cargo.toml +++ b/multi_contract_caller/subber/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2021" [dependencies] -ink = { version = "4.2", default-features = false } +ink = { version = "4.2.0", default-features = false } accumulator = { path = "../accumulator", default-features = false, features = ["ink-as-dependency"] } @@ -21,7 +21,6 @@ std = [ "ink/std", "scale/std", "scale-info/std", - "accumulator/std", ] ink-as-dependency = [] diff --git a/multisig/Cargo.toml b/multisig/Cargo.toml index 5ce04f3c..d98ffc25 100755 --- a/multisig/Cargo.toml +++ b/multisig/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 } diff --git a/payment-channel/Cargo.toml b/payment-channel/Cargo.toml index 9047b33e..438fc60b 100755 --- a/payment-channel/Cargo.toml +++ b/payment-channel/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"] } diff --git a/psp22-extension/Cargo.toml b/psp22-extension/Cargo.toml index 37bfe380..5fd1ff5e 100755 --- a/psp22-extension/Cargo.toml +++ b/psp22-extension/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 } diff --git a/rand-extension/contract/Cargo.toml b/rand-extension/contract/Cargo.toml index 51092957..79329706 100644 --- a/rand-extension/contract/Cargo.toml +++ b/rand-extension/contract/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"] } rand_extension = { version = "1.0.0", path = "../rand_extension", default-features = false } diff --git a/rand-extension/rand_extension/Cargo.toml b/rand-extension/rand_extension/Cargo.toml index c505f8b5..4053eb7e 100644 --- a/rand-extension/rand_extension/Cargo.toml +++ b/rand-extension/rand_extension/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"] } diff --git a/set_code_hash/Cargo.toml b/set_code_hash/Cargo.toml index 1fa036bd..059d17cb 100644 --- a/set_code_hash/Cargo.toml +++ b/set_code_hash/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" diff --git a/set_code_hash/updated_incrementer/Cargo.toml b/set_code_hash/updated_incrementer/Cargo.toml index dfafa9b7..2a4bcbda 100644 --- a/set_code_hash/updated_incrementer/Cargo.toml +++ b/set_code_hash/updated_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 } diff --git a/trait-dyn-cross-contract-calls/Cargo.toml b/trait-dyn-cross-contract-calls/Cargo.toml index bdab930d..f5bc1c2c 100644 --- a/trait-dyn-cross-contract-calls/Cargo.toml +++ b/trait-dyn-cross-contract-calls/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 } @@ -14,7 +14,7 @@ scale-info = { version = "2.5", default-features = false, features = ["derive"], dyn-traits = { path = "./traits", default-features = false } [dev-dependencies] -ink_e2e = { version = "4.2" } +ink_e2e = { version = "4.2.0" } trait-incrementer = { path = "./contracts/incrementer", default-features = false, features = ["ink-as-dependency"] } [lib] @@ -26,7 +26,6 @@ std = [ "ink/std", "scale/std", "scale-info/std", - "dyn-traits/std", ] e2e-tests = [] diff --git a/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml b/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml index 0cf71da9..223be4f4 100644 --- a/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml +++ b/trait-dyn-cross-contract-calls/contracts/incrementer/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" publish = false [dependencies] -ink = { path = "../../../../crates/ink", 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 } diff --git a/trait-dyn-cross-contract-calls/traits/Cargo.toml b/trait-dyn-cross-contract-calls/traits/Cargo.toml index 008bd5fb..bd0a7d33 100644 --- a/trait-dyn-cross-contract-calls/traits/Cargo.toml +++ b/trait-dyn-cross-contract-calls/traits/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 } diff --git a/trait-erc20/Cargo.toml b/trait-erc20/Cargo.toml index 796a309d..174f04eb 100644 --- a/trait-erc20/Cargo.toml +++ b/trait-erc20/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 } diff --git a/trait-flipper/Cargo.toml b/trait-flipper/Cargo.toml index 18e20094..ead54e42 100644 --- a/trait-flipper/Cargo.toml +++ b/trait-flipper/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 } diff --git a/trait-incrementer/Cargo.toml b/trait-incrementer/Cargo.toml index 9afb3e94..c04baeff 100644 --- a/trait-incrementer/Cargo.toml +++ b/trait-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 } diff --git a/trait-incrementer/traits/Cargo.toml b/trait-incrementer/traits/Cargo.toml index e4080988..53b7b4c8 100644 --- a/trait-incrementer/traits/Cargo.toml +++ b/trait-incrementer/traits/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 } @@ -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"] diff --git a/upgradeable-contracts/forward-calls/Cargo.toml b/upgradeable-contracts/forward-calls/Cargo.toml index 3e6106c0..01ff51e9 100644 --- a/upgradeable-contracts/forward-calls/Cargo.toml +++ b/upgradeable-contracts/forward-calls/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "forward_calls" -version = "4.1.0" +version = "4.2.0" authors = ["Parity Technologies "] 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 } @@ -14,7 +14,6 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"], [lib] name = "forward_calls" path = "lib.rs" -crate-type = ["cdylib"] [features] default = ["std"] diff --git a/upgradeable-contracts/forward-calls/lib.rs b/upgradeable-contracts/forward-calls/lib.rs index d65c5111..d1885dbb 100644 --- a/upgradeable-contracts/forward-calls/lib.rs +++ b/upgradeable-contracts/forward-calls/lib.rs @@ -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 { diff --git a/upgradeable-contracts/set-code-hash/Cargo.toml b/upgradeable-contracts/set-code-hash/Cargo.toml index 18ca6cdf..c27abf00 100644 --- a/upgradeable-contracts/set-code-hash/Cargo.toml +++ b/upgradeable-contracts/set-code-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "incrementer" -version = "4.1.0" +version = "4.2.0" edition = "2021" authors = ["Parity Technologies "] publish = false @@ -8,7 +8,7 @@ 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.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 } @@ -16,7 +16,6 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"], [lib] name = "incrementer" path = "lib.rs" -crate-type = ["cdylib"] [features] default = ["std"] diff --git a/upgradeable-contracts/set-code-hash/lib.rs b/upgradeable-contracts/set-code-hash/lib.rs index ce36570a..4f733a3c 100644 --- a/upgradeable-contracts/set-code-hash/lib.rs +++ b/upgradeable-contracts/set-code-hash/lib.rs @@ -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 { diff --git a/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml b/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml index 3c1e4041..2bb53e8d 100644 --- a/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml +++ b/upgradeable-contracts/set-code-hash/updated-incrementer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "updated-incrementer" -version = "4.1.0" +version = "4.2.0" edition = "2021" authors = ["Parity Technologies "] publish = false @@ -8,7 +8,7 @@ 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.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 } @@ -16,7 +16,6 @@ scale-info = { version = "2.3", default-features = false, features = ["derive"], [lib] name = "updated_incrementer" path = "lib.rs" -crate-type = ["cdylib"] [features] default = ["std"] diff --git a/upgradeable-contracts/set-code-hash/updated-incrementer/lib.rs b/upgradeable-contracts/set-code-hash/updated-incrementer/lib.rs index de2b517c..3bd37166 100644 --- a/upgradeable-contracts/set-code-hash/updated-incrementer/lib.rs +++ b/upgradeable-contracts/set-code-hash/updated-incrementer/lib.rs @@ -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 {