diff --git a/Cargo.lock b/Cargo.lock index 63b872e6..e5cd9391 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1251,9 +1251,9 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.43.4" +version = "0.43.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406939660d0c79dd191c6677f4b048df873a95f4531d8abafc9cdbe282bf1725" +checksum = "adbdd41a744caa562646c6d593df35caed84889e0d35df8b9ad8efc45457b5bd" dependencies = [ "bitflags 1.3.2", "hashbrown 0.13.2", @@ -1288,9 +1288,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.43.4" +version = "0.43.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e006240993963b482fe0682ae49b2d07255495e3c86706925d119137376cdfc" +checksum = "ebdaec412a272d8fd6668bc0b4b8674a5e03148aa72041a4705d502b86f4d9ce" dependencies = [ "hex", "proc-macro2", @@ -1301,9 +1301,9 @@ dependencies = [ [[package]] name = "multiversx-sc-meta" -version = "0.43.4" +version = "0.43.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467a1a945055107f0880d865a0854e3c67abd77c0f1dc65f6bc83abe082f424e" +checksum = "9578e4d3b8a9fd9b50b066630d2ec7d169a2c9e76fb129f47e6081e67f630fcd" dependencies = [ "anyhow", "clap", @@ -1323,23 +1323,25 @@ dependencies = [ "tempfile", "tokio", "toml", + "wasmparser 0.113.3", + "wasmprinter", "zip", ] [[package]] name = "multiversx-sc-modules" -version = "0.43.4" +version = "0.43.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75dc2548fe5072cad37b5c816d2344d7cd12e8cafb1a0ff8bbf2bc1829054710" +checksum = "45a02a1c14d05986661eff35beab26f5e72cdc44753b1f415eff64d6c4e4bc98" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-scenario" -version = "0.43.4" +version = "0.43.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5003813b6c5d703e6f973fcdef5aeed277182d49a75b73e255060f4c4c987b29" +checksum = "9f07016e6a8dd2152327e4d2904cbeb1ec1b3edb98b01660bfbce0f56453c7b5" dependencies = [ "base64 0.13.1", "bech32", @@ -2478,6 +2480,36 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +[[package]] +name = "wasmparser" +version = "0.113.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "286049849b5a5bd09a8773171be96824afabffc7cc3df6caaf33a38db6cd07ae" +dependencies = [ + "indexmap 2.0.2", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.115.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e06c0641a4add879ba71ccb3a1e4278fd546f76f1eafb21d8f7b07733b547cd5" +dependencies = [ + "indexmap 2.0.2", + "semver", +] + +[[package]] +name = "wasmprinter" +version = "0.2.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e74458a9bc5cc9c7108abfa0fe4dc88d5abf1f3baf194df3264985f17d559b5e" +dependencies = [ + "anyhow", + "wasmparser 0.115.0", +] + [[package]] name = "web-sys" version = "0.3.64" diff --git a/common/bls-signature/Cargo.toml b/common/bls-signature/Cargo.toml index b903700f..2c15cc2f 100644 --- a/common/bls-signature/Cargo.toml +++ b/common/bls-signature/Cargo.toml @@ -5,10 +5,10 @@ authors = ["dorin-iancu "] 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 index cb56d58d..58bdb8a1 100644 --- 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 "] 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 index 37d95cf7..5e6a5b6c 100644 --- a/common/token-module/Cargo.toml +++ b/common/token-module/Cargo.toml @@ -5,7 +5,7 @@ authors = ["dorin-iancu "] 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 index 5936c175..d1658847 100644 --- 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 index f33de3bc..9c87b257 100644 --- a/common/transaction/src/lib.rs +++ b/common/transaction/src/lib.rs @@ -35,50 +35,12 @@ pub struct TransferData { pub args: ManagedVec>, } -#[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 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 { - pub token_type: StolenFromFrameworkEsdtTokenType, + pub token_type: EsdtTokenType, pub amount: BigUint, pub frozen: bool, pub hash: ManagedBuffer, @@ -92,7 +54,7 @@ pub struct StolenFromFrameworkEsdtTokenData { impl Default for StolenFromFrameworkEsdtTokenData { 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 Default for StolenFromFrameworkEsdtTokenData { impl From> for StolenFromFrameworkEsdtTokenData { fn from(value: EsdtTokenData) -> 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 index b0336c64..0623db20 100644 --- 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 "] 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 index 84cc8022..7b469020 100644 --- 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 index 57c3072c..94183c03 100644 --- 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 index f43cdf87..63dc0440 100644 --- 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"