removed crypto-kitties dependency from crypto-zombies

contracts/examples/crypto-kitties/kitty-ownership/sc-config.toml

@@ -8,4 +8,4 @@ to = "kitty"
 path = "../../crypto-zombies/src/kitty_ownership_proxy.rs"
 [[proxy.path-rename]]
 from = "kitty::kitty"
-to = "kitty"
+to = "crate::kitty_obj"

contracts/examples/crypto-zombies/Cargo.toml

@@ -15,7 +15,3 @@ path = "../../../framework/base"
 [dev-dependencies.multiversx-sc-scenario]
 version = "0.49.0"
 path = "../../../framework/scenario"
-
-[dependencies.kitty]
-version = "0.0.0"
-path = "../../../contracts/examples/crypto-kitties/common/kitty"

contracts/examples/crypto-zombies/src/kitty_obj.rs

@@ -0,0 +1,40 @@
+use multiversx_sc::derive_imports::*;
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct Kitty {
+    pub genes: KittyGenes,
+    pub birth_time: u64,   // timestamp
+    pub cooldown_end: u64, // timestamp, used for pregnancy timer and siring cooldown
+    pub matron_id: u32,
+    pub sire_id: u32,
+    pub siring_with_id: u32, // for pregnant cats, 0 otherwise
+    pub nr_children: u16,    // cooldown period increases exponentially with every breeding/siring
+    pub generation: u16,     // max(sire_gen, matron_gen) + 1. Generation also influences cooldown.
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct KittyGenes {
+    pub fur_color: Color,
+    pub eye_color: Color,
+    pub meow_power: u8, // the higher the value, the louder the cat
+}
+
+#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, TypeAbi)]
+pub struct Color {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+}
+
+impl KittyGenes {
+    pub fn get_as_u64(&self) -> u64 {
+        (self.fur_color.as_u64() << 12 | self.eye_color.as_u64()) << 4
+            | self.meow_power.to_be() as u64
+    }
+}
+
+impl Color {
+    pub fn as_u64(&self) -> u64 {
+        ((self.r.to_be() as u64) << 4 | self.r.to_be() as u64) << 4 | self.r.to_be() as u64
+    }
+}

contracts/examples/crypto-zombies/src/kitty_ownership_proxy.rs

@@ -241,7 +241,7 @@ where
     >(
         self,
         kitty_id: Arg0,
-    ) -> TxProxyCall<Env, From, To, Gas, kitty::Kitty> {
+    ) -> TxProxyCall<Env, From, To, Gas, crate::kitty_obj::Kitty> {
         self.wrapped_tx
             .raw_call("getKittyById")
             .argument(&kitty_id)

contracts/examples/crypto-zombies/src/lib.rs

@@ -2,6 +2,7 @@
 
 use multiversx_sc::imports::*;
 
+pub mod kitty_obj;
 pub mod kitty_ownership_proxy;
 pub mod proxy_crypto_zombies;
 mod storage;

contracts/examples/crypto-zombies/src/zombie_feeding.rs

@@ -38,7 +38,7 @@ pub trait ZombieFeeding:
     #[callback]
     fn get_kitty_callback(
         &self,
-        #[call_result] result: ManagedAsyncCallResult<kitty::Kitty>,
+        #[call_result] result: ManagedAsyncCallResult<crate::kitty_obj::Kitty>,
         zombie_id: usize,
     ) {
         match result {