Skip to content

prepare: 1.6.0-alpha.7 #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 23, 2025
Merged

prepare: 1.6.0-alpha.7 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83e4f18
prepare: 1.6.0-alpha.7
Larkooo Jul 23, 2025
d05434b
update tokens types
Larkooo Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ crate-type = ["cdylib", "rlib", "staticlib"]
[dependencies]
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 = "a89dd8c" }
torii-client = { git = "https://github.com/dojoengine/torii", rev = "a89dd8c" }
torii-grpc-client = { git = "https://github.com/dojoengine/torii", rev = "a89dd8c" }
torii-proto = { git = "https://github.com/dojoengine/torii", tag = "v1.6.0-alpha.7" }
torii-client = { git = "https://github.com/dojoengine/torii", tag = "v1.6.0-alpha.7" }
torii-grpc-client = { git = "https://github.com/dojoengine/torii", tag = "v1.6.0-alpha.7" }

starknet = "0.14.0"
starknet-crypto = "0.7.2"
Expand Down
18 changes: 16 additions & 2 deletions dojo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,9 +638,23 @@ typedef struct TokenQuery {
struct Pagination pagination;
} TokenQuery;

typedef enum COptionU256_Tag {
SomeU256,
NoneU256,
} COptionU256_Tag;

typedef struct COptionU256 {
COptionU256_Tag tag;
union {
struct {
struct U256 some;
};
};
} COptionU256;

typedef struct Token {
struct FieldElement contract_address;
struct U256 token_id;
struct COptionU256 token_id;
const char *name;
const char *symbol;
uint8_t decimals;
Expand Down Expand Up @@ -719,7 +733,7 @@ typedef struct TokenBalance {
struct U256 balance;
struct FieldElement account_address;
struct FieldElement contract_address;
struct U256 token_id;
struct COptionU256 token_id;
} TokenBalance;

typedef enum Resultc_char_Tag {
Expand Down
4 changes: 2 additions & 2 deletions dojo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ struct Event {

struct Token {
FieldElement contract_address;
U256 token_id;
COption<U256> token_id;
const char *name;
const char *symbol;
uint8_t decimals;
Expand All @@ -856,7 +856,7 @@ struct TokenBalance {
U256 balance;
FieldElement account_address;
FieldElement contract_address;
U256 token_id;
COption<U256> token_id;
};

struct TokenBalanceQuery {
Expand Down
12 changes: 10 additions & 2 deletions dojo.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,17 @@ cdef extern from *:
CArrayU256 token_ids;
Pagination pagination;

cdef enum COptionU256_Tag:
SomeU256,
NoneU256,

cdef struct COptionU256:
COptionU256_Tag tag;
U256 some;

cdef struct Token:
FieldElement contract_address;
U256 token_id;
COptionU256 token_id;
const char *name;
const char *symbol;
uint8_t decimals;
Expand Down Expand Up @@ -471,7 +479,7 @@ cdef extern from *:
U256 balance;
FieldElement account_address;
FieldElement contract_address;
U256 token_id;
COptionU256 token_id;

cdef enum Resultc_char_Tag:
Okc_char,
Expand Down
4 changes: 2 additions & 2 deletions src/c/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ impl From<torii_proto::Controller> for Controller {
#[repr(C)]
pub struct Token {
pub contract_address: FieldElement,
pub token_id: U256,
pub token_id: COption<U256>,
pub name: *const c_char,
pub symbol: *const c_char,
pub decimals: u8,
Expand All @@ -158,7 +158,7 @@ pub struct TokenBalance {
pub balance: U256,
pub account_address: FieldElement,
pub contract_address: FieldElement,
pub token_id: U256,
pub token_id: COption<U256>,
}

impl From<torii_proto::TokenBalance> for TokenBalance {
Expand Down
8 changes: 4 additions & 4 deletions src/wasm/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pub struct TokenCollections(pub Page<TokenCollection>);
#[tsify(into_wasm_abi, from_wasm_abi)]
pub struct Token {
pub contract_address: String,
pub token_id: String,
pub token_id: Option<String>,
pub name: String,
pub symbol: String,
pub decimals: u8,
Expand All @@ -90,7 +90,7 @@ impl From<torii_proto::Token> for Token {
fn from(value: torii_proto::Token) -> Self {
Self {
contract_address: format!("{:#x}", value.contract_address),
token_id: format!("0x{:x}", value.token_id),
token_id: value.token_id.map(|t| format!("0x{:x}", t)),
name: value.name.clone(),
symbol: value.symbol.clone(),
decimals: value.decimals,
Expand Down Expand Up @@ -141,7 +141,7 @@ pub struct TokenBalance {
pub balance: String,
pub account_address: String,
pub contract_address: String,
pub token_id: String,
pub token_id: Option<String>,
}

impl From<torii_proto::TokenBalance> for TokenBalance {
Expand All @@ -150,7 +150,7 @@ impl From<torii_proto::TokenBalance> for TokenBalance {
balance: format!("0x{:x}", value.balance),
account_address: format!("{:#x}", value.account_address),
contract_address: format!("{:#x}", value.contract_address),
token_id: format!("0x{:x}", value.token_id),
token_id: value.token_id.map(|t| format!("0x{:x}", t)),
}
}
}
Expand Down
Loading