Skip to content
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

feat(katana): include settlement info in chainspec #2869

Closed
wants to merge 12 commits into from
Closed

feat(katana): include settlement info in chainspec #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
07bb880
fix(torii-core): correct parallelized task hash (#2860)
Larkooo Jan 3, 2025
d9e93c4
fix(torii-core): remove old check for StoreUpdateMember processor (#2…
glihm Jan 6, 2025
3daa543
docs: readme (#2861)
Olexandr88 Jan 6, 2025
1ddee9e
ci: add constraints on jobs to start based on linters (#2866)
glihm Jan 6, 2025
b5b8ac4
consume initialization configuration output
kariy Jan 3, 2025
e5306ab
move chain spec into its own crate
kariy Jan 3, 2025
51dfa69
use new chain spec struct
kariy Jan 3, 2025
214c53d
chore: remove comments
kariy Jan 3, 2025
1e2164b
chore: hide `--chain` flag
kariy Jan 3, 2025
de12920
chore: remove comments
kariy Jan 3, 2025
ab5e13f
refactor: introduce back `--chain-id` arg
kariy Jan 3, 2025
5579a1e
refactor: settlement config as enum
kariy Jan 6, 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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
jobs:
build:
runs-on: ubuntu-latest-4-cores
needs: [fmt, cairofmt]
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -55,6 +56,7 @@ jobs:

ensure-wasm:
runs-on: ubuntu-latest
needs: [fmt, cairofmt]
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
Expand Down Expand Up @@ -153,6 +155,7 @@ jobs:

clippy:
runs-on: ubuntu-latest-4-cores
needs: [fmt, cairofmt]
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
Expand All @@ -171,6 +174,7 @@ jobs:

docs:
runs-on: ubuntu-latest
needs: [fmt, cairofmt]
container:
image: ghcr.io/dojoengine/dojo-dev:v1.0.9
steps:
Expand Down
84 changes: 52 additions & 32 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: 4 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ members = [
"crates/dojo/utils",
"crates/dojo/world",
"crates/dojo/world/abigen",
"crates/katana/chain-spec",
"crates/katana/cli",
"crates/katana/controller",
"crates/katana/core",
Expand Down Expand Up @@ -73,8 +74,8 @@ debug = true
inherits = "release"

[workspace.dependencies]
cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.10", features = [ "abigen-rs" ] }
cainome-cairo-serde = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.10" }
cainome = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.11", features = [ "abigen-rs" ] }
cainome-cairo-serde = { git = "https://github.com/cartridge-gg/cainome", tag = "v0.4.11" }
dojo-utils = { path = "crates/dojo/utils" }

# metrics
Expand All @@ -93,6 +94,7 @@ topological-sort = "0.2"

# katana
katana-cairo = { path = "crates/katana/cairo" }
katana-chain-spec = { path = "crates/katana/chain-spec" }
katana-cli = { path = "crates/katana/cli" }
katana-codecs = { path = "crates/katana/storage/codecs" }
katana-codecs-derive = { path = "crates/katana/storage/codecs/derive" }
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
![Dojo Feature Matrix](.github/feature_matrix.png)

# Dojo: Provable Games and Applications [![discord](https://img.shields.io/badge/join-dojo-green?logo=discord&logoColor=white)](https://discord.com/invite/dojoengine) [![Telegram Chat][tg-badge]][tg-url] ![Github Actions][gha-badge]
# Dojo: Provable Games and Applications [![discord](https://img.shields.io/badge/join-dojo-green?logo=discord&logoColor=white)](https://discord.com/invite/dojoengine) [![Telegram Chat][tg-badge]][tg-url] [![Github Actions][gha-badge]][gha-url]

[gha-badge]: https://img.shields.io/github/actions/workflow/status/dojoengine/dojo/ci.yml?branch=main
[gha-url]: https://github.com/dojoengine/dojo/actions/workflows/ci.yml?query=branch%3Amain
[tg-badge]: https://img.shields.io/endpoint?color=neon&logo=telegram&label=chat&style=flat-square&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Fdojoengine
[tg-url]: https://t.me/dojoengine

Expand Down
4 changes: 2 additions & 2 deletions bin/katana/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ version.workspace = true

[dependencies]
katana-cairo.workspace = true
katana-chain-spec.workspace = true
katana-cli.workspace = true
katana-db.workspace = true
katana-node.workspace = true
Expand All @@ -22,13 +23,12 @@ comfy-table = "7.1.1"
dirs = "5.0.1"
dojo-utils.workspace = true
inquire = "0.7.5"
serde.workspace = true
lazy_static.workspace = true
serde_json.workspace = true
shellexpand = "3.1.0"
spinoff.workspace = true
starknet.workspace = true
tokio.workspace = true
toml.workspace = true

[dev-dependencies]
assert_matches.workspace = true
Expand Down
Loading
Loading