feat: torii 1.6.0 controller & entity queries

Cargo.toml

@@ -1,19 +1,19 @@
 [package]
 edition = "2021"
 name = "dojo-c"
-version = "1.5.7"
+version = "1.6.0-alpha.0"
 
 [lib]
 crate-type = ["cdylib", "rlib", "staticlib"]
 
 [dependencies]
-dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "4145801" }
-dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "4145801" }
-torii-proto = { git = "https://github.com/dojoengine/torii", rev = "07ca961fa81c069b75c5a149984ddf65443e7dae" }
-torii-client = { git = "https://github.com/dojoengine/torii", rev = "07ca961fa81c069b75c5a149984ddf65443e7dae" }
-torii-grpc-client = { git = "https://github.com/dojoengine/torii", rev = "07ca961fa81c069b75c5a149984ddf65443e7dae" }
+dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "054623b" }
+dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "054623b" }
+torii-proto = { git = "https://github.com/dojoengine/torii", rev = "0e89d04" }
+torii-client = { git = "https://github.com/dojoengine/torii", rev = "0e89d04" }
+torii-grpc-client = { git = "https://github.com/dojoengine/torii", rev = "0e89d04" }
 
-starknet = "0.13.0"
+starknet = "0.14.0"
 starknet-crypto = "0.7.2"
 starknet-types-core = { version = "0.1.6", features = ["arbitrary"] }
 
@@ -30,7 +30,7 @@ wasm-bindgen = "0.2.92"
 stream-cancel = "0.8.2"
 cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.3.2" }
 lazy_static = "1.5.0"
-account_sdk = { git = "https://github.com/cartridge-gg/controller", rev = "dbbe0353d64de743739d425f8aab91ca3ac0e16f" }
+account_sdk = { git = "https://github.com/cartridge-gg/controller", rev = "05fe96f4" }
 
 serde-wasm-bindgen = "0.6.3"
 wasm-bindgen-futures = "0.4.39"
@@ -48,6 +48,7 @@ instant = { version = "0.1.13", features = ["wasm-bindgen"] }
 gloo-timers = { version = "0.3.0", features = ["futures"] }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
+chrono = "0.4.41"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 axum = "0.8.1"

dojo.h

@@ -729,8 +729,7 @@ typedef struct Entity {
 } Entity;
 
 typedef struct OrderBy {
-  const char *model;
-  const char *member;
+  const char *field;
   enum OrderDirection direction;
 } OrderBy;
 

dojo.hpp

@@ -181,8 +181,7 @@ struct Entity {
 };
 
 struct OrderBy {
-  const char *model;
-  const char *member;
+  const char *field;
   OrderDirection direction;
 };
 

dojo.pyx

@@ -460,8 +460,7 @@ cdef extern from *:
     CArrayStruct models;
 
   cdef struct OrderBy:
-    const char *model;
-    const char *member;
+    const char *field;
     OrderDirection direction;
 
   cdef enum COptionFieldElement_Tag:

src/c/mod.rs

@@ -17,7 +17,6 @@ use account_sdk::account::session::account::SessionAccount;
 use account_sdk::account::session::hash::Session;
 use account_sdk::provider::{CartridgeJsonRpcProvider, CartridgeProvider};
 use account_sdk::signers::Signer;
-use account_sdk::utils::time::get_current_timestamp;
 use axum::extract::State;
 use axum::http::{header, HeaderValue, Method, StatusCode};
 use axum::response::IntoResponse;
@@ -26,6 +25,7 @@ use axum::Router;
 use base64::engine::general_purpose::STANDARD as BASE64;
 use base64::Engine as _;
 use cainome::cairo_serde::{self, ByteArray, CairoSerde};
+use chrono::Utc;
 use crypto_bigint::U256;
 use directories::ProjectDirs;
 use dojo_world::contracts::naming::compute_selector_from_tag;
@@ -629,7 +629,7 @@ pub unsafe extern "C" fn controller_execute_from_outside(
     let caller = OutsideExecutionCaller::Any;
     let calls = unsafe { std::slice::from_raw_parts(calldata, calldata_len).to_vec() };
     let calls = calls.into_iter().map(|c| c.into()).collect::<Vec<starknet::core::types::Call>>();
-    let now = get_current_timestamp();
+    let now = Utc::now().timestamp() as u64;
     let outside_execution = OutsideExecutionV3 {
         caller: caller.into(),
         execute_after: 0_u64,
@@ -652,6 +652,7 @@ pub unsafe extern "C" fn controller_execute_from_outside(
             OutsideExecution::V3(outside_execution),
             (*controller).account.address(),
             signed.signature,
+            None,
         )) {
             Ok(res) => res,
             Err(e) => {

src/c/types.rs

@@ -532,16 +532,14 @@ impl From<torii_proto::PaginationDirection> for PaginationDirection {
 #[derive(Clone, Debug)]
 #[repr(C)]
 pub struct OrderBy {
-    pub model: *const c_char,
-    pub member: *const c_char,
+    pub field: *const c_char,
     pub direction: OrderDirection,
 }
 
 impl From<OrderBy> for torii_proto::OrderBy {
     fn from(val: OrderBy) -> Self {
         torii_proto::OrderBy {
-            model: unsafe { CStr::from_ptr(val.model).to_string_lossy().to_string() },
-            member: unsafe { CStr::from_ptr(val.member).to_string_lossy().to_string() },
+            field: unsafe { CStr::from_ptr(val.field).to_string_lossy().to_string() },
             direction: val.direction.into(),
         }
     }
@@ -550,8 +548,7 @@ impl From<OrderBy> for torii_proto::OrderBy {
 impl From<torii_proto::OrderBy> for OrderBy {
     fn from(val: torii_proto::OrderBy) -> Self {
         OrderBy {
-            model: CString::new(val.model.clone()).unwrap().into_raw(),
-            member: CString::new(val.member.clone()).unwrap().into_raw(),
+            field: CString::new(val.field.clone()).unwrap().into_raw(),
             direction: val.direction.into(),
         }
     }

src/wasm/types.rs

@@ -389,18 +389,13 @@ impl From<PaginationDirection> for torii_proto::PaginationDirection {
 #[derive(Tsify, Serialize, Deserialize, Debug)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct OrderBy {
-    pub model: String,
-    pub member: String,
+    pub field: String,
     pub direction: OrderDirection,
 }
 
 impl From<OrderBy> for torii_proto::OrderBy {
     fn from(value: OrderBy) -> Self {
-        Self {
-            model: value.model.clone(),
-            member: value.member.clone(),
-            direction: value.direction.into(),
-        }
+        Self { field: value.field.clone(), direction: value.direction.into() }
     }
 }