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

Bumpup/v12 #45

Merged
merged 4 commits into from
Sep 24, 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/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.12
asdf global dojo 1.0.0-alpha.12
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 @@
scarb 2.7.0
dojo 1.0.0-alpha.11
dojo 1.0.0-alpha.12
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.12/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 contracts/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +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"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.12#b391948911356cbf8a91daa93314809c87411098"
dependencies = [
"dojo_plugin",
]
Expand All @@ -25,7 +25,7 @@ dependencies = [
[[package]]
name = "pixelaw"
version = "0.3.50"
source = "git+https://github.com/pixelaw/core?branch=main#8d3103416e52f4782cc14aaba78f5845d9e0fd77"
source = "git+https://github.com/pixelaw/core?branch=feat%2Fup-v12#75240c7f745330bfe60e8f420c774aca22a68002"
dependencies = [
"dojo",
]
5 changes: 3 additions & 2 deletions contracts/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ version = "0.3.54"
sierra-replace-ids = true

[dependencies]
pixelaw = { git = "https://github.com/pixelaw/core", branch = "main" }
# pixelaw = { git = "https://github.com/pixelaw/core", branch = "main" }
pixelaw = { git = "https://github.com/pixelaw/core", branch = "feat/up-v12" }
# Added explicitly for https://github.com/dojoengine/dojo/issues/2430
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.12" }

[[target.dojo]]
build-external-contracts = [
Expand Down
6 changes: 3 additions & 3 deletions contracts/dojo_release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ default = "pixelaw"
mappings = {}

[env]
rpc_url = "https://api.cartridge.gg/x/pwar-dev/katana/"
account_address = "0x486e6aa0d971ca556782ac8cebf4d75e5c4635c4c5209e3f1eaea773cb154a7"
private_key = "0x1dfc2b3a9a6524f0177de5ce22d87d40d5a4f28d21e5f2f306f85fcd945a265"
rpc_url = "https://api.cartridge.gg/x/pwar-dev-2/katana/"
account_address = "0x8cecdb74164f073793942ddd1c477a6549d43a5ce57f4640eadefe0a6dd8bf"
private_key = "0x422f174dedd139c6cad1c535b1a7d43a6cf224f71cb4a67e1070347a952b9d0"
world_address = "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind = "DojoContract"
class_hash = "0x38db4138d34279431e859f0e0a779834c98fe8500ecf791e026778918257eb4"
original_class_hash = "0x38db4138d34279431e859f0e0a779834c98fe8500ecf791e026778918257eb4"
class_hash = "0x121b6dbe4e601a2d06856e92fc198299dd8bb540481c741898ce68cf9c9c57"
original_class_hash = "0x121b6dbe4e601a2d06856e92fc198299dd8bb540481c741898ce68cf9c9c57"
base_class_hash = "0x0"
abi = "manifests/dev/base/abis/contracts/pixelaw-p_war_actions-60819afd.json"
reads = []
Expand Down

This file was deleted.

Loading
Loading