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

Alpha 3 #71

Merged
merged 10 commits into from
Jul 25, 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 .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: curl -L https://install.dojoengine.org | bash
- run: /home/runner/.config/.dojo/bin/dojoup -v v0.7.3
- run: /home/runner/.config/.dojo/bin/dojoup -v v1.0.0-alpha.3
- run: |
/home/runner/.config/.dojo/bin/sozo build
/home/runner/.config/.dojo/bin/sozo test
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ sozo build
sozo migrate apply

# Start Torii
torii --world 0xb4079627ebab1cd3cf9fd075dda1ad2454a7a448bf659591f259efa2519b18 --allowed-origins "*"
torii --world 0x16a15cc2a571bf95eef741c701a5657e4dbf1a5b9ce3785b4060b60f58913f4 --allowed-origins "*"
```

---
Expand Down
10 changes: 5 additions & 5 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ version = 1

[[package]]
name = "dojo"
version = "0.7.2"
source = "git+https://github.com/dojoengine/dojo?tag=v0.7.2#3da5cad9fdd39b81551e0668015d88262e6c5fc4"
version = "0.7.3"
source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.3#a6a7724380169372336e886fb36f31f56e7d0d8a"
dependencies = [
"dojo_plugin",
]

[[package]]
name = "dojo_plugin"
version = "0.3.11"
source = "git+https://github.com/dojoengine/dojo?tag=v0.3.11#1e651b5d4d3b79b14a7d8aa29a92062fcb9e6659"
version = "0.7.3"
source = "git+https://github.com/dojoengine/dojo?rev=71b1f1a4#71b1f1a467534cbeeb901356f41e612ed4187bd1"

[[package]]
name = "dojo_starter"
version = "0.7.0"
version = "0.1.0"
dependencies = [
"dojo",
]
12 changes: 8 additions & 4 deletions Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
cairo-version = "2.6.3"
cairo-version = "=2.7.0-rc.3"
name = "dojo_starter"
version = "0.7.0"
version = "0.1.0"

[cairo]
sierra-replace-ids = true
Expand All @@ -12,7 +12,7 @@ spawn = "./scripts/spawn.sh"
move = "./scripts/move.sh"

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

[[target.dojo]]

Expand All @@ -24,14 +24,18 @@ rpc_url = "http://localhost:5050/"
# Default account for katana with seed = 0
account_address = "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
#world_address = "0xb4079627ebab1cd3cf9fd075dda1ad2454a7a448bf659591f259efa2519b18" # Uncomment and update this line with your world address.
world_address = "0x3fc79ccfd72c1450d2ccb73c5c521a7ec68b6c6af0caf96a0f1c39ce58876c8" # Uncomment and update this line with your world address.

[tool.dojo.world]
name = "Dojo starter"
description = "The official Dojo Starter guide, the quickest and most streamlined way to get your Dojo Autonomous World up and running. This guide will assist you with the initial setup, from cloning the repository to deploying your world."
cover_uri = "file://assets/cover.png"
icon_uri = "file://assets/icon.png"
website = "https://github.com/dojoengine/dojo-starter"
seed = "dojo_starter"

[tool.dojo.world.namespace]
default = "dojo_starter"

[tool.dojo.world.socials]
x = "https://x.com/ohayo_dojo"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,89 @@
[
{
"type": "impl",
"name": "DojoResourceProviderImpl",
"interface_name": "dojo::world::IDojoResourceProvider"
"name": "ContractImpl",
"interface_name": "dojo::contract::contract::IContract"
},
{
"type": "struct",
"name": "core::byte_array::ByteArray",
"members": [
{
"name": "data",
"type": "core::array::Array::<core::bytes_31::bytes31>"
},
{
"name": "pending_word",
"type": "core::felt252"
},
{
"name": "pending_word_len",
"type": "core::integer::u32"
}
]
},
{
"type": "interface",
"name": "dojo::world::IDojoResourceProvider",
"name": "dojo::contract::contract::IContract",
"items": [
{
"type": "function",
"name": "dojo_resource",
"name": "contract_name",
"inputs": [],
"outputs": [
{
"type": "core::byte_array::ByteArray"
}
],
"state_mutability": "view"
},
{
"type": "function",
"name": "namespace",
"inputs": [],
"outputs": [
{
"type": "core::byte_array::ByteArray"
}
],
"state_mutability": "view"
},
{
"type": "function",
"name": "tag",
"inputs": [],
"outputs": [
{
"type": "core::byte_array::ByteArray"
}
],
"state_mutability": "view"
},
{
"type": "function",
"name": "name_hash",
"inputs": [],
"outputs": [
{
"type": "core::felt252"
}
],
"state_mutability": "view"
},
{
"type": "function",
"name": "namespace_hash",
"inputs": [],
"outputs": [
{
"type": "core::felt252"
}
],
"state_mutability": "view"
},
{
"type": "function",
"name": "selector",
"inputs": [],
"outputs": [
{
Expand All @@ -24,11 +97,11 @@
{
"type": "impl",
"name": "WorldProviderImpl",
"interface_name": "dojo::world::IWorldProvider"
"interface_name": "dojo::world::world_contract::IWorldProvider"
},
{
"type": "struct",
"name": "dojo::world::IWorldDispatcher",
"name": "dojo::world::world_contract::IWorldDispatcher",
"members": [
{
"name": "contract_address",
Expand All @@ -38,15 +111,15 @@
},
{
"type": "interface",
"name": "dojo::world::IWorldProvider",
"name": "dojo::world::world_contract::IWorldProvider",
"items": [
{
"type": "function",
"name": "world",
"inputs": [],
"outputs": [
{
"type": "dojo::world::IWorldDispatcher"
"type": "dojo::world::world_contract::IWorldDispatcher"
}
],
"state_mutability": "view"
Expand All @@ -60,7 +133,7 @@
},
{
"type": "enum",
"name": "dojo_starter::models::moves::Direction",
"name": "dojo_starter::models::Direction",
"variants": [
{
"name": "None",
Expand Down Expand Up @@ -101,7 +174,7 @@
"inputs": [
{
"name": "direction",
"type": "dojo_starter::models::moves::Direction"
"type": "dojo_starter::models::Direction"
}
],
"outputs": [],
Expand Down Expand Up @@ -130,11 +203,11 @@
{
"type": "impl",
"name": "UpgradableImpl",
"interface_name": "dojo::components::upgradeable::IUpgradeable"
"interface_name": "dojo::contract::upgradeable::IUpgradeable"
},
{
"type": "interface",
"name": "dojo::components::upgradeable::IUpgradeable",
"name": "dojo::contract::upgradeable::IUpgradeable",
"items": [
{
"type": "function",
Expand All @@ -152,7 +225,7 @@
},
{
"type": "event",
"name": "dojo::components::upgradeable::upgradeable::Upgraded",
"name": "dojo::contract::upgradeable::upgradeable::Upgraded",
"kind": "struct",
"members": [
{
Expand All @@ -164,12 +237,12 @@
},
{
"type": "event",
"name": "dojo::components::upgradeable::upgradeable::Event",
"name": "dojo::contract::upgradeable::upgradeable::Event",
"kind": "enum",
"variants": [
{
"name": "Upgraded",
"type": "dojo::components::upgradeable::upgradeable::Upgraded",
"type": "dojo::contract::upgradeable::upgradeable::Upgraded",
"kind": "nested"
}
]
Expand All @@ -181,7 +254,7 @@
"variants": [
{
"name": "UpgradeableEvent",
"type": "dojo::components::upgradeable::upgradeable::Event",
"type": "dojo::contract::upgradeable::upgradeable::Event",
"kind": "nested"
}
]
Expand Down
98 changes: 98 additions & 0 deletions manifests/dev/base/abis/dojo-base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
[
{
"type": "impl",
"name": "WorldProviderImpl",
"interface_name": "dojo::world::world_contract::IWorldProvider"
},
{
"type": "struct",
"name": "dojo::world::world_contract::IWorldDispatcher",
"members": [
{
"name": "contract_address",
"type": "core::starknet::contract_address::ContractAddress"
}
]
},
{
"type": "interface",
"name": "dojo::world::world_contract::IWorldProvider",
"items": [
{
"type": "function",
"name": "world",
"inputs": [],
"outputs": [
{
"type": "dojo::world::world_contract::IWorldDispatcher"
}
],
"state_mutability": "view"
}
]
},
{
"type": "impl",
"name": "UpgradableImpl",
"interface_name": "dojo::contract::upgradeable::IUpgradeable"
},
{
"type": "interface",
"name": "dojo::contract::upgradeable::IUpgradeable",
"items": [
{
"type": "function",
"name": "upgrade",
"inputs": [
{
"name": "new_class_hash",
"type": "core::starknet::class_hash::ClassHash"
}
],
"outputs": [],
"state_mutability": "external"
}
]
},
{
"type": "constructor",
"name": "constructor",
"inputs": []
},
{
"type": "event",
"name": "dojo::contract::upgradeable::upgradeable::Upgraded",
"kind": "struct",
"members": [
{
"name": "class_hash",
"type": "core::starknet::class_hash::ClassHash",
"kind": "data"
}
]
},
{
"type": "event",
"name": "dojo::contract::upgradeable::upgradeable::Event",
"kind": "enum",
"variants": [
{
"name": "Upgraded",
"type": "dojo::contract::upgradeable::upgradeable::Upgraded",
"kind": "nested"
}
]
},
{
"type": "event",
"name": "dojo::contract::base_contract::base::Event",
"kind": "enum",
"variants": [
{
"name": "UpgradeableEvent",
"type": "dojo::contract::upgradeable::upgradeable::Event",
"kind": "flat"
}
]
}
]
Loading
Loading