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.

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

🚧 Upgrade to dojo rc0 #1

Merged
merged 5 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/workflows/contracts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
pull_request:

env:
DOJO_VERSION: v1.0.0-alpha.14
SCARB_VERSION: 2.7.0
DOJO_VERSION: v1.0.0-rc.0
SCARB_VERSION: 2.8.4
WORKING_DIRECTORY: ./contracts

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
pull_request:

env:
DOJO_VERSION: v1.0.0-alpha.14
SCARB_VERSION: 2.7.0
DOJO_VERSION: v1.0.0-rc.0
SCARB_VERSION: 2.8.4
WORKING_DIRECTORY: ./packages

jobs:
Expand Down
21 changes: 19 additions & 2 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,26 @@ name = "achievement"
version = "0.0.0"
dependencies = [
"dojo",
"dojo_cairo_test",
]

[[package]]
name = "dojo"
version = "1.0.0-alpha.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.14#6bafcb55178888268d86aae9dccef8a1ba6e7542"
version = "1.0.0-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_cairo_test"
version = "1.0.0-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7"
dependencies = [
"dojo",
]

[[package]]
name = "dojo_plugin"
version = "2.8.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7"
10 changes: 5 additions & 5 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[workspace]
members = ["packages/achievement"]
version = "0.0.0"
description = "Dojo quest library"
homepage = "https://github.com/cartridge-gg/quest/"
cairo-version = "2.7.0"
cairo-version = "2.8.4"

[workspace.package]
version = "0.0.0"

[workspace.dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.14" }
starknet = "^2.7.0"
cairo_test = "^2.7.0"
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" }
starknet = "2.8.4"
cairo_test = "2.8.4"

[workspace.tool.fmt]
sort-module-level-items = true
23 changes: 20 additions & 3 deletions contracts/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,30 @@ dependencies = [

[[package]]
name = "dojo"
version = "1.0.0-alpha.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.14#6bafcb55178888268d86aae9dccef8a1ba6e7542"
version = "1.0.0-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_cairo_test"
version = "1.0.0-rc.0"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7"
dependencies = [
"dojo",
]

[[package]]
name = "dojo_plugin"
version = "2.8.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-rc.0#f4199aec570a395278b8c8748bc46e2f6be3d0c7"

[[package]]
name = "quest_world"
name = "game_center"
version = "0.0.0"
dependencies = [
"achievement",
"dojo",
"dojo_cairo_test",
]
22 changes: 14 additions & 8 deletions contracts/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
cairo-version = "=2.7.0"
name = "quest_world"
cairo-version = "2.8.4"
name = "game_center"
version = "0.0.0"

[cairo]
Expand All @@ -10,15 +10,21 @@ sierra-replace-ids = true
dev = "sozo clean && sozo build --typescript && sozo migrate plan && sozo migrate apply"

[dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" }
achievement = { path = ".." }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.14" }
starknet = "2.8.4"
cairo_test = "2.8.4"

[[target.dojo]]
[dev-dependencies]
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-rc.0" }

[[target.starknet-contract]]
build-external-contracts = [
"achievement::models::index::Game",
"achievement::models::index::Achievement",
"achievement::events::index::AchievementCreation",
"achievement::events::index::AchievementCompletion",
"dojo::world::world_contract::world",
"achievement::models::index::m_Game",
"achievement::models::index::m_Achievement",
"achievement::events::index::e_Trophy",
"achievement::events::index::e_Progress",
]

[profile.slot]
8 changes: 5 additions & 3 deletions contracts/dojo_dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ telegram = "https://t.me/dojoengine"

[namespace]
default = "game_center"
mappings = { "achievement" = "game_center" }

[writers]
"game_center" = ["game_center-Actions"]

[env]
rpc_url = "http://localhost:5050/"
account_address = "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
account_address = "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec"
private_key = "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912"
11 changes: 10 additions & 1 deletion contracts/dojo_slot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ telegram = "https://t.me/dojoengine"

[namespace]
default = "game_center"
mappings = { "achievement" = "game_center" }
mappings = { "achievement" = [
"m_Game",
"m_Achievement",
], "game_center" = [
"m_Game",
"m_Achievement",
] }

[writers]
"game_center" = ["game_center-Actions"]

[env]
rpc_url = "https://api.cartridge.gg/x/bushido/katana"
Expand Down
Loading