diff --git a/.gitignore b/.gitignore index 00a4be02e9..41cbcd3a14 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ coverage.md my-vm-tests.sh quick.sh template-test +install-debugger-test # Zip output with example wasm binaries examples-wasm.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index b2a5d785c0..4accb705c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,14 @@ They are: - `multiversx-sdk-http` - `multiversx-sdk-dapp` +## [sc 0.54.4] - 2024-11-22 +- `sc-meta` + - `install debugger` CLI that prepares VSCode extension for debugging; + - fixed a crash involving templates and installers. +- Deprecated `#[derive(TypeAbi)]` and added an additional warning in the macro. + +## [sc 0.54.3] - 2024-11-18 +- `#[storage_mapper_from_address]` fixes for: `FungibleTokenMapper`, `NonFungibleTokenMapper`, `TokenAttributesMapper`, `UniqueIdMapper`, `UserMapper`, `AddressToIdMapper`. ## [sc 0.54.2, codec 0.21.1, chain 0.11.1, sdk 0.7.1] - 2024-11-15 - Codec improvements: diff --git a/Cargo.lock b/Cargo.lock index 2ef9a03de4..cce05c2d4a 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -625,9 +625,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1608,9 +1608,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -1686,6 +1686,15 @@ dependencies = [ "digest", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "http" version = "0.2.12" @@ -1745,9 +1754,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", @@ -2045,9 +2054,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" [[package]] name = "js-sys" @@ -2160,9 +2169,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.162" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "linked-list-repeat" @@ -2434,7 +2443,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f" [[package]] name = "multiversx-price-aggregator-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "arrayvec", "getrandom", @@ -2455,7 +2464,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -2488,7 +2497,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -2499,7 +2508,7 @@ dependencies = [ [[package]] name = "multiversx-sc-meta" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bip39", "clap", @@ -2507,6 +2516,7 @@ dependencies = [ "common-path", "convert_case", "copy_dir", + "home", "multiversx-sc", "multiversx-sc-meta-lib", "multiversx-sc-snippets", @@ -2523,7 +2533,7 @@ dependencies = [ [[package]] name = "multiversx-sc-meta-lib" -version = "0.54.2" +version = "0.54.4" dependencies = [ "clap", "colored", @@ -2543,14 +2553,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-scenario" -version = "0.54.2" +version = "0.54.4" dependencies = [ "base64", "bech32", @@ -2574,7 +2584,7 @@ dependencies = [ [[package]] name = "multiversx-sc-snippets" -version = "0.54.2" +version = "0.54.4" dependencies = [ "anyhow", "base64", @@ -2593,7 +2603,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -2658,7 +2668,7 @@ dependencies = [ [[package]] name = "multiversx-wegld-swap-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", "multiversx-sc-modules", @@ -3585,9 +3595,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.40" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags", "errno", @@ -3598,9 +3608,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.16" +version = "0.23.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" +checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" dependencies = [ "once_cell", "ring", @@ -3684,9 +3694,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -3821,9 +3831,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "indexmap 2.6.0", "itoa", @@ -4048,9 +4058,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -4359,9 +4369,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -4668,9 +4678,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml index 472bbe45d5..f0e9de9742 100644 --- a/contracts/benchmarks/large-storage/Cargo.toml +++ b/contracts/benchmarks/large-storage/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/large_storage.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml index 77d8a6683e..ec4ffdfd3e 100644 --- a/contracts/benchmarks/large-storage/meta/Cargo.toml +++ b/contracts/benchmarks/large-storage/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/large-storage/src/large_storage.rs b/contracts/benchmarks/large-storage/src/large_storage.rs index 46e62ceedb..3e47dc0e01 100644 --- a/contracts/benchmarks/large-storage/src/large_storage.rs +++ b/contracts/benchmarks/large-storage/src/large_storage.rs @@ -3,12 +3,15 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); -#[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] pub enum SampleEnum { Value1, Value2, } -#[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] + +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] pub struct Structure { pub field1: ManagedBuffer, pub field2: SampleEnum, diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock index 8a9ea78450..268754df55 100755 --- a/contracts/benchmarks/large-storage/wasm/Cargo.lock +++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml index 120c1f7a6b..ebc29a2856 100644 --- a/contracts/benchmarks/large-storage/wasm/Cargo.toml +++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml index 4c349a33a7..729d073598 100644 --- a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml +++ b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/benchmark-common/src/example_struct.rs b/contracts/benchmarks/mappers/benchmark-common/src/example_struct.rs index 23bb9b8cda..9193ef2a9c 100644 --- a/contracts/benchmarks/mappers/benchmark-common/src/example_struct.rs +++ b/contracts/benchmarks/mappers/benchmark-common/src/example_struct.rs @@ -3,7 +3,8 @@ multiversx_sc::derive_imports!(); pub type Nonce = u64; -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] pub struct ExampleStruct where M: ManagedTypeApi, diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml index 3c230c23b0..01bd61f274 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml index 88abe80b03..e979be0ed5 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock index 1132dfd3e1..5774d35d6d 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml index bca9ba0056..6a7279254b 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml index 1a4192baf2..054b70dff0 100644 --- a/contracts/benchmarks/mappers/map-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml index 5d1c060019..336483e767 100644 --- a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock index cb8f17b0a1..d60fc63742 100644 --- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml index 99586a6b37..75b8194799 100644 --- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml index 0e1150009b..a687acc703 100644 --- a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml index 634fbb4202..bacaf76d9f 100644 --- a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock index 021229f479..696cadbff0 100644 --- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml index 2c6a0619af..1cd0e8301b 100644 --- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml index dbacd4277f..117fc28907 100644 --- a/contracts/benchmarks/mappers/set-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml index 2ff8579685..b437b4a35d 100644 --- a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock index 238d81ab69..c1001b72b8 100644 --- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml index 477d44cdca..41091c06c2 100644 --- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml index f33342cebd..1fc64b2ae8 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml index f0b0fbcad8..19f896aa78 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock index a537a04ae0..fc19bcb175 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml index 50fb70acfd..e7f0f7617b 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml index 5e5153bc09..ba3f106d9d 100644 --- a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml index be9b284795..36a0506d62 100644 --- a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock index dc81990eda..0c8ad4fc96 100644 --- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml index df823ce0dd..f40b4889ec 100644 --- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml index f253a0f072..70d6fc6f20 100644 --- a/contracts/benchmarks/send-tx-repeat/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/send_tx_repeat.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml index 651e3b0aec..617fe98739 100644 --- a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock index d5662791f6..412c81f668 100755 --- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml index 1e4cc89296..9031ded722 100644 --- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml index a6af0b194d..f5cd912231 100644 --- a/contracts/benchmarks/str-repeat/Cargo.toml +++ b/contracts/benchmarks/str-repeat/Cargo.toml @@ -12,10 +12,10 @@ path = "src/str_repeat.rs" managed-buffer-builder-cached = ["multiversx-sc/managed-buffer-builder-cached"] [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml index d4cb8e1450..b8e267fe1b 100644 --- a/contracts/benchmarks/str-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/str-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock index bf3d0ce4c5..ccc27615fb 100644 --- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock +++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml index 58cdc106d3..e6992f1fd3 100644 --- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml +++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-basic/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock index e097adcfe3..f20cf1dd8e 100644 --- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock +++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml index f5ea1f1ccc..2efd006b28 100644 --- a/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml +++ b/contracts/benchmarks/str-repeat/wasm-str-repeat-mb-builder-cached/Cargo.toml @@ -29,7 +29,7 @@ path = ".." features = ["managed-buffer-builder-cached"] [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock index a39ba9a6eb..011f7069b2 100755 --- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml index c2fb9501ac..4ff72bd15d 100644 --- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml index 5523ac2d59..2be6e991cb 100644 --- a/contracts/core/price-aggregator/Cargo.toml +++ b/contracts/core/price-aggregator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-price-aggregator-sc" -version = "0.54.2" +version = "0.54.4" authors = [ "Claudiu-Marcel Bruda ", "MultiversX ", @@ -19,15 +19,15 @@ edition = "2021" path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dependencies] diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml index 0a9d1de33d..9c3152c415 100644 --- a/contracts/core/price-aggregator/meta/Cargo.toml +++ b/contracts/core/price-aggregator/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock index 0c6d3e6965..224798e239 100644 --- a/contracts/core/price-aggregator/wasm/Cargo.lock +++ b/contracts/core/price-aggregator/wasm/Cargo.lock @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.162" +version = "0.2.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" +checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" [[package]] name = "log" @@ -100,7 +100,7 @@ dependencies = [ [[package]] name = "multiversx-price-aggregator-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "arrayvec", "getrandom", @@ -119,7 +119,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -151,7 +151,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -162,14 +162,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -284,9 +284,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml index 83b0c242c1..08d5fa6411 100644 --- a/contracts/core/price-aggregator/wasm/Cargo.toml +++ b/contracts/core/price-aggregator/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml index b92d5c503b..7b3d5a8e27 100644 --- a/contracts/core/wegld-swap/Cargo.toml +++ b/contracts/core/wegld-swap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-wegld-swap-sc" -version = "0.54.2" +version = "0.54.4" authors = [ "Dorin Iancu ", @@ -20,13 +20,13 @@ edition = "2021" path = "src/wegld.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml index e4ec97a5c4..7eea92dbf7 100644 --- a/contracts/core/wegld-swap/meta/Cargo.toml +++ b/contracts/core/wegld-swap/meta/Cargo.toml @@ -11,10 +11,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml index c85e1f98e3..4f770b2a84 100644 --- a/contracts/core/wegld-swap/wasm/Cargo.toml +++ b/contracts/core/wegld-swap/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml index 4bc491a693..73736c9495 100644 --- a/contracts/examples/adder/Cargo.toml +++ b/contracts/examples/adder/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/adder.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" \ No newline at end of file diff --git a/contracts/examples/adder/interactor/Cargo.toml b/contracts/examples/adder/interactor/Cargo.toml index 98248e99f9..d3028c111d 100644 --- a/contracts/examples/adder/interactor/Cargo.toml +++ b/contracts/examples/adder/interactor/Cargo.toml @@ -16,7 +16,7 @@ path = "src/basic_interactor.rs" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/snippets" [dependencies] diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml index 9c9c808d49..2354d72321 100644 --- a/contracts/examples/adder/meta/Cargo.toml +++ b/contracts/examples/adder/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock index ec0d4425ab..aec8e29ede 100755 --- a/contracts/examples/adder/wasm/Cargo.lock +++ b/contracts/examples/adder/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml index f1f0c92fa7..a110fa61bc 100644 --- a/contracts/examples/adder/wasm/Cargo.toml +++ b/contracts/examples/adder/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml index 086a8ad114..2968e1d993 100644 --- a/contracts/examples/bonding-curve-contract/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/bonding_curve_contract.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml index e009f17bf5..df50d7a93a 100644 --- a/contracts/examples/bonding-curve-contract/meta/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/bonding-curve-contract/src/function_selector.rs b/contracts/examples/bonding-curve-contract/src/function_selector.rs index 218a490c9c..511285ea4c 100644 --- a/contracts/examples/bonding-curve-contract/src/function_selector.rs +++ b/contracts/examples/bonding-curve-contract/src/function_selector.rs @@ -5,9 +5,8 @@ use crate::bonding_curve::{ utils::structs::CurveArguments, }; -#[derive( - TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, PartialEq, Eq, Clone, Default, -)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone, Default)] pub enum FunctionSelector { Linear(LinearFunction), CustomExample(BigUint), diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock index 9e588cc69e..44dd694354 100644 --- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock +++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml index cefd5b6e08..b24827f3c0 100644 --- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml index 9bac909e7a..12af52eaf6 100644 --- a/contracts/examples/check-pause/Cargo.toml +++ b/contracts/examples/check-pause/Cargo.toml @@ -12,14 +12,14 @@ path = "src/check_pause.rs" num-bigint = "0.4" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml index 3f06f84284..4c5a0bc2bd 100644 --- a/contracts/examples/check-pause/meta/Cargo.toml +++ b/contracts/examples/check-pause/meta/Cargo.toml @@ -9,6 +9,6 @@ authors = ["Alin Cruceat "] path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock index 88e4adf548..be95f0cff4 100644 --- a/contracts/examples/check-pause/wasm/Cargo.lock +++ b/contracts/examples/check-pause/wasm/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml index 3ece6a1b8e..fb67f28845 100644 --- a/contracts/examples/check-pause/wasm/Cargo.toml +++ b/contracts/examples/check-pause/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml index 6947bab3a7..cb6744f61a 100644 --- a/contracts/examples/crowdfunding-esdt/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/crowdfunding_esdt.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml index 1f39c074ab..de7abc4a3e 100644 --- a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock index b899381efc..68a32f7014 100644 --- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock +++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml index 5fa21d32ee..93633a67be 100644 --- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml index 33b2188748..b662a6f026 100644 --- a/contracts/examples/crypto-bubbles/Cargo.toml +++ b/contracts/examples/crypto-bubbles/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/crypto_bubbles.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml index ba0f2881ba..27fccce7af 100644 --- a/contracts/examples/crypto-bubbles/meta/Cargo.toml +++ b/contracts/examples/crypto-bubbles/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock index ac6ec84d1e..928e05b003 100755 --- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock +++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml index 3860d79d27..49af36cd25 100644 --- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml +++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/common/kitty/Cargo.toml b/contracts/examples/crypto-kitties/common/kitty/Cargo.toml index d4df383c1e..b5c8d6948f 100644 --- a/contracts/examples/crypto-kitties/common/kitty/Cargo.toml +++ b/contracts/examples/crypto-kitties/common/kitty/Cargo.toml @@ -9,7 +9,7 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/base" [dependencies.random] diff --git a/contracts/examples/crypto-kitties/common/random/Cargo.toml b/contracts/examples/crypto-kitties/common/random/Cargo.toml index ed048f781f..a3458a7005 100644 --- a/contracts/examples/crypto-kitties/common/random/Cargo.toml +++ b/contracts/examples/crypto-kitties/common/random/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/base" diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml index 93cbbab087..e669bf8a1a 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml @@ -17,9 +17,9 @@ version = "0.0.0" path = "../kitty-ownership" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml index c585ca04fe..637dd4c9bf 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs b/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs index 261def0cf0..67f3035870 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs +++ b/contracts/examples/crypto-kitties/kitty-auction/src/auction.rs @@ -5,7 +5,8 @@ use multiversx_sc::{ types::{BigUint, ManagedAddress}, }; -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub enum AuctionType { Selling, Siring, diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock index 1b9599dc26..4941580555 100755 --- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -135,7 +135,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml index 92a268a079..9a4f6121d0 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml index 654c922e7a..0b84f55d1c 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml @@ -18,9 +18,9 @@ version = "0.0.0" path = "../common/random" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml index c075dbf2fe..0eba6ef01a 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock index 6b011c8600..362990d216 100755 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock @@ -73,7 +73,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -193,9 +193,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml index b5970d75f0..7e5c7b4aaf 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml index bdb03b4232..4d35da2033 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml @@ -21,9 +21,9 @@ version = "0.0.0" path = "../kitty-genetic-alg" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml index ecd9e4413e..a4fbabe240 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock index 4a55e23be7..df8f2de19b 100755 --- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -115,7 +115,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -126,7 +126,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -203,9 +203,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml index de24703feb..1876cf9891 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml index 169966d236..7d67799c69 100644 --- a/contracts/examples/crypto-zombies/Cargo.toml +++ b/contracts/examples/crypto-zombies/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml index 5723fe2c7b..2c0861de6e 100644 --- a/contracts/examples/crypto-zombies/meta/Cargo.toml +++ b/contracts/examples/crypto-zombies/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock index 6db54a43a2..3e491c2fa5 100755 --- a/contracts/examples/crypto-zombies/wasm/Cargo.lock +++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml index 99d2a672d7..b75666891c 100644 --- a/contracts/examples/crypto-zombies/wasm/Cargo.toml +++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml index 8f67d07a9a..fee37eb8eb 100644 --- a/contracts/examples/digital-cash/Cargo.toml +++ b/contracts/examples/digital-cash/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/digital_cash.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml index e8ea5216f1..56f036d855 100644 --- a/contracts/examples/digital-cash/meta/Cargo.toml +++ b/contracts/examples/digital-cash/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock index a3f92c98e8..edd0fb81c1 100644 --- a/contracts/examples/digital-cash/wasm/Cargo.lock +++ b/contracts/examples/digital-cash/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml index b415263101..e83de65185 100644 --- a/contracts/examples/digital-cash/wasm/Cargo.toml +++ b/contracts/examples/digital-cash/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml index 868874ce38..def58da197 100644 --- a/contracts/examples/empty/Cargo.toml +++ b/contracts/examples/empty/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/empty.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml index b12c130559..de2d203feb 100644 --- a/contracts/examples/empty/meta/Cargo.toml +++ b/contracts/examples/empty/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock index 7280b5039f..fe8f5ed713 100755 --- a/contracts/examples/empty/wasm/Cargo.lock +++ b/contracts/examples/empty/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml index 4ebf986209..ff191a741d 100644 --- a/contracts/examples/empty/wasm/Cargo.toml +++ b/contracts/examples/empty/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/esdt-transfer-with-fee/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/Cargo.toml index d347b708b9..59a5d54728 100644 --- a/contracts/examples/esdt-transfer-with-fee/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/esdt_transfer_with_fee.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml index c4bc79e23f..0888e6d86d 100644 --- a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/esdt-transfer-with-fee/src/fee.rs b/contracts/examples/esdt-transfer-with-fee/src/fee.rs index 67c88d8742..2f3a9d3b0b 100644 --- a/contracts/examples/esdt-transfer-with-fee/src/fee.rs +++ b/contracts/examples/esdt-transfer-with-fee/src/fee.rs @@ -2,7 +2,8 @@ use multiversx_sc::{derive_imports::*, imports::*}; pub(crate) const PERCENTAGE_DIVISOR: u32 = 10_000; // dividing the percentage fee by this number will result in a 2 decimal percentage -#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone)] pub enum Fee where M: ManagedTypeApi, diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock index 322a731b7b..fec9c244c0 100644 --- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock +++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml index 0d2ccb4983..41df8d59e1 100644 --- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml index 3a222743ba..247e171487 100644 --- a/contracts/examples/factorial/Cargo.toml +++ b/contracts/examples/factorial/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/factorial.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml index fa2eff30d7..3714ffc4be 100644 --- a/contracts/examples/factorial/meta/Cargo.toml +++ b/contracts/examples/factorial/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock index a5ef39b601..ef19bc1275 100755 --- a/contracts/examples/factorial/wasm/Cargo.lock +++ b/contracts/examples/factorial/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml index 424352d04f..a56329522d 100644 --- a/contracts/examples/factorial/wasm/Cargo.toml +++ b/contracts/examples/factorial/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml index ed56706eaf..af65324e4e 100644 --- a/contracts/examples/fractional-nfts/Cargo.toml +++ b/contracts/examples/fractional-nfts/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/fractional_nfts.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml index b1d0d23a1b..e829e02791 100644 --- a/contracts/examples/fractional-nfts/meta/Cargo.toml +++ b/contracts/examples/fractional-nfts/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock index 40f105257e..47585401c4 100644 --- a/contracts/examples/fractional-nfts/wasm/Cargo.lock +++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml index a708990e43..3eb4d65584 100644 --- a/contracts/examples/fractional-nfts/wasm/Cargo.toml +++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml index 4720d701dd..f8a3a61d29 100644 --- a/contracts/examples/lottery-esdt/Cargo.toml +++ b/contracts/examples/lottery-esdt/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lottery.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml index 856060a7af..8080d765ef 100644 --- a/contracts/examples/lottery-esdt/meta/Cargo.toml +++ b/contracts/examples/lottery-esdt/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock index 2cb8b90030..03b0ca822e 100755 --- a/contracts/examples/lottery-esdt/wasm/Cargo.lock +++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml index bc46a09cb0..2e422feac2 100644 --- a/contracts/examples/lottery-esdt/wasm/Cargo.toml +++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml index b932d7128f..b8c4b9065c 100644 --- a/contracts/examples/multisig/Cargo.toml +++ b/contracts/examples/multisig/Cargo.toml @@ -9,15 +9,15 @@ publish = false path = "src/multisig.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies.adder] @@ -27,7 +27,7 @@ path = "../adder" path = "../factorial" [dev-dependencies.multiversx-wegld-swap-sc] -version = "0.54.2" +version = "0.54.4" path = "../../core/wegld-swap" [dev-dependencies] diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml index d62b890c3e..a6869b1702 100644 --- a/contracts/examples/multisig/interact/Cargo.toml +++ b/contracts/examples/multisig/interact/Cargo.toml @@ -19,17 +19,17 @@ tokio = { version = "1.24" } path = ".." [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../../contracts/modules" [dependencies.multiversx-sc-snippets] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/snippets" [dependencies.multiversx-sc-scenario] -version = "=0.54.2" +version = "=0.54.4" path = "../../../../framework/scenario" [dependencies.multiversx-sc] -version = "=0.54.2" +version = "=0.54.4" path = "../../../../framework/base" diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml index eb67bcd346..89600645b1 100644 --- a/contracts/examples/multisig/meta/Cargo.toml +++ b/contracts/examples/multisig/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/multisig/src/multisig_proxy.rs b/contracts/examples/multisig/src/multisig_proxy.rs index 6e4b78df16..b4b691f91f 100644 --- a/contracts/examples/multisig/src/multisig_proxy.rs +++ b/contracts/examples/multisig/src/multisig_proxy.rs @@ -458,7 +458,7 @@ where } #[type_abi] -#[derive(TopEncode, TopDecode)] +#[derive(TopEncode, TopDecode, Clone, Copy, PartialEq, Eq, Debug)] pub enum UserRole { None, Proposer, diff --git a/contracts/examples/multisig/src/multisig_view_proxy.rs b/contracts/examples/multisig/src/multisig_view_proxy.rs index f17bdc4212..6235f6dbbb 100644 --- a/contracts/examples/multisig/src/multisig_view_proxy.rs +++ b/contracts/examples/multisig/src/multisig_view_proxy.rs @@ -212,7 +212,7 @@ where } #[type_abi] -#[derive(TopEncode, TopDecode)] +#[derive(TopEncode, TopDecode, Clone, Copy, PartialEq, Eq, Debug)] pub enum UserRole { None, Proposer, diff --git a/contracts/examples/multisig/src/user_role.rs b/contracts/examples/multisig/src/user_role.rs index b92b2dea30..d8230fe68c 100644 --- a/contracts/examples/multisig/src/user_role.rs +++ b/contracts/examples/multisig/src/user_role.rs @@ -1,6 +1,7 @@ use multiversx_sc::derive_imports::*; -#[derive(TopEncode, TopDecode, TypeAbi, Clone, Copy, PartialEq, Eq, Debug)] +#[type_abi] +#[derive(TopEncode, TopDecode, Clone, Copy, PartialEq, Eq, Debug)] pub enum UserRole { None, Proposer, diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock index e6e278906b..4c85beca50 100644 --- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock +++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml index c62ace3213..4c7268986d 100644 --- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml +++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock index dc6396b679..ee240de925 100644 --- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock +++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml index 68722a3d85..43b1a71e06 100644 --- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml +++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock index 880d3a280a..158c7a971b 100755 --- a/contracts/examples/multisig/wasm/Cargo.lock +++ b/contracts/examples/multisig/wasm/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml index b958aa5fc5..55b5f1fdbb 100644 --- a/contracts/examples/multisig/wasm/Cargo.toml +++ b/contracts/examples/multisig/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml index be0e995034..eb0e70c1d0 100644 --- a/contracts/examples/nft-minter/Cargo.toml +++ b/contracts/examples/nft-minter/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml index 2e78ced43f..2e15ebe968 100644 --- a/contracts/examples/nft-minter/meta/Cargo.toml +++ b/contracts/examples/nft-minter/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/nft-minter/src/lib.rs b/contracts/examples/nft-minter/src/lib.rs index 4148f368c2..bf73acee3a 100644 --- a/contracts/examples/nft-minter/src/lib.rs +++ b/contracts/examples/nft-minter/src/lib.rs @@ -5,7 +5,8 @@ use multiversx_sc::{derive_imports::*, imports::*}; pub mod nft_marketplace_proxy; mod nft_module; -#[derive(TypeAbi, TopEncode, TopDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct ExampleAttributes { pub creation_timestamp: u64, } diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs index 12f2c3b868..ab4fd22504 100644 --- a/contracts/examples/nft-minter/src/nft_module.rs +++ b/contracts/examples/nft-minter/src/nft_module.rs @@ -3,7 +3,8 @@ use multiversx_sc::{derive_imports::*, imports::*}; const NFT_AMOUNT: u32 = 1; const ROYALTIES_MAX: u32 = 10_000; -#[derive(TypeAbi, TopEncode, TopDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct PriceTag { pub token: EgldOrEsdtTokenIdentifier, pub nonce: u64, diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock index 4cf9776093..cd7ab1a864 100644 --- a/contracts/examples/nft-minter/wasm/Cargo.lock +++ b/contracts/examples/nft-minter/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml index 5d8928fe73..24e1506a64 100644 --- a/contracts/examples/nft-minter/wasm/Cargo.toml +++ b/contracts/examples/nft-minter/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml index 54cae3eca6..88963e78da 100644 --- a/contracts/examples/nft-storage-prepay/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/Cargo.toml @@ -10,9 +10,9 @@ path = "src/nft_storage_prepay.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml index 47117bdf12..ef923965fe 100644 --- a/contracts/examples/nft-storage-prepay/meta/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/meta/Cargo.toml @@ -11,6 +11,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock index 44e43928ae..904d8b25bc 100755 --- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock +++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml index 7a32337057..35cc32da44 100644 --- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml index 95ec32906e..b171ae5ba2 100644 --- a/contracts/examples/nft-subscription/Cargo.toml +++ b/contracts/examples/nft-subscription/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml index bce95cd89d..1bbc2cf1f3 100644 --- a/contracts/examples/nft-subscription/meta/Cargo.toml +++ b/contracts/examples/nft-subscription/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock index b16e251557..bc7f0868a5 100644 --- a/contracts/examples/nft-subscription/wasm/Cargo.lock +++ b/contracts/examples/nft-subscription/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,14 +91,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml index aab14c84d1..1d683b5828 100644 --- a/contracts/examples/nft-subscription/wasm/Cargo.toml +++ b/contracts/examples/nft-subscription/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml index e9add0c12d..d0aa46beba 100644 --- a/contracts/examples/order-book/factory/Cargo.toml +++ b/contracts/examples/order-book/factory/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml index c50bb5a385..1107bfa86b 100644 --- a/contracts/examples/order-book/factory/meta/Cargo.toml +++ b/contracts/examples/order-book/factory/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/order-book/factory/src/lib.rs b/contracts/examples/order-book/factory/src/lib.rs index fb83863ae3..8208737a71 100644 --- a/contracts/examples/order-book/factory/src/lib.rs +++ b/contracts/examples/order-book/factory/src/lib.rs @@ -2,7 +2,8 @@ use multiversx_sc::{derive_imports::*, imports::*}; -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] pub struct TokenIdPair { first_token_id: TokenIdentifier, second_token_id: TokenIdentifier, diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock index 8fa9a7b2a8..0aab9e2f09 100644 --- a/contracts/examples/order-book/factory/wasm/Cargo.lock +++ b/contracts/examples/order-book/factory/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml index 92a7648862..1431692dc1 100644 --- a/contracts/examples/order-book/factory/wasm/Cargo.toml +++ b/contracts/examples/order-book/factory/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml index 8e02b20e6e..181363ce7c 100644 --- a/contracts/examples/order-book/pair/Cargo.toml +++ b/contracts/examples/order-book/pair/Cargo.toml @@ -8,9 +8,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml index 0f40cab172..e562560944 100644 --- a/contracts/examples/order-book/pair/meta/Cargo.toml +++ b/contracts/examples/order-book/pair/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/order-book/pair/src/common.rs b/contracts/examples/order-book/pair/src/common.rs index 1c4b2e893c..7728e4c364 100644 --- a/contracts/examples/order-book/pair/src/common.rs +++ b/contracts/examples/order-book/pair/src/common.rs @@ -6,8 +6,9 @@ pub const FEE_PENALTY_INCREASE_EPOCHS: u64 = 5; pub const FEE_PENALTY_INCREASE_PERCENT: u64 = 1_000; pub const FREE_ORDER_FROM_STORAGE_MIN_PENALTIES: u64 = 6; +#[type_abi] #[derive( - ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, TypeAbi, Clone, + ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone, )] pub enum OrderType { Buy, @@ -26,27 +27,29 @@ pub struct Transfer { pub payment: Payment, } -#[derive(ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)] +#[type_abi] +#[derive(ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] pub enum FeeConfigEnum { Fixed, Percent, } -#[derive(ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)] +#[type_abi] +#[derive(ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] pub struct FeeConfig { pub fee_type: FeeConfigEnum, pub fixed_fee: BigUint, pub percent_fee: u64, } -#[derive( - ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone, Default, -)] +#[type_abi] +#[derive(ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, Clone, Default)] pub struct DealConfig { pub match_provider_percent: u64, } -#[derive(TopEncode, TopDecode, TypeAbi, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, Clone)] pub struct OrderInputParams { pub amount: BigUint, pub match_provider: ManagedAddress, @@ -54,7 +57,8 @@ pub struct OrderInputParams { pub deal_config: DealConfig, } -#[derive(ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, Clone)] +#[type_abi] +#[derive(ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, Clone)] pub struct Order { pub id: u64, pub creator: ManagedAddress, diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock index 8994890558..ab9619a06e 100644 --- a/contracts/examples/order-book/pair/wasm/Cargo.lock +++ b/contracts/examples/order-book/pair/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml index a77bd3418b..5f2c4787a9 100644 --- a/contracts/examples/order-book/pair/wasm/Cargo.toml +++ b/contracts/examples/order-book/pair/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml index 735fd928fa..f2eb86b608 100644 --- a/contracts/examples/ping-pong-egld/Cargo.toml +++ b/contracts/examples/ping-pong-egld/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/ping_pong.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/ping-pong-egld/interactor/Cargo.toml b/contracts/examples/ping-pong-egld/interactor/Cargo.toml index cccded99f3..a32852ec30 100644 --- a/contracts/examples/ping-pong-egld/interactor/Cargo.toml +++ b/contracts/examples/ping-pong-egld/interactor/Cargo.toml @@ -22,7 +22,7 @@ tokio = { version = "1.24" } path = ".." [dependencies.multiversx-sc-snippets] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/snippets" [features] diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml index 0f3db68fe0..a5fe359518 100644 --- a/contracts/examples/ping-pong-egld/meta/Cargo.toml +++ b/contracts/examples/ping-pong-egld/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/ping-pong-egld/src/ping_pong_egld_proxy.rs b/contracts/examples/ping-pong-egld/src/ping_pong_egld_proxy.rs new file mode 100644 index 0000000000..ad8944411b --- /dev/null +++ b/contracts/examples/ping-pong-egld/src/ping_pong_egld_proxy.rs @@ -0,0 +1,263 @@ +// Code generated by the multiversx-sc proxy generator. DO NOT EDIT. + +//////////////////////////////////////////////////// +////////////////// AUTO-GENERATED ////////////////// +//////////////////////////////////////////////////// + +#![allow(dead_code)] +#![allow(clippy::all)] + +use multiversx_sc::proxy_imports::*; + +pub struct PingPongProxy; + +impl TxProxyTrait for PingPongProxy +where + Env: TxEnv, + From: TxFrom, + To: TxTo, + Gas: TxGas, +{ + type TxProxyMethods = PingPongProxyMethods; + + fn proxy_methods(self, tx: Tx) -> Self::TxProxyMethods { + PingPongProxyMethods { wrapped_tx: tx } + } +} + +pub struct PingPongProxyMethods +where + Env: TxEnv, + From: TxFrom, + To: TxTo, + Gas: TxGas, +{ + wrapped_tx: Tx, +} + +#[rustfmt::skip] +impl PingPongProxyMethods +where + Env: TxEnv, + Env::Api: VMApi, + From: TxFrom, + Gas: TxGas, +{ + /// Necessary configuration when deploying: + /// `ping_amount` - the exact EGLD amount that needs to be sent when `ping`-ing. + /// `duration_in_seconds` - how much time (in seconds) until contract expires. + /// `opt_activation_timestamp` - optionally specify the contract to only activate at a later date. + /// `max_funds` - optional funding cap, no more funds than this can be added to the contract. + pub fn init< + Arg0: ProxyArg>, + Arg1: ProxyArg, + Arg2: ProxyArg>, + Arg3: ProxyArg>>, + >( + self, + ping_amount: Arg0, + duration_in_seconds: Arg1, + opt_activation_timestamp: Arg2, + max_funds: Arg3, + ) -> TxTypedDeploy { + self.wrapped_tx + .payment(NotPayable) + .raw_deploy() + .argument(&ping_amount) + .argument(&duration_in_seconds) + .argument(&opt_activation_timestamp) + .argument(&max_funds) + .original_result() + } +} + +#[rustfmt::skip] +impl PingPongProxyMethods +where + Env: TxEnv, + Env::Api: VMApi, + From: TxFrom, + To: TxTo, + Gas: TxGas, +{ + pub fn upgrade< + Arg0: ProxyArg>, + Arg1: ProxyArg, + Arg2: ProxyArg>, + Arg3: ProxyArg>>, + >( + self, + ping_amount: Arg0, + duration_in_seconds: Arg1, + opt_activation_timestamp: Arg2, + max_funds: Arg3, + ) -> TxTypedUpgrade { + self.wrapped_tx + .payment(NotPayable) + .raw_upgrade() + .argument(&ping_amount) + .argument(&duration_in_seconds) + .argument(&opt_activation_timestamp) + .argument(&max_funds) + .original_result() + } +} + +#[rustfmt::skip] +impl PingPongProxyMethods +where + Env: TxEnv, + Env::Api: VMApi, + From: TxFrom, + To: TxTo, + Gas: TxGas, +{ + /// User sends some EGLD to be locked in the contract for a period of time. + /// Optional `_data` argument is ignored. + pub fn ping< + Arg0: ProxyArg, + >( + self, + _data: Arg0, + ) -> TxTypedCall { + self.wrapped_tx + .raw_call("ping") + .argument(&_data) + .original_result() + } + + /// User can take back funds from the contract. + /// Can only be called after expiration. + pub fn pong( + self, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("pong") + .original_result() + } + + /// Send back funds to all users who pinged. + /// Returns + /// - `completed` if everything finished + /// - `interrupted` if run out of gas midway. + /// Can only be called after expiration. + pub fn pong_all( + self, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("pongAll") + .original_result() + } + + /// Lists the addresses of all users that have `ping`-ed, + /// in the order they have `ping`-ed + pub fn get_user_addresses( + self, + ) -> TxTypedCall>> { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getUserAddresses") + .original_result() + } + + /// Returns the current contract state as a struct + /// for faster fetching from external parties + pub fn get_contract_state( + self, + ) -> TxTypedCall> { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getContractState") + .original_result() + } + + pub fn ping_amount( + self, + ) -> TxTypedCall> { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getPingAmount") + .original_result() + } + + pub fn deadline( + self, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getDeadline") + .original_result() + } + + /// Block timestamp of the block where the contract got activated. + /// If not specified in the constructor it is the the deploy block timestamp. + pub fn activation_timestamp( + self, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getActivationTimestamp") + .original_result() + } + + /// Optional funding cap. + pub fn max_funds( + self, + ) -> TxTypedCall>> { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getMaxFunds") + .original_result() + } + + /// State of user funds. + /// 0 - user unknown, never `ping`-ed + /// 1 - `ping`-ed + /// 2 - `pong`-ed + pub fn user_status< + Arg0: ProxyArg, + >( + self, + user_id: Arg0, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("getUserStatus") + .argument(&user_id) + .original_result() + } + + /// Part of the `pongAll` status, the last user to be processed. + /// 0 if never called `pongAll` or `pongAll` completed. + pub fn pong_all_last_user( + self, + ) -> TxTypedCall { + self.wrapped_tx + .payment(NotPayable) + .raw_call("pongAllLastUser") + .original_result() + } +} + +#[type_abi] +#[derive(TopEncode, TopDecode, Default)] +pub struct ContractState +where + Api: ManagedTypeApi, +{ + pub ping_amount: BigUint, + pub deadline: u64, + pub activation_timestamp: u64, + pub max_funds: Option>, + pub pong_all_last_user: usize, +} + +#[type_abi] +#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy)] +pub enum UserStatus { + New, + Registered, + Withdrawn, +} diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock index 4d11ed3cde..87f8c64305 100755 --- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock +++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml index 01ae289f9c..da4d153086 100644 --- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml +++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml index 8f6a950560..a445dbe661 100644 --- a/contracts/examples/proxy-pause/Cargo.toml +++ b/contracts/examples/proxy-pause/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/proxy_pause.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies.check-pause] diff --git a/contracts/examples/proxy-pause/meta/Cargo.toml b/contracts/examples/proxy-pause/meta/Cargo.toml index fb92bb22f2..d1ca5c453d 100644 --- a/contracts/examples/proxy-pause/meta/Cargo.toml +++ b/contracts/examples/proxy-pause/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["you"] path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock index e49dfdbfe7..913e64e1c3 100644 --- a/contracts/examples/proxy-pause/wasm/Cargo.lock +++ b/contracts/examples/proxy-pause/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml index 0469f3f6f6..12277c343e 100644 --- a/contracts/examples/proxy-pause/wasm/Cargo.toml +++ b/contracts/examples/proxy-pause/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml index cd592c0bad..7be0419081 100644 --- a/contracts/examples/rewards-distribution/Cargo.toml +++ b/contracts/examples/rewards-distribution/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/rewards_distribution.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml index 80e2d3de6c..75b8114b67 100644 --- a/contracts/examples/rewards-distribution/meta/Cargo.toml +++ b/contracts/examples/rewards-distribution/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["Claudiu-Marcel Bruda "] path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock index 08b3ec4f3f..3ffc415732 100644 --- a/contracts/examples/rewards-distribution/wasm/Cargo.lock +++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,14 +91,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml index f08fe0a193..bc99d4dc07 100644 --- a/contracts/examples/rewards-distribution/wasm/Cargo.toml +++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml index 0318bfc9df..c5706404a7 100644 --- a/contracts/examples/seed-nft-minter/Cargo.toml +++ b/contracts/examples/seed-nft-minter/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/seed_nft_minter.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml index e50502120e..84c6deef53 100644 --- a/contracts/examples/seed-nft-minter/meta/Cargo.toml +++ b/contracts/examples/seed-nft-minter/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["Claudiu-Marcel Bruda "] path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/seed-nft-minter/src/nft_module.rs b/contracts/examples/seed-nft-minter/src/nft_module.rs index a65a4175d7..3580ecedb5 100644 --- a/contracts/examples/seed-nft-minter/src/nft_module.rs +++ b/contracts/examples/seed-nft-minter/src/nft_module.rs @@ -7,7 +7,8 @@ use multiversx_sc_modules::default_issue_callbacks; const NFT_AMOUNT: u32 = 1; const ROYALTIES_MAX: u32 = 10_000; // 100% -#[derive(TypeAbi, TopEncode, TopDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct PriceTag { pub token: EgldOrEsdtTokenIdentifier, pub nonce: u64, diff --git a/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs b/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs index 1a6ac5ffe2..f0cff643c6 100644 --- a/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs +++ b/contracts/examples/seed-nft-minter/src/seed_nft_minter.rs @@ -9,7 +9,8 @@ mod nft_module; use distribution_module::Distribution; use multiversx_sc_modules::default_issue_callbacks; -#[derive(TypeAbi, TopEncode, TopDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct ExampleAttributes { pub creation_timestamp: u64, } diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock index 4fe342a3c1..56ca5ee4e1 100644 --- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock +++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,14 +91,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml index 6f631963f9..14eee61fcf 100644 --- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml +++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml index f79bb50a49..0e073ea762 100644 --- a/contracts/examples/token-release/Cargo.toml +++ b/contracts/examples/token-release/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/token_release.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml index 4fcfdd67df..e0c3b16340 100644 --- a/contracts/examples/token-release/meta/Cargo.toml +++ b/contracts/examples/token-release/meta/Cargo.toml @@ -10,6 +10,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/examples/token-release/src/contract_data.rs b/contracts/examples/token-release/src/contract_data.rs index d224761986..4b65ba599f 100644 --- a/contracts/examples/token-release/src/contract_data.rs +++ b/contracts/examples/token-release/src/contract_data.rs @@ -2,7 +2,8 @@ use multiversx_sc::{api::ManagedTypeApi, types::BigUint}; use multiversx_sc::derive_imports::*; -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, PartialEq, Eq, TypeAbi, Clone)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, PartialEq, Eq, Clone)] pub enum UnlockType { FixedAmount { period_unlock_amount: BigUint, @@ -16,7 +17,8 @@ pub enum UnlockType { }, } -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, TypeAbi, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone)] pub struct Schedule { pub group_total_amount: BigUint, pub unlock_type: UnlockType, diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock index eb49529f88..361fa07bcc 100644 --- a/contracts/examples/token-release/wasm/Cargo.lock +++ b/contracts/examples/token-release/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml index 163d2354ab..6ee52cea91 100644 --- a/contracts/examples/token-release/wasm/Cargo.toml +++ b/contracts/examples/token-release/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml index 6e579e7308..5b2f37a789 100644 --- a/contracts/feature-tests/abi-tester/Cargo.toml +++ b/contracts/feature-tests/abi-tester/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/abi_tester.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/meta-lib" diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json index 1fbc2065fb..588dc0f0cf 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.54.2" + "version": "0.54.4" } }, "docs": [ diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json index 6a687ed0eb..e74204e04e 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.54.2" + "version": "0.54.4" } }, "docs": [ diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml index 1f00e125e8..7f78d21826 100644 --- a/contracts/feature-tests/abi-tester/meta/Cargo.toml +++ b/contracts/feature-tests/abi-tester/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/abi-tester/src/abi_enum.rs b/contracts/feature-tests/abi-tester/src/abi_enum.rs index 3b8db35407..8278907db7 100644 --- a/contracts/feature-tests/abi-tester/src/abi_enum.rs +++ b/contracts/feature-tests/abi-tester/src/abi_enum.rs @@ -2,7 +2,8 @@ use crate::only_nested::*; multiversx_sc::derive_imports!(); /// Its only purpose is to test that the ABI generator works fine. -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub enum AbiEnum { Nothing, Something(i32), @@ -11,7 +12,8 @@ pub enum AbiEnum { } /// An enum with similar explicit discriminants -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub enum ExplicitDiscriminant { Zero, Thirty = 30, @@ -21,7 +23,8 @@ pub enum ExplicitDiscriminant { } /// An enum with different explicit discriminants -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] #[repr(u8)] pub enum ExplicitDiscriminantMixed { Zero, diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs index c13a4a4e2d..69fdfb2319 100644 --- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs +++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs @@ -438,7 +438,7 @@ pub struct OnlyShowsUpAsNested02 { #[rustfmt::skip] #[type_abi] -#[derive(TopEncode, TopDecode)] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub enum AbiEnum { Nothing, Something(i32), @@ -553,7 +553,7 @@ pub struct OnlyShowsUpInEsdtAttr { pub struct OnlyShowsUpAsNested10 {} #[type_abi] -#[derive(TopEncode, TopDecode)] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub enum ExplicitDiscriminant { Zero, Thirty, @@ -564,7 +564,7 @@ pub enum ExplicitDiscriminant { #[rustfmt::skip] #[type_abi] -#[derive(TopEncode, TopDecode)] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub enum ExplicitDiscriminantMixed { Zero, Unit, diff --git a/contracts/feature-tests/abi-tester/src/abi_test_type.rs b/contracts/feature-tests/abi-tester/src/abi_test_type.rs index fe5d3246d1..8a9ae4f8ab 100644 --- a/contracts/feature-tests/abi-tester/src/abi_test_type.rs +++ b/contracts/feature-tests/abi-tester/src/abi_test_type.rs @@ -38,12 +38,14 @@ pub struct AbiManagedVecItem { } #[type_abi] +#[derive(TopEncode, TopDecode)] pub struct OnlyShowsUpInEsdtAttr { #[allow(dead_code)] pub field: OnlyShowsUpAsNested10, } #[type_abi] +#[derive(TopEncode, TopDecode)] pub struct ManagedDecimalWrapper { #[allow(dead_code)] pub field: ManagedDecimal>, diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock index 98bbe9cc7f..60620e3a26 100644 --- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock +++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml index df8cc4501d..2de6e47b0d 100644 --- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml +++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock index 57d1d82a6b..473d0e8533 100755 --- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock +++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml index 7bb5e5f510..e21663fb09 100644 --- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml +++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml index 37ad3e98ba..6c405f160a 100644 --- a/contracts/feature-tests/alloc-features/Cargo.toml +++ b/contracts/feature-tests/alloc-features/Cargo.toml @@ -9,12 +9,12 @@ publish = false path = "src/alloc_features_main.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/alloc-features/meta/Cargo.toml b/contracts/feature-tests/alloc-features/meta/Cargo.toml index be7d766012..4f2c58f333 100644 --- a/contracts/feature-tests/alloc-features/meta/Cargo.toml +++ b/contracts/feature-tests/alloc-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/alloc-features/src/types/large_boxed_byte_array.rs b/contracts/feature-tests/alloc-features/src/types/large_boxed_byte_array.rs index 5eddcbdeb6..c2c105fcc6 100644 --- a/contracts/feature-tests/alloc-features/src/types/large_boxed_byte_array.rs +++ b/contracts/feature-tests/alloc-features/src/types/large_boxed_byte_array.rs @@ -3,5 +3,6 @@ multiversx_sc::derive_imports!(); const ARRAY_SIZE: usize = 512; -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub struct LargeBoxedByteArray(Box<[u8; ARRAY_SIZE]>); diff --git a/contracts/feature-tests/alloc-features/src/types/struct_example_alloc.rs b/contracts/feature-tests/alloc-features/src/types/struct_example_alloc.rs index 3aca49df3b..d450253125 100644 --- a/contracts/feature-tests/alloc-features/src/types/struct_example_alloc.rs +++ b/contracts/feature-tests/alloc-features/src/types/struct_example_alloc.rs @@ -3,7 +3,8 @@ multiversx_sc::derive_imports!(); /// Example serialization for a structure that uses the heap allocator. /// Also checking nested serialization of basic types. -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub struct StructExampleAlloc { pub int: u16, diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock index 93061794d3..b58d4e20ea 100644 --- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock +++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml index 09f5b3c538..cad10e0291 100644 --- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml +++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock index b96b245227..e3949f3013 100644 --- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock +++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml index cfb624964e..4beaa73cc9 100644 --- a/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml +++ b/contracts/feature-tests/alloc-features/wasm-alloc-mem-leaking/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock index be36fcceba..84ad80371b 100644 --- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock +++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml index 83fdc67114..22e9ff3315 100644 --- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml +++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml index 9a04665cb7..16ee4440ff 100644 --- a/contracts/feature-tests/basic-features/Cargo.toml +++ b/contracts/feature-tests/basic-features/Cargo.toml @@ -9,15 +9,15 @@ publish = false path = "src/basic_features_main.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/basic-features/interact/Cargo.toml b/contracts/feature-tests/basic-features/interact/Cargo.toml index 9a1e5ab5e8..95565b5cd4 100644 --- a/contracts/feature-tests/basic-features/interact/Cargo.toml +++ b/contracts/feature-tests/basic-features/interact/Cargo.toml @@ -22,7 +22,7 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/snippets" [features] diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml index 5f4d9eee08..05964c2ba9 100644 --- a/contracts/feature-tests/basic-features/meta/Cargo.toml +++ b/contracts/feature-tests/basic-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs index ca53fd6e08..a17a5b27e2 100644 --- a/contracts/feature-tests/basic-features/src/basic_features_proxy.rs +++ b/contracts/feature-tests/basic-features/src/basic_features_proxy.rs @@ -165,7 +165,7 @@ where } #[type_abi] -#[derive(TopEncode, TopDecode)] +#[derive(Clone, Copy)] pub struct CodecErrorTestType {} #[rustfmt::skip] diff --git a/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs b/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs index 41c1524c41..44db572eca 100644 --- a/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs +++ b/contracts/feature-tests/basic-features/src/types/codec_err_test_type.rs @@ -9,6 +9,7 @@ use multiversx_sc::{ /// Helper type to explore encode/decode errors. #[type_abi] +#[derive(Clone, Copy)] pub struct CodecErrorTestType; impl TopEncode for CodecErrorTestType { diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock index d6309efed3..efbbbac5f9 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml index 6fd1314588..cf06ff2e89 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml +++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock index a8b8313de3..8f7d95fd5d 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml index 3d028393b7..ecfa365ab0 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml +++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock index 8f950ada24..af4fc51c59 100755 --- a/contracts/feature-tests/basic-features/wasm/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,14 +107,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml index 380edcd071..804441622a 100644 --- a/contracts/feature-tests/basic-features/wasm/Cargo.toml +++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs index 0b60403fe0..663d9e234a 100644 --- a/contracts/feature-tests/basic-features/wasm/src/lib.rs +++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs @@ -5,9 +5,9 @@ //////////////////////////////////////////////////// // Init: 1 -// Endpoints: 413 +// Endpoints: 414 // Async Callback: 1 -// Total number of exported functions: 415 +// Total number of exported functions: 416 #![no_std] @@ -419,6 +419,7 @@ multiversx_sc_wasm_adapter::endpoints! { fill_map_mapper => fill_map_mapper fill_unordered_set_mapper => fill_unordered_set_mapper get_value_from_address_with_keys => get_value_from_address_with_keys + address_to_id_mapper_get_id_from_address => address_to_id_mapper_get_id_from_address managed_decimal_addition => managed_decimal_addition managed_decimal_subtraction => managed_decimal_subtraction managed_decimal_eq => managed_decimal_eq diff --git a/contracts/feature-tests/big-float-features/Cargo.toml b/contracts/feature-tests/big-float-features/Cargo.toml index 9b3faac84c..fa77f97d73 100644 --- a/contracts/feature-tests/big-float-features/Cargo.toml +++ b/contracts/feature-tests/big-float-features/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/big_float_main.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/big-float-features/meta/Cargo.toml b/contracts/feature-tests/big-float-features/meta/Cargo.toml index c3201a147d..dad4189d12 100644 --- a/contracts/feature-tests/big-float-features/meta/Cargo.toml +++ b/contracts/feature-tests/big-float-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock index 1b0fb7461d..7e102a89c1 100644 --- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock +++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml index 8de169ee06..c1ef1e5b22 100644 --- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml +++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml index f2e1e0b612..93bd6bd235 100644 --- a/contracts/feature-tests/composability/Cargo.toml +++ b/contracts/feature-tests/composability/Cargo.toml @@ -36,9 +36,9 @@ path = "recursive-caller" path = "vault" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/composability/builtin-func-features/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/Cargo.toml index d612862159..f6c14a3d92 100644 --- a/contracts/feature-tests/composability/builtin-func-features/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/builtin_func_features.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml index 5ae31d6337..523c33d327 100644 --- a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock index d2bb40c85c..907e2f6628 100644 --- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml index bd3447b2ef..72c5fc26ae 100644 --- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml index c074fb4ff3..0bc6984a81 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml @@ -12,9 +12,9 @@ path = "first-contract" path = "second-contract" [dev-dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml index bdb3ed6cea..806dd0af58 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml index 187ca80592..8399148f7b 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock index 92e8546384..64159f1244 100755 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml index e1b5678714..b37c437b9e 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml index 8d9127b00a..4bd87330eb 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml @@ -10,10 +10,10 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml index 58e3b93444..e4a323fed9 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock index 1960b36baa..1c3da01395 100755 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml index 2dfa809f0d..7ffe7f6505 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml index 6f815af6de..97fba7fa30 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml @@ -16,9 +16,9 @@ path = "parent" path = "child" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml index e9fdb6669d..68ba91c9a4 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml @@ -10,9 +10,9 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml index 6b1109cce0..7e15280854 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock index 43e9afd4d3..8f885f3bfa 100755 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml index 9f76bd5968..df7c21abb5 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml index eb46df291e..d5569161f7 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml index 65b9b12a9e..5c540d84c9 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock index 346c1173bb..ea64d4da2d 100755 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml index 726048536c..2ab0896e60 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml index 353d00bae3..cbd83cdcfc 100644 --- a/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-legacy/Cargo.toml @@ -12,10 +12,10 @@ path = "src/forwarder_legacy_main.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml index d6c99905fe..a8dbe274fd 100644 --- a/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-legacy/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_async_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_async_legacy.rs index 8826c2db48..3e199f2ede 100644 --- a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_async_legacy.rs +++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_call_async_legacy.rs @@ -1,7 +1,8 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); -#[derive(TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct CallbackData { callback_name: ManagedBuffer, token_identifier: EgldOrEsdtTokenIdentifier, diff --git a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs index 0cd0b57f4e..8e04da46a1 100644 --- a/contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs +++ b/contracts/feature-tests/composability/forwarder-legacy/src/fwd_nft_legacy.rs @@ -4,14 +4,16 @@ multiversx_sc::derive_imports!(); use super::fwd_storage_legacy; // used as mock attributes for NFTs -#[derive(TopEncode, TopDecode, TypeAbi, Clone, Copy, PartialEq, Debug)] +#[type_abi] +#[derive(TopEncode, TopDecode, Clone, Copy, PartialEq, Debug)] pub struct Color { pub r: u8, pub g: u8, pub b: u8, } -#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone)] pub struct ComplexAttributes { pub biguint: BigUint, pub vec_u8: ManagedBuffer, diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock index 950652888f..6b6dbd9a1a 100644 --- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -107,7 +107,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -177,9 +177,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml index 8684063ac4..055c9b2550 100644 --- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml index 1e4a7fbb09..11d134c43f 100644 --- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/forwarder_queue.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" optional = true [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml index 98693f7118..0c19e1232e 100644 --- a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock index 40fb3acb8e..b3d67b6c5b 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml index ce56e19512..889d3600e5 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock index 7de414dd23..42bbd80b19 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml index ec3b633b1f..9de20eb616 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/Cargo.toml index 81f990c294..975983fb38 100644 --- a/contracts/feature-tests/composability/forwarder-raw/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/forwarder_raw.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml index dcc7d5172b..4cf49659d3 100644 --- a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock index 4053a7f786..91409b87d8 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml index e83074b3c8..3b0c9aae13 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock index 15911afacf..019dcf15d3 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml index b1fd9f99ed..85eac11121 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock index ab3166c5fa..08b90d3c44 100755 --- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml index e574dd546a..f809f6e575 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml index 52f1d20f6b..2876883d22 100644 --- a/contracts/feature-tests/composability/forwarder/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/forwarder_main.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml index f89c6fd801..85bc808a5d 100644 --- a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock index e998595a94..348ba17594 100755 --- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml index dd635a1b16..829bd6b0f6 100644 --- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml index 889ccfb92d..defb4df070 100644 --- a/contracts/feature-tests/composability/interact/Cargo.toml +++ b/contracts/feature-tests/composability/interact/Cargo.toml @@ -16,9 +16,9 @@ tokio = { version = "1.24" } toml = "0.8.6" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dependencies.multiversx-sc-snippets] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/snippets" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml index bf555bd642..52084e312f 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml @@ -10,9 +10,9 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml index 42ddf5c3ab..a87269b648 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs index 0291d36131..e0cf22ab74 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs +++ b/contracts/feature-tests/composability/local-esdt-and-nft/src/lib.rs @@ -4,7 +4,8 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); // used as mock attributes for NFTs -#[derive(TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct Color { r: u8, g: u8, diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock index 9f5e9c1c1b..29c5b9437f 100755 --- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml index ed073646b7..231fb6312e 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/promises-features/Cargo.toml b/contracts/feature-tests/composability/promises-features/Cargo.toml index 6c4094c2fb..c015d6d7d9 100644 --- a/contracts/feature-tests/composability/promises-features/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = "src/promises_main.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml index b9eec88d12..b93ad71975 100644 --- a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/promises-features/src/common.rs b/contracts/feature-tests/composability/promises-features/src/common.rs index 9d0e245fb9..46208c937a 100644 --- a/contracts/feature-tests/composability/promises-features/src/common.rs +++ b/contracts/feature-tests/composability/promises-features/src/common.rs @@ -1,7 +1,8 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); -#[derive(TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct CallbackData { pub callback_name: ManagedBuffer, pub token_identifier: EgldOrEsdtTokenIdentifier, diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock index a34d8dcf99..486da6e16a 100644 --- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml index 985a4c3b83..f570cd1f20 100644 --- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/proxy-test-first/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/Cargo.toml index efe8dd9385..f4d7799c7a 100644 --- a/contracts/feature-tests/composability/proxy-test-first/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/Cargo.toml @@ -12,10 +12,10 @@ path = "src/proxy-test-first.rs" hex-literal = "0.4.1" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml index b8666d5929..de99b45a8f 100644 --- a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock index 540e02fbf9..9bb651d0ab 100755 --- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -177,9 +177,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml index 41457acf72..df8fedd7f9 100644 --- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/proxy-test-second/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/Cargo.toml index 2e2eccade0..5e411467dc 100644 --- a/contracts/feature-tests/composability/proxy-test-second/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/proxy-test-second.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml index 0eb4989a21..a10425f3b9 100644 --- a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock index 6f0d95c7c5..fc530cf355 100755 --- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml index f4b1c1a7bf..8d0c71bc5a 100644 --- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/recursive-caller/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/Cargo.toml index 298eb97d08..0f76523495 100644 --- a/contracts/feature-tests/composability/recursive-caller/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/Cargo.toml @@ -12,9 +12,9 @@ path = "src/recursive_caller.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml index d7e19799af..c7addeb3ed 100644 --- a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock index 5929fc36ff..5c9496c396 100755 --- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -177,9 +177,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml index a59bbd5d01..cfb51ba0dc 100644 --- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/transfer-role-features/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/Cargo.toml index 00708eedd0..48550dc485 100644 --- a/contracts/feature-tests/composability/transfer-role-features/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/Cargo.toml @@ -12,13 +12,13 @@ path = "src/lib.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml index b001b18f9a..fbeeed338d 100644 --- a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock index 3e62b26873..dc31d1fd54 100644 --- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,14 +91,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml index d72ff5252d..48b47eeec9 100644 --- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml index d4158ac6cc..7c68b8243c 100644 --- a/contracts/feature-tests/composability/vault/Cargo.toml +++ b/contracts/feature-tests/composability/vault/Cargo.toml @@ -10,9 +10,9 @@ path = "src/vault.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml index 99581b5656..134d67a840 100644 --- a/contracts/feature-tests/composability/vault/meta/Cargo.toml +++ b/contracts/feature-tests/composability/vault/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock index fa9b07dd1b..89f88b3004 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml index 5faece922c..2596bc0386 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock index c3c2c9c4dd..75b1ca3a9d 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml index 97ded4f2e3..86520e93a1 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock index cbf7079d6f..0fc5720fe6 100755 --- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml index 71ae45e949..3c74499bce 100644 --- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml index e13d916adb..7342a1923d 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml @@ -12,10 +12,10 @@ path = "src/crowdfunding_erc20.rs" path = "../erc20" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml index 520226f715..682d5400e4 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs index 019ec560a5..48cb45e1d9 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/src/crowdfunding_erc20.rs @@ -5,7 +5,8 @@ multiversx_sc::derive_imports!(); pub mod erc20_proxy; -#[derive(TopEncode, TopDecode, PartialEq, Eq, TypeAbi, Clone, Copy)] +#[type_abi] +#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy)] pub enum Status { FundingPeriod, Successful, diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock index c069083d47..7c58ef1219 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml index af640ab2eb..29c8585806 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml index 543811bcb0..f5f31e7a9e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml @@ -13,10 +13,10 @@ path = "src/lib.rs" path = "../erc1155" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml index 8c70f8e71f..bdb2c090b0 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs index 7aa633d71c..01a093c164 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/src/lib.rs @@ -7,7 +7,8 @@ pub mod erc1155_proxy; const PERCENTAGE_TOTAL: u8 = 100; -#[derive(TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct Auction { pub token_identifier: EgldOrEsdtTokenIdentifier, pub min_bid: BigUint, @@ -18,7 +19,8 @@ pub struct Auction { pub current_winner: ManagedAddress, } -#[derive(TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct AuctionArgument { pub token_identifier: EgldOrEsdtTokenIdentifier, pub min_bid: BigUint, diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock index b1199227a5..05384dce67 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml index 13717966b7..32e2106a52 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml index da50794e10..0ea6d7d39e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml index ffeab19f56..31d0671780 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock index 4819ac9ee9..dc68d022bf 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml index 5c4426750b..3a7f4ccedd 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml index 1173be04a4..daeb588bbf 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml @@ -9,12 +9,12 @@ publish = false path = "src/erc1155.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" [dev-dependencies.erc1155-user-mock] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml index 95aa1a81b4..3012f55490 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock index 2ec62294bf..041fc7a114 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml index dfb1ad53a2..a319cef9d6 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml index b80bff895b..aa81d6e499 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/erc20.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml index 4fb2ba9121..ac49df561a 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock index 63efcfac77..2f48e09b7c 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml index 714da7d69c..db7ebb4c03 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml index 46858f6178..a69b735f8a 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml @@ -10,9 +10,9 @@ path = "src/erc721.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml index 1ffd0964c5..2e1ad93348 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock index 5d63fcdeef..9092642df1 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml index eac9229350..c9091ceae1 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml index 21c7981f28..0eb9a6289e 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml @@ -12,10 +12,10 @@ path = "src/lottery.rs" path = "../erc20" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml index 5aaf9c960f..def16e46ad 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery_info.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery_info.rs index 809bfaa662..f89fa26ee8 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery_info.rs +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/lottery_info.rs @@ -4,7 +4,8 @@ use multiversx_sc::{ }; multiversx_sc::derive_imports!(); -#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)] +#[type_abi] +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)] pub struct LotteryInfo { pub ticket_price: BigUint, pub tickets_left: u32, diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/status.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/status.rs index 3cd6d6cfa9..a0d2617b5b 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/status.rs +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/src/status.rs @@ -1,6 +1,7 @@ multiversx_sc::derive_imports!(); -#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy)] +#[type_abi] +#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy)] pub enum Status { Inactive, Running, diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock index 345747e9da..9de7b0ebce 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock @@ -71,7 +71,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml index cdbcba113e..ec1ffede12 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml index 9f4a827aa4..8db7cfda4d 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/esdt_system_sc_mock.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml index 6821ab2aef..b5279e7d4d 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock index aab3ff0e73..1cccb1c905 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock +++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml index 4c554c55fc..d959fd4ef8 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/exchange-features/Cargo.toml b/contracts/feature-tests/exchange-features/Cargo.toml index 0e7e32cb6c..2518fb827f 100644 --- a/contracts/feature-tests/exchange-features/Cargo.toml +++ b/contracts/feature-tests/exchange-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/exchange_features.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/exchange-features/meta/Cargo.toml b/contracts/feature-tests/exchange-features/meta/Cargo.toml index 765c10a556..22e2713d4a 100644 --- a/contracts/feature-tests/exchange-features/meta/Cargo.toml +++ b/contracts/feature-tests/exchange-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/exchange-features/src/exchange_features.rs b/contracts/feature-tests/exchange-features/src/exchange_features.rs index fd048e72c8..65d5f8974e 100644 --- a/contracts/feature-tests/exchange-features/src/exchange_features.rs +++ b/contracts/feature-tests/exchange-features/src/exchange_features.rs @@ -3,16 +3,9 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); +#[type_abi] #[derive( - ManagedVecItem, - TopEncode, - TopDecode, - NestedEncode, - NestedDecode, - TypeAbi, - Clone, - PartialEq, - Debug, + ManagedVecItem, TopEncode, TopDecode, NestedEncode, NestedDecode, Clone, PartialEq, Debug, )] pub struct TokenAttributes { pub amount: BigUint, diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock index d558da203e..b003ee759e 100644 --- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock +++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml index 031b294a16..b9a75f0805 100644 --- a/contracts/feature-tests/exchange-features/wasm/Cargo.toml +++ b/contracts/feature-tests/exchange-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/formatted-message-features/Cargo.toml b/contracts/feature-tests/formatted-message-features/Cargo.toml index e1f96f973c..70d23ef225 100644 --- a/contracts/feature-tests/formatted-message-features/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/formatted_message_features.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml index b263c311c3..971016137b 100644 --- a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["you"] path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock index 02dc8c9f5b..b9ac913714 100644 --- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock +++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml index e47eccbe46..f9ea9cb0b3 100644 --- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/managed-map-features/Cargo.toml b/contracts/feature-tests/managed-map-features/Cargo.toml index 35646fe266..59d8121cba 100644 --- a/contracts/feature-tests/managed-map-features/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/mmap_features.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/managed-map-features/meta/Cargo.toml b/contracts/feature-tests/managed-map-features/meta/Cargo.toml index 0fe80a7620..2e2fc69202 100644 --- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock index 956932aa13..6ffa99e7a8 100644 --- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock +++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml index d5ed8a5126..4c75303e0d 100644 --- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/Cargo.toml b/contracts/feature-tests/multi-contract-features/Cargo.toml index 234fde2cee..cc7ed8b468 100644 --- a/contracts/feature-tests/multi-contract-features/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/Cargo.toml @@ -12,9 +12,9 @@ path = "src/multi_contract_features.rs" example_feature = [] [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml index da359bffd6..9952bbc043 100644 --- a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock index 1b6a89fa67..dbc6f8cfe6 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml index db57d2738f..c29088bf9e 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock index 695f614e28..1e29209f8d 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml index 79383d20a0..4cab4835ff 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml @@ -30,7 +30,7 @@ features = ["example_feature"] default-features = false [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock index fca7b0cbc2..26695e70cf 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml index 616bc62af9..837426b209 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock index 65d49fd3ae..9899f2acfb 100755 --- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -106,7 +106,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml index b6e6c454c3..98f38babe6 100644 --- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/panic-message-features/Cargo.toml b/contracts/feature-tests/panic-message-features/Cargo.toml index 7fe7f41f3a..ca0767f11b 100644 --- a/contracts/feature-tests/panic-message-features/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/panic_features.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/panic-message-features/meta/Cargo.toml b/contracts/feature-tests/panic-message-features/meta/Cargo.toml index 103622eb94..926d0e5ad3 100644 --- a/contracts/feature-tests/panic-message-features/meta/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock index f4b1586e92..da578e8071 100755 --- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock +++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml index 918a21a6f0..b937116720 100644 --- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml index be1ab83ef3..6954e7ea5a 100644 --- a/contracts/feature-tests/payable-features/Cargo.toml +++ b/contracts/feature-tests/payable-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/payable_features.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml index 1e15468ae2..4f54728336 100644 --- a/contracts/feature-tests/payable-features/meta/Cargo.toml +++ b/contracts/feature-tests/payable-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock index bb450a60c1..e654493e67 100755 --- a/contracts/feature-tests/payable-features/wasm/Cargo.lock +++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml index 8f0c22f8cc..ee0c09c5bb 100644 --- a/contracts/feature-tests/payable-features/wasm/Cargo.toml +++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml index 7bf2c9c6f2..964e1cdd30 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml index cbd23c5bdd..b3d8247fbb 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml @@ -13,7 +13,7 @@ path = "src/interactor_main.rs" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/snippets" # [workspace] diff --git a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml index 114dfeac93..11cf2ffc0d 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs b/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs index e3ae6e8738..4f61ec728b 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs +++ b/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs @@ -13,12 +13,11 @@ multiversx_sc::derive_imports!(); // Additionally, we also have to update the interactor snippets manually to add relative paths: // [dependencies.multiversx-sc-snippets] -// version = "0.54.2" +// version = "0.54.4" // path = "../../../../framework/snippets" -#[derive( - TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, Debug, Clone, -)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, Debug, Clone)] pub struct MyCoolStruct { pub awesome: BigUint, } diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock index 261f62319f..61a495881c 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock +++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml index 0748e7f90d..8815261a87 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml index 704385bed2..103114a47b 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" publish = false [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" features = [ "alloc" ] @@ -17,7 +17,7 @@ path = "../../examples/adder" path = "../../feature-tests/basic-features" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml index 6865a5eb48..6fdba5454e 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock index a82e5ee621..1ec7dce57c 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock +++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml index 74171812f5..174fce037b 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/scenario-tester/Cargo.toml b/contracts/feature-tests/scenario-tester/Cargo.toml index e8b407f2df..e9b7636e75 100644 --- a/contracts/feature-tests/scenario-tester/Cargo.toml +++ b/contracts/feature-tests/scenario-tester/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/scenario-tester/meta/Cargo.toml b/contracts/feature-tests/scenario-tester/meta/Cargo.toml index 7a2fc5cd07..639db3a0af 100644 --- a/contracts/feature-tests/scenario-tester/meta/Cargo.toml +++ b/contracts/feature-tests/scenario-tester/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock index b6e6a0700d..c1057083d1 100755 --- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock +++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml index cad6b76129..e66aefa221 100644 --- a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml +++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml index f57dab3308..d0a7053b25 100644 --- a/contracts/feature-tests/use-module/Cargo.toml +++ b/contracts/feature-tests/use-module/Cargo.toml @@ -9,17 +9,17 @@ publish = false path = "src/use_module.rs" [dependencies.multiversx-sc-modules] -version = "0.54.2" +version = "0.54.4" path = "../../../contracts/modules" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/scenario" [dev-dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../framework/meta-lib" diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml index c8e85f8e3c..ffb7dc72cb 100644 --- a/contracts/feature-tests/use-module/meta/Cargo.toml +++ b/contracts/feature-tests/use-module/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta-lib] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/meta-lib" default-features = false diff --git a/contracts/feature-tests/use-module/src/token_merge_mod_impl.rs b/contracts/feature-tests/use-module/src/token_merge_mod_impl.rs index 617cce5ad6..b5d7711481 100644 --- a/contracts/feature-tests/use-module/src/token_merge_mod_impl.rs +++ b/contracts/feature-tests/use-module/src/token_merge_mod_impl.rs @@ -10,7 +10,8 @@ use multiversx_sc_modules::token_merge::{ merged_token_instances::MergedTokenInstances, }; -#[derive(TypeAbi, TopEncode, TopDecode, PartialEq, Debug)] +#[type_abi] +#[derive(TopEncode, TopDecode, PartialEq, Debug)] pub struct CustomAttributes { pub first: u32, pub second: u64, diff --git a/contracts/feature-tests/use-module/use_module_expected_main.abi.json b/contracts/feature-tests/use-module/use_module_expected_main.abi.json index 37e1e83751..090b314169 100644 --- a/contracts/feature-tests/use-module/use_module_expected_main.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_main.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.54.2" + "version": "0.54.4" } }, "docs": [ diff --git a/contracts/feature-tests/use-module/use_module_expected_view.abi.json b/contracts/feature-tests/use-module/use_module_expected_view.abi.json index 2a78c62050..11edf02c6a 100644 --- a/contracts/feature-tests/use-module/use_module_expected_view.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_view.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.54.2" + "version": "0.54.4" } }, "docs": [ diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock index a0d894bd72..86e96dc702 100644 --- a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock +++ b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,14 +91,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml index 492b808880..dc34d7b5df 100644 --- a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml +++ b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock index 2053adc07f..ab03f93446 100644 --- a/contracts/feature-tests/use-module/wasm/Cargo.lock +++ b/contracts/feature-tests/use-module/wasm/Cargo.lock @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" dependencies = [ "bitflags", "hex-literal", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" dependencies = [ "hex", "proc-macro2", @@ -91,14 +91,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" dependencies = [ "multiversx-sc", ] @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unwrap-infallible" diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml index c10ea90d32..4eaee51384 100644 --- a/contracts/feature-tests/use-module/wasm/Cargo.toml +++ b/contracts/feature-tests/use-module/wasm/Cargo.toml @@ -28,7 +28,7 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.54.2" +version = "0.54.4" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml index b07e11a622..b85f7f7313 100644 --- a/contracts/modules/Cargo.toml +++ b/contracts/modules/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-modules" -version = "0.54.2" +version = "0.54.4" edition = "2021" authors = ["MultiversX "] @@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"] alloc = ["multiversx-sc/alloc"] [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../framework/base" diff --git a/contracts/modules/src/bonding_curve/curves/linear_function.rs b/contracts/modules/src/bonding_curve/curves/linear_function.rs index 698d1757fd..fe2105310c 100644 --- a/contracts/modules/src/bonding_curve/curves/linear_function.rs +++ b/contracts/modules/src/bonding_curve/curves/linear_function.rs @@ -3,7 +3,8 @@ multiversx_sc::derive_imports!(); use crate::bonding_curve::{curves::curve_function::CurveFunction, utils::structs::CurveArguments}; -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, PartialEq, Eq, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone)] pub struct LinearFunction { pub initial_price: BigUint, pub linear_coefficient: BigUint, diff --git a/contracts/modules/src/bonding_curve/utils/structs.rs b/contracts/modules/src/bonding_curve/utils/structs.rs index 59836befc1..9d020c48c6 100644 --- a/contracts/modules/src/bonding_curve/utils/structs.rs +++ b/contracts/modules/src/bonding_curve/utils/structs.rs @@ -3,7 +3,8 @@ use crate::bonding_curve::curves::curve_function::CurveFunction; multiversx_sc::imports!(); multiversx_sc::derive_imports!(); -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, PartialEq, Eq, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone)] pub struct CurveArguments { pub available_supply: BigUint, pub balance: BigUint, @@ -15,7 +16,8 @@ impl CurveArguments { } } -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, PartialEq, Eq, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone)] pub struct BondingCurve< M: ManagedTypeApi, T: CurveFunction + TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi, @@ -39,7 +41,8 @@ impl< } } -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi, PartialEq, Eq, Clone)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Eq, Clone)] pub struct TokenOwnershipData { pub token_nonces: ManagedVec, pub owner: ManagedAddress, diff --git a/contracts/modules/src/governance/governance_proposal.rs b/contracts/modules/src/governance/governance_proposal.rs index e251a43830..60d0fa27f0 100644 --- a/contracts/modules/src/governance/governance_proposal.rs +++ b/contracts/modules/src/governance/governance_proposal.rs @@ -7,7 +7,8 @@ pub type ProposalId = usize; pub type GovernanceActionAsMultiArg = MultiValue4, ManagedBuffer, ManagedVec>>; -#[derive(TypeAbi, TopEncode, TopDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub enum VoteType { UpVote, DownVote, @@ -15,7 +16,8 @@ pub enum VoteType { AbstainVote, } -#[derive(TypeAbi, TopEncode, TopDecode, PartialEq, Eq)] +#[type_abi] +#[derive(TopEncode, TopDecode, PartialEq, Eq)] pub enum GovernanceProposalStatus { None, Pending, @@ -26,19 +28,22 @@ pub enum GovernanceProposalStatus { WaitingForFees, } -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem)] pub struct ProposalFees { pub total_amount: BigUint, pub entries: ManagedVec>, } -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, ManagedVecItem)] pub struct FeeEntry { pub depositor_addr: ManagedAddress, pub tokens: EsdtTokenPayment, } -#[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)] pub struct GovernanceAction { pub gas_limit: u64, pub dest_address: ManagedAddress, @@ -58,7 +63,8 @@ impl GovernanceAction { } } -#[derive(TypeAbi, TopEncode, TopDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct GovernanceProposal { pub proposer: ManagedAddress, pub actions: ArrayVec, MAX_GOVERNANCE_PROPOSAL_ACTIONS>, @@ -66,7 +72,8 @@ pub struct GovernanceProposal { pub fees: ProposalFees, } -#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, TypeAbi)] +#[type_abi] +#[derive(TopEncode, TopDecode, NestedEncode, NestedDecode)] pub struct ProposalVotes { pub up_votes: BigUint, pub down_votes: BigUint, diff --git a/contracts/modules/src/subscription.rs b/contracts/modules/src/subscription.rs index 3f142abbe4..536956b90d 100644 --- a/contracts/modules/src/subscription.rs +++ b/contracts/modules/src/subscription.rs @@ -24,7 +24,8 @@ multiversx_sc::derive_imports!(); /// * cancelling a subscription /// * getting the expiration /// -#[derive(TypeAbi, TopEncode, TopDecode)] +#[type_abi] +#[derive(TopEncode, TopDecode)] pub struct SubscriptionAttributes { pub expiration: u64, pub attributes: T, diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml index 67c72a6f41..6c090af8a8 100644 --- a/framework/base/Cargo.toml +++ b/framework/base/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc" -version = "0.54.2" +version = "0.54.4" edition = "2021" rust-version = "1.78" @@ -30,7 +30,7 @@ num-traits = { version = "=0.2.19", default-features = false } unwrap-infallible = "0.1.5" [dependencies.multiversx-sc-derive] -version = "=0.54.2" +version = "=0.54.4" path = "../derive" [dependencies.multiversx-sc-codec] diff --git a/framework/base/src/storage/mappers/token.rs b/framework/base/src/storage/mappers/token.rs index 3fa7032349..7ccaffa767 100644 --- a/framework/base/src/storage/mappers/token.rs +++ b/framework/base/src/storage/mappers/token.rs @@ -1,11 +1,12 @@ +#![allow(unused)] + +mod error; mod fungible_token_mapper; mod non_fungible_token_mapper; mod token_attributes_mapper; -mod token_mapper; mod token_mapper_state; pub use fungible_token_mapper::FungibleTokenMapper; pub use non_fungible_token_mapper::NonFungibleTokenMapper; pub use token_attributes_mapper::TokenAttributesMapper; -pub use token_mapper::StorageTokenWrapper; pub use token_mapper_state::TokenMapperState; diff --git a/framework/base/src/storage/mappers/token/error.rs b/framework/base/src/storage/mappers/token/error.rs new file mode 100644 index 0000000000..45953bd4a3 --- /dev/null +++ b/framework/base/src/storage/mappers/token/error.rs @@ -0,0 +1,5 @@ +pub(crate) const TOKEN_ID_ALREADY_SET_ERR_MSG: &[u8] = b"Token ID already set"; +pub(crate) const PENDING_ERR_MSG: &[u8] = b"Issue was already called"; +pub(crate) const MUST_SET_TOKEN_ID_ERR_MSG: &[u8] = b"Must issue or set token ID first"; +pub(crate) const INVALID_TOKEN_ID_ERR_MSG: &[u8] = b"Invalid token ID"; +pub(crate) const INVALID_PAYMENT_TOKEN_ERR_MSG: &[u8] = b"Invalid payment token"; diff --git a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs index 384e0d6096..e3cd41702e 100644 --- a/framework/base/src/storage/mappers/token/fungible_token_mapper.rs +++ b/framework/base/src/storage/mappers/token/fungible_token_mapper.rs @@ -1,17 +1,26 @@ +use multiversx_chain_core::types::EsdtLocalRole; + use crate::{ abi::{TypeAbi, TypeAbiFrom}, api::ErrorApiImpl, codec::{EncodeErrorHandler, TopEncodeMulti, TopEncodeMultiOutput}, - storage_clear, storage_get, storage_set, + storage::mappers::{ + set_mapper::{CurrentStorage, StorageAddress}, + StorageMapperFromAddress, + }, + storage_clear, storage_get, storage_get_len, storage_set, types::{ system_proxy::{ESDTSystemSCProxy, FungibleTokenProperties}, - ESDTSystemSCAddress, Tx, + ESDTSystemSCAddress, ManagedRef, Tx, }, }; use super::{ super::StorageMapper, - token_mapper::{check_not_set, store_token_id, StorageTokenWrapper, INVALID_TOKEN_ID_ERR_MSG}, + error::{ + INVALID_PAYMENT_TOKEN_ERR_MSG, INVALID_TOKEN_ID_ERR_MSG, MUST_SET_TOKEN_ID_ERR_MSG, + PENDING_ERR_MSG, TOKEN_ID_ALREADY_SET_ERR_MSG, + }, TokenMapperState, }; use crate::{ @@ -21,7 +30,7 @@ use crate::{ storage::StorageKey, types::{ BigUint, CallbackClosure, EsdtTokenPayment, EsdtTokenType, ManagedAddress, ManagedBuffer, - ManagedType, TokenIdentifier, + ManagedType, ManagedVec, TokenIdentifier, }, }; @@ -29,15 +38,17 @@ pub(crate) const DEFAULT_ISSUE_CALLBACK_NAME: &str = "default_issue_cb"; pub(crate) const DEFAULT_ISSUE_WITH_INIT_SUPPLY_CALLBACK_NAME: &str = "default_issue_init_supply_cb"; -pub struct FungibleTokenMapper +pub struct FungibleTokenMapper where SA: StorageMapperApi + CallTypeApi, + A: StorageAddress, { key: StorageKey, token_state: TokenMapperState, + address: A, } -impl StorageMapper for FungibleTokenMapper +impl StorageMapper for FungibleTokenMapper where SA: StorageMapperApi + CallTypeApi, { @@ -45,45 +56,25 @@ where Self { token_state: storage_get(base_key.as_ref()), key: base_key, + address: CurrentStorage, } } } -impl StorageTokenWrapper for FungibleTokenMapper +impl StorageMapperFromAddress for FungibleTokenMapper> where SA: StorageMapperApi + CallTypeApi, { - fn get_storage_key(&self) -> crate::types::ManagedRef> { - self.key.as_ref() - } - - fn get_token_state(&self) -> TokenMapperState { - self.token_state.clone() - } - - fn get_token_id(&self) -> TokenIdentifier { - if let TokenMapperState::Token(token) = &self.token_state { - token.clone() - } else { - SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG) - } - } - - fn get_token_id_ref(&self) -> &TokenIdentifier { - if let TokenMapperState::Token(token) = &self.token_state { - token - } else { - SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); + fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { + Self { + token_state: storage_get(base_key.as_ref()), + key: base_key, + address, } } - - fn set_token_id(&mut self, token_id: TokenIdentifier) { - store_token_id(self, &token_id); - self.token_state = TokenMapperState::Token(token_id); - } } -impl FungibleTokenMapper +impl FungibleTokenMapper where SA: StorageMapperApi + CallTypeApi, { @@ -114,7 +105,7 @@ where num_decimals: usize, opt_callback: Option>, ) -> ! { - check_not_set(self); + self.check_not_set(); let callback = match opt_callback { Some(cb) => cb, @@ -166,7 +157,7 @@ where num_decimals: usize, opt_callback: Option>, ) -> ! { - check_not_set(self); + self.check_not_set(); let callback = match opt_callback { Some(cb) => cb, @@ -195,21 +186,6 @@ where } } - fn default_callback_closure_obj(&self, initial_supply: &BigUint) -> CallbackClosure { - let initial_caller = BlockchainWrapper::::new().get_caller(); - let cb_name = if initial_supply > &0 { - DEFAULT_ISSUE_WITH_INIT_SUPPLY_CALLBACK_NAME - } else { - DEFAULT_ISSUE_CALLBACK_NAME - }; - - let mut cb_closure = CallbackClosure::new(cb_name); - cb_closure.push_endpoint_arg(&initial_caller); - cb_closure.push_endpoint_arg(&self.key.buffer); - - cb_closure - } - pub fn mint(&self, amount: BigUint) -> EsdtTokenPayment { let send_wrapper = SendWrapper::::new(); let token_id = self.get_token_id(); @@ -237,6 +213,63 @@ where send_wrapper.esdt_local_burn(token_id, 0, amount); } + pub fn send_payment(&self, to: &ManagedAddress, payment: &EsdtTokenPayment) { + Tx::new_tx_from_sc() + .to(to) + .single_esdt(&payment.token_identifier, 0, &payment.amount) + .transfer(); + } + + pub fn set_if_empty(&mut self, token_id: TokenIdentifier) { + if self.is_empty() { + self.set_token_id(token_id); + } + } + + pub fn set_local_roles( + &self, + roles: &[EsdtLocalRole], + opt_callback: Option>, + ) -> ! { + let own_sc_address = Self::get_sc_address(); + self.set_local_roles_for_address(&own_sc_address, roles, opt_callback); + } + + pub fn set_local_roles_for_address( + &self, + address: &ManagedAddress, + roles: &[EsdtLocalRole], + opt_callback: Option>, + ) -> ! { + self.require_issued_or_set(); + + let token_id = self.get_token_id_ref(); + Tx::new_tx_from_sc() + .to(ESDTSystemSCAddress) + .typed(ESDTSystemSCProxy) + .set_special_roles(address, token_id, roles[..].iter().cloned()) + .callback(opt_callback) + .async_call_and_exit() + } + + pub fn set_token_id(&mut self, token_id: TokenIdentifier) { + self.store_token_id(&token_id); + self.token_state = TokenMapperState::Token(token_id); + } + + pub(crate) fn store_token_id(&self, token_id: &TokenIdentifier) { + if self.get_token_state().is_set() { + SA::error_api_impl().signal_error(TOKEN_ID_ALREADY_SET_ERR_MSG); + } + if !token_id.is_valid_esdt_identifier() { + SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); + } + storage_set( + self.get_storage_key(), + &TokenMapperState::Token(token_id.clone()), + ); + } + pub fn get_balance(&self) -> BigUint { let b_wrapper = BlockchainWrapper::new(); let own_sc_address = Self::get_sc_address(); @@ -245,11 +278,96 @@ where b_wrapper.get_esdt_balance(&own_sc_address, token_id, 0) } - fn send_payment(&self, to: &ManagedAddress, payment: &EsdtTokenPayment) { - Tx::new_tx_from_sc() - .to(to) - .single_esdt(&payment.token_identifier, 0, &payment.amount) - .transfer(); + pub fn get_sc_address() -> ManagedAddress { + let b_wrapper = BlockchainWrapper::new(); + b_wrapper.get_sc_address() + } +} + +impl FungibleTokenMapper +where + SA: StorageMapperApi + CallTypeApi, + A: StorageAddress, +{ + pub fn get_storage_key(&self) -> ManagedRef> { + self.key.as_ref() + } + + pub fn get_token_state(&self) -> TokenMapperState { + self.token_state.clone() + } + + pub fn get_token_id(&self) -> TokenIdentifier { + if let TokenMapperState::Token(token) = &self.token_state { + token.clone() + } else { + SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG) + } + } + + pub fn get_token_id_ref(&self) -> &TokenIdentifier { + if let TokenMapperState::Token(token) = &self.token_state { + token + } else { + SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); + } + } + + pub fn is_empty(&self) -> bool { + storage_get_len(self.get_storage_key()) == 0 + } + + pub fn require_issued_or_set(&self) { + if self.is_empty() { + SA::error_api_impl().signal_error(MUST_SET_TOKEN_ID_ERR_MSG); + } + } + + pub fn require_same_token(&self, expected_token_id: &TokenIdentifier) { + let actual_token_id = self.get_token_id_ref(); + if actual_token_id != expected_token_id { + SA::error_api_impl().signal_error(INVALID_PAYMENT_TOKEN_ERR_MSG); + } + } + + pub fn require_all_same_token(&self, payments: &ManagedVec>) { + let actual_token_id = self.get_token_id_ref(); + for p in payments { + if actual_token_id != &p.token_identifier { + SA::error_api_impl().signal_error(INVALID_PAYMENT_TOKEN_ERR_MSG); + } + } + } + + pub fn default_callback_closure_obj( + &self, + initial_supply: &BigUint, + ) -> CallbackClosure { + let initial_caller = BlockchainWrapper::::new().get_caller(); + let cb_name = if initial_supply > &0 { + DEFAULT_ISSUE_WITH_INIT_SUPPLY_CALLBACK_NAME + } else { + DEFAULT_ISSUE_CALLBACK_NAME + }; + + let mut cb_closure = CallbackClosure::new(cb_name); + cb_closure.push_endpoint_arg(&initial_caller); + cb_closure.push_endpoint_arg(&self.key.buffer); + + cb_closure + } + + pub(crate) fn check_not_set(&self) { + let storage_value: TokenMapperState = storage_get(self.get_storage_key()); + match storage_value { + TokenMapperState::NotSet => {}, + TokenMapperState::Pending => { + SA::error_api_impl().signal_error(PENDING_ERR_MSG); + }, + TokenMapperState::Token(_) => { + SA::error_api_impl().signal_error(TOKEN_ID_ALREADY_SET_ERR_MSG); + }, + } } } diff --git a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs index 70fc3be81f..3a4d63ab97 100644 --- a/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs +++ b/framework/base/src/storage/mappers/token/non_fungible_token_mapper.rs @@ -1,17 +1,26 @@ +use multiversx_chain_core::types::EsdtLocalRole; + use crate::{ abi::TypeAbiFrom, codec::{EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput}, - storage_clear, storage_get, storage_set, + storage::mappers::{ + set_mapper::{CurrentStorage, StorageAddress}, + StorageMapperFromAddress, + }, + storage_clear, storage_get, storage_get_len, storage_set, types::{ system_proxy::ESDTSystemSCProxy, ESDTSystemSCAddress, EgldPayment, FunctionCall, - OriginalResultMarker, Tx, TxScEnv, + ManagedVec, OriginalResultMarker, Tx, TxScEnv, }, }; use super::{ super::StorageMapper, + error::{ + INVALID_PAYMENT_TOKEN_ERR_MSG, INVALID_TOKEN_ID_ERR_MSG, MUST_SET_TOKEN_ID_ERR_MSG, + PENDING_ERR_MSG, TOKEN_ID_ALREADY_SET_ERR_MSG, + }, fungible_token_mapper::DEFAULT_ISSUE_CALLBACK_NAME, - token_mapper::{check_not_set, store_token_id, StorageTokenWrapper, INVALID_TOKEN_ID_ERR_MSG}, TokenMapperState, }; use crate::{ @@ -40,15 +49,17 @@ pub type IssueCallTo = Tx< OriginalResultMarker>, >; -pub struct NonFungibleTokenMapper +pub struct NonFungibleTokenMapper where SA: StorageMapperApi + CallTypeApi, + A: StorageAddress, { key: StorageKey, token_state: TokenMapperState, + address: A, } -impl StorageMapper for NonFungibleTokenMapper +impl StorageMapper for NonFungibleTokenMapper where SA: StorageMapperApi + CallTypeApi, { @@ -56,45 +67,25 @@ where Self { token_state: storage_get(base_key.as_ref()), key: base_key, + address: CurrentStorage, } } } -impl StorageTokenWrapper for NonFungibleTokenMapper +impl StorageMapperFromAddress for NonFungibleTokenMapper> where SA: StorageMapperApi + CallTypeApi, { - fn get_storage_key(&self) -> crate::types::ManagedRef> { - self.key.as_ref() - } - - fn get_token_state(&self) -> TokenMapperState { - self.token_state.clone() - } - - fn get_token_id(&self) -> TokenIdentifier { - if let TokenMapperState::Token(token) = &self.token_state { - token.clone() - } else { - SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); - } - } - - fn get_token_id_ref(&self) -> &TokenIdentifier { - if let TokenMapperState::Token(token) = &self.token_state { - token - } else { - SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); + fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { + Self { + token_state: storage_get(base_key.as_ref()), + key: base_key, + address, } } - - fn set_token_id(&mut self, token_id: TokenIdentifier) { - store_token_id(self, &token_id); - self.token_state = TokenMapperState::Token(token_id); - } } -impl NonFungibleTokenMapper +impl NonFungibleTokenMapper where SA: StorageMapperApi + CallTypeApi, { @@ -125,7 +116,7 @@ where num_decimals: usize, opt_callback: Option>, ) -> ! { - check_not_set(self); + self.check_not_set(); let callback = match opt_callback { Some(cb) => cb, @@ -175,7 +166,7 @@ where num_decimals: usize, opt_callback: Option>, ) -> ! { - check_not_set(self); + self.check_not_set(); if token_type == EsdtTokenType::Fungible || token_type == EsdtTokenType::Invalid { SA::error_api_impl().signal_error(INVALID_TOKEN_TYPE_ERR_MSG); @@ -208,18 +199,7 @@ where } } - fn default_callback_closure_obj(&self) -> CallbackClosure { - let initial_caller = BlockchainWrapper::::new().get_caller(); - let cb_name = DEFAULT_ISSUE_CALLBACK_NAME; - - let mut cb_closure = CallbackClosure::new(cb_name); - cb_closure.push_endpoint_arg(&initial_caller); - cb_closure.push_endpoint_arg(&self.key.buffer); - - cb_closure - } - - fn nft_issue( + pub fn nft_issue( issue_cost: BigUint, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer, @@ -235,7 +215,7 @@ where ) } - fn sft_issue( + pub fn sft_issue( issue_cost: BigUint, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer, @@ -251,7 +231,7 @@ where ) } - fn meta_issue( + pub fn meta_issue( issue_cost: BigUint, token_display_name: ManagedBuffer, token_ticker: ManagedBuffer, @@ -355,12 +335,65 @@ where send_wrapper.esdt_local_burn(token_id, token_nonce, amount); } - pub fn get_all_token_data(&self, token_nonce: u64) -> EsdtTokenData { - let b_wrapper = BlockchainWrapper::new(); + pub fn send_payment(&self, to: &ManagedAddress, payment: &EsdtTokenPayment) { + Tx::new_tx_from_sc() + .to(to) + .single_esdt( + &payment.token_identifier, + payment.token_nonce, + &payment.amount, + ) + .transfer(); + } + + pub fn set_token_id(&mut self, token_id: TokenIdentifier) { + self.store_token_id(&token_id); + self.token_state = TokenMapperState::Token(token_id); + } + + pub fn set_if_empty(&mut self, token_id: TokenIdentifier) { + if self.is_empty() { + self.set_token_id(token_id); + } + } + + pub fn set_local_roles( + &self, + roles: &[EsdtLocalRole], + opt_callback: Option>, + ) -> ! { let own_sc_address = Self::get_sc_address(); + self.set_local_roles_for_address(&own_sc_address, roles, opt_callback); + } + + pub fn set_local_roles_for_address( + &self, + address: &ManagedAddress, + roles: &[EsdtLocalRole], + opt_callback: Option>, + ) -> ! { + self.require_issued_or_set(); + let token_id = self.get_token_id_ref(); + Tx::new_tx_from_sc() + .to(ESDTSystemSCAddress) + .typed(ESDTSystemSCProxy) + .set_special_roles(address, token_id, roles[..].iter().cloned()) + .callback(opt_callback) + .async_call_and_exit() + } - b_wrapper.get_esdt_token_data(&own_sc_address, token_id, token_nonce) + pub(crate) fn store_token_id(&self, token_id: &TokenIdentifier) { + if self.get_token_state().is_set() { + SA::error_api_impl().signal_error(TOKEN_ID_ALREADY_SET_ERR_MSG); + } + if !token_id.is_valid_esdt_identifier() { + SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); + } + storage_set( + self.get_storage_key(), + &TokenMapperState::Token(token_id.clone()), + ); } pub fn get_balance(&self, token_nonce: u64) -> BigUint { @@ -371,20 +404,102 @@ where b_wrapper.get_esdt_balance(&own_sc_address, token_id, token_nonce) } + pub fn get_sc_address() -> ManagedAddress { + let b_wrapper = BlockchainWrapper::new(); + b_wrapper.get_sc_address() + } + + pub fn get_all_token_data(&self, token_nonce: u64) -> EsdtTokenData { + let b_wrapper = BlockchainWrapper::new(); + let own_sc_address = Self::get_sc_address(); + let token_id = self.get_token_id_ref(); + + b_wrapper.get_esdt_token_data(&own_sc_address, token_id, token_nonce) + } + pub fn get_token_attributes(&self, token_nonce: u64) -> T { let token_data = self.get_all_token_data(token_nonce); token_data.decode_attributes() } +} - fn send_payment(&self, to: &ManagedAddress, payment: &EsdtTokenPayment) { - Tx::new_tx_from_sc() - .to(to) - .single_esdt( - &payment.token_identifier, - payment.token_nonce, - &payment.amount, - ) - .transfer(); +impl NonFungibleTokenMapper +where + SA: StorageMapperApi + CallTypeApi, + A: StorageAddress, +{ + pub(crate) fn check_not_set(&self) { + let storage_value: TokenMapperState = storage_get(self.get_storage_key()); + match storage_value { + TokenMapperState::NotSet => {}, + TokenMapperState::Pending => { + SA::error_api_impl().signal_error(PENDING_ERR_MSG); + }, + TokenMapperState::Token(_) => { + SA::error_api_impl().signal_error(TOKEN_ID_ALREADY_SET_ERR_MSG); + }, + } + } + + pub fn is_empty(&self) -> bool { + storage_get_len(self.get_storage_key()) == 0 + } + + pub fn require_issued_or_set(&self) { + if self.is_empty() { + SA::error_api_impl().signal_error(MUST_SET_TOKEN_ID_ERR_MSG); + } + } + + pub fn require_same_token(&self, expected_token_id: &TokenIdentifier) { + let actual_token_id = self.get_token_id_ref(); + if actual_token_id != expected_token_id { + SA::error_api_impl().signal_error(INVALID_PAYMENT_TOKEN_ERR_MSG); + } + } + + pub fn require_all_same_token(&self, payments: &ManagedVec>) { + let actual_token_id = self.get_token_id_ref(); + for p in payments { + if actual_token_id != &p.token_identifier { + SA::error_api_impl().signal_error(INVALID_PAYMENT_TOKEN_ERR_MSG); + } + } + } + + pub fn get_storage_key(&self) -> crate::types::ManagedRef> { + self.key.as_ref() + } + + pub fn get_token_state(&self) -> TokenMapperState { + self.token_state.clone() + } + + pub fn get_token_id(&self) -> TokenIdentifier { + if let TokenMapperState::Token(token) = &self.token_state { + token.clone() + } else { + SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); + } + } + + pub fn get_token_id_ref(&self) -> &TokenIdentifier { + if let TokenMapperState::Token(token) = &self.token_state { + token + } else { + SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); + } + } + + pub fn default_callback_closure_obj(&self) -> CallbackClosure { + let initial_caller = BlockchainWrapper::::new().get_caller(); + let cb_name = DEFAULT_ISSUE_CALLBACK_NAME; + + let mut cb_closure = CallbackClosure::new(cb_name); + cb_closure.push_endpoint_arg(&initial_caller); + cb_closure.push_endpoint_arg(&self.key.buffer); + + cb_closure } } diff --git a/framework/base/src/storage/mappers/token/token_attributes_mapper.rs b/framework/base/src/storage/mappers/token/token_attributes_mapper.rs index 33b00f56f3..f9631cf983 100644 --- a/framework/base/src/storage/mappers/token/token_attributes_mapper.rs +++ b/framework/base/src/storage/mappers/token/token_attributes_mapper.rs @@ -1,6 +1,13 @@ use core::marker::PhantomData; -use crate::codec::{NestedDecode, NestedEncode, TopDecode, TopEncode}; +use crate::{ + codec::{NestedDecode, NestedEncode, TopDecode, TopEncode}, + storage::mappers::{ + set_mapper::{CurrentStorage, StorageAddress}, + StorageMapperFromAddress, + }, + types::ManagedAddress, +}; use super::super::StorageMapper; use crate::{ @@ -23,15 +30,16 @@ const VALUE_NOT_PREVIOUSLY_SET_ERROR_MESSAGE: &[u8] = b"A value was not previous const COUNTER_OVERFLOW_ERROR_MESSAGE: &[u8] = b"Counter overflow. This module can hold evidence for maximum u8::MAX different token IDs"; -pub struct TokenAttributesMapper +pub struct TokenAttributesMapper where SA: StorageMapperApi, { _phantom_api: PhantomData, base_key: StorageKey, + address: A, } -impl StorageMapper for TokenAttributesMapper +impl StorageMapper for TokenAttributesMapper where SA: StorageMapperApi, { @@ -39,11 +47,25 @@ where TokenAttributesMapper { _phantom_api: PhantomData, base_key, + address: CurrentStorage, + } + } +} + +impl StorageMapperFromAddress for TokenAttributesMapper> +where + SA: StorageMapperApi, +{ + fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { + Self { + _phantom_api: PhantomData, + base_key, + address, } } } -impl TokenAttributesMapper +impl TokenAttributesMapper where SA: StorageMapperApi, { @@ -124,6 +146,60 @@ where self.clear_attributes_to_nonce_mapping(mapping, &attr); } + fn set_counter_value(&self, value: u8) { + storage_set(self.build_key_token_id_counter().as_ref(), &value); + } + + fn set_mapping_value(&self, token_id: &TokenIdentifier, value: u8) { + storage_set(self.build_key_token_id_mapping(token_id).as_ref(), &value); + } + + fn set_attributes_to_nonce_mapping( + &self, + mapping: u8, + attr: &T, + token_nonce: u64, + ) { + storage_set( + self.build_key_attr_to_nonce_mapping(mapping, attr).as_ref(), + &token_nonce, + ); + } + + fn clear_attributes_to_nonce_mapping( + &self, + mapping: u8, + attr: &T, + ) { + storage_clear(self.build_key_attr_to_nonce_mapping(mapping, attr).as_ref()); + } + + fn set_token_attributes_value( + &self, + mapping: u8, + token_nonce: u64, + value: &T, + ) { + storage_set( + self.build_key_token_attr_value(mapping, token_nonce) + .as_ref(), + value, + ); + } + + fn clear_token_attributes_value(&self, mapping: u8, token_nonce: u64) { + storage_clear( + self.build_key_token_attr_value(mapping, token_nonce) + .as_ref(), + ); + } +} + +impl TokenAttributesMapper +where + SA: StorageMapperApi, + A: StorageAddress, +{ pub fn has_attributes( &self, token_id: &TokenIdentifier, @@ -249,18 +325,10 @@ where storage_get(self.build_key_token_id_counter().as_ref()) } - fn set_counter_value(&self, value: u8) { - storage_set(self.build_key_token_id_counter().as_ref(), &value); - } - fn get_mapping_value(&self, token_id: &TokenIdentifier) -> u8 { storage_get(self.build_key_token_id_mapping(token_id).as_ref()) } - fn set_mapping_value(&self, token_id: &TokenIdentifier, value: u8) { - storage_set(self.build_key_token_id_mapping(token_id).as_ref(), &value); - } - fn is_empty_mapping_value(&self, token_id: &TokenIdentifier) -> bool { storage_get_len(self.build_key_token_id_mapping(token_id).as_ref()) == 0 } @@ -273,18 +341,6 @@ where storage_get(self.build_key_attr_to_nonce_mapping(mapping, attr).as_ref()) } - fn set_attributes_to_nonce_mapping( - &self, - mapping: u8, - attr: &T, - token_nonce: u64, - ) { - storage_set( - self.build_key_attr_to_nonce_mapping(mapping, attr).as_ref(), - &token_nonce, - ); - } - fn is_empty_attributes_to_nonce_mapping< T: TopEncode + TopDecode + NestedEncode + NestedDecode, >( @@ -295,14 +351,6 @@ where storage_get_len(self.build_key_attr_to_nonce_mapping(mapping, attr).as_ref()) == 0 } - fn clear_attributes_to_nonce_mapping( - &self, - mapping: u8, - attr: &T, - ) { - storage_clear(self.build_key_attr_to_nonce_mapping(mapping, attr).as_ref()); - } - fn get_token_attributes_value( &self, mapping: u8, @@ -314,30 +362,10 @@ where ) } - fn set_token_attributes_value( - &self, - mapping: u8, - token_nonce: u64, - value: &T, - ) { - storage_set( - self.build_key_token_attr_value(mapping, token_nonce) - .as_ref(), - value, - ); - } - fn is_empty_token_attributes_value(&self, mapping: u8, token_nonce: u64) -> bool { storage_get_len( self.build_key_token_attr_value(mapping, token_nonce) .as_ref(), ) == 0 } - - fn clear_token_attributes_value(&self, mapping: u8, token_nonce: u64) { - storage_clear( - self.build_key_token_attr_value(mapping, token_nonce) - .as_ref(), - ); - } } diff --git a/framework/base/src/storage/mappers/token/token_mapper.rs b/framework/base/src/storage/mappers/token/token_mapper.rs deleted file mode 100644 index 77f435a546..0000000000 --- a/framework/base/src/storage/mappers/token/token_mapper.rs +++ /dev/null @@ -1,129 +0,0 @@ -use crate::{ - api::{CallTypeApi, ErrorApiImpl, StorageMapperApi}, - contract_base::BlockchainWrapper, - storage::StorageKey, - storage_get, storage_get_len, storage_set, - types::{ - system_proxy::ESDTSystemSCProxy, CallbackClosure, ESDTSystemSCAddress, EsdtLocalRole, - EsdtTokenPayment, ManagedAddress, ManagedRef, ManagedVec, TokenIdentifier, Tx, - }, -}; - -use super::TokenMapperState; - -pub(crate) const TOKEN_ID_ALREADY_SET_ERR_MSG: &[u8] = b"Token ID already set"; -pub(crate) const PENDING_ERR_MSG: &[u8] = b"Issue was already called"; -pub(crate) const MUST_SET_TOKEN_ID_ERR_MSG: &[u8] = b"Must issue or set token ID first"; -pub(crate) const INVALID_TOKEN_ID_ERR_MSG: &[u8] = b"Invalid token ID"; -pub(crate) const INVALID_PAYMENT_TOKEN_ERR_MSG: &[u8] = b"Invalid payment token"; - -pub trait StorageTokenWrapper -where - SA: StorageMapperApi + CallTypeApi, -{ - fn get_storage_key(&self) -> ManagedRef>; - - fn is_empty(&self) -> bool { - storage_get_len(self.get_storage_key()) == 0 - } - - fn get_token_state(&self) -> TokenMapperState; - - fn get_token_id(&self) -> TokenIdentifier; - - fn get_token_id_ref(&self) -> &TokenIdentifier; - - fn set_token_id(&mut self, token_id: TokenIdentifier); - - fn set_if_empty(&mut self, token_id: TokenIdentifier) { - if self.is_empty() { - self.set_token_id(token_id); - } - } - - fn require_issued_or_set(&self) { - if self.is_empty() { - SA::error_api_impl().signal_error(MUST_SET_TOKEN_ID_ERR_MSG); - } - } - - fn require_same_token(&self, expected_token_id: &TokenIdentifier) { - let actual_token_id = self.get_token_id_ref(); - if actual_token_id != expected_token_id { - SA::error_api_impl().signal_error(INVALID_PAYMENT_TOKEN_ERR_MSG); - } - } - - fn require_all_same_token(&self, payments: &ManagedVec>) { - let actual_token_id = self.get_token_id_ref(); - for p in payments { - if actual_token_id != &p.token_identifier { - SA::error_api_impl().signal_error(INVALID_PAYMENT_TOKEN_ERR_MSG); - } - } - } - - fn set_local_roles( - &self, - roles: &[EsdtLocalRole], - opt_callback: Option>, - ) -> ! { - let own_sc_address = Self::get_sc_address(); - self.set_local_roles_for_address(&own_sc_address, roles, opt_callback); - } - - fn set_local_roles_for_address( - &self, - address: &ManagedAddress, - roles: &[EsdtLocalRole], - opt_callback: Option>, - ) -> ! { - self.require_issued_or_set(); - - let token_id = self.get_token_id_ref(); - Tx::new_tx_from_sc() - .to(ESDTSystemSCAddress) - .typed(ESDTSystemSCProxy) - .set_special_roles(address, token_id, roles[..].iter().cloned()) - .callback(opt_callback) - .async_call_and_exit() - } - - fn get_sc_address() -> ManagedAddress { - let b_wrapper = BlockchainWrapper::new(); - b_wrapper.get_sc_address() - } -} - -pub(crate) fn store_token_id< - SA: StorageMapperApi + CallTypeApi, - Mapper: StorageTokenWrapper, ->( - mapper: &Mapper, - token_id: &TokenIdentifier, -) { - if mapper.get_token_state().is_set() { - SA::error_api_impl().signal_error(TOKEN_ID_ALREADY_SET_ERR_MSG); - } - if !token_id.is_valid_esdt_identifier() { - SA::error_api_impl().signal_error(INVALID_TOKEN_ID_ERR_MSG); - } - storage_set( - mapper.get_storage_key(), - &TokenMapperState::Token(token_id.clone()), - ); -} -pub(crate) fn check_not_set>( - mapper: &Mapper, -) { - let storage_value: TokenMapperState = storage_get(mapper.get_storage_key()); - match storage_value { - TokenMapperState::NotSet => {}, - TokenMapperState::Pending => { - SA::error_api_impl().signal_error(PENDING_ERR_MSG); - }, - TokenMapperState::Token(_) => { - SA::error_api_impl().signal_error(TOKEN_ID_ALREADY_SET_ERR_MSG); - }, - } -} diff --git a/framework/base/src/types/interaction/tx_data/deploy_call.rs b/framework/base/src/types/interaction/tx_data/deploy_call.rs index a742901736..74b40d3828 100644 --- a/framework/base/src/types/interaction/tx_data/deploy_call.rs +++ b/framework/base/src/types/interaction/tx_data/deploy_call.rs @@ -22,7 +22,7 @@ where fn default() -> DeployCall { DeployCall { code_source: (), - code_metadata: CodeMetadata::DEFAULT, + code_metadata: CodeMetadata::UPGRADEABLE, arg_buffer: ManagedArgBuffer::new(), } } diff --git a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs index 2e702a0701..e87d520981 100644 --- a/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs +++ b/framework/base/src/types/managed/wrapped/egld_or_esdt_token_payment.rs @@ -10,13 +10,12 @@ use crate::codec::{ }; use crate as multiversx_sc; // needed by the TypeAbi generated code -use crate::derive::TypeAbi; +use crate::derive::type_abi; use super::{EsdtTokenPayment, EsdtTokenPaymentRefs}; -#[derive( - TopDecode, TopEncode, NestedDecode, NestedEncode, TypeAbi, Clone, PartialEq, Eq, Debug, -)] +#[type_abi] +#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug)] pub struct EgldOrEsdtTokenPayment { pub token_identifier: EgldOrEsdtTokenIdentifier, pub token_nonce: u64, diff --git a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs index 4c3187e3c9..88534f95c1 100644 --- a/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs +++ b/framework/base/src/types/managed/wrapped/egld_or_multi_esdt_payment.rs @@ -9,14 +9,13 @@ use crate::{ }; use crate as multiversx_sc; // needed by the TypeAbi generated code -use crate::derive::TypeAbi; +use crate::derive::type_abi; /// Encodes any type of payment, which either: /// - EGLD (can be zero in case of no payment whatsoever); /// - Multi-ESDT (one or more ESDT transfers). -#[derive( - TopDecode, TopEncode, TypeAbi, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, -)] +#[type_abi] +#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug)] pub enum EgldOrMultiEsdtPayment { Egld(BigUint), MultiEsdt(ManagedVec>), diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs index 3e25360ea4..5cf35be4b6 100644 --- a/framework/base/src/types/managed/wrapped/managed_vec.rs +++ b/framework/base/src/types/managed/wrapped/managed_vec.rs @@ -356,6 +356,8 @@ where M: ManagedTypeApi, T: ManagedVecItem + Ord + Debug, { + #[deprecated(since = "0.54.5", note = "Please use method `sort_unstable` instead.")] + #[cfg(feature = "alloc")] pub fn sort(&mut self) { self.with_self_as_slice_mut(|slice| { slice.sort(); @@ -363,6 +365,11 @@ where }); } + #[deprecated( + since = "0.54.5", + note = "Please use method `sort_unstable_by` instead." + )] + #[cfg(feature = "alloc")] pub fn sort_by(&mut self, mut compare: F) where F: FnMut(&T, &T) -> Ordering, @@ -373,6 +380,11 @@ where }); } + #[deprecated( + since = "0.54.5", + note = "Please use method `sort_unstable_by_key` instead." + )] + #[cfg(feature = "alloc")] pub fn sort_by_key(&mut self, mut f: F) where F: FnMut(&T) -> K, @@ -384,6 +396,8 @@ where }); } + #[deprecated] + #[cfg(feature = "alloc")] pub fn sort_by_cached_key(&mut self, mut f: F) where F: FnMut(&T) -> K, diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml index b87b533d89..d65b07f4f4 100644 --- a/framework/derive/Cargo.toml +++ b/framework/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-derive" -version = "0.54.2" +version = "0.54.4" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] diff --git a/framework/derive/src/format/semver_tuple.rs b/framework/derive/src/format/semver_tuple.rs index f10036a973..ec0f9a1ec2 100644 --- a/framework/derive/src/format/semver_tuple.rs +++ b/framework/derive/src/format/semver_tuple.rs @@ -32,7 +32,12 @@ fn convert_token_tree(token: &proc_macro2::TokenTree) -> proc_macro2::TokenStrea } fn u64_literal_from_str(s: &str) -> proc_macro2::TokenTree { + // For some reason a space creeps in at the end, + // but only when running from rust-analyzer, + // therefore also calling a trim() proc_macro2::TokenTree::Literal(proc_macro2::Literal::u64_suffixed( - s.parse().expect("failed to parse token as u64"), + s.trim() + .parse() + .unwrap_or_else(|err| panic!("failed to parse token as u64 '{s}': {err}")), )) } diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs index 515aa3fc7d..d0fdd36b5f 100644 --- a/framework/derive/src/lib.rs +++ b/framework/derive/src/lib.rs @@ -44,6 +44,10 @@ pub fn proxy( macro_proxy::process_proxy(args, input) } +#[deprecated( + since = "0.54.4", + note = "Replace with attribute #[type_abi], which should be placed before all derives. More about this: https://docs.multiversx.com/developers/transactions/tx-migration/#replace-derivetypeabi-with-type_abi" +)] #[proc_macro_derive(TypeAbi)] pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream { type_abi_derive::type_abi_derive(input).into() diff --git a/framework/derive/src/type_abi_derive.rs b/framework/derive/src/type_abi_derive.rs index 8c70b56af8..fd7eff5cd4 100644 --- a/framework/derive/src/type_abi_derive.rs +++ b/framework/derive/src/type_abi_derive.rs @@ -46,8 +46,13 @@ fn fields_snippets(fields: &syn::Fields) -> Vec { pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStream { let ast: syn::DeriveInput = syn::parse(input).unwrap(); + let name = &ast.ident; + let name_str = name.to_string(); let type_docs = extract_doc(ast.attrs.as_slice()); let macro_attributes = extract_macro_attributes(ast.attrs.as_slice()); + if macro_attributes.is_empty() { + println!("Warning! {name_str} #[type_abi] implementation sees no derive traits. Make sure that the derive attribute comes after #[type_abi]"); + } let type_description_impl = match &ast.data { syn::Data::Struct(data_struct) => { @@ -119,8 +124,6 @@ pub fn type_abi_derive(input: proc_macro::TokenStream) -> proc_macro2::TokenStre syn::Data::Union(_) => panic!("Union not supported!"), }; - let name = &ast.ident; - let name_str = name.to_string(); let (impl_generics, ty_generics, where_clause) = &ast.generics.split_for_impl(); quote! { impl #impl_generics multiversx_sc::abi::TypeAbiFrom for #name #ty_generics #where_clause {} diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml index 0411b4fb41..ee7149edaf 100644 --- a/framework/meta-lib/Cargo.toml +++ b/framework/meta-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-meta-lib" -version = "0.54.2" +version = "0.54.4" edition = "2021" authors = [ @@ -32,6 +32,6 @@ semver = "1.0.20" wat = "1.217.0" [dependencies.multiversx-sc] -version = "=0.54.2" +version = "=0.54.4" path = "../base" features = ["alloc", "num-bigint"] diff --git a/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs b/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs index e78092a844..7bb1ed4692 100644 --- a/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs +++ b/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs @@ -358,10 +358,10 @@ mod tests { const CARGO_TOML_RAW: &str = r#" [dependencies.by-version-1] -version = "1.2.30" +version = "0.54.0" [dependencies.by-version-1-strict] -version = "=1.2.31" +version = "=0.54.1" [dependencies.by-git-commit-1] git = "https://github.com/multiversx/repo1" @@ -371,8 +371,8 @@ rev = "85c31b9ce730bd5ffe41589c353d935a14baaa96" path = "a/b/c" [dependencies] -by-version-2 = "4.5.60" -by-version-2-strict = "=4.5.61" +by-version-2 = "0.54.2" +by-version-2-strict = "=0.54.3" by-path-2 = { path = "d/e/f" } by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be823f26d1e7f59c71536d337b7240dc3fa2" } "#; @@ -386,13 +386,13 @@ by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be82 assert_eq!( raw_value, DependencyRawValue { - version: Some("1.2.30".to_owned()), + version: Some("0.54.0".to_owned()), ..Default::default() }, ); assert_eq!( raw_value.interpret(), - DependencyReference::Version(VersionReq::from_version_str("1.2.30")), + DependencyReference::Version(VersionReq::from_version_str("0.54.0").unwrap()), ); // version, strict @@ -402,13 +402,13 @@ by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be82 assert_eq!( raw_value, DependencyRawValue { - version: Some("=1.2.31".to_owned()), + version: Some("=0.54.1".to_owned()), ..Default::default() }, ); assert_eq!( raw_value.interpret(), - DependencyReference::Version(VersionReq::from_version_str("1.2.31").strict()), + DependencyReference::Version(VersionReq::from_version_str("0.54.1").unwrap().strict()), ); // version, compact @@ -416,13 +416,13 @@ by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be82 assert_eq!( raw_value, DependencyRawValue { - version: Some("4.5.60".to_owned()), + version: Some("0.54.2".to_owned()), ..Default::default() }, ); assert_eq!( raw_value.interpret(), - DependencyReference::Version(VersionReq::from_version_str("4.5.60")), + DependencyReference::Version(VersionReq::from_version_str("0.54.2").unwrap()), ); // version, compact, strict @@ -432,13 +432,13 @@ by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be82 assert_eq!( raw_value, DependencyRawValue { - version: Some("=4.5.61".to_owned()), + version: Some("=0.54.3".to_owned()), ..Default::default() }, ); assert_eq!( raw_value.interpret(), - DependencyReference::Version(VersionReq::from_version_str("4.5.61").strict()), + DependencyReference::Version(VersionReq::from_version_str("0.54.3").unwrap().strict()), ); // git diff --git a/framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs b/framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs index 442ad6edb9..bb26c075af 100644 --- a/framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs +++ b/framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs @@ -31,7 +31,7 @@ pub enum DependencyReference { GitBranch(GitBranchReference), GitTag(GitTagReference), Path(String), - Unsupported(&'static str), + Unsupported(String), } impl DependencyReference { @@ -66,10 +66,10 @@ impl DependencyRawValue { }, (None, None, None) => DependencyReference::Unsupported( - "need at least one of: git commit, git brach, or git tag", + "need at least one of: git commit, git brach, or git tag".to_owned(), ), _ => DependencyReference::Unsupported( - "can only have one of: git commit, git brach, or git tag", + "can only have one of: git commit, git brach, or git tag".to_owned(), ), }; } @@ -77,9 +77,15 @@ impl DependencyRawValue { // explicit version = "..." // handled last, because it has the lowest priority, both path and git fields override it if let Some(version) = self.version { - return DependencyReference::Version(VersionReq::from_version_str(&version)); + if let Some(version_req) = VersionReq::from_version_str(&version) { + return DependencyReference::Version(version_req); + } else { + return DependencyReference::Unsupported(format!( + "unknown framework version: {version}" + )); + } } - DependencyReference::Unsupported("expected at least one of: version, git, path") + DependencyReference::Unsupported("expected at least one of: version, git, path".to_owned()) } } diff --git a/framework/meta-lib/src/cargo_toml/version_req.rs b/framework/meta-lib/src/cargo_toml/version_req.rs index 1e834dade5..a29a1d65a4 100644 --- a/framework/meta-lib/src/cargo_toml/version_req.rs +++ b/framework/meta-lib/src/cargo_toml/version_req.rs @@ -12,7 +12,21 @@ pub struct VersionReq { pub is_strict: bool, } impl VersionReq { - pub fn from_version_str(raw: &str) -> Self { + pub fn from_version_str(raw: &str) -> Option { + if let Some(stripped_version) = raw.strip_prefix('=') { + Some(VersionReq { + semver: find_version_by_str(stripped_version)?.clone(), + is_strict: true, + }) + } else { + Some(VersionReq { + semver: find_version_by_str(raw)?.clone(), + is_strict: false, + }) + } + } + + pub fn from_version_str_or_latest(raw: &str) -> Self { if let Some(stripped_version) = raw.strip_prefix('=') { VersionReq { semver: find_version_by_str(stripped_version) diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs index 029f7c0f97..16e36a6aae 100644 --- a/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs +++ b/framework/meta-lib/src/contract/generate_snippets/snippet_crate_gen.rs @@ -101,7 +101,6 @@ serial_test = {{ version = "3.2.0" }} [features] chain-simulator-tests = [] -blockchain-tests = [] "# ) .unwrap(); diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs index 78abf244b5..816ad76572 100644 --- a/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs +++ b/framework/meta-lib/src/contract/generate_snippets/snippet_template_gen.rs @@ -260,7 +260,7 @@ use rust_interact::ContractInteract; // In order for this test to work, make sure that the `config.toml` file contains the real blockchain config (or choose it manually) // Can be run with `sc-meta test`. #[tokio::test] -#[cfg_attr(not(feature = "blockchain-tests"), ignore)] +#[ignore = "run on demand, relies on real blockchain state"] async fn deploy_test_{crate_name}() {{ let mut interactor = ContractInteract::new().await; diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs index 4dc20adcb1..8fa779c32f 100644 --- a/framework/meta-lib/src/version_history.rs +++ b/framework/meta-lib/src/version_history.rs @@ -3,7 +3,7 @@ use crate::{framework_version, framework_versions, version::FrameworkVersion}; /// The last version to be used for upgrades and templates. /// /// Should be edited every time a new version of the framework is released. -pub const LAST_VERSION: FrameworkVersion = framework_version!(0.54.2); +pub const LAST_VERSION: FrameworkVersion = framework_version!(0.54.4); /// Indicates where to stop with the upgrades. pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION; @@ -86,7 +86,10 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![ 0.53.1, 0.53.2, 0.54.0, + 0.54.1, 0.54.2, + 0.54.3, + 0.54.4, ]; #[rustfmt::skip] @@ -114,9 +117,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![ 0.51.1, 0.52.3, 0.53.2, - 0.54.0, - 0.54.1, - 0.54.2, + 0.54.4, ]; pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0); diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml index c2aab90350..7acf74dfe4 100644 --- a/framework/meta/Cargo.toml +++ b/framework/meta/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-meta" -version = "0.54.2" +version = "0.54.4" edition = "2021" authors = [ @@ -36,20 +36,21 @@ semver = "1.0.20" ruplacer = { version = "0.8.1", default-features = false } reqwest = { version = "0.12", features = ["blocking", "json"] } zip = { version = "2.1", features = ["deflate"], default-features = false } -copy_dir = "0.1.2" -pathdiff = "0.2.1" -common-path = "1.0.0" +copy_dir = "0.1.2" +pathdiff = "0.2.1" +common-path = "1.0.0" bip39 = "2.0.0" +home = "0.5.2" [dependencies.multiversx-sc-meta-lib] -version = "=0.54.2" +version = "=0.54.4" path = "../meta-lib" [dependencies.multiversx-sc] -version = "=0.54.2" +version = "=0.54.4" path = "../base" features = ["alloc", "num-bigint"] [dependencies.multiversx-sc-snippets] -version = "=0.54.2" +version = "=0.54.4" path = "../snippets" diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs index abd450b702..47ac971563 100644 --- a/framework/meta/src/cli/cli_args_standalone.rs +++ b/framework/meta/src/cli/cli_args_standalone.rs @@ -427,6 +427,9 @@ pub enum InstallCommand { #[command(name = "wasm-opt", about = "Installs the `wasm-opt` tool")] WasmOpt(InstallWasmOptArgs), + + #[command(name = "debugger", about = "Installs the lldb debugger script tool")] + Debugger(InstallDebuggerArgs), } #[derive(Default, Clone, PartialEq, Eq, Debug, Args)] @@ -442,6 +445,9 @@ pub struct InstallWasm32Args {} #[derive(Default, Clone, PartialEq, Eq, Debug, Args)] pub struct InstallWasmOptArgs {} +#[derive(Default, Clone, PartialEq, Eq, Debug, Args)] +pub struct InstallDebuggerArgs {} + #[derive(Default, Clone, PartialEq, Eq, Debug, Args)] pub struct AccountArgs { /// Provide the target API you want the data to come from diff --git a/framework/meta/src/cli/cli_standalone_main.rs b/framework/meta/src/cli/cli_standalone_main.rs index 3d91747f45..bc83cc9714 100644 --- a/framework/meta/src/cli/cli_standalone_main.rs +++ b/framework/meta/src/cli/cli_standalone_main.rs @@ -21,16 +21,16 @@ pub async fn cli_main_standalone() { let cli_args = StandaloneCliArgs::parse(); match &cli_args.command { Some(StandaloneCliAction::Info(args)) => call_info(args), - Some(StandaloneCliAction::Install(args)) => install(args), + Some(StandaloneCliAction::Install(args)) => install(args).await, Some(StandaloneCliAction::All(args)) => call_all_meta(args), Some(StandaloneCliAction::Upgrade(args)) => { upgrade_sc(args); }, Some(StandaloneCliAction::Template(args)) => { - create_contract(args); + create_contract(args).await; }, Some(StandaloneCliAction::TemplateList(args)) => { - print_template_names(args); + print_template_names(args).await; }, Some(StandaloneCliAction::TestGen(args)) => { test_gen_tool(args); diff --git a/framework/meta/src/cmd/install.rs b/framework/meta/src/cmd/install.rs index 256f7640e7..35b4917e7a 100644 --- a/framework/meta/src/cmd/install.rs +++ b/framework/meta/src/cmd/install.rs @@ -1,14 +1,16 @@ +pub mod install_debugger; mod install_scenario_go; mod install_wasm_tools; mod system_info; use crate::cli::{ - InstallArgs, InstallCommand, InstallMxScenarioGoArgs, InstallWasm32Args, InstallWasmOptArgs, + InstallArgs, InstallCommand, InstallDebuggerArgs, InstallMxScenarioGoArgs, InstallWasm32Args, + InstallWasmOptArgs, }; use self::install_scenario_go::ScenarioGoInstaller; -pub fn install(args: &InstallArgs) { +pub async fn install(args: &InstallArgs) { let command = args .command .as_ref() @@ -16,18 +18,22 @@ pub fn install(args: &InstallArgs) { match command { InstallCommand::All => { - install_scenario_go(&InstallMxScenarioGoArgs::default()); + install_scenario_go(&InstallMxScenarioGoArgs::default()).await; install_wasm32(&InstallWasm32Args::default()); install_wasm_opt(&InstallWasmOptArgs::default()); + install_debugger(&InstallDebuggerArgs::default()).await; }, - InstallCommand::MxScenarioGo(sg_args) => install_scenario_go(sg_args), + InstallCommand::MxScenarioGo(sg_args) => install_scenario_go(sg_args).await, InstallCommand::Wasm32(wam32_args) => install_wasm32(wam32_args), InstallCommand::WasmOpt(wasm_opt_args) => install_wasm_opt(wasm_opt_args), + InstallCommand::Debugger(debugger_args) => install_debugger(debugger_args).await, } } -fn install_scenario_go(sg_args: &InstallMxScenarioGoArgs) { - ScenarioGoInstaller::new(sg_args.tag.clone()).install(); +async fn install_scenario_go(sg_args: &InstallMxScenarioGoArgs) { + ScenarioGoInstaller::new(sg_args.tag.clone()) + .install() + .await; } fn install_wasm32(_wasm32_args: &InstallWasm32Args) { @@ -37,3 +43,7 @@ fn install_wasm32(_wasm32_args: &InstallWasm32Args) { fn install_wasm_opt(_wasm_opt_args: &InstallWasmOptArgs) { install_wasm_tools::install_wasm_opt(); } + +async fn install_debugger(_debugger_args: &InstallDebuggerArgs) { + install_debugger::install_debugger(Option::None).await; +} diff --git a/framework/meta/src/cmd/install/install_debugger.rs b/framework/meta/src/cmd/install/install_debugger.rs new file mode 100644 index 0000000000..0f95aa614b --- /dev/null +++ b/framework/meta/src/cmd/install/install_debugger.rs @@ -0,0 +1,135 @@ +use crate::cmd::template::RepoSource; +use std::fs::{self}; +use std::path::{Path, PathBuf}; +use std::process::Command; +use std::{env, io}; + +pub const PATH_TO_SCRIPT: &str = "tools/rust-debugger/pretty-printers"; +pub const SCRIPT_NAME: &str = "multiversx_sc_lldb_pretty_printers.py"; + +pub const TARGET_PATH: &str = ".vscode/extensions/"; + +pub async fn install_debugger(custom_path: Option) { + let testing = custom_path.is_some(); + let _ = install_lldb_extension(); + install_script(custom_path).await; + if !testing { + // if we are testing we skip the configuration path, not to mess up with the current vscode configuration + configure_vscode(); + } +} + +fn install_lldb_extension() -> io::Result<()> { + let extension_id = "vadimcn.vscode-lldb"; + + // Run the VSCode command to install the extension + let status = Command::new("code") + .arg("--install-extension") + .arg(extension_id) + .status()?; + + // Check if the command was successful + if status.success() { + println!("Extension {} installed successfully.", extension_id); + } else { + eprintln!("Failed to install extension {}.", extension_id); + } + + Ok(()) +} + +async fn install_script(custom_path: Option) { + let repo_temp_download = RepoSource::download_from_github( + crate::cmd::template::RepoVersion::Master, + std::env::temp_dir(), + ) + .await; + + let script_path = repo_temp_download.repo_path().join(PATH_TO_SCRIPT); + let path_ref: &Path = script_path.as_ref(); + let canonicalized = fs::canonicalize(path_ref).unwrap_or_else(|err| { + panic!( + "error canonicalizing input path {}: {}", + path_ref.display(), + err, + ) + }); + let script = canonicalized.join(SCRIPT_NAME); + + let target_path = if let Some(unwrapped_custom_path) = custom_path { + unwrapped_custom_path + } else { + home::home_dir().unwrap().join(TARGET_PATH) + }; + + let _ = fs::create_dir_all(&target_path); + if fs::copy(script, get_script_path(target_path)).is_ok() { + println!("debugger script imported successfully"); + } +} + +fn get_script_path(path: PathBuf) -> PathBuf { + path.join(SCRIPT_NAME) +} + +fn get_path_to_settings() -> PathBuf { + let os = env::consts::OS; + let user_home = home::home_dir().unwrap(); + match os { + "macos" => { + // For macOS + Path::new(&user_home) + .join("Library") + .join("Application Support") + .join("Code") + .join("User") + .join("settings.json") + }, + "linux" => { + // For Linux + Path::new(&user_home) + .join(".config") + .join("Code") + .join("User") + .join("settings.json") + }, + _ => panic!("OS not supported"), + } +} + +fn configure_vscode() { + let path_to_settings = get_path_to_settings(); + + let script_full_path = get_script_path(home::home_dir().unwrap().join(TARGET_PATH)); + let json = fs::read_to_string(&path_to_settings).expect("Unable to read settings.json"); + let mut sub_values: serde_json::Value = serde_json::from_str(&json).unwrap(); + + let init_commands = sub_values + .as_object_mut() + .unwrap() + .entry("lldb.launch.initCommands") + .or_insert_with(|| serde_json::Value::Array(Vec::new())); + let command_script_line = + "command script import ".to_owned() + script_full_path.to_str().unwrap(); + + if let serde_json::Value::Array(ref mut array) = init_commands { + if let Some(pos) = array.iter().position(|v| { + if let serde_json::Value::String(s) = v { + s.contains(SCRIPT_NAME) // Replace with your substring + } else { + false + } + }) { + array.remove(pos); // Remove the element if the substring is found + } + + array.push(serde_json::Value::String(command_script_line)); + } + + let _ = fs::write( + path_to_settings, + serde_json::to_string_pretty(&sub_values).unwrap(), + ); + + println!("debugger script installed successfully"); +} diff --git a/framework/meta/src/cmd/install/install_scenario_go.rs b/framework/meta/src/cmd/install/install_scenario_go.rs index 2351ab2621..538da0e116 100644 --- a/framework/meta/src/cmd/install/install_scenario_go.rs +++ b/framework/meta/src/cmd/install/install_scenario_go.rs @@ -50,9 +50,10 @@ impl ScenarioGoInstaller { } } - pub fn install(&self) { + pub async fn install(&self) { let release_raw = self .get_scenario_go_release_json() + .await .expect("couldn't retrieve mx-chain-scenario-cli-go release"); assert!( @@ -62,6 +63,7 @@ impl ScenarioGoInstaller { let release = self.parse_scenario_go_release(&release_raw); self.download_zip(&release) + .await .expect("could not download artifact"); self.unzip_binaries(); @@ -76,16 +78,18 @@ impl ScenarioGoInstaller { } } - fn get_scenario_go_release_json(&self) -> Result { + async fn get_scenario_go_release_json(&self) -> Result { let release_url = self.release_url(); println_green(format!("Retrieving release info: {release_url}")); - let response = reqwest::blocking::Client::builder() + let response = reqwest::Client::builder() .user_agent(&self.user_agent) .build()? .get(release_url) - .send()? - .text()?; + .send() + .await? + .text() + .await?; Ok(response) } @@ -135,14 +139,16 @@ impl ScenarioGoInstaller { self.temp_dir_path.join(&self.zip_name) } - fn download_zip(&self, release: &ScenarioGoRelease) -> Result<(), reqwest::Error> { + async fn download_zip(&self, release: &ScenarioGoRelease) -> Result<(), reqwest::Error> { println_green(format!("Downloading binaries: {}", &release.download_url)); - let response = reqwest::blocking::Client::builder() + let response = reqwest::Client::builder() .user_agent(&self.user_agent) .build()? .get(&release.download_url) - .send()? - .bytes()?; + .send() + .await? + .bytes() + .await?; if response.len() < 10000 { panic!( "Could not download artifact: {}", diff --git a/framework/meta/src/cmd/template/contract_creator.rs b/framework/meta/src/cmd/template/contract_creator.rs index 8483f3c8f8..7e0cfb5ea1 100644 --- a/framework/meta/src/cmd/template/contract_creator.rs +++ b/framework/meta/src/cmd/template/contract_creator.rs @@ -12,10 +12,10 @@ use super::{ }; /// Creates a new contract on disk, from a template, given a name. -pub fn create_contract(args: &TemplateArgs) { +pub async fn create_contract(args: &TemplateArgs) { let version = get_repo_version(&args.tag); let version_tag: FrameworkVersion = version.get_tag(); - let repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir()); + let repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir()).await; let target = target_from_args(args); let creator = ContractCreator::new( diff --git a/framework/meta/src/cmd/template/repo_source.rs b/framework/meta/src/cmd/template/repo_source.rs index 2bb19e262f..b1e66063ee 100644 --- a/framework/meta/src/cmd/template/repo_source.rs +++ b/framework/meta/src/cmd/template/repo_source.rs @@ -11,12 +11,9 @@ pub enum RepoSource { } impl RepoSource { - pub fn download_from_github(version: RepoVersion, temp_dir_path: PathBuf) -> Self { + pub async fn download_from_github(version: RepoVersion, temp_dir_path: PathBuf) -> Self { fs::create_dir_all(&temp_dir_path).unwrap(); - RepoSource::Downloaded(RepoTempDownload::download_from_github( - version, - temp_dir_path, - )) + RepoSource::Downloaded(RepoTempDownload::download_from_github(version, temp_dir_path).await) } pub fn from_local_path(repo_local_path: impl AsRef) -> Self { diff --git a/framework/meta/src/cmd/template/repo_temp_download.rs b/framework/meta/src/cmd/template/repo_temp_download.rs index 374939eddd..242d21d0c6 100644 --- a/framework/meta/src/cmd/template/repo_temp_download.rs +++ b/framework/meta/src/cmd/template/repo_temp_download.rs @@ -14,12 +14,12 @@ pub struct RepoTempDownload { } impl RepoTempDownload { - pub fn download_from_github(version: RepoVersion, temp_dir_path: PathBuf) -> Self { + pub async fn download_from_github(version: RepoVersion, temp_dir_path: PathBuf) -> Self { let tt_download = RepoTempDownload { version, temp_dir_path, }; - tt_download.download_binaries().unwrap(); + tt_download.download_binaries().await.unwrap(); tt_download.delete_temp_folder(); tt_download.unzip_binaries(); tt_download.delete_zip(); @@ -34,8 +34,8 @@ impl RepoTempDownload { self.temp_dir_path.join(self.version.temp_dir_name()) } - fn download_binaries(&self) -> Result<(), reqwest::Error> { - let response = reqwest::blocking::get(self.version.url())?.bytes()?; + async fn download_binaries(&self) -> Result<(), reqwest::Error> { + let response = reqwest::get(self.version.url()).await?.bytes().await?; if response.len() < 10000 { panic!( "Could not download artifact: {}", diff --git a/framework/meta/src/cmd/template/template_list.rs b/framework/meta/src/cmd/template/template_list.rs index 1d297179b7..24170d95a5 100644 --- a/framework/meta/src/cmd/template/template_list.rs +++ b/framework/meta/src/cmd/template/template_list.rs @@ -2,9 +2,9 @@ use crate::cli::TemplateListArgs; use super::{contract_creator::get_repo_version, template_source::template_sources, RepoSource}; -pub fn print_template_names(args: &TemplateListArgs) { +pub async fn print_template_names(args: &TemplateListArgs) { let version = get_repo_version(&args.tag); - let repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir()); + let repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir()).await; let template_names = template_names_from_repo(&repo_temp_download); for template_name in template_names { println!("{template_name}"); diff --git a/framework/meta/src/cmd/upgrade/upgrade_common.rs b/framework/meta/src/cmd/upgrade/upgrade_common.rs index 3678051527..9ce08b2388 100644 --- a/framework/meta/src/cmd/upgrade/upgrade_common.rs +++ b/framework/meta/src/cmd/upgrade/upgrade_common.rs @@ -179,7 +179,7 @@ fn change_version_string( framework_crate_name: &str, ) { let version_string_before = version_string.clone(); - let mut version_spec = VersionReq::from_version_str(&std::mem::take(version_string)); + let mut version_spec = VersionReq::from_version_str_or_latest(&std::mem::take(version_string)); if version_spec.semver == *from_version { version_spec.semver = to_version.clone(); } diff --git a/framework/meta/tests/install_debugger_test.rs b/framework/meta/tests/install_debugger_test.rs new file mode 100644 index 0000000000..2731b32a4f --- /dev/null +++ b/framework/meta/tests/install_debugger_test.rs @@ -0,0 +1,11 @@ +use multiversx_sc_meta::cmd::install::install_debugger; +use multiversx_sc_meta_lib::tools::find_current_workspace; + +const INSTALL_DEBUGGER_TEMP_DIR_NAME: &str = "install-debugger-test"; + +#[tokio::test] +async fn test_install_debugger() { + let workspace_path = find_current_workspace().unwrap(); + let target_path = workspace_path.join(INSTALL_DEBUGGER_TEMP_DIR_NAME); + install_debugger::install_debugger(Option::Some(target_path)).await; +} diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs index 7a52398ff8..695763095d 100644 --- a/framework/meta/tests/template_test.rs +++ b/framework/meta/tests/template_test.rs @@ -106,28 +106,29 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str, ne cargo_test(&target); } -#[test] +#[tokio::test] #[cfg_attr(not(feature = "template-test-released"), ignore)] -fn template_released_adder() { +async fn template_released_adder() { template_test_released( "adder", "released-adder", "Alin Cruceat ", - ); + ) + .await; cargo_check_interactor("", "released-adder"); } -#[test] +#[tokio::test] #[cfg_attr(not(feature = "template-test-released"), ignore)] -fn template_released_crypto_zombies() { - template_test_released("crypto-zombies", "released-crypto-zombies", ""); +async fn template_released_crypto_zombies() { + template_test_released("crypto-zombies", "released-crypto-zombies", "").await; } -#[test] +#[tokio::test] #[cfg_attr(not(feature = "template-test-released"), ignore)] -fn template_released_empty() { - template_test_released("empty", "released-empty", ""); +async fn template_released_empty() { + template_test_released("empty", "released-empty", "").await; } /// These tests fully replicate the templating process. They @@ -135,7 +136,7 @@ fn template_released_empty() { /// - create proper contracts, /// - build the newly created contracts (to wasm) /// - run all tests (including Go scenarios) on them. -fn template_test_released(template_name: &str, new_name: &str, new_author: &str) { +async fn template_test_released(template_name: &str, new_name: &str, new_author: &str) { let workspace_path = find_current_workspace().unwrap(); let target = ContractCreatorTarget { target_path: workspace_path.join(TEMPLATE_TEMP_DIR_NAME), @@ -149,7 +150,8 @@ fn template_test_released(template_name: &str, new_name: &str, new_author: &str) let repo_source = RepoSource::download_from_github( RepoVersion::Tag(version_history::LAST_TEMPLATE_VERSION.to_string()), temp_dir_path, - ); + ) + .await; prepare_target_dir(&target); diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml index f0c3ec1ac0..5b018b3c47 100644 --- a/framework/scenario/Cargo.toml +++ b/framework/scenario/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-scenario" -version = "0.54.2" +version = "0.54.4" edition = "2021" authors = [ @@ -37,12 +37,12 @@ wasm-incompatible = ["multiversx-chain-vm/wasm-incompatible"] run-go-tests = [] [dependencies.multiversx-sc] -version = "=0.54.2" +version = "=0.54.4" features = ["alloc", "num-bigint"] path = "../base" [dependencies.multiversx-sc-meta-lib] -version = "=0.54.2" +version = "=0.54.4" path = "../meta-lib" [dependencies.multiversx-chain-scenario-format] diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs index 1c7532e27a..75e4555152 100644 --- a/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs +++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_deploy.rs @@ -50,6 +50,7 @@ where let mut step = ScDeployStep::new() .from(address_annotated(env, &from)) .code(code_annotated(env, data.code_source)); + step.tx.code_metadata = data.code_metadata; for arg in data.arg_buffer.iter_buffers() { step.tx.arguments.push(arg.to_vec().into()); } diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml index d28ca2d138..c3d649f477 100644 --- a/framework/snippets/Cargo.toml +++ b/framework/snippets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-snippets" -version = "0.54.2" +version = "0.54.4" edition = "2021" authors = ["MultiversX "] @@ -31,7 +31,7 @@ anyhow = "1.0.44" tokio = { version = "1.24", features = ["full"], optional = true} [dependencies.multiversx-sc-scenario] -version = "=0.54.2" +version = "=0.54.4" path = "../scenario" [dependencies.multiversx-chain-scenario-format] diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml index 8b1ea27b93..122931ed64 100644 --- a/framework/wasm-adapter/Cargo.toml +++ b/framework/wasm-adapter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-wasm-adapter" -version = "0.54.2" +version = "0.54.4" edition = "2021" authors = [ @@ -22,5 +22,5 @@ categories = [ ] [dependencies.multiversx-sc] -version = "=0.54.2" +version = "=0.54.4" path = "../base" diff --git a/tools/interactor-system-func-calls/Cargo.toml b/tools/interactor-system-func-calls/Cargo.toml index 2eb9cd6bf9..5afce38431 100644 --- a/tools/interactor-system-func-calls/Cargo.toml +++ b/tools/interactor-system-func-calls/Cargo.toml @@ -22,5 +22,5 @@ version = "1.0" features = ["derive"] [dependencies.multiversx-sc-snippets] -version = "=0.54.2" +version = "=0.54.4" path = "../../framework/snippets" diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml index d8c5cfc2b6..2153816344 100644 --- a/tools/mxpy-snippet-generator/Cargo.toml +++ b/tools/mxpy-snippet-generator/Cargo.toml @@ -10,7 +10,7 @@ name = "mxpy-snippet-generator" path = "src/mxpy_snippet_generator.rs" [dependencies.multiversx-sc] -version = "0.54.2" +version = "0.54.4" path = "../../framework/base" [dependencies] diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml index 309518ebf7..7500358750 100644 --- a/tools/plotter/Cargo.toml +++ b/tools/plotter/Cargo.toml @@ -21,11 +21,11 @@ plotters-canvas = "^0.3.0" lto = true [dependencies.multiversx-sc] -version = "=0.54.2" +version = "=0.54.4" path = "../../framework/base" [dependencies.multiversx-sc-scenario] -version = "=0.54.2" +version = "=0.54.4" path = "../../framework/scenario" default-features = false diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml index 557c646173..d79b616e4e 100644 --- a/tools/rust-debugger/format-tests/Cargo.toml +++ b/tools/rust-debugger/format-tests/Cargo.toml @@ -9,11 +9,11 @@ name = "format-tests" path = "src/format_tests.rs" [dependencies.multiversx-sc] -version = "=0.54.2" +version = "=0.54.4" path = "../../../framework/base" [dependencies.multiversx-sc-scenario] -version = "=0.54.2" +version = "=0.54.4" path = "../../../framework/scenario" [dependencies.multiversx-chain-vm]