Skip to content

Commit

Permalink
Merge remote-tracking branch 'dojo/main' into refactor/sn-messaging
Browse files Browse the repository at this point in the history
  • Loading branch information
glihm committed Jan 9, 2025
2 parents 6076f67 + 7718099 commit 4331a7c
Show file tree
Hide file tree
Showing 42 changed files with 1,381 additions and 1,287 deletions.
143 changes: 70 additions & 73 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ torii-graphql = { path = "crates/torii/graphql" }
torii-grpc = { path = "crates/torii/grpc" }
torii-relay = { path = "crates/torii/libp2p" }
torii-server = { path = "crates/torii/server" }
torii-runner = { path = "crates/torii/runner" }
torii-typed-data = { path = "crates/torii/typed-data" }

# saya
saya-core = { path = "crates/saya/core" }
Expand Down
57 changes: 3 additions & 54 deletions bin/torii/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,9 @@ edition.workspace = true
name = "torii"
version.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
torii-cli.workspace = true
torii-runner.workspace = true
tokio.workspace = true
anyhow.workspace = true
async-trait.workspace = true
base64.workspace = true
camino.workspace = true
chrono.workspace = true
clap.workspace = true
clap_complete.workspace = true
ctrlc = { version = "3.4", features = [ "termination" ] }
dojo-metrics.workspace = true
dojo-types.workspace = true
dojo-utils.workspace = true
dojo-world.workspace = true
either = "1.9.0"
futures.workspace = true
http-body = "0.4.5"
http.workspace = true
hyper-reverse-proxy = { git = "https://github.com/tarrencev/hyper-reverse-proxy" }
hyper.workspace = true
indexmap.workspace = true
lazy_static.workspace = true
serde.workspace = true
serde_json.workspace = true
sqlx.workspace = true
starknet-crypto.workspace = true
starknet.workspace = true
tokio-stream = "0.1.11"
tokio-util = "0.7.7"
tokio.workspace = true
toml.workspace = true
torii-cli.workspace = true
torii-indexer.workspace = true
torii-sqlite.workspace = true
torii-graphql.workspace = true
torii-grpc = { workspace = true, features = [ "server" ] }
torii-relay.workspace = true
torii-server.workspace = true
tower.workspace = true

clap_config = "0.1.1"
tempfile.workspace = true
tower-http.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
url.workspace = true
webbrowser = "0.8"

[dev-dependencies]
assert_matches.workspace = true
camino.workspace = true

[features]
default = [ "jemalloc", "sqlite" ]
jemalloc = [ "dojo-metrics/jemalloc" ]
sqlite = [ "sqlx/sqlite" ]
Loading

0 comments on commit 4331a7c

Please sign in to comment.