contracts: optimization: use IntrospectPacked

BibliothecaDAO · Jul 27, 2024 · 492931b · 492931b
1 parent 129d83f
commit 492931b
Show file tree

Hide file tree

Showing 27 changed files with 67 additions and 68 deletions.
diff --git a/contracts/src/models/bank/bank.cairo b/contracts/src/models/bank/bank.cairo
@@ -3,7 +3,7 @@ use eternum::alias::ID;
 use starknet::ContractAddress;
 
 // Used as helper struct throughout the world
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Bank {
     #[key]

diff --git a/contracts/src/models/bank/liquidity.cairo b/contracts/src/models/bank/liquidity.cairo
@@ -31,7 +31,7 @@ impl IntrospectFixed of Introspect<Fixed> {
     }
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Liquidity {
     #[key]

diff --git a/contracts/src/models/bank/market.cairo b/contracts/src/models/bank/market.cairo
@@ -35,7 +35,7 @@ impl IntrospectFixed of Introspect<Fixed> {
     }
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Market {
     #[key]

diff --git a/contracts/src/models/buildings.cairo b/contracts/src/models/buildings.cairo
@@ -18,7 +18,7 @@ use eternum::models::resources::{Resource, ResourceCustomImpl, ResourceCost};
 
 //todo we need to define border of innner hexes
 
-#[derive(PartialEq, Copy, Drop, Serde)]
+#[derive(IntrospectPacked, PartialEq, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Building {
     #[key]
@@ -36,7 +36,7 @@ pub struct Building {
     outer_entity_id: ID,
 }
 
-#[derive(PartialEq, Copy, Drop, Serde)]
+#[derive(IntrospectPacked, PartialEq, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct BuildingQuantityv2 {
     #[key]
@@ -48,7 +48,6 @@ pub struct BuildingQuantityv2 {
 
 
 #[derive(PartialEq, Copy, Drop, Serde, Introspect)]
-#[dojo::model]
 enum BuildingCategory {
     None,
     Castle,

diff --git a/contracts/src/models/capacity.cairo b/contracts/src/models/capacity.cairo
@@ -3,7 +3,7 @@ use eternum::models::quantity::{Quantity, QuantityCustomTrait};
 use eternum::models::weight::{Weight};
 
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Capacity {
     #[key]

diff --git a/contracts/src/models/combat.cairo b/contracts/src/models/combat.cairo
@@ -28,7 +28,7 @@ use eternum::utils::number::NumberTrait;
 const STRENGTH_PRECISION: u256 = 10_000;
 
 
-#[derive(Copy, Drop, Serde, Default)]
+#[derive(IntrospectPacked, Copy, Drop, Serde, Default)]
 #[dojo::model]
 pub struct Health {
     #[key]
@@ -290,7 +290,7 @@ impl ArmyQuantityTracker of ArmyQuantityTrackerTrait {
     }
 }
 
-#[derive(Copy, Drop, Serde, Default)]
+#[derive(IntrospectPacked, Copy, Drop, Serde, Default)]
 #[dojo::model]
 pub struct Army {
     #[key]
@@ -385,7 +385,7 @@ impl ArmyCustomImpl of ArmyCustomTrait {
 }
 
 
-#[derive(Copy, Drop, Serde, Default)]
+#[derive(IntrospectPacked, Copy, Drop, Serde, Default)]
 #[dojo::model]
 pub struct Protector {
     #[key]
@@ -400,7 +400,7 @@ impl ProtectorCustomImpl of ProtectorCustomTrait {
     }
 }
 
-#[derive(Copy, Drop, Serde, Default)]
+#[derive(IntrospectPacked, Copy, Drop, Serde, Default)]
 #[dojo::model]
 pub struct Protectee {
     #[key]
@@ -428,7 +428,7 @@ impl ProtecteeCustomImpl of ProtecteeCustomTrait {
 }
 
 
-#[derive(Copy, Drop, Serde, Default)]
+#[derive(IntrospectPacked, Copy, Drop, Serde, Default)]
 #[dojo::model]
 pub struct Battle {
     #[key]

diff --git a/contracts/src/models/config.cairo b/contracts/src/models/config.cairo
@@ -13,7 +13,7 @@ use starknet::ContractAddress;
 // GLOBAL CONFIGS
 //
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct WorldConfig {
     #[key]
@@ -22,7 +22,7 @@ pub struct WorldConfig {
     realm_l2_contract: ContractAddress,
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct RealmFreeMintConfig {
     #[key]
@@ -32,7 +32,7 @@ pub struct RealmFreeMintConfig {
 }
 
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct RoadConfig {
     #[key]
@@ -42,7 +42,7 @@ pub struct RoadConfig {
     speed_up_by: u64
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct HyperstructureResourceConfig {
     #[key]
@@ -57,7 +57,7 @@ pub struct HyperstructureResourceConfig {
 // that it's a config for one specific entity type?
 // and not the same as world config
 // e.g. EntityTypeCapacityConfig?
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct CapacityConfig {
     #[key]
@@ -76,7 +76,7 @@ impl CapacityConfigCustomImpl of CapacityConfigCustomTrait {
 }
 
 // speed
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct SpeedConfig {
     #[key]
@@ -88,7 +88,7 @@ pub struct SpeedConfig {
 }
 
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct MapExploreConfig {
     #[key]
@@ -100,7 +100,7 @@ pub struct MapExploreConfig {
 }
 
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct TickConfig {
     #[key]
@@ -110,7 +110,7 @@ pub struct TickConfig {
     tick_interval_in_seconds: u64
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct StaminaConfig {
     #[key]
@@ -169,7 +169,7 @@ impl TickImpl of TickTrait {
 
 
 // weight
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct WeightConfig {
     #[key]
@@ -189,7 +189,7 @@ impl WeightConfigCustomImpl of WeightConfigCustomTrait {
     }
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct LevelingConfig {
     #[key]
@@ -212,7 +212,7 @@ pub struct LevelingConfig {
     resource_3_cost_count: u32
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct ProductionConfig {
     #[key]
@@ -226,7 +226,7 @@ pub struct ProductionConfig {
 }
 
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct BankConfig {
     #[key]
@@ -236,7 +236,7 @@ pub struct BankConfig {
     lp_fee_denom: u128,
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct BuildingConfig {
     #[key]
@@ -264,7 +264,7 @@ impl BuildingConfigCustomImpl of BuildingConfigCustomTrait {
     }
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct TroopConfig {
     #[key]
@@ -300,7 +300,7 @@ impl TroopConfigCustomImpl of TroopConfigCustomTrait {
 }
 
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct BattleConfig {
     #[key]
@@ -316,7 +316,7 @@ impl BattleConfigCustomImpl of BattleConfigCustomTrait {
 }
 
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct BuildingCategoryPopConfig {
     #[key]
@@ -327,7 +327,7 @@ pub struct BuildingCategoryPopConfig {
     capacity: u32, // increase capacity by this amount
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct PopulationConfig {
     #[key]
@@ -349,7 +349,7 @@ impl HyperstructureConfigCustomImpl of HyperstructureConfigCustomTrait {
     }
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct HasClaimedStartingResources {
     #[key]

diff --git a/contracts/src/models/guild.cairo b/contracts/src/models/guild.cairo
@@ -1,7 +1,7 @@
 use eternum::alias::ID;
 use starknet::ContractAddress;
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Guild {
     #[key]
@@ -10,15 +10,15 @@ pub struct Guild {
     member_count: u16
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct GuildMember {
     #[key]
     address: ContractAddress,
     guild_entity_id: ID
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct GuildWhitelist {
     #[key]

diff --git a/contracts/src/models/hyperstructure.cairo b/contracts/src/models/hyperstructure.cairo
@@ -1,7 +1,7 @@
 use eternum::alias::ID;
 use starknet::ContractAddress;
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Progress {
     #[key]
@@ -11,7 +11,7 @@ pub struct Progress {
     amount: u128,
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Contribution {
     #[key]

diff --git a/contracts/src/models/level.cairo b/contracts/src/models/level.cairo
@@ -6,7 +6,7 @@ use eternum::constants::{LevelIndex};
 use eternum::models::config::{LevelingConfig};
 use eternum::models::resources::{ResourceCost};
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Level {
     #[key]

diff --git a/contracts/src/models/map.cairo b/contracts/src/models/map.cairo
@@ -2,7 +2,7 @@ use eternum::alias::ID;
 use eternum::models::position::Coord;
 use eternum::utils::map::biomes::Biome;
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Tile {
     #[key]

diff --git a/contracts/src/models/metadata.cairo b/contracts/src/models/metadata.cairo
@@ -2,7 +2,7 @@ use eternum::alias::ID;
 
 // a way to store the type of the entity in addition
 // to the list of components which we already have
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct EntityMetadata {
     #[key]
@@ -16,7 +16,7 @@ pub struct EntityMetadata {
 // using an index and the foreign key
 // see CreateCaravan for an example
 // TODO: change ForeignKey to CaravanMember and stop using general purpose components
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct ForeignKey {
     #[key]

diff --git a/contracts/src/models/movable.cairo b/contracts/src/models/movable.cairo
@@ -4,7 +4,7 @@ use eternum::constants::WORLD_CONFIG_ID;
 use eternum::models::config::{SpeedConfig};
 use eternum::models::position::Coord;
 // speed seconds per km
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct Movable {
     #[key]
@@ -36,7 +36,7 @@ impl MovableCustomImpl of MovableCustomTrait {
 // DISCUSS: separated from the Movable component because
 // we want to attach an ArrivalTime to the trading order
 // without having to attach a Movable component to the order
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct ArrivalTime {
     #[key]

diff --git a/contracts/src/models/name.cairo b/contracts/src/models/name.cairo
@@ -1,14 +1,14 @@
 use eternum::alias::ID;
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct AddressName {
     #[key]
     address: felt252,
     name: felt252
 }
 
-#[derive(Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde)]
 #[dojo::model]
 pub struct EntityName {
     #[key]