From b1fe6098d3deb76adee780fcd7e1b751fe78d7aa Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 25 Aug 2023 17:00:20 +0300 Subject: [PATCH 1/9] upgrade to framework version 0.40.0 --- Cargo.toml | 2 ++ common/common_errors/Cargo.toml | 2 +- common/common_structs/Cargo.toml | 2 +- common/modules/farm/config/Cargo.toml | 2 +- common/modules/farm/contexts/Cargo.toml | 4 ++-- common/modules/farm/events/Cargo.toml | 2 +- common/modules/farm/farm_base_impl/Cargo.toml | 6 +++--- common/modules/farm/farm_token/Cargo.toml | 4 ++-- .../modules/farm/farm_token/src/farm_token.rs | 2 +- .../modules/farm/farm_token_merge/Cargo.toml | 4 ++-- common/modules/farm/rewards/Cargo.toml | 4 ++-- .../legacy_token_decode_module/Cargo.toml | 2 +- common/modules/locking_module/Cargo.toml | 2 +- common/modules/math/Cargo.toml | 2 +- common/modules/pausable/Cargo.toml | 2 +- common/modules/permissions_module/Cargo.toml | 2 +- common/modules/sc_whitelist_module/Cargo.toml | 2 +- common/modules/token_merge_helper/Cargo.toml | 2 +- common/modules/token_send/Cargo.toml | 2 +- common/modules/utils/Cargo.toml | 2 +- common/modules/utils/src/lib.rs | 2 +- common/traits/fixed-supply-token/Cargo.toml | 2 +- common/traits/mergeable/Cargo.toml | 2 +- common/traits/unwrappable/Cargo.toml | 2 +- dex/Cargo.toml | 6 +++--- dex/farm-with-locked-rewards/Cargo.toml | 6 +++--- dex/farm-with-locked-rewards/meta/Cargo.toml | 2 +- dex/farm-with-locked-rewards/src/lib.rs | 2 +- dex/farm-with-locked-rewards/wasm/Cargo.toml | 2 +- dex/farm/Cargo.toml | 6 +++--- dex/farm/meta/Cargo.toml | 2 +- dex/farm/src/base_functions.rs | 6 +++--- dex/farm/wasm/Cargo.toml | 2 +- dex/fuzz/Cargo.toml | 4 ++-- dex/governance/Cargo.toml | 4 ++-- dex/governance/meta/Cargo.toml | 2 +- dex/governance/wasm/Cargo.toml | 2 +- dex/pair-mock/Cargo.toml | 4 ++-- dex/pair-mock/meta/Cargo.toml | 2 +- dex/pair-mock/wasm/Cargo.toml | 2 +- dex/pair/Cargo.toml | 4 ++-- dex/pair/meta/Cargo.toml | 2 +- dex/pair/wasm-pair-full/Cargo.toml | 2 +- dex/pair/wasm-safe-price-view/Cargo.toml | 2 +- dex/pair/wasm/Cargo.toml | 2 +- dex/price-discovery/Cargo.toml | 6 +++--- dex/price-discovery/meta/Cargo.toml | 2 +- dex/price-discovery/src/redeem_token.rs | 2 +- dex/price-discovery/wasm/Cargo.toml | 2 +- dex/proxy-deployer/Cargo.toml | 4 ++-- dex/proxy-deployer/meta/Cargo.toml | 2 +- dex/proxy-deployer/wasm/Cargo.toml | 2 +- dex/router/Cargo.toml | 4 ++-- dex/router/meta/Cargo.toml | 2 +- dex/router/src/contract.rs | 2 +- dex/router/wasm/Cargo.toml | 2 +- .../common-modules/energy-query/Cargo.toml | 2 +- .../week-timekeeping/Cargo.toml | 2 +- .../weekly-rewards-splitting/Cargo.toml | 2 +- energy-integration/common-types/Cargo.toml | 2 +- .../energy-factory-mock/Cargo.toml | 4 ++-- .../energy-factory-mock/meta/Cargo.toml | 2 +- .../energy-factory-mock/wasm/Cargo.toml | 2 +- energy-integration/energy-update/Cargo.toml | 6 +++--- .../energy-update/meta/Cargo.toml | 2 +- .../energy-update/wasm/Cargo.toml | 2 +- .../farm-boosted-yields/Cargo.toml | 2 +- energy-integration/fees-collector/Cargo.toml | 6 +++--- .../fees-collector/meta/Cargo.toml | 2 +- .../fees-collector/wasm/Cargo.toml | 2 +- energy-integration/governance-v2/Cargo.toml | 20 +++++++++---------- .../governance-v2/meta/Cargo.toml | 2 +- .../governance-v2/wasm/Cargo.toml | 2 +- farm-staking/farm-staking-proxy/Cargo.toml | 6 +++--- .../farm-staking-proxy/meta/Cargo.toml | 2 +- .../src/dual_yield_token.rs | 2 +- .../src/proxy_actions/merge_pos.rs | 2 +- .../farm-staking-proxy/wasm/Cargo.toml | 2 +- farm-staking/farm-staking/Cargo.toml | 6 +++--- farm-staking/farm-staking/meta/Cargo.toml | 2 +- farm-staking/farm-staking/src/stake_farm.rs | 2 +- farm-staking/farm-staking/wasm/Cargo.toml | 2 +- farm-staking/metabonding-staking/Cargo.toml | 6 +++--- .../metabonding-staking/meta/Cargo.toml | 2 +- farm-staking/metabonding-staking/src/lib.rs | 2 +- .../metabonding-staking/wasm/Cargo.toml | 2 +- locked-asset/Cargo.toml | 6 +++--- locked-asset/distribution/Cargo.toml | 4 ++-- locked-asset/distribution/meta/Cargo.toml | 2 +- locked-asset/distribution/wasm/Cargo.toml | 2 +- locked-asset/energy-factory/Cargo.toml | 6 +++--- locked-asset/energy-factory/meta/Cargo.toml | 2 +- locked-asset/energy-factory/wasm/Cargo.toml | 2 +- locked-asset/factory/Cargo.toml | 6 +++--- locked-asset/factory/meta/Cargo.toml | 2 +- locked-asset/factory/src/lib.rs | 2 +- locked-asset/factory/wasm/Cargo.toml | 2 +- locked-asset/lkmex-transfer/Cargo.toml | 7 ++++--- locked-asset/lkmex-transfer/meta/Cargo.toml | 2 +- locked-asset/lkmex-transfer/src/lib.rs | 2 +- locked-asset/lkmex-transfer/wasm/Cargo.toml | 2 +- locked-asset/locked-token-wrapper/Cargo.toml | 6 +++--- .../locked-token-wrapper/meta/Cargo.toml | 2 +- .../locked-token-wrapper/src/wrapped_token.rs | 2 +- .../locked-token-wrapper/wasm/Cargo.toml | 2 +- locked-asset/proxy_dex/Cargo.toml | 6 +++--- locked-asset/proxy_dex/meta/Cargo.toml | 2 +- locked-asset/proxy_dex/src/lib.rs | 4 ++-- locked-asset/proxy_dex/wasm/Cargo.toml | 2 +- locked-asset/simple-lock-whitelist/Cargo.toml | 6 +++--- .../simple-lock-whitelist/meta/Cargo.toml | 2 +- .../simple-lock-whitelist/wasm/Cargo.toml | 2 +- locked-asset/simple-lock/Cargo.toml | 6 +++--- locked-asset/simple-lock/meta/Cargo.toml | 2 +- locked-asset/simple-lock/src/locked_token.rs | 2 +- locked-asset/simple-lock/src/proxy_farm.rs | 4 ++-- locked-asset/simple-lock/src/proxy_lp.rs | 2 +- locked-asset/simple-lock/wasm/Cargo.toml | 2 +- locked-asset/token-unstake/Cargo.toml | 6 +++--- locked-asset/token-unstake/meta/Cargo.toml | 2 +- locked-asset/token-unstake/wasm/Cargo.toml | 2 +- pause-all/Cargo.toml | 6 +++--- pause-all/meta/Cargo.toml | 2 +- pause-all/wasm/Cargo.toml | 2 +- 124 files changed, 191 insertions(+), 188 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 03bc3e07d..dbdd0d3ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,6 @@ [workspace] +resolver = "2" + members = [ "dex", "dex/farm", diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml index c4d256a3c..bdc222367 100644 --- a/common/common_errors/Cargo.toml +++ b/common/common_errors/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml index 98b03285a..cff885fce 100644 --- a/common/common_structs/Cargo.toml +++ b/common/common_structs/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml index 7380edcdc..91de3a378 100644 --- a/common/modules/farm/config/Cargo.toml +++ b/common/modules/farm/config/Cargo.toml @@ -22,5 +22,5 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml index 1fc3a93ed..49f186fba 100644 --- a/common/modules/farm/contexts/Cargo.toml +++ b/common/modules/farm/contexts/Cargo.toml @@ -34,8 +34,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml index 453278dd2..308590817 100644 --- a/common/modules/farm/events/Cargo.toml +++ b/common/modules/farm/events/Cargo.toml @@ -13,5 +13,5 @@ path = "../../../common_structs" path = "../contexts" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/farm_base_impl/Cargo.toml b/common/modules/farm/farm_base_impl/Cargo.toml index db5644507..d06e9c14e 100644 --- a/common/modules/farm/farm_base_impl/Cargo.toml +++ b/common/modules/farm/farm_base_impl/Cargo.toml @@ -49,10 +49,10 @@ path = "../../../traits/mergeable" path = "../../../traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml index 7fc2158cc..31babc159 100644 --- a/common/modules/farm/farm_token/Cargo.toml +++ b/common/modules/farm/farm_token/Cargo.toml @@ -25,8 +25,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" diff --git a/common/modules/farm/farm_token/src/farm_token.rs b/common/modules/farm/farm_token/src/farm_token.rs index 30843ef3d..de3f32d5d 100644 --- a/common/modules/farm/farm_token/src/farm_token.rs +++ b/common/modules/farm/farm_token/src/farm_token.rs @@ -20,7 +20,7 @@ pub trait FarmTokenModule: ) { self.require_caller_has_owner_or_admin_permissions(); - let payment_amount = self.call_value().egld_value(); + let payment_amount = self.call_value().egld_value().clone_value(); self.farm_token().issue_and_set_all_roles( EsdtTokenType::Meta, payment_amount, diff --git a/common/modules/farm/farm_token_merge/Cargo.toml b/common/modules/farm/farm_token_merge/Cargo.toml index e73555fd1..aa54886c4 100644 --- a/common/modules/farm/farm_token_merge/Cargo.toml +++ b/common/modules/farm/farm_token_merge/Cargo.toml @@ -22,8 +22,8 @@ path = "../../token_merge_helper" path = "../farm_token" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml index 57a1fe8de..9f003a58d 100644 --- a/common/modules/farm/rewards/Cargo.toml +++ b/common/modules/farm/rewards/Cargo.toml @@ -28,8 +28,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" diff --git a/common/modules/legacy_token_decode_module/Cargo.toml b/common/modules/legacy_token_decode_module/Cargo.toml index 5f26f6f7b..83d0bf26d 100644 --- a/common/modules/legacy_token_decode_module/Cargo.toml +++ b/common/modules/legacy_token_decode_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/modules/locking_module/Cargo.toml b/common/modules/locking_module/Cargo.toml index b6179493e..5be9a144e 100644 --- a/common/modules/locking_module/Cargo.toml +++ b/common/modules/locking_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.simple-lock] diff --git a/common/modules/math/Cargo.toml b/common/modules/math/Cargo.toml index 4b5883072..29abbd7cf 100644 --- a/common/modules/math/Cargo.toml +++ b/common/modules/math/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/pausable/Cargo.toml b/common/modules/pausable/Cargo.toml index 1f6aa17be..3f5c8259c 100644 --- a/common/modules/pausable/Cargo.toml +++ b/common/modules/pausable/Cargo.toml @@ -10,5 +10,5 @@ path = "src/pausable.rs" path = "../permissions_module" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/permissions_module/Cargo.toml b/common/modules/permissions_module/Cargo.toml index e899bb299..b46cf5c92 100644 --- a/common/modules/permissions_module/Cargo.toml +++ b/common/modules/permissions_module/Cargo.toml @@ -14,5 +14,5 @@ bitflags = "1.3.2" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/sc_whitelist_module/Cargo.toml b/common/modules/sc_whitelist_module/Cargo.toml index 0b3bc696d..037cc7746 100644 --- a/common/modules/sc_whitelist_module/Cargo.toml +++ b/common/modules/sc_whitelist_module/Cargo.toml @@ -10,5 +10,5 @@ path = "src/sc_whitelist_module.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_merge_helper/Cargo.toml b/common/modules/token_merge_helper/Cargo.toml index 2bf0e30e9..37073efc3 100644 --- a/common/modules/token_merge_helper/Cargo.toml +++ b/common/modules/token_merge_helper/Cargo.toml @@ -10,5 +10,5 @@ path = "src/lib.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml index f2aeda9cc..0f81a2d46 100644 --- a/common/modules/token_send/Cargo.toml +++ b/common/modules/token_send/Cargo.toml @@ -13,5 +13,5 @@ path = "../../common_structs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/utils/Cargo.toml b/common/modules/utils/Cargo.toml index 6b821e33e..c36f1bc82 100644 --- a/common/modules/utils/Cargo.toml +++ b/common/modules/utils/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/modules/utils/src/lib.rs b/common/modules/utils/src/lib.rs index 333c3e509..31d384146 100644 --- a/common/modules/utils/src/lib.rs +++ b/common/modules/utils/src/lib.rs @@ -32,7 +32,7 @@ pub trait UtilsModule { let payments = self.call_value().all_esdt_transfers(); require!(!payments.is_empty(), ERR_EMPTY_PAYMENTS); - payments + payments.clone_value() } fn pop_first_payment( diff --git a/common/traits/fixed-supply-token/Cargo.toml b/common/traits/fixed-supply-token/Cargo.toml index 1fe4b6fbc..81ee73396 100644 --- a/common/traits/fixed-supply-token/Cargo.toml +++ b/common/traits/fixed-supply-token/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" diff --git a/common/traits/mergeable/Cargo.toml b/common/traits/mergeable/Cargo.toml index 526ec4e13..68a549515 100644 --- a/common/traits/mergeable/Cargo.toml +++ b/common/traits/mergeable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/traits/unwrappable/Cargo.toml b/common/traits/unwrappable/Cargo.toml index 05a13e631..2d628ded7 100644 --- a/common/traits/unwrappable/Cargo.toml +++ b/common/traits/unwrappable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/dex/Cargo.toml b/dex/Cargo.toml index 25e221076..b78488475 100644 --- a/dex/Cargo.toml +++ b/dex/Cargo.toml @@ -4,17 +4,17 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.config] path = "../common/modules/farm/config" diff --git a/dex/farm-with-locked-rewards/Cargo.toml b/dex/farm-with-locked-rewards/Cargo.toml index 3052499d2..464b2fc85 100644 --- a/dex/farm-with-locked-rewards/Cargo.toml +++ b/dex/farm-with-locked-rewards/Cargo.toml @@ -74,17 +74,17 @@ path = "../../locked-asset/energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.simple-lock] path = "../../locked-asset/simple-lock" diff --git a/dex/farm-with-locked-rewards/meta/Cargo.toml b/dex/farm-with-locked-rewards/meta/Cargo.toml index 5189d15c6..ec1511ff7 100644 --- a/dex/farm-with-locked-rewards/meta/Cargo.toml +++ b/dex/farm-with-locked-rewards/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/farm-with-locked-rewards/src/lib.rs b/dex/farm-with-locked-rewards/src/lib.rs index 0bfbff59b..948ed0739 100644 --- a/dex/farm-with-locked-rewards/src/lib.rs +++ b/dex/farm-with-locked-rewards/src/lib.rs @@ -121,7 +121,7 @@ pub trait Farm: let caller = self.blockchain().get_caller(); let orig_caller = self.get_orig_caller_from_opt(&caller, opt_orig_caller); - let payments = self.call_value().all_esdt_transfers(); + let payments = self.call_value().all_esdt_transfers().clone_value(); let base_claim_rewards_result = self.claim_rewards_base::>(orig_caller.clone(), payments); let output_farm_token_payment = base_claim_rewards_result.new_farm_token.payment.clone(); diff --git a/dex/farm-with-locked-rewards/wasm/Cargo.toml b/dex/farm-with-locked-rewards/wasm/Cargo.toml index 2c92c6c62..917e6e03b 100644 --- a/dex/farm-with-locked-rewards/wasm/Cargo.toml +++ b/dex/farm-with-locked-rewards/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/farm/Cargo.toml b/dex/farm/Cargo.toml index f2cca8bf7..35906d5a9 100644 --- a/dex/farm/Cargo.toml +++ b/dex/farm/Cargo.toml @@ -68,11 +68,11 @@ path = "../../energy-integration/common-modules/weekly-rewards-splitting" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies] num-bigint = "0.4.2" @@ -81,7 +81,7 @@ num-bigint = "0.4.2" path = "../../energy-integration/energy-update" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.energy-factory-mock] path = "../../energy-integration/energy-factory-mock" diff --git a/dex/farm/meta/Cargo.toml b/dex/farm/meta/Cargo.toml index 0829c6199..963df4cd2 100644 --- a/dex/farm/meta/Cargo.toml +++ b/dex/farm/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/farm/src/base_functions.rs b/dex/farm/src/base_functions.rs index 317ae4c1c..719092fc5 100644 --- a/dex/farm/src/base_functions.rs +++ b/dex/farm/src/base_functions.rs @@ -73,7 +73,7 @@ pub trait BaseFunctionsModule: &self, caller: ManagedAddress, ) -> EsdtTokenPayment { - let payments = self.call_value().all_esdt_transfers(); + let payments = self.call_value().all_esdt_transfers().clone_value(); let base_enter_farm_result = self.enter_farm_base::(caller.clone(), payments); self.set_farm_supply_for_current_week( @@ -95,7 +95,7 @@ pub trait BaseFunctionsModule: &self, caller: ManagedAddress, ) -> ClaimRewardsResultWrapper { - let payments = self.call_value().all_esdt_transfers(); + let payments = self.call_value().all_esdt_transfers().clone_value(); let base_claim_rewards_result = self.claim_rewards_base::(caller.clone(), payments); let output_farm_token_payment = base_claim_rewards_result.new_farm_token.payment.clone(); @@ -124,7 +124,7 @@ pub trait BaseFunctionsModule: &self, caller: ManagedAddress, ) -> EsdtTokenPayment { - let payments = self.call_value().all_esdt_transfers(); + let payments = self.call_value().all_esdt_transfers().clone_value(); let base_compound_rewards_result = self.compound_rewards_base::(caller.clone(), payments); diff --git a/dex/farm/wasm/Cargo.toml b/dex/farm/wasm/Cargo.toml index 61e5f6174..c18417cc4 100644 --- a/dex/farm/wasm/Cargo.toml +++ b/dex/farm/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/fuzz/Cargo.toml b/dex/fuzz/Cargo.toml index ba40e32f0..501f7d799 100644 --- a/dex/fuzz/Cargo.toml +++ b/dex/fuzz/Cargo.toml @@ -12,11 +12,11 @@ num-bigint = "0.4.2" rand = "0.8.4" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dependencies.pausable] path = "../../common/modules/pausable" diff --git a/dex/governance/Cargo.toml b/dex/governance/Cargo.toml index 7aeb1b170..6a2e01153 100644 --- a/dex/governance/Cargo.toml +++ b/dex/governance/Cargo.toml @@ -8,14 +8,14 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.pair-mock] path = "../pair-mock" diff --git a/dex/governance/meta/Cargo.toml b/dex/governance/meta/Cargo.toml index 0714371a8..8ce801e04 100644 --- a/dex/governance/meta/Cargo.toml +++ b/dex/governance/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/governance/wasm/Cargo.toml b/dex/governance/wasm/Cargo.toml index 8214f691a..c5841d766 100644 --- a/dex/governance/wasm/Cargo.toml +++ b/dex/governance/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/pair-mock/Cargo.toml b/dex/pair-mock/Cargo.toml index cda7012ec..c58e13485 100644 --- a/dex/pair-mock/Cargo.toml +++ b/dex/pair-mock/Cargo.toml @@ -11,11 +11,11 @@ path = "src/pair.rs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.itertools] version = "0.10.1" default-features = false [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/pair-mock/meta/Cargo.toml b/dex/pair-mock/meta/Cargo.toml index ffee1543e..623b11a01 100644 --- a/dex/pair-mock/meta/Cargo.toml +++ b/dex/pair-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/pair-mock/wasm/Cargo.toml b/dex/pair-mock/wasm/Cargo.toml index feebc28dc..fbee18359 100644 --- a/dex/pair-mock/wasm/Cargo.toml +++ b/dex/pair-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/pair/Cargo.toml b/dex/pair/Cargo.toml index b4ae5976b..28bf69884 100644 --- a/dex/pair/Cargo.toml +++ b/dex/pair/Cargo.toml @@ -33,11 +33,11 @@ version = "0.10.1" default-features = false [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/pair/meta/Cargo.toml b/dex/pair/meta/Cargo.toml index 2c4f80564..9bf1f1f3a 100644 --- a/dex/pair/meta/Cargo.toml +++ b/dex/pair/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/pair/wasm-pair-full/Cargo.toml b/dex/pair/wasm-pair-full/Cargo.toml index 83cc77a50..bdbaa2c0e 100644 --- a/dex/pair/wasm-pair-full/Cargo.toml +++ b/dex/pair/wasm-pair-full/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/pair/wasm-safe-price-view/Cargo.toml b/dex/pair/wasm-safe-price-view/Cargo.toml index 90323de22..7154becef 100644 --- a/dex/pair/wasm-safe-price-view/Cargo.toml +++ b/dex/pair/wasm-safe-price-view/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/pair/wasm/Cargo.toml b/dex/pair/wasm/Cargo.toml index 6ef96197e..7faee9288 100644 --- a/dex/pair/wasm/Cargo.toml +++ b/dex/pair/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/price-discovery/Cargo.toml b/dex/price-discovery/Cargo.toml index 7bf90df61..172709172 100644 --- a/dex/price-discovery/Cargo.toml +++ b/dex/price-discovery/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.locking_module] path = "../../common/modules/locking_module" @@ -30,4 +30,4 @@ hex = "0.4" path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/price-discovery/meta/Cargo.toml b/dex/price-discovery/meta/Cargo.toml index 7ffb188bc..f8ce3fdab 100644 --- a/dex/price-discovery/meta/Cargo.toml +++ b/dex/price-discovery/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/price-discovery/src/redeem_token.rs b/dex/price-discovery/src/redeem_token.rs index 70de40567..e54b091d8 100644 --- a/dex/price-discovery/src/redeem_token.rs +++ b/dex/price-discovery/src/redeem_token.rs @@ -19,7 +19,7 @@ pub trait RedeemTokenModule: token_ticker: ManagedBuffer, nr_decimals: usize, ) { - let payment_amount = self.call_value().egld_value(); + let payment_amount = self.call_value().egld_value().clone_value(); self.redeem_token().issue_and_set_all_roles( EsdtTokenType::Meta, payment_amount, diff --git a/dex/price-discovery/wasm/Cargo.toml b/dex/price-discovery/wasm/Cargo.toml index b706e6a63..a771c6db6 100644 --- a/dex/price-discovery/wasm/Cargo.toml +++ b/dex/price-discovery/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/proxy-deployer/Cargo.toml b/dex/proxy-deployer/Cargo.toml index 60586f00a..b56e2830e 100644 --- a/dex/proxy-deployer/Cargo.toml +++ b/dex/proxy-deployer/Cargo.toml @@ -20,11 +20,11 @@ path = "../../common/modules/farm/config" path = "../../common/modules/farm/farm_token" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/proxy-deployer/meta/Cargo.toml b/dex/proxy-deployer/meta/Cargo.toml index 43004528f..3c1d9eb40 100644 --- a/dex/proxy-deployer/meta/Cargo.toml +++ b/dex/proxy-deployer/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/proxy-deployer/wasm/Cargo.toml b/dex/proxy-deployer/wasm/Cargo.toml index 86fa07458..5c27f6b07 100644 --- a/dex/proxy-deployer/wasm/Cargo.toml +++ b/dex/proxy-deployer/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/router/Cargo.toml b/dex/router/Cargo.toml index 32e19083e..0c4bf33b0 100644 --- a/dex/router/Cargo.toml +++ b/dex/router/Cargo.toml @@ -14,7 +14,7 @@ path = "../../common/modules/token_send" path = "../../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.pair] @@ -26,4 +26,4 @@ path = "../../common/modules/locking_module" [dependencies.simple-lock] path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/dex/router/meta/Cargo.toml b/dex/router/meta/Cargo.toml index 4901db35c..02b87ec1e 100644 --- a/dex/router/meta/Cargo.toml +++ b/dex/router/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/dex/router/src/contract.rs b/dex/router/src/contract.rs index 693c7fe23..8e9f685e5 100644 --- a/dex/router/src/contract.rs +++ b/dex/router/src/contract.rs @@ -190,7 +190,7 @@ pub trait Router: lp_token_display_name: ManagedBuffer, lp_token_ticker: ManagedBuffer, ) { - let issue_cost = self.call_value().egld_value(); + let issue_cost = self.call_value().egld_value().clone_value(); require!(self.is_active(), "Not active"); let caller = self.blockchain().get_caller(); diff --git a/dex/router/wasm/Cargo.toml b/dex/router/wasm/Cargo.toml index 5e1dbd501..91396f80e 100644 --- a/dex/router/wasm/Cargo.toml +++ b/dex/router/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/energy-integration/common-modules/energy-query/Cargo.toml b/energy-integration/common-modules/energy-query/Cargo.toml index 4538084dd..be4cd4ea9 100644 --- a/energy-integration/common-modules/energy-query/Cargo.toml +++ b/energy-integration/common-modules/energy-query/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-factory] diff --git a/energy-integration/common-modules/week-timekeeping/Cargo.toml b/energy-integration/common-modules/week-timekeeping/Cargo.toml index 5572b47c6..590353094 100644 --- a/energy-integration/common-modules/week-timekeeping/Cargo.toml +++ b/energy-integration/common-modules/week-timekeeping/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common-types] diff --git a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml index 17f83c964..cd144a625 100644 --- a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml +++ b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-query] diff --git a/energy-integration/common-types/Cargo.toml b/energy-integration/common-types/Cargo.toml index 11a2466fa..0be3be9d7 100644 --- a/energy-integration/common-types/Cargo.toml +++ b/energy-integration/common-types/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/energy-integration/energy-factory-mock/Cargo.toml b/energy-integration/energy-factory-mock/Cargo.toml index 8af77face..10e878081 100644 --- a/energy-integration/energy-factory-mock/Cargo.toml +++ b/energy-integration/energy-factory-mock/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/energy-integration/energy-factory-mock/meta/Cargo.toml b/energy-integration/energy-factory-mock/meta/Cargo.toml index 194f75d4c..b56977a01 100644 --- a/energy-integration/energy-factory-mock/meta/Cargo.toml +++ b/energy-integration/energy-factory-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/energy-integration/energy-factory-mock/wasm/Cargo.toml b/energy-integration/energy-factory-mock/wasm/Cargo.toml index 3c5feb01a..6bea8b4a1 100644 --- a/energy-integration/energy-factory-mock/wasm/Cargo.toml +++ b/energy-integration/energy-factory-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/energy-integration/energy-update/Cargo.toml b/energy-integration/energy-update/Cargo.toml index 2282d5687..fe655051c 100644 --- a/energy-integration/energy-update/Cargo.toml +++ b/energy-integration/energy-update/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.farm] path = "../../dex/farm" @@ -24,4 +24,4 @@ path = "../common-modules/weekly-rewards-splitting" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/energy-integration/energy-update/meta/Cargo.toml b/energy-integration/energy-update/meta/Cargo.toml index 0a84ae847..f095ce203 100644 --- a/energy-integration/energy-update/meta/Cargo.toml +++ b/energy-integration/energy-update/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/energy-integration/energy-update/wasm/Cargo.toml b/energy-integration/energy-update/wasm/Cargo.toml index 1186d489e..9634dd90e 100644 --- a/energy-integration/energy-update/wasm/Cargo.toml +++ b/energy-integration/energy-update/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/energy-integration/farm-boosted-yields/Cargo.toml b/energy-integration/farm-boosted-yields/Cargo.toml index 19d33b080..a71ef8b6f 100644 --- a/energy-integration/farm-boosted-yields/Cargo.toml +++ b/energy-integration/farm-boosted-yields/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.config] diff --git a/energy-integration/fees-collector/Cargo.toml b/energy-integration/fees-collector/Cargo.toml index 1f260d8f6..43b0f7cba 100644 --- a/energy-integration/fees-collector/Cargo.toml +++ b/energy-integration/fees-collector/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.energy-query] path = "../common-modules/energy-query" @@ -48,7 +48,7 @@ path = "../../common/common_errors" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.sc_whitelist_module] path = "../../common/modules/sc_whitelist_module" diff --git a/energy-integration/fees-collector/meta/Cargo.toml b/energy-integration/fees-collector/meta/Cargo.toml index 2896d634f..26c79443e 100644 --- a/energy-integration/fees-collector/meta/Cargo.toml +++ b/energy-integration/fees-collector/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/energy-integration/fees-collector/wasm/Cargo.toml b/energy-integration/fees-collector/wasm/Cargo.toml index 8ccf99214..232074e58 100644 --- a/energy-integration/fees-collector/wasm/Cargo.toml +++ b/energy-integration/fees-collector/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/energy-integration/governance-v2/Cargo.toml b/energy-integration/governance-v2/Cargo.toml index e1993198d..e82f11542 100644 --- a/energy-integration/governance-v2/Cargo.toml +++ b/energy-integration/governance-v2/Cargo.toml @@ -11,18 +11,9 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] -[dev-dependencies] -num-bigint = "0.4.2" - -[dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" - -[dev-dependencies.energy-factory-mock] -path = "../energy-factory-mock" - [dependencies.permissions_module] path = "../../common/modules/permissions_module" @@ -31,3 +22,12 @@ path = "../fees-collector" [dependencies.weekly-rewards-splitting] path = "../common-modules/weekly-rewards-splitting" + +[dev-dependencies] +num-bigint = "0.4.2" + +[dev-dependencies.multiversx-sc-scenario] +version = "=0.40.0" + +[dev-dependencies.energy-factory-mock] +path = "../energy-factory-mock" diff --git a/energy-integration/governance-v2/meta/Cargo.toml b/energy-integration/governance-v2/meta/Cargo.toml index 2d5c3e77d..8c50d731b 100644 --- a/energy-integration/governance-v2/meta/Cargo.toml +++ b/energy-integration/governance-v2/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/energy-integration/governance-v2/wasm/Cargo.toml b/energy-integration/governance-v2/wasm/Cargo.toml index 9150116ff..78fda0c4a 100644 --- a/energy-integration/governance-v2/wasm/Cargo.toml +++ b/energy-integration/governance-v2/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/farm-staking/farm-staking-proxy/Cargo.toml b/farm-staking/farm-staking-proxy/Cargo.toml index 65b8c1d5f..3060277f7 100644 --- a/farm-staking/farm-staking-proxy/Cargo.toml +++ b/farm-staking/farm-staking-proxy/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.farm] path = "../../dex/farm" @@ -61,7 +61,7 @@ path = "../../common/modules/sc_whitelist_module" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.farm_token] path = "../../common/modules/farm/farm_token" diff --git a/farm-staking/farm-staking-proxy/meta/Cargo.toml b/farm-staking/farm-staking-proxy/meta/Cargo.toml index 093f5cefc..2f50a4dbb 100644 --- a/farm-staking/farm-staking-proxy/meta/Cargo.toml +++ b/farm-staking/farm-staking-proxy/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/farm-staking/farm-staking-proxy/src/dual_yield_token.rs b/farm-staking/farm-staking-proxy/src/dual_yield_token.rs index cb9b5fe73..f1e2eedd0 100644 --- a/farm-staking/farm-staking-proxy/src/dual_yield_token.rs +++ b/farm-staking/farm-staking-proxy/src/dual_yield_token.rs @@ -114,7 +114,7 @@ pub trait DualYieldTokenModule: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let register_cost = self.call_value().egld_value(); + let register_cost = self.call_value().egld_value().clone_value(); self.dual_yield_token().issue_and_set_all_roles( EsdtTokenType::Meta, register_cost, diff --git a/farm-staking/farm-staking-proxy/src/proxy_actions/merge_pos.rs b/farm-staking/farm-staking-proxy/src/proxy_actions/merge_pos.rs index 4a0f89031..84be38ae0 100644 --- a/farm-staking/farm-staking-proxy/src/proxy_actions/merge_pos.rs +++ b/farm-staking/farm-staking-proxy/src/proxy_actions/merge_pos.rs @@ -22,7 +22,7 @@ pub trait ProxyMergePosModule: #[payable("*")] #[endpoint(mergeMetastakingWithStakingToken)] fn merge_metastaking_with_staking_token(&self) -> MergeResult { - let mut payments = self.call_value().all_esdt_transfers(); + let mut payments = self.call_value().all_esdt_transfers().clone_value(); require!( payments.len() >= 2, "Must send metastaking token and at least a staking token" diff --git a/farm-staking/farm-staking-proxy/wasm/Cargo.toml b/farm-staking/farm-staking-proxy/wasm/Cargo.toml index 199cb1c27..d9c188ee1 100644 --- a/farm-staking/farm-staking-proxy/wasm/Cargo.toml +++ b/farm-staking/farm-staking-proxy/wasm/Cargo.toml @@ -22,5 +22,5 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" features = ["vm-validate-token-identifier"] diff --git a/farm-staking/farm-staking/Cargo.toml b/farm-staking/farm-staking/Cargo.toml index d4d155aee..aaac3b278 100644 --- a/farm-staking/farm-staking/Cargo.toml +++ b/farm-staking/farm-staking/Cargo.toml @@ -77,14 +77,14 @@ path = "../../common/common_structs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/farm-staking/farm-staking/meta/Cargo.toml b/farm-staking/farm-staking/meta/Cargo.toml index 5b9131e0c..835ca66ae 100644 --- a/farm-staking/farm-staking/meta/Cargo.toml +++ b/farm-staking/farm-staking/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/farm-staking/farm-staking/src/stake_farm.rs b/farm-staking/farm-staking/src/stake_farm.rs index a50dca4b8..8524a2b4f 100644 --- a/farm-staking/farm-staking/src/stake_farm.rs +++ b/farm-staking/farm-staking/src/stake_farm.rs @@ -46,7 +46,7 @@ pub trait StakeFarmModule: let staked_token_simulated_payment = EsdtTokenPayment::new(staked_token_id, 0, staked_token_amount); - let farm_tokens = self.call_value().all_esdt_transfers(); + let farm_tokens = self.call_value().all_esdt_transfers().clone_value(); let mut payments = ManagedVec::from_single_item(staked_token_simulated_payment); payments.append_vec(farm_tokens); diff --git a/farm-staking/farm-staking/wasm/Cargo.toml b/farm-staking/farm-staking/wasm/Cargo.toml index f8658d344..98e3de41c 100644 --- a/farm-staking/farm-staking/wasm/Cargo.toml +++ b/farm-staking/farm-staking/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/farm-staking/metabonding-staking/Cargo.toml b/farm-staking/metabonding-staking/Cargo.toml index 8ad683d29..253fc8514 100644 --- a/farm-staking/metabonding-staking/Cargo.toml +++ b/farm-staking/metabonding-staking/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.factory] path = "../../locked-asset/factory" @@ -21,7 +21,7 @@ path = "../../locked-asset/factory" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.common_structs] path = "../../common/common_structs" diff --git a/farm-staking/metabonding-staking/meta/Cargo.toml b/farm-staking/metabonding-staking/meta/Cargo.toml index 06c584a9d..a27642b9a 100644 --- a/farm-staking/metabonding-staking/meta/Cargo.toml +++ b/farm-staking/metabonding-staking/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/farm-staking/metabonding-staking/src/lib.rs b/farm-staking/metabonding-staking/src/lib.rs index 9b3387a78..416e8d409 100644 --- a/farm-staking/metabonding-staking/src/lib.rs +++ b/farm-staking/metabonding-staking/src/lib.rs @@ -29,7 +29,7 @@ pub trait MetabondingStaking: #[payable("*")] #[endpoint(stakeLockedAsset)] fn stake_locked_asset(&self) { - let payments = self.call_value().all_esdt_transfers(); + let payments = self.call_value().all_esdt_transfers().clone_value(); self.require_all_locked_asset_payments(&payments); let caller = self.blockchain().get_caller(); diff --git a/farm-staking/metabonding-staking/wasm/Cargo.toml b/farm-staking/metabonding-staking/wasm/Cargo.toml index b979245b8..906c0e566 100644 --- a/farm-staking/metabonding-staking/wasm/Cargo.toml +++ b/farm-staking/metabonding-staking/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/Cargo.toml b/locked-asset/Cargo.toml index 4dd7afd2e..adca36943 100644 --- a/locked-asset/Cargo.toml +++ b/locked-asset/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.farm] @@ -49,7 +49,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/distribution/Cargo.toml b/locked-asset/distribution/Cargo.toml index 991eb324d..805000190 100644 --- a/locked-asset/distribution/Cargo.toml +++ b/locked-asset/distribution/Cargo.toml @@ -13,7 +13,7 @@ path = "../../common/common_structs" path = "../factory" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/distribution/meta/Cargo.toml b/locked-asset/distribution/meta/Cargo.toml index e43a9e44c..7784251a5 100644 --- a/locked-asset/distribution/meta/Cargo.toml +++ b/locked-asset/distribution/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/distribution/wasm/Cargo.toml b/locked-asset/distribution/wasm/Cargo.toml index 616dccf1b..1aec0fabf 100644 --- a/locked-asset/distribution/wasm/Cargo.toml +++ b/locked-asset/distribution/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/energy-factory/Cargo.toml b/locked-asset/energy-factory/Cargo.toml index cad9fd46f..15b13bf36 100644 --- a/locked-asset/energy-factory/Cargo.toml +++ b/locked-asset/energy-factory/Cargo.toml @@ -32,11 +32,11 @@ path = "../../common/traits/unwrappable" path = "../../common/modules/legacy_token_decode_module" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies] num-bigint = "0.4.2" @@ -44,4 +44,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/energy-factory/meta/Cargo.toml b/locked-asset/energy-factory/meta/Cargo.toml index 736f335ed..c12b5726a 100644 --- a/locked-asset/energy-factory/meta/Cargo.toml +++ b/locked-asset/energy-factory/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/energy-factory/wasm/Cargo.toml b/locked-asset/energy-factory/wasm/Cargo.toml index 9e5f2dbc6..e7b0082b5 100644 --- a/locked-asset/energy-factory/wasm/Cargo.toml +++ b/locked-asset/energy-factory/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/factory/Cargo.toml b/locked-asset/factory/Cargo.toml index 80516a5b4..48100dda5 100644 --- a/locked-asset/factory/Cargo.toml +++ b/locked-asset/factory/Cargo.toml @@ -26,11 +26,11 @@ path = "../../common/modules/token_merge_helper" path = "../energy-factory" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.arrayvec] version = "0.7.1" @@ -49,4 +49,4 @@ hex = "0.4" path = "../simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/factory/meta/Cargo.toml b/locked-asset/factory/meta/Cargo.toml index 56dcbd950..7483b7728 100644 --- a/locked-asset/factory/meta/Cargo.toml +++ b/locked-asset/factory/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/factory/src/lib.rs b/locked-asset/factory/src/lib.rs index 893f16624..d4e552905 100644 --- a/locked-asset/factory/src/lib.rs +++ b/locked-asset/factory/src/lib.rs @@ -334,7 +334,7 @@ pub trait LockedAssetFactory: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let payment_amount = self.call_value().egld_value(); + let payment_amount = self.call_value().egld_value().clone_value(); self.locked_asset_token().issue_and_set_all_roles( EsdtTokenType::Meta, payment_amount, diff --git a/locked-asset/factory/wasm/Cargo.toml b/locked-asset/factory/wasm/Cargo.toml index e4b9b3780..b61583c71 100644 --- a/locked-asset/factory/wasm/Cargo.toml +++ b/locked-asset/factory/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/lkmex-transfer/Cargo.toml b/locked-asset/lkmex-transfer/Cargo.toml index 8742e67e8..d39f7629e 100644 --- a/locked-asset/lkmex-transfer/Cargo.toml +++ b/locked-asset/lkmex-transfer/Cargo.toml @@ -15,6 +15,7 @@ path = "../../common/modules/utils" [dependencies.legacy_token_decode_module] path = "../../common/modules/legacy_token_decode_module" + [dependencies.permissions_module] path = "../../common/modules/permissions_module" @@ -28,14 +29,14 @@ path = "../energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/lkmex-transfer/meta/Cargo.toml b/locked-asset/lkmex-transfer/meta/Cargo.toml index 6572c05da..7198cfdfd 100644 --- a/locked-asset/lkmex-transfer/meta/Cargo.toml +++ b/locked-asset/lkmex-transfer/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/lkmex-transfer/src/lib.rs b/locked-asset/lkmex-transfer/src/lib.rs index 993eb4913..f716b55a3 100644 --- a/locked-asset/lkmex-transfer/src/lib.rs +++ b/locked-asset/lkmex-transfer/src/lib.rs @@ -122,7 +122,7 @@ pub trait LkmexTransfer: let sender_last_transfer_mapper = self.sender_last_transfer_epoch(&sender); self.check_address_on_cooldown(&sender_last_transfer_mapper); - let payments = self.call_value().all_esdt_transfers(); + let payments = self.call_value().all_esdt_transfers().clone_value(); let locked_token_id = self.locked_token_id().get(); for payment in payments.iter() { require!( diff --git a/locked-asset/lkmex-transfer/wasm/Cargo.toml b/locked-asset/lkmex-transfer/wasm/Cargo.toml index 7960ec1fc..ef033e2fb 100644 --- a/locked-asset/lkmex-transfer/wasm/Cargo.toml +++ b/locked-asset/lkmex-transfer/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/locked-token-wrapper/Cargo.toml b/locked-asset/locked-token-wrapper/Cargo.toml index cf44d39d6..cbc3eebc2 100644 --- a/locked-asset/locked-token-wrapper/Cargo.toml +++ b/locked-asset/locked-token-wrapper/Cargo.toml @@ -8,10 +8,10 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.utils] path = "../../common/modules/utils" @@ -43,4 +43,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/locked-token-wrapper/meta/Cargo.toml b/locked-asset/locked-token-wrapper/meta/Cargo.toml index 669290a57..dfc90a35a 100644 --- a/locked-asset/locked-token-wrapper/meta/Cargo.toml +++ b/locked-asset/locked-token-wrapper/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/locked-token-wrapper/src/wrapped_token.rs b/locked-asset/locked-token-wrapper/src/wrapped_token.rs index d4ac823c8..ae3fce50a 100644 --- a/locked-asset/locked-token-wrapper/src/wrapped_token.rs +++ b/locked-asset/locked-token-wrapper/src/wrapped_token.rs @@ -24,7 +24,7 @@ pub trait WrappedTokenModule: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let payment_amount = self.call_value().egld_value(); + let payment_amount = self.call_value().egld_value().clone_value(); self.wrapped_token().issue_and_set_all_roles( EsdtTokenType::Meta, diff --git a/locked-asset/locked-token-wrapper/wasm/Cargo.toml b/locked-asset/locked-token-wrapper/wasm/Cargo.toml index 5fb959317..3fb4e5b75 100644 --- a/locked-asset/locked-token-wrapper/wasm/Cargo.toml +++ b/locked-asset/locked-token-wrapper/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/proxy_dex/Cargo.toml b/locked-asset/proxy_dex/Cargo.toml index 5d3be5054..18f8a3ed9 100644 --- a/locked-asset/proxy_dex/Cargo.toml +++ b/locked-asset/proxy_dex/Cargo.toml @@ -44,11 +44,11 @@ path = "../../common/traits/mergeable" path = "../../common/traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.energy-factory] path = "../energy-factory" @@ -65,7 +65,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.pausable] path = "../../common/modules/pausable" diff --git a/locked-asset/proxy_dex/meta/Cargo.toml b/locked-asset/proxy_dex/meta/Cargo.toml index bac44200f..90f1ff8e9 100644 --- a/locked-asset/proxy_dex/meta/Cargo.toml +++ b/locked-asset/proxy_dex/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/proxy_dex/src/lib.rs b/locked-asset/proxy_dex/src/lib.rs index 6dde5c483..e8ff52eec 100644 --- a/locked-asset/proxy_dex/src/lib.rs +++ b/locked-asset/proxy_dex/src/lib.rs @@ -66,7 +66,7 @@ pub trait ProxyDexImpl: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let register_cost = self.call_value().egld_value(); + let register_cost = self.call_value().egld_value().clone_value(); self.wrapped_lp_token().issue_and_set_all_roles( EsdtTokenType::Meta, register_cost, @@ -101,7 +101,7 @@ pub trait ProxyDexImpl: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let register_cost = self.call_value().egld_value(); + let register_cost = self.call_value().egld_value().clone_value(); self.wrapped_farm_token().issue_and_set_all_roles( EsdtTokenType::Meta, register_cost, diff --git a/locked-asset/proxy_dex/wasm/Cargo.toml b/locked-asset/proxy_dex/wasm/Cargo.toml index a2523c980..ba10a9e5d 100644 --- a/locked-asset/proxy_dex/wasm/Cargo.toml +++ b/locked-asset/proxy_dex/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/simple-lock-whitelist/Cargo.toml b/locked-asset/simple-lock-whitelist/Cargo.toml index 75df4276f..f1ffbaac1 100644 --- a/locked-asset/simple-lock-whitelist/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/Cargo.toml @@ -14,11 +14,11 @@ path = "../simple-lock" path = "../../common/modules/utils" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies] num-bigint = "0.4.2" @@ -26,4 +26,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/simple-lock-whitelist/meta/Cargo.toml b/locked-asset/simple-lock-whitelist/meta/Cargo.toml index a55865268..ed59d5578 100644 --- a/locked-asset/simple-lock-whitelist/meta/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml index 97334c70b..76a333844 100644 --- a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/simple-lock/Cargo.toml b/locked-asset/simple-lock/Cargo.toml index 13a7614a3..b86d0091d 100644 --- a/locked-asset/simple-lock/Cargo.toml +++ b/locked-asset/simple-lock/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dependencies.common_structs] path = "../../common/common_structs" @@ -23,4 +23,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/simple-lock/meta/Cargo.toml b/locked-asset/simple-lock/meta/Cargo.toml index 72ac58b6f..2854c8196 100644 --- a/locked-asset/simple-lock/meta/Cargo.toml +++ b/locked-asset/simple-lock/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/simple-lock/src/locked_token.rs b/locked-asset/simple-lock/src/locked_token.rs index 700d81a25..dbb9c1a5d 100644 --- a/locked-asset/simple-lock/src/locked_token.rs +++ b/locked-asset/simple-lock/src/locked_token.rs @@ -62,7 +62,7 @@ pub trait LockedTokenModule: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let payment_amount = self.call_value().egld_value(); + let payment_amount = self.call_value().egld_value().clone_value(); self.locked_token().issue_and_set_all_roles( EsdtTokenType::Meta, diff --git a/locked-asset/simple-lock/src/proxy_farm.rs b/locked-asset/simple-lock/src/proxy_farm.rs index 36692a51a..43ea8b6c8 100644 --- a/locked-asset/simple-lock/src/proxy_farm.rs +++ b/locked-asset/simple-lock/src/proxy_farm.rs @@ -44,7 +44,7 @@ pub trait ProxyFarmModule: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let payment_amount = self.call_value().egld_value(); + let payment_amount = self.call_value().egld_value().clone_value(); self.farm_proxy_token().issue_and_set_all_roles( EsdtTokenType::Meta, @@ -117,7 +117,7 @@ pub trait ProxyFarmModule: farm_type: FarmType, ) -> EnterFarmThroughProxyResultType { let payments: ManagedVec> = - self.call_value().all_esdt_transfers(); + self.call_value().all_esdt_transfers().clone_value(); require!(!payments.is_empty(), NO_PAYMENT_ERR_MSG); let proxy_lp_payment: EsdtTokenPayment = payments.get(0); diff --git a/locked-asset/simple-lock/src/proxy_lp.rs b/locked-asset/simple-lock/src/proxy_lp.rs index ca7a36ba5..9d6e4e599 100644 --- a/locked-asset/simple-lock/src/proxy_lp.rs +++ b/locked-asset/simple-lock/src/proxy_lp.rs @@ -34,7 +34,7 @@ pub trait ProxyLpModule: token_ticker: ManagedBuffer, num_decimals: usize, ) { - let payment_amount = self.call_value().egld_value(); + let payment_amount = self.call_value().egld_value().clone_value(); self.lp_proxy_token().issue_and_set_all_roles( EsdtTokenType::Meta, diff --git a/locked-asset/simple-lock/wasm/Cargo.toml b/locked-asset/simple-lock/wasm/Cargo.toml index 7c877dafc..a3bbc9629 100644 --- a/locked-asset/simple-lock/wasm/Cargo.toml +++ b/locked-asset/simple-lock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/token-unstake/Cargo.toml b/locked-asset/token-unstake/Cargo.toml index 544b7221b..fbdfa52a3 100644 --- a/locked-asset/token-unstake/Cargo.toml +++ b/locked-asset/token-unstake/Cargo.toml @@ -8,7 +8,7 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] @@ -38,7 +38,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" diff --git a/locked-asset/token-unstake/meta/Cargo.toml b/locked-asset/token-unstake/meta/Cargo.toml index f82b14477..45ecf8834 100644 --- a/locked-asset/token-unstake/meta/Cargo.toml +++ b/locked-asset/token-unstake/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/locked-asset/token-unstake/wasm/Cargo.toml b/locked-asset/token-unstake/wasm/Cargo.toml index d27d882ac..661043d39 100644 --- a/locked-asset/token-unstake/wasm/Cargo.toml +++ b/locked-asset/token-unstake/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" diff --git a/pause-all/Cargo.toml b/pause-all/Cargo.toml index 5165b7955..d6166ac49 100644 --- a/pause-all/Cargo.toml +++ b/pause-all/Cargo.toml @@ -11,13 +11,13 @@ path = "src/lib.rs" path = "../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.39.4" +version = "=0.40.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.39.4" +version = "=0.40.0" [dev-dependencies.farm] path = "../dex/farm" diff --git a/pause-all/meta/Cargo.toml b/pause-all/meta/Cargo.toml index 0dafab7fb..4b3b35f59 100644 --- a/pause-all/meta/Cargo.toml +++ b/pause-all/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.39.4" +version = "0.40.0" diff --git a/pause-all/wasm/Cargo.toml b/pause-all/wasm/Cargo.toml index 4e14e45c4..05572907d 100644 --- a/pause-all/wasm/Cargo.toml +++ b/pause-all/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.39.4" +version = "=0.40.0" From 928b77374fc4b858a1b576c01447a5fb72048d05 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 25 Aug 2023 17:07:03 +0300 Subject: [PATCH 2/9] upgrade to framework version 0.41.0 --- common/common_errors/Cargo.toml | 2 +- common/common_structs/Cargo.toml | 2 +- common/modules/farm/config/Cargo.toml | 2 +- common/modules/farm/contexts/Cargo.toml | 4 ++-- common/modules/farm/events/Cargo.toml | 2 +- common/modules/farm/farm_base_impl/Cargo.toml | 6 +++--- common/modules/farm/farm_token/Cargo.toml | 4 ++-- common/modules/farm/farm_token_merge/Cargo.toml | 4 ++-- common/modules/farm/rewards/Cargo.toml | 4 ++-- common/modules/legacy_token_decode_module/Cargo.toml | 2 +- common/modules/locking_module/Cargo.toml | 2 +- common/modules/math/Cargo.toml | 2 +- common/modules/pausable/Cargo.toml | 2 +- common/modules/permissions_module/Cargo.toml | 2 +- common/modules/sc_whitelist_module/Cargo.toml | 2 +- common/modules/token_merge_helper/Cargo.toml | 2 +- common/modules/token_send/Cargo.toml | 2 +- common/modules/utils/Cargo.toml | 2 +- common/traits/fixed-supply-token/Cargo.toml | 2 +- common/traits/mergeable/Cargo.toml | 2 +- common/traits/unwrappable/Cargo.toml | 2 +- dex/Cargo.toml | 6 +++--- dex/farm-with-locked-rewards/Cargo.toml | 6 +++--- dex/farm-with-locked-rewards/meta/Cargo.toml | 2 +- dex/farm-with-locked-rewards/wasm/Cargo.toml | 2 +- dex/farm/Cargo.toml | 6 +++--- dex/farm/meta/Cargo.toml | 2 +- dex/farm/wasm/Cargo.toml | 2 +- dex/fuzz/Cargo.toml | 4 ++-- dex/governance/Cargo.toml | 4 ++-- dex/governance/meta/Cargo.toml | 2 +- dex/governance/wasm/Cargo.toml | 2 +- dex/pair-mock/Cargo.toml | 4 ++-- dex/pair-mock/meta/Cargo.toml | 2 +- dex/pair-mock/wasm/Cargo.toml | 2 +- dex/pair/Cargo.toml | 4 ++-- dex/pair/meta/Cargo.toml | 2 +- dex/pair/wasm-pair-full/Cargo.toml | 2 +- dex/pair/wasm-safe-price-view/Cargo.toml | 2 +- dex/pair/wasm/Cargo.toml | 2 +- dex/price-discovery/Cargo.toml | 6 +++--- dex/price-discovery/meta/Cargo.toml | 2 +- dex/price-discovery/wasm/Cargo.toml | 2 +- dex/proxy-deployer/Cargo.toml | 4 ++-- dex/proxy-deployer/meta/Cargo.toml | 2 +- dex/proxy-deployer/wasm/Cargo.toml | 2 +- dex/router/Cargo.toml | 4 ++-- dex/router/meta/Cargo.toml | 2 +- dex/router/wasm/Cargo.toml | 2 +- energy-integration/common-modules/energy-query/Cargo.toml | 2 +- .../common-modules/week-timekeeping/Cargo.toml | 2 +- .../common-modules/weekly-rewards-splitting/Cargo.toml | 2 +- energy-integration/common-types/Cargo.toml | 2 +- energy-integration/energy-factory-mock/Cargo.toml | 4 ++-- energy-integration/energy-factory-mock/meta/Cargo.toml | 2 +- energy-integration/energy-factory-mock/wasm/Cargo.toml | 2 +- energy-integration/energy-update/Cargo.toml | 6 +++--- energy-integration/energy-update/meta/Cargo.toml | 2 +- energy-integration/energy-update/wasm/Cargo.toml | 2 +- energy-integration/farm-boosted-yields/Cargo.toml | 2 +- energy-integration/fees-collector/Cargo.toml | 6 +++--- energy-integration/fees-collector/meta/Cargo.toml | 2 +- energy-integration/fees-collector/wasm/Cargo.toml | 2 +- energy-integration/governance-v2/Cargo.toml | 4 ++-- energy-integration/governance-v2/meta/Cargo.toml | 2 +- energy-integration/governance-v2/wasm/Cargo.toml | 2 +- farm-staking/farm-staking-proxy/Cargo.toml | 6 +++--- farm-staking/farm-staking-proxy/meta/Cargo.toml | 2 +- farm-staking/farm-staking-proxy/wasm/Cargo.toml | 2 +- farm-staking/farm-staking/Cargo.toml | 6 +++--- farm-staking/farm-staking/meta/Cargo.toml | 2 +- farm-staking/farm-staking/wasm/Cargo.toml | 2 +- farm-staking/metabonding-staking/Cargo.toml | 6 +++--- farm-staking/metabonding-staking/meta/Cargo.toml | 2 +- farm-staking/metabonding-staking/wasm/Cargo.toml | 2 +- locked-asset/Cargo.toml | 6 +++--- locked-asset/distribution/Cargo.toml | 4 ++-- locked-asset/distribution/meta/Cargo.toml | 2 +- locked-asset/distribution/wasm/Cargo.toml | 2 +- locked-asset/energy-factory/Cargo.toml | 6 +++--- locked-asset/energy-factory/meta/Cargo.toml | 2 +- locked-asset/energy-factory/wasm/Cargo.toml | 2 +- locked-asset/factory/Cargo.toml | 6 +++--- locked-asset/factory/meta/Cargo.toml | 2 +- locked-asset/factory/wasm/Cargo.toml | 2 +- locked-asset/lkmex-transfer/Cargo.toml | 6 +++--- locked-asset/lkmex-transfer/meta/Cargo.toml | 2 +- locked-asset/lkmex-transfer/wasm/Cargo.toml | 2 +- locked-asset/locked-token-wrapper/Cargo.toml | 6 +++--- locked-asset/locked-token-wrapper/meta/Cargo.toml | 2 +- locked-asset/locked-token-wrapper/wasm/Cargo.toml | 2 +- locked-asset/proxy_dex/Cargo.toml | 6 +++--- locked-asset/proxy_dex/meta/Cargo.toml | 2 +- locked-asset/proxy_dex/wasm/Cargo.toml | 2 +- locked-asset/simple-lock-whitelist/Cargo.toml | 6 +++--- locked-asset/simple-lock-whitelist/meta/Cargo.toml | 2 +- locked-asset/simple-lock-whitelist/wasm/Cargo.toml | 2 +- locked-asset/simple-lock/Cargo.toml | 6 +++--- locked-asset/simple-lock/meta/Cargo.toml | 2 +- locked-asset/simple-lock/wasm/Cargo.toml | 2 +- locked-asset/token-unstake/Cargo.toml | 6 +++--- locked-asset/token-unstake/meta/Cargo.toml | 2 +- locked-asset/token-unstake/wasm/Cargo.toml | 2 +- pause-all/Cargo.toml | 6 +++--- pause-all/meta/Cargo.toml | 2 +- pause-all/wasm/Cargo.toml | 2 +- 106 files changed, 159 insertions(+), 159 deletions(-) diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml index bdc222367..11defd1d9 100644 --- a/common/common_errors/Cargo.toml +++ b/common/common_errors/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml index cff885fce..cccede402 100644 --- a/common/common_structs/Cargo.toml +++ b/common/common_structs/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml index 91de3a378..0ef973338 100644 --- a/common/modules/farm/config/Cargo.toml +++ b/common/modules/farm/config/Cargo.toml @@ -22,5 +22,5 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml index 49f186fba..c8cb79f1b 100644 --- a/common/modules/farm/contexts/Cargo.toml +++ b/common/modules/farm/contexts/Cargo.toml @@ -34,8 +34,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml index 308590817..2fa7e3a84 100644 --- a/common/modules/farm/events/Cargo.toml +++ b/common/modules/farm/events/Cargo.toml @@ -13,5 +13,5 @@ path = "../../../common_structs" path = "../contexts" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/farm_base_impl/Cargo.toml b/common/modules/farm/farm_base_impl/Cargo.toml index d06e9c14e..9c7f304d3 100644 --- a/common/modules/farm/farm_base_impl/Cargo.toml +++ b/common/modules/farm/farm_base_impl/Cargo.toml @@ -49,10 +49,10 @@ path = "../../../traits/mergeable" path = "../../../traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml index 31babc159..c76da530c 100644 --- a/common/modules/farm/farm_token/Cargo.toml +++ b/common/modules/farm/farm_token/Cargo.toml @@ -25,8 +25,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" diff --git a/common/modules/farm/farm_token_merge/Cargo.toml b/common/modules/farm/farm_token_merge/Cargo.toml index aa54886c4..b791802db 100644 --- a/common/modules/farm/farm_token_merge/Cargo.toml +++ b/common/modules/farm/farm_token_merge/Cargo.toml @@ -22,8 +22,8 @@ path = "../../token_merge_helper" path = "../farm_token" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml index 9f003a58d..47278eaaa 100644 --- a/common/modules/farm/rewards/Cargo.toml +++ b/common/modules/farm/rewards/Cargo.toml @@ -28,8 +28,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" diff --git a/common/modules/legacy_token_decode_module/Cargo.toml b/common/modules/legacy_token_decode_module/Cargo.toml index 83d0bf26d..d0a3c69f8 100644 --- a/common/modules/legacy_token_decode_module/Cargo.toml +++ b/common/modules/legacy_token_decode_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/modules/locking_module/Cargo.toml b/common/modules/locking_module/Cargo.toml index 5be9a144e..5a0615f01 100644 --- a/common/modules/locking_module/Cargo.toml +++ b/common/modules/locking_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.simple-lock] diff --git a/common/modules/math/Cargo.toml b/common/modules/math/Cargo.toml index 29abbd7cf..656647975 100644 --- a/common/modules/math/Cargo.toml +++ b/common/modules/math/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/pausable/Cargo.toml b/common/modules/pausable/Cargo.toml index 3f5c8259c..4424c91d9 100644 --- a/common/modules/pausable/Cargo.toml +++ b/common/modules/pausable/Cargo.toml @@ -10,5 +10,5 @@ path = "src/pausable.rs" path = "../permissions_module" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/permissions_module/Cargo.toml b/common/modules/permissions_module/Cargo.toml index b46cf5c92..7d4b3d79b 100644 --- a/common/modules/permissions_module/Cargo.toml +++ b/common/modules/permissions_module/Cargo.toml @@ -14,5 +14,5 @@ bitflags = "1.3.2" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/sc_whitelist_module/Cargo.toml b/common/modules/sc_whitelist_module/Cargo.toml index 037cc7746..923e9bf7a 100644 --- a/common/modules/sc_whitelist_module/Cargo.toml +++ b/common/modules/sc_whitelist_module/Cargo.toml @@ -10,5 +10,5 @@ path = "src/sc_whitelist_module.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_merge_helper/Cargo.toml b/common/modules/token_merge_helper/Cargo.toml index 37073efc3..85ef46b52 100644 --- a/common/modules/token_merge_helper/Cargo.toml +++ b/common/modules/token_merge_helper/Cargo.toml @@ -10,5 +10,5 @@ path = "src/lib.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml index 0f81a2d46..b765f1352 100644 --- a/common/modules/token_send/Cargo.toml +++ b/common/modules/token_send/Cargo.toml @@ -13,5 +13,5 @@ path = "../../common_structs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/utils/Cargo.toml b/common/modules/utils/Cargo.toml index c36f1bc82..dadbeb561 100644 --- a/common/modules/utils/Cargo.toml +++ b/common/modules/utils/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/traits/fixed-supply-token/Cargo.toml b/common/traits/fixed-supply-token/Cargo.toml index 81ee73396..1cdd1ce39 100644 --- a/common/traits/fixed-supply-token/Cargo.toml +++ b/common/traits/fixed-supply-token/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" diff --git a/common/traits/mergeable/Cargo.toml b/common/traits/mergeable/Cargo.toml index 68a549515..1c9430de7 100644 --- a/common/traits/mergeable/Cargo.toml +++ b/common/traits/mergeable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/traits/unwrappable/Cargo.toml b/common/traits/unwrappable/Cargo.toml index 2d628ded7..b745d0e67 100644 --- a/common/traits/unwrappable/Cargo.toml +++ b/common/traits/unwrappable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/dex/Cargo.toml b/dex/Cargo.toml index b78488475..e36131bd9 100644 --- a/dex/Cargo.toml +++ b/dex/Cargo.toml @@ -4,17 +4,17 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.config] path = "../common/modules/farm/config" diff --git a/dex/farm-with-locked-rewards/Cargo.toml b/dex/farm-with-locked-rewards/Cargo.toml index 464b2fc85..71b2647b6 100644 --- a/dex/farm-with-locked-rewards/Cargo.toml +++ b/dex/farm-with-locked-rewards/Cargo.toml @@ -74,17 +74,17 @@ path = "../../locked-asset/energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.simple-lock] path = "../../locked-asset/simple-lock" diff --git a/dex/farm-with-locked-rewards/meta/Cargo.toml b/dex/farm-with-locked-rewards/meta/Cargo.toml index ec1511ff7..46d2c3d3f 100644 --- a/dex/farm-with-locked-rewards/meta/Cargo.toml +++ b/dex/farm-with-locked-rewards/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/farm-with-locked-rewards/wasm/Cargo.toml b/dex/farm-with-locked-rewards/wasm/Cargo.toml index 917e6e03b..ab0df013e 100644 --- a/dex/farm-with-locked-rewards/wasm/Cargo.toml +++ b/dex/farm-with-locked-rewards/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/farm/Cargo.toml b/dex/farm/Cargo.toml index 35906d5a9..5d119c8fe 100644 --- a/dex/farm/Cargo.toml +++ b/dex/farm/Cargo.toml @@ -68,11 +68,11 @@ path = "../../energy-integration/common-modules/weekly-rewards-splitting" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies] num-bigint = "0.4.2" @@ -81,7 +81,7 @@ num-bigint = "0.4.2" path = "../../energy-integration/energy-update" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.energy-factory-mock] path = "../../energy-integration/energy-factory-mock" diff --git a/dex/farm/meta/Cargo.toml b/dex/farm/meta/Cargo.toml index 963df4cd2..1b158fa11 100644 --- a/dex/farm/meta/Cargo.toml +++ b/dex/farm/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/farm/wasm/Cargo.toml b/dex/farm/wasm/Cargo.toml index c18417cc4..e043258ce 100644 --- a/dex/farm/wasm/Cargo.toml +++ b/dex/farm/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/fuzz/Cargo.toml b/dex/fuzz/Cargo.toml index 501f7d799..71278ce20 100644 --- a/dex/fuzz/Cargo.toml +++ b/dex/fuzz/Cargo.toml @@ -12,11 +12,11 @@ num-bigint = "0.4.2" rand = "0.8.4" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dependencies.pausable] path = "../../common/modules/pausable" diff --git a/dex/governance/Cargo.toml b/dex/governance/Cargo.toml index 6a2e01153..567d8b18e 100644 --- a/dex/governance/Cargo.toml +++ b/dex/governance/Cargo.toml @@ -8,14 +8,14 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.pair-mock] path = "../pair-mock" diff --git a/dex/governance/meta/Cargo.toml b/dex/governance/meta/Cargo.toml index 8ce801e04..280d962bb 100644 --- a/dex/governance/meta/Cargo.toml +++ b/dex/governance/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/governance/wasm/Cargo.toml b/dex/governance/wasm/Cargo.toml index c5841d766..16090dbdc 100644 --- a/dex/governance/wasm/Cargo.toml +++ b/dex/governance/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/pair-mock/Cargo.toml b/dex/pair-mock/Cargo.toml index c58e13485..95229f91c 100644 --- a/dex/pair-mock/Cargo.toml +++ b/dex/pair-mock/Cargo.toml @@ -11,11 +11,11 @@ path = "src/pair.rs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.itertools] version = "0.10.1" default-features = false [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/pair-mock/meta/Cargo.toml b/dex/pair-mock/meta/Cargo.toml index 623b11a01..fcb82cfb9 100644 --- a/dex/pair-mock/meta/Cargo.toml +++ b/dex/pair-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/pair-mock/wasm/Cargo.toml b/dex/pair-mock/wasm/Cargo.toml index fbee18359..c0a0ee702 100644 --- a/dex/pair-mock/wasm/Cargo.toml +++ b/dex/pair-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/pair/Cargo.toml b/dex/pair/Cargo.toml index 28bf69884..e8e5721aa 100644 --- a/dex/pair/Cargo.toml +++ b/dex/pair/Cargo.toml @@ -33,11 +33,11 @@ version = "0.10.1" default-features = false [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/pair/meta/Cargo.toml b/dex/pair/meta/Cargo.toml index 9bf1f1f3a..5c7086200 100644 --- a/dex/pair/meta/Cargo.toml +++ b/dex/pair/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/pair/wasm-pair-full/Cargo.toml b/dex/pair/wasm-pair-full/Cargo.toml index bdbaa2c0e..078063580 100644 --- a/dex/pair/wasm-pair-full/Cargo.toml +++ b/dex/pair/wasm-pair-full/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/pair/wasm-safe-price-view/Cargo.toml b/dex/pair/wasm-safe-price-view/Cargo.toml index 7154becef..6f945e5ad 100644 --- a/dex/pair/wasm-safe-price-view/Cargo.toml +++ b/dex/pair/wasm-safe-price-view/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/pair/wasm/Cargo.toml b/dex/pair/wasm/Cargo.toml index 7faee9288..3752c727c 100644 --- a/dex/pair/wasm/Cargo.toml +++ b/dex/pair/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/price-discovery/Cargo.toml b/dex/price-discovery/Cargo.toml index 172709172..fa03a7b15 100644 --- a/dex/price-discovery/Cargo.toml +++ b/dex/price-discovery/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.locking_module] path = "../../common/modules/locking_module" @@ -30,4 +30,4 @@ hex = "0.4" path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/price-discovery/meta/Cargo.toml b/dex/price-discovery/meta/Cargo.toml index f8ce3fdab..c9abf0455 100644 --- a/dex/price-discovery/meta/Cargo.toml +++ b/dex/price-discovery/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/price-discovery/wasm/Cargo.toml b/dex/price-discovery/wasm/Cargo.toml index a771c6db6..b9febeed9 100644 --- a/dex/price-discovery/wasm/Cargo.toml +++ b/dex/price-discovery/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/proxy-deployer/Cargo.toml b/dex/proxy-deployer/Cargo.toml index b56e2830e..2074d9bdd 100644 --- a/dex/proxy-deployer/Cargo.toml +++ b/dex/proxy-deployer/Cargo.toml @@ -20,11 +20,11 @@ path = "../../common/modules/farm/config" path = "../../common/modules/farm/farm_token" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/proxy-deployer/meta/Cargo.toml b/dex/proxy-deployer/meta/Cargo.toml index 3c1d9eb40..3ee1590b9 100644 --- a/dex/proxy-deployer/meta/Cargo.toml +++ b/dex/proxy-deployer/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/proxy-deployer/wasm/Cargo.toml b/dex/proxy-deployer/wasm/Cargo.toml index 5c27f6b07..4f61b8c73 100644 --- a/dex/proxy-deployer/wasm/Cargo.toml +++ b/dex/proxy-deployer/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/router/Cargo.toml b/dex/router/Cargo.toml index 0c4bf33b0..b23370a09 100644 --- a/dex/router/Cargo.toml +++ b/dex/router/Cargo.toml @@ -14,7 +14,7 @@ path = "../../common/modules/token_send" path = "../../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.pair] @@ -26,4 +26,4 @@ path = "../../common/modules/locking_module" [dependencies.simple-lock] path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/dex/router/meta/Cargo.toml b/dex/router/meta/Cargo.toml index 02b87ec1e..2df7a1a67 100644 --- a/dex/router/meta/Cargo.toml +++ b/dex/router/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/dex/router/wasm/Cargo.toml b/dex/router/wasm/Cargo.toml index 91396f80e..5f4c95d70 100644 --- a/dex/router/wasm/Cargo.toml +++ b/dex/router/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/energy-integration/common-modules/energy-query/Cargo.toml b/energy-integration/common-modules/energy-query/Cargo.toml index be4cd4ea9..f82a69e26 100644 --- a/energy-integration/common-modules/energy-query/Cargo.toml +++ b/energy-integration/common-modules/energy-query/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-factory] diff --git a/energy-integration/common-modules/week-timekeeping/Cargo.toml b/energy-integration/common-modules/week-timekeeping/Cargo.toml index 590353094..c40233221 100644 --- a/energy-integration/common-modules/week-timekeeping/Cargo.toml +++ b/energy-integration/common-modules/week-timekeeping/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common-types] diff --git a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml index cd144a625..8969827f5 100644 --- a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml +++ b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-query] diff --git a/energy-integration/common-types/Cargo.toml b/energy-integration/common-types/Cargo.toml index 0be3be9d7..9f3258892 100644 --- a/energy-integration/common-types/Cargo.toml +++ b/energy-integration/common-types/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/energy-integration/energy-factory-mock/Cargo.toml b/energy-integration/energy-factory-mock/Cargo.toml index 10e878081..7a3f7728f 100644 --- a/energy-integration/energy-factory-mock/Cargo.toml +++ b/energy-integration/energy-factory-mock/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/energy-integration/energy-factory-mock/meta/Cargo.toml b/energy-integration/energy-factory-mock/meta/Cargo.toml index b56977a01..74848b0df 100644 --- a/energy-integration/energy-factory-mock/meta/Cargo.toml +++ b/energy-integration/energy-factory-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/energy-integration/energy-factory-mock/wasm/Cargo.toml b/energy-integration/energy-factory-mock/wasm/Cargo.toml index 6bea8b4a1..99c907c59 100644 --- a/energy-integration/energy-factory-mock/wasm/Cargo.toml +++ b/energy-integration/energy-factory-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/energy-integration/energy-update/Cargo.toml b/energy-integration/energy-update/Cargo.toml index fe655051c..53af90b10 100644 --- a/energy-integration/energy-update/Cargo.toml +++ b/energy-integration/energy-update/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.farm] path = "../../dex/farm" @@ -24,4 +24,4 @@ path = "../common-modules/weekly-rewards-splitting" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/energy-integration/energy-update/meta/Cargo.toml b/energy-integration/energy-update/meta/Cargo.toml index f095ce203..4b238d65d 100644 --- a/energy-integration/energy-update/meta/Cargo.toml +++ b/energy-integration/energy-update/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/energy-integration/energy-update/wasm/Cargo.toml b/energy-integration/energy-update/wasm/Cargo.toml index 9634dd90e..df1055bb7 100644 --- a/energy-integration/energy-update/wasm/Cargo.toml +++ b/energy-integration/energy-update/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/energy-integration/farm-boosted-yields/Cargo.toml b/energy-integration/farm-boosted-yields/Cargo.toml index a71ef8b6f..a093421b9 100644 --- a/energy-integration/farm-boosted-yields/Cargo.toml +++ b/energy-integration/farm-boosted-yields/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.config] diff --git a/energy-integration/fees-collector/Cargo.toml b/energy-integration/fees-collector/Cargo.toml index 43b0f7cba..4252cad97 100644 --- a/energy-integration/fees-collector/Cargo.toml +++ b/energy-integration/fees-collector/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.energy-query] path = "../common-modules/energy-query" @@ -48,7 +48,7 @@ path = "../../common/common_errors" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.sc_whitelist_module] path = "../../common/modules/sc_whitelist_module" diff --git a/energy-integration/fees-collector/meta/Cargo.toml b/energy-integration/fees-collector/meta/Cargo.toml index 26c79443e..0f44601f2 100644 --- a/energy-integration/fees-collector/meta/Cargo.toml +++ b/energy-integration/fees-collector/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/energy-integration/fees-collector/wasm/Cargo.toml b/energy-integration/fees-collector/wasm/Cargo.toml index 232074e58..7382de0f1 100644 --- a/energy-integration/fees-collector/wasm/Cargo.toml +++ b/energy-integration/fees-collector/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/energy-integration/governance-v2/Cargo.toml b/energy-integration/governance-v2/Cargo.toml index e82f11542..23a054917 100644 --- a/energy-integration/governance-v2/Cargo.toml +++ b/energy-integration/governance-v2/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.permissions_module] @@ -27,7 +27,7 @@ path = "../common-modules/weekly-rewards-splitting" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.energy-factory-mock] path = "../energy-factory-mock" diff --git a/energy-integration/governance-v2/meta/Cargo.toml b/energy-integration/governance-v2/meta/Cargo.toml index 8c50d731b..1b3a3d68b 100644 --- a/energy-integration/governance-v2/meta/Cargo.toml +++ b/energy-integration/governance-v2/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/energy-integration/governance-v2/wasm/Cargo.toml b/energy-integration/governance-v2/wasm/Cargo.toml index 78fda0c4a..34f7bde21 100644 --- a/energy-integration/governance-v2/wasm/Cargo.toml +++ b/energy-integration/governance-v2/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/farm-staking/farm-staking-proxy/Cargo.toml b/farm-staking/farm-staking-proxy/Cargo.toml index 3060277f7..d2596d68e 100644 --- a/farm-staking/farm-staking-proxy/Cargo.toml +++ b/farm-staking/farm-staking-proxy/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.farm] path = "../../dex/farm" @@ -61,7 +61,7 @@ path = "../../common/modules/sc_whitelist_module" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.farm_token] path = "../../common/modules/farm/farm_token" diff --git a/farm-staking/farm-staking-proxy/meta/Cargo.toml b/farm-staking/farm-staking-proxy/meta/Cargo.toml index 2f50a4dbb..ae7ccede3 100644 --- a/farm-staking/farm-staking-proxy/meta/Cargo.toml +++ b/farm-staking/farm-staking-proxy/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/farm-staking/farm-staking-proxy/wasm/Cargo.toml b/farm-staking/farm-staking-proxy/wasm/Cargo.toml index d9c188ee1..72cad6257 100644 --- a/farm-staking/farm-staking-proxy/wasm/Cargo.toml +++ b/farm-staking/farm-staking-proxy/wasm/Cargo.toml @@ -22,5 +22,5 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" features = ["vm-validate-token-identifier"] diff --git a/farm-staking/farm-staking/Cargo.toml b/farm-staking/farm-staking/Cargo.toml index aaac3b278..8755cfddd 100644 --- a/farm-staking/farm-staking/Cargo.toml +++ b/farm-staking/farm-staking/Cargo.toml @@ -77,14 +77,14 @@ path = "../../common/common_structs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/farm-staking/farm-staking/meta/Cargo.toml b/farm-staking/farm-staking/meta/Cargo.toml index 835ca66ae..9a9bb3c61 100644 --- a/farm-staking/farm-staking/meta/Cargo.toml +++ b/farm-staking/farm-staking/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/farm-staking/farm-staking/wasm/Cargo.toml b/farm-staking/farm-staking/wasm/Cargo.toml index 98e3de41c..43aa71f48 100644 --- a/farm-staking/farm-staking/wasm/Cargo.toml +++ b/farm-staking/farm-staking/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/farm-staking/metabonding-staking/Cargo.toml b/farm-staking/metabonding-staking/Cargo.toml index 253fc8514..b7bb52cee 100644 --- a/farm-staking/metabonding-staking/Cargo.toml +++ b/farm-staking/metabonding-staking/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.factory] path = "../../locked-asset/factory" @@ -21,7 +21,7 @@ path = "../../locked-asset/factory" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.common_structs] path = "../../common/common_structs" diff --git a/farm-staking/metabonding-staking/meta/Cargo.toml b/farm-staking/metabonding-staking/meta/Cargo.toml index a27642b9a..9848cd72d 100644 --- a/farm-staking/metabonding-staking/meta/Cargo.toml +++ b/farm-staking/metabonding-staking/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/farm-staking/metabonding-staking/wasm/Cargo.toml b/farm-staking/metabonding-staking/wasm/Cargo.toml index 906c0e566..1fae8b4c0 100644 --- a/farm-staking/metabonding-staking/wasm/Cargo.toml +++ b/farm-staking/metabonding-staking/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/Cargo.toml b/locked-asset/Cargo.toml index adca36943..a11a0fa62 100644 --- a/locked-asset/Cargo.toml +++ b/locked-asset/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.farm] @@ -49,7 +49,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/distribution/Cargo.toml b/locked-asset/distribution/Cargo.toml index 805000190..1f202ec0e 100644 --- a/locked-asset/distribution/Cargo.toml +++ b/locked-asset/distribution/Cargo.toml @@ -13,7 +13,7 @@ path = "../../common/common_structs" path = "../factory" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/distribution/meta/Cargo.toml b/locked-asset/distribution/meta/Cargo.toml index 7784251a5..a072c5736 100644 --- a/locked-asset/distribution/meta/Cargo.toml +++ b/locked-asset/distribution/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/distribution/wasm/Cargo.toml b/locked-asset/distribution/wasm/Cargo.toml index 1aec0fabf..6acbac2c9 100644 --- a/locked-asset/distribution/wasm/Cargo.toml +++ b/locked-asset/distribution/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/energy-factory/Cargo.toml b/locked-asset/energy-factory/Cargo.toml index 15b13bf36..46de9581c 100644 --- a/locked-asset/energy-factory/Cargo.toml +++ b/locked-asset/energy-factory/Cargo.toml @@ -32,11 +32,11 @@ path = "../../common/traits/unwrappable" path = "../../common/modules/legacy_token_decode_module" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies] num-bigint = "0.4.2" @@ -44,4 +44,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/energy-factory/meta/Cargo.toml b/locked-asset/energy-factory/meta/Cargo.toml index c12b5726a..50c0431a1 100644 --- a/locked-asset/energy-factory/meta/Cargo.toml +++ b/locked-asset/energy-factory/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/energy-factory/wasm/Cargo.toml b/locked-asset/energy-factory/wasm/Cargo.toml index e7b0082b5..a35ae1bac 100644 --- a/locked-asset/energy-factory/wasm/Cargo.toml +++ b/locked-asset/energy-factory/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/factory/Cargo.toml b/locked-asset/factory/Cargo.toml index 48100dda5..764235d05 100644 --- a/locked-asset/factory/Cargo.toml +++ b/locked-asset/factory/Cargo.toml @@ -26,11 +26,11 @@ path = "../../common/modules/token_merge_helper" path = "../energy-factory" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.arrayvec] version = "0.7.1" @@ -49,4 +49,4 @@ hex = "0.4" path = "../simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/factory/meta/Cargo.toml b/locked-asset/factory/meta/Cargo.toml index 7483b7728..008ea69d4 100644 --- a/locked-asset/factory/meta/Cargo.toml +++ b/locked-asset/factory/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/factory/wasm/Cargo.toml b/locked-asset/factory/wasm/Cargo.toml index b61583c71..2fe668562 100644 --- a/locked-asset/factory/wasm/Cargo.toml +++ b/locked-asset/factory/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/lkmex-transfer/Cargo.toml b/locked-asset/lkmex-transfer/Cargo.toml index d39f7629e..e16312493 100644 --- a/locked-asset/lkmex-transfer/Cargo.toml +++ b/locked-asset/lkmex-transfer/Cargo.toml @@ -29,14 +29,14 @@ path = "../energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/lkmex-transfer/meta/Cargo.toml b/locked-asset/lkmex-transfer/meta/Cargo.toml index 7198cfdfd..72173b3a0 100644 --- a/locked-asset/lkmex-transfer/meta/Cargo.toml +++ b/locked-asset/lkmex-transfer/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/lkmex-transfer/wasm/Cargo.toml b/locked-asset/lkmex-transfer/wasm/Cargo.toml index ef033e2fb..716705c35 100644 --- a/locked-asset/lkmex-transfer/wasm/Cargo.toml +++ b/locked-asset/lkmex-transfer/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/locked-token-wrapper/Cargo.toml b/locked-asset/locked-token-wrapper/Cargo.toml index cbc3eebc2..b1e7a4a15 100644 --- a/locked-asset/locked-token-wrapper/Cargo.toml +++ b/locked-asset/locked-token-wrapper/Cargo.toml @@ -8,10 +8,10 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.utils] path = "../../common/modules/utils" @@ -43,4 +43,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/locked-token-wrapper/meta/Cargo.toml b/locked-asset/locked-token-wrapper/meta/Cargo.toml index dfc90a35a..39e80ce0f 100644 --- a/locked-asset/locked-token-wrapper/meta/Cargo.toml +++ b/locked-asset/locked-token-wrapper/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/locked-token-wrapper/wasm/Cargo.toml b/locked-asset/locked-token-wrapper/wasm/Cargo.toml index 3fb4e5b75..6dd616302 100644 --- a/locked-asset/locked-token-wrapper/wasm/Cargo.toml +++ b/locked-asset/locked-token-wrapper/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/proxy_dex/Cargo.toml b/locked-asset/proxy_dex/Cargo.toml index 18f8a3ed9..14361f041 100644 --- a/locked-asset/proxy_dex/Cargo.toml +++ b/locked-asset/proxy_dex/Cargo.toml @@ -44,11 +44,11 @@ path = "../../common/traits/mergeable" path = "../../common/traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.energy-factory] path = "../energy-factory" @@ -65,7 +65,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.pausable] path = "../../common/modules/pausable" diff --git a/locked-asset/proxy_dex/meta/Cargo.toml b/locked-asset/proxy_dex/meta/Cargo.toml index 90f1ff8e9..6b835d751 100644 --- a/locked-asset/proxy_dex/meta/Cargo.toml +++ b/locked-asset/proxy_dex/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/proxy_dex/wasm/Cargo.toml b/locked-asset/proxy_dex/wasm/Cargo.toml index ba10a9e5d..a36693d1b 100644 --- a/locked-asset/proxy_dex/wasm/Cargo.toml +++ b/locked-asset/proxy_dex/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/simple-lock-whitelist/Cargo.toml b/locked-asset/simple-lock-whitelist/Cargo.toml index f1ffbaac1..5e32fc766 100644 --- a/locked-asset/simple-lock-whitelist/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/Cargo.toml @@ -14,11 +14,11 @@ path = "../simple-lock" path = "../../common/modules/utils" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies] num-bigint = "0.4.2" @@ -26,4 +26,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/simple-lock-whitelist/meta/Cargo.toml b/locked-asset/simple-lock-whitelist/meta/Cargo.toml index ed59d5578..8313a3a25 100644 --- a/locked-asset/simple-lock-whitelist/meta/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml index 76a333844..c40b42eea 100644 --- a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/simple-lock/Cargo.toml b/locked-asset/simple-lock/Cargo.toml index b86d0091d..e001ab642 100644 --- a/locked-asset/simple-lock/Cargo.toml +++ b/locked-asset/simple-lock/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dependencies.common_structs] path = "../../common/common_structs" @@ -23,4 +23,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/simple-lock/meta/Cargo.toml b/locked-asset/simple-lock/meta/Cargo.toml index 2854c8196..567b68d62 100644 --- a/locked-asset/simple-lock/meta/Cargo.toml +++ b/locked-asset/simple-lock/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/simple-lock/wasm/Cargo.toml b/locked-asset/simple-lock/wasm/Cargo.toml index a3bbc9629..cc638384f 100644 --- a/locked-asset/simple-lock/wasm/Cargo.toml +++ b/locked-asset/simple-lock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/token-unstake/Cargo.toml b/locked-asset/token-unstake/Cargo.toml index fbdfa52a3..a81cdc500 100644 --- a/locked-asset/token-unstake/Cargo.toml +++ b/locked-asset/token-unstake/Cargo.toml @@ -8,7 +8,7 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] @@ -38,7 +38,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" diff --git a/locked-asset/token-unstake/meta/Cargo.toml b/locked-asset/token-unstake/meta/Cargo.toml index 45ecf8834..81b241482 100644 --- a/locked-asset/token-unstake/meta/Cargo.toml +++ b/locked-asset/token-unstake/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/locked-asset/token-unstake/wasm/Cargo.toml b/locked-asset/token-unstake/wasm/Cargo.toml index 661043d39..2991c44a3 100644 --- a/locked-asset/token-unstake/wasm/Cargo.toml +++ b/locked-asset/token-unstake/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" diff --git a/pause-all/Cargo.toml b/pause-all/Cargo.toml index d6166ac49..c99ec1a7f 100644 --- a/pause-all/Cargo.toml +++ b/pause-all/Cargo.toml @@ -11,13 +11,13 @@ path = "src/lib.rs" path = "../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.40.0" +version = "=0.41.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.40.0" +version = "=0.41.0" [dev-dependencies.farm] path = "../dex/farm" diff --git a/pause-all/meta/Cargo.toml b/pause-all/meta/Cargo.toml index 4b3b35f59..9a477b7b0 100644 --- a/pause-all/meta/Cargo.toml +++ b/pause-all/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.40.0" +version = "0.41.0" diff --git a/pause-all/wasm/Cargo.toml b/pause-all/wasm/Cargo.toml index 05572907d..09882a081 100644 --- a/pause-all/wasm/Cargo.toml +++ b/pause-all/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.40.0" +version = "=0.41.0" From d123b6bdcce1dddbd452635d955552564879f855 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 25 Aug 2023 17:52:20 +0300 Subject: [PATCH 3/9] github actions update --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index edce63ab7..3404f739e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -20,7 +20,7 @@ permissions: jobs: contracts: name: Contracts - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2 + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.0 with: rust-toolchain: nightly-2023-04-23 vmtools-version: v1.4.60 From a41d0fa52fa7de4481e01a209015917edff9fd26 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 25 Aug 2023 20:03:44 +0300 Subject: [PATCH 4/9] upgrade to framework version 0.42.0 --- common/common_errors/Cargo.toml | 2 +- common/common_structs/Cargo.toml | 2 +- common/modules/farm/config/Cargo.toml | 2 +- common/modules/farm/contexts/Cargo.toml | 4 +- .../contexts/src/claim_rewards_context.rs | 1 + .../farm/contexts/src/exit_farm_context.rs | 1 + common/modules/farm/events/Cargo.toml | 2 +- common/modules/farm/farm_base_impl/Cargo.toml | 6 +- common/modules/farm/farm_token/Cargo.toml | 4 +- .../modules/farm/farm_token_merge/Cargo.toml | 4 +- common/modules/farm/rewards/Cargo.toml | 4 +- .../legacy_token_decode_module/Cargo.toml | 2 +- common/modules/locking_module/Cargo.toml | 2 +- common/modules/math/Cargo.toml | 2 +- common/modules/pausable/Cargo.toml | 2 +- common/modules/permissions_module/Cargo.toml | 2 +- common/modules/sc_whitelist_module/Cargo.toml | 2 +- common/modules/token_merge_helper/Cargo.toml | 2 +- common/modules/token_send/Cargo.toml | 2 +- common/modules/utils/Cargo.toml | 2 +- common/traits/fixed-supply-token/Cargo.toml | 2 +- common/traits/mergeable/Cargo.toml | 2 +- common/traits/unwrappable/Cargo.toml | 2 +- dex/Cargo.toml | 6 +- dex/farm-with-locked-rewards/Cargo.toml | 6 +- dex/farm-with-locked-rewards/meta/Cargo.toml | 2 +- .../farm_with_locked_rewards_setup/mod.rs | 4 +- .../tests/farm_with_locked_rewards_test.rs | 2 + dex/farm-with-locked-rewards/wasm/Cargo.toml | 2 +- dex/farm/Cargo.toml | 6 +- dex/farm/meta/Cargo.toml | 2 +- dex/farm/tests/energy_update_test.rs | 2 + dex/farm/tests/farm_multi_user_test.rs | 2 + .../farm_setup/farm_rewards_distr_setup.rs | 5 +- .../tests/farm_setup/multi_user_farm_setup.rs | 5 +- .../farm_setup/single_user_farm_setup.rs | 5 +- dex/farm/tests/farm_single_user_test.rs | 6 +- dex/farm/wasm/Cargo.toml | 2 +- dex/fuzz/Cargo.toml | 4 +- dex/fuzz/src/fuzz_data.rs | 4 +- dex/fuzz/src/fuzz_factory.rs | 3 +- dex/fuzz/src/fuzz_farm.rs | 3 +- dex/fuzz/src/fuzz_pair.rs | 3 +- dex/fuzz/src/fuzz_price_discovery.rs | 1 + dex/fuzz/src/fuzz_start.rs | 1 + dex/governance/Cargo.toml | 4 +- dex/governance/meta/Cargo.toml | 2 +- dex/governance/src/proposal.rs | 20 +- dex/governance/src/weight.rs | 4 +- dex/governance/tests/gov_tests.rs | 6 +- dex/governance/wasm/Cargo.toml | 2 +- dex/pair-mock/Cargo.toml | 4 +- dex/pair-mock/meta/Cargo.toml | 2 +- dex/pair-mock/wasm/Cargo.toml | 2 +- dex/pair/Cargo.toml | 4 +- dex/pair/meta/Cargo.toml | 2 +- dex/pair/tests/pair_rs_test.rs | 4 +- dex/pair/tests/pair_setup/mod.rs | 4 +- dex/pair/wasm-pair-full/Cargo.toml | 2 +- dex/pair/wasm-safe-price-view/Cargo.toml | 2 +- dex/pair/wasm/Cargo.toml | 2 +- dex/price-discovery/Cargo.toml | 6 +- dex/price-discovery/meta/Cargo.toml | 2 +- dex/price-discovery/tests/price_disc_tests.rs | 2 + dex/price-discovery/tests/tests_common.rs | 6 +- dex/price-discovery/wasm/Cargo.toml | 2 +- dex/proxy-deployer/Cargo.toml | 4 +- dex/proxy-deployer/meta/Cargo.toml | 2 +- dex/proxy-deployer/wasm/Cargo.toml | 2 +- dex/router/Cargo.toml | 4 +- dex/router/meta/Cargo.toml | 2 +- dex/router/tests/router_setup/mod.rs | 6 +- dex/router/tests/router_test.rs | 4 +- dex/router/wasm/Cargo.toml | 2 +- dex/tests/dex_scenario_go_test.rs | 90 ++--- dex/tests/dex_scenario_rs_test.rs | 92 +++-- .../common-modules/energy-query/Cargo.toml | 2 +- .../week-timekeeping/Cargo.toml | 2 +- .../weekly-rewards-splitting/Cargo.toml | 2 +- energy-integration/common-types/Cargo.toml | 2 +- .../energy-factory-mock/Cargo.toml | 4 +- .../energy-factory-mock/meta/Cargo.toml | 2 +- .../energy-factory-mock/wasm/Cargo.toml | 2 +- energy-integration/energy-update/Cargo.toml | 6 +- .../energy-update/meta/Cargo.toml | 2 +- .../energy-update/wasm/Cargo.toml | 2 +- .../farm-boosted-yields/Cargo.toml | 2 +- .../farm-boosted-yields/src/lib.rs | 1 + energy-integration/fees-collector/Cargo.toml | 6 +- .../fees-collector/meta/Cargo.toml | 2 +- .../tests/fees_collector_rust_test.rs | 2 + .../tests/fees_collector_test_setup/mod.rs | 4 +- .../fees-collector/wasm/Cargo.toml | 2 +- energy-integration/governance-v2/Cargo.toml | 4 +- .../governance-v2/meta/Cargo.toml | 2 +- energy-integration/governance-v2/src/lib.rs | 2 +- .../governance-v2/tests/gov_rust_test.rs | 2 + .../governance-v2/tests/gov_test_setup/mod.rs | 6 +- .../governance-v2/wasm/Cargo.toml | 2 +- farm-staking/farm-staking-proxy/Cargo.toml | 6 +- .../farm-staking-proxy/meta/Cargo.toml | 2 +- .../tests/composed_pos_test.rs | 2 + .../tests/staking_farm_with_lp.rs | 2 + .../mod.rs | 6 +- .../mod.rs | 6 +- .../mod.rs | 4 +- .../farm-staking-proxy/wasm/Cargo.toml | 2 +- farm-staking/farm-staking/Cargo.toml | 6 +- farm-staking/farm-staking/meta/Cargo.toml | 2 +- .../tests/farm_staking_energy_test.rs | 2 + .../tests/farm_staking_setup/mod.rs | 6 +- .../farm-staking/tests/farm_staking_test.rs | 4 +- farm-staking/farm-staking/wasm/Cargo.toml | 2 +- farm-staking/metabonding-staking/Cargo.toml | 6 +- .../metabonding-staking/meta/Cargo.toml | 2 +- .../tests/metabonding_staking_setup/mod.rs | 6 +- .../tests/metabonding_staking_test.rs | 4 +- .../metabonding-staking/wasm/Cargo.toml | 2 +- locked-asset/Cargo.toml | 6 +- locked-asset/distribution/Cargo.toml | 4 +- locked-asset/distribution/meta/Cargo.toml | 2 +- locked-asset/distribution/wasm/Cargo.toml | 2 +- locked-asset/energy-factory/Cargo.toml | 6 +- locked-asset/energy-factory/meta/Cargo.toml | 2 +- .../energy-factory/src/token_merging.rs | 2 + .../tests/energy_factory_setup/mod.rs | 5 +- .../energy-factory/tests/old_tokens_test.rs | 2 + .../tests/simple_lock_energy_test.rs | 2 + .../tests/token_merging_test.rs | 5 +- .../energy-factory/tests/virtual_lock_test.rs | 2 + locked-asset/energy-factory/wasm/Cargo.toml | 2 +- locked-asset/factory/Cargo.toml | 6 +- locked-asset/factory/meta/Cargo.toml | 2 +- .../factory/tests/factory_setup/mod.rs | 3 +- locked-asset/factory/tests/lock_test.rs | 4 +- locked-asset/factory/tests/unlock_test.rs | 4 +- locked-asset/factory/wasm/Cargo.toml | 2 +- locked-asset/lkmex-transfer/Cargo.toml | 6 +- locked-asset/lkmex-transfer/meta/Cargo.toml | 2 +- .../tests/lkmex_transfer_tests.rs | 4 +- locked-asset/lkmex-transfer/wasm/Cargo.toml | 2 +- locked-asset/locked-token-wrapper/Cargo.toml | 6 +- .../locked-token-wrapper/meta/Cargo.toml | 2 +- .../tests/locked_token_wrapping_test.rs | 4 +- .../locked-token-wrapper/wasm/Cargo.toml | 2 +- locked-asset/proxy_dex/Cargo.toml | 6 +- locked-asset/proxy_dex/meta/Cargo.toml | 2 +- .../tests/proxy_dex_test_setup/mod.rs | 4 +- .../proxy_dex/tests/proxy_farm_test.rs | 4 +- locked-asset/proxy_dex/tests/proxy_lp_test.rs | 4 +- locked-asset/proxy_dex/wasm/Cargo.toml | 2 +- locked-asset/simple-lock-whitelist/Cargo.toml | 6 +- .../simple-lock-whitelist/meta/Cargo.toml | 2 +- .../tests/whitelist_test.rs | 4 +- .../simple-lock-whitelist/wasm/Cargo.toml | 2 +- locked-asset/simple-lock/Cargo.toml | 6 +- locked-asset/simple-lock/meta/Cargo.toml | 2 +- locked-asset/simple-lock/tests/rust_test.rs | 4 +- locked-asset/simple-lock/wasm/Cargo.toml | 2 +- .../tests/distribution_scenario_go_test.rs | 317 ++++++++++-------- locked-asset/token-unstake/Cargo.toml | 6 +- locked-asset/token-unstake/meta/Cargo.toml | 2 +- .../tests/token_unstake_setup/mod.rs | 5 +- .../token-unstake/tests/token_unstake_test.rs | 2 + .../token-unstake/tests/unlock_early_test.rs | 2 + locked-asset/token-unstake/wasm/Cargo.toml | 2 +- pause-all/Cargo.toml | 6 +- pause-all/meta/Cargo.toml | 2 +- pause-all/tests/pause_all_test.rs | 4 +- pause-all/wasm/Cargo.toml | 2 +- 170 files changed, 592 insertions(+), 458 deletions(-) diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml index 11defd1d9..2ac587ef5 100644 --- a/common/common_errors/Cargo.toml +++ b/common/common_errors/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml index cccede402..b74834ee6 100644 --- a/common/common_structs/Cargo.toml +++ b/common/common_structs/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml index 0ef973338..e8a8d417a 100644 --- a/common/modules/farm/config/Cargo.toml +++ b/common/modules/farm/config/Cargo.toml @@ -22,5 +22,5 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml index c8cb79f1b..bcc6faea2 100644 --- a/common/modules/farm/contexts/Cargo.toml +++ b/common/modules/farm/contexts/Cargo.toml @@ -34,8 +34,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" diff --git a/common/modules/farm/contexts/src/claim_rewards_context.rs b/common/modules/farm/contexts/src/claim_rewards_context.rs index d327156b5..653c6b2e6 100644 --- a/common/modules/farm/contexts/src/claim_rewards_context.rs +++ b/common/modules/farm/contexts/src/claim_rewards_context.rs @@ -3,6 +3,7 @@ multiversx_sc::derive_imports!(); use common_errors::{ERROR_BAD_PAYMENTS, ERROR_EMPTY_PAYMENTS}; use common_structs::PaymentAttributesPair; +use multiversx_sc::api::BlockchainApi; use multiversx_sc::contract_base::BlockchainWrapper; pub struct ClaimRewardsContext diff --git a/common/modules/farm/contexts/src/exit_farm_context.rs b/common/modules/farm/contexts/src/exit_farm_context.rs index b56d88498..98aea1adb 100644 --- a/common/modules/farm/contexts/src/exit_farm_context.rs +++ b/common/modules/farm/contexts/src/exit_farm_context.rs @@ -3,6 +3,7 @@ multiversx_sc::derive_imports!(); use common_errors::ERROR_BAD_PAYMENTS; use common_structs::PaymentAttributesPair; +use multiversx_sc::api::BlockchainApi; use multiversx_sc::contract_base::BlockchainWrapper; pub struct ExitFarmContext diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml index 2fa7e3a84..f6e7008be 100644 --- a/common/modules/farm/events/Cargo.toml +++ b/common/modules/farm/events/Cargo.toml @@ -13,5 +13,5 @@ path = "../../../common_structs" path = "../contexts" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/farm_base_impl/Cargo.toml b/common/modules/farm/farm_base_impl/Cargo.toml index 9c7f304d3..eab9a3ae1 100644 --- a/common/modules/farm/farm_base_impl/Cargo.toml +++ b/common/modules/farm/farm_base_impl/Cargo.toml @@ -49,10 +49,10 @@ path = "../../../traits/mergeable" path = "../../../traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml index c76da530c..eca09fbb1 100644 --- a/common/modules/farm/farm_token/Cargo.toml +++ b/common/modules/farm/farm_token/Cargo.toml @@ -25,8 +25,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" diff --git a/common/modules/farm/farm_token_merge/Cargo.toml b/common/modules/farm/farm_token_merge/Cargo.toml index b791802db..20289e13d 100644 --- a/common/modules/farm/farm_token_merge/Cargo.toml +++ b/common/modules/farm/farm_token_merge/Cargo.toml @@ -22,8 +22,8 @@ path = "../../token_merge_helper" path = "../farm_token" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml index 47278eaaa..e3cbe0419 100644 --- a/common/modules/farm/rewards/Cargo.toml +++ b/common/modules/farm/rewards/Cargo.toml @@ -28,8 +28,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" diff --git a/common/modules/legacy_token_decode_module/Cargo.toml b/common/modules/legacy_token_decode_module/Cargo.toml index d0a3c69f8..a0817d114 100644 --- a/common/modules/legacy_token_decode_module/Cargo.toml +++ b/common/modules/legacy_token_decode_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/modules/locking_module/Cargo.toml b/common/modules/locking_module/Cargo.toml index 5a0615f01..c55b00d69 100644 --- a/common/modules/locking_module/Cargo.toml +++ b/common/modules/locking_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.simple-lock] diff --git a/common/modules/math/Cargo.toml b/common/modules/math/Cargo.toml index 656647975..f0594e357 100644 --- a/common/modules/math/Cargo.toml +++ b/common/modules/math/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/pausable/Cargo.toml b/common/modules/pausable/Cargo.toml index 4424c91d9..0b4300147 100644 --- a/common/modules/pausable/Cargo.toml +++ b/common/modules/pausable/Cargo.toml @@ -10,5 +10,5 @@ path = "src/pausable.rs" path = "../permissions_module" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/permissions_module/Cargo.toml b/common/modules/permissions_module/Cargo.toml index 7d4b3d79b..aa19a0098 100644 --- a/common/modules/permissions_module/Cargo.toml +++ b/common/modules/permissions_module/Cargo.toml @@ -14,5 +14,5 @@ bitflags = "1.3.2" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/sc_whitelist_module/Cargo.toml b/common/modules/sc_whitelist_module/Cargo.toml index 923e9bf7a..f5469987f 100644 --- a/common/modules/sc_whitelist_module/Cargo.toml +++ b/common/modules/sc_whitelist_module/Cargo.toml @@ -10,5 +10,5 @@ path = "src/sc_whitelist_module.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_merge_helper/Cargo.toml b/common/modules/token_merge_helper/Cargo.toml index 85ef46b52..35ba6122f 100644 --- a/common/modules/token_merge_helper/Cargo.toml +++ b/common/modules/token_merge_helper/Cargo.toml @@ -10,5 +10,5 @@ path = "src/lib.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml index b765f1352..f895e3524 100644 --- a/common/modules/token_send/Cargo.toml +++ b/common/modules/token_send/Cargo.toml @@ -13,5 +13,5 @@ path = "../../common_structs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/utils/Cargo.toml b/common/modules/utils/Cargo.toml index dadbeb561..66296dddc 100644 --- a/common/modules/utils/Cargo.toml +++ b/common/modules/utils/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/traits/fixed-supply-token/Cargo.toml b/common/traits/fixed-supply-token/Cargo.toml index 1cdd1ce39..f81b16f66 100644 --- a/common/traits/fixed-supply-token/Cargo.toml +++ b/common/traits/fixed-supply-token/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" diff --git a/common/traits/mergeable/Cargo.toml b/common/traits/mergeable/Cargo.toml index 1c9430de7..c2629c71c 100644 --- a/common/traits/mergeable/Cargo.toml +++ b/common/traits/mergeable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/traits/unwrappable/Cargo.toml b/common/traits/unwrappable/Cargo.toml index b745d0e67..6aff2032c 100644 --- a/common/traits/unwrappable/Cargo.toml +++ b/common/traits/unwrappable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/dex/Cargo.toml b/dex/Cargo.toml index e36131bd9..21226dbaf 100644 --- a/dex/Cargo.toml +++ b/dex/Cargo.toml @@ -4,17 +4,17 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.config] path = "../common/modules/farm/config" diff --git a/dex/farm-with-locked-rewards/Cargo.toml b/dex/farm-with-locked-rewards/Cargo.toml index 71b2647b6..bdbe34677 100644 --- a/dex/farm-with-locked-rewards/Cargo.toml +++ b/dex/farm-with-locked-rewards/Cargo.toml @@ -74,17 +74,17 @@ path = "../../locked-asset/energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.simple-lock] path = "../../locked-asset/simple-lock" diff --git a/dex/farm-with-locked-rewards/meta/Cargo.toml b/dex/farm-with-locked-rewards/meta/Cargo.toml index 46d2c3d3f..ff1dc11ca 100644 --- a/dex/farm-with-locked-rewards/meta/Cargo.toml +++ b/dex/farm-with-locked-rewards/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs index dfccee8b9..b51328190 100644 --- a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs +++ b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use common_structs::FarmTokenAttributes; use config::ConfigModule; use multiversx_sc::{ @@ -7,7 +9,7 @@ use multiversx_sc::{ }; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, rust_biguint, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; diff --git a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_test.rs b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_test.rs index f88ed6774..941c08f8e 100644 --- a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_test.rs +++ b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use common_structs::FarmTokenAttributes; use multiversx_sc_scenario::{managed_address, managed_biguint, rust_biguint, DebugApi}; use simple_lock::locked_token::LockedTokenAttributes; diff --git a/dex/farm-with-locked-rewards/wasm/Cargo.toml b/dex/farm-with-locked-rewards/wasm/Cargo.toml index ab0df013e..56abe71c5 100644 --- a/dex/farm-with-locked-rewards/wasm/Cargo.toml +++ b/dex/farm-with-locked-rewards/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/farm/Cargo.toml b/dex/farm/Cargo.toml index 5d119c8fe..c98bc2e9b 100644 --- a/dex/farm/Cargo.toml +++ b/dex/farm/Cargo.toml @@ -68,11 +68,11 @@ path = "../../energy-integration/common-modules/weekly-rewards-splitting" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies] num-bigint = "0.4.2" @@ -81,7 +81,7 @@ num-bigint = "0.4.2" path = "../../energy-integration/energy-update" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.energy-factory-mock] path = "../../energy-integration/energy-factory-mock" diff --git a/dex/farm/meta/Cargo.toml b/dex/farm/meta/Cargo.toml index 1b158fa11..d546f9321 100644 --- a/dex/farm/meta/Cargo.toml +++ b/dex/farm/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/farm/tests/energy_update_test.rs b/dex/farm/tests/energy_update_test.rs index d8dd4e639..1d8f78a98 100644 --- a/dex/farm/tests/energy_update_test.rs +++ b/dex/farm/tests/energy_update_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod farm_setup; use farm_setup::multi_user_farm_setup::*; diff --git a/dex/farm/tests/farm_multi_user_test.rs b/dex/farm/tests/farm_multi_user_test.rs index 45b388ba0..dcb1dba22 100644 --- a/dex/farm/tests/farm_multi_user_test.rs +++ b/dex/farm/tests/farm_multi_user_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use common_structs::FarmTokenAttributes; use multiversx_sc_scenario::{managed_address, managed_biguint, rust_biguint, DebugApi}; diff --git a/dex/farm/tests/farm_setup/farm_rewards_distr_setup.rs b/dex/farm/tests/farm_setup/farm_rewards_distr_setup.rs index 7b9672d4f..7c610556c 100644 --- a/dex/farm/tests/farm_setup/farm_rewards_distr_setup.rs +++ b/dex/farm/tests/farm_setup/farm_rewards_distr_setup.rs @@ -1,11 +1,12 @@ #![allow(dead_code)] +#![allow(deprecated)] use multiversx_sc::codec::multi_types::OptionalValue; use multiversx_sc::storage::mappers::StorageTokenWrapper; use multiversx_sc::types::{Address, BigUint, EsdtLocalRole, ManagedAddress, MultiValueEncoded}; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::TxTokenTransfer, - whitebox::*, DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, + whitebox_legacy::TxTokenTransfer, whitebox_legacy::*, DebugApi, }; pub type RustBigUint = num_bigint::BigUint; diff --git a/dex/farm/tests/farm_setup/multi_user_farm_setup.rs b/dex/farm/tests/farm_setup/multi_user_farm_setup.rs index aa669401e..00995b692 100644 --- a/dex/farm/tests/farm_setup/multi_user_farm_setup.rs +++ b/dex/farm/tests/farm_setup/multi_user_farm_setup.rs @@ -1,4 +1,5 @@ #![allow(dead_code)] +#![allow(deprecated)] use common_structs::FarmTokenAttributes; use config::ConfigModule; @@ -7,10 +8,10 @@ use multiversx_sc::{ storage::mappers::StorageTokenWrapper, types::{Address, BigInt, EsdtLocalRole, MultiValueEncoded}, }; -use multiversx_sc_scenario::whitebox::TxTokenTransfer; +use multiversx_sc_scenario::whitebox_legacy::TxTokenTransfer; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, rust_biguint, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; diff --git a/dex/farm/tests/farm_setup/single_user_farm_setup.rs b/dex/farm/tests/farm_setup/single_user_farm_setup.rs index 6ec061758..6dd2620e7 100644 --- a/dex/farm/tests/farm_setup/single_user_farm_setup.rs +++ b/dex/farm/tests/farm_setup/single_user_farm_setup.rs @@ -1,12 +1,13 @@ #![allow(dead_code)] +#![allow(deprecated)] use common_structs::FarmTokenAttributes; use multiversx_sc::codec::multi_types::OptionalValue; use multiversx_sc::storage::mappers::StorageTokenWrapper; use multiversx_sc::types::{Address, EsdtLocalRole, ManagedAddress, MultiValueEncoded}; -use multiversx_sc_scenario::whitebox::{TxContextStack, TxTokenTransfer}; +use multiversx_sc_scenario::whitebox_legacy::{TxContextStack, TxTokenTransfer}; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::*, DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::*, DebugApi, }; type RustBigUint = num_bigint::BigUint; diff --git a/dex/farm/tests/farm_single_user_test.rs b/dex/farm/tests/farm_single_user_test.rs index a928eecb6..eb5c9f61c 100644 --- a/dex/farm/tests/farm_single_user_test.rs +++ b/dex/farm/tests/farm_single_user_test.rs @@ -1,11 +1,13 @@ +#![allow(deprecated)] + mod farm_setup; use config::ConfigModule; use farm_setup::single_user_farm_setup::*; use multiversx_sc::types::EsdtLocalRole; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::TxTokenTransfer, - DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, + whitebox_legacy::TxTokenTransfer, DebugApi, }; use sc_whitelist_module::SCWhitelistModule; diff --git a/dex/farm/wasm/Cargo.toml b/dex/farm/wasm/Cargo.toml index e043258ce..6e6c4a5c2 100644 --- a/dex/farm/wasm/Cargo.toml +++ b/dex/farm/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/fuzz/Cargo.toml b/dex/fuzz/Cargo.toml index 71278ce20..0a3647b95 100644 --- a/dex/fuzz/Cargo.toml +++ b/dex/fuzz/Cargo.toml @@ -12,11 +12,11 @@ num-bigint = "0.4.2" rand = "0.8.4" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dependencies.pausable] path = "../../common/modules/pausable" diff --git a/dex/fuzz/src/fuzz_data.rs b/dex/fuzz/src/fuzz_data.rs index a9f19a346..14de4e7c3 100644 --- a/dex/fuzz/src/fuzz_data.rs +++ b/dex/fuzz/src/fuzz_data.rs @@ -1,5 +1,7 @@ #[cfg(test)] pub mod fuzz_data_tests { + #![allow(deprecated)] + multiversx_sc::imports!(); multiversx_sc::derive_imports!(); @@ -14,7 +16,7 @@ pub mod fuzz_data_tests { use multiversx_sc::types::{Address, BigUint, EsdtLocalRole}; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::*, DebugApi, + whitebox_legacy::*, DebugApi, }; use pair::*; use pausable::{PausableModule, State}; diff --git a/dex/fuzz/src/fuzz_factory.rs b/dex/fuzz/src/fuzz_factory.rs index 1aaf848d2..4286c72c7 100644 --- a/dex/fuzz/src/fuzz_factory.rs +++ b/dex/fuzz/src/fuzz_factory.rs @@ -1,10 +1,11 @@ #[cfg(test)] pub mod fuzz_factory_test { + #![allow(deprecated)] multiversx_sc::imports!(); multiversx_sc::derive_imports!(); - use multiversx_sc_scenario::whitebox::TxTokenTransfer; + use multiversx_sc_scenario::whitebox_legacy::TxTokenTransfer; use multiversx_sc_scenario::{rust_biguint, DebugApi}; use crate::fuzz_data::fuzz_data_tests::*; diff --git a/dex/fuzz/src/fuzz_farm.rs b/dex/fuzz/src/fuzz_farm.rs index 6df66416c..1ef8e2463 100644 --- a/dex/fuzz/src/fuzz_farm.rs +++ b/dex/fuzz/src/fuzz_farm.rs @@ -1,12 +1,13 @@ #[cfg(test)] pub mod fuzz_farm_test { + #![allow(deprecated)] multiversx_sc::imports!(); multiversx_sc::derive_imports!(); use std::cmp::Ordering; - use multiversx_sc_scenario::whitebox::TxTokenTransfer; + use multiversx_sc_scenario::whitebox_legacy::TxTokenTransfer; use multiversx_sc_scenario::{managed_biguint, rust_biguint, DebugApi}; use crate::fuzz_data::fuzz_data_tests::*; diff --git a/dex/fuzz/src/fuzz_pair.rs b/dex/fuzz/src/fuzz_pair.rs index 74a326ea0..3ccc5031a 100644 --- a/dex/fuzz/src/fuzz_pair.rs +++ b/dex/fuzz/src/fuzz_pair.rs @@ -1,11 +1,12 @@ #[cfg(test)] pub mod fuzz_pair_test { + #![allow(deprecated)] multiversx_sc::imports!(); multiversx_sc::derive_imports!(); use multiversx_sc_scenario::{ - managed_biguint, managed_token_id, rust_biguint, whitebox::TxTokenTransfer, DebugApi, + managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::TxTokenTransfer, DebugApi, }; use rand::prelude::*; diff --git a/dex/fuzz/src/fuzz_price_discovery.rs b/dex/fuzz/src/fuzz_price_discovery.rs index 45254341b..2b6cd9909 100644 --- a/dex/fuzz/src/fuzz_price_discovery.rs +++ b/dex/fuzz/src/fuzz_price_discovery.rs @@ -1,5 +1,6 @@ #[cfg(test)] pub mod fuzz_price_discovery_test { + #![allow(deprecated)] multiversx_sc::imports!(); multiversx_sc::derive_imports!(); diff --git a/dex/fuzz/src/fuzz_start.rs b/dex/fuzz/src/fuzz_start.rs index 2c673a261..4df24d71a 100644 --- a/dex/fuzz/src/fuzz_start.rs +++ b/dex/fuzz/src/fuzz_start.rs @@ -1,5 +1,6 @@ #[cfg(test)] mod test { + #![allow(deprecated)] multiversx_sc::imports!(); multiversx_sc::derive_imports!(); diff --git a/dex/governance/Cargo.toml b/dex/governance/Cargo.toml index 567d8b18e..3ebc9493d 100644 --- a/dex/governance/Cargo.toml +++ b/dex/governance/Cargo.toml @@ -8,14 +8,14 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.pair-mock] path = "../pair-mock" diff --git a/dex/governance/meta/Cargo.toml b/dex/governance/meta/Cargo.toml index 280d962bb..97ae17c5e 100644 --- a/dex/governance/meta/Cargo.toml +++ b/dex/governance/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/governance/src/proposal.rs b/dex/governance/src/proposal.rs index 7f04c1f2f..3a80c60bd 100644 --- a/dex/governance/src/proposal.rs +++ b/dex/governance/src/proposal.rs @@ -103,12 +103,18 @@ pub trait ProposalHelper: config::Config { } fn execute_action(&self, action: &Action) -> Result<(), &'static [u8]> { - Self::Api::send_api_impl().transfer_value_execute( - &action.dest_address, - &BigUint::zero(), - action.gas_limit, - &action.endpoint_name, - &ManagedArgBuffer::from(action.arguments.clone()), - ) + self.send() + .contract_call::<()>(action.dest_address.clone(), action.endpoint_name.clone()) + .with_raw_arguments(ManagedArgBuffer::from(action.arguments.clone())) + .with_gas_limit(action.gas_limit) + .transfer_execute(); + Result::Ok(()) + // ContractCallNoPayment::new() + // self.send_raw().direct_egld( + // &BigUint::zero(), + // action.gas_limit, + // &action.endpoint_name, + // &ManagedArgBuffer::from(action.arguments.clone()), + // ) } } diff --git a/dex/governance/src/weight.rs b/dex/governance/src/weight.rs index 2eda127a1..07b075f95 100644 --- a/dex/governance/src/weight.rs +++ b/dex/governance/src/weight.rs @@ -27,9 +27,7 @@ pub trait Lib: config::Config { if let Some(provider) = self.price_providers().get(&payment.token_identifier) { let call_result: MultiValue2, EsdtTokenPayment> = self.price_provider_proxy(provider) - .get_tokens_for_given_position_with_safe_price( - payment.amount.clone(), - ) + .get_tokens_for_given_position_with_safe_price(payment.amount.clone()) .execute_on_dest_context(); let (token1, token2) = call_result.into_tuple(); diff --git a/dex/governance/tests/gov_tests.rs b/dex/governance/tests/gov_tests.rs index cbc708798..61dc9c985 100644 --- a/dex/governance/tests/gov_tests.rs +++ b/dex/governance/tests/gov_tests.rs @@ -1,9 +1,11 @@ +#![allow(deprecated)] + use multiversx_sc::codec::multi_types::{MultiValue2, OptionalValue}; use multiversx_sc::types::MultiValueEncoded; use multiversx_sc::types::{Address, EsdtLocalRole, EsdtTokenPayment, ManagedVec}; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_buffer, managed_token_id, rust_biguint, whitebox::*, - DebugApi, + managed_address, managed_biguint, managed_buffer, managed_token_id, rust_biguint, + whitebox_legacy::*, DebugApi, }; use governance::config::*; diff --git a/dex/governance/wasm/Cargo.toml b/dex/governance/wasm/Cargo.toml index 16090dbdc..adb5831a7 100644 --- a/dex/governance/wasm/Cargo.toml +++ b/dex/governance/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/pair-mock/Cargo.toml b/dex/pair-mock/Cargo.toml index 95229f91c..921328f78 100644 --- a/dex/pair-mock/Cargo.toml +++ b/dex/pair-mock/Cargo.toml @@ -11,11 +11,11 @@ path = "src/pair.rs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.itertools] version = "0.10.1" default-features = false [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/pair-mock/meta/Cargo.toml b/dex/pair-mock/meta/Cargo.toml index fcb82cfb9..9e6ec9b08 100644 --- a/dex/pair-mock/meta/Cargo.toml +++ b/dex/pair-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/pair-mock/wasm/Cargo.toml b/dex/pair-mock/wasm/Cargo.toml index c0a0ee702..cf62f1077 100644 --- a/dex/pair-mock/wasm/Cargo.toml +++ b/dex/pair-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/pair/Cargo.toml b/dex/pair/Cargo.toml index e8e5721aa..559184b9d 100644 --- a/dex/pair/Cargo.toml +++ b/dex/pair/Cargo.toml @@ -33,11 +33,11 @@ version = "0.10.1" default-features = false [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/pair/meta/Cargo.toml b/dex/pair/meta/Cargo.toml index 5c7086200..b9869414c 100644 --- a/dex/pair/meta/Cargo.toml +++ b/dex/pair/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/pair/tests/pair_rs_test.rs b/dex/pair/tests/pair_rs_test.rs index 585093667..ea2a2cf52 100644 --- a/dex/pair/tests/pair_rs_test.rs +++ b/dex/pair/tests/pair_rs_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod pair_setup; use fees_collector::{ config::ConfigModule, fees_accumulation::FeesAccumulationModule, FeesCollector, @@ -9,7 +11,7 @@ use multiversx_sc::{ }; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::TxTokenTransfer, DebugApi, + whitebox_legacy::TxTokenTransfer, DebugApi, }; // use pair::safe_price::MAX_OBSERVATIONS; use pair::{config::MAX_PERCENTAGE, fee::FeeModule, locking_wrapper::LockingWrapperModule, Pair}; diff --git a/dex/pair/tests/pair_setup/mod.rs b/dex/pair/tests/pair_setup/mod.rs index 2032efe24..e7311eca5 100644 --- a/dex/pair/tests/pair_setup/mod.rs +++ b/dex/pair/tests/pair_setup/mod.rs @@ -2,9 +2,9 @@ use multiversx_sc::codec::multi_types::MultiValue3; use multiversx_sc::types::{ Address, EsdtLocalRole, EsdtTokenPayment, ManagedAddress, MultiValueEncoded, }; -use multiversx_sc_scenario::whitebox::TxTokenTransfer; +use multiversx_sc_scenario::whitebox_legacy::TxTokenTransfer; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::*, DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::*, DebugApi, }; pub const PAIR_WASM_PATH: &str = "pair/output/pair.wasm"; diff --git a/dex/pair/wasm-pair-full/Cargo.toml b/dex/pair/wasm-pair-full/Cargo.toml index 078063580..ca4c2c82c 100644 --- a/dex/pair/wasm-pair-full/Cargo.toml +++ b/dex/pair/wasm-pair-full/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/pair/wasm-safe-price-view/Cargo.toml b/dex/pair/wasm-safe-price-view/Cargo.toml index 6f945e5ad..9d2719a95 100644 --- a/dex/pair/wasm-safe-price-view/Cargo.toml +++ b/dex/pair/wasm-safe-price-view/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/pair/wasm/Cargo.toml b/dex/pair/wasm/Cargo.toml index 3752c727c..2b6c9c8f5 100644 --- a/dex/pair/wasm/Cargo.toml +++ b/dex/pair/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/price-discovery/Cargo.toml b/dex/price-discovery/Cargo.toml index fa03a7b15..64e827a60 100644 --- a/dex/price-discovery/Cargo.toml +++ b/dex/price-discovery/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.locking_module] path = "../../common/modules/locking_module" @@ -30,4 +30,4 @@ hex = "0.4" path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/price-discovery/meta/Cargo.toml b/dex/price-discovery/meta/Cargo.toml index c9abf0455..4897cfd92 100644 --- a/dex/price-discovery/meta/Cargo.toml +++ b/dex/price-discovery/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/price-discovery/tests/price_disc_tests.rs b/dex/price-discovery/tests/price_disc_tests.rs index 5094c568b..db0905cf8 100644 --- a/dex/price-discovery/tests/price_disc_tests.rs +++ b/dex/price-discovery/tests/price_disc_tests.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use multiversx_sc::codec::Empty; use multiversx_sc_scenario::{managed_biguint, managed_token_id_wrapped}; use multiversx_sc_scenario::{rust_biguint, DebugApi}; diff --git a/dex/price-discovery/tests/tests_common.rs b/dex/price-discovery/tests/tests_common.rs index 788013975..984a7ec0c 100644 --- a/dex/price-discovery/tests/tests_common.rs +++ b/dex/price-discovery/tests/tests_common.rs @@ -1,8 +1,10 @@ +#![allow(deprecated)] + use multiversx_sc::codec::Empty; use multiversx_sc::types::{Address, EsdtLocalRole}; -use multiversx_sc_scenario::whitebox::TxResult; +use multiversx_sc_scenario::whitebox_legacy::TxResult; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id_wrapped, whitebox::*, + managed_address, managed_biguint, managed_token_id_wrapped, whitebox_legacy::*, }; use multiversx_sc_scenario::{managed_token_id, rust_biguint, DebugApi}; diff --git a/dex/price-discovery/wasm/Cargo.toml b/dex/price-discovery/wasm/Cargo.toml index b9febeed9..8fff57628 100644 --- a/dex/price-discovery/wasm/Cargo.toml +++ b/dex/price-discovery/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/proxy-deployer/Cargo.toml b/dex/proxy-deployer/Cargo.toml index 2074d9bdd..7b4123b5a 100644 --- a/dex/proxy-deployer/Cargo.toml +++ b/dex/proxy-deployer/Cargo.toml @@ -20,11 +20,11 @@ path = "../../common/modules/farm/config" path = "../../common/modules/farm/farm_token" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/proxy-deployer/meta/Cargo.toml b/dex/proxy-deployer/meta/Cargo.toml index 3ee1590b9..4ea12f805 100644 --- a/dex/proxy-deployer/meta/Cargo.toml +++ b/dex/proxy-deployer/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/proxy-deployer/wasm/Cargo.toml b/dex/proxy-deployer/wasm/Cargo.toml index 4f61b8c73..c29ba0d40 100644 --- a/dex/proxy-deployer/wasm/Cargo.toml +++ b/dex/proxy-deployer/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/router/Cargo.toml b/dex/router/Cargo.toml index b23370a09..83dc3492a 100644 --- a/dex/router/Cargo.toml +++ b/dex/router/Cargo.toml @@ -14,7 +14,7 @@ path = "../../common/modules/token_send" path = "../../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.pair] @@ -26,4 +26,4 @@ path = "../../common/modules/locking_module" [dependencies.simple-lock] path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/router/meta/Cargo.toml b/dex/router/meta/Cargo.toml index 2df7a1a67..9b71b6e99 100644 --- a/dex/router/meta/Cargo.toml +++ b/dex/router/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/dex/router/tests/router_setup/mod.rs b/dex/router/tests/router_setup/mod.rs index a7cd6c14c..98313d35a 100644 --- a/dex/router/tests/router_setup/mod.rs +++ b/dex/router/tests/router_setup/mod.rs @@ -1,9 +1,9 @@ use multiversx_sc::codec::multi_types::{MultiValue4, OptionalValue}; use multiversx_sc::types::{Address, EsdtLocalRole, ManagedAddress, MultiValueEncoded}; -use multiversx_sc_scenario::whitebox::TxTokenTransfer; +use multiversx_sc_scenario::whitebox_legacy::TxTokenTransfer; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_buffer, managed_token_id, rust_biguint, whitebox::*, - DebugApi, + managed_address, managed_biguint, managed_buffer, managed_token_id, rust_biguint, + whitebox_legacy::*, DebugApi, }; pub const PAIR_WASM_PATH: &str = "pair/output/pair.wasm"; diff --git a/dex/router/tests/router_test.rs b/dex/router/tests/router_test.rs index 2c1803311..3d395316d 100644 --- a/dex/router/tests/router_test.rs +++ b/dex/router/tests/router_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod router_setup; use multiversx_sc::{ codec::multi_types::OptionalValue, @@ -19,7 +21,7 @@ use router_setup::*; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::BlockchainStateWrapper, whitebox::TxTokenTransfer, DebugApi, + whitebox_legacy::BlockchainStateWrapper, whitebox_legacy::TxTokenTransfer, DebugApi, }; use simple_lock::{ locked_token::{LockedTokenAttributes, LockedTokenModule}, diff --git a/dex/router/wasm/Cargo.toml b/dex/router/wasm/Cargo.toml index 5f4c95d70..0256a67b3 100644 --- a/dex/router/wasm/Cargo.toml +++ b/dex/router/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/dex/tests/dex_scenario_go_test.rs b/dex/tests/dex_scenario_go_test.rs index 1bc63e0c1..5675b0a8d 100644 --- a/dex/tests/dex_scenario_go_test.rs +++ b/dex/tests/dex_scenario_go_test.rs @@ -1,203 +1,205 @@ +use multiversx_sc_scenario::*; + +fn world() -> ScenarioWorld { + ScenarioWorld::vm_go() +} + #[test] fn add_liquidity_go() { - multiversx_sc_scenario::run_go("scenarios/add_liquidity.scen.json"); + world().run("scenarios/add_liquidity.scen.json"); } #[test] fn calculate_rewards_for_given_position_go() { - multiversx_sc_scenario::run_go("scenarios/calculate_rewards_for_given_position.scen.json"); + world().run("scenarios/calculate_rewards_for_given_position.scen.json"); } #[test] fn calculate_rewards_for_given_position_after_compound_go() { - multiversx_sc_scenario::run_go( - "scenarios/calculate_rewards_for_given_position_after_compound.scen.json", - ); + world().run("scenarios/calculate_rewards_for_given_position_after_compound.scen.json"); } #[test] fn check_fee_disabled_after_swap_go() { - multiversx_sc_scenario::run_go("scenarios/check_fee_disabled_after_swap.scen.json"); + world().run("scenarios/check_fee_disabled_after_swap.scen.json"); } #[test] fn check_fee_enabled_after_swap_go() { - multiversx_sc_scenario::run_go("scenarios/check_fee_enabled_after_swap.scen.json"); + world().run("scenarios/check_fee_enabled_after_swap.scen.json"); } #[test] fn claim_rewards_go() { - multiversx_sc_scenario::run_go("scenarios/claim_rewards.scen.json"); + world().run("scenarios/claim_rewards.scen.json"); } #[test] fn complete_setup_go() { - multiversx_sc_scenario::run_go("scenarios/complete_setup.scen.json"); + world().run("scenarios/complete_setup.scen.json"); } #[test] fn compound_rewards_go() { - multiversx_sc_scenario::run_go("scenarios/compound_rewards.scen.json"); + world().run("scenarios/compound_rewards.scen.json"); } #[test] fn create_pair_twice_go() { - multiversx_sc_scenario::run_go("scenarios/create_pair_twice.scen.json"); + world().run("scenarios/create_pair_twice.scen.json"); } #[test] fn enter_farm_go() { - multiversx_sc_scenario::run_go("scenarios/enter_farm.scen.json"); + world().run("scenarios/enter_farm.scen.json"); } #[test] fn enter_farm_with_merge_tokens_go() { - multiversx_sc_scenario::run_go("scenarios/enter_farm_with_merge_tokens.scen.json"); + world().run("scenarios/enter_farm_with_merge_tokens.scen.json"); } #[test] fn enter_mex_farm_go() { - multiversx_sc_scenario::run_go("scenarios/enter_mex_farm.scen.json"); + world().run("scenarios/enter_mex_farm.scen.json"); } #[test] fn exit_farm_go() { - multiversx_sc_scenario::run_go("scenarios/exit_farm.scen.json"); + world().run("scenarios/exit_farm.scen.json"); } #[test] fn exit_farm_too_soon_go() { - multiversx_sc_scenario::run_go("scenarios/exit_farm_too_soon.scen.json"); + world().run("scenarios/exit_farm_too_soon.scen.json"); } #[test] fn exit_mex_farm_go() { - multiversx_sc_scenario::run_go("scenarios/exit_mex_farm.scen.json"); + world().run("scenarios/exit_mex_farm.scen.json"); } #[test] fn farm_reward_distr_scen_1_go() { - multiversx_sc_scenario::run_go("scenarios/farm_reward_distr_scen_1.scen.json"); + world().run("scenarios/farm_reward_distr_scen_1.scen.json"); } #[test] fn farm_reward_distr_scen_2_go() { - multiversx_sc_scenario::run_go("scenarios/farm_reward_distr_scen_2.scen.json"); + world().run("scenarios/farm_reward_distr_scen_2.scen.json"); } #[test] fn farm_reward_distr_scen_3_go() { - multiversx_sc_scenario::run_go("scenarios/farm_reward_distr_scen_3.scen.json"); + world().run("scenarios/farm_reward_distr_scen_3.scen.json"); } #[test] fn farm_reward_distr_scen_4_go() { - multiversx_sc_scenario::run_go("scenarios/farm_reward_distr_scen_4.scen.json"); + world().run("scenarios/farm_reward_distr_scen_4.scen.json"); } #[test] fn farm_with_egld_token_go() { - multiversx_sc_scenario::run_go("scenarios/farm_with_egld_token.scen.json"); + world().run("scenarios/farm_with_egld_token.scen.json"); } #[test] fn farm_wrong_lp_token_go() { - multiversx_sc_scenario::run_go("scenarios/farm_wrong_lp_token.scen.json"); + world().run("scenarios/farm_wrong_lp_token.scen.json"); } #[test] fn get_amounts_go() { - multiversx_sc_scenario::run_go("scenarios/get_amounts.scen.json"); + world().run("scenarios/get_amounts.scen.json"); } #[test] fn get_amounts_no_liquidity_go() { - multiversx_sc_scenario::run_go("scenarios/get_amounts_no_liquidity.scen.json"); + world().run("scenarios/get_amounts_no_liquidity.scen.json"); } #[test] fn get_pair_non_existent_go() { - multiversx_sc_scenario::run_go("scenarios/get_pair_non_existent.scen.json"); + world().run("scenarios/get_pair_non_existent.scen.json"); } #[test] fn get_pair_views_go() { - multiversx_sc_scenario::run_go("scenarios/get_pair_views.scen.json"); + world().run("scenarios/get_pair_views.scen.json"); } #[test] fn merge_tokens_go() { - multiversx_sc_scenario::run_go("scenarios/merge_tokens.scen.json"); + world().run("scenarios/merge_tokens.scen.json"); } #[test] fn owner_pause_farm_go() { - multiversx_sc_scenario::run_go("scenarios/owner_pause_farm.scen.json"); + world().run("scenarios/owner_pause_farm.scen.json"); } #[test] fn owner_resume_farm_go() { - multiversx_sc_scenario::run_go("scenarios/owner_resume_farm.scen.json"); + world().run("scenarios/owner_resume_farm.scen.json"); } #[test] fn remove_liquidity_go() { - multiversx_sc_scenario::run_go("scenarios/remove_liquidity.scen.json"); + world().run("scenarios/remove_liquidity.scen.json"); } #[test] fn remove_liquidity_and_buyback_and_burn_token_go() { - multiversx_sc_scenario::run_go( - "scenarios/remove_liquidity_and_buyback_and_burn_token.scen.json", - ); + world().run("scenarios/remove_liquidity_and_buyback_and_burn_token.scen.json"); } #[test] fn remove_liquidity_twice_go() { - multiversx_sc_scenario::run_go("scenarios/remove_liquidity_twice.scen.json"); + world().run("scenarios/remove_liquidity_twice.scen.json"); } #[test] fn remove_pair_go() { - multiversx_sc_scenario::run_go("scenarios/remove_pair.scen.json"); + world().run("scenarios/remove_pair.scen.json"); } #[test] fn router_pause_self_go() { - multiversx_sc_scenario::run_go("scenarios/router_pause_self.scen.json"); + world().run("scenarios/router_pause_self.scen.json"); } #[test] fn router_resume_self_go() { - multiversx_sc_scenario::run_go("scenarios/router_resume_self.scen.json"); + world().run("scenarios/router_resume_self.scen.json"); } #[test] fn swap_fixed_input_go() { - multiversx_sc_scenario::run_go("scenarios/swap_fixed_input.scen.json"); + world().run("scenarios/swap_fixed_input.scen.json"); } #[test] fn swap_fixed_input_after_removed_liquidity_go() { - multiversx_sc_scenario::run_go("scenarios/swap_fixed_input_after_removed_liquidity.scen.json"); + world().run("scenarios/swap_fixed_input_after_removed_liquidity.scen.json"); } #[test] fn swap_fixed_output_go() { - multiversx_sc_scenario::run_go("scenarios/swap_fixed_output.scen.json"); + world().run("scenarios/swap_fixed_output.scen.json"); } #[test] fn swap_same_token_go() { - multiversx_sc_scenario::run_go("scenarios/swap_same_token.scen.json"); + world().run("scenarios/swap_same_token.scen.json"); } #[test] fn swap_wrong_token_go() { - multiversx_sc_scenario::run_go("scenarios/swap_wrong_token.scen.json"); + world().run("scenarios/swap_wrong_token.scen.json"); } #[test] fn upgrade_contract_go() { - multiversx_sc_scenario::run_go("scenarios/upgrade_contract.scen.json"); + world().run("scenarios/upgrade_contract.scen.json"); } diff --git a/dex/tests/dex_scenario_rs_test.rs b/dex/tests/dex_scenario_rs_test.rs index b5124f1d0..623f63667 100644 --- a/dex/tests/dex_scenario_rs_test.rs +++ b/dex/tests/dex_scenario_rs_test.rs @@ -13,212 +13,200 @@ fn world() -> ScenarioWorld { #[test] fn add_liquidity_rs() { - multiversx_sc_scenario::run_rs("scenarios/add_liquidity.scen.json", world()); + world().run("scenarios/add_liquidity.scen.json"); } #[test] fn calculate_rewards_for_given_position_rs() { - multiversx_sc_scenario::run_rs( - "scenarios/calculate_rewards_for_given_position.scen.json", - world(), - ); + world().run("scenarios/calculate_rewards_for_given_position.scen.json"); } #[test] fn calculate_rewards_for_given_position_after_compound_rs() { - multiversx_sc_scenario::run_rs( - "scenarios/calculate_rewards_for_given_position_after_compound.scen.json", - world(), - ); + world().run("scenarios/calculate_rewards_for_given_position_after_compound.scen.json"); } #[test] fn check_fee_disabled_after_swap_rs() { - multiversx_sc_scenario::run_rs("scenarios/check_fee_disabled_after_swap.scen.json", world()); + world().run("scenarios/check_fee_disabled_after_swap.scen.json"); } #[test] fn check_fee_enabled_after_swap_rs() { - multiversx_sc_scenario::run_rs("scenarios/check_fee_enabled_after_swap.scen.json", world()); + world().run("scenarios/check_fee_enabled_after_swap.scen.json"); } #[test] fn claim_rewards_rs() { - multiversx_sc_scenario::run_rs("scenarios/claim_rewards.scen.json", world()); + world().run("scenarios/claim_rewards.scen.json"); } #[test] fn complete_setup_rs() { - multiversx_sc_scenario::run_rs("scenarios/complete_setup.scen.json", world()); + world().run("scenarios/complete_setup.scen.json"); } #[test] fn compound_rewards_rs() { - multiversx_sc_scenario::run_rs("scenarios/compound_rewards.scen.json", world()); + world().run("scenarios/compound_rewards.scen.json"); } #[test] fn create_pair_twice_rs() { - multiversx_sc_scenario::run_rs("scenarios/create_pair_twice.scen.json", world()); + world().run("scenarios/create_pair_twice.scen.json"); } #[test] fn enter_farm_rs() { - multiversx_sc_scenario::run_rs("scenarios/enter_farm.scen.json", world()); + world().run("scenarios/enter_farm.scen.json"); } #[test] fn enter_farm_with_merge_tokens_rs() { - multiversx_sc_scenario::run_rs("scenarios/enter_farm_with_merge_tokens.scen.json", world()); + world().run("scenarios/enter_farm_with_merge_tokens.scen.json"); } #[test] fn enter_mex_farm_rs() { - multiversx_sc_scenario::run_rs("scenarios/enter_mex_farm.scen.json", world()); + world().run("scenarios/enter_mex_farm.scen.json"); } #[test] fn exit_farm_rs() { - multiversx_sc_scenario::run_rs("scenarios/exit_farm.scen.json", world()); + world().run("scenarios/exit_farm.scen.json"); } #[test] fn exit_farm_too_soon_rs() { - multiversx_sc_scenario::run_rs("scenarios/exit_farm_too_soon.scen.json", world()); + world().run("scenarios/exit_farm_too_soon.scen.json"); } #[test] fn exit_mex_farm_rs() { - multiversx_sc_scenario::run_rs("scenarios/exit_mex_farm.scen.json", world()); + world().run("scenarios/exit_mex_farm.scen.json"); } #[test] fn farm_reward_distr_scen_1_rs() { - multiversx_sc_scenario::run_rs("scenarios/farm_reward_distr_scen_1.scen.json", world()); + world().run("scenarios/farm_reward_distr_scen_1.scen.json"); } #[test] fn farm_reward_distr_scen_2_rs() { - multiversx_sc_scenario::run_rs("scenarios/farm_reward_distr_scen_2.scen.json", world()); + world().run("scenarios/farm_reward_distr_scen_2.scen.json"); } #[test] fn farm_reward_distr_scen_3_rs() { - multiversx_sc_scenario::run_rs("scenarios/farm_reward_distr_scen_3.scen.json", world()); + world().run("scenarios/farm_reward_distr_scen_3.scen.json"); } #[test] fn farm_reward_distr_scen_4_rs() { - multiversx_sc_scenario::run_rs("scenarios/farm_reward_distr_scen_4.scen.json", world()); + world().run("scenarios/farm_reward_distr_scen_4.scen.json"); } #[test] fn farm_with_egld_token_rs() { - multiversx_sc_scenario::run_rs("scenarios/farm_with_egld_token.scen.json", world()); + world().run("scenarios/farm_with_egld_token.scen.json"); } #[test] fn farm_wrong_lp_token_rs() { - multiversx_sc_scenario::run_rs("scenarios/farm_wrong_lp_token.scen.json", world()); + world().run("scenarios/farm_wrong_lp_token.scen.json"); } #[test] fn get_amounts_rs() { - multiversx_sc_scenario::run_rs("scenarios/get_amounts.scen.json", world()); + world().run("scenarios/get_amounts.scen.json"); } #[test] fn get_amounts_no_liquidity_rs() { - multiversx_sc_scenario::run_rs("scenarios/get_amounts_no_liquidity.scen.json", world()); + world().run("scenarios/get_amounts_no_liquidity.scen.json"); } #[test] fn get_pair_non_existent_rs() { - multiversx_sc_scenario::run_rs("scenarios/get_pair_non_existent.scen.json", world()); + world().run("scenarios/get_pair_non_existent.scen.json"); } #[test] fn get_pair_views_rs() { - multiversx_sc_scenario::run_rs("scenarios/get_pair_views.scen.json", world()); + world().run("scenarios/get_pair_views.scen.json"); } #[test] fn merge_tokens_rs() { - multiversx_sc_scenario::run_rs("scenarios/merge_tokens.scen.json", world()); + world().run("scenarios/merge_tokens.scen.json"); } #[test] fn owner_pause_farm_rs() { - multiversx_sc_scenario::run_rs("scenarios/owner_pause_farm.scen.json", world()); + world().run("scenarios/owner_pause_farm.scen.json"); } #[test] fn owner_resume_farm_rs() { - multiversx_sc_scenario::run_rs("scenarios/owner_resume_farm.scen.json", world()); + world().run("scenarios/owner_resume_farm.scen.json"); } #[test] fn remove_liquidity_rs() { - multiversx_sc_scenario::run_rs("scenarios/remove_liquidity.scen.json", world()); + world().run("scenarios/remove_liquidity.scen.json"); } #[test] fn remove_liquidity_and_buyback_and_burn_token_rs() { - multiversx_sc_scenario::run_rs( - "scenarios/remove_liquidity_and_buyback_and_burn_token.scen.json", - world(), - ); + world().run("scenarios/remove_liquidity_and_buyback_and_burn_token.scen.json"); } #[test] fn remove_liquidity_twice_rs() { - multiversx_sc_scenario::run_rs("scenarios/remove_liquidity_twice.scen.json", world()); + world().run("scenarios/remove_liquidity_twice.scen.json"); } #[test] fn remove_pair_rs() { - multiversx_sc_scenario::run_rs("scenarios/remove_pair.scen.json", world()); + world().run("scenarios/remove_pair.scen.json"); } #[test] fn router_pause_self_rs() { - multiversx_sc_scenario::run_rs("scenarios/router_pause_self.scen.json", world()); + world().run("scenarios/router_pause_self.scen.json"); } #[test] fn router_resume_self_rs() { - multiversx_sc_scenario::run_rs("scenarios/router_resume_self.scen.json", world()); + world().run("scenarios/router_resume_self.scen.json"); } #[test] fn swap_fixed_input_rs() { - multiversx_sc_scenario::run_rs("scenarios/swap_fixed_input.scen.json", world()); + world().run("scenarios/swap_fixed_input.scen.json"); } #[test] fn swap_fixed_input_after_removed_liquidity_rs() { - multiversx_sc_scenario::run_rs( - "scenarios/swap_fixed_input_after_removed_liquidity.scen.json", - world(), - ); + world().run("scenarios/swap_fixed_input_after_removed_liquidity.scen.json"); } #[test] fn swap_fixed_output_rs() { - multiversx_sc_scenario::run_rs("scenarios/swap_fixed_output.scen.json", world()); + world().run("scenarios/swap_fixed_output.scen.json"); } #[test] fn swap_same_token_rs() { - multiversx_sc_scenario::run_rs("scenarios/swap_same_token.scen.json", world()); + world().run("scenarios/swap_same_token.scen.json"); } #[test] fn swap_wrong_token_rs() { - multiversx_sc_scenario::run_rs("scenarios/swap_wrong_token.scen.json", world()); + world().run("scenarios/swap_wrong_token.scen.json"); } #[test] fn upgrade_contract_rs() { - multiversx_sc_scenario::run_rs("scenarios/upgrade_contract.scen.json", world()); + world().run("scenarios/upgrade_contract.scen.json"); } diff --git a/energy-integration/common-modules/energy-query/Cargo.toml b/energy-integration/common-modules/energy-query/Cargo.toml index f82a69e26..fa86ab377 100644 --- a/energy-integration/common-modules/energy-query/Cargo.toml +++ b/energy-integration/common-modules/energy-query/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-factory] diff --git a/energy-integration/common-modules/week-timekeeping/Cargo.toml b/energy-integration/common-modules/week-timekeeping/Cargo.toml index c40233221..08a32ef44 100644 --- a/energy-integration/common-modules/week-timekeeping/Cargo.toml +++ b/energy-integration/common-modules/week-timekeeping/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.common-types] diff --git a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml index 8969827f5..fb0f0c2dc 100644 --- a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml +++ b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-query] diff --git a/energy-integration/common-types/Cargo.toml b/energy-integration/common-types/Cargo.toml index 9f3258892..ecb8bb89d 100644 --- a/energy-integration/common-types/Cargo.toml +++ b/energy-integration/common-types/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] diff --git a/energy-integration/energy-factory-mock/Cargo.toml b/energy-integration/energy-factory-mock/Cargo.toml index 7a3f7728f..95588ec75 100644 --- a/energy-integration/energy-factory-mock/Cargo.toml +++ b/energy-integration/energy-factory-mock/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/energy-integration/energy-factory-mock/meta/Cargo.toml b/energy-integration/energy-factory-mock/meta/Cargo.toml index 74848b0df..2875e2307 100644 --- a/energy-integration/energy-factory-mock/meta/Cargo.toml +++ b/energy-integration/energy-factory-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/energy-integration/energy-factory-mock/wasm/Cargo.toml b/energy-integration/energy-factory-mock/wasm/Cargo.toml index 99c907c59..59674aaef 100644 --- a/energy-integration/energy-factory-mock/wasm/Cargo.toml +++ b/energy-integration/energy-factory-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/energy-integration/energy-update/Cargo.toml b/energy-integration/energy-update/Cargo.toml index 53af90b10..9855a3bd5 100644 --- a/energy-integration/energy-update/Cargo.toml +++ b/energy-integration/energy-update/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.farm] path = "../../dex/farm" @@ -24,4 +24,4 @@ path = "../common-modules/weekly-rewards-splitting" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/energy-integration/energy-update/meta/Cargo.toml b/energy-integration/energy-update/meta/Cargo.toml index 4b238d65d..6ba2d63b1 100644 --- a/energy-integration/energy-update/meta/Cargo.toml +++ b/energy-integration/energy-update/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/energy-integration/energy-update/wasm/Cargo.toml b/energy-integration/energy-update/wasm/Cargo.toml index df1055bb7..4bc2db79c 100644 --- a/energy-integration/energy-update/wasm/Cargo.toml +++ b/energy-integration/energy-update/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/energy-integration/farm-boosted-yields/Cargo.toml b/energy-integration/farm-boosted-yields/Cargo.toml index a093421b9..51a690e35 100644 --- a/energy-integration/farm-boosted-yields/Cargo.toml +++ b/energy-integration/farm-boosted-yields/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.config] diff --git a/energy-integration/farm-boosted-yields/src/lib.rs b/energy-integration/farm-boosted-yields/src/lib.rs index e9b38e526..fc441b515 100644 --- a/energy-integration/farm-boosted-yields/src/lib.rs +++ b/energy-integration/farm-boosted-yields/src/lib.rs @@ -6,6 +6,7 @@ use core::cmp; use boosted_yields_factors::BoostedYieldsConfig; use common_types::PaymentsVec; +use multiversx_sc::api::ErrorApi; use week_timekeeping::Week; use weekly_rewards_splitting::{ base_impl::WeeklyRewardsSplittingTraitsModule, USER_MAX_CLAIM_WEEKS, diff --git a/energy-integration/fees-collector/Cargo.toml b/energy-integration/fees-collector/Cargo.toml index 4252cad97..c77e3e03b 100644 --- a/energy-integration/fees-collector/Cargo.toml +++ b/energy-integration/fees-collector/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.energy-query] path = "../common-modules/energy-query" @@ -48,7 +48,7 @@ path = "../../common/common_errors" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.sc_whitelist_module] path = "../../common/modules/sc_whitelist_module" diff --git a/energy-integration/fees-collector/meta/Cargo.toml b/energy-integration/fees-collector/meta/Cargo.toml index 0f44601f2..c050057c7 100644 --- a/energy-integration/fees-collector/meta/Cargo.toml +++ b/energy-integration/fees-collector/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/energy-integration/fees-collector/tests/fees_collector_rust_test.rs b/energy-integration/fees-collector/tests/fees_collector_rust_test.rs index c840080e5..30a8d56b2 100644 --- a/energy-integration/fees-collector/tests/fees_collector_rust_test.rs +++ b/energy-integration/fees-collector/tests/fees_collector_rust_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod fees_collector_test_setup; use energy_query::Energy; diff --git a/energy-integration/fees-collector/tests/fees_collector_test_setup/mod.rs b/energy-integration/fees-collector/tests/fees_collector_test_setup/mod.rs index e3524ce65..e5d5baaca 100644 --- a/energy-integration/fees-collector/tests/fees_collector_test_setup/mod.rs +++ b/energy-integration/fees-collector/tests/fees_collector_test_setup/mod.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use multiversx_sc::{ codec::multi_types::OptionalValue, storage::mappers::StorageTokenWrapper, @@ -5,7 +7,7 @@ use multiversx_sc::{ }; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::TxResult, whitebox::*, DebugApi, + whitebox_legacy::TxResult, whitebox_legacy::*, DebugApi, }; use energy_factory::{energy::EnergyModule, SimpleLockEnergy}; diff --git a/energy-integration/fees-collector/wasm/Cargo.toml b/energy-integration/fees-collector/wasm/Cargo.toml index 7382de0f1..c394f7c6d 100644 --- a/energy-integration/fees-collector/wasm/Cargo.toml +++ b/energy-integration/fees-collector/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/energy-integration/governance-v2/Cargo.toml b/energy-integration/governance-v2/Cargo.toml index 23a054917..4dc4d683f 100644 --- a/energy-integration/governance-v2/Cargo.toml +++ b/energy-integration/governance-v2/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.permissions_module] @@ -27,7 +27,7 @@ path = "../common-modules/weekly-rewards-splitting" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.energy-factory-mock] path = "../energy-factory-mock" diff --git a/energy-integration/governance-v2/meta/Cargo.toml b/energy-integration/governance-v2/meta/Cargo.toml index 1b3a3d68b..1e2c7b5ac 100644 --- a/energy-integration/governance-v2/meta/Cargo.toml +++ b/energy-integration/governance-v2/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/energy-integration/governance-v2/src/lib.rs b/energy-integration/governance-v2/src/lib.rs index 584d43008..e2b27e5c6 100644 --- a/energy-integration/governance-v2/src/lib.rs +++ b/energy-integration/governance-v2/src/lib.rs @@ -37,7 +37,7 @@ pub trait GovernanceV2: /// - `quorum_percentage` - the minimum number of (`votes` minus `downvotes`) at the end of voting period /// - `votingDelayInBlocks` - Number of blocks to wait after a block is proposed before being able to vote/downvote that proposal /// - `votingPeriodInBlocks` - Number of blocks the voting period lasts (voting delay does not count towards this) - /// - `withdraw_percentage_defeated` - Percetange of the fee to be returned if proposal defetead + /// - `withdraw_percentage_defeated` - Percetange of the fee to be returned if proposal defetead /// - `energy_factory_address` /// - `fees_collector_address` /// - `fee_token` - The token used to pay the fee diff --git a/energy-integration/governance-v2/tests/gov_rust_test.rs b/energy-integration/governance-v2/tests/gov_rust_test.rs index 5c2329a3d..a9ec92558 100644 --- a/energy-integration/governance-v2/tests/gov_rust_test.rs +++ b/energy-integration/governance-v2/tests/gov_rust_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod gov_test_setup; use gov_test_setup::*; diff --git a/energy-integration/governance-v2/tests/gov_test_setup/mod.rs b/energy-integration/governance-v2/tests/gov_test_setup/mod.rs index 3c02e7e09..8ea1ef5f0 100644 --- a/energy-integration/governance-v2/tests/gov_test_setup/mod.rs +++ b/energy-integration/governance-v2/tests/gov_test_setup/mod.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use energy_factory_mock::EnergyFactoryMock; use energy_query::Energy; use fees_collector::FeesCollector; @@ -12,8 +14,8 @@ use multiversx_sc::{ }; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_buffer, managed_token_id, rust_biguint, - whitebox::TxResult, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::TxResult, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; use num_bigint::BigUint; diff --git a/energy-integration/governance-v2/wasm/Cargo.toml b/energy-integration/governance-v2/wasm/Cargo.toml index 34f7bde21..bbae2b03e 100644 --- a/energy-integration/governance-v2/wasm/Cargo.toml +++ b/energy-integration/governance-v2/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/farm-staking/farm-staking-proxy/Cargo.toml b/farm-staking/farm-staking-proxy/Cargo.toml index d2596d68e..a66a88277 100644 --- a/farm-staking/farm-staking-proxy/Cargo.toml +++ b/farm-staking/farm-staking-proxy/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.farm] path = "../../dex/farm" @@ -61,7 +61,7 @@ path = "../../common/modules/sc_whitelist_module" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.farm_token] path = "../../common/modules/farm/farm_token" diff --git a/farm-staking/farm-staking-proxy/meta/Cargo.toml b/farm-staking/farm-staking-proxy/meta/Cargo.toml index ae7ccede3..2647116b3 100644 --- a/farm-staking/farm-staking-proxy/meta/Cargo.toml +++ b/farm-staking/farm-staking-proxy/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/farm-staking/farm-staking-proxy/tests/composed_pos_test.rs b/farm-staking/farm-staking-proxy/tests/composed_pos_test.rs index 76b13a8f8..ee0f78cbc 100644 --- a/farm-staking/farm-staking-proxy/tests/composed_pos_test.rs +++ b/farm-staking/farm-staking-proxy/tests/composed_pos_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + pub mod constants; pub mod staking_farm_with_lp_external_contracts; pub mod staking_farm_with_lp_staking_contract_interactions; diff --git a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp.rs b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp.rs index 6036f505e..e54f13dc6 100644 --- a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp.rs +++ b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + pub mod constants; pub mod staking_farm_with_lp_external_contracts; pub mod staking_farm_with_lp_staking_contract_interactions; diff --git a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_external_contracts/mod.rs b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_external_contracts/mod.rs index 02729ff2d..69891868d 100644 --- a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_external_contracts/mod.rs +++ b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_external_contracts/mod.rs @@ -1,9 +1,11 @@ +#![allow(deprecated)] + use multiversx_sc::codec::multi_types::{MultiValue3, OptionalValue}; use multiversx_sc::storage::mappers::StorageTokenWrapper; use multiversx_sc::types::{Address, EsdtLocalRole, ManagedAddress, MultiValueEncoded}; -use multiversx_sc_scenario::whitebox::TxTokenTransfer; +use multiversx_sc_scenario::whitebox_legacy::TxTokenTransfer; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::*, DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::*, DebugApi, }; use farm::exit_penalty::ExitPenaltyModule; diff --git a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_interactions/mod.rs b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_interactions/mod.rs index f9eb0b06e..8be6d9b13 100644 --- a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_interactions/mod.rs +++ b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_interactions/mod.rs @@ -1,8 +1,10 @@ +#![allow(deprecated)] + use multiversx_sc::{codec::multi_types::OptionalValue, types::Address}; use multiversx_sc_scenario::{ managed_address, managed_biguint, rust_biguint, - whitebox::TxTokenTransfer, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::TxTokenTransfer, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; diff --git a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_setup/mod.rs b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_setup/mod.rs index 1635f22e0..e5d848e5d 100644 --- a/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_setup/mod.rs +++ b/farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_setup/mod.rs @@ -1,8 +1,10 @@ +#![allow(deprecated)] + use multiversx_sc::storage::mappers::StorageTokenWrapper; use multiversx_sc::types::{Address, EsdtLocalRole, ManagedAddress, MultiValueEncoded}; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, rust_biguint, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; diff --git a/farm-staking/farm-staking-proxy/wasm/Cargo.toml b/farm-staking/farm-staking-proxy/wasm/Cargo.toml index 72cad6257..912124ded 100644 --- a/farm-staking/farm-staking-proxy/wasm/Cargo.toml +++ b/farm-staking/farm-staking-proxy/wasm/Cargo.toml @@ -22,5 +22,5 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" features = ["vm-validate-token-identifier"] diff --git a/farm-staking/farm-staking/Cargo.toml b/farm-staking/farm-staking/Cargo.toml index 8755cfddd..036fc5e1d 100644 --- a/farm-staking/farm-staking/Cargo.toml +++ b/farm-staking/farm-staking/Cargo.toml @@ -77,14 +77,14 @@ path = "../../common/common_structs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/farm-staking/farm-staking/meta/Cargo.toml b/farm-staking/farm-staking/meta/Cargo.toml index 9a9bb3c61..15e0d861c 100644 --- a/farm-staking/farm-staking/meta/Cargo.toml +++ b/farm-staking/farm-staking/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/farm-staking/farm-staking/tests/farm_staking_energy_test.rs b/farm-staking/farm-staking/tests/farm_staking_energy_test.rs index d7afaf744..bb95876b4 100644 --- a/farm-staking/farm-staking/tests/farm_staking_energy_test.rs +++ b/farm-staking/farm-staking/tests/farm_staking_energy_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + pub mod farm_staking_setup; use farm_staking::{ claim_stake_farm_rewards::ClaimStakeFarmRewardsModule, stake_farm::StakeFarmModule, diff --git a/farm-staking/farm-staking/tests/farm_staking_setup/mod.rs b/farm-staking/farm-staking/tests/farm_staking_setup/mod.rs index 0ad97a738..e861eb64f 100644 --- a/farm-staking/farm-staking/tests/farm_staking_setup/mod.rs +++ b/farm-staking/farm-staking/tests/farm_staking_setup/mod.rs @@ -1,9 +1,11 @@ +#![allow(deprecated)] + use multiversx_sc::codec::multi_types::OptionalValue; use multiversx_sc::storage::mappers::StorageTokenWrapper; use multiversx_sc::types::{Address, BigInt, EsdtLocalRole, ManagedAddress, MultiValueEncoded}; -use multiversx_sc_scenario::whitebox::TxTokenTransfer; +use multiversx_sc_scenario::whitebox_legacy::TxTokenTransfer; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::*, DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::*, DebugApi, }; pub type RustBigUint = num_bigint::BigUint; diff --git a/farm-staking/farm-staking/tests/farm_staking_test.rs b/farm-staking/farm-staking/tests/farm_staking_test.rs index 6a8eba2ae..271efe5c2 100644 --- a/farm-staking/farm-staking/tests/farm_staking_test.rs +++ b/farm-staking/farm-staking/tests/farm_staking_test.rs @@ -1,4 +1,6 @@ -use multiversx_sc_scenario::{rust_biguint, whitebox::TxTokenTransfer, DebugApi}; +#![allow(deprecated)] + +use multiversx_sc_scenario::{rust_biguint, whitebox_legacy::TxTokenTransfer, DebugApi}; pub mod farm_staking_setup; use farm_staking::{ diff --git a/farm-staking/farm-staking/wasm/Cargo.toml b/farm-staking/farm-staking/wasm/Cargo.toml index 43aa71f48..13d4e5205 100644 --- a/farm-staking/farm-staking/wasm/Cargo.toml +++ b/farm-staking/farm-staking/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/farm-staking/metabonding-staking/Cargo.toml b/farm-staking/metabonding-staking/Cargo.toml index b7bb52cee..d9c18ae26 100644 --- a/farm-staking/metabonding-staking/Cargo.toml +++ b/farm-staking/metabonding-staking/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.factory] path = "../../locked-asset/factory" @@ -21,7 +21,7 @@ path = "../../locked-asset/factory" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.common_structs] path = "../../common/common_structs" diff --git a/farm-staking/metabonding-staking/meta/Cargo.toml b/farm-staking/metabonding-staking/meta/Cargo.toml index 9848cd72d..2e1acb451 100644 --- a/farm-staking/metabonding-staking/meta/Cargo.toml +++ b/farm-staking/metabonding-staking/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/farm-staking/metabonding-staking/tests/metabonding_staking_setup/mod.rs b/farm-staking/metabonding-staking/tests/metabonding_staking_setup/mod.rs index 6e7d01b4a..b32812145 100644 --- a/farm-staking/metabonding-staking/tests/metabonding_staking_setup/mod.rs +++ b/farm-staking/metabonding-staking/tests/metabonding_staking_setup/mod.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use common_structs::{ LockedAssetTokenAttributesEx, UnlockMilestone, UnlockMilestoneEx, UnlockScheduleEx, }; @@ -7,9 +9,9 @@ use metabonding_staking::MetabondingStaking; use multiversx_sc::storage::mappers::StorageTokenWrapper; use multiversx_sc::types::{Address, EsdtLocalRole, ManagedVec}; use multiversx_sc_modules::pause::PauseModule; -use multiversx_sc_scenario::whitebox::{TxResult, TxTokenTransfer}; +use multiversx_sc_scenario::whitebox_legacy::{TxResult, TxTokenTransfer}; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::*, DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::*, DebugApi, }; pub const METABONDING_STAKING_WASM_PATH: &str = "1.wasm"; diff --git a/farm-staking/metabonding-staking/tests/metabonding_staking_test.rs b/farm-staking/metabonding-staking/tests/metabonding_staking_test.rs index cc084e495..c83be6726 100644 --- a/farm-staking/metabonding-staking/tests/metabonding_staking_test.rs +++ b/farm-staking/metabonding-staking/tests/metabonding_staking_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + pub mod metabonding_staking_setup; use metabonding_staking::{ locked_asset_token::{LockedAssetTokenModule, UserEntry}, @@ -5,7 +7,7 @@ use metabonding_staking::{ }; use metabonding_staking_setup::*; use multiversx_sc_scenario::{ - managed_address, managed_biguint, rust_biguint, whitebox::TxTokenTransfer, + managed_address, managed_biguint, rust_biguint, whitebox_legacy::TxTokenTransfer, }; #[test] diff --git a/farm-staking/metabonding-staking/wasm/Cargo.toml b/farm-staking/metabonding-staking/wasm/Cargo.toml index 1fae8b4c0..76a1fde72 100644 --- a/farm-staking/metabonding-staking/wasm/Cargo.toml +++ b/farm-staking/metabonding-staking/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/Cargo.toml b/locked-asset/Cargo.toml index a11a0fa62..72e7f786e 100644 --- a/locked-asset/Cargo.toml +++ b/locked-asset/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.farm] @@ -49,7 +49,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/distribution/Cargo.toml b/locked-asset/distribution/Cargo.toml index 1f202ec0e..05da3b270 100644 --- a/locked-asset/distribution/Cargo.toml +++ b/locked-asset/distribution/Cargo.toml @@ -13,7 +13,7 @@ path = "../../common/common_structs" path = "../factory" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/distribution/meta/Cargo.toml b/locked-asset/distribution/meta/Cargo.toml index a072c5736..599c2a126 100644 --- a/locked-asset/distribution/meta/Cargo.toml +++ b/locked-asset/distribution/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/distribution/wasm/Cargo.toml b/locked-asset/distribution/wasm/Cargo.toml index 6acbac2c9..eb70848ae 100644 --- a/locked-asset/distribution/wasm/Cargo.toml +++ b/locked-asset/distribution/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/energy-factory/Cargo.toml b/locked-asset/energy-factory/Cargo.toml index 46de9581c..f164c78cb 100644 --- a/locked-asset/energy-factory/Cargo.toml +++ b/locked-asset/energy-factory/Cargo.toml @@ -32,11 +32,11 @@ path = "../../common/traits/unwrappable" path = "../../common/modules/legacy_token_decode_module" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies] num-bigint = "0.4.2" @@ -44,4 +44,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/energy-factory/meta/Cargo.toml b/locked-asset/energy-factory/meta/Cargo.toml index 50c0431a1..db4b5f52d 100644 --- a/locked-asset/energy-factory/meta/Cargo.toml +++ b/locked-asset/energy-factory/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/energy-factory/src/token_merging.rs b/locked-asset/energy-factory/src/token_merging.rs index e6b683206..36470c70d 100644 --- a/locked-asset/energy-factory/src/token_merging.rs +++ b/locked-asset/energy-factory/src/token_merging.rs @@ -1,6 +1,8 @@ multiversx_sc::imports!(); multiversx_sc::derive_imports!(); +use multiversx_sc::api::BlockchainApi; + use common_structs::PaymentsVec; use math::weighted_average_round_up; use mergeable::Mergeable; diff --git a/locked-asset/energy-factory/tests/energy_factory_setup/mod.rs b/locked-asset/energy-factory/tests/energy_factory_setup/mod.rs index e44ac9fc5..f6693c2fe 100644 --- a/locked-asset/energy-factory/tests/energy_factory_setup/mod.rs +++ b/locked-asset/energy-factory/tests/energy_factory_setup/mod.rs @@ -1,4 +1,5 @@ #![allow(dead_code)] +#![allow(deprecated)] pub mod unbond_sc_mock; @@ -14,8 +15,8 @@ use multiversx_sc::{ use multiversx_sc_modules::pause::PauseModule; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, rust_biguint, - whitebox::TxResult, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::TxResult, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; use simple_lock::locked_token::LockedTokenModule; diff --git a/locked-asset/energy-factory/tests/old_tokens_test.rs b/locked-asset/energy-factory/tests/old_tokens_test.rs index ba8be3d6a..6f39214ff 100644 --- a/locked-asset/energy-factory/tests/old_tokens_test.rs +++ b/locked-asset/energy-factory/tests/old_tokens_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod energy_factory_setup; use common_structs::{ diff --git a/locked-asset/energy-factory/tests/simple_lock_energy_test.rs b/locked-asset/energy-factory/tests/simple_lock_energy_test.rs index 21d4f2d29..409ee1c1a 100644 --- a/locked-asset/energy-factory/tests/simple_lock_energy_test.rs +++ b/locked-asset/energy-factory/tests/simple_lock_energy_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod energy_factory_setup; use energy_factory::energy::EnergyModule; diff --git a/locked-asset/energy-factory/tests/token_merging_test.rs b/locked-asset/energy-factory/tests/token_merging_test.rs index fd81bb2d7..00b4ede93 100644 --- a/locked-asset/energy-factory/tests/token_merging_test.rs +++ b/locked-asset/energy-factory/tests/token_merging_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod energy_factory_setup; use energy_factory::{ @@ -17,7 +19,8 @@ use multiversx_sc::{ }; use multiversx_sc_modules::pause::PauseModule; use multiversx_sc_scenario::{ - managed_address, managed_token_id, whitebox::BlockchainStateWrapper, whitebox::TxTokenTransfer, + managed_address, managed_token_id, whitebox_legacy::BlockchainStateWrapper, + whitebox_legacy::TxTokenTransfer, }; use simple_lock::{ basic_lock_unlock::BasicLockUnlock, diff --git a/locked-asset/energy-factory/tests/virtual_lock_test.rs b/locked-asset/energy-factory/tests/virtual_lock_test.rs index 1d13e1eb9..250abff1f 100644 --- a/locked-asset/energy-factory/tests/virtual_lock_test.rs +++ b/locked-asset/energy-factory/tests/virtual_lock_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod energy_factory_setup; use energy_factory::virtual_lock::VirtualLockModule; diff --git a/locked-asset/energy-factory/wasm/Cargo.toml b/locked-asset/energy-factory/wasm/Cargo.toml index a35ae1bac..ba6f427b8 100644 --- a/locked-asset/energy-factory/wasm/Cargo.toml +++ b/locked-asset/energy-factory/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/factory/Cargo.toml b/locked-asset/factory/Cargo.toml index 764235d05..e2a659fc1 100644 --- a/locked-asset/factory/Cargo.toml +++ b/locked-asset/factory/Cargo.toml @@ -26,11 +26,11 @@ path = "../../common/modules/token_merge_helper" path = "../energy-factory" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.arrayvec] version = "0.7.1" @@ -49,4 +49,4 @@ hex = "0.4" path = "../simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/factory/meta/Cargo.toml b/locked-asset/factory/meta/Cargo.toml index 008ea69d4..7312ff4fa 100644 --- a/locked-asset/factory/meta/Cargo.toml +++ b/locked-asset/factory/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/factory/tests/factory_setup/mod.rs b/locked-asset/factory/tests/factory_setup/mod.rs index 148ce0e13..9fec3157d 100644 --- a/locked-asset/factory/tests/factory_setup/mod.rs +++ b/locked-asset/factory/tests/factory_setup/mod.rs @@ -1,4 +1,5 @@ #![allow(dead_code)] +#![allow(deprecated)] use common_structs::UnlockMilestone; use energy_factory::SimpleLockEnergy; @@ -11,7 +12,7 @@ use multiversx_sc::{ }; use multiversx_sc_scenario::{ managed_address, managed_token_id, rust_biguint, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; use simple_lock::locked_token::LockedTokenModule; diff --git a/locked-asset/factory/tests/lock_test.rs b/locked-asset/factory/tests/lock_test.rs index bd097933c..556642eef 100644 --- a/locked-asset/factory/tests/lock_test.rs +++ b/locked-asset/factory/tests/lock_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use common_structs::{ LockedAssetTokenAttributesEx, UnlockMilestone, UnlockMilestoneEx, UnlockScheduleEx, }; @@ -6,7 +8,7 @@ use multiversx_sc::{ types::{EsdtLocalRole, ManagedVec, MultiValueEncoded}, }; use multiversx_sc_scenario::{ - managed_biguint, managed_token_id, rust_biguint, whitebox::*, DebugApi, + managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::*, DebugApi, }; const SC_WASM_PATH: &str = "output/factory.wasm"; diff --git a/locked-asset/factory/tests/unlock_test.rs b/locked-asset/factory/tests/unlock_test.rs index bfc8403de..333d97b50 100644 --- a/locked-asset/factory/tests/unlock_test.rs +++ b/locked-asset/factory/tests/unlock_test.rs @@ -1,8 +1,10 @@ +#![allow(deprecated)] + use common_structs::{LockedAssetTokenAttributesEx, UnlockMilestoneEx, UnlockScheduleEx}; use multiversx_sc::types::{BigInt, MultiValueEncoded}; use multiversx_sc::types::{EsdtTokenPayment, ManagedVec, TokenIdentifier}; use multiversx_sc_scenario::{ - managed_address, managed_biguint, rust_biguint, whitebox::*, DebugApi, + managed_address, managed_biguint, rust_biguint, whitebox_legacy::*, DebugApi, }; const SC_WASM_PATH: &str = "output/factory.wasm"; diff --git a/locked-asset/factory/wasm/Cargo.toml b/locked-asset/factory/wasm/Cargo.toml index 2fe668562..22220e5d5 100644 --- a/locked-asset/factory/wasm/Cargo.toml +++ b/locked-asset/factory/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/lkmex-transfer/Cargo.toml b/locked-asset/lkmex-transfer/Cargo.toml index e16312493..a6d2e4b9a 100644 --- a/locked-asset/lkmex-transfer/Cargo.toml +++ b/locked-asset/lkmex-transfer/Cargo.toml @@ -29,14 +29,14 @@ path = "../energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/lkmex-transfer/meta/Cargo.toml b/locked-asset/lkmex-transfer/meta/Cargo.toml index 72173b3a0..76410a6b4 100644 --- a/locked-asset/lkmex-transfer/meta/Cargo.toml +++ b/locked-asset/lkmex-transfer/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/lkmex-transfer/tests/lkmex_transfer_tests.rs b/locked-asset/lkmex-transfer/tests/lkmex_transfer_tests.rs index 2f265d1a1..9ec46ebc2 100644 --- a/locked-asset/lkmex-transfer/tests/lkmex_transfer_tests.rs +++ b/locked-asset/lkmex-transfer/tests/lkmex_transfer_tests.rs @@ -1,7 +1,9 @@ +#![allow(deprecated)] + use multiversx_sc::codec::multi_types::OptionalValue; use multiversx_sc::storage::mappers::StorageTokenWrapper; use multiversx_sc::types::{BigInt, EsdtLocalRole, MultiValueEncoded}; -use multiversx_sc_scenario::{managed_address, managed_biguint, whitebox::*}; +use multiversx_sc_scenario::{managed_address, managed_biguint, whitebox_legacy::*}; use multiversx_sc_scenario::{managed_token_id, rust_biguint}; use energy_factory::energy::EnergyModule; diff --git a/locked-asset/lkmex-transfer/wasm/Cargo.toml b/locked-asset/lkmex-transfer/wasm/Cargo.toml index 716705c35..366cc607b 100644 --- a/locked-asset/lkmex-transfer/wasm/Cargo.toml +++ b/locked-asset/lkmex-transfer/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/locked-token-wrapper/Cargo.toml b/locked-asset/locked-token-wrapper/Cargo.toml index b1e7a4a15..105e22340 100644 --- a/locked-asset/locked-token-wrapper/Cargo.toml +++ b/locked-asset/locked-token-wrapper/Cargo.toml @@ -8,10 +8,10 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.utils] path = "../../common/modules/utils" @@ -43,4 +43,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/locked-token-wrapper/meta/Cargo.toml b/locked-asset/locked-token-wrapper/meta/Cargo.toml index 39e80ce0f..5c0709dc7 100644 --- a/locked-asset/locked-token-wrapper/meta/Cargo.toml +++ b/locked-asset/locked-token-wrapper/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/locked-token-wrapper/tests/locked_token_wrapping_test.rs b/locked-asset/locked-token-wrapper/tests/locked_token_wrapping_test.rs index d4c5d22c8..13edf221e 100644 --- a/locked-asset/locked-token-wrapper/tests/locked_token_wrapping_test.rs +++ b/locked-asset/locked-token-wrapper/tests/locked_token_wrapping_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use energy_factory_mock::EnergyFactoryMock; use energy_query::Energy; use locked_token_wrapper::{ @@ -7,7 +9,7 @@ use locked_token_wrapper::{ use multiversx_sc::{storage::mappers::StorageTokenWrapper, types::EsdtLocalRole}; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::BlockchainStateWrapper, DebugApi, + whitebox_legacy::BlockchainStateWrapper, DebugApi, }; use simple_lock::locked_token::LockedTokenAttributes; diff --git a/locked-asset/locked-token-wrapper/wasm/Cargo.toml b/locked-asset/locked-token-wrapper/wasm/Cargo.toml index 6dd616302..7d3bf7341 100644 --- a/locked-asset/locked-token-wrapper/wasm/Cargo.toml +++ b/locked-asset/locked-token-wrapper/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/proxy_dex/Cargo.toml b/locked-asset/proxy_dex/Cargo.toml index 14361f041..e4d6cb257 100644 --- a/locked-asset/proxy_dex/Cargo.toml +++ b/locked-asset/proxy_dex/Cargo.toml @@ -44,11 +44,11 @@ path = "../../common/traits/mergeable" path = "../../common/traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.energy-factory] path = "../energy-factory" @@ -65,7 +65,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.pausable] path = "../../common/modules/pausable" diff --git a/locked-asset/proxy_dex/meta/Cargo.toml b/locked-asset/proxy_dex/meta/Cargo.toml index 6b835d751..55c609a02 100644 --- a/locked-asset/proxy_dex/meta/Cargo.toml +++ b/locked-asset/proxy_dex/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/proxy_dex/tests/proxy_dex_test_setup/mod.rs b/locked-asset/proxy_dex/tests/proxy_dex_test_setup/mod.rs index 1fdff8d2b..413ddb980 100644 --- a/locked-asset/proxy_dex/tests/proxy_dex_test_setup/mod.rs +++ b/locked-asset/proxy_dex/tests/proxy_dex_test_setup/mod.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use config::ConfigModule; use energy_factory::{locked_token_transfer::LockedTokenTransferModule, SimpleLockEnergy}; use energy_query::EnergyQueryModule; @@ -14,7 +16,7 @@ use multiversx_sc::{ use multiversx_sc_modules::pause::PauseModule; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; use pair::{config::ConfigModule as OtherConfigModule, Pair}; diff --git a/locked-asset/proxy_dex/tests/proxy_farm_test.rs b/locked-asset/proxy_dex/tests/proxy_farm_test.rs index f363483e9..bfa289fde 100644 --- a/locked-asset/proxy_dex/tests/proxy_farm_test.rs +++ b/locked-asset/proxy_dex/tests/proxy_farm_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod proxy_dex_test_setup; use common_structs::FarmTokenAttributes; @@ -11,7 +13,7 @@ use multiversx_sc::{ }; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::TxTokenTransfer, DebugApi, + whitebox_legacy::TxTokenTransfer, DebugApi, }; use num_traits::ToPrimitive; use proxy_dex::{ diff --git a/locked-asset/proxy_dex/tests/proxy_lp_test.rs b/locked-asset/proxy_dex/tests/proxy_lp_test.rs index c96323a50..1f025ca67 100644 --- a/locked-asset/proxy_dex/tests/proxy_lp_test.rs +++ b/locked-asset/proxy_dex/tests/proxy_lp_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod proxy_dex_test_setup; use energy_factory::{energy::EnergyModule, SimpleLockEnergy}; @@ -8,7 +10,7 @@ use multiversx_sc::{ }; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, managed_token_id_wrapped, rust_biguint, - whitebox::TxTokenTransfer, DebugApi, + whitebox_legacy::TxTokenTransfer, DebugApi, }; use num_traits::ToPrimitive; use proxy_dex::{ diff --git a/locked-asset/proxy_dex/wasm/Cargo.toml b/locked-asset/proxy_dex/wasm/Cargo.toml index a36693d1b..3070db804 100644 --- a/locked-asset/proxy_dex/wasm/Cargo.toml +++ b/locked-asset/proxy_dex/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/simple-lock-whitelist/Cargo.toml b/locked-asset/simple-lock-whitelist/Cargo.toml index 5e32fc766..39882c1bd 100644 --- a/locked-asset/simple-lock-whitelist/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/Cargo.toml @@ -14,11 +14,11 @@ path = "../simple-lock" path = "../../common/modules/utils" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies] num-bigint = "0.4.2" @@ -26,4 +26,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/simple-lock-whitelist/meta/Cargo.toml b/locked-asset/simple-lock-whitelist/meta/Cargo.toml index 8313a3a25..b146358f9 100644 --- a/locked-asset/simple-lock-whitelist/meta/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/simple-lock-whitelist/tests/whitelist_test.rs b/locked-asset/simple-lock-whitelist/tests/whitelist_test.rs index 8e3cff4d3..d2f335ec1 100644 --- a/locked-asset/simple-lock-whitelist/tests/whitelist_test.rs +++ b/locked-asset/simple-lock-whitelist/tests/whitelist_test.rs @@ -1,7 +1,9 @@ +#![allow(deprecated)] + use multiversx_sc::codec::multi_types::OptionalValue; use multiversx_sc::types::{EsdtLocalRole, MultiValueEncoded}; use multiversx_sc_scenario::{managed_token_id, rust_biguint, DebugApi}; -use multiversx_sc_scenario::{managed_token_id_wrapped, whitebox::*}; +use multiversx_sc_scenario::{managed_token_id_wrapped, whitebox_legacy::*}; use multiversx_sc::storage::mappers::StorageTokenWrapper; use simple_lock::locked_token::*; diff --git a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml index c40b42eea..aeef25cc8 100644 --- a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/simple-lock/Cargo.toml b/locked-asset/simple-lock/Cargo.toml index e001ab642..7251cb4d2 100644 --- a/locked-asset/simple-lock/Cargo.toml +++ b/locked-asset/simple-lock/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dependencies.common_structs] path = "../../common/common_structs" @@ -23,4 +23,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/simple-lock/meta/Cargo.toml b/locked-asset/simple-lock/meta/Cargo.toml index 567b68d62..578259c66 100644 --- a/locked-asset/simple-lock/meta/Cargo.toml +++ b/locked-asset/simple-lock/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/simple-lock/tests/rust_test.rs b/locked-asset/simple-lock/tests/rust_test.rs index 8b879b610..8b760049a 100644 --- a/locked-asset/simple-lock/tests/rust_test.rs +++ b/locked-asset/simple-lock/tests/rust_test.rs @@ -1,6 +1,8 @@ +#![allow(deprecated)] + use multiversx_sc::codec::multi_types::OptionalValue; use multiversx_sc::types::EsdtLocalRole; -use multiversx_sc_scenario::{managed_biguint, managed_token_id_wrapped, whitebox::*}; +use multiversx_sc_scenario::{managed_biguint, managed_token_id_wrapped, whitebox_legacy::*}; use multiversx_sc_scenario::{managed_token_id, rust_biguint, DebugApi}; use multiversx_sc::storage::mappers::StorageTokenWrapper; diff --git a/locked-asset/simple-lock/wasm/Cargo.toml b/locked-asset/simple-lock/wasm/Cargo.toml index cc638384f..6c63e40f1 100644 --- a/locked-asset/simple-lock/wasm/Cargo.toml +++ b/locked-asset/simple-lock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/tests/distribution_scenario_go_test.rs b/locked-asset/tests/distribution_scenario_go_test.rs index 637f0521b..b887a0d42 100644 --- a/locked-asset/tests/distribution_scenario_go_test.rs +++ b/locked-asset/tests/distribution_scenario_go_test.rs @@ -1,138 +1,179 @@ -// #[test] -// fn add_liquidity_proxy_go() { -// multiversx_sc_scenario::run_go("scenarios/add_liquidity_proxy.scen.json"); -// } - -// #[test] -// fn claim_locked_assets_basic_go() { -// multiversx_sc_scenario::run_go("scenarios/claim_locked_assets_basic.scen.json"); -// } - -// #[test] -// fn claim_mex_rewards_proxy_after_mint_rewards_go() { -// multiversx_sc_scenario::run_go("scenarios/claim_mex_rewards_proxy_after_mint_rewards.scen.json"); -// } - -// #[test] -// fn claim_only_last_four_go() { -// multiversx_sc_scenario::run_go("scenarios/claim_only_last_four.scen.json"); -// } - -// #[test] -// fn claim_rewards_proxy_go() { -// multiversx_sc_scenario::run_go("scenarios/claim_rewards_proxy.scen.json"); -// } - -// /* -// #[test] -// fn claim_rewards_proxy_after_mint_rewards_go() { -// multiversx_sc_scenario::run_go("scenarios/claim_rewards_proxy_after_mint_rewards.scen.json"); -// } -// */ -// #[test] -// fn clear_unclaimable_assets_go() { -// multiversx_sc_scenario::run_go("scenarios/clear_unclaimable_assets.scen.json"); -// } - -// #[test] -// fn compound_mex_rewards_proxy_after_mint_rewards_go() { -// multiversx_sc_scenario::run_go("scenarios/compound_mex_rewards_proxy_after_mint_rewards.scen.json"); -// } - -// #[test] -// fn enter_farm_proxy_go() { -// multiversx_sc_scenario::run_go("scenarios/enter_farm_proxy.scen.json"); -// } - -// #[test] -// fn enter_mex_farm_proxy_go() { -// multiversx_sc_scenario::run_go("scenarios/enter_mex_farm_proxy.scen.json"); -// } - -// #[test] -// fn exit_farm_proxy_go() { -// multiversx_sc_scenario::run_go("scenarios/exit_farm_proxy.scen.json"); -// } - -// #[test] -// fn exit_mex_farm_proxy_after_compound_rewards_and_epoch_increase_go() { -// multiversx_sc_scenario::run_go( -// "scenarios/exit_mex_farm_proxy_after_compound_rewards_and_epoch_increase.scen.json", -// ); -// } - -// #[test] -// fn exit_mex_farm_proxy_after_compound_rewards_go() { -// multiversx_sc_scenario::run_go("scenarios/exit_mex_farm_proxy_after_compound_rewards.scen.json"); -// } - -// /* -// #[test] -// fn exit_farm_proxy_after_mint_rewards_go() { -// multiversx_sc_scenario::run_go("scenarios/exit_farm_proxy_after_mint_rewards.scen.json"); -// } -// */ -// #[test] -// fn exit_mex_farm_proxy_after_mint_rewards_go() { -// multiversx_sc_scenario::run_go("scenarios/exit_mex_farm_proxy_after_mint_rewards.scen.json"); -// } - -// #[test] -// fn merge_locked_mex_tokens_go() { -// multiversx_sc_scenario::run_go("scenarios/merge_locked_mex_tokens.scen.json"); -// } - -// #[test] -// fn multiple_claim_assets_go() { -// multiversx_sc_scenario::run_go("scenarios/multiple_claim_assets.scen.json"); -// } - -// #[test] -// fn remove_liquidity_proxy_go() { -// multiversx_sc_scenario::run_go("scenarios/remove_liquidity_proxy.scen.json"); -// } - -// #[test] -// fn remove_liquidity_proxy_after_swap_mex_go() { -// multiversx_sc_scenario::run_go("scenarios/remove_liquidity_proxy_after_swap_mex.scen.json"); -// } - -// #[test] -// fn remove_liquidity_proxy_after_swap_wegld_go() { -// multiversx_sc_scenario::run_go("scenarios/remove_liquidity_proxy_after_swap_wegld.scen.json"); -// } - -// #[test] -// fn set_user_distribution_go() { -// multiversx_sc_scenario::run_go("scenarios/set_user_distribution.scen.json"); -// } - -// #[test] -// fn set_user_distribution_above_cap_go() { -// multiversx_sc_scenario::run_go("scenarios/set_user_distribution_above_cap.scen.json"); -// } - -// #[test] -// fn set_user_distribution_duplicate_go() { -// multiversx_sc_scenario::run_go("scenarios/set_user_distribution_duplicate.scen.json"); -// } - -// #[test] -// fn set_user_distribution_with_unlock_go() { -// multiversx_sc_scenario::run_go("scenarios/set_user_distribution_with_unlock.scen.json"); -// } - -// #[test] -// fn undo_last_community_distribution_go() { -// multiversx_sc_scenario::run_go("scenarios/undo_last_community_distribution.scen.json"); -// } - -// #[test] -// fn undo_user_distribution_between_epochs_go() { -// multiversx_sc_scenario::run_go("scenarios/undo_user_distribution_between_epochs.scen.json"); -// } - -// #[test] -// fn unlock_assets_basic_go() { -// multiversx_sc_scenario::run_go("scenarios/unlock_assets_basic.scen.json"); -// } +use multiversx_sc_scenario::*; + +fn world() -> ScenarioWorld { + ScenarioWorld::vm_go() +} + +#[test] +#[ignore] +fn add_liquidity_proxy_go() { + world().run("scenarios/add_liquidity_proxy.scen.json"); +} + +#[test] +#[ignore] +fn add_liquidity_with_merge_tokens_go() { + world().run("scenarios/add_liquidity_with_merge_tokens.scen.json"); +} + +#[test] +#[ignore] +fn claim_locked_assets_basic_go() { + world().run("scenarios/claim_locked_assets_basic.scen.json"); +} + +#[test] +#[ignore] +fn claim_mex_rewards_proxy_after_mint_rewards_go() { + world().run("scenarios/claim_mex_rewards_proxy_after_mint_rewards.scen.json"); +} + +#[test] +#[ignore] +fn claim_only_last_four_go() { + world().run("scenarios/claim_only_last_four.scen.json"); +} + +#[test] +#[ignore] +fn claim_rewards_proxy_go() { + world().run("scenarios/claim_rewards_proxy.scen.json"); +} + +#[test] +#[ignore] +fn clear_unclaimable_assets_go() { + world().run("scenarios/clear_unclaimable_assets.scen.json"); +} + +#[test] +#[ignore] +fn compound_mex_rewards_proxy_after_mint_rewards_go() { + world().run("scenarios/compound_mex_rewards_proxy_after_mint_rewards.scen.json"); +} + +#[test] +#[ignore] +fn enter_farm_proxy_go() { + world().run("scenarios/enter_farm_proxy.scen.json"); +} + +#[test] +#[ignore] +fn enter_farm_proxy_with_merge_tokens_go() { + world().run("scenarios/enter_farm_proxy_with_merge_tokens.scen.json"); +} + +#[test] +#[ignore] +fn enter_mex_farm_proxy_go() { + world().run("scenarios/enter_mex_farm_proxy.scen.json"); +} + +#[test] +#[ignore] +fn exit_farm_proxy_go() { + world().run("scenarios/exit_farm_proxy.scen.json"); +} + +#[test] +#[ignore] +fn exit_mex_farm_proxy_after_compound_rewards_go() { + world().run("scenarios/exit_mex_farm_proxy_after_compound_rewards.scen.json"); +} + +#[test] +#[ignore] +fn exit_mex_farm_proxy_after_compound_rewards_and_epoch_increase_go() { + world().run("scenarios/exit_mex_farm_proxy_after_compound_rewards_and_epoch_increase.scen.json"); +} + +#[test] +#[ignore] +fn exit_mex_farm_proxy_after_mint_rewards_go() { + world().run("scenarios/exit_mex_farm_proxy_after_mint_rewards.scen.json"); +} + +#[test] +#[ignore] +fn merge_locked_mex_tokens_go() { + world().run("scenarios/merge_locked_mex_tokens.scen.json"); +} + +#[test] +#[ignore] +fn merge_wrapped_farm_tokens_go() { + world().run("scenarios/merge_wrapped_farm_tokens.scen.json"); +} + +#[test] +#[ignore] +fn merge_wrapped_lp_tokens_go() { + world().run("scenarios/merge_wrapped_lp_tokens.scen.json"); +} + +#[test] +#[ignore] +fn multiple_claim_assets_go() { + world().run("scenarios/multiple_claim_assets.scen.json"); +} + +#[test] +#[ignore] +fn remove_liquidity_proxy_go() { + world().run("scenarios/remove_liquidity_proxy.scen.json"); +} + +#[test] +#[ignore] +fn remove_liquidity_proxy_after_swap_mex_go() { + world().run("scenarios/remove_liquidity_proxy_after_swap_mex.scen.json"); +} + +#[test] +#[ignore] +fn remove_liquidity_proxy_after_swap_wegld_go() { + world().run("scenarios/remove_liquidity_proxy_after_swap_wegld.scen.json"); +} + +#[test] +#[ignore] +fn set_user_distribution_go() { + world().run("scenarios/set_user_distribution.scen.json"); +} + +#[test] +#[ignore] +fn set_user_distribution_above_cap_go() { + world().run("scenarios/set_user_distribution_above_cap.scen.json"); +} + +#[test] +#[ignore] +fn set_user_distribution_duplicate_go() { + world().run("scenarios/set_user_distribution_duplicate.scen.json"); +} + +#[test] +#[ignore] +fn set_user_distribution_with_unlock_go() { + world().run("scenarios/set_user_distribution_with_unlock.scen.json"); +} + +#[test] +#[ignore] +fn undo_last_community_distribution_go() { + world().run("scenarios/undo_last_community_distribution.scen.json"); +} + +#[test] +#[ignore] +fn undo_user_distribution_between_epochs_go() { + world().run("scenarios/undo_user_distribution_between_epochs.scen.json"); +} + +#[test] +#[ignore] +fn unlock_assets_basic_go() { + world().run("scenarios/unlock_assets_basic.scen.json"); +} diff --git a/locked-asset/token-unstake/Cargo.toml b/locked-asset/token-unstake/Cargo.toml index a81cdc500..a11a4a670 100644 --- a/locked-asset/token-unstake/Cargo.toml +++ b/locked-asset/token-unstake/Cargo.toml @@ -8,7 +8,7 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] @@ -38,7 +38,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" diff --git a/locked-asset/token-unstake/meta/Cargo.toml b/locked-asset/token-unstake/meta/Cargo.toml index 81b241482..47fedd0b8 100644 --- a/locked-asset/token-unstake/meta/Cargo.toml +++ b/locked-asset/token-unstake/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/locked-asset/token-unstake/tests/token_unstake_setup/mod.rs b/locked-asset/token-unstake/tests/token_unstake_setup/mod.rs index f74fbb844..5191fe7b8 100644 --- a/locked-asset/token-unstake/tests/token_unstake_setup/mod.rs +++ b/locked-asset/token-unstake/tests/token_unstake_setup/mod.rs @@ -1,4 +1,5 @@ #![allow(dead_code)] +#![allow(deprecated)] pub mod fees_collector_mock; @@ -15,8 +16,8 @@ use multiversx_sc::{ use multiversx_sc_modules::pause::PauseModule; use multiversx_sc_scenario::{ managed_address, managed_biguint, managed_token_id, rust_biguint, - whitebox::TxResult, - whitebox::{BlockchainStateWrapper, ContractObjWrapper}, + whitebox_legacy::TxResult, + whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper}, DebugApi, }; use simple_lock::locked_token::LockedTokenModule; diff --git a/locked-asset/token-unstake/tests/token_unstake_test.rs b/locked-asset/token-unstake/tests/token_unstake_test.rs index 21596d411..e247a4a0d 100644 --- a/locked-asset/token-unstake/tests/token_unstake_test.rs +++ b/locked-asset/token-unstake/tests/token_unstake_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod token_unstake_setup; use multiversx_sc::types::{EsdtTokenPayment, ManagedVec}; diff --git a/locked-asset/token-unstake/tests/unlock_early_test.rs b/locked-asset/token-unstake/tests/unlock_early_test.rs index bbe17cf2c..5da1c4021 100644 --- a/locked-asset/token-unstake/tests/unlock_early_test.rs +++ b/locked-asset/token-unstake/tests/unlock_early_test.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + mod token_unstake_setup; use energy_factory::energy::EnergyModule; diff --git a/locked-asset/token-unstake/wasm/Cargo.toml b/locked-asset/token-unstake/wasm/Cargo.toml index 2991c44a3..d4e44421c 100644 --- a/locked-asset/token-unstake/wasm/Cargo.toml +++ b/locked-asset/token-unstake/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" diff --git a/pause-all/Cargo.toml b/pause-all/Cargo.toml index c99ec1a7f..49ee9d910 100644 --- a/pause-all/Cargo.toml +++ b/pause-all/Cargo.toml @@ -11,13 +11,13 @@ path = "src/lib.rs" path = "../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.41.0" +version = "=0.42.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.multiversx-sc-scenario] -version = "=0.41.0" +version = "=0.42.0" [dev-dependencies.farm] path = "../dex/farm" diff --git a/pause-all/meta/Cargo.toml b/pause-all/meta/Cargo.toml index 9a477b7b0..bcfe951d6 100644 --- a/pause-all/meta/Cargo.toml +++ b/pause-all/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.41.0" +version = "0.42.0" diff --git a/pause-all/tests/pause_all_test.rs b/pause-all/tests/pause_all_test.rs index 6a46cbbbf..37cc38e70 100644 --- a/pause-all/tests/pause_all_test.rs +++ b/pause-all/tests/pause_all_test.rs @@ -1,7 +1,9 @@ +#![allow(deprecated)] + use farm::Farm; use multiversx_sc::types::{Address, ManagedAddress, MultiValueEncoded, OperationCompletionStatus}; use multiversx_sc_scenario::{ - managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox::*, DebugApi, + managed_address, managed_biguint, managed_token_id, rust_biguint, whitebox_legacy::*, DebugApi, }; use pair::Pair; use pausable::{PausableModule, State}; diff --git a/pause-all/wasm/Cargo.toml b/pause-all/wasm/Cargo.toml index 09882a081..958a4a7e6 100644 --- a/pause-all/wasm/Cargo.toml +++ b/pause-all/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.41.0" +version = "=0.42.0" From df198583c2789a532690d963d515c5212c6f3da8 Mon Sep 17 00:00:00 2001 From: "dorin.iancu" Date: Tue, 29 Aug 2023 13:04:42 +0300 Subject: [PATCH 5/9] upgrade 0.43.2 --- common/common_errors/Cargo.toml | 2 +- common/common_structs/Cargo.toml | 2 +- common/modules/farm/config/Cargo.toml | 2 +- common/modules/farm/contexts/Cargo.toml | 4 ++-- common/modules/farm/events/Cargo.toml | 2 +- common/modules/farm/farm_base_impl/Cargo.toml | 6 +++--- common/modules/farm/farm_base_impl/src/base_farm_init.rs | 6 +----- common/modules/farm/farm_token/Cargo.toml | 4 ++-- common/modules/farm/farm_token_merge/Cargo.toml | 4 ++-- common/modules/farm/rewards/Cargo.toml | 4 ++-- common/modules/legacy_token_decode_module/Cargo.toml | 2 +- common/modules/locking_module/Cargo.toml | 2 +- common/modules/math/Cargo.toml | 2 +- common/modules/pausable/Cargo.toml | 2 +- common/modules/permissions_module/Cargo.toml | 2 +- common/modules/sc_whitelist_module/Cargo.toml | 2 +- common/modules/token_merge_helper/Cargo.toml | 2 +- common/modules/token_send/Cargo.toml | 2 +- common/modules/utils/Cargo.toml | 2 +- common/traits/fixed-supply-token/Cargo.toml | 2 +- common/traits/mergeable/Cargo.toml | 2 +- common/traits/unwrappable/Cargo.toml | 2 +- dex/Cargo.toml | 6 +++--- dex/farm-with-locked-rewards/Cargo.toml | 6 +++--- dex/farm-with-locked-rewards/meta/Cargo.toml | 2 +- dex/farm-with-locked-rewards/wasm/Cargo.toml | 2 +- dex/farm/Cargo.toml | 6 +++--- dex/farm/meta/Cargo.toml | 2 +- dex/farm/wasm/Cargo.toml | 2 +- dex/fuzz/Cargo.toml | 4 ++-- dex/governance/Cargo.toml | 4 ++-- dex/governance/meta/Cargo.toml | 2 +- dex/governance/wasm/Cargo.toml | 2 +- dex/pair-mock/Cargo.toml | 4 ++-- dex/pair-mock/meta/Cargo.toml | 2 +- dex/pair-mock/wasm/Cargo.toml | 2 +- dex/pair/Cargo.toml | 4 ++-- dex/pair/meta/Cargo.toml | 2 +- dex/pair/wasm-pair-full/Cargo.toml | 2 +- dex/pair/wasm-safe-price-view/Cargo.toml | 2 +- dex/pair/wasm/Cargo.toml | 2 +- dex/price-discovery/Cargo.toml | 6 +++--- dex/price-discovery/meta/Cargo.toml | 2 +- dex/price-discovery/wasm/Cargo.toml | 2 +- dex/proxy-deployer/Cargo.toml | 4 ++-- dex/proxy-deployer/meta/Cargo.toml | 2 +- dex/proxy-deployer/wasm/Cargo.toml | 2 +- dex/router/Cargo.toml | 4 ++-- dex/router/meta/Cargo.toml | 2 +- dex/router/wasm/Cargo.toml | 2 +- energy-integration/common-modules/energy-query/Cargo.toml | 2 +- .../common-modules/week-timekeeping/Cargo.toml | 2 +- .../common-modules/weekly-rewards-splitting/Cargo.toml | 2 +- energy-integration/common-types/Cargo.toml | 2 +- energy-integration/energy-factory-mock/Cargo.toml | 4 ++-- energy-integration/energy-factory-mock/meta/Cargo.toml | 2 +- energy-integration/energy-factory-mock/wasm/Cargo.toml | 2 +- energy-integration/energy-update/Cargo.toml | 6 +++--- energy-integration/energy-update/meta/Cargo.toml | 2 +- energy-integration/energy-update/wasm/Cargo.toml | 2 +- energy-integration/farm-boosted-yields/Cargo.toml | 2 +- energy-integration/fees-collector/Cargo.toml | 6 +++--- energy-integration/fees-collector/meta/Cargo.toml | 2 +- energy-integration/fees-collector/wasm/Cargo.toml | 2 +- energy-integration/governance-v2/Cargo.toml | 4 ++-- energy-integration/governance-v2/meta/Cargo.toml | 2 +- energy-integration/governance-v2/wasm/Cargo.toml | 2 +- farm-staking/farm-staking-proxy/Cargo.toml | 6 +++--- farm-staking/farm-staking-proxy/meta/Cargo.toml | 2 +- farm-staking/farm-staking-proxy/wasm/Cargo.toml | 2 +- farm-staking/farm-staking/Cargo.toml | 6 +++--- farm-staking/farm-staking/meta/Cargo.toml | 2 +- farm-staking/farm-staking/wasm/Cargo.toml | 2 +- farm-staking/metabonding-staking/Cargo.toml | 6 +++--- farm-staking/metabonding-staking/meta/Cargo.toml | 2 +- farm-staking/metabonding-staking/wasm/Cargo.toml | 2 +- locked-asset/Cargo.toml | 6 +++--- locked-asset/distribution/Cargo.toml | 4 ++-- locked-asset/distribution/meta/Cargo.toml | 2 +- locked-asset/distribution/wasm/Cargo.toml | 2 +- locked-asset/energy-factory/Cargo.toml | 6 +++--- locked-asset/energy-factory/meta/Cargo.toml | 2 +- locked-asset/energy-factory/wasm/Cargo.toml | 2 +- locked-asset/factory/Cargo.toml | 6 +++--- locked-asset/factory/meta/Cargo.toml | 2 +- locked-asset/factory/wasm/Cargo.toml | 2 +- locked-asset/lkmex-transfer/Cargo.toml | 6 +++--- locked-asset/lkmex-transfer/meta/Cargo.toml | 2 +- locked-asset/lkmex-transfer/wasm/Cargo.toml | 2 +- locked-asset/locked-token-wrapper/Cargo.toml | 6 +++--- locked-asset/locked-token-wrapper/meta/Cargo.toml | 2 +- locked-asset/locked-token-wrapper/wasm/Cargo.toml | 2 +- locked-asset/proxy_dex/Cargo.toml | 6 +++--- locked-asset/proxy_dex/meta/Cargo.toml | 2 +- locked-asset/proxy_dex/wasm/Cargo.toml | 2 +- locked-asset/simple-lock-whitelist/Cargo.toml | 6 +++--- locked-asset/simple-lock-whitelist/meta/Cargo.toml | 2 +- locked-asset/simple-lock-whitelist/wasm/Cargo.toml | 2 +- locked-asset/simple-lock/Cargo.toml | 6 +++--- locked-asset/simple-lock/meta/Cargo.toml | 2 +- locked-asset/simple-lock/wasm/Cargo.toml | 2 +- locked-asset/token-unstake/Cargo.toml | 6 +++--- locked-asset/token-unstake/meta/Cargo.toml | 2 +- locked-asset/token-unstake/wasm/Cargo.toml | 2 +- pause-all/Cargo.toml | 6 +++--- pause-all/meta/Cargo.toml | 2 +- pause-all/wasm/Cargo.toml | 2 +- 107 files changed, 160 insertions(+), 164 deletions(-) diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml index 2ac587ef5..499450be3 100644 --- a/common/common_errors/Cargo.toml +++ b/common/common_errors/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml index b74834ee6..f1ab9094c 100644 --- a/common/common_structs/Cargo.toml +++ b/common/common_structs/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml index e8a8d417a..2bf5d119e 100644 --- a/common/modules/farm/config/Cargo.toml +++ b/common/modules/farm/config/Cargo.toml @@ -22,5 +22,5 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml index bcc6faea2..8ab7c0cd5 100644 --- a/common/modules/farm/contexts/Cargo.toml +++ b/common/modules/farm/contexts/Cargo.toml @@ -34,8 +34,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml index f6e7008be..b19892e0b 100644 --- a/common/modules/farm/events/Cargo.toml +++ b/common/modules/farm/events/Cargo.toml @@ -13,5 +13,5 @@ path = "../../../common_structs" path = "../contexts" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/farm/farm_base_impl/Cargo.toml b/common/modules/farm/farm_base_impl/Cargo.toml index eab9a3ae1..e38957230 100644 --- a/common/modules/farm/farm_base_impl/Cargo.toml +++ b/common/modules/farm/farm_base_impl/Cargo.toml @@ -49,10 +49,10 @@ path = "../../../traits/mergeable" path = "../../../traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/common/modules/farm/farm_base_impl/src/base_farm_init.rs b/common/modules/farm/farm_base_impl/src/base_farm_init.rs index dcba4b6c4..700057a3e 100644 --- a/common/modules/farm/farm_base_impl/src/base_farm_init.rs +++ b/common/modules/farm/farm_base_impl/src/base_farm_init.rs @@ -1,6 +1,6 @@ multiversx_sc::imports!(); -use common_errors::{ERROR_NOT_AN_ESDT, ERROR_SAME_TOKEN_IDS, ERROR_ZERO_AMOUNT}; +use common_errors::{ERROR_NOT_AN_ESDT, ERROR_ZERO_AMOUNT}; use pausable::State; use permissions_module::Permissions; @@ -30,10 +30,6 @@ pub trait BaseFarmInitModule: ); require!(division_safety_constant != 0u64, ERROR_ZERO_AMOUNT); - let farm_token = self.farm_token().get_token_id(); - require!(reward_token_id != farm_token, ERROR_SAME_TOKEN_IDS); - require!(farming_token_id != farm_token, ERROR_SAME_TOKEN_IDS); - self.state().set(State::Inactive); self.division_safety_constant() .set_if_empty(&division_safety_constant); diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml index eca09fbb1..27579b189 100644 --- a/common/modules/farm/farm_token/Cargo.toml +++ b/common/modules/farm/farm_token/Cargo.toml @@ -25,8 +25,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" diff --git a/common/modules/farm/farm_token_merge/Cargo.toml b/common/modules/farm/farm_token_merge/Cargo.toml index 20289e13d..3458a9daa 100644 --- a/common/modules/farm/farm_token_merge/Cargo.toml +++ b/common/modules/farm/farm_token_merge/Cargo.toml @@ -22,8 +22,8 @@ path = "../../token_merge_helper" path = "../farm_token" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml index e3cbe0419..954b95342 100644 --- a/common/modules/farm/rewards/Cargo.toml +++ b/common/modules/farm/rewards/Cargo.toml @@ -28,8 +28,8 @@ path = "../../pausable" path = "../../permissions_module" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" diff --git a/common/modules/legacy_token_decode_module/Cargo.toml b/common/modules/legacy_token_decode_module/Cargo.toml index a0817d114..50d697c77 100644 --- a/common/modules/legacy_token_decode_module/Cargo.toml +++ b/common/modules/legacy_token_decode_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/modules/locking_module/Cargo.toml b/common/modules/locking_module/Cargo.toml index c55b00d69..6dbd6e89c 100644 --- a/common/modules/locking_module/Cargo.toml +++ b/common/modules/locking_module/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.simple-lock] diff --git a/common/modules/math/Cargo.toml b/common/modules/math/Cargo.toml index f0594e357..d591a6aa5 100644 --- a/common/modules/math/Cargo.toml +++ b/common/modules/math/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/pausable/Cargo.toml b/common/modules/pausable/Cargo.toml index 0b4300147..c332aed4c 100644 --- a/common/modules/pausable/Cargo.toml +++ b/common/modules/pausable/Cargo.toml @@ -10,5 +10,5 @@ path = "src/pausable.rs" path = "../permissions_module" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/permissions_module/Cargo.toml b/common/modules/permissions_module/Cargo.toml index aa19a0098..ce9642965 100644 --- a/common/modules/permissions_module/Cargo.toml +++ b/common/modules/permissions_module/Cargo.toml @@ -14,5 +14,5 @@ bitflags = "1.3.2" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/sc_whitelist_module/Cargo.toml b/common/modules/sc_whitelist_module/Cargo.toml index f5469987f..711661188 100644 --- a/common/modules/sc_whitelist_module/Cargo.toml +++ b/common/modules/sc_whitelist_module/Cargo.toml @@ -10,5 +10,5 @@ path = "src/sc_whitelist_module.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_merge_helper/Cargo.toml b/common/modules/token_merge_helper/Cargo.toml index 35ba6122f..56585e019 100644 --- a/common/modules/token_merge_helper/Cargo.toml +++ b/common/modules/token_merge_helper/Cargo.toml @@ -10,5 +10,5 @@ path = "src/lib.rs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml index f895e3524..bff76dcd0 100644 --- a/common/modules/token_send/Cargo.toml +++ b/common/modules/token_send/Cargo.toml @@ -13,5 +13,5 @@ path = "../../common_structs" path = "../../common_errors" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/modules/utils/Cargo.toml b/common/modules/utils/Cargo.toml index 66296dddc..0b229c058 100644 --- a/common/modules/utils/Cargo.toml +++ b/common/modules/utils/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.common_structs] diff --git a/common/traits/fixed-supply-token/Cargo.toml b/common/traits/fixed-supply-token/Cargo.toml index f81b16f66..c8a2679f9 100644 --- a/common/traits/fixed-supply-token/Cargo.toml +++ b/common/traits/fixed-supply-token/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" diff --git a/common/traits/mergeable/Cargo.toml b/common/traits/mergeable/Cargo.toml index c2629c71c..fce702ff2 100644 --- a/common/traits/mergeable/Cargo.toml +++ b/common/traits/mergeable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/common/traits/unwrappable/Cargo.toml b/common/traits/unwrappable/Cargo.toml index 6aff2032c..5ea86b7fb 100644 --- a/common/traits/unwrappable/Cargo.toml +++ b/common/traits/unwrappable/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/dex/Cargo.toml b/dex/Cargo.toml index 21226dbaf..7bf3dc375 100644 --- a/dex/Cargo.toml +++ b/dex/Cargo.toml @@ -4,17 +4,17 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.config] path = "../common/modules/farm/config" diff --git a/dex/farm-with-locked-rewards/Cargo.toml b/dex/farm-with-locked-rewards/Cargo.toml index bdbe34677..e111ba646 100644 --- a/dex/farm-with-locked-rewards/Cargo.toml +++ b/dex/farm-with-locked-rewards/Cargo.toml @@ -74,17 +74,17 @@ path = "../../locked-asset/energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.simple-lock] path = "../../locked-asset/simple-lock" diff --git a/dex/farm-with-locked-rewards/meta/Cargo.toml b/dex/farm-with-locked-rewards/meta/Cargo.toml index ff1dc11ca..4db13ec1d 100644 --- a/dex/farm-with-locked-rewards/meta/Cargo.toml +++ b/dex/farm-with-locked-rewards/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/farm-with-locked-rewards/wasm/Cargo.toml b/dex/farm-with-locked-rewards/wasm/Cargo.toml index 56abe71c5..7a33ece2d 100644 --- a/dex/farm-with-locked-rewards/wasm/Cargo.toml +++ b/dex/farm-with-locked-rewards/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/farm/Cargo.toml b/dex/farm/Cargo.toml index c98bc2e9b..c75ce1fcb 100644 --- a/dex/farm/Cargo.toml +++ b/dex/farm/Cargo.toml @@ -68,11 +68,11 @@ path = "../../energy-integration/common-modules/weekly-rewards-splitting" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies] num-bigint = "0.4.2" @@ -81,7 +81,7 @@ num-bigint = "0.4.2" path = "../../energy-integration/energy-update" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.energy-factory-mock] path = "../../energy-integration/energy-factory-mock" diff --git a/dex/farm/meta/Cargo.toml b/dex/farm/meta/Cargo.toml index d546f9321..777764d67 100644 --- a/dex/farm/meta/Cargo.toml +++ b/dex/farm/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/farm/wasm/Cargo.toml b/dex/farm/wasm/Cargo.toml index 6e6c4a5c2..c43c76ab2 100644 --- a/dex/farm/wasm/Cargo.toml +++ b/dex/farm/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/fuzz/Cargo.toml b/dex/fuzz/Cargo.toml index 0a3647b95..bd8bc2d8e 100644 --- a/dex/fuzz/Cargo.toml +++ b/dex/fuzz/Cargo.toml @@ -12,11 +12,11 @@ num-bigint = "0.4.2" rand = "0.8.4" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dependencies.pausable] path = "../../common/modules/pausable" diff --git a/dex/governance/Cargo.toml b/dex/governance/Cargo.toml index 3ebc9493d..5ceb95c9d 100644 --- a/dex/governance/Cargo.toml +++ b/dex/governance/Cargo.toml @@ -8,14 +8,14 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.pair-mock] path = "../pair-mock" diff --git a/dex/governance/meta/Cargo.toml b/dex/governance/meta/Cargo.toml index 97ae17c5e..0a183b8d9 100644 --- a/dex/governance/meta/Cargo.toml +++ b/dex/governance/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/governance/wasm/Cargo.toml b/dex/governance/wasm/Cargo.toml index adb5831a7..964b6bf7c 100644 --- a/dex/governance/wasm/Cargo.toml +++ b/dex/governance/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/pair-mock/Cargo.toml b/dex/pair-mock/Cargo.toml index 921328f78..a335ee5da 100644 --- a/dex/pair-mock/Cargo.toml +++ b/dex/pair-mock/Cargo.toml @@ -11,11 +11,11 @@ path = "src/pair.rs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.itertools] version = "0.10.1" default-features = false [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/pair-mock/meta/Cargo.toml b/dex/pair-mock/meta/Cargo.toml index 9e6ec9b08..f6dc3932d 100644 --- a/dex/pair-mock/meta/Cargo.toml +++ b/dex/pair-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/pair-mock/wasm/Cargo.toml b/dex/pair-mock/wasm/Cargo.toml index cf62f1077..0e43165cd 100644 --- a/dex/pair-mock/wasm/Cargo.toml +++ b/dex/pair-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/pair/Cargo.toml b/dex/pair/Cargo.toml index 559184b9d..32c1fae21 100644 --- a/dex/pair/Cargo.toml +++ b/dex/pair/Cargo.toml @@ -33,11 +33,11 @@ version = "0.10.1" default-features = false [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/pair/meta/Cargo.toml b/dex/pair/meta/Cargo.toml index b9869414c..26d231c9f 100644 --- a/dex/pair/meta/Cargo.toml +++ b/dex/pair/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/pair/wasm-pair-full/Cargo.toml b/dex/pair/wasm-pair-full/Cargo.toml index ca4c2c82c..b9e1841c2 100644 --- a/dex/pair/wasm-pair-full/Cargo.toml +++ b/dex/pair/wasm-pair-full/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/pair/wasm-safe-price-view/Cargo.toml b/dex/pair/wasm-safe-price-view/Cargo.toml index 9d2719a95..be0fd8731 100644 --- a/dex/pair/wasm-safe-price-view/Cargo.toml +++ b/dex/pair/wasm-safe-price-view/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/pair/wasm/Cargo.toml b/dex/pair/wasm/Cargo.toml index 2b6c9c8f5..02438d6bc 100644 --- a/dex/pair/wasm/Cargo.toml +++ b/dex/pair/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/price-discovery/Cargo.toml b/dex/price-discovery/Cargo.toml index 64e827a60..d62a52636 100644 --- a/dex/price-discovery/Cargo.toml +++ b/dex/price-discovery/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.locking_module] path = "../../common/modules/locking_module" @@ -30,4 +30,4 @@ hex = "0.4" path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/price-discovery/meta/Cargo.toml b/dex/price-discovery/meta/Cargo.toml index 4897cfd92..e611b98a7 100644 --- a/dex/price-discovery/meta/Cargo.toml +++ b/dex/price-discovery/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/price-discovery/wasm/Cargo.toml b/dex/price-discovery/wasm/Cargo.toml index 8fff57628..721537a54 100644 --- a/dex/price-discovery/wasm/Cargo.toml +++ b/dex/price-discovery/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/proxy-deployer/Cargo.toml b/dex/proxy-deployer/Cargo.toml index 7b4123b5a..85f723f1e 100644 --- a/dex/proxy-deployer/Cargo.toml +++ b/dex/proxy-deployer/Cargo.toml @@ -20,11 +20,11 @@ path = "../../common/modules/farm/config" path = "../../common/modules/farm/farm_token" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/proxy-deployer/meta/Cargo.toml b/dex/proxy-deployer/meta/Cargo.toml index 4ea12f805..728822284 100644 --- a/dex/proxy-deployer/meta/Cargo.toml +++ b/dex/proxy-deployer/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/proxy-deployer/wasm/Cargo.toml b/dex/proxy-deployer/wasm/Cargo.toml index c29ba0d40..4cf22608e 100644 --- a/dex/proxy-deployer/wasm/Cargo.toml +++ b/dex/proxy-deployer/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/router/Cargo.toml b/dex/router/Cargo.toml index 83dc3492a..401e90b89 100644 --- a/dex/router/Cargo.toml +++ b/dex/router/Cargo.toml @@ -14,7 +14,7 @@ path = "../../common/modules/token_send" path = "../../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.pair] @@ -26,4 +26,4 @@ path = "../../common/modules/locking_module" [dependencies.simple-lock] path = "../../locked-asset/simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/dex/router/meta/Cargo.toml b/dex/router/meta/Cargo.toml index 9b71b6e99..1952e09af 100644 --- a/dex/router/meta/Cargo.toml +++ b/dex/router/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/dex/router/wasm/Cargo.toml b/dex/router/wasm/Cargo.toml index 0256a67b3..f2a456292 100644 --- a/dex/router/wasm/Cargo.toml +++ b/dex/router/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/energy-integration/common-modules/energy-query/Cargo.toml b/energy-integration/common-modules/energy-query/Cargo.toml index fa86ab377..e4a52097c 100644 --- a/energy-integration/common-modules/energy-query/Cargo.toml +++ b/energy-integration/common-modules/energy-query/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-factory] diff --git a/energy-integration/common-modules/week-timekeeping/Cargo.toml b/energy-integration/common-modules/week-timekeeping/Cargo.toml index 08a32ef44..805abb126 100644 --- a/energy-integration/common-modules/week-timekeeping/Cargo.toml +++ b/energy-integration/common-modules/week-timekeeping/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.common-types] diff --git a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml index fb0f0c2dc..4cc3bb2c3 100644 --- a/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml +++ b/energy-integration/common-modules/weekly-rewards-splitting/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.energy-query] diff --git a/energy-integration/common-types/Cargo.toml b/energy-integration/common-types/Cargo.toml index ecb8bb89d..43fdc4687 100644 --- a/energy-integration/common-types/Cargo.toml +++ b/energy-integration/common-types/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] diff --git a/energy-integration/energy-factory-mock/Cargo.toml b/energy-integration/energy-factory-mock/Cargo.toml index 95588ec75..2268f1472 100644 --- a/energy-integration/energy-factory-mock/Cargo.toml +++ b/energy-integration/energy-factory-mock/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/energy-integration/energy-factory-mock/meta/Cargo.toml b/energy-integration/energy-factory-mock/meta/Cargo.toml index 2875e2307..0a0449eda 100644 --- a/energy-integration/energy-factory-mock/meta/Cargo.toml +++ b/energy-integration/energy-factory-mock/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/energy-integration/energy-factory-mock/wasm/Cargo.toml b/energy-integration/energy-factory-mock/wasm/Cargo.toml index 59674aaef..ec16f4fae 100644 --- a/energy-integration/energy-factory-mock/wasm/Cargo.toml +++ b/energy-integration/energy-factory-mock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/energy-integration/energy-update/Cargo.toml b/energy-integration/energy-update/Cargo.toml index 9855a3bd5..09d479864 100644 --- a/energy-integration/energy-update/Cargo.toml +++ b/energy-integration/energy-update/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.farm] path = "../../dex/farm" @@ -24,4 +24,4 @@ path = "../common-modules/weekly-rewards-splitting" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/energy-integration/energy-update/meta/Cargo.toml b/energy-integration/energy-update/meta/Cargo.toml index 6ba2d63b1..9b28309d9 100644 --- a/energy-integration/energy-update/meta/Cargo.toml +++ b/energy-integration/energy-update/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/energy-integration/energy-update/wasm/Cargo.toml b/energy-integration/energy-update/wasm/Cargo.toml index 4bc2db79c..5ccada06e 100644 --- a/energy-integration/energy-update/wasm/Cargo.toml +++ b/energy-integration/energy-update/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/energy-integration/farm-boosted-yields/Cargo.toml b/energy-integration/farm-boosted-yields/Cargo.toml index 51a690e35..443883813 100644 --- a/energy-integration/farm-boosted-yields/Cargo.toml +++ b/energy-integration/farm-boosted-yields/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.config] diff --git a/energy-integration/fees-collector/Cargo.toml b/energy-integration/fees-collector/Cargo.toml index c77e3e03b..1c01cc70f 100644 --- a/energy-integration/fees-collector/Cargo.toml +++ b/energy-integration/fees-collector/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.energy-query] path = "../common-modules/energy-query" @@ -48,7 +48,7 @@ path = "../../common/common_errors" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.sc_whitelist_module] path = "../../common/modules/sc_whitelist_module" diff --git a/energy-integration/fees-collector/meta/Cargo.toml b/energy-integration/fees-collector/meta/Cargo.toml index c050057c7..64c545255 100644 --- a/energy-integration/fees-collector/meta/Cargo.toml +++ b/energy-integration/fees-collector/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/energy-integration/fees-collector/wasm/Cargo.toml b/energy-integration/fees-collector/wasm/Cargo.toml index c394f7c6d..4c46ff2ee 100644 --- a/energy-integration/fees-collector/wasm/Cargo.toml +++ b/energy-integration/fees-collector/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/energy-integration/governance-v2/Cargo.toml b/energy-integration/governance-v2/Cargo.toml index 4dc4d683f..ab9768c6b 100644 --- a/energy-integration/governance-v2/Cargo.toml +++ b/energy-integration/governance-v2/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" path = "../common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.permissions_module] @@ -27,7 +27,7 @@ path = "../common-modules/weekly-rewards-splitting" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.energy-factory-mock] path = "../energy-factory-mock" diff --git a/energy-integration/governance-v2/meta/Cargo.toml b/energy-integration/governance-v2/meta/Cargo.toml index 1e2c7b5ac..f79ca0ab9 100644 --- a/energy-integration/governance-v2/meta/Cargo.toml +++ b/energy-integration/governance-v2/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/energy-integration/governance-v2/wasm/Cargo.toml b/energy-integration/governance-v2/wasm/Cargo.toml index bbae2b03e..767e42380 100644 --- a/energy-integration/governance-v2/wasm/Cargo.toml +++ b/energy-integration/governance-v2/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/farm-staking/farm-staking-proxy/Cargo.toml b/farm-staking/farm-staking-proxy/Cargo.toml index a66a88277..a9fba8db2 100644 --- a/farm-staking/farm-staking-proxy/Cargo.toml +++ b/farm-staking/farm-staking-proxy/Cargo.toml @@ -12,11 +12,11 @@ path = "src/lib.rs" hex-literal = "0.3.1" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.farm] path = "../../dex/farm" @@ -61,7 +61,7 @@ path = "../../common/modules/sc_whitelist_module" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.farm_token] path = "../../common/modules/farm/farm_token" diff --git a/farm-staking/farm-staking-proxy/meta/Cargo.toml b/farm-staking/farm-staking-proxy/meta/Cargo.toml index 2647116b3..7461b0f5b 100644 --- a/farm-staking/farm-staking-proxy/meta/Cargo.toml +++ b/farm-staking/farm-staking-proxy/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/farm-staking/farm-staking-proxy/wasm/Cargo.toml b/farm-staking/farm-staking-proxy/wasm/Cargo.toml index 912124ded..fc415475e 100644 --- a/farm-staking/farm-staking-proxy/wasm/Cargo.toml +++ b/farm-staking/farm-staking-proxy/wasm/Cargo.toml @@ -22,5 +22,5 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" features = ["vm-validate-token-identifier"] diff --git a/farm-staking/farm-staking/Cargo.toml b/farm-staking/farm-staking/Cargo.toml index 036fc5e1d..48523fc76 100644 --- a/farm-staking/farm-staking/Cargo.toml +++ b/farm-staking/farm-staking/Cargo.toml @@ -77,14 +77,14 @@ path = "../../common/common_structs" path = "../../common/common_errors" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/farm-staking/farm-staking/meta/Cargo.toml b/farm-staking/farm-staking/meta/Cargo.toml index 15e0d861c..0f03d3b72 100644 --- a/farm-staking/farm-staking/meta/Cargo.toml +++ b/farm-staking/farm-staking/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/farm-staking/farm-staking/wasm/Cargo.toml b/farm-staking/farm-staking/wasm/Cargo.toml index 13d4e5205..8a48c1058 100644 --- a/farm-staking/farm-staking/wasm/Cargo.toml +++ b/farm-staking/farm-staking/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/farm-staking/metabonding-staking/Cargo.toml b/farm-staking/metabonding-staking/Cargo.toml index d9c18ae26..d618306bf 100644 --- a/farm-staking/metabonding-staking/Cargo.toml +++ b/farm-staking/metabonding-staking/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.factory] path = "../../locked-asset/factory" @@ -21,7 +21,7 @@ path = "../../locked-asset/factory" num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.common_structs] path = "../../common/common_structs" diff --git a/farm-staking/metabonding-staking/meta/Cargo.toml b/farm-staking/metabonding-staking/meta/Cargo.toml index 2e1acb451..f944c4fce 100644 --- a/farm-staking/metabonding-staking/meta/Cargo.toml +++ b/farm-staking/metabonding-staking/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/farm-staking/metabonding-staking/wasm/Cargo.toml b/farm-staking/metabonding-staking/wasm/Cargo.toml index 76a1fde72..f4fab82b3 100644 --- a/farm-staking/metabonding-staking/wasm/Cargo.toml +++ b/farm-staking/metabonding-staking/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/Cargo.toml b/locked-asset/Cargo.toml index 72e7f786e..8c27ab608 100644 --- a/locked-asset/Cargo.toml +++ b/locked-asset/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.0" edition = "2021" publish = false [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.farm] @@ -49,7 +49,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/distribution/Cargo.toml b/locked-asset/distribution/Cargo.toml index 05da3b270..f40090c14 100644 --- a/locked-asset/distribution/Cargo.toml +++ b/locked-asset/distribution/Cargo.toml @@ -13,7 +13,7 @@ path = "../../common/common_structs" path = "../factory" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/distribution/meta/Cargo.toml b/locked-asset/distribution/meta/Cargo.toml index 599c2a126..eef847e32 100644 --- a/locked-asset/distribution/meta/Cargo.toml +++ b/locked-asset/distribution/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/distribution/wasm/Cargo.toml b/locked-asset/distribution/wasm/Cargo.toml index eb70848ae..bb3466e11 100644 --- a/locked-asset/distribution/wasm/Cargo.toml +++ b/locked-asset/distribution/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/energy-factory/Cargo.toml b/locked-asset/energy-factory/Cargo.toml index f164c78cb..a6aa2276f 100644 --- a/locked-asset/energy-factory/Cargo.toml +++ b/locked-asset/energy-factory/Cargo.toml @@ -32,11 +32,11 @@ path = "../../common/traits/unwrappable" path = "../../common/modules/legacy_token_decode_module" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies] num-bigint = "0.4.2" @@ -44,4 +44,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/energy-factory/meta/Cargo.toml b/locked-asset/energy-factory/meta/Cargo.toml index db4b5f52d..0bab3bc4d 100644 --- a/locked-asset/energy-factory/meta/Cargo.toml +++ b/locked-asset/energy-factory/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/energy-factory/wasm/Cargo.toml b/locked-asset/energy-factory/wasm/Cargo.toml index ba6f427b8..64c23e954 100644 --- a/locked-asset/energy-factory/wasm/Cargo.toml +++ b/locked-asset/energy-factory/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/factory/Cargo.toml b/locked-asset/factory/Cargo.toml index e2a659fc1..c353b9c9d 100644 --- a/locked-asset/factory/Cargo.toml +++ b/locked-asset/factory/Cargo.toml @@ -26,11 +26,11 @@ path = "../../common/modules/token_merge_helper" path = "../energy-factory" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.arrayvec] version = "0.7.1" @@ -49,4 +49,4 @@ hex = "0.4" path = "../simple-lock" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/factory/meta/Cargo.toml b/locked-asset/factory/meta/Cargo.toml index 7312ff4fa..4dac5cc03 100644 --- a/locked-asset/factory/meta/Cargo.toml +++ b/locked-asset/factory/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/factory/wasm/Cargo.toml b/locked-asset/factory/wasm/Cargo.toml index 22220e5d5..2d8adf3c9 100644 --- a/locked-asset/factory/wasm/Cargo.toml +++ b/locked-asset/factory/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/lkmex-transfer/Cargo.toml b/locked-asset/lkmex-transfer/Cargo.toml index a6d2e4b9a..05f05ce18 100644 --- a/locked-asset/lkmex-transfer/Cargo.toml +++ b/locked-asset/lkmex-transfer/Cargo.toml @@ -29,14 +29,14 @@ path = "../energy-factory" path = "../../energy-integration/common-modules/energy-query" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/lkmex-transfer/meta/Cargo.toml b/locked-asset/lkmex-transfer/meta/Cargo.toml index 76410a6b4..08a7e03f5 100644 --- a/locked-asset/lkmex-transfer/meta/Cargo.toml +++ b/locked-asset/lkmex-transfer/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/lkmex-transfer/wasm/Cargo.toml b/locked-asset/lkmex-transfer/wasm/Cargo.toml index 366cc607b..7555038a6 100644 --- a/locked-asset/lkmex-transfer/wasm/Cargo.toml +++ b/locked-asset/lkmex-transfer/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/locked-token-wrapper/Cargo.toml b/locked-asset/locked-token-wrapper/Cargo.toml index 105e22340..63c4884e1 100644 --- a/locked-asset/locked-token-wrapper/Cargo.toml +++ b/locked-asset/locked-token-wrapper/Cargo.toml @@ -8,10 +8,10 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.utils] path = "../../common/modules/utils" @@ -43,4 +43,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/locked-token-wrapper/meta/Cargo.toml b/locked-asset/locked-token-wrapper/meta/Cargo.toml index 5c0709dc7..1b5daca09 100644 --- a/locked-asset/locked-token-wrapper/meta/Cargo.toml +++ b/locked-asset/locked-token-wrapper/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/locked-token-wrapper/wasm/Cargo.toml b/locked-asset/locked-token-wrapper/wasm/Cargo.toml index 7d3bf7341..198c12da9 100644 --- a/locked-asset/locked-token-wrapper/wasm/Cargo.toml +++ b/locked-asset/locked-token-wrapper/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/proxy_dex/Cargo.toml b/locked-asset/proxy_dex/Cargo.toml index e4d6cb257..1038cdffa 100644 --- a/locked-asset/proxy_dex/Cargo.toml +++ b/locked-asset/proxy_dex/Cargo.toml @@ -44,11 +44,11 @@ path = "../../common/traits/mergeable" path = "../../common/traits/fixed-supply-token" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.energy-factory] path = "../energy-factory" @@ -65,7 +65,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.pausable] path = "../../common/modules/pausable" diff --git a/locked-asset/proxy_dex/meta/Cargo.toml b/locked-asset/proxy_dex/meta/Cargo.toml index 55c609a02..062ab5aaf 100644 --- a/locked-asset/proxy_dex/meta/Cargo.toml +++ b/locked-asset/proxy_dex/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/proxy_dex/wasm/Cargo.toml b/locked-asset/proxy_dex/wasm/Cargo.toml index 3070db804..440f1a190 100644 --- a/locked-asset/proxy_dex/wasm/Cargo.toml +++ b/locked-asset/proxy_dex/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/simple-lock-whitelist/Cargo.toml b/locked-asset/simple-lock-whitelist/Cargo.toml index 39882c1bd..e46c6f9d0 100644 --- a/locked-asset/simple-lock-whitelist/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/Cargo.toml @@ -14,11 +14,11 @@ path = "../simple-lock" path = "../../common/modules/utils" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies] num-bigint = "0.4.2" @@ -26,4 +26,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/simple-lock-whitelist/meta/Cargo.toml b/locked-asset/simple-lock-whitelist/meta/Cargo.toml index b146358f9..9707df924 100644 --- a/locked-asset/simple-lock-whitelist/meta/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml index aeef25cc8..638f49b8c 100644 --- a/locked-asset/simple-lock-whitelist/wasm/Cargo.toml +++ b/locked-asset/simple-lock-whitelist/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/simple-lock/Cargo.toml b/locked-asset/simple-lock/Cargo.toml index 7251cb4d2..ca79b9b58 100644 --- a/locked-asset/simple-lock/Cargo.toml +++ b/locked-asset/simple-lock/Cargo.toml @@ -8,11 +8,11 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dependencies.common_structs] path = "../../common/common_structs" @@ -23,4 +23,4 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/simple-lock/meta/Cargo.toml b/locked-asset/simple-lock/meta/Cargo.toml index 578259c66..b51468b2b 100644 --- a/locked-asset/simple-lock/meta/Cargo.toml +++ b/locked-asset/simple-lock/meta/Cargo.toml @@ -8,4 +8,4 @@ authors = ["Dorin Iancu "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/simple-lock/wasm/Cargo.toml b/locked-asset/simple-lock/wasm/Cargo.toml index 6c63e40f1..952e46e5d 100644 --- a/locked-asset/simple-lock/wasm/Cargo.toml +++ b/locked-asset/simple-lock/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/token-unstake/Cargo.toml b/locked-asset/token-unstake/Cargo.toml index a11a4a670..303074c0d 100644 --- a/locked-asset/token-unstake/Cargo.toml +++ b/locked-asset/token-unstake/Cargo.toml @@ -8,7 +8,7 @@ publish = false [lib] path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.mergeable] @@ -38,7 +38,7 @@ num-traits = "0.2" hex = "0.4" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" diff --git a/locked-asset/token-unstake/meta/Cargo.toml b/locked-asset/token-unstake/meta/Cargo.toml index 47fedd0b8..be6b1b488 100644 --- a/locked-asset/token-unstake/meta/Cargo.toml +++ b/locked-asset/token-unstake/meta/Cargo.toml @@ -8,4 +8,4 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/locked-asset/token-unstake/wasm/Cargo.toml b/locked-asset/token-unstake/wasm/Cargo.toml index d4e44421c..1c9a3a43d 100644 --- a/locked-asset/token-unstake/wasm/Cargo.toml +++ b/locked-asset/token-unstake/wasm/Cargo.toml @@ -23,4 +23,4 @@ default-features = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" diff --git a/pause-all/Cargo.toml b/pause-all/Cargo.toml index 49ee9d910..182a8459d 100644 --- a/pause-all/Cargo.toml +++ b/pause-all/Cargo.toml @@ -11,13 +11,13 @@ path = "src/lib.rs" path = "../common/modules/pausable" [dependencies.multiversx-sc] -version = "=0.42.0" +version = "=0.43.2" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.42.0" +version = "=0.43.2" [dev-dependencies.farm] path = "../dex/farm" diff --git a/pause-all/meta/Cargo.toml b/pause-all/meta/Cargo.toml index bcfe951d6..a9e79beef 100644 --- a/pause-all/meta/Cargo.toml +++ b/pause-all/meta/Cargo.toml @@ -10,4 +10,4 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.42.0" +version = "0.43.2" diff --git a/pause-all/wasm/Cargo.toml b/pause-all/wasm/Cargo.toml index 958a4a7e6..5bf81326a 100644 --- a/pause-all/wasm/Cargo.toml +++ b/pause-all/wasm/Cargo.toml @@ -22,4 +22,4 @@ panic = "abort" path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.42.0" +version = "=0.43.2" From c625a1bbd4a3c6679e97ce230c7602220a39336f Mon Sep 17 00:00:00 2001 From: "dorin.iancu" Date: Tue, 29 Aug 2023 14:03:51 +0300 Subject: [PATCH 6/9] fix test --- .../farm_with_locked_rewards_setup/mod.rs | 49 ++++++++++++++++++- .../tests/farm_setup/multi_user_farm_setup.rs | 49 ++++++++++++++++++- .../energy-factory/tests/old_tokens_test.rs | 24 ++++++--- .../tests/simple_lock_energy_test.rs | 10 +++- locked-asset/factory/src/lib.rs | 5 +- locked-asset/factory/tests/unlock_test.rs | 15 ++++-- 6 files changed, 131 insertions(+), 21 deletions(-) diff --git a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs index b51328190..f795108e6 100644 --- a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs +++ b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs @@ -27,6 +27,7 @@ use multiversx_sc_modules::pause::PauseModule; use pausable::{PausableModule, State}; use sc_whitelist_module::SCWhitelistModule; use simple_lock::locked_token::LockedTokenModule; +use week_timekeeping::Epoch; pub static REWARD_TOKEN_ID: &[u8] = b"MEX-123456"; pub static LOCKED_REWARD_TOKEN_ID: &[u8] = b"LOCKED-123456"; @@ -48,6 +49,14 @@ pub const EPOCHS_IN_YEAR: u64 = 360; pub static LOCK_OPTIONS: &[u64] = &[EPOCHS_IN_YEAR, 2 * EPOCHS_IN_YEAR, 4 * EPOCHS_IN_YEAR]; pub static PENALTY_PERCENTAGES: &[u64] = &[4_000, 6_000, 8_000]; +pub struct RawFarmTokenAttributes { + pub reward_per_share_bytes: Vec, + pub entering_epoch: Epoch, + pub compounded_reward_bytes: Vec, + pub current_farm_amount_bytes: Vec, + pub original_owner_bytes: [u8; 32], +} + pub struct FarmSetup where FarmObjBuilder: 'static + Copy + Fn() -> farm_with_locked_rewards::ContractObj, @@ -302,12 +311,50 @@ where attributes: FarmTokenAttributes, ) -> u64 { let mut result = 0; + + let raw_attributes = RawFarmTokenAttributes { + reward_per_share_bytes: attributes + .reward_per_share + .to_bytes_be() + .as_slice() + .to_vec(), + entering_epoch: attributes.entering_epoch, + compounded_reward_bytes: attributes + .compounded_reward + .to_bytes_be() + .as_slice() + .to_vec(), + current_farm_amount_bytes: attributes + .current_farm_amount + .to_bytes_be() + .as_slice() + .to_vec(), + original_owner_bytes: attributes.original_owner.to_byte_array(), + }; + self.b_mock .execute_query(&self.farm_wrapper, |sc| { + let attributes_managed = FarmTokenAttributes { + reward_per_share: multiversx_sc::types::BigUint::::from_bytes_be( + &raw_attributes.reward_per_share_bytes, + ), + entering_epoch: raw_attributes.entering_epoch, + compounded_reward: multiversx_sc::types::BigUint::::from_bytes_be( + &raw_attributes.compounded_reward_bytes, + ), + current_farm_amount: multiversx_sc::types::BigUint::::from_bytes_be( + &raw_attributes.current_farm_amount_bytes, + ), + original_owner: + multiversx_sc::types::ManagedAddress::::new_from_bytes( + &raw_attributes.original_owner_bytes, + ), + }; + let result_managed = sc.calculate_rewards_for_given_position( managed_address!(user), managed_biguint!(farm_token_amount), - attributes, + attributes_managed, ); result = result_managed.to_u64().unwrap(); }) diff --git a/dex/farm/tests/farm_setup/multi_user_farm_setup.rs b/dex/farm/tests/farm_setup/multi_user_farm_setup.rs index 00995b692..2536c837f 100644 --- a/dex/farm/tests/farm_setup/multi_user_farm_setup.rs +++ b/dex/farm/tests/farm_setup/multi_user_farm_setup.rs @@ -24,6 +24,7 @@ use farm_boosted_yields::FarmBoostedYieldsModule; use farm_token::FarmTokenModule; use pausable::{PausableModule, State}; use sc_whitelist_module::SCWhitelistModule; +use week_timekeeping::Epoch; use weekly_rewards_splitting::update_claim_progress_energy::UpdateClaimProgressEnergyModule; pub static REWARD_TOKEN_ID: &[u8] = b"REW-123456"; @@ -39,6 +40,14 @@ pub const USER_REWARDS_FARM_CONST: u64 = 2; pub const MIN_ENERGY_AMOUNT_FOR_BOOSTED_YIELDS: u64 = 1; pub const MIN_FARM_AMOUNT_FOR_BOOSTED_YIELDS: u64 = 1; +pub struct RawFarmTokenAttributes { + pub reward_per_share_bytes: Vec, + pub entering_epoch: Epoch, + pub compounded_reward_bytes: Vec, + pub current_farm_amount_bytes: Vec, + pub original_owner_bytes: [u8; 32], +} + pub struct MultiUserFarmSetup where FarmObjBuilder: 'static + Copy + Fn() -> farm::ContractObj, @@ -347,12 +356,50 @@ where attributes: FarmTokenAttributes, ) -> u64 { let mut result = 0; + + let raw_attributes = RawFarmTokenAttributes { + reward_per_share_bytes: attributes + .reward_per_share + .to_bytes_be() + .as_slice() + .to_vec(), + entering_epoch: attributes.entering_epoch, + compounded_reward_bytes: attributes + .compounded_reward + .to_bytes_be() + .as_slice() + .to_vec(), + current_farm_amount_bytes: attributes + .current_farm_amount + .to_bytes_be() + .as_slice() + .to_vec(), + original_owner_bytes: attributes.original_owner.to_byte_array(), + }; + self.b_mock .execute_query(&self.farm_wrapper, |sc| { + let attributes_managed = FarmTokenAttributes { + reward_per_share: multiversx_sc::types::BigUint::::from_bytes_be( + &raw_attributes.reward_per_share_bytes, + ), + entering_epoch: raw_attributes.entering_epoch, + compounded_reward: multiversx_sc::types::BigUint::::from_bytes_be( + &raw_attributes.compounded_reward_bytes, + ), + current_farm_amount: multiversx_sc::types::BigUint::::from_bytes_be( + &raw_attributes.current_farm_amount_bytes, + ), + original_owner: + multiversx_sc::types::ManagedAddress::::new_from_bytes( + &raw_attributes.original_owner_bytes, + ), + }; + let result_managed = sc.calculate_rewards_for_given_position( managed_address!(user), managed_biguint!(farm_token_amount), - attributes, + attributes_managed, ); result = result_managed.to_u64().unwrap(); }) diff --git a/locked-asset/energy-factory/tests/old_tokens_test.rs b/locked-asset/energy-factory/tests/old_tokens_test.rs index 6f39214ff..2e45d0d83 100644 --- a/locked-asset/energy-factory/tests/old_tokens_test.rs +++ b/locked-asset/energy-factory/tests/old_tokens_test.rs @@ -60,6 +60,8 @@ fn extend_lock_period_old_token_test() { managed_biguint!(60_000) * USER_BALANCE * (second_unlock_epoch - current_epoch) / 100_000u32; + let user_energy_amount_vec = user_energy_amount.to_bytes_be().as_slice().to_vec(); + setup .b_mock .execute_tx(&setup.owner, &setup.sc_wrapper, &rust_zero, |sc| { @@ -68,14 +70,14 @@ fn extend_lock_period_old_token_test() { let user_energy = ( managed_address!(&first_user), managed_biguint!(USER_BALANCE), - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), ) .into(); users_energy.push(user_energy); sc.set_energy_for_old_tokens(users_energy); let expected_energy = Energy::new( - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), 1, managed_biguint!(USER_BALANCE), ); @@ -177,6 +179,8 @@ fn min_period_migrated_token_test() { managed_biguint!(60_000) * USER_BALANCE * (second_unlock_epoch - current_epoch) / 100_000u32; + let user_energy_amount_vec = user_energy_amount.to_bytes_be().as_slice().to_vec(); + setup .b_mock .execute_tx(&setup.owner, &setup.sc_wrapper, &rust_zero, |sc| { @@ -185,14 +189,14 @@ fn min_period_migrated_token_test() { let user_energy = ( managed_address!(&first_user), managed_biguint!(USER_BALANCE), - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), ) .into(); users_energy.push(user_energy); sc.set_energy_for_old_tokens(users_energy); let expected_energy = Energy::new( - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), 1, managed_biguint!(USER_BALANCE), ); @@ -285,6 +289,8 @@ fn min_period_migrated_token_test2() { managed_biguint!(60_000) * USER_BALANCE * (second_unlock_epoch - current_epoch) / 100_000u32; + let user_energy_amount_vec = user_energy_amount.to_bytes_be().as_slice().to_vec(); + setup .b_mock .execute_tx(&setup.owner, &setup.sc_wrapper, &rust_zero, |sc| { @@ -294,14 +300,14 @@ fn min_period_migrated_token_test2() { let user_energy = ( managed_address!(&first_user), managed_biguint!(USER_BALANCE), - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), ) .into(); users_energy.push(user_energy); sc.set_energy_for_old_tokens(users_energy); let expected_energy = Energy::new( - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), 1441, managed_biguint!(USER_BALANCE), ); @@ -403,6 +409,8 @@ fn check_initial_old_unlock_schedule_decode_test() { managed_biguint!(60_000) * USER_BALANCE * (second_unlock_epoch - current_epoch) / 100_000u32; + let user_energy_amount_vec = user_energy_amount.to_bytes_be().as_slice().to_vec(); + setup .b_mock .execute_tx(&setup.owner, &setup.sc_wrapper, &rust_zero, |sc| { @@ -411,14 +419,14 @@ fn check_initial_old_unlock_schedule_decode_test() { let user_energy = ( managed_address!(&first_user), managed_biguint!(USER_BALANCE), - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), ) .into(); users_energy.push(user_energy); sc.set_energy_for_old_tokens(users_energy); let expected_energy = Energy::new( - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&user_energy_amount_vec), 1, managed_biguint!(USER_BALANCE), ); diff --git a/locked-asset/energy-factory/tests/simple_lock_energy_test.rs b/locked-asset/energy-factory/tests/simple_lock_energy_test.rs index 409ee1c1a..823a8eb56 100644 --- a/locked-asset/energy-factory/tests/simple_lock_energy_test.rs +++ b/locked-asset/energy-factory/tests/simple_lock_energy_test.rs @@ -4,6 +4,7 @@ mod energy_factory_setup; use energy_factory::energy::EnergyModule; use energy_factory_setup::*; +use multiversx_sc::types::BigUint; use simple_lock::locked_token::LockedTokenAttributes; use multiversx_sc_scenario::{ @@ -444,14 +445,19 @@ fn energy_deplete_test() { assert_eq!(actual_energy, expected_energy); current_epoch = 10; - let expected_energy = managed_biguint!(LOCK_OPTIONS[0] - current_epoch) * half_balance; + let expected_energy: BigUint = + managed_biguint!(LOCK_OPTIONS[0] - current_epoch) * half_balance; + let expected_energy_vec = expected_energy.to_bytes_be().as_slice().to_vec(); setup .b_mock .execute_query(&setup.sc_wrapper, |sc| { let mut energy = sc.user_energy(&managed_address!(&first_user)).get(); energy.deplete(current_epoch); - assert_eq!(energy.get_energy_amount(), expected_energy); + assert_eq!( + energy.get_energy_amount(), + BigUint::from_bytes_be(&expected_energy_vec) + ); }) .assert_ok(); } diff --git a/locked-asset/factory/src/lib.rs b/locked-asset/factory/src/lib.rs index d4e552905..21084b2f1 100644 --- a/locked-asset/factory/src/lib.rs +++ b/locked-asset/factory/src/lib.rs @@ -43,10 +43,7 @@ pub trait LockedAssetFactory: asset_token_id.is_valid_esdt_identifier(), "Asset token ID is not a valid esdt identifier" ); - require!( - asset_token_id != self.locked_asset_token().get_token_id(), - "Asset token ID cannot be the same as Locked asset token ID" - ); + let unlock_milestones = default_unlock_period.to_vec(); self.validate_unlock_milestones(&unlock_milestones); diff --git a/locked-asset/factory/tests/unlock_test.rs b/locked-asset/factory/tests/unlock_test.rs index 333d97b50..b1e26d7d7 100644 --- a/locked-asset/factory/tests/unlock_test.rs +++ b/locked-asset/factory/tests/unlock_test.rs @@ -817,7 +817,7 @@ fn update_energy_after_old_token_unlock_test() { &old_token_attributes, ); - let mut user_energy_amount = managed_biguint!(0); + let mut user_energy_amount: multiversx_sc::types::BigUint = managed_biguint!(0); user_energy_amount += managed_biguint!(20_000) * USER_BALANCE * (first_unlock_epoch - current_epoch) / 100_000u32; user_energy_amount += @@ -828,6 +828,8 @@ fn update_energy_after_old_token_unlock_test() { user_energy_amount += managed_biguint!(40_000) * USER_BALANCE * (forth_unlock_epoch - current_epoch) / 100_000u32; + let expected_energy_vec = user_energy_amount.to_bytes_be().as_slice().to_vec(); + setup .b_mock .execute_tx( @@ -841,14 +843,14 @@ fn update_energy_after_old_token_unlock_test() { let user_energy = ( managed_address!(&first_user), managed_biguint!(USER_BALANCE), - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&expected_energy_vec), ) .into(); users_energy.push(user_energy); sc.set_energy_for_old_tokens(users_energy); let expected_energy = Energy::new( - BigInt::from(user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&expected_energy_vec), 1441, managed_biguint!(USER_BALANCE), ); @@ -911,7 +913,8 @@ fn update_energy_after_old_token_unlock_test() { Some(&new_locked_token_attributes), ); - let mut final_user_energy_amount = managed_biguint!(0u64); + let mut final_user_energy_amount: multiversx_sc::types::BigUint = + managed_biguint!(0u64); final_user_energy_amount += managed_biguint!(33_333) * remaining_locked_token_balace * (third_unlock_epoch - current_epoch) @@ -921,11 +924,13 @@ fn update_energy_after_old_token_unlock_test() { * (forth_unlock_epoch - current_epoch) / 100_000u32; // 66_666 + 1 leftover + let final_amount_vec = final_user_energy_amount.to_bytes_be().as_slice().to_vec(); + setup .b_mock .execute_query(&setup.energy_factory_wrapper, |sc| { let expected_energy = Energy::new( - BigInt::from(final_user_energy_amount.clone()), + BigInt::from_signed_bytes_be(&final_amount_vec), current_epoch, managed_biguint!(remaining_locked_token_balace), ); From 49fe9a345c464b362337f5795ae95d658a48b7bf Mon Sep 17 00:00:00 2001 From: ovidiuolteanu Date: Tue, 29 Aug 2023 15:13:20 +0300 Subject: [PATCH 7/9] actions update --- .github/workflows/actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 3404f739e..c5fdba201 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -20,9 +20,9 @@ permissions: jobs: contracts: name: Contracts - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.0 + uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.1 with: - rust-toolchain: nightly-2023-04-23 + rust-toolchain: nightly-2023-05-26 vmtools-version: v1.4.60 secrets: token: ${{ secrets.GITHUB_TOKEN }} From 9293cd43ec09b2721dc44ea0a6adb1858cfe88f8 Mon Sep 17 00:00:00 2001 From: "dorin.iancu" Date: Wed, 30 Aug 2023 09:44:25 +0300 Subject: [PATCH 8/9] fix imports --- .../common-modules/weekly-rewards-splitting/src/base_impl.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/energy-integration/common-modules/weekly-rewards-splitting/src/base_impl.rs b/energy-integration/common-modules/weekly-rewards-splitting/src/base_impl.rs index e249aa9ba..c8579672d 100644 --- a/energy-integration/common-modules/weekly-rewards-splitting/src/base_impl.rs +++ b/energy-integration/common-modules/weekly-rewards-splitting/src/base_impl.rs @@ -1,6 +1,5 @@ multiversx_sc::imports!(); -use crate::update_claim_progress_energy::UpdateClaimProgressEnergyModule; use common_types::PaymentsVec; use week_timekeeping::Week; @@ -12,7 +11,8 @@ pub trait AllBaseWeeklyRewardsSplittingImplTraits = + week_timekeeping::WeekTimekeepingModule + crate::global_info::WeeklyRewardsGlobalInfo + crate::locked_token_buckets::WeeklyRewardsLockedTokenBucketsModule - + events::WeeklyRewardsSplittingEventsModule; + + events::WeeklyRewardsSplittingEventsModule + + crate::update_claim_progress_energy::UpdateClaimProgressEnergyModule; pub trait WeeklyRewardsSplittingTraitsModule { type WeeklyRewardsSplittingMod: AllBaseWeeklyRewardsSplittingImplTraits; From c48b882db4e93198bb215da16ba5cc92b5b8b083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Fri, 1 Sep 2023 11:10:47 +0300 Subject: [PATCH 9/9] Remove reference of older feature from Cargo.toml. --- farm-staking/farm-staking-proxy/wasm/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/farm-staking/farm-staking-proxy/wasm/Cargo.toml b/farm-staking/farm-staking-proxy/wasm/Cargo.toml index fc415475e..5e6c97a92 100644 --- a/farm-staking/farm-staking-proxy/wasm/Cargo.toml +++ b/farm-staking/farm-staking-proxy/wasm/Cargo.toml @@ -23,4 +23,3 @@ path = ".." [dependencies.multiversx-sc-wasm-adapter] version = "=0.43.2" -features = ["vm-validate-token-identifier"]