Merge branch 'rc/v3.0' into simple-lock-exit-farm-with-penalty-fix

multiversx · Jun 20, 2024 · 81be5bb · 81be5bb
2 parents 78fa9a1 + a639089
commit 81be5bb
Show file tree

Hide file tree

Showing 179 changed files with 1,466 additions and 1,088 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.mergeable]

diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml
@@ -23,5 +23,5 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml
@@ -35,8 +35,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.4"
diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml
@@ -14,5 +14,5 @@ path = "../../../common_structs"
 path = "../contexts"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 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
@@ -50,11 +50,11 @@ path = "../../../traits/mergeable"
 path = "../../../traits/fixed-supply-token"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.4"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.48.1"
+version = "=0.50.4"
diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml
@@ -26,8 +26,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.4"
diff --git a/common/modules/farm/farm_token_merge/Cargo.toml b/common/modules/farm/farm_token_merge/Cargo.toml
@@ -23,11 +23,11 @@ path = "../../token_merge_helper"
 path = "../farm_token"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.4"
 
 [workspace]
 members = ["."]
diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml
@@ -29,8 +29,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.4"
diff --git a/common/modules/legacy_token_decode_module/Cargo.toml b/common/modules/legacy_token_decode_module/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 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
@@ -8,7 +8,7 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.simple-lock]

diff --git a/common/modules/locking_module/src/lock_with_energy_module.rs b/common/modules/locking_module/src/lock_with_energy_module.rs
@@ -36,7 +36,7 @@ pub trait LockWithEnergyModule {
             .execute_on_dest_context()
     }
 
-    fn get_locking_sc_proxy_instance(&self) -> energy_factory::Proxy<Self::Api> {
+    fn get_locking_sc_proxy_instance(&self) -> energy_factory::ProxyTo<Self::Api> {
         let locking_sc_address = self.locking_sc_address().get();
         self.locking_sc_proxy_obj(locking_sc_address)
     }

diff --git a/common/modules/locking_module/src/locking_module.rs b/common/modules/locking_module/src/locking_module.rs
@@ -53,13 +53,13 @@ pub trait LockingModule {
             .execute_on_dest_context()
     }
 
-    fn get_locking_sc_proxy_instance(&self) -> simple_lock::Proxy<Self::Api> {
+    fn get_locking_sc_proxy_instance(&self) -> simple_lock::ProxyTo<Self::Api> {
         let locking_sc_address = self.locking_sc_address().get();
         self.locking_sc_proxy_obj(locking_sc_address)
     }
 
     #[proxy]
-    fn locking_sc_proxy_obj(&self, sc_address: ManagedAddress) -> simple_lock::Proxy<Self::Api>;
+    fn locking_sc_proxy_obj(&self, sc_address: ManagedAddress) -> simple_lock::ProxyTo<Self::Api>;
 
     #[view(getLockingScAddress)]
     #[storage_mapper("lockingScAddress")]

diff --git a/common/modules/math/Cargo.toml b/common/modules/math/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/pausable/Cargo.toml b/common/modules/pausable/Cargo.toml
@@ -11,5 +11,5 @@ path = "src/pausable.rs"
 path = "../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/permissions_module/Cargo.toml b/common/modules/permissions_module/Cargo.toml
@@ -17,5 +17,5 @@ bitflags = "2.4.1"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/permissions_module/src/permissions.rs b/common/modules/permissions_module/src/permissions.rs
@@ -1,6 +1,6 @@
 use bitflags::bitflags;
 use multiversx_sc::{
-    abi::TypeAbi,
+    abi::{TypeAbi, TypeAbiFrom},
     codec::{DecodeError, TopDecode, TopEncode},
 };
 bitflags! {
@@ -32,8 +32,16 @@ impl TopDecode for Permissions {
     }
 }
 
-impl TypeAbi for Permissions {
-    fn type_name() -> multiversx_sc::abi::TypeName {
-        core::any::type_name::<u32>().into()
-    }
-}
+impl TypeAbiFrom<Self> for Permissions {}
+
+ impl TypeAbi for Permissions {
+     type Unmanaged = Self;
+
+     fn type_name() -> multiversx_sc::abi::TypeName {
+         core::any::type_name::<u32>().into()
+     }
+
+     fn type_name_rust() -> multiversx_sc::abi::TypeName {
+         core::any::type_name::<u32>().into()
+     }
+ }
diff --git a/common/modules/permissions_module/src/permissions_module.rs b/common/modules/permissions_module/src/permissions_module.rs
@@ -1,6 +1,6 @@
 #![no_std]
 
-mod permissions;
+pub mod permissions;
 
 use common_errors::ERROR_PERMISSION_DENIED;
 

diff --git a/common/modules/sc_whitelist_module/Cargo.toml b/common/modules/sc_whitelist_module/Cargo.toml
@@ -11,5 +11,5 @@ path = "src/sc_whitelist_module.rs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/token_merge_helper/Cargo.toml b/common/modules/token_merge_helper/Cargo.toml
@@ -11,5 +11,5 @@ path = "src/lib.rs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml
@@ -14,5 +14,5 @@ path = "../../common_structs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/utils/Cargo.toml b/common/modules/utils/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 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
@@ -8,4 +8,4 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
diff --git a/common/traits/mergeable/Cargo.toml b/common/traits/mergeable/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/traits/unwrappable/Cargo.toml b/common/traits/unwrappable/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/dex/Cargo.toml b/dex/Cargo.toml
@@ -5,17 +5,17 @@ edition = "2021"
 publish = false
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dev-dependencies]
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.4"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.48.1"
+version = "=0.50.4"
 
 [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
@@ -75,17 +75,17 @@ path = "../../locked-asset/energy-factory"
 path = "../../energy-integration/common-modules/energy-query"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.4"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.4"
 
 [dev-dependencies]
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.48.1"
+version = "=0.50.4"
 
 [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
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.48.1"
+version = "0.50.4"
 default-features = false