diff --git a/.github/workflows/discord-bot.yml b/.github/workflows/discord-bot.yml index d732cda5c0..f6b9ffbfe8 100644 --- a/.github/workflows/discord-bot.yml +++ b/.github/workflows/discord-bot.yml @@ -22,7 +22,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - sparse-checkout: discord-bot + sparse-checkout: bot/discord - name: Install Rust uses: actions-rs/toolchain@v1 @@ -32,7 +32,7 @@ jobs: components: rustfmt - name: Run rustfmt - run: cd discord-bot && cargo fmt -- --check + run: cd bot/discord && cargo fmt -- --check clippy: runs-on: ubuntu-latest @@ -41,7 +41,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - sparse-checkout: discord-bot + sparse-checkout: bot/discord - name: Install Rust uses: actions-rs/toolchain@v1 @@ -54,4 +54,4 @@ jobs: run: sudo apt-get install protobuf-compiler - name: Run clippy - run: cd discord-bot && cargo clippy -- -D warnings + run: cd bot/discord && cargo clippy -- -D warnings diff --git a/bot/_ b/bot/_ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/discord-bot/.gitignore b/bot/discord/.gitignore similarity index 100% rename from discord-bot/.gitignore rename to bot/discord/.gitignore diff --git a/discord-bot/Cargo.lock b/bot/discord/Cargo.lock similarity index 100% rename from discord-bot/Cargo.lock rename to bot/discord/Cargo.lock diff --git a/discord-bot/Cargo.toml b/bot/discord/Cargo.toml similarity index 100% rename from discord-bot/Cargo.toml rename to bot/discord/Cargo.toml diff --git a/discord-bot/Makefile.toml b/bot/discord/Makefile.toml similarity index 100% rename from discord-bot/Makefile.toml rename to bot/discord/Makefile.toml diff --git a/discord-bot/Secrets.toml.example b/bot/discord/Secrets.toml.example similarity index 100% rename from discord-bot/Secrets.toml.example rename to bot/discord/Secrets.toml.example diff --git a/discord-bot/Shuttle.toml b/bot/discord/Shuttle.toml similarity index 100% rename from discord-bot/Shuttle.toml rename to bot/discord/Shuttle.toml diff --git a/discord-bot/migrations/20240818171830_create_users_table.sql b/bot/discord/migrations/20240818171830_create_users_table.sql similarity index 100% rename from discord-bot/migrations/20240818171830_create_users_table.sql rename to bot/discord/migrations/20240818171830_create_users_table.sql diff --git a/discord-bot/src/actors/discord_message_creator.rs b/bot/discord/src/actors/discord_message_creator.rs similarity index 100% rename from discord-bot/src/actors/discord_message_creator.rs rename to bot/discord/src/actors/discord_message_creator.rs diff --git a/discord-bot/src/actors/discord_message_sender.rs b/bot/discord/src/actors/discord_message_sender.rs similarity index 100% rename from discord-bot/src/actors/discord_message_sender.rs rename to bot/discord/src/actors/discord_message_sender.rs diff --git a/discord-bot/src/actors/mod.rs b/bot/discord/src/actors/mod.rs similarity index 100% rename from discord-bot/src/actors/mod.rs rename to bot/discord/src/actors/mod.rs diff --git a/discord-bot/src/actors/tick_sender.rs b/bot/discord/src/actors/tick_sender.rs similarity index 100% rename from discord-bot/src/actors/tick_sender.rs rename to bot/discord/src/actors/tick_sender.rs diff --git a/discord-bot/src/actors/torii_client_subscriber.rs b/bot/discord/src/actors/torii_client_subscriber.rs similarity index 100% rename from discord-bot/src/actors/torii_client_subscriber.rs rename to bot/discord/src/actors/torii_client_subscriber.rs diff --git a/discord-bot/src/commands/add_user.rs b/bot/discord/src/commands/add_user.rs similarity index 100% rename from discord-bot/src/commands/add_user.rs rename to bot/discord/src/commands/add_user.rs diff --git a/discord-bot/src/commands/get_user.rs b/bot/discord/src/commands/get_user.rs similarity index 100% rename from discord-bot/src/commands/get_user.rs rename to bot/discord/src/commands/get_user.rs diff --git a/discord-bot/src/commands/mod.rs b/bot/discord/src/commands/mod.rs similarity index 100% rename from discord-bot/src/commands/mod.rs rename to bot/discord/src/commands/mod.rs diff --git a/discord-bot/src/commands/update_user.rs b/bot/discord/src/commands/update_user.rs similarity index 100% rename from discord-bot/src/commands/update_user.rs rename to bot/discord/src/commands/update_user.rs diff --git a/discord-bot/src/constants.rs b/bot/discord/src/constants.rs similarity index 100% rename from discord-bot/src/constants.rs rename to bot/discord/src/constants.rs diff --git a/discord-bot/src/eternum_enums.rs b/bot/discord/src/eternum_enums.rs similarity index 100% rename from discord-bot/src/eternum_enums.rs rename to bot/discord/src/eternum_enums.rs diff --git a/discord-bot/src/events/battle_claim.rs b/bot/discord/src/events/battle_claim.rs similarity index 100% rename from discord-bot/src/events/battle_claim.rs rename to bot/discord/src/events/battle_claim.rs diff --git a/discord-bot/src/events/battle_join.rs b/bot/discord/src/events/battle_join.rs similarity index 100% rename from discord-bot/src/events/battle_join.rs rename to bot/discord/src/events/battle_join.rs diff --git a/discord-bot/src/events/battle_leave.rs b/bot/discord/src/events/battle_leave.rs similarity index 100% rename from discord-bot/src/events/battle_leave.rs rename to bot/discord/src/events/battle_leave.rs diff --git a/discord-bot/src/events/battle_pillage.rs b/bot/discord/src/events/battle_pillage.rs similarity index 98% rename from discord-bot/src/events/battle_pillage.rs rename to bot/discord/src/events/battle_pillage.rs index cb71308c8e..f4a49c2596 100644 --- a/discord-bot/src/events/battle_pillage.rs +++ b/bot/discord/src/events/battle_pillage.rs @@ -14,7 +14,7 @@ use crate::{ use super::{ToDiscordMessage, UNKNOWN_USER}; -const RESOURCE_PRECISION : u128 = 1_000_000_000; +const RESOURCE_PRECISION: u128 = 1_000_000_000; #[derive(CairoSerde, Clone)] pub struct BattlePillage { pub id: u32, diff --git a/discord-bot/src/events/battle_start.rs b/bot/discord/src/events/battle_start.rs similarity index 100% rename from discord-bot/src/events/battle_start.rs rename to bot/discord/src/events/battle_start.rs diff --git a/discord-bot/src/events/game_ended.rs b/bot/discord/src/events/game_ended.rs similarity index 100% rename from discord-bot/src/events/game_ended.rs rename to bot/discord/src/events/game_ended.rs diff --git a/discord-bot/src/events/hyperstructure_finished.rs b/bot/discord/src/events/hyperstructure_finished.rs similarity index 100% rename from discord-bot/src/events/hyperstructure_finished.rs rename to bot/discord/src/events/hyperstructure_finished.rs diff --git a/discord-bot/src/events/hyperstructure_started.rs b/bot/discord/src/events/hyperstructure_started.rs similarity index 100% rename from discord-bot/src/events/hyperstructure_started.rs rename to bot/discord/src/events/hyperstructure_started.rs diff --git a/discord-bot/src/events/mod.rs b/bot/discord/src/events/mod.rs similarity index 100% rename from discord-bot/src/events/mod.rs rename to bot/discord/src/events/mod.rs diff --git a/discord-bot/src/events/settle_realm.rs b/bot/discord/src/events/settle_realm.rs similarity index 100% rename from discord-bot/src/events/settle_realm.rs rename to bot/discord/src/events/settle_realm.rs diff --git a/discord-bot/src/init.rs b/bot/discord/src/init.rs similarity index 100% rename from discord-bot/src/init.rs rename to bot/discord/src/init.rs diff --git a/discord-bot/src/main.rs b/bot/discord/src/main.rs similarity index 100% rename from discord-bot/src/main.rs rename to bot/discord/src/main.rs diff --git a/discord-bot/src/types.rs b/bot/discord/src/types.rs similarity index 100% rename from discord-bot/src/types.rs rename to bot/discord/src/types.rs diff --git a/discord-bot/src/utils.rs b/bot/discord/src/utils.rs similarity index 100% rename from discord-bot/src/utils.rs rename to bot/discord/src/utils.rs diff --git a/contracts/scripts/contracts.sh b/contracts/common/scripts/contracts.sh similarity index 100% rename from contracts/scripts/contracts.sh rename to contracts/common/scripts/contracts.sh diff --git a/contracts/scripts/deploy.sh b/contracts/common/scripts/deploy.sh similarity index 100% rename from contracts/scripts/deploy.sh rename to contracts/common/scripts/deploy.sh diff --git a/contracts/scripts/extractPolicies.js b/contracts/common/scripts/extractPolicies.js similarity index 100% rename from contracts/scripts/extractPolicies.js rename to contracts/common/scripts/extractPolicies.js diff --git a/contracts/scripts/indexer.sh b/contracts/common/scripts/indexer.sh similarity index 100% rename from contracts/scripts/indexer.sh rename to contracts/common/scripts/indexer.sh diff --git a/contracts/scripts/set_admin_bank.sh b/contracts/common/scripts/set_admin_bank.sh similarity index 100% rename from contracts/scripts/set_admin_bank.sh rename to contracts/common/scripts/set_admin_bank.sh diff --git a/contracts/scripts/update_variables.sh b/contracts/common/scripts/update_variables.sh similarity index 100% rename from contracts/scripts/update_variables.sh rename to contracts/common/scripts/update_variables.sh diff --git a/contracts/.gitignore b/contracts/game/.gitignore similarity index 100% rename from contracts/.gitignore rename to contracts/game/.gitignore diff --git a/contracts/.tool-versions b/contracts/game/.tool-versions similarity index 100% rename from contracts/.tool-versions rename to contracts/game/.tool-versions diff --git a/contracts/Scarb.lock b/contracts/game/Scarb.lock similarity index 100% rename from contracts/Scarb.lock rename to contracts/game/Scarb.lock diff --git a/contracts/Scarb.toml b/contracts/game/Scarb.toml similarity index 100% rename from contracts/Scarb.toml rename to contracts/game/Scarb.toml diff --git a/contracts/dojo_dev.toml b/contracts/game/dojo_dev.toml similarity index 100% rename from contracts/dojo_dev.toml rename to contracts/game/dojo_dev.toml diff --git a/contracts/dojo_prod.toml b/contracts/game/dojo_prod.toml similarity index 100% rename from contracts/dojo_prod.toml rename to contracts/game/dojo_prod.toml diff --git a/contracts/game/ext/_ b/contracts/game/ext/_ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contracts/formula/battles/battle_time.js b/contracts/game/ext/formulas/battles/battle_time.js similarity index 100% rename from contracts/formula/battles/battle_time.js rename to contracts/game/ext/formulas/battles/battle_time.js diff --git a/contracts/formula/battles/package.json b/contracts/game/ext/formulas/battles/package.json similarity index 100% rename from contracts/formula/battles/package.json rename to contracts/game/ext/formulas/battles/package.json diff --git a/contracts/formula/resources/readme.md b/contracts/game/ext/formulas/resources/readme.md similarity index 100% rename from contracts/formula/resources/readme.md rename to contracts/game/ext/formulas/resources/readme.md diff --git a/contracts/formula/resources/resources.py b/contracts/game/ext/formulas/resources/resources.py similarity index 100% rename from contracts/formula/resources/resources.py rename to contracts/game/ext/formulas/resources/resources.py diff --git a/contracts/manifest_dev.json b/contracts/game/manifest_dev.json similarity index 100% rename from contracts/manifest_dev.json rename to contracts/game/manifest_dev.json diff --git a/contracts/manifest_mainnet.json b/contracts/game/manifest_mainnet.json similarity index 100% rename from contracts/manifest_mainnet.json rename to contracts/game/manifest_mainnet.json diff --git a/contracts/manifest_prod.json b/contracts/game/manifest_prod.json similarity index 100% rename from contracts/manifest_prod.json rename to contracts/game/manifest_prod.json diff --git a/contracts/src/alias.cairo b/contracts/game/src/alias.cairo similarity index 100% rename from contracts/src/alias.cairo rename to contracts/game/src/alias.cairo diff --git a/contracts/src/constants.cairo b/contracts/game/src/constants.cairo similarity index 100% rename from contracts/src/constants.cairo rename to contracts/game/src/constants.cairo diff --git a/contracts/src/lib.cairo b/contracts/game/src/lib.cairo similarity index 100% rename from contracts/src/lib.cairo rename to contracts/game/src/lib.cairo diff --git a/contracts/src/models.cairo b/contracts/game/src/models.cairo similarity index 100% rename from contracts/src/models.cairo rename to contracts/game/src/models.cairo diff --git a/contracts/src/models/bank/bank.cairo b/contracts/game/src/models/bank/bank.cairo similarity index 100% rename from contracts/src/models/bank/bank.cairo rename to contracts/game/src/models/bank/bank.cairo diff --git a/contracts/src/models/bank/liquidity.cairo b/contracts/game/src/models/bank/liquidity.cairo similarity index 100% rename from contracts/src/models/bank/liquidity.cairo rename to contracts/game/src/models/bank/liquidity.cairo diff --git a/contracts/src/models/bank/market.cairo b/contracts/game/src/models/bank/market.cairo similarity index 100% rename from contracts/src/models/bank/market.cairo rename to contracts/game/src/models/bank/market.cairo diff --git a/contracts/src/models/buildings.cairo b/contracts/game/src/models/buildings.cairo similarity index 100% rename from contracts/src/models/buildings.cairo rename to contracts/game/src/models/buildings.cairo diff --git a/contracts/src/models/capacity.cairo b/contracts/game/src/models/capacity.cairo similarity index 100% rename from contracts/src/models/capacity.cairo rename to contracts/game/src/models/capacity.cairo diff --git a/contracts/src/models/combat.cairo b/contracts/game/src/models/combat.cairo similarity index 100% rename from contracts/src/models/combat.cairo rename to contracts/game/src/models/combat.cairo diff --git a/contracts/src/models/config.cairo b/contracts/game/src/models/config.cairo similarity index 100% rename from contracts/src/models/config.cairo rename to contracts/game/src/models/config.cairo diff --git a/contracts/src/models/event.cairo b/contracts/game/src/models/event.cairo similarity index 100% rename from contracts/src/models/event.cairo rename to contracts/game/src/models/event.cairo diff --git a/contracts/src/models/guild.cairo b/contracts/game/src/models/guild.cairo similarity index 100% rename from contracts/src/models/guild.cairo rename to contracts/game/src/models/guild.cairo diff --git a/contracts/src/models/hyperstructure.cairo b/contracts/game/src/models/hyperstructure.cairo similarity index 100% rename from contracts/src/models/hyperstructure.cairo rename to contracts/game/src/models/hyperstructure.cairo diff --git a/contracts/src/models/map.cairo b/contracts/game/src/models/map.cairo similarity index 100% rename from contracts/src/models/map.cairo rename to contracts/game/src/models/map.cairo diff --git a/contracts/src/models/message.cairo b/contracts/game/src/models/message.cairo similarity index 100% rename from contracts/src/models/message.cairo rename to contracts/game/src/models/message.cairo diff --git a/contracts/src/models/movable.cairo b/contracts/game/src/models/movable.cairo similarity index 100% rename from contracts/src/models/movable.cairo rename to contracts/game/src/models/movable.cairo diff --git a/contracts/src/models/name.cairo b/contracts/game/src/models/name.cairo similarity index 100% rename from contracts/src/models/name.cairo rename to contracts/game/src/models/name.cairo diff --git a/contracts/src/models/order.cairo b/contracts/game/src/models/order.cairo similarity index 100% rename from contracts/src/models/order.cairo rename to contracts/game/src/models/order.cairo diff --git a/contracts/src/models/owner.cairo b/contracts/game/src/models/owner.cairo similarity index 100% rename from contracts/src/models/owner.cairo rename to contracts/game/src/models/owner.cairo diff --git a/contracts/src/models/population.cairo b/contracts/game/src/models/population.cairo similarity index 100% rename from contracts/src/models/population.cairo rename to contracts/game/src/models/population.cairo diff --git a/contracts/src/models/position.cairo b/contracts/game/src/models/position.cairo similarity index 100% rename from contracts/src/models/position.cairo rename to contracts/game/src/models/position.cairo diff --git a/contracts/src/models/production.cairo b/contracts/game/src/models/production.cairo similarity index 100% rename from contracts/src/models/production.cairo rename to contracts/game/src/models/production.cairo diff --git a/contracts/src/models/quantity.cairo b/contracts/game/src/models/quantity.cairo similarity index 100% rename from contracts/src/models/quantity.cairo rename to contracts/game/src/models/quantity.cairo diff --git a/contracts/src/models/quest.cairo b/contracts/game/src/models/quest.cairo similarity index 100% rename from contracts/src/models/quest.cairo rename to contracts/game/src/models/quest.cairo diff --git a/contracts/src/models/realm.cairo b/contracts/game/src/models/realm.cairo similarity index 100% rename from contracts/src/models/realm.cairo rename to contracts/game/src/models/realm.cairo diff --git a/contracts/src/models/resources.cairo b/contracts/game/src/models/resources.cairo similarity index 100% rename from contracts/src/models/resources.cairo rename to contracts/game/src/models/resources.cairo diff --git a/contracts/src/models/season.cairo b/contracts/game/src/models/season.cairo similarity index 100% rename from contracts/src/models/season.cairo rename to contracts/game/src/models/season.cairo diff --git a/contracts/src/models/stamina.cairo b/contracts/game/src/models/stamina.cairo similarity index 100% rename from contracts/src/models/stamina.cairo rename to contracts/game/src/models/stamina.cairo diff --git a/contracts/src/models/structure.cairo b/contracts/game/src/models/structure.cairo similarity index 100% rename from contracts/src/models/structure.cairo rename to contracts/game/src/models/structure.cairo diff --git a/contracts/src/models/trade.cairo b/contracts/game/src/models/trade.cairo similarity index 100% rename from contracts/src/models/trade.cairo rename to contracts/game/src/models/trade.cairo diff --git a/contracts/src/models/weight.cairo b/contracts/game/src/models/weight.cairo similarity index 100% rename from contracts/src/models/weight.cairo rename to contracts/game/src/models/weight.cairo diff --git a/contracts/src/systems.cairo b/contracts/game/src/systems.cairo similarity index 100% rename from contracts/src/systems.cairo rename to contracts/game/src/systems.cairo diff --git a/contracts/src/systems/bank/contracts.cairo b/contracts/game/src/systems/bank/contracts.cairo similarity index 100% rename from contracts/src/systems/bank/contracts.cairo rename to contracts/game/src/systems/bank/contracts.cairo diff --git a/contracts/src/systems/bank/contracts/bank.cairo b/contracts/game/src/systems/bank/contracts/bank.cairo similarity index 100% rename from contracts/src/systems/bank/contracts/bank.cairo rename to contracts/game/src/systems/bank/contracts/bank.cairo diff --git a/contracts/src/systems/bank/contracts/liquidity.cairo b/contracts/game/src/systems/bank/contracts/liquidity.cairo similarity index 100% rename from contracts/src/systems/bank/contracts/liquidity.cairo rename to contracts/game/src/systems/bank/contracts/liquidity.cairo diff --git a/contracts/src/systems/bank/contracts/swap.cairo b/contracts/game/src/systems/bank/contracts/swap.cairo similarity index 100% rename from contracts/src/systems/bank/contracts/swap.cairo rename to contracts/game/src/systems/bank/contracts/swap.cairo diff --git a/contracts/src/systems/bank/tests.cairo b/contracts/game/src/systems/bank/tests.cairo similarity index 100% rename from contracts/src/systems/bank/tests.cairo rename to contracts/game/src/systems/bank/tests.cairo diff --git a/contracts/src/systems/bank/tests/bank.cairo b/contracts/game/src/systems/bank/tests/bank.cairo similarity index 100% rename from contracts/src/systems/bank/tests/bank.cairo rename to contracts/game/src/systems/bank/tests/bank.cairo diff --git a/contracts/src/systems/bank/tests/liquidity.cairo b/contracts/game/src/systems/bank/tests/liquidity.cairo similarity index 100% rename from contracts/src/systems/bank/tests/liquidity.cairo rename to contracts/game/src/systems/bank/tests/liquidity.cairo diff --git a/contracts/src/systems/bank/tests/swap.cairo b/contracts/game/src/systems/bank/tests/swap.cairo similarity index 100% rename from contracts/src/systems/bank/tests/swap.cairo rename to contracts/game/src/systems/bank/tests/swap.cairo diff --git a/contracts/src/systems/buildings/contracts.cairo b/contracts/game/src/systems/buildings/contracts.cairo similarity index 100% rename from contracts/src/systems/buildings/contracts.cairo rename to contracts/game/src/systems/buildings/contracts.cairo diff --git a/contracts/src/systems/buildings/tests.cairo b/contracts/game/src/systems/buildings/tests.cairo similarity index 100% rename from contracts/src/systems/buildings/tests.cairo rename to contracts/game/src/systems/buildings/tests.cairo diff --git a/contracts/src/systems/combat/contracts/battle_systems.cairo b/contracts/game/src/systems/combat/contracts/battle_systems.cairo similarity index 99% rename from contracts/src/systems/combat/contracts/battle_systems.cairo rename to contracts/game/src/systems/combat/contracts/battle_systems.cairo index 9aa9af35e4..581bb65d7b 100644 --- a/contracts/src/systems/combat/contracts/battle_systems.cairo +++ b/contracts/game/src/systems/combat/contracts/battle_systems.cairo @@ -674,7 +674,6 @@ mod battle_systems { caller_army = r_caller_army; // slash army if battle was not concluded before they left - let leaver = starknet::get_caller_address(); let mut army: Army = world.read_model(army_id); if army_left_early { let troop_config = TroopConfigImpl::get(world); diff --git a/contracts/src/systems/combat/contracts/troop_systems.cairo b/contracts/game/src/systems/combat/contracts/troop_systems.cairo similarity index 100% rename from contracts/src/systems/combat/contracts/troop_systems.cairo rename to contracts/game/src/systems/combat/contracts/troop_systems.cairo diff --git a/contracts/src/systems/combat/tests.cairo b/contracts/game/src/systems/combat/tests.cairo similarity index 100% rename from contracts/src/systems/combat/tests.cairo rename to contracts/game/src/systems/combat/tests.cairo diff --git a/contracts/src/systems/combat/tests/army_buy_test.cairo b/contracts/game/src/systems/combat/tests/army_buy_test.cairo similarity index 100% rename from contracts/src/systems/combat/tests/army_buy_test.cairo rename to contracts/game/src/systems/combat/tests/army_buy_test.cairo diff --git a/contracts/src/systems/combat/tests/army_create_test.cairo b/contracts/game/src/systems/combat/tests/army_create_test.cairo similarity index 100% rename from contracts/src/systems/combat/tests/army_create_test.cairo rename to contracts/game/src/systems/combat/tests/army_create_test.cairo diff --git a/contracts/src/systems/combat/tests/battle_leave_test.cairo b/contracts/game/src/systems/combat/tests/battle_leave_test.cairo similarity index 100% rename from contracts/src/systems/combat/tests/battle_leave_test.cairo rename to contracts/game/src/systems/combat/tests/battle_leave_test.cairo diff --git a/contracts/src/systems/combat/tests/battle_pillage_test.cairo b/contracts/game/src/systems/combat/tests/battle_pillage_test.cairo similarity index 100% rename from contracts/src/systems/combat/tests/battle_pillage_test.cairo rename to contracts/game/src/systems/combat/tests/battle_pillage_test.cairo diff --git a/contracts/src/systems/combat/tests/battle_start_test.cairo b/contracts/game/src/systems/combat/tests/battle_start_test.cairo similarity index 100% rename from contracts/src/systems/combat/tests/battle_start_test.cairo rename to contracts/game/src/systems/combat/tests/battle_start_test.cairo diff --git a/contracts/src/systems/config/contracts.cairo b/contracts/game/src/systems/config/contracts.cairo similarity index 100% rename from contracts/src/systems/config/contracts.cairo rename to contracts/game/src/systems/config/contracts.cairo diff --git a/contracts/src/systems/config/tests.cairo b/contracts/game/src/systems/config/tests.cairo similarity index 100% rename from contracts/src/systems/config/tests.cairo rename to contracts/game/src/systems/config/tests.cairo diff --git a/contracts/src/systems/config/tests/hyperstructure_config_tests.cairo b/contracts/game/src/systems/config/tests/hyperstructure_config_tests.cairo similarity index 100% rename from contracts/src/systems/config/tests/hyperstructure_config_tests.cairo rename to contracts/game/src/systems/config/tests/hyperstructure_config_tests.cairo diff --git a/contracts/src/systems/config/tests/settlement_config_tests.cairo b/contracts/game/src/systems/config/tests/settlement_config_tests.cairo similarity index 100% rename from contracts/src/systems/config/tests/settlement_config_tests.cairo rename to contracts/game/src/systems/config/tests/settlement_config_tests.cairo diff --git a/contracts/src/systems/dev/contracts.cairo b/contracts/game/src/systems/dev/contracts.cairo similarity index 100% rename from contracts/src/systems/dev/contracts.cairo rename to contracts/game/src/systems/dev/contracts.cairo diff --git a/contracts/src/systems/dev/contracts/bank.cairo b/contracts/game/src/systems/dev/contracts/bank.cairo similarity index 100% rename from contracts/src/systems/dev/contracts/bank.cairo rename to contracts/game/src/systems/dev/contracts/bank.cairo diff --git a/contracts/src/systems/dev/contracts/realm.cairo b/contracts/game/src/systems/dev/contracts/realm.cairo similarity index 100% rename from contracts/src/systems/dev/contracts/realm.cairo rename to contracts/game/src/systems/dev/contracts/realm.cairo diff --git a/contracts/src/systems/dev/contracts/resource.cairo b/contracts/game/src/systems/dev/contracts/resource.cairo similarity index 100% rename from contracts/src/systems/dev/contracts/resource.cairo rename to contracts/game/src/systems/dev/contracts/resource.cairo diff --git a/contracts/src/systems/guild/contracts.cairo b/contracts/game/src/systems/guild/contracts.cairo similarity index 100% rename from contracts/src/systems/guild/contracts.cairo rename to contracts/game/src/systems/guild/contracts.cairo diff --git a/contracts/src/systems/guild/tests.cairo b/contracts/game/src/systems/guild/tests.cairo similarity index 100% rename from contracts/src/systems/guild/tests.cairo rename to contracts/game/src/systems/guild/tests.cairo diff --git a/contracts/src/systems/hyperstructure/contracts.cairo b/contracts/game/src/systems/hyperstructure/contracts.cairo similarity index 100% rename from contracts/src/systems/hyperstructure/contracts.cairo rename to contracts/game/src/systems/hyperstructure/contracts.cairo diff --git a/contracts/src/systems/hyperstructure/tests.cairo b/contracts/game/src/systems/hyperstructure/tests.cairo similarity index 100% rename from contracts/src/systems/hyperstructure/tests.cairo rename to contracts/game/src/systems/hyperstructure/tests.cairo diff --git a/contracts/src/systems/map/contracts.cairo b/contracts/game/src/systems/map/contracts.cairo similarity index 100% rename from contracts/src/systems/map/contracts.cairo rename to contracts/game/src/systems/map/contracts.cairo diff --git a/contracts/src/systems/map/map_generation.cairo b/contracts/game/src/systems/map/map_generation.cairo similarity index 100% rename from contracts/src/systems/map/map_generation.cairo rename to contracts/game/src/systems/map/map_generation.cairo diff --git a/contracts/src/systems/map/tests.cairo b/contracts/game/src/systems/map/tests.cairo similarity index 100% rename from contracts/src/systems/map/tests.cairo rename to contracts/game/src/systems/map/tests.cairo diff --git a/contracts/src/systems/name/contracts.cairo b/contracts/game/src/systems/name/contracts.cairo similarity index 100% rename from contracts/src/systems/name/contracts.cairo rename to contracts/game/src/systems/name/contracts.cairo diff --git a/contracts/src/systems/ownership/contracts.cairo b/contracts/game/src/systems/ownership/contracts.cairo similarity index 100% rename from contracts/src/systems/ownership/contracts.cairo rename to contracts/game/src/systems/ownership/contracts.cairo diff --git a/contracts/src/systems/ownership/tests.cairo b/contracts/game/src/systems/ownership/tests.cairo similarity index 100% rename from contracts/src/systems/ownership/tests.cairo rename to contracts/game/src/systems/ownership/tests.cairo diff --git a/contracts/src/systems/realm/contracts.cairo b/contracts/game/src/systems/realm/contracts.cairo similarity index 100% rename from contracts/src/systems/realm/contracts.cairo rename to contracts/game/src/systems/realm/contracts.cairo diff --git a/contracts/src/systems/realm/tests.cairo b/contracts/game/src/systems/realm/tests.cairo similarity index 100% rename from contracts/src/systems/realm/tests.cairo rename to contracts/game/src/systems/realm/tests.cairo diff --git a/contracts/src/systems/resources/contracts.cairo b/contracts/game/src/systems/resources/contracts.cairo similarity index 100% rename from contracts/src/systems/resources/contracts.cairo rename to contracts/game/src/systems/resources/contracts.cairo diff --git a/contracts/src/systems/resources/contracts/resource_bridge_systems.cairo b/contracts/game/src/systems/resources/contracts/resource_bridge_systems.cairo similarity index 100% rename from contracts/src/systems/resources/contracts/resource_bridge_systems.cairo rename to contracts/game/src/systems/resources/contracts/resource_bridge_systems.cairo diff --git a/contracts/src/systems/resources/contracts/resource_systems.cairo b/contracts/game/src/systems/resources/contracts/resource_systems.cairo similarity index 100% rename from contracts/src/systems/resources/contracts/resource_systems.cairo rename to contracts/game/src/systems/resources/contracts/resource_systems.cairo diff --git a/contracts/src/systems/resources/tests.cairo b/contracts/game/src/systems/resources/tests.cairo similarity index 100% rename from contracts/src/systems/resources/tests.cairo rename to contracts/game/src/systems/resources/tests.cairo diff --git a/contracts/src/systems/resources/tests/resource_approval_system_tests.cairo b/contracts/game/src/systems/resources/tests/resource_approval_system_tests.cairo similarity index 100% rename from contracts/src/systems/resources/tests/resource_approval_system_tests.cairo rename to contracts/game/src/systems/resources/tests/resource_approval_system_tests.cairo diff --git a/contracts/src/systems/resources/tests/resource_bridge_system_tests.cairo b/contracts/game/src/systems/resources/tests/resource_bridge_system_tests.cairo similarity index 100% rename from contracts/src/systems/resources/tests/resource_bridge_system_tests.cairo rename to contracts/game/src/systems/resources/tests/resource_bridge_system_tests.cairo diff --git a/contracts/src/systems/resources/tests/resource_transfer_system_tests.cairo b/contracts/game/src/systems/resources/tests/resource_transfer_system_tests.cairo similarity index 100% rename from contracts/src/systems/resources/tests/resource_transfer_system_tests.cairo rename to contracts/game/src/systems/resources/tests/resource_transfer_system_tests.cairo diff --git a/contracts/src/systems/season/contracts.cairo b/contracts/game/src/systems/season/contracts.cairo similarity index 100% rename from contracts/src/systems/season/contracts.cairo rename to contracts/game/src/systems/season/contracts.cairo diff --git a/contracts/src/systems/season/tests.cairo b/contracts/game/src/systems/season/tests.cairo similarity index 100% rename from contracts/src/systems/season/tests.cairo rename to contracts/game/src/systems/season/tests.cairo diff --git a/contracts/src/systems/trade/contracts.cairo b/contracts/game/src/systems/trade/contracts.cairo similarity index 100% rename from contracts/src/systems/trade/contracts.cairo rename to contracts/game/src/systems/trade/contracts.cairo diff --git a/contracts/src/systems/trade/contracts/trade_systems.cairo b/contracts/game/src/systems/trade/contracts/trade_systems.cairo similarity index 100% rename from contracts/src/systems/trade/contracts/trade_systems.cairo rename to contracts/game/src/systems/trade/contracts/trade_systems.cairo diff --git a/contracts/src/systems/trade/tests.cairo b/contracts/game/src/systems/trade/tests.cairo similarity index 100% rename from contracts/src/systems/trade/tests.cairo rename to contracts/game/src/systems/trade/tests.cairo diff --git a/contracts/src/systems/trade/tests/trade_systems_tests.cairo b/contracts/game/src/systems/trade/tests/trade_systems_tests.cairo similarity index 100% rename from contracts/src/systems/trade/tests/trade_systems_tests.cairo rename to contracts/game/src/systems/trade/tests/trade_systems_tests.cairo diff --git a/contracts/src/systems/trade/tests/trade_systems_tests/accept_order.cairo b/contracts/game/src/systems/trade/tests/trade_systems_tests/accept_order.cairo similarity index 100% rename from contracts/src/systems/trade/tests/trade_systems_tests/accept_order.cairo rename to contracts/game/src/systems/trade/tests/trade_systems_tests/accept_order.cairo diff --git a/contracts/src/systems/trade/tests/trade_systems_tests/cancel_order.cairo b/contracts/game/src/systems/trade/tests/trade_systems_tests/cancel_order.cairo similarity index 100% rename from contracts/src/systems/trade/tests/trade_systems_tests/cancel_order.cairo rename to contracts/game/src/systems/trade/tests/trade_systems_tests/cancel_order.cairo diff --git a/contracts/src/systems/trade/tests/trade_systems_tests/create_order.cairo b/contracts/game/src/systems/trade/tests/trade_systems_tests/create_order.cairo similarity index 100% rename from contracts/src/systems/trade/tests/trade_systems_tests/create_order.cairo rename to contracts/game/src/systems/trade/tests/trade_systems_tests/create_order.cairo diff --git a/contracts/src/systems/transport/contracts.cairo b/contracts/game/src/systems/transport/contracts.cairo similarity index 100% rename from contracts/src/systems/transport/contracts.cairo rename to contracts/game/src/systems/transport/contracts.cairo diff --git a/contracts/src/systems/transport/contracts/donkey_systems.cairo b/contracts/game/src/systems/transport/contracts/donkey_systems.cairo similarity index 100% rename from contracts/src/systems/transport/contracts/donkey_systems.cairo rename to contracts/game/src/systems/transport/contracts/donkey_systems.cairo diff --git a/contracts/src/systems/transport/contracts/travel_systems.cairo b/contracts/game/src/systems/transport/contracts/travel_systems.cairo similarity index 100% rename from contracts/src/systems/transport/contracts/travel_systems.cairo rename to contracts/game/src/systems/transport/contracts/travel_systems.cairo diff --git a/contracts/src/systems/transport/tests.cairo b/contracts/game/src/systems/transport/tests.cairo similarity index 100% rename from contracts/src/systems/transport/tests.cairo rename to contracts/game/src/systems/transport/tests.cairo diff --git a/contracts/src/systems/transport/tests/travel_systems_tests.cairo b/contracts/game/src/systems/transport/tests/travel_systems_tests.cairo similarity index 100% rename from contracts/src/systems/transport/tests/travel_systems_tests.cairo rename to contracts/game/src/systems/transport/tests/travel_systems_tests.cairo diff --git a/contracts/src/utils.cairo b/contracts/game/src/utils.cairo similarity index 100% rename from contracts/src/utils.cairo rename to contracts/game/src/utils.cairo diff --git a/contracts/src/utils/map.cairo b/contracts/game/src/utils/map.cairo similarity index 100% rename from contracts/src/utils/map.cairo rename to contracts/game/src/utils/map.cairo diff --git a/contracts/src/utils/map/biomes.cairo b/contracts/game/src/utils/map/biomes.cairo similarity index 100% rename from contracts/src/utils/map/biomes.cairo rename to contracts/game/src/utils/map/biomes.cairo diff --git a/contracts/src/utils/map/constants.cairo b/contracts/game/src/utils/map/constants.cairo similarity index 100% rename from contracts/src/utils/map/constants.cairo rename to contracts/game/src/utils/map/constants.cairo diff --git a/contracts/src/utils/math.cairo b/contracts/game/src/utils/math.cairo similarity index 100% rename from contracts/src/utils/math.cairo rename to contracts/game/src/utils/math.cairo diff --git a/contracts/src/utils/number.cairo b/contracts/game/src/utils/number.cairo similarity index 100% rename from contracts/src/utils/number.cairo rename to contracts/game/src/utils/number.cairo diff --git a/contracts/src/utils/random.cairo b/contracts/game/src/utils/random.cairo similarity index 100% rename from contracts/src/utils/random.cairo rename to contracts/game/src/utils/random.cairo diff --git a/contracts/src/utils/tasks.cairo b/contracts/game/src/utils/tasks.cairo similarity index 100% rename from contracts/src/utils/tasks.cairo rename to contracts/game/src/utils/tasks.cairo diff --git a/contracts/src/utils/tasks/battlelord.cairo b/contracts/game/src/utils/tasks/battlelord.cairo similarity index 100% rename from contracts/src/utils/tasks/battlelord.cairo rename to contracts/game/src/utils/tasks/battlelord.cairo diff --git a/contracts/src/utils/tasks/breeder.cairo b/contracts/game/src/utils/tasks/breeder.cairo similarity index 100% rename from contracts/src/utils/tasks/breeder.cairo rename to contracts/game/src/utils/tasks/breeder.cairo diff --git a/contracts/src/utils/tasks/builder.cairo b/contracts/game/src/utils/tasks/builder.cairo similarity index 100% rename from contracts/src/utils/tasks/builder.cairo rename to contracts/game/src/utils/tasks/builder.cairo diff --git a/contracts/src/utils/tasks/claimer.cairo b/contracts/game/src/utils/tasks/claimer.cairo similarity index 100% rename from contracts/src/utils/tasks/claimer.cairo rename to contracts/game/src/utils/tasks/claimer.cairo diff --git a/contracts/src/utils/tasks/conqueror.cairo b/contracts/game/src/utils/tasks/conqueror.cairo similarity index 100% rename from contracts/src/utils/tasks/conqueror.cairo rename to contracts/game/src/utils/tasks/conqueror.cairo diff --git a/contracts/src/utils/tasks/discoverer.cairo b/contracts/game/src/utils/tasks/discoverer.cairo similarity index 100% rename from contracts/src/utils/tasks/discoverer.cairo rename to contracts/game/src/utils/tasks/discoverer.cairo diff --git a/contracts/src/utils/tasks/explorer.cairo b/contracts/game/src/utils/tasks/explorer.cairo similarity index 100% rename from contracts/src/utils/tasks/explorer.cairo rename to contracts/game/src/utils/tasks/explorer.cairo diff --git a/contracts/src/utils/tasks/index.cairo b/contracts/game/src/utils/tasks/index.cairo similarity index 100% rename from contracts/src/utils/tasks/index.cairo rename to contracts/game/src/utils/tasks/index.cairo diff --git a/contracts/src/utils/tasks/interface.cairo b/contracts/game/src/utils/tasks/interface.cairo similarity index 100% rename from contracts/src/utils/tasks/interface.cairo rename to contracts/game/src/utils/tasks/interface.cairo diff --git a/contracts/src/utils/tasks/maximalist.cairo b/contracts/game/src/utils/tasks/maximalist.cairo similarity index 100% rename from contracts/src/utils/tasks/maximalist.cairo rename to contracts/game/src/utils/tasks/maximalist.cairo diff --git a/contracts/src/utils/tasks/opportunist.cairo b/contracts/game/src/utils/tasks/opportunist.cairo similarity index 100% rename from contracts/src/utils/tasks/opportunist.cairo rename to contracts/game/src/utils/tasks/opportunist.cairo diff --git a/contracts/src/utils/tasks/ruler.cairo b/contracts/game/src/utils/tasks/ruler.cairo similarity index 100% rename from contracts/src/utils/tasks/ruler.cairo rename to contracts/game/src/utils/tasks/ruler.cairo diff --git a/contracts/src/utils/tasks/squire.cairo b/contracts/game/src/utils/tasks/squire.cairo similarity index 100% rename from contracts/src/utils/tasks/squire.cairo rename to contracts/game/src/utils/tasks/squire.cairo diff --git a/contracts/src/utils/tasks/warlord.cairo b/contracts/game/src/utils/tasks/warlord.cairo similarity index 100% rename from contracts/src/utils/tasks/warlord.cairo rename to contracts/game/src/utils/tasks/warlord.cairo diff --git a/contracts/src/utils/testing.cairo b/contracts/game/src/utils/testing.cairo similarity index 100% rename from contracts/src/utils/testing.cairo rename to contracts/game/src/utils/testing.cairo diff --git a/contracts/src/utils/testing/config.cairo b/contracts/game/src/utils/testing/config.cairo similarity index 100% rename from contracts/src/utils/testing/config.cairo rename to contracts/game/src/utils/testing/config.cairo diff --git a/contracts/src/utils/testing/constants.cairo b/contracts/game/src/utils/testing/constants.cairo similarity index 100% rename from contracts/src/utils/testing/constants.cairo rename to contracts/game/src/utils/testing/constants.cairo diff --git a/contracts/src/utils/testing/general.cairo b/contracts/game/src/utils/testing/general.cairo similarity index 100% rename from contracts/src/utils/testing/general.cairo rename to contracts/game/src/utils/testing/general.cairo diff --git a/contracts/src/utils/testing/mock/erc20mock.cairo b/contracts/game/src/utils/testing/mock/erc20mock.cairo similarity index 100% rename from contracts/src/utils/testing/mock/erc20mock.cairo rename to contracts/game/src/utils/testing/mock/erc20mock.cairo diff --git a/contracts/src/utils/testing/systems.cairo b/contracts/game/src/utils/testing/systems.cairo similarity index 100% rename from contracts/src/utils/testing/systems.cairo rename to contracts/game/src/utils/testing/systems.cairo diff --git a/contracts/src/utils/testing/world.cairo b/contracts/game/src/utils/testing/world.cairo similarity index 100% rename from contracts/src/utils/testing/world.cairo rename to contracts/game/src/utils/testing/world.cairo diff --git a/contracts/src/utils/trophies.cairo b/contracts/game/src/utils/trophies.cairo similarity index 100% rename from contracts/src/utils/trophies.cairo rename to contracts/game/src/utils/trophies.cairo diff --git a/contracts/src/utils/trophies/battlelord.cairo b/contracts/game/src/utils/trophies/battlelord.cairo similarity index 100% rename from contracts/src/utils/trophies/battlelord.cairo rename to contracts/game/src/utils/trophies/battlelord.cairo diff --git a/contracts/src/utils/trophies/breeder.cairo b/contracts/game/src/utils/trophies/breeder.cairo similarity index 100% rename from contracts/src/utils/trophies/breeder.cairo rename to contracts/game/src/utils/trophies/breeder.cairo diff --git a/contracts/src/utils/trophies/conqueror.cairo b/contracts/game/src/utils/trophies/conqueror.cairo similarity index 100% rename from contracts/src/utils/trophies/conqueror.cairo rename to contracts/game/src/utils/trophies/conqueror.cairo diff --git a/contracts/src/utils/trophies/explorer.cairo b/contracts/game/src/utils/trophies/explorer.cairo similarity index 100% rename from contracts/src/utils/trophies/explorer.cairo rename to contracts/game/src/utils/trophies/explorer.cairo diff --git a/contracts/src/utils/trophies/index.cairo b/contracts/game/src/utils/trophies/index.cairo similarity index 100% rename from contracts/src/utils/trophies/index.cairo rename to contracts/game/src/utils/trophies/index.cairo diff --git a/contracts/src/utils/trophies/interface.cairo b/contracts/game/src/utils/trophies/interface.cairo similarity index 100% rename from contracts/src/utils/trophies/interface.cairo rename to contracts/game/src/utils/trophies/interface.cairo diff --git a/contracts/src/utils/trophies/maximalist.cairo b/contracts/game/src/utils/trophies/maximalist.cairo similarity index 100% rename from contracts/src/utils/trophies/maximalist.cairo rename to contracts/game/src/utils/trophies/maximalist.cairo diff --git a/contracts/src/utils/trophies/opportunist.cairo b/contracts/game/src/utils/trophies/opportunist.cairo similarity index 100% rename from contracts/src/utils/trophies/opportunist.cairo rename to contracts/game/src/utils/trophies/opportunist.cairo diff --git a/contracts/src/utils/trophies/ruler.cairo b/contracts/game/src/utils/trophies/ruler.cairo similarity index 100% rename from contracts/src/utils/trophies/ruler.cairo rename to contracts/game/src/utils/trophies/ruler.cairo diff --git a/contracts/src/utils/trophies/squire.cairo b/contracts/game/src/utils/trophies/squire.cairo similarity index 100% rename from contracts/src/utils/trophies/squire.cairo rename to contracts/game/src/utils/trophies/squire.cairo diff --git a/contracts/src/utils/trophies/strategist.cairo b/contracts/game/src/utils/trophies/strategist.cairo similarity index 100% rename from contracts/src/utils/trophies/strategist.cairo rename to contracts/game/src/utils/trophies/strategist.cairo diff --git a/contracts/src/utils/trophies/warlord.cairo b/contracts/game/src/utils/trophies/warlord.cairo similarity index 100% rename from contracts/src/utils/trophies/warlord.cairo rename to contracts/game/src/utils/trophies/warlord.cairo diff --git a/contracts/src/utils/vrgda.cairo b/contracts/game/src/utils/vrgda.cairo similarity index 100% rename from contracts/src/utils/vrgda.cairo rename to contracts/game/src/utils/vrgda.cairo diff --git a/contracts/torii-sepolia.toml b/contracts/game/torii-sepolia.toml similarity index 100% rename from contracts/torii-sepolia.toml rename to contracts/game/torii-sepolia.toml diff --git a/contracts/torii.toml b/contracts/game/torii.toml similarity index 100% rename from contracts/torii.toml rename to contracts/game/torii.toml diff --git a/contracts/package.json b/contracts/package.json deleted file mode 100644 index 0c4ebbde13..0000000000 --- a/contracts/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "scripts", - "version": "1.0.0", - "type": "module", - "description": "", - "main": "index.js", - "author": "", - "license": "ISC", - "dependencies": { - "colors": "^1.4.0", - "dotenv": "^16.3.1", - "starknet": "^6.8.0" - } -} diff --git a/contracts/scripts/client.sh b/contracts/scripts/client.sh deleted file mode 100755 index b458819a78..0000000000 --- a/contracts/scripts/client.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Navigate to the root of the repo to install dependencies -echo "Installing dependencies..." - -pnpm i && pnpm build-packages - -# Copy .env.sample to .env.local -# cp client/.env.sample client/.env.local - -pnpm dev \ No newline at end of file diff --git a/contracts/season_pass/contracts/.tool-versions b/contracts/season_pass/.tool-versions similarity index 100% rename from contracts/season_pass/contracts/.tool-versions rename to contracts/season_pass/.tool-versions diff --git a/contracts/season_pass/contracts/Scarb.lock b/contracts/season_pass/Scarb.lock similarity index 100% rename from contracts/season_pass/contracts/Scarb.lock rename to contracts/season_pass/Scarb.lock diff --git a/contracts/season_pass/contracts/Scarb.toml b/contracts/season_pass/Scarb.toml similarity index 100% rename from contracts/season_pass/contracts/Scarb.toml rename to contracts/season_pass/Scarb.toml diff --git a/contracts/season_pass/contracts/.DS_Store b/contracts/season_pass/contracts/.DS_Store deleted file mode 100644 index ee77193878..0000000000 Binary files a/contracts/season_pass/contracts/.DS_Store and /dev/null differ diff --git a/contracts/season_pass/ext/_ b/contracts/season_pass/ext/_ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contracts/season_pass/scripts/deployment/.env.example b/contracts/season_pass/ext/scripts/deployment/.env.example similarity index 100% rename from contracts/season_pass/scripts/deployment/.env.example rename to contracts/season_pass/ext/scripts/deployment/.env.example diff --git a/contracts/season_pass/scripts/deployment/.env.production b/contracts/season_pass/ext/scripts/deployment/.env.production similarity index 100% rename from contracts/season_pass/scripts/deployment/.env.production rename to contracts/season_pass/ext/scripts/deployment/.env.production diff --git a/contracts/season_pass/scripts/deployment/.env.sepolia b/contracts/season_pass/ext/scripts/deployment/.env.sepolia similarity index 100% rename from contracts/season_pass/scripts/deployment/.env.sepolia rename to contracts/season_pass/ext/scripts/deployment/.env.sepolia diff --git a/contracts/season_pass/scripts/deployment/.gitignore b/contracts/season_pass/ext/scripts/deployment/.gitignore similarity index 100% rename from contracts/season_pass/scripts/deployment/.gitignore rename to contracts/season_pass/ext/scripts/deployment/.gitignore diff --git a/contracts/season_pass/scripts/deployment/deploy_dev.js b/contracts/season_pass/ext/scripts/deployment/deploy_dev.js similarity index 100% rename from contracts/season_pass/scripts/deployment/deploy_dev.js rename to contracts/season_pass/ext/scripts/deployment/deploy_dev.js diff --git a/contracts/season_pass/scripts/deployment/deploy_prod.js b/contracts/season_pass/ext/scripts/deployment/deploy_prod.js similarity index 100% rename from contracts/season_pass/scripts/deployment/deploy_prod.js rename to contracts/season_pass/ext/scripts/deployment/deploy_prod.js diff --git a/contracts/season_pass/scripts/deployment/libs/commands.js b/contracts/season_pass/ext/scripts/deployment/libs/commands.js similarity index 100% rename from contracts/season_pass/scripts/deployment/libs/commands.js rename to contracts/season_pass/ext/scripts/deployment/libs/commands.js diff --git a/contracts/season_pass/scripts/deployment/libs/common.js b/contracts/season_pass/ext/scripts/deployment/libs/common.js similarity index 100% rename from contracts/season_pass/scripts/deployment/libs/common.js rename to contracts/season_pass/ext/scripts/deployment/libs/common.js diff --git a/contracts/season_pass/scripts/deployment/libs/network.js b/contracts/season_pass/ext/scripts/deployment/libs/network.js similarity index 100% rename from contracts/season_pass/scripts/deployment/libs/network.js rename to contracts/season_pass/ext/scripts/deployment/libs/network.js diff --git a/contracts/season_pass/scripts/deployment/mainnet.ansi b/contracts/season_pass/ext/scripts/deployment/mainnet.ansi similarity index 100% rename from contracts/season_pass/scripts/deployment/mainnet.ansi rename to contracts/season_pass/ext/scripts/deployment/mainnet.ansi diff --git a/contracts/season_pass/scripts/deployment/package.json b/contracts/season_pass/ext/scripts/deployment/package.json similarity index 100% rename from contracts/season_pass/scripts/deployment/package.json rename to contracts/season_pass/ext/scripts/deployment/package.json diff --git a/contracts/season_pass/contracts/src/contract.cairo b/contracts/season_pass/src/contract.cairo similarity index 100% rename from contracts/season_pass/contracts/src/contract.cairo rename to contracts/season_pass/src/contract.cairo diff --git a/contracts/season_pass/contracts/src/lib.cairo b/contracts/season_pass/src/lib.cairo similarity index 100% rename from contracts/season_pass/contracts/src/lib.cairo rename to contracts/season_pass/src/lib.cairo diff --git a/contracts/season_pass/contracts/src/mock/lords.cairo b/contracts/season_pass/src/mock/lords.cairo similarity index 100% rename from contracts/season_pass/contracts/src/mock/lords.cairo rename to contracts/season_pass/src/mock/lords.cairo diff --git a/contracts/season_pass/contracts/src/mock/realms/metadata.cairo b/contracts/season_pass/src/mock/realms/metadata.cairo similarity index 100% rename from contracts/season_pass/contracts/src/mock/realms/metadata.cairo rename to contracts/season_pass/src/mock/realms/metadata.cairo diff --git a/contracts/season_pass/contracts/src/mock/realms/realms.cairo b/contracts/season_pass/src/mock/realms/realms.cairo similarity index 100% rename from contracts/season_pass/contracts/src/mock/realms/realms.cairo rename to contracts/season_pass/src/mock/realms/realms.cairo diff --git a/contracts/season_pass/contracts/src/tests/test_season_pass.cairo b/contracts/season_pass/src/tests/test_season_pass.cairo similarity index 100% rename from contracts/season_pass/contracts/src/tests/test_season_pass.cairo rename to contracts/season_pass/src/tests/test_season_pass.cairo diff --git a/contracts/season_pass/contracts/src/utils.cairo b/contracts/season_pass/src/utils.cairo similarity index 100% rename from contracts/season_pass/contracts/src/utils.cairo rename to contracts/season_pass/src/utils.cairo diff --git a/contracts/season_resources/contracts/.tool-versions b/contracts/season_resources/.tool-versions similarity index 100% rename from contracts/season_resources/contracts/.tool-versions rename to contracts/season_resources/.tool-versions diff --git a/contracts/season_resources/contracts/Scarb.lock b/contracts/season_resources/Scarb.lock similarity index 100% rename from contracts/season_resources/contracts/Scarb.lock rename to contracts/season_resources/Scarb.lock diff --git a/contracts/season_resources/contracts/Scarb.toml b/contracts/season_resources/Scarb.toml similarity index 100% rename from contracts/season_resources/contracts/Scarb.toml rename to contracts/season_resources/Scarb.toml diff --git a/contracts/season_resources/ext/_ b/contracts/season_resources/ext/_ new file mode 100644 index 0000000000..e69de29bb2 diff --git a/contracts/season_resources/scripts/deployment/.env.example b/contracts/season_resources/ext/scripts/deployment/.env.example similarity index 100% rename from contracts/season_resources/scripts/deployment/.env.example rename to contracts/season_resources/ext/scripts/deployment/.env.example diff --git a/contracts/season_resources/scripts/deployment/.env.production b/contracts/season_resources/ext/scripts/deployment/.env.production similarity index 100% rename from contracts/season_resources/scripts/deployment/.env.production rename to contracts/season_resources/ext/scripts/deployment/.env.production diff --git a/contracts/season_resources/scripts/deployment/.env.sample b/contracts/season_resources/ext/scripts/deployment/.env.sample similarity index 100% rename from contracts/season_resources/scripts/deployment/.env.sample rename to contracts/season_resources/ext/scripts/deployment/.env.sample diff --git a/contracts/season_resources/scripts/deployment/.env.sepolia b/contracts/season_resources/ext/scripts/deployment/.env.sepolia similarity index 100% rename from contracts/season_resources/scripts/deployment/.env.sepolia rename to contracts/season_resources/ext/scripts/deployment/.env.sepolia diff --git a/contracts/season_resources/scripts/deployment/.gitignore b/contracts/season_resources/ext/scripts/deployment/.gitignore similarity index 100% rename from contracts/season_resources/scripts/deployment/.gitignore rename to contracts/season_resources/ext/scripts/deployment/.gitignore diff --git a/contracts/season_resources/scripts/deployment/config/index.ts b/contracts/season_resources/ext/scripts/deployment/config/index.ts similarity index 100% rename from contracts/season_resources/scripts/deployment/config/index.ts rename to contracts/season_resources/ext/scripts/deployment/config/index.ts diff --git a/contracts/season_resources/scripts/deployment/config/provider/index.ts b/contracts/season_resources/ext/scripts/deployment/config/provider/index.ts similarity index 100% rename from contracts/season_resources/scripts/deployment/config/provider/index.ts rename to contracts/season_resources/ext/scripts/deployment/config/provider/index.ts diff --git a/contracts/season_resources/scripts/deployment/deploy.js b/contracts/season_resources/ext/scripts/deployment/deploy.js similarity index 100% rename from contracts/season_resources/scripts/deployment/deploy.js rename to contracts/season_resources/ext/scripts/deployment/deploy.js diff --git a/contracts/season_resources/scripts/deployment/libs/commands.js b/contracts/season_resources/ext/scripts/deployment/libs/commands.js similarity index 100% rename from contracts/season_resources/scripts/deployment/libs/commands.js rename to contracts/season_resources/ext/scripts/deployment/libs/commands.js diff --git a/contracts/season_resources/scripts/deployment/libs/common.js b/contracts/season_resources/ext/scripts/deployment/libs/common.js similarity index 100% rename from contracts/season_resources/scripts/deployment/libs/common.js rename to contracts/season_resources/ext/scripts/deployment/libs/common.js diff --git a/contracts/season_resources/scripts/deployment/libs/network.js b/contracts/season_resources/ext/scripts/deployment/libs/network.js similarity index 100% rename from contracts/season_resources/scripts/deployment/libs/network.js rename to contracts/season_resources/ext/scripts/deployment/libs/network.js diff --git a/contracts/season_resources/scripts/deployment/libs/resources.json b/contracts/season_resources/ext/scripts/deployment/libs/resources.json similarity index 100% rename from contracts/season_resources/scripts/deployment/libs/resources.json rename to contracts/season_resources/ext/scripts/deployment/libs/resources.json diff --git a/contracts/season_resources/scripts/deployment/package.json b/contracts/season_resources/ext/scripts/deployment/package.json similarity index 100% rename from contracts/season_resources/scripts/deployment/package.json rename to contracts/season_resources/ext/scripts/deployment/package.json diff --git a/contracts/season_resources/contracts/src/contract.cairo b/contracts/season_resources/src/contract.cairo similarity index 100% rename from contracts/season_resources/contracts/src/contract.cairo rename to contracts/season_resources/src/contract.cairo diff --git a/contracts/season_resources/contracts/src/lib.cairo b/contracts/season_resources/src/lib.cairo similarity index 100% rename from contracts/season_resources/contracts/src/lib.cairo rename to contracts/season_resources/src/lib.cairo diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8f7a60f329..52eefe32ad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -462,32 +462,6 @@ importers: specifier: ^2.0.5 version: 2.1.8(@types/node@20.17.12)(@vitest/ui@2.1.8)(terser@5.37.0) - contracts: - dependencies: - colors: - specifier: ^1.4.0 - version: 1.4.0 - dotenv: - specifier: ^16.3.1 - version: 16.4.7 - starknet: - specifier: ^6.8.0 - version: 6.11.0(encoding@0.1.13) - - contracts/season_pass/scripts/deployment: {} - - contracts/season_resources/scripts/deployment: - dependencies: - '@dojoengine/core': - specifier: 1.0.0-alpha.24 - version: 1.0.0-alpha.24(starknet@6.11.0(encoding@0.1.13))(typescript@5.7.2) - eventemitter3: - specifier: ^5.0.1 - version: 5.0.1 - vitest: - specifier: ^2.0.5 - version: 2.1.8(@types/node@20.17.12)(@vitest/ui@2.1.8)(terser@5.37.0) - packages: '@0no-co/graphql.web@1.0.13': @@ -4516,10 +4490,6 @@ packages: colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} - colors@1.4.0: - resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} - engines: {node: '>=0.1.90'} - combined-stream@1.0.8: resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} engines: {node: '>= 0.8'} @@ -12583,8 +12553,6 @@ snapshots: colorette@2.0.20: {} - colors@1.4.0: {} - combined-stream@1.0.8: dependencies: delayed-stream: 1.0.0