Skip to content

feat(core): use metaprogramming for tuple and fixed size array Introspect and DojoStore - #3260

Merged
glihm merged 9 commits into
dev-1.6.0from
feat-use_metaprogramming_for_tuple_serialization
Jul 3, 2025
Merged

feat(core): use metaprogramming for tuple and fixed size array Introspect and DojoStore#3260
glihm merged 9 commits into
dev-1.6.0from
feat-use_metaprogramming_for_tuple_serialization

Conversation

@remybar

@remybar remybar commented Jun 30, 2025

Copy link
Copy Markdown
Contributor

Description

For tuple and fixed size arrays serialization with Serde, Starkware has implemented some metaprogramming mechanisms to support at most tuples/fixed size arrays of 16 elements. See:

To have a better support of tuples serialization using DojoStore and to simplify Dojo macros code, it would be nice to reuse this metaprogramming mechanisms for DojoStore. Unfortunately, they are not visible outside the Cairo corelib.
So, this PR copy/paste metaprogrammin.cairo and tuple.cairo files from the Starkware repo and use them to manage tuple serialisation with DojoStore.

Thanks to that, Option with tuples (like Option<(u8, u16)>) are now fully supported in Dojo.

Tests

  • Yes
  • No, because they aren't needed
  • No, because I need help

Added to documentation?

  • README.md
  • Dojo Book
  • No documentation needed

Checklist

  • I've formatted my code (scripts/rust_fmt.sh, scripts/cairo_fmt.sh)
  • I've linted my code (scripts/clippy.sh, scripts/docs.sh)
  • I've commented my code
  • I've requested a review after addressing the comments

Summary by CodeRabbit

  • New Features

    • Added support for registering and upgrading external contracts, including related events and permission checks.
    • Introduced new serialization and deserialization utilities for world storage, supporting advanced data types and layouts.
    • Added comprehensive test suites for access control, contract upgrades, event and model registration, and storage layouts.
    • Provided new testing libraries and utilities for streamlined contract and world testing.
  • Improvements

    • Updated toolchain and dependencies to newer versions for improved compatibility.
    • Refactored and unified command-line workflows, metadata handling, and feature management.
    • Enhanced error messages, event handling, and test setup for greater clarity and robustness.
  • Removals

    • Removed legacy macro plugins, derive macros, and attribute macros from the language plugin.
    • Deleted obsolete test data, fixtures, and configuration files.
    • Cleaned up redundant or deprecated utility functions and internal modules.
  • Bug Fixes

    • Fixed compatibility and layout issues for legacy models and events.
    • Addressed edge cases in storage serialization, deserialization, and layout handling.
  • Style

    • Improved code organization, import ordering, and formatting across multiple modules.
  • Documentation

    • Updated and reorganized documentation and module exports for better discoverability.

@remybar
remybar changed the base branch from main to dev-1.6.0 June 30, 2025 08:54
@remybar
remybar force-pushed the feat-use_metaprogramming_for_tuple_serialization branch from 6c20074 to 5bcb57f Compare June 30, 2025 09:01
@coderabbitai

coderabbitai Bot commented Jun 30, 2025

Copy link
Copy Markdown
Contributor

Caution

Review failed

Failed to post review comments.

Walkthrough

Ohayo sensei! This update overhauls Dojo's core and CLI by removing the entire dojo-lang plugin and language server, refactoring the Sozo CLI and related crates to use a new metadata abstraction instead of Scarb workspaces, updating core contracts for external contract management, and restructuring tests and dependencies. Major test and macro files are deleted or replaced, and new support is added for external contracts in the world contract.

Changes

