storage slot correct endiannes

HerodotusDev · Jul 24, 2024 · ebfa454 · ebfa454
1 parent 81f48a5
commit ebfa454
Show file tree

Hide file tree

Showing 4 changed files with 581 additions and 778 deletions.
diff --git a/cairo/src/memorizer/storage_memorizer.cairo b/cairo/src/memorizer/storage_memorizer.cairo
@@ -11,7 +11,7 @@ pub struct StorageKey {
     pub chain_id: felt252,
     pub block_number: felt252,
     pub address: felt252,
-    pub storage_slot: u256,
+    pub key: u256,
 }
 
 #[generate_trait]
@@ -26,8 +26,8 @@ pub impl StorageMemorizerImpl of StorageMemorizerTrait {
                 key.chain_id,
                 key.block_number,
                 key.address,
-                key.storage_slot.low.into(),
-                key.storage_slot.high.into(),
+                key.key.high.into(),
+                key.key.low.into(),
             ]
                 .span()
         )

diff --git a/packages/contract_bootloader/memorizer/storage_memorizer.py b/packages/contract_bootloader/memorizer/storage_memorizer.py
@@ -39,24 +39,25 @@ def from_int(cls, values: List[int]):
             or values[4] >= 0x100000000000000000000000000000000
         ):
             raise ValueError("Storage slot value not u128")
-        storage_slot_low = values[3] % 0x100000000000000000000000000000000
-        storage_slot_high = values[4] % 0x100000000000000000000000000000000
+        storage_slot_high = values[3] % 0x100000000000000000000000000000000
+        storage_slot_low = values[4] % 0x100000000000000000000000000000000
         return cls(
-            values[0], values[1], values[2], (storage_slot_low, storage_slot_high)
+            values[0], values[1], values[2], (storage_slot_high, storage_slot_low)
         )
 
     def derive(self) -> int:
         return poseidon_hash_many(
             [
                 self.chain_id,
                 self.block_number,
+                self.address,
                 self.storage_slot[0],
                 self.storage_slot[1],
             ]
         )
 
     def to_dict(self):
-        storage_slot_value = (self.storage_slot[1] << 128) + self.storage_slot[0]
+        storage_slot_value = (self.storage_slot[0] << 128) + self.storage_slot[1]
 
         return {
             "chain_id": self.chain_id,

diff --git a/packages/contract_bootloader/syscall_handler.py b/packages/contract_bootloader/syscall_handler.py
@@ -131,6 +131,7 @@ def _call_contract_helper(
                 dict_raw_ptrs=calldata[0 : Memorizer.size()],
                 dict_manager=self.dict_manager,
             )
+            print(memorizer.dict_ptr)
 
             idx = Memorizer.size()
             key = StorageMemorizerKey.from_int(