Skip to content

Commit

Permalink
bump to core 0.5.12 and dojo 1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
thiscaspar committed Dec 1, 2024
1 parent 776306d commit debfcbd
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 79 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "My Project",
"image": "ghcr.io/pixelaw/core:0.5.11",
"image": "ghcr.io/pixelaw/core:0.5.12",
"forwardPorts": [
5050,
8080,
Expand All @@ -17,7 +17,7 @@
"PUBLIC_RELAY_URL": "http://localhost:8080",
"MASTER_ADDRESS": "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca",
"MASTER_PRIVATE_KEY": "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a",
"WORLD_ADDRESS": "0x6f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6",
"WORLD_ADDRESS": "0x2bf4d3aa0dced89d37d8c3b4ff6a05895c0af32ff3baf9b02abf8504e53eaad",
"ACCOUNT_CLASS_HASH": "0x05400e90f7e0ae78bd02c77cd75527280470e2fe19c54970dd79dc37a9d3645c",
"FEETOKEN_ADDRESS": "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
"SERVER_PORT": "3000"
Expand All @@ -32,7 +32,7 @@
// Set *default* container specific settings.json values on container create.
"settings": {
"cairo1.enableLanguageServer": true,
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.2/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.3/bin/dojo-language-server",
"cairo1.enableScarb": true,
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.7.0/bin/scarb",
"lldb.executable": "/usr/bin/lldb",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
- uses: asdf-vm/actions/setup@v3
- run: |
asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
asdf install dojo 1.0.2
asdf global dojo 1.0.2
asdf install dojo 1.0.3
asdf global dojo 1.0.3
sozo test
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dojo 1.0.2
dojo 1.0.3
scarb 2.7.0
2 changes: 1 addition & 1 deletion .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.2/bin/dojo-language-server",
"cairo1.languageServerPath": "${userHome}/.asdf/installs/dojo/1.0.3/bin/dojo-language-server",
"cairo1.enableScarb": true,
"cairo1.scarbPath": "${userHome}/.asdf/installs/scarb/2.7.0/bin/scarb",
"cairo1.preferScarbLanguageServer": false
Expand Down
4 changes: 2 additions & 2 deletions README.local.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Follow the asdf installation instructions.

```
asdf plugin add dojo https://github.com/dojoengine/asdf-dojo
asdf install dojo 1.0.2
asdf install dojo 1.0.3
```

### Install scarb
Expand Down Expand Up @@ -48,7 +48,7 @@ sozo migrate
scarb run init_auth

# Start Torii
torii --world 0x6f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6 --http.cors_origins "*"
torii --world 0x2bf4d3aa0dced89d37d8c3b4ff6a05895c0af32ff3baf9b02abf8504e53eaad --http.cors_origins "*"
```

### How to deploy
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The idea is that you'll copy this template and create your own PixeLAW app with
To upgrade Dojo, you have to upgrade Pixelaw Core (see below)

### 4.2 Upgrade Core
The easiest is to do a full-text search/replace on the Core version number (for example `0.5.11`) and replace it with the new version. Then it's easiest to
The easiest is to do a full-text search/replace on the Core version number (for example `0.5.12`) and replace it with the new version. Then it's easiest to
1. Delete the `/target/` folder
1. Delete the `Scarb.lock` file
1. Full Rebuild using `sozo build`
Expand Down
50 changes: 0 additions & 50 deletions Scarb.lock

This file was deleted.

21 changes: 4 additions & 17 deletions Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,22 @@ version = "0.0.0"
sierra-replace-ids = true

[dependencies]
pixelaw = { git = "https://github.com/pixelaw/core", tag = "v0.5.11" }
pixelaw = { git = "https://github.com/pixelaw/core", tag = "v0.5.12" }
#pixelaw = { path = "../core/contracts" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.2" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.3" }

[dev-dependencies]
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.2" }
pixelaw_test_helpers = { git = "https://github.com/pixelaw/core", tag = "v0.5.11" }
dojo_cairo_test = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.3" }
pixelaw_test_helpers = { git = "https://github.com/pixelaw/core", tag = "v0.5.12" }
#pixelaw_test_helpers = { path = "../core/test_helpers" }

[[target.starknet-contract]]
sierra = true
build-external-contracts = [
"dojo::world::world_contract::world",
# "pixelaw::core::models::area::Area",
# "pixelaw::core::models::pixel::Pixel",
# "pixelaw::core::models::pixel::PixelUpdate",
# "pixelaw::core::models::queue::QueueItem",
# "pixelaw::core::models::registry::App",
# "pixelaw::core::models::registry::AppName",
# "pixelaw::core::models::registry::CoreActionsAddress",
# "pixelaw::core::utils::get_core_actions",
# "pixelaw::core::utils::Direction",
# "pixelaw::core::utils::Position",
# "pixelaw::core::utils::DefaultParameters",
"pixelaw::core::actions::actions",
"pixelaw::apps::paint::app::paint_actions",
"pixelaw::apps::snake::app::snake_actions",
# "pixelaw::core::actions::IActionsDispatcher",
# "pixelaw::core::actions::IActionsDispatcherTrait"
]

[tool.fmt]
Expand Down
2 changes: 1 addition & 1 deletion 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 = "0x127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec"
private_key = "0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912"
world_address = "0x6f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6"
world_address = "0x2bf4d3aa0dced89d37d8c3b4ff6a05895c0af32ff3baf9b02abf8504e53eaad"
2 changes: 1 addition & 1 deletion dojo_sepolia.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ mappings = {}
[env]
rpc_url = "https://starknet-sepolia.public.blastapi.io/rpc/v0_7"
keystore_path = "accounts/sepolia.deployer.keystore.json"
world_address = "0x6f130c8e150882e39cbe878c650c8f35c86579180dbc77d0c1cbe169449b5f6"
world_address = "0x2bf4d3aa0dced89d37d8c3b4ff6a05895c0af32ff3baf9b02abf8504e53eaad"

account_address = "YOUR_ACCOUNT"

0 comments on commit debfcbd

Please sign in to comment.