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

[ FIX] Remove overlay and add config to dojo config files #79

Merged
merged 1 commit into from
Nov 13, 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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
target/

contracts/out
contracts/db
contracts/target
contracts/manifest_dev.json

*.account.json
*.keystore.json

4 changes: 2 additions & 2 deletions contracts/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"label": "Start Katana",
"type": "shell",
"command": "katana --disable-fee --allowed-origins '*' --db-dir db/katana",
"command": "katana --http.cors_origins '*' --db-dir db/katana",
"isBackground": true,
"problemMatcher": [],
"presentation": {
Expand All @@ -16,7 +16,7 @@
{
"label": "Start Torii",
"type": "shell",
"command": "torii --world 0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34 --database db/torii --allowed-origins '*'",
"command": "torii --world 0x06f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6 --http.cors_origins '*' --db-dir db/torii",
"isBackground": true,
"problemMatcher": [],
"presentation": {
Expand Down
2 changes: 1 addition & 1 deletion contracts/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0#74280d48fa2828095331

[[package]]
name = "pixelaw"
version = "0.5.0"
version = "0.5.1"
dependencies = [
"dojo",
"dojo_cairo_test",
Expand Down
15 changes: 15 additions & 0 deletions contracts/dojo_dev-pop.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,18 @@ account_address = "0x3c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502
private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
world_address = "0x5729e109ed70ce4f33e3164505c78476e9fec57874b69467cdf0ba51636085"

[writers]
"pixelaw-App" = ["pixelaw-actions"]
"pixelaw-AppName" = ["pixelaw-actions"]
"pixelaw-AppUser" = ["pixelaw-actions"]
"pixelaw-CoreActionsAddress" = ["pixelaw-actions"]
"pixelaw-Pixel" = [
"pixelaw-actions",
"pixelaw-paint_actions",
"pixelaw-snake_actions",
]
"pixelaw-QueueItem" = ["pixelaw-actions"]
"pixelaw-Snake" = ["pixelaw-actions", "pixelaw-snake_actions"]
"pixelaw-RTree" = ["pixelaw-actions"]
"pixelaw-Area" = ["pixelaw-actions"]
"pixelaw-SnakeSegment" = ["pixelaw-snake_actions"]
21 changes: 18 additions & 3 deletions contracts/dojo_dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,22 @@ mappings = {}

[env]
rpc_url = "http://localhost:5050/"
account_address = "0x3c4dd268780ef738920c801edc3a75b6337bc17558c74795b530c0ff502486"
private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
world_address = "0x6f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6"
account_address = "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec"
private_key = "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912"
world_address = "0x06f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6"

[writers]
"pixelaw-App" = ["pixelaw-actions"]
"pixelaw-AppName" = ["pixelaw-actions"]
"pixelaw-AppUser" = ["pixelaw-actions"]
"pixelaw-CoreActionsAddress" = ["pixelaw-actions"]
"pixelaw-Pixel" = [
"pixelaw-actions",
"pixelaw-paint_actions",
"pixelaw-snake_actions",
]
"pixelaw-QueueItem" = ["pixelaw-actions"]
"pixelaw-Snake" = ["pixelaw-actions", "pixelaw-snake_actions"]
"pixelaw-RTree" = ["pixelaw-actions"]
"pixelaw-Area" = ["pixelaw-actions"]
"pixelaw-SnakeSegment" = ["pixelaw-snake_actions"]
16 changes: 16 additions & 0 deletions contracts/dojo_sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,19 @@ rpc_url = "https://starknet-sepolia.public.blastapi.io/rpc/v0_7"
keystore_path = "accounts/deployer.keystore.json"
account_address = "0x02c306e30b02a1a734bc770af37b32619911f1cfd6ccecb93c5899632f379da9"
world_address = "0x4adbe4bfe631a95a5ce99d8200a8721b1ac8096ff8941cecddc4e79a7b2d5d5"

[writers]
"pixelaw-App" = ["pixelaw-actions"]
"pixelaw-AppName" = ["pixelaw-actions"]
"pixelaw-AppUser" = ["pixelaw-actions"]
"pixelaw-CoreActionsAddress" = ["pixelaw-actions"]
"pixelaw-Pixel" = [
"pixelaw-actions",
"pixelaw-paint_actions",
"pixelaw-snake_actions",
]
"pixelaw-QueueItem" = ["pixelaw-actions"]
"pixelaw-Snake" = ["pixelaw-actions", "pixelaw-snake_actions"]
"pixelaw-RTree" = ["pixelaw-actions"]
"pixelaw-Area" = ["pixelaw-actions"]
"pixelaw-SnakeSegment" = ["pixelaw-snake_actions"]
16 changes: 16 additions & 0 deletions contracts/dojo_slot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,19 @@ rpc_url = "https://api.cartridge.gg/x/pixelaw-dev/katana/"
account_address = "0x75aab901b406698604a33f1c81c6487b8de3b2d7ad2456cf01658b68b12aa5"
private_key = "0x74825107c10098a1a991b1419e0afad3afc9e9ba4d16dec23995916cdca4366"
world_address = "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34"

[writers]
"pixelaw-App" = ["pixelaw-actions"]
"pixelaw-AppName" = ["pixelaw-actions"]
"pixelaw-AppUser" = ["pixelaw-actions"]
"pixelaw-CoreActionsAddress" = ["pixelaw-actions"]
"pixelaw-Pixel" = [
"pixelaw-actions",
"pixelaw-paint_actions",
"pixelaw-snake_actions",
]
"pixelaw-QueueItem" = ["pixelaw-actions"]
"pixelaw-Snake" = ["pixelaw-actions", "pixelaw-snake_actions"]
"pixelaw-RTree" = ["pixelaw-actions"]
"pixelaw-Area" = ["pixelaw-actions"]
"pixelaw-SnakeSegment" = ["pixelaw-snake_actions"]
43 changes: 0 additions & 43 deletions contracts/output.txt

This file was deleted.

11 changes: 0 additions & 11 deletions contracts/overlays/dev-pop/core_actions.toml

This file was deleted.

2 changes: 0 additions & 2 deletions contracts/overlays/dev-pop/paint_actions.toml

This file was deleted.

2 changes: 0 additions & 2 deletions contracts/overlays/dev-pop/snake_actions.toml

This file was deleted.

11 changes: 0 additions & 11 deletions contracts/overlays/dev/core_actions.toml

This file was deleted.

2 changes: 0 additions & 2 deletions contracts/overlays/dev/paint_actions.toml

This file was deleted.

2 changes: 0 additions & 2 deletions contracts/overlays/dev/snake_actions.toml

This file was deleted.

11 changes: 0 additions & 11 deletions contracts/overlays/sepolia/core_actions.toml

This file was deleted.

2 changes: 0 additions & 2 deletions contracts/overlays/sepolia/paint_actions.toml

This file was deleted.

2 changes: 0 additions & 2 deletions contracts/overlays/sepolia/snake_actions.toml

This file was deleted.

Loading