Skip to content

Commit

Permalink
Merge pull request #46 from notV4l/update_to_v0.6.0-alpha.2
Browse files Browse the repository at this point in the history
update to v0.6.0-alpha.7
  • Loading branch information
gianalarcon authored Mar 24, 2024
2 parents 593d684 + b6b3928 commit f4ecad0
Show file tree
Hide file tree
Showing 16 changed files with 593 additions and 64 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: CI

on:
push:
pull_request:
push:
pull_request:

jobs:
sozo-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: curl -L https://install.dojoengine.org | bash
- run: /home/runner/.config/.dojo/bin/dojoup -v v0.4.4
- run: |
/home/runner/.config/.dojo/bin/sozo build
/home/runner/.config/.dojo/bin/sozo test
if [[ `git status --porcelain` ]]; then
echo The git repo is dirty
echo "Make sure to run \"sozo build\" after changing Scarb.toml"
exit 1
fi
sozo-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: curl -L https://install.dojoengine.org | bash
- run: /home/runner/.config/.dojo/bin/dojoup -v v0.6.0-alpha.7
- run: |
/home/runner/.config/.dojo/bin/sozo build
/home/runner/.config/.dojo/bin/sozo test
if [[ `git status --porcelain` ]]; then
echo The git repo is dirty
echo "Make sure to run \"sozo build\" after changing Scarb.toml"
exit 1
fi
4 changes: 2 additions & 2 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = 1
[[package]]
name = "dojo"
version = "0.5.1"
source = "git+https://github.com/dojoengine/dojo?tag=v0.5.1#4a6cad5f21d8da71714ae6ff48c9cc6ecaae642a"
source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.7#f4c8111aefe2672d04356df64914871a5bcb536d"
dependencies = [
"dojo_plugin",
]
Expand All @@ -16,7 +16,7 @@ source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7

[[package]]
name = "dojo_starter"
version = "0.5.1"
version = "0.6.0-alpha.7"
dependencies = [
"dojo",
]
11 changes: 8 additions & 3 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
[package]
cairo-version = "2.4.0"
cairo-version = "2.5.4"
name = "dojo_starter"
version = "0.5.1"
version = "0.6.0-alpha.7"

[cairo]
sierra-replace-ids = true

[scripts]
migrate = "sozo build && sozo migrate && ./scripts/default_auth.sh"
spawn = "./scripts/spawn.sh"

[dependencies]
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.5.1" }
dojo = { git = "https://github.com/dojoengine/dojo", tag = "v0.6.0-alpha.7" }

[[target.dojo]]

Expand All @@ -19,6 +23,7 @@ rpc_url = "http://localhost:5050/"
# Default account for katana with seed = 0
account_address = "0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03"
private_key = "0x1800000000300000180000000000030000000000003006001800006600"
world_address = "0x446f1f19ba951b59935df72974f8ba6060e5fbb411ca21d3e3e3812e3eb8df8"

[tool.dojo.world]
name = "Dojo starter"
Expand Down
193 changes: 193 additions & 0 deletions abis/base/contracts/actions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
[
{
"type": "impl",
"name": "DojoResourceProviderImpl",
"interface_name": "dojo::world::IDojoResourceProvider"
},
{
"type": "interface",
"name": "dojo::world::IDojoResourceProvider",
"items": [
{
"type": "function",
"name": "dojo_resource",
"inputs": [],
"outputs": [
{
"type": "core::felt252"
}
],
"state_mutability": "view"
}
]
},
{
"type": "impl",
"name": "WorldProviderImpl",
"interface_name": "dojo::world::IWorldProvider"
},
{
"type": "struct",
"name": "dojo::world::IWorldDispatcher",
"members": [
{
"name": "contract_address",
"type": "core::starknet::contract_address::ContractAddress"
}
]
},
{
"type": "interface",
"name": "dojo::world::IWorldProvider",
"items": [
{
"type": "function",
"name": "world",
"inputs": [],
"outputs": [
{
"type": "dojo::world::IWorldDispatcher"
}
],
"state_mutability": "view"
}
]
},
{
"type": "impl",
"name": "ActionsImpl",
"interface_name": "dojo_starter::systems::actions::IActions"
},
{
"type": "enum",
"name": "dojo_starter::models::moves::Direction",
"variants": [
{
"name": "None",
"type": "()"
},
{
"name": "Left",
"type": "()"
},
{
"name": "Right",
"type": "()"
},
{
"name": "Up",
"type": "()"
},
{
"name": "Down",
"type": "()"
}
]
},
{
"type": "interface",
"name": "dojo_starter::systems::actions::IActions",
"items": [
{
"type": "function",
"name": "spawn",
"inputs": [],
"outputs": [],
"state_mutability": "view"
},
{
"type": "function",
"name": "move",
"inputs": [
{
"name": "direction",
"type": "dojo_starter::models::moves::Direction"
}
],
"outputs": [],
"state_mutability": "view"
}
]
},
{
"type": "impl",
"name": "UpgradableImpl",
"interface_name": "dojo::components::upgradeable::IUpgradeable"
},
{
"type": "interface",
"name": "dojo::components::upgradeable::IUpgradeable",
"items": [
{
"type": "function",
"name": "upgrade",
"inputs": [
{
"name": "new_class_hash",
"type": "core::starknet::class_hash::ClassHash"
}
],
"outputs": [],
"state_mutability": "external"
}
]
},
{
"type": "event",
"name": "dojo::components::upgradeable::upgradeable::Upgraded",
"kind": "struct",
"members": [
{
"name": "class_hash",
"type": "core::starknet::class_hash::ClassHash",
"kind": "data"
}
]
},
{
"type": "event",
"name": "dojo::components::upgradeable::upgradeable::Event",
"kind": "enum",
"variants": [
{
"name": "Upgraded",
"type": "dojo::components::upgradeable::upgradeable::Upgraded",
"kind": "nested"
}
]
},
{
"type": "event",
"name": "dojo_starter::systems::actions::actions::Moved",
"kind": "struct",
"members": [
{
"name": "player",
"type": "core::starknet::contract_address::ContractAddress",
"kind": "key"
},
{
"name": "direction",
"type": "dojo_starter::models::moves::Direction",
"kind": "data"
}
]
},
{
"type": "event",
"name": "dojo_starter::systems::actions::actions::Event",
"kind": "enum",
"variants": [
{
"name": "UpgradeableEvent",
"type": "dojo::components::upgradeable::upgradeable::Event",
"kind": "nested"
},
{
"name": "Moved",
"type": "dojo_starter::systems::actions::actions::Moved",
"kind": "nested"
}
]
}
]
Loading

0 comments on commit f4ecad0

Please sign in to comment.