From 426468d7ebe4f31b8d4daebc21af5567c5991b0c Mon Sep 17 00:00:00 2001
From: Aleksandar Brayanov <aleksandar@chexvisual.co.uk>
Date: Thu, 21 Mar 2024 03:50:52 +0000
Subject: [PATCH] fixed FungibleTokenId serialization/deserialization  error

---
 Cargo.lock                      | 8 ++++----
 Cargo.toml                      | 2 +-
 primitives/metaverse/Cargo.toml | 9 +++++----
 primitives/metaverse/src/lib.rs | 7 ++++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fb118f0a..d9daf37d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12713,18 +12713,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index fb074fa1..beeb950b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ resolver = "2"
 # General 
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["max-encoded-len"] }
 serde_json = { version = "=1.0.105", default-features = false }
-serde = { version = "=1.0.193", default-features = false, features = ["derive", "alloc"] }
+serde = { version = "=1.0.194", default-features = false, features = ["derive", "alloc"] }
 scale-info = { version = "2.9.0", features = ["derive"], default-features = false }
 hex-literal = { version = "0.4.1" }
 log = { version = "0.4.20", default-features = false }
diff --git a/primitives/metaverse/Cargo.toml b/primitives/metaverse/Cargo.toml
index c8ebebab..001e21f2 100644
--- a/primitives/metaverse/Cargo.toml
+++ b/primitives/metaverse/Cargo.toml
@@ -5,8 +5,7 @@ authors = ["Metaverse.Network & Bit.Country Developers"]
 edition = '2021'
 
 [dependencies]
-serde = { workspace = true, optional = true, features = ["derive"] }
-serde_json = { workspace = true }
+serde = { workspace = true, features = ["derive", "alloc"] }
 codec = { workspace = true, package = "parity-scale-codec" }
 scale-info = { workspace = true }
 hex-literal = { workspace = true }
@@ -20,11 +19,13 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 xcm = { workspace = true }
 
+[dev-dependencies]
+serde_json = { workspace = true }
+
 [features]
 default = ["std"]
 std = [
-    "serde",
-    "serde_json/std",
+    "serde/std",
     "num_enum/std",
     "codec/std",
     "scale-info/std",
diff --git a/primitives/metaverse/src/lib.rs b/primitives/metaverse/src/lib.rs
index ad1544bc..8c4374a5 100644
--- a/primitives/metaverse/src/lib.rs
+++ b/primitives/metaverse/src/lib.rs
@@ -19,7 +19,7 @@
 
 use codec::{Decode, Encode, HasCompact, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
+//#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::traits::AtLeast32Bit;
 use sp_runtime::RuntimeDebug;
@@ -171,8 +171,9 @@ impl<Balance: AtLeast32Bit + Copy> ItemId<Balance> {
 	}
 }
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, MaxEncodedLen, PartialOrd, Ord, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, MaxEncodedLen, PartialOrd, Ord, TypeInfo, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+//#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum FungibleTokenId {
 	NativeToken(TokenId),
 	FungibleToken(TokenId),