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

[ FEAT ] Bumup version to 12 #74

Closed
wants to merge 6 commits into from
Closed
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/ci-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jobs:
- uses: asdf-vm/actions/setup@v3
- run: |
asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
asdf install dojo 1.0.0-alpha.11
asdf global dojo 1.0.0-alpha.11
asdf install dojo 1.0.0-alpha.13
asdf global dojo 1.0.0-alpha.13
sozo test
2 changes: 1 addition & 1 deletion contracts/.tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dojo 1.0.0-alpha.11
dojo 1.0.0-alpha.13
scarb 2.7.0
2 changes: 1 addition & 1 deletion contracts/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cairo1.enableLanguageServer": true,
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.0-alpha.11/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.0-alpha.13/bin/dojo-language-server",
"cairo1.enableScarb": true,
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.7.0/bin/scarb",
"cairo1.preferScarbLanguageServer": false
Expand Down
2 changes: 1 addition & 1 deletion contracts/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"label": "Start Torii",
"type": "shell",
"command": "torii --world 0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34 --database db/torii --allowed-origins '*'",
"command": "torii --world 0x29861a9e7b2e8414e13c97819ff2b62f1245932abe8f05b3c6e58ad42a1d243 --database db/torii --allowed-origins '*'",
"isBackground": true,
"problemMatcher": [],
"presentation": {
Expand Down
10 changes: 1 addition & 9 deletions contracts/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@ version = 1
[[package]]
name = "dojo"
version = "1.0.0-alpha.4"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.11#fbff45b249e2b931f5007edf2d526beef7dc553f"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_plugin"
version = "1.0.0-alpha.4"
source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79351d11c197f63e8cc1ff36"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.13#9f95a68a957d45190a1e1c42877a4b828ab7a96d"

[[package]]
name = "pixelaw"
Expand Down
6 changes: 3 additions & 3 deletions contracts/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ edition = "2024_07"
sierra-replace-ids = true

[dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.11" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.13" }

[tool.fmt]
sort-module-level-items = true

# [lib]
[[target.dojo]]
[lib]
# [[target.dojo]]


[profile.dev-pop]
Expand Down
2 changes: 1 addition & 1 deletion contracts/Scarb_deploy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2024_07"
sierra-replace-ids = true

[dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.11" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.13" }

[tool.fmt]
sort-module-level-items = true
Expand Down
2 changes: 1 addition & 1 deletion contracts/dojo_dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ mappings = {}
rpc_url = "http://localhost:5050/"
account_address = "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
world_address = "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34"
world_address = "0x29861a9e7b2e8414e13c97819ff2b62f1245932abe8f05b3c6e58ad42a1d243"
4 changes: 2 additions & 2 deletions contracts/dojo_slot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ mappings = {}

[env]
rpc_url = "https://api.cartridge.gg/x/pixelaw-dev/katana/"
account_address = "0x75aab901b406698604a33f1c81c6487b8de3b2d7ad2456cf01658b68b12aa5"
private_key = "0x74825107c10098a1a991b1419e0afad3afc9e9ba4d16dec23995916cdca4366"
account_address = "0x798115b6af1edfeb17bf60973d2250bc7a12bcd4824293eecd8feead990ed50"
private_key = "0x24a070bc4fe89dc2415d651aba07d14e4460b6b02de60a0c6f9a0df40ddaf56"
world_address = "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind = "DojoContract"
class_hash = "0xcd76621d6a3678a27c2d5424907d1151e04b4ceb28c02d800b3ddfe2d016f2"
original_class_hash = "0xcd76621d6a3678a27c2d5424907d1151e04b4ceb28c02d800b3ddfe2d016f2"
class_hash = "0x26345888698fbdcfa98dca43542f038a02620c9b485c1487b7e76a21f63aff"
original_class_hash = "0x26345888698fbdcfa98dca43542f038a02620c9b485c1487b7e76a21f63aff"
base_class_hash = "0x0"
abi = "manifests/dev/base/abis/contracts/pixelaw-paint_actions-2afb94fe.json"
reads = []
Expand Down
4 changes: 2 additions & 2 deletions contracts/manifests/dev/base/dojo-world.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind = "Class"
class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
original_class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
original_class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
abi = "manifests/dev/base/abis/dojo-world.json"
tag = "dojo-world"
manifest_name = "dojo-world"
57 changes: 42 additions & 15 deletions contracts/manifests/dev/deployment/manifest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"world": {
"kind": "WorldContract",
"class_hash": "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e",
"original_class_hash": "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e",
"class_hash": "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0",
"original_class_hash": "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0",
"abi": [
{
"type": "impl",
Expand Down Expand Up @@ -1234,8 +1234,8 @@
]
}
],
"address": "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34",
"transaction_hash": "0x507cd13b0e34b357d25bd0ddafa527c8caf0729f894e57ad9129c1f29311768",
"address": "0x29861a9e7b2e8414e13c97819ff2b62f1245932abe8f05b3c6e58ad42a1d243",
"transaction_hash": "0x5ece9d6772ba3916ab7f14b93012f3891082bcb2aebe6a278842024a9c43d57",
"block_number": 3,
"seed": "pixelaw",
"metadata": {
Expand All @@ -1255,7 +1255,7 @@
"contracts": [
{
"kind": "DojoContract",
"address": "0x6c2ffdd97cb5a1bca13de416adb23a1d0e24ae3c805114b2100f6af95a7f60e",
"address": "0x69101f6d916d1d992e4964696cd07d3cde9a1a9687d58b5db0af816465c0cc6",
"class_hash": "0x17d390af6c3b449b52da5a0969a00006a3b7935ffc08192dc8cefdeb563488f",
"original_class_hash": "0x17d390af6c3b449b52da5a0969a00006a3b7935ffc08192dc8cefdeb563488f",
"base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
Expand Down Expand Up @@ -2035,7 +2035,16 @@
}
],
"reads": [],
"writes": [],
"writes": [
"pixelaw-App",
"pixelaw-AppName",
"pixelaw-CoreActionsAddress",
"pixelaw-Pixel",
"pixelaw-Permissions",
"pixelaw-QueueItem",
"pixelaw-Snake",
"pixelaw-Instruction"
],
"init_calldata": [],
"tag": "pixelaw-actions",
"systems": [
Expand All @@ -2051,9 +2060,9 @@
},
{
"kind": "DojoContract",
"address": "0x41b6ece4125198c4de0d9d7efa2fad0af34376178b2c0a5a4487c676f35d5c6",
"class_hash": "0xcd76621d6a3678a27c2d5424907d1151e04b4ceb28c02d800b3ddfe2d016f2",
"original_class_hash": "0xcd76621d6a3678a27c2d5424907d1151e04b4ceb28c02d800b3ddfe2d016f2",
"address": "0x5eb3a0500622b2c8495d1c0756cda60353816e7099042dd52643b9c29baf64f",
"class_hash": "0x26345888698fbdcfa98dca43542f038a02620c9b485c1487b7e76a21f63aff",
"original_class_hash": "0x26345888698fbdcfa98dca43542f038a02620c9b485c1487b7e76a21f63aff",
"base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
"abi": [
{
Expand Down Expand Up @@ -2545,15 +2554,25 @@
}
],
"reads": [],
"writes": [],
"writes": [
"pixelaw-Pixel"
],
"init_calldata": [],
"tag": "pixelaw-paint_actions",
"systems": ["on_pre_update", "on_post_update", "init", "interact", "put_color", "pixel_row", "fade"],
"systems": [
"on_pre_update",
"on_post_update",
"init",
"interact",
"put_color",
"pixel_row",
"fade"
],
"manifest_name": "pixelaw-paint_actions-2afb94fe"
},
{
"kind": "DojoContract",
"address": "0x7e90101cb87a2f0b670204fa83f70d42a48c64ef10ddf0aaf9862d84b4bc9df",
"address": "0x59180b232ad2ba9cb78adc01d84e4905cf847583c314b1cce2d8a2963d1515a",
"class_hash": "0x6dbe6fed41677edc917050c80b2e15727f48534fd7752e153e7cf74542ebad9",
"original_class_hash": "0x6dbe6fed41677edc917050c80b2e15727f48534fd7752e153e7cf74542ebad9",
"base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
Expand Down Expand Up @@ -3092,10 +3111,18 @@
}
],
"reads": [],
"writes": [],
"writes": [
"pixelaw-Snake",
"pixelaw-SnakeSegment"
],
"init_calldata": [],
"tag": "pixelaw-snake_actions",
"systems": ["on_pre_update", "on_post_update", "init", "move"],
"systems": [
"on_pre_update",
"on_post_update",
"init",
"move"
],
"manifest_name": "pixelaw-snake_actions-4f967106"
}
],
Expand Down Expand Up @@ -7694,4 +7721,4 @@
"manifest_name": "pixelaw-SnakeSegment-302de0d8"
}
]
}
}
71 changes: 44 additions & 27 deletions contracts/manifests/dev/deployment/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[world]
kind = "WorldContract"
class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
original_class_hash = "0x6f4515274ee23404789c3351a77107d0ec07508530119822046600ca6948d6e"
class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
original_class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
abi = "manifests/dev/deployment/abis/dojo-world.json"
address = "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34"
transaction_hash = "0x507cd13b0e34b357d25bd0ddafa527c8caf0729f894e57ad9129c1f29311768"
address = "0x29861a9e7b2e8414e13c97819ff2b62f1245932abe8f05b3c6e58ad42a1d243"
transaction_hash = "0x5ece9d6772ba3916ab7f14b93012f3891082bcb2aebe6a278842024a9c43d57"
block_number = 3
seed = "pixelaw"
manifest_name = "dojo-world"
Expand All @@ -23,60 +23,77 @@ manifest_name = "dojo-base"

