fixing queue and snake/paint

Author: thiscaspar

contracts/Scarb.lock

@@ -24,7 +24,7 @@ source = "git+https://github.com/dojoengine/dojo?tag=v1.2.1#3d4b1a3e662f70679813
 
 [[package]]
 name = "pixelaw"
-version = "0.6.14"
+version = "0.6.15"
 dependencies = [
  "dojo",
  "dojo_cairo_test",

contracts/dojo_dev.toml

@@ -30,3 +30,4 @@ world_address = "0x005a247732e3a59737fea5504ed776c6e79eae8b6b2317402ab36b6d3cc50
 "pixelaw-RTree" = ["pixelaw-actions"]
 "pixelaw-Area" = ["pixelaw-actions"]
 "pixelaw-SnakeSegment" = ["pixelaw-snake_actions"]
+

contracts/src/apps/paint/app.cairo

@@ -65,7 +65,7 @@ pub mod paint_actions {
 
     use pixelaw::core::actions::{IActionsDispatcherTrait as ICoreActionsDispatcherTrait};
 
-    use pixelaw::core::models::pixel::{Pixel, PixelUpdate};
+    use pixelaw::core::models::pixel::{Pixel, PixelUpdate, PixelUpdateResultTrait};
     use pixelaw::core::models::registry::App;
     use pixelaw::core::utils::{
         DefaultParameters, decode_rgba, encode_rgba, get_callers, get_core_actions, subu8,
@@ -190,7 +190,7 @@ pub mod paint_actions {
 
             // TODO: Load Paint App Settings like the fade step time
             // For example for the cooldown feature
-            let COOLDOWN_SECS = 5;
+            let COOLDOWN_SECS = 0;
 
             // Check if 5 seconds have passed or if the sender is the owner
             assert!(
@@ -316,19 +316,19 @@ pub mod paint_actions {
             // If the color is 0,0,0, fading is done.
             if r == 0 && g == 0 && b == 0 {
                 world.erase_model(@pixel);
-                //delete!(world, (pixel));
                 return;
             }
 
             // Fade the color
-            let FADE_STEP = 5;
+            let FADE_STEP = 50;
 
             let new_color = encode_rgba(
                 subu8(r, FADE_STEP), subu8(g, FADE_STEP), subu8(b, FADE_STEP), a,
             );
 
             // Update color of the pixel
-            let _ = core_actions
+            // TODO check results?
+            let _result  = core_actions
                 .update_pixel(
                     player,
                     system,
@@ -340,13 +340,15 @@ pub mod paint_actions {
                         text: Option::None,
                         app: Option::Some(system),
                         owner: Option::Some(player),
-                        action: Option::None // Not using this feature for paint
+                        action: Option::None
                     },
                     Option::None,
                     false,
-                );
+                ).unwrap();
 
-            let FADE_SECONDS = 4;
+
+
+            let FADE_SECONDS = 0;
 
             // Implement fading by scheduling a new fade call
             let queue_timestamp = starknet::get_block_timestamp() + FADE_SECONDS;
@@ -355,12 +357,17 @@ pub mod paint_actions {
             let THIS_CONTRACT_ADDRESS = get_contract_address();
 
             // Prepare calldata
-            // Calldata[0]: Calling player
+            // Calldata[0]: player_override option:None
+            calldata.append(0x0);
             calldata.append(player.into());
 
             // Calldata[1]: Calling system
+            calldata.append(0x0);
             calldata.append(THIS_CONTRACT_ADDRESS.into());
 
+            // Calldata[2]: Area Hint
+            calldata.append(0x1);
+
             // Calldata[2,3]: Position[x,y]
             calldata.append(position.x.into());
             calldata.append(position.y.into());

contracts/src/apps/snake/app.cairo

@@ -132,7 +132,6 @@ pub trait ISnakeActions<T> {
 
 #[dojo::contract]
 pub mod snake_actions {
-    use dojo::event::EventStorage;
     use dojo::model::{ModelStorage};
     use dojo::world::storage::WorldStorage;
     use dojo::world::{IWorldDispatcherTrait};
@@ -156,23 +155,6 @@ pub mod snake_actions {
     use super::{Snake, SnakeSegment};
 
 
-    #[derive(Copy, Drop, Serde)]
-    #[dojo::event]
-    pub struct Died {
-        #[key]
-        owner: ContractAddress,
-        x: u16,
-        y: u16,
-    }
-
-    #[derive(Copy, Drop, Serde)]
-    #[dojo::event]
-    pub struct Moved {
-        #[key]
-        pub owner: ContractAddress,
-        pub direction: Direction,
-    }
-
     const SNAKE_MAX_LENGTH: u8 = 255;
 
 
@@ -364,11 +346,6 @@ pub mod snake_actions {
                     let position = Position { x: first_segment.x, y: first_segment.y };
                     core_actions.alert_player(position, snake.owner, 'Snake died here');
 
-                    world
-                        .emit_event(
-                            @Died { owner: snake.owner, x: first_segment.x, y: first_segment.y },
-                        );
-
                     // Delete the snake
                     world.erase_model(@snake);
                     return;

contracts/src/core/actions/pixel.cairo

@@ -107,6 +107,7 @@ pub fn update_pixel(
     }
     // Store the Pixel
     world.write_model(@pixel);
+    
     // Call on_post_update if the pixel has an app
     if pixel.app != contract_address_const::<0>() {
         let mut caller_app: App = world.read_model(for_system);

contracts/src/core/utils.cairo

@@ -6,7 +6,7 @@ use pixelaw::core::models::{
     pixel::{Pixel},
     {area::{BoundsTraitImpl, ChildrenPackableImpl, RTreeNodePackableImpl, RTreeTraitImpl}},
 };
-use starknet::{ContractAddress, contract_address_const, get_contract_address, get_tx_info};
+use starknet::{ContractAddress, contract_address_const, get_caller_address,get_contract_address, get_tx_info};
 
 
 pub const POW_2_96: u128 = 0x1000000000000000000000000_u128;
@@ -120,16 +120,19 @@ pub fn get_callers(
     let mut system = contract_address_const::<0>();
 
     let core_address = get_core_actions_address(ref world);
+    // let caller_contract = get_caller_address();
     let caller_contract = get_contract_address();
-
+    
     if let Option::Some(override) = params.player_override {
-        assert(caller_contract == core_address, 'only core can override');
+        // TODO this doesnt work when queue
+        assert(get_caller_address() == core_address, 'only core can override');
         player = override;
     } else {
         player = get_tx_info().unbox().account_contract_address;
     }
+
     if let Option::Some(override) = params.system_override {
-        assert(caller_contract == core_address, 'only core can override');
+        assert(get_caller_address() == core_address, 'only core can override');
         system = override;
     } else {
         system = caller_contract;
@@ -185,7 +188,7 @@ pub fn subu8(nr: u8, sub: u8) -> u8 {
     if nr >= sub {
         return nr - sub;
     } else {
-        return 0x000000FF;
+        return 0;
     }
 }
 

contracts/src/tests/test_helpers.cairo

@@ -16,7 +16,7 @@ use pixelaw::{
     core::{
         actions::{IActionsDispatcher, IActionsDispatcherTrait, actions},
         models::{
-            area::{m_Area, m_RTree}, pixel::{m_Pixel},
+            area::{m_Area, m_RTree}, pixel::{m_Pixel},queue::{m_QueueItem},
             registry::{m_App, m_AppName, m_CoreActionsAddress},
         },
         utils::{Position},
@@ -63,6 +63,7 @@ fn namespace_def() -> NamespaceDef {
             TestResource::Model(m_Area::TEST_CLASS_HASH),
             TestResource::Model(m_Snake::TEST_CLASS_HASH),
             TestResource::Model(m_SnakeSegment::TEST_CLASS_HASH),
+            TestResource::Model(m_QueueItem::TEST_CLASS_HASH),
             TestResource::Event(pixelaw::core::events::e_QueueScheduled::TEST_CLASS_HASH),
             TestResource::Event(pixelaw::core::events::e_QueueProcessed::TEST_CLASS_HASH),
             TestResource::Event(pixelaw::core::events::e_Alert::TEST_CLASS_HASH),