Merge pull request #13 from multiversx/upgrade-0.43.5

Upgrade 0.43.5
multiversx · Oct 18, 2023 · f9c654b · f9c654b
2 parents ac5fc80 + ba2a3ec
commit f9c654b
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/bls-signature/Cargo.toml b/common/bls-signature/Cargo.toml
@@ -5,10 +5,10 @@ authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
 
 [dependencies.multiversx-sc]
-version = "0.43.4"
+version = "=0.43.5"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.43.4"
+version = "=0.43.5"
 
 [dependencies.transaction]
 path = "../transaction"
diff --git a/common/max-bridged-amount-module/Cargo.toml b/common/max-bridged-amount-module/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.0.0"
 authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
 [dependencies.multiversx-sc]
-version = "0.43.4"
+version = "=0.43.5"
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.43.4"
+version = "=0.43.5"
diff --git a/common/token-module/Cargo.toml b/common/token-module/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
 
 [dependencies.multiversx-sc]
-version = "0.43.4"
+version = "=0.43.5"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.43.4"
+version = "=0.43.5"
diff --git a/common/transaction/Cargo.toml b/common/transaction/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "0.43.4"
+version = "=0.43.5"
diff --git a/common/transaction/src/lib.rs b/common/transaction/src/lib.rs
@@ -35,50 +35,12 @@ pub struct TransferData<M: ManagedTypeApi> {
     pub args: ManagedVec<M, ManagedBuffer<M>>,
 }
 
-#[derive(
-    TopDecode,
-    TopEncode,
-    NestedDecode,
-    NestedEncode,
-    Clone,
-    PartialEq,
-    Eq,
-    Debug,
-    TypeAbi,
-    ManagedVecItem,
-)]
-pub enum StolenFromFrameworkEsdtTokenType {
-    Fungible,
-    NonFungible,
-    SemiFungible,
-    Meta,
-    Invalid,
-}
-
-impl Default for StolenFromFrameworkEsdtTokenType {
-    #[inline]
-    fn default() -> Self {
-        Self::Fungible
-    }
-}
-
-impl From<EsdtTokenType> for StolenFromFrameworkEsdtTokenType {
-    fn from(value: EsdtTokenType) -> Self {
-        match value {
-            EsdtTokenType::Fungible => StolenFromFrameworkEsdtTokenType::Fungible,
-            EsdtTokenType::NonFungible => StolenFromFrameworkEsdtTokenType::NonFungible,
-            EsdtTokenType::SemiFungible => StolenFromFrameworkEsdtTokenType::SemiFungible,
-            EsdtTokenType::Meta => StolenFromFrameworkEsdtTokenType::Meta,
-            EsdtTokenType::Invalid => StolenFromFrameworkEsdtTokenType::Invalid,
-        }
-    }
-}
-
+// Temporary until Clone is implemented for EsdtTokenData
 #[derive(
     TopDecode, TopEncode, NestedDecode, NestedEncode, TypeAbi, Debug, ManagedVecItem, Clone,
 )]
 pub struct StolenFromFrameworkEsdtTokenData<M: ManagedTypeApi> {
-    pub token_type: StolenFromFrameworkEsdtTokenType,
+    pub token_type: EsdtTokenType,
     pub amount: BigUint<M>,
     pub frozen: bool,
     pub hash: ManagedBuffer<M>,
@@ -92,7 +54,7 @@ pub struct StolenFromFrameworkEsdtTokenData<M: ManagedTypeApi> {
 impl<M: ManagedTypeApi> Default for StolenFromFrameworkEsdtTokenData<M> {
     fn default() -> Self {
         StolenFromFrameworkEsdtTokenData {
-            token_type: StolenFromFrameworkEsdtTokenType::Fungible,
+            token_type: EsdtTokenType::Fungible,
             amount: BigUint::zero(),
             frozen: false,
             hash: ManagedBuffer::new(),
@@ -108,7 +70,7 @@ impl<M: ManagedTypeApi> Default for StolenFromFrameworkEsdtTokenData<M> {
 impl<M: ManagedTypeApi> From<EsdtTokenData<M>> for StolenFromFrameworkEsdtTokenData<M> {
     fn from(value: EsdtTokenData<M>) -> Self {
         StolenFromFrameworkEsdtTokenData {
-            token_type: value.token_type.into(),
+            token_type: value.token_type,
             amount: value.amount,
             frozen: value.frozen,
             hash: value.hash,

diff --git a/common/tx-batch-module/Cargo.toml b/common/tx-batch-module/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.0.0"
 authors = ["dorin-iancu <[email protected]>"]
 edition = "2018"
 [dependencies.multiversx-sc]
-version = "0.43.4"
+version = "=0.43.5"
 
 [dependencies.transaction]
 path = "../transaction"
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.43.4"
+version = "=0.43.5"
diff --git a/esdt-safe/Cargo.toml b/esdt-safe/Cargo.toml
@@ -24,11 +24,11 @@ path = "../common/max-bridged-amount-module"
 path = "../common/bls-signature"
 
 [dependencies.multiversx-sc]
-version = "0.43.4"
+version = "=0.43.5"
 features = [ "promises" ]
 
 [dependencies.multiversx-sc-modules]
-version = "0.43.4"
+version = "=0.43.5"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.43.4"
+version = "=0.43.5"
diff --git a/esdt-safe/meta/Cargo.toml b/esdt-safe/meta/Cargo.toml
@@ -10,4 +10,4 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.43.4"
+version = "=0.43.5"
diff --git a/esdt-safe/wasm/Cargo.toml b/esdt-safe/wasm/Cargo.toml
@@ -22,4 +22,4 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.43.4"
+version = "=0.43.5"