fix: change to new entity_updated_after query field (#79)

Author: glihm

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly
+          toolchain: nightly-2024-08-28
           components: rustfmt
       - uses: Swatinem/rust-cache@v2
       - uses: arduino/setup-protoc@v1

Cargo.lock

@@ -8,13 +8,13 @@ crate-type = ["cdylib", "rlib", "staticlib"]
 
 
 [dependencies]
-dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "8111b6d" }
-dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "8111b6d"}
-torii-client = { git = "https://github.com/dojoengine/dojo", rev = "8111b6d" }
+dojo-world = { git = "https://github.com/dojoengine/dojo", rev = "b0e9367" }
+dojo-types = { git = "https://github.com/dojoengine/dojo", rev = "b0e9367"}
+torii-client = { git = "https://github.com/dojoengine/dojo", rev = "b0e9367" }
 torii-grpc = { git = "https://github.com/dojoengine/dojo", features = [
     "client",
-], rev = "8111b6d" }
-torii-relay = { git = "https://github.com/dojoengine/dojo", rev = "8111b6d" }
+], rev = "b0e9367" }
+torii-relay = { git = "https://github.com/dojoengine/dojo", rev = "b0e9367" }
 
 starknet = "0.12.0"
 starknet-crypto = "0.7.2"

Cargo.toml

@@ -387,7 +387,7 @@ typedef struct Query {
   bool dont_include_hashed_keys;
   struct CArrayOrderBy order_by;
   struct CArrayc_char entity_models;
-  uint64_t internal_updated_at;
+  uint64_t entity_updated_after;
 } Query;
 
 typedef struct CArrayFieldElement {

dojo.h

@@ -725,7 +725,7 @@ struct Query {
   bool dont_include_hashed_keys;
   CArray<OrderBy> order_by;
   CArray<const char*> entity_models;
-  uint64_t internal_updated_at;
+  uint64_t entity_updated_after;
 };
 
 struct ModelMetadata {

dojo.hpp

@@ -256,7 +256,7 @@ cdef extern from *:
     bool dont_include_hashed_keys;
     CArrayOrderBy order_by;
     CArrayc_char entity_models;
-    uint64_t internal_updated_at;
+    uint64_t entity_updated_after;
 
   cdef struct CArrayFieldElement:
     FieldElement *data;

dojo.pyx

@@ -34,14 +34,8 @@
                 dont_include_hashed_keys: true,
                 order_by: [],
                 entity_models: [],
-                internal_updated_at: 0,
-                clause: {
-                    Keys: {
-                        keys: [undefined],
-                        pattern_matching: "VariableLen",
-                        models: []
-                    }
-                }
+                entity_updated_after: 0,
+
             });
 
             updateManager.displayUpdate('fetch', entities);

playground/entities.html

@@ -38,7 +38,7 @@
                 dont_include_hashed_keys: true,
                 order_by: [],
                 entity_models: [],
-                internal_updated_at: 0,
+                entity_updated_after: 0,
                 clause: {
                     Keys: {
                         keys: [undefined],

playground/events.html

@@ -1,3 +1,10 @@
 #!/bin/bash
 
-cargo +nightly fmt --check --all -- "$@"
+option="--check"
+
+if [ "$1" == "--fix" ]; then
+    option=""
+    shift
+fi
+
+cargo +nightly-2024-08-28 fmt $option --all -- "$@"

scripts/rust_fmt.sh

@@ -1,10 +1,10 @@
 mod types;
 
-use std::ffi::{CStr, CString, c_void};
+use std::ffi::{c_void, CStr, CString};
 use std::ops::Deref;
 use std::os::raw::c_char;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::Arc;
 use std::time::Duration;
 
 use cainome::cairo_serde::{self, ByteArray, CairoSerde};
@@ -18,7 +18,7 @@ use starknet::core::utils::get_contract_address;
 use starknet::providers::jsonrpc::HttpTransport;
 use starknet::providers::{JsonRpcClient, Provider as _};
 use starknet::signers::{LocalWallet, SigningKey, VerifyingKey};
-use starknet_crypto::{Felt, poseidon_hash_many};
+use starknet_crypto::{poseidon_hash_many, Felt};
 use stream_cancel::{StreamExt as _, Tripwire};
 use tokio::time::sleep;
 use tokio_stream::StreamExt;

src/c/mod.rs

@@ -1,4 +1,4 @@
-use std::ffi::{CStr, CString, c_char};
+use std::ffi::{c_char, CStr, CString};
 
 use starknet::core::utils::get_selector_from_name;
 use torii_client::client::Client;
@@ -326,7 +326,7 @@ pub struct Query {
     pub dont_include_hashed_keys: bool,
     pub order_by: CArray<OrderBy>,
     pub entity_models: CArray<*const c_char>,
-    pub internal_updated_at: u64,
+    pub entity_updated_after: u64,
 }
 
 #[derive(Clone, Debug)]
@@ -896,7 +896,7 @@ impl From<&Query> for torii_grpc::types::Query {
                     dont_include_hashed_keys: val.dont_include_hashed_keys,
                     order_by,
                     entity_models,
-                    internal_updated_at: val.internal_updated_at,
+                    entity_updated_after: val.entity_updated_after,
                 }
             }
             COption::None => torii_grpc::types::Query {
@@ -906,7 +906,7 @@ impl From<&Query> for torii_grpc::types::Query {
                 dont_include_hashed_keys: val.dont_include_hashed_keys,
                 order_by,
                 entity_models,
-                internal_updated_at: val.internal_updated_at,
+                entity_updated_after: val.entity_updated_after,
             },
         }
     }