File(s) / Group Change Summary
.github/workflows/*, .tool-versions Rust, Scarab, and tool versions updated in CI workflows and toolchain files.
Cargo.toml, bin/sozo/Cargo.toml, crates/dojo/bindgen/Cargo.toml Workspace members and dependencies updated, renamed, or removed.
bin/dojo-language-server/*, crates/dojo/lang/* Entire Dojo language server and plugin codebase deleted, including attribute macros, derive macros, inline macros, and plugin infrastructure.
bin/sozo/src/args.rs, bin/sozo/src/main.rs, bin/sozo/src/features.rs CLI argument handling refactored; version flag made explicit; main function and CLI logic made async.
bin/sozo/src/commands/* All command modules refactored to use new Metadata abstraction instead of Scarb workspace/config; many methods made async; dev and account commands removed; build, test, and migration flows simplified and updated.
bin/sozo/tests/* Test modules, fixtures, and utilities removed or updated for new structure.
crates/dojo/core/* Major refactor: new modules for DojoStore, metaprogramming, tuple utilities, and default values; event and model storage logic updated; support for external contracts added in world contract and resource enums; derive macros and plugin dependencies removed.
crates/dojo/core-tests/*, crates/dojo/dojo-cairo-test/*, crates/dojo/dojo-snf-test/* Core test suites restructured, new helpers and test modules added for storage, layout, ACL, events, models, and external contracts; legacy and new storage layouts tested; test resource management updated.
crates/dojo/lang/src/attribute_macros/*, crates/dojo/lang/src/derive_macros/*, crates/dojo/lang/src/inline_macros/*, crates/dojo/lang/Scarb.toml All attribute, derive, and inline macro implementations and their supporting files deleted.
crates/dojo/core-cairo-test/* Entire core-cairo-test crate and its test files deleted.
crates/dojo/core/src/world/world_contract.cairo, crates/dojo/core/src/world/iworld.cairo, crates/dojo/core/src/world/resource.cairo External contract registration and upgrade support added, with new events and resource types.
crates/dojo/core/src/model/*, crates/dojo/core/src/event/*, crates/dojo/core/src/storage/*, crates/dojo/core/src/utils/* Model, event, and storage logic refactored for new serialization, layout, and metaprogramming support; legacy and new storage layouts handled.
crates/dojo/core/src/meta/layout.cairo Function added to build legacy layouts from new storage layouts.
crates/dojo/core/src/meta/introspect.cairo Option enum variant selectors updated for compatibility.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Sozo CLI
    participant Metadata
    participant World Contract

    User->>Sozo CLI: Run command (build, test, migrate, etc.)
    Sozo CLI->>Metadata: Load project metadata from Scarb.toml
    Sozo CLI->>Sozo CLI: Parse CLI args, handle features
    Sozo CLI->>World Contract: (If applicable) Build, deploy, or interact via new metadata abstraction
    World Contract-->>Sozo CLI: Respond with results/events (including external contract support)
    Sozo CLI-->>User: Output results
Loading
sequenceDiagram
    participant User
    participant Sozo CLI
    participant Metadata
    participant External Contract

    User->>Sozo CLI: Register or upgrade external contract
    Sozo CLI->>Metadata: Load project metadata
    Sozo CLI->>World Contract: Call register_external_contract or upgrade_external_contract
    World Contract-->>Sozo CLI: Emit ExternalContractRegistered or ExternalContractUpgraded event
    Sozo CLI-->>User: Confirm registration/upgrade
Loading

Possibly related PRs

  • dojoengine/dojo#2337: Adds the inline macro plugin for get_models_test_class_hashes, which is removed in this PR.
  • dojoengine/dojo#3195: Adds external contract registering and upgrading features in the world contract, directly related to the new external contract support in this update.
  • dojoengine/dojo#2595: Major release removing the Dojo compiler plugin and rewriting Sozo, aligning with this PR's removal of the Dojo plugin and restructuring.

Suggested labels

contributor

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate Unit Tests
  • Create PR with Unit Tests
  • Post Copyable Unit Tests in Comment
  • Commit Unit Tests in branch feat-use_metaprogramming_for_tuple_serialization

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai auto-generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@remybar
remybar force-pushed the feat-use_metaprogramming_for_tuple_serialization branch 4 times, most recently from 30ca168 to dfe41ca Compare July 2, 2025 11:32
@remybar remybar changed the title feat(core): use metaprogramming for tuple serialization feat(core): use metaprogramming for tuple and fixed size array Introspect and DojoStore Jul 3, 2025
@remybar
remybar force-pushed the feat-use_metaprogramming_for_tuple_serialization branch from 9d910ee to 7497716 Compare July 3, 2025 15:24

@glihm glihm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome work @remybar, will be very nice having this tuple introspect + the fixed size array, which are actually quite common it seems.

Comment thread crates/dojo/core/src/meta/introspect.cairo Outdated
Comment thread crates/dojo/core/src/meta/introspect.cairo
@remybar
remybar force-pushed the feat-use_metaprogramming_for_tuple_serialization branch from e987042 to 91883f9 Compare July 3, 2025 21:21
@glihm
glihm merged commit dbf5d69 into dev-1.6.0 Jul 3, 2025
10 checks passed
@glihm
glihm deleted the feat-use_metaprogramming_for_tuple_serialization branch July 3, 2025 23:08
glihm added a commit that referenced this pull request Jul 14, 2025
…3266)

* feat: add external contract registering in the world (#3195)

* Use the world as external contract reference and manage upgrades with sozo

* update spawn-and-move with new external contract features

* update test artifacts + world_address in dojo_dev.toml

* export entrypoints + fix tests + remove TODO RBA

* restore test_metadata_updated_event test

* fix tests

* rabbit improvements

* fix test

* feat: add proc macros (#3212)

* WIP

* add macros + core-tests crates + update them from 1.6.0

* update scripts/cairo_fmt.sh + fix fmt

* update CI + Scarb.toml files

* fix fmt

* change from 2.11.2 to 2.11.4

* fix scarb issue + fmt

* one testing library for each test runner (cairo, snfoundry) + update examples

* fix fmt

* update comment

* chore: apply patches to sync exact same commits than scarb

* fix(ci): update rust-toolchain version

* fix(ci): bump clippy to use nightly compatible with 1.86

* fix: clippy and fmt

* update spawn-and-move to use dojo-snf-test

* update world address

---------

Co-authored-by: glihm <dev@glihm.net>

* Scarb crate removing (#3223)

* introduce scarb_interop crate

* handle missing scarb

* introduce metadata instead of workspace to manage dojo related paths and config

* add stats back and ensure profile is propagated until build not only metadata

* cleanup and add error message if SCARB is not set correctly

* add features + packages to build command

* update scarb build/test command

* refactor packages/features

* fix utils.rs + enable auth command

* fix rust fmt

* re-enable sozo commands

* re-enable the last sozo commands + new version command

* fix issue with conflicts_with_all

* check if manifest_path does not exist

* set run() functions as async instead of using tokio

* update init command management

* refactor metadata loading + dead code cleaning

* add build_simple_dev() function to be used to easily build spawn-and-move for tests/benches

* update tests + fmt + clippy

* remove dojo/lang

* remove useless sozo files

* tiny change

* fix CI

* use scarb nightly in CI

* fix manifest_path/manifest_dir issue

* fix fmt

* update snfoundry version + update tests accordingly + add cairo-profiler to .tool-versions

---------

Co-authored-by: glihm <dev@glihm.net>

* feat: add DojoStore trait to handle storage serialization (#3219)

* add DojoStore management

* fix rust fmt after abigen

* fix ModelReader

* fix fmt

* set DojoStore functions as inline(always)

* update test artifacts

* fix fmt

* remove dojo-core test from CI as all tests are now in core-tests

* feat: add block number for external contract events (#3224)

* add block_number to ExternalContractRegistered/ExternalContractUpgraded events

* remove useless println

* restore external_contracts tests + update with block_number

* update test artifacts

* fix clippy

* rework: handle block_number

* fix world.dns for external contract + update tests

* update sozo events with missing events

* add a self-managed external contract called from spawn-and-move

* update manifest_dev.json

* use dns_address

* fix fmt + abigen

* update test artifacts

* fix fmt

* update starkli path

* update policies

* rebuild test db

* fix: restore resource order to avoid storage conflict (#3238)

* Resource enum variant order should not change as it is used in the world storage

* fix fmt

* fix world address and test db

* fix fmt

---------

Co-authored-by: glihm <dev@glihm.net>

* fix(lang): remove warning with unit type (#3255)

fix warning with unit type for enumerations serialization generated code.

* dev: merge main in dev 1.6.0 (#3263)

* Fix broken getting started link in README (#3235)

* chore(versions): add torii 1.5.6

* Update DEVELOPMENT.md (#3236)

* Update DEVELOPMENT.md with new instructions

* Update scripts/rebuild_test_artifacts.sh with Rabbit suggestion

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Respond to review comments

* Respond to review comments II

* Respond to review comments III

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: update rpc spec to 0.8 (#3179)

* release(prepare): v1.6.0-alpha.0 (#3241)

Prepare release: v1.6.0-alpha.0

Co-authored-by: glihm <glihm@users.noreply.github.com>

* chore(versions): bump katana to 1.6.0-alpha.0

* fix(dojoup): remove new line in the source cmd (#3244)

fix: fixed new line in the source cmd

* chore: edited the build badge and its link (#3221)

Co-authored-by: Ammar Arif <evergreenkary@gmail.com>

* chore(devcontainer): update image: v1.6.0-alpha.0 (#3242)

Update devcontainer image: v1.6.0-alpha.0

Co-authored-by: glihm <glihm@users.noreply.github.com>

* chore: add katana 1.5.4 (#3245)

* chore: add the missing backticks in the comments (#3243)

Signed-off-by: one230six <723682061@qq.com>

* fix(bindgen): use world namespace for imported models in TypeScript S… (#3249)

* fix(bindgen): filter out Value models (#3248)

* fix(bindgen): fix ts bytearray type mapping (#3247)

* chore: update katana versions (#3253)

add katana versions

* sozo(unrealengine): handle UE5.6 and Dojo 1.5 (#3252)

* fix(sozo): assert caller permission with match (#3254)

* handle call_contract_syscall() result for better panic trace

* avoid using 0 as caller address

* remove temporarly the RPC version check.

Currently, Katana uses the new RPC types, without
bumping the spec version. To ensure we can still use
sozo with sepolia/mainnet and Katana, Sozo will not check
the RPC version for now

* update test dbs

---------

Co-authored-by: glihm <dev@glihm.net>

* feat(sozo): create standalone bindgen command (#3246)

* feat: create standalone bindgen command

* cleanup unused inputs

* remove dbg

* add meaningful error if project is not built

---------

Co-authored-by: glihm <dev@glihm.net>

* feat(sozo): add MCP sever (#3256)

* feat(sozo): add mvp for mcp server

* refacto: restructure MCP server

* evaluate changes using official rust sdk

* feat(mcp): add stdio support

* refacto with rmcp crate

* wip

* bump rmcp

* add testing support

* wip

* refacto

* cleanup

* add instructions

* add instructions

* wip test

* refacto tests

* add debugging

* ignore test with katana at the moment

* fix typos and sozo path

* refacto uri parsing

* remove dbg

* disable test that should be run with katana

* fix test, windows fails because of new reqwest version

* refactor(types): schema json sql value (#3257)

* refactor(types): schema json sql value

* remove excess comma

* fix clippy

---------

Co-authored-by: glihm <dev@glihm.net>

* chore: bump cairo packages to 1.6.0-alpha.0

* fix(mcp): ensure test is using latest version

* split scarb metadata ext in a different crate for dependencies

* wip: controller issue

* wip

* wip: resolve conflicts and update deps

* cleanup

* lint

* wip

* wip tests

* fix all tests

* rebuild test db

* fix: run linter

* fix slot dep with github commit

* fix clippy

* fix inspect by adding missing json format

* fix mcp formatting

* fix stdio_test

* use sozo from path

---------

Signed-off-by: one230six <723682061@qq.com>
Co-authored-by: Ritik <ritikverma0050@gmail.com>
Co-authored-by: Daniel Kronovet <kronovet@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Ammar Arif <evergreenkary@gmail.com>
Co-authored-by: Tarrence van As <tarrencev@users.noreply.github.com>
Co-authored-by: glihm <glihm@users.noreply.github.com>
Co-authored-by: Benjamin <158306087+bengineer42@users.noreply.github.com>
Co-authored-by: braveocheretovych <braveocheretovych@gmail.com>
Co-authored-by: one230six <163239332+one230six@users.noreply.github.com>
Co-authored-by: Brother MartianGreed <valentin@pupucecorp.com>
Co-authored-by: Corentin Cailleaud <corentin.cailleaud@caillef.com>
Co-authored-by: Rémy Baranx <remy.baranx@gmail.com>
Co-authored-by: Larko <59736843+Larkooo@users.noreply.github.com>

* feat(core): use metaprogramming for tuple and fixed size array Introspect and DojoStore (#3260)

* reuse Starkware metaprogramming stuff to manage tuples

* fix fmt + clippy + artifacts

* use metaprogramming to handle tuple introspect

* fix fmt + clippy + artifacts

* add fixed size array support

* update dojo-world

* update abigen + artifacts after rebase

* add a sum_sizes function

* update artifacts

* tooling: add cairo-bench tool + bench tests (#3240)

* add cairo-bench tool

* add bench tests

* first optimisation batch

* fix fmt

* add license info

* update artifacts after rebase

* fix cairo-bench tests

* update artifacts

* update artifacts

* update scarb lock

---------

Co-authored-by: glihm <dev@glihm.net>

* fix(cairo-bench): use write and threshold + refactor fixed size array (#3267)

* remove update-ref-test-list argument

* add threshold parameter to cairo-bench (set to 3% by default)

* max_fee_raw and fee_estimate_multiplier don't exist anymore

* update sozo model commands for fixed size arrays

* fix fmt + clippy

* rename --update-ref to --write

* fix some tests

* fix fmt

* fix(ci): update katana to 1.6.2 for compatible db

---------

Signed-off-by: one230six <723682061@qq.com>
Co-authored-by: Rémy Baranx <remy.baranx@gmail.com>
Co-authored-by: Ritik <ritikverma0050@gmail.com>
Co-authored-by: Daniel Kronovet <kronovet@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Ammar Arif <evergreenkary@gmail.com>
Co-authored-by: Tarrence van As <tarrencev@users.noreply.github.com>
Co-authored-by: glihm <glihm@users.noreply.github.com>
Co-authored-by: Benjamin <158306087+bengineer42@users.noreply.github.com>
Co-authored-by: braveocheretovych <braveocheretovych@gmail.com>
Co-authored-by: one230six <163239332+one230six@users.noreply.github.com>
Co-authored-by: Brother MartianGreed <valentin@pupucecorp.com>
Co-authored-by: Corentin Cailleaud <corentin.cailleaud@caillef.com>
Co-authored-by: Larko <59736843+Larkooo@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants