Merge branch 'main' of https://github.com/BibliothecaDAO/loot-survivor

contracts/adventurer/src/bag.cairo

@@ -73,7 +73,7 @@ impl BagPacking of Packing<Bag> {
         }
     }
 
-    // TODO: add overflow pack protection
+    // Not used for bag
     fn overflow_pack_protection(self: Bag) -> Bag {
         self
     }

contracts/game/Scarb.toml

@@ -8,7 +8,7 @@ lootitems = { path = "../loot" }
 survivor = { path = "../adventurer" }
 market = { path = "../market" }
 obstacles = { path = "../obstacles" }
-openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts", rev = "05429e4" }
+openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.7.0" }
 
 [[target.starknet-contract]]
 allowed-libfuncs-list.name = "experimental"

contracts/game/src/game/game_entropy.cairo

@@ -0,0 +1,55 @@
+use pack::{constants::pow, pack::{Packing, rshift_split}};
+
+#[derive(Drop, Copy, Serde)]
+struct GameEntropy {
+    entropy: u128,
+    last_updated: u64,
+}
+
+impl GameEntropyPacking of Packing<GameEntropy> {
+    fn pack(self: GameEntropy) -> felt252 {
+        (self.entropy.into()
+            + self.last_updated.into() * pow::TWO_POW_128)
+            .try_into()
+            .expect('pack GameEntropy')
+    }
+
+    fn unpack(packed: felt252) -> GameEntropy {
+        let packed = packed.into();
+        let (packed, entropy) = rshift_split(packed, pow::TWO_POW_128);
+        let (_, last_updated) = rshift_split(packed, pow::TWO_POW_128);
+
+        GameEntropy {
+            entropy: entropy.try_into().unwrap(), last_updated: last_updated.try_into().unwrap(),
+        }
+    }
+    // Not used for game entropy
+    fn overflow_pack_protection(self: GameEntropy) -> GameEntropy {
+        self
+    }
+}
+
+// ---------------------------
+// ---------- Tests ----------
+// ---------------------------
+#[cfg(test)]
+mod tests {
+    use game::game::game_entropy::{GameEntropy, GameEntropyPacking};
+    use pack::{pack::{Packing}};
+
+    #[test]
+    #[available_gas(3000000)]
+    fn test_packing_and_unpacking_game_entropy() {
+        let game_entropy = GameEntropy { entropy: 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, last_updated: 0xFFFFFFFFFFFFFFFF };
+        let unpacked: GameEntropy = Packing::unpack(game_entropy.pack());
+
+        assert(unpacked.entropy == game_entropy.entropy, 'wrong entropy max value');
+        assert(unpacked.last_updated == game_entropy.last_updated, 'wrong last_updated max value');
+
+        let game_entropy = GameEntropy { entropy: 0, last_updated: 0 };
+        let unpacked: GameEntropy = Packing::unpack(game_entropy.pack());
+
+        assert(unpacked.entropy == game_entropy.entropy, 'wrong entropy zero');
+        assert(unpacked.last_updated == game_entropy.last_updated, 'wrong last_updated zero');
+    }
+}

contracts/game/src/game/interfaces.cairo

@@ -5,6 +5,7 @@ use survivor::{
     bag::Bag, adventurer::{Adventurer, Stats}, adventurer_meta::AdventurerMetadata,
     item_meta::{ItemSpecials, ItemSpecialsStorage}
 };
+use game::game::game_entropy::{GameEntropy};
 
 
 #[starknet::interface]
@@ -109,5 +110,5 @@ trait IGame<TContractState> {
     fn owner_of(self: @TContractState, adventurer_id: u256) -> ContractAddress;
     fn get_dao_address(self: @TContractState) -> ContractAddress;
     fn get_lords_address(self: @TContractState) -> ContractAddress;
-    fn get_entropy(self: @TContractState) -> u64;
+    fn get_game_entropy(self: @TContractState) -> GameEntropy;
 }

contracts/game/src/game/lib.cairo

@@ -1,3 +1,4 @@
 mod game;
 mod constants;
 mod interfaces;
+mod game_entropy;