@@ -927,7 +927,7 @@ impl From<&torii_grpc::types::Query> for Query {
                     dont_include_hashed_keys: val.dont_include_hashed_keys,
                     order_by: order_by.into(),
                     entity_models,
-                    internal_updated_at: val.internal_updated_at,
+                    entity_updated_after: val.entity_updated_after,
                 }
             }
             Option::None => Query {
@@ -937,7 +937,7 @@ impl From<&torii_grpc::types::Query> for Query {
                 dont_include_hashed_keys: val.dont_include_hashed_keys,
                 order_by: order_by.into(),
                 entity_models,
-                internal_updated_at: val.internal_updated_at,
+                entity_updated_after: val.entity_updated_after,
             },
         }
     }

src/c/types.rs

@@ -1,10 +1,10 @@
 use std::ffi::c_char;
-use std::sync::Arc;
 use std::sync::atomic::AtomicU64;
+use std::sync::Arc;
 
 use starknet::accounts::SingleOwnerAccount;
-use starknet::providers::JsonRpcClient;
 use starknet::providers::jsonrpc::HttpTransport;
+use starknet::providers::JsonRpcClient;
 use starknet::signers::LocalWallet;
 use stream_cancel::Trigger;
 use torii_client::client::Client;

src/types.rs

@@ -7,8 +7,8 @@ mod utils;
 
 use std::collections::HashMap;
 use std::str::FromStr;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::Arc;
 use std::time::Duration;
 
 use cainome::cairo_serde::{self, ByteArray, CairoSerde};
@@ -689,7 +689,7 @@ impl ToriiClient {
                 dont_include_hashed_keys: false,
                 order_by: vec![],
                 entity_models: vec![],
-                internal_updated_at: 0,
+                entity_updated_after: 0,
             })
             .await;
 

src/wasm/mod.rs

@@ -8,7 +8,7 @@ use serde_wasm_bindgen::to_value;
 use starknet::core::types::FunctionCall;
 use starknet::core::utils::get_selector_from_name;
 use starknet_crypto::Felt;
-use tsify_next::{Tsify, declare};
+use tsify_next::{declare, Tsify};
 use wasm_bindgen::prelude::*;
 
 use super::utils::parse_ty_as_json_str;
@@ -302,7 +302,7 @@ pub struct Query {
     pub dont_include_hashed_keys: bool,
     pub order_by: Vec<OrderBy>,
     pub entity_models: Vec<String>,
-    pub internal_updated_at: u64,
+    pub entity_updated_after: u64,
 }
 
 #[derive(Tsify, Serialize, Deserialize, Debug)]
@@ -348,7 +348,7 @@ impl From<&Query> for torii_grpc::types::Query {
             dont_include_hashed_keys: value.dont_include_hashed_keys,
             order_by: value.order_by.iter().map(|o| o.into()).collect(),
             entity_models: value.entity_models.iter().map(|m| m.to_string()).collect(),
-            internal_updated_at: value.internal_updated_at,
+            entity_updated_after: value.entity_updated_after,
         }
     }
 }

src/wasm/types.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use dojo_types::primitive::Primitive;
-use serde_json::{Value, json};
+use serde_json::{json, Value};
 use torii_grpc::types::schema::Entity;
 use wasm_bindgen::JsValue;