Skip to content

Commit

Permalink
Merge branch 'main' into feat/torii/ercs
Browse files Browse the repository at this point in the history
  • Loading branch information
lambda-0x committed Oct 3, 2024
1 parent 0958c4d commit 2972ae3
Show file tree
Hide file tree
Showing 27 changed files with 975 additions and 474 deletions.
173 changes: 149 additions & 24 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ alloy-sol-types = { version = "0.8.3", default-features = false }
criterion = "0.5.1"

# Slot integration. Dojo don't need to manually include `account_sdk` as dependency as `slot` already re-exports it.
slot = { git = "https://github.com/cartridge-gg/slot", rev = "630ed37" }
slot = { git = "https://github.com/cartridge-gg/slot", rev = "544cbc6" }

alloy-contract = { version = "0.3", default-features = false }
alloy-json-rpc = { version = "0.3", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions bin/torii/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ tracing-subscriber.workspace = true
tracing.workspace = true
url.workspace = true
webbrowser = "0.8"
tempfile.workspace = true

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

0 comments on commit 2972ae3

Please sign in to comment.