[[contracts]]
kind = "DojoContract"
address = "0x6c2ffdd97cb5a1bca13de416adb23a1d0e24ae3c805114b2100f6af95a7f60e"
address = "0x69101f6d916d1d992e4964696cd07d3cde9a1a9687d58b5db0af816465c0cc6"
class_hash = "0x17d390af6c3b449b52da5a0969a00006a3b7935ffc08192dc8cefdeb563488f"
original_class_hash = "0x17d390af6c3b449b52da5a0969a00006a3b7935ffc08192dc8cefdeb563488f"
base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
abi = "manifests/dev/deployment/abis/contracts/pixelaw-actions-16928a49.json"
reads = []
writes = []
writes = [
"pixelaw-App",
"pixelaw-AppName",
"pixelaw-CoreActionsAddress",
"pixelaw-Pixel",
"pixelaw-Permissions",
"pixelaw-QueueItem",
"pixelaw-Snake",
"pixelaw-Instruction",
]
init_calldata = []
tag = "pixelaw-actions"
systems = [
"init",
"update_permission",
"schedule_queue",
"process_queue",
"update_pixel",
"alert_player",
"set_instruction",
"init",
"update_permission",
"schedule_queue",
"process_queue",
"update_pixel",
"alert_player",
"set_instruction",
]
manifest_name = "pixelaw-actions-16928a49"

[[contracts]]
kind = "DojoContract"
address = "0x41b6ece4125198c4de0d9d7efa2fad0af34376178b2c0a5a4487c676f35d5c6"
class_hash = "0xcd76621d6a3678a27c2d5424907d1151e04b4ceb28c02d800b3ddfe2d016f2"
original_class_hash = "0xcd76621d6a3678a27c2d5424907d1151e04b4ceb28c02d800b3ddfe2d016f2"
address = "0x5eb3a0500622b2c8495d1c0756cda60353816e7099042dd52643b9c29baf64f"
class_hash = "0x26345888698fbdcfa98dca43542f038a02620c9b485c1487b7e76a21f63aff"
original_class_hash = "0x26345888698fbdcfa98dca43542f038a02620c9b485c1487b7e76a21f63aff"
base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
abi = "manifests/dev/deployment/abis/contracts/pixelaw-paint_actions-2afb94fe.json"
reads = []
writes = []
writes = ["pixelaw-Pixel"]
init_calldata = []
tag = "pixelaw-paint_actions"
systems = [
"on_pre_update",
"on_post_update",
"init",
"interact",
"put_color",
"pixel_row",
"fade",
"on_pre_update",
"on_post_update",
"init",
"interact",
"put_color",
"pixel_row",
"fade",
]
manifest_name = "pixelaw-paint_actions-2afb94fe"

[[contracts]]
kind = "DojoContract"
address = "0x7e90101cb87a2f0b670204fa83f70d42a48c64ef10ddf0aaf9862d84b4bc9df"
address = "0x59180b232ad2ba9cb78adc01d84e4905cf847583c314b1cce2d8a2963d1515a"
class_hash = "0x6dbe6fed41677edc917050c80b2e15727f48534fd7752e153e7cf74542ebad9"
original_class_hash = "0x6dbe6fed41677edc917050c80b2e15727f48534fd7752e153e7cf74542ebad9"
base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
abi = "manifests/dev/deployment/abis/contracts/pixelaw-snake_actions-4f967106.json"
reads = []
writes = []
writes = [
"pixelaw-Snake",
"pixelaw-SnakeSegment",
]
init_calldata = []
tag = "pixelaw-snake_actions"
systems = ["on_pre_update", "on_post_update", "init", "move"]
systems = [
"on_pre_update",
"on_post_update",
"init",
"move",
]
manifest_name = "pixelaw-snake_actions-4f967106"

[[models]]
Expand Down
22 changes: 18 additions & 4 deletions contracts/manifests/slot/deployment/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,7 @@
}
],
"address": "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34",
"transaction_hash": "0xf97c1e5993326189b232d6abb37f8a3733557b231d9d8bfc10fb6a7a078f89",
"transaction_hash": "0x3a6c907a6782b0d14c271fe62a3b3e9652a838e6dc4164fd3dc5a8fd706a4ed",
"block_number": 3,
"seed": "pixelaw",
"metadata": {
Expand Down Expand Up @@ -2035,7 +2035,16 @@
}
],
"reads": [],
"writes": [],
"writes": [
"pixelaw-App",
"pixelaw-AppName",
"pixelaw-CoreActionsAddress",
"pixelaw-Pixel",
"pixelaw-Permissions",
"pixelaw-QueueItem",
"pixelaw-Snake",
"pixelaw-Instruction"
],
"init_calldata": [],
"tag": "pixelaw-actions",
"systems": [
Expand Down Expand Up @@ -2545,7 +2554,9 @@
}
],
"reads": [],
"writes": [],
"writes": [
"pixelaw-Pixel"
],
"init_calldata": [],
"tag": "pixelaw-paint_actions",
"systems": [
Expand Down Expand Up @@ -3100,7 +3111,10 @@
}
],
"reads": [],
"writes": [],
"writes": [
"pixelaw-Snake",
"pixelaw-SnakeSegment"
],
"init_calldata": [],
"tag": "pixelaw-snake_actions",
"systems": [
Expand Down
Loading
Loading