From ff30e1d8a78c1ddba9f3dec30d6e13cd955e5558 Mon Sep 17 00:00:00 2001 From: glihm Date: Sun, 7 Jul 2024 07:22:15 -0600 Subject: [PATCH 1/4] devcontainer: bump rust to 1.79 --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 66bba6e674..471f71cf32 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -26,7 +26,7 @@ ENV LLVM_SYS_170_PREFIX=/usr/lib/llvm-17 ENV TABLEGEN_170_PREFIX=/usr/lib/llvm-17 # To allow independent workflow of the container, the rust-toolchain is explicitely given. -RUN echo "1.76.0" > rust_toolchain_version +RUN echo "1.79.0" > rust_toolchain_version # Install cargo-binstall RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash From 7f5514d2a5be8d5aa127772e56f55fc336b389b5 Mon Sep 17 00:00:00 2001 From: lambda-0x <0xlambda@protonmail.com> Date: Mon, 8 Jul 2024 07:54:19 +0530 Subject: [PATCH 2/4] refactor: update manifest structure (#2153) * update manifest structure * fix abi path in manifest * fix test * fix: fix typo and remove dbg --------- Co-authored-by: glihm --- bin/sozo/src/commands/clean.rs | 55 ++++++----- bin/sozo/src/commands/migrate.rs | 4 +- crates/benches/src/deployer.rs | 4 +- crates/dojo-lang/src/compiler.rs | 20 ++-- .../contracts/ccf-cairo_v240-8d921297.json | 0 .../contracts/ccf-cairo_v260-465ec7fe.json | 0 .../{abis/base => base/abis}/dojo-base.json | 0 .../{abis/base => base/abis}/dojo-world.json | 0 .../contracts/ccf-cairo_v240-8d921297.toml | 2 +- .../contracts/ccf-cairo_v260-465ec7fe.toml | 2 +- .../manifests/dev/base/dojo-base.toml | 2 +- .../manifests/dev/base/dojo-world.toml | 2 +- crates/dojo-world/src/manifest/mod.rs | 10 +- crates/dojo-world/src/metadata.rs | 2 +- crates/dojo-world/src/metadata_test.rs | 2 +- crates/sozo/ops/src/migration/migrate.rs | 44 ++++++--- crates/torii/core/src/sql_test.rs | 1 - .../dojo_examples-actions-40b6994c.json | 0 .../dojo_examples-mock_token-31599eb2.json | 0 .../dojo_examples-others-61de2c18.json | 0 .../{abis/base => base/abis}/dojo-base.json | 0 .../{abis/base => base/abis}/dojo-world.json | 0 ...examples-ContractInitialized-376b7bd6.json | 0 .../dojo_examples-Message-1bb1d226.json | 0 .../dojo_examples-MockToken-38903c7c.json | 0 .../models/dojo_examples-Moved-318ae40d.json | 0 .../models/dojo_examples-Moves-2e2accba.json | 0 .../dojo_examples-PlayerConfig-3adad785.json | 0 .../dojo_examples-Position-1e145e26.json | 0 .../dojo_examples-ServerProfile-4caad1e6.json | 0 .../dojo_examples-actions-40b6994c.toml | 2 +- .../dojo_examples-mock_token-31599eb2.toml | 2 +- .../dojo_examples-others-61de2c18.toml | 2 +- .../manifests/dev/base/dojo-base.toml | 2 +- .../manifests/dev/base/dojo-world.toml | 2 +- ...examples-ContractInitialized-376b7bd6.toml | 2 +- .../dojo_examples-Message-1bb1d226.toml | 2 +- .../dojo_examples-MockToken-38903c7c.toml | 2 +- .../models/dojo_examples-Moved-318ae40d.toml | 2 +- .../models/dojo_examples-Moves-2e2accba.toml | 2 +- .../dojo_examples-PlayerConfig-3adad785.toml | 2 +- .../dojo_examples-Position-1e145e26.toml | 2 +- .../dojo_examples-ServerProfile-4caad1e6.toml | 2 +- .../dojo_examples-actions-40b6994c.json | 0 .../dojo_examples-mock_token-31599eb2.json | 0 .../dojo_examples-others-61de2c18.json | 0 .../deployment/abis}/dojo-base.json | 0 .../abis}/dojo-world.json | 0 ...examples-ContractInitialized-376b7bd6.json | 0 .../dojo_examples-Message-1bb1d226.json | 0 .../dojo_examples-MockToken-38903c7c.json | 0 .../models/dojo_examples-Moved-318ae40d.json | 0 .../models/dojo_examples-Moves-2e2accba.json | 0 .../dojo_examples-PlayerConfig-3adad785.json | 0 .../dojo_examples-Position-1e145e26.json | 0 .../dojo_examples-ServerProfile-4caad1e6.json | 0 .../dev/{ => deployment}/manifest.json | 2 +- .../dev/{ => deployment}/manifest.toml | 26 ++--- .../dojo_examples-actions-40b6994c.json | 0 .../dojo_examples-mock_token-31599eb2.json | 0 .../dojo_examples-others-61de2c18.json | 0 .../release/base/abis/dojo-base.json | 98 +++++++++++++++++++ .../{abis/base => base/abis}/dojo-world.json | 0 ...examples-ContractInitialized-376b7bd6.json | 0 .../dojo_examples-Message-1bb1d226.json | 0 .../dojo_examples-MockToken-38903c7c.json | 0 .../models/dojo_examples-Moved-318ae40d.json | 0 .../models/dojo_examples-Moves-2e2accba.json | 0 .../dojo_examples-PlayerConfig-3adad785.json | 0 .../dojo_examples-Position-1e145e26.json | 0 .../dojo_examples-ServerProfile-4caad1e6.json | 0 .../dojo_examples-actions-40b6994c.toml | 2 +- .../dojo_examples-mock_token-31599eb2.toml | 2 +- .../dojo_examples-others-61de2c18.toml | 2 +- .../manifests/release/base/dojo-base.toml | 2 +- .../manifests/release/base/dojo-world.toml | 2 +- ...examples-ContractInitialized-376b7bd6.toml | 2 +- .../dojo_examples-Message-1bb1d226.toml | 2 +- .../dojo_examples-MockToken-38903c7c.toml | 2 +- .../models/dojo_examples-Moved-318ae40d.toml | 2 +- .../models/dojo_examples-Moves-2e2accba.toml | 2 +- .../dojo_examples-PlayerConfig-3adad785.toml | 2 +- .../dojo_examples-Position-1e145e26.toml | 2 +- .../dojo_examples-ServerProfile-4caad1e6.toml | 2 +- 84 files changed, 224 insertions(+), 104 deletions(-) rename crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/{abis/base => base/abis}/contracts/ccf-cairo_v240-8d921297.json (100%) rename crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/{abis/base => base/abis}/contracts/ccf-cairo_v260-465ec7fe.json (100%) rename crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/{abis/base => base/abis}/dojo-base.json (100%) rename crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/{abis/base => base/abis}/dojo-world.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/contracts/dojo_examples-actions-40b6994c.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/contracts/dojo_examples-mock_token-31599eb2.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/contracts/dojo_examples-others-61de2c18.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/dojo-base.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/dojo-world.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-ContractInitialized-376b7bd6.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-Message-1bb1d226.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-MockToken-38903c7c.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-Moved-318ae40d.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-Moves-2e2accba.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-PlayerConfig-3adad785.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-Position-1e145e26.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/base => base/abis}/models/dojo_examples-ServerProfile-4caad1e6.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/contracts/dojo_examples-actions-40b6994c.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/contracts/dojo_examples-mock_token-31599eb2.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/contracts/dojo_examples-others-61de2c18.json (100%) rename examples/spawn-and-move/manifests/{release/abis/base => dev/deployment/abis}/dojo-base.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/dojo-world.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-ContractInitialized-376b7bd6.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-Message-1bb1d226.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-MockToken-38903c7c.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-Moved-318ae40d.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-Moves-2e2accba.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-PlayerConfig-3adad785.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-Position-1e145e26.json (100%) rename examples/spawn-and-move/manifests/dev/{abis/deployments => deployment/abis}/models/dojo_examples-ServerProfile-4caad1e6.json (100%) rename examples/spawn-and-move/manifests/dev/{ => deployment}/manifest.json (99%) rename examples/spawn-and-move/manifests/dev/{ => deployment}/manifest.toml (85%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/contracts/dojo_examples-actions-40b6994c.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/contracts/dojo_examples-mock_token-31599eb2.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/contracts/dojo_examples-others-61de2c18.json (100%) create mode 100644 examples/spawn-and-move/manifests/release/base/abis/dojo-base.json rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/dojo-world.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-ContractInitialized-376b7bd6.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-Message-1bb1d226.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-MockToken-38903c7c.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-Moved-318ae40d.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-Moves-2e2accba.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-PlayerConfig-3adad785.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-Position-1e145e26.json (100%) rename examples/spawn-and-move/manifests/release/{abis/base => base/abis}/models/dojo_examples-ServerProfile-4caad1e6.json (100%) diff --git a/bin/sozo/src/commands/clean.rs b/bin/sozo/src/commands/clean.rs index 54650fcd96..59a76f15c1 100644 --- a/bin/sozo/src/commands/clean.rs +++ b/bin/sozo/src/commands/clean.rs @@ -3,7 +3,7 @@ use std::fs; use anyhow::{Context, Result}; use camino::Utf8PathBuf; use clap::Args; -use dojo_world::manifest::{ABIS_DIR, BASE_DIR, MANIFESTS_DIR}; +use dojo_world::manifest::{BASE_DIR, MANIFESTS_DIR}; use scarb::core::Config; use scarb::ops; use tracing::trace; @@ -28,7 +28,7 @@ impl CleanArgs { /// * `profile_dir` - The directory where the profile files are located. pub fn clean_manifests(profile_dir: &Utf8PathBuf) -> Result<()> { trace!(?profile_dir, "Cleaning manifests."); - let dirs = vec![profile_dir.join(BASE_DIR), profile_dir.join(ABIS_DIR).join(BASE_DIR)]; + let dirs = vec![profile_dir.join(BASE_DIR)]; for d in dirs { if d.exists() { @@ -96,6 +96,8 @@ impl CleanArgs { #[cfg(test)] mod tests { use dojo_test_utils::compiler; + use dojo_world::manifest::DEPLOYMENT_DIR; + use dojo_world::metadata::ABIS_DIR; use scarb::compiler::Profile; use super::*; @@ -111,6 +113,8 @@ mod tests { Profile::DEV, ); + println!("path {:?}", config.manifest_path()); + let temp_project_dir = config.manifest_path().parent().unwrap().to_path_buf(); let clean_cmd = CleanArgs { full: false, all_profiles: false }; @@ -126,14 +130,14 @@ mod tests { let release_manifests_dir = temp_project_dir.join("manifests").join(release_profile_name); let dev_manifests_base_dir = dev_manifests_dir.join("base"); - let dev_manifests_abis_base_dir = dev_manifests_dir.join("abis").join("base"); + let dev_manifests_abis_base_dir = dev_manifests_dir.join("base").join("abis"); let release_manifests_base_dir = release_manifests_dir.join("base"); - let release_manifests_abis_base_dir = release_manifests_dir.join("abis").join("base"); - - let dev_manifests_abis_depl_dir = dev_manifests_dir.join("abis").join("deployments"); + let release_manifests_abis_base_dir = release_manifests_dir.join("base").join("abis"); - let dev_manifest_toml = dev_manifests_dir.join("manifest").with_extension("toml"); - let dev_manifest_json = dev_manifests_dir.join("manifest").with_extension("json"); + let dev_manifests_depl_dir = dev_manifests_dir.join("deployment"); + let dev_manifests_abis_depl_dir = dev_manifests_depl_dir.join("abis"); + let dev_manifest_toml = dev_manifests_depl_dir.join("manifest").with_extension("toml"); + let dev_manifest_json = dev_manifests_depl_dir.join("manifest").with_extension("json"); assert!(fs::read_dir(target_dev_dir).is_err(), "Expected 'target/dev' to be empty"); assert!( @@ -147,11 +151,11 @@ mod tests { ); assert!( fs::read_dir(dev_manifests_abis_base_dir).is_err(), - "Expected 'manifests/dev/abis/base' to be empty" + "Expected 'manifests/dev/base/abis' to be empty" ); assert!( fs::read_dir(&dev_manifests_abis_depl_dir).is_ok(), - "Expected 'manifests/dev/abis/deployments' to not be empty" + "Expected 'manifests/dev/deployment/abis' to not be empty" ); // we expect release profile to be not affected @@ -161,7 +165,7 @@ mod tests { ); assert!( fs::read_dir(release_manifests_abis_base_dir).is_ok(), - "Expected 'manifests/release/abis/base' to be non empty" + "Expected 'manifests/release/base/abis' to be non empty" ); assert!(dev_manifest_toml.exists(), "Expected 'manifest.toml' to exist"); @@ -172,7 +176,7 @@ mod tests { assert!( fs::read_dir(&dev_manifests_abis_depl_dir).is_err(), - "Expected 'manifests/dev/abis/deployments' to be empty" + "Expected 'manifests/dev/deployment/abis' to be empty" ); assert!(!dev_manifest_toml.exists(), "Expected 'manifest.toml' to not exist"); assert!(!dev_manifest_json.exists(), "Expected 'manifest.json' to not exist"); @@ -200,18 +204,19 @@ mod tests { let target_dev_dir = temp_project_dir.join("target").join(dev_profile_name); let target_release_dir = temp_project_dir.join("target").join(release_profile_name); - let dev_manifests_dir = temp_project_dir.join("manifests").join(dev_profile_name); - let release_manifests_dir = temp_project_dir.join("manifests").join(release_profile_name); + let dev_manifests_dir = temp_project_dir.join(MANIFESTS_DIR).join(dev_profile_name); + let release_manifests_dir = temp_project_dir.join(MANIFESTS_DIR).join(release_profile_name); - let dev_manifests_base_dir = dev_manifests_dir.join("base"); - let dev_manifests_abis_base_dir = dev_manifests_dir.join("abis").join("base"); - let release_manifests_base_dir = release_manifests_dir.join("base"); - let release_manifests_abis_base_dir = release_manifests_dir.join("abis").join("base"); + let dev_manifests_base_dir = dev_manifests_dir.join(BASE_DIR); + let dev_manifests_abis_base_dir = dev_manifests_base_dir.join(ABIS_DIR); + let release_manifests_base_dir = release_manifests_dir.join(BASE_DIR); + let release_manifests_abis_base_dir = release_manifests_base_dir.join(ABIS_DIR); - let dev_manifests_abis_depl_dir = dev_manifests_dir.join("abis").join("deployments"); + let dev_manifests_deploy_dir = dev_manifests_dir.join(DEPLOYMENT_DIR); + let dev_manifests_abis_depl_dir = dev_manifests_deploy_dir.join(ABIS_DIR); - let dev_manifest_toml = dev_manifests_dir.join("manifest").with_extension("toml"); - let dev_manifest_json = dev_manifests_dir.join("manifest").with_extension("json"); + let dev_manifest_toml = dev_manifests_deploy_dir.join("manifest").with_extension("toml"); + let dev_manifest_json = dev_manifests_deploy_dir.join("manifest").with_extension("json"); assert!(fs::read_dir(target_dev_dir).is_err(), "Expected 'target/dev' to be empty"); assert!(fs::read_dir(target_release_dir).is_err(), "Expected 'target/release' to be empty"); @@ -222,11 +227,11 @@ mod tests { ); assert!( fs::read_dir(dev_manifests_abis_base_dir).is_err(), - "Expected 'manifests/dev/abis/base' to be empty" + "Expected 'manifests/dev/base/abis' to be empty" ); assert!( fs::read_dir(&dev_manifests_abis_depl_dir).is_ok(), - "Expected 'manifests/dev/abis/deployments' to not be empty" + "Expected 'manifests/dev/deployment/abis' to not be empty" ); assert!( @@ -235,7 +240,7 @@ mod tests { ); assert!( fs::read_dir(release_manifests_abis_base_dir).is_err(), - "Expected 'manifests/release/abis/base' to be empty" + "Expected 'manifests/release/base/abis' to be empty" ); assert!(dev_manifest_toml.exists(), "Expected 'manifest.toml' to exist"); @@ -246,7 +251,7 @@ mod tests { assert!( fs::read_dir(&dev_manifests_abis_depl_dir).is_err(), - "Expected 'manifests/dev/abis/deployments' to be empty" + "Expected 'manifests/dev/deployment/abis' to be empty" ); assert!(!dev_manifest_toml.exists(), "Expected 'manifest.toml' to not exist"); assert!(!dev_manifest_json.exists(), "Expected 'manifest.json' to not exist"); diff --git a/bin/sozo/src/commands/migrate.rs b/bin/sozo/src/commands/migrate.rs index c697a15e7c..cc0b28559a 100644 --- a/bin/sozo/src/commands/migrate.rs +++ b/bin/sozo/src/commands/migrate.rs @@ -81,8 +81,10 @@ impl MigrateArgs { None }; + let profile_name = + ws.current_profile().expect("Scarb profile expected to be defined.").to_string(); let manifest_dir = ws.manifest_path().parent().unwrap().to_path_buf(); - if !manifest_dir.join(MANIFESTS_DIR).exists() { + if !manifest_dir.join(MANIFESTS_DIR).join(profile_name).exists() { return Err(anyhow!("Build project using `sozo build` first")); } diff --git a/crates/benches/src/deployer.rs b/crates/benches/src/deployer.rs index 9dcf7e961e..ad4db203a1 100644 --- a/crates/benches/src/deployer.rs +++ b/crates/benches/src/deployer.rs @@ -5,7 +5,7 @@ use anyhow::{anyhow, bail, Context, Ok, Result}; use clap::Parser; use dojo_lang::compiler::DojoCompiler; use dojo_lang::plugin::CairoPluginRepository; -use dojo_world::manifest::{DeploymentManifest, DEPLOYMENTS_DIR, MANIFESTS_DIR}; +use dojo_world::manifest::{DeploymentManifest, DEPLOYMENT_DIR, MANIFESTS_DIR}; use futures::executor::block_on; use katana_runner::KatanaRunner; use scarb::compiler::CompilerRepository; @@ -97,7 +97,7 @@ async fn prepare_migration_args(args: SozoArgs) -> Result { let manifest_dir = manifest_path.parent().unwrap(); let manifest = DeploymentManifest::load_from_path( - &manifest_dir.join(MANIFESTS_DIR).join("dev").join(DEPLOYMENTS_DIR).with_extension("toml"), + &manifest_dir.join(MANIFESTS_DIR).join("dev").join(DEPLOYMENT_DIR).with_extension("toml"), ) .expect("failed to load manifest"); diff --git a/crates/dojo-lang/src/compiler.rs b/crates/dojo-lang/src/compiler.rs index 826d1dc4fc..54e4f631b6 100644 --- a/crates/dojo-lang/src/compiler.rs +++ b/crates/dojo-lang/src/compiler.rs @@ -223,10 +223,12 @@ fn update_files( ) -> anyhow::Result<()> { let profile_name = ws.current_profile().expect("Scarb profile expected to be defined.").to_string(); - let profile_dir = Utf8PathBuf::new().join(MANIFESTS_DIR).join(profile_name); + let relative_manifest_dir = Utf8PathBuf::new().join(MANIFESTS_DIR).join(profile_name); + + // relative path to manifests and abi + let base_manifests_dir = Utf8PathBuf::new().join(relative_manifest_dir).join(BASE_DIR); + let base_abis_dir = Utf8PathBuf::new().join(&base_manifests_dir).join(ABIS_DIR); - let relative_manifests_dir = Utf8PathBuf::new().join(&profile_dir).join(BASE_DIR); - let relative_abis_dir = Utf8PathBuf::new().join(&profile_dir).join(ABIS_DIR).join(BASE_DIR); let manifest_dir = ws.manifest_path().parent().unwrap().to_path_buf(); fn get_compiled_artifact_from_map<'a>( @@ -247,8 +249,8 @@ fn update_files( let (hash, class) = get_compiled_artifact_from_map(&compiled_artifacts, qualified_path)?; let filename = naming::get_filename_from_tag(tag); write_manifest_and_abi( - &relative_manifests_dir, - &relative_abis_dir, + &base_manifests_dir, + &base_abis_dir, &manifest_dir, &mut Manifest::new( // abi path will be written by `write_manifest` @@ -334,8 +336,8 @@ fn update_files( for (_, (manifest, class, module_id)) in contracts.iter_mut() { write_manifest_and_abi( - &relative_manifests_dir.join(CONTRACTS_DIR), - &relative_abis_dir.join(CONTRACTS_DIR), + &base_manifests_dir.join(CONTRACTS_DIR), + &base_abis_dir.join(CONTRACTS_DIR), &manifest_dir, manifest, &class.abi, @@ -360,8 +362,8 @@ fn update_files( for (_, (manifest, class, module_id)) in models.iter_mut() { write_manifest_and_abi( - &relative_manifests_dir.join(MODELS_DIR), - &relative_abis_dir.join(MODELS_DIR), + &base_manifests_dir.join(MODELS_DIR), + &base_abis_dir.join(MODELS_DIR), &manifest_dir, manifest, &class.abi, diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/contracts/ccf-cairo_v240-8d921297.json b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/contracts/ccf-cairo_v240-8d921297.json similarity index 100% rename from crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/contracts/ccf-cairo_v240-8d921297.json rename to crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/contracts/ccf-cairo_v240-8d921297.json diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/contracts/ccf-cairo_v260-465ec7fe.json b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/contracts/ccf-cairo_v260-465ec7fe.json similarity index 100% rename from crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/contracts/ccf-cairo_v260-465ec7fe.json rename to crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/contracts/ccf-cairo_v260-465ec7fe.json diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/dojo-base.json b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/dojo-base.json similarity index 100% rename from crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/dojo-base.json rename to crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/dojo-base.json diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/dojo-world.json b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/dojo-world.json similarity index 100% rename from crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/abis/base/dojo-world.json rename to crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/abis/dojo-world.json diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml index be3fb94735..2dc026c126 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x7468fbf6e47eb66fd898a4a68bbe801560fdd42b0d6909ec4f75fb38c613702" original_class_hash = "0x7468fbf6e47eb66fd898a4a68bbe801560fdd42b0d6909ec4f75fb38c613702" base_class_hash = "0x0" -abi = "manifests/dev/abis/base/contracts/ccf-cairo_v240-8d921297.json" +abi = "manifests/dev/base/abis/contracts/ccf-cairo_v240-8d921297.json" reads = [] writes = [] computed = [] diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml index f4443a58d4..df70ed0ff9 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x4bbfcdc8d95ecfa332201e21f615e98b4d12e08f77d176761e32bb34e3bc333" original_class_hash = "0x4bbfcdc8d95ecfa332201e21f615e98b4d12e08f77d176761e32bb34e3bc333" base_class_hash = "0x0" -abi = "manifests/dev/abis/base/contracts/ccf-cairo_v260-465ec7fe.json" +abi = "manifests/dev/base/abis/contracts/ccf-cairo_v260-465ec7fe.json" reads = [] writes = [] computed = [] diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml index 4e2fc2e0bb..35f4edd8d1 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml @@ -1,6 +1,6 @@ kind = "Class" class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -abi = "manifests/dev/abis/base/dojo-base.json" +abi = "manifests/dev/base/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml index 94821ba3f7..2e7374451b 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml @@ -1,6 +1,6 @@ kind = "Class" class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -abi = "manifests/dev/abis/base/dojo-world.json" +abi = "manifests/dev/base/abis/dojo-world.json" tag = "dojo-world" manifest_name = "dojo-world" diff --git a/crates/dojo-world/src/manifest/mod.rs b/crates/dojo-world/src/manifest/mod.rs index 876a1f814e..48397654f3 100644 --- a/crates/dojo-world/src/manifest/mod.rs +++ b/crates/dojo-world/src/manifest/mod.rs @@ -41,10 +41,10 @@ pub const WORLD_QUALIFIED_PATH: &str = "dojo::world::world"; pub const BASE_QUALIFIED_PATH: &str = "dojo::base::base"; pub const MANIFESTS_DIR: &str = "manifests"; +pub const DEPLOYMENT_DIR: &str = "deployment"; pub const TARGET_DIR: &str = "target"; pub const BASE_DIR: &str = "base"; pub const OVERLAYS_DIR: &str = "overlays"; -pub const DEPLOYMENTS_DIR: &str = "deployments"; pub const ABIS_DIR: &str = "abis"; pub const CONTRACTS_DIR: &str = "contracts"; @@ -366,25 +366,25 @@ impl DeploymentManifest { Ok(()) } - pub fn write_to_path_json(&self, path: &Utf8PathBuf, profile_dir: &Utf8PathBuf) -> Result<()> { + pub fn write_to_path_json(&self, path: &Utf8PathBuf, root_dir: &Utf8PathBuf) -> Result<()> { fs::create_dir_all(path.parent().unwrap())?; // Embedding ABIs into the manifest. let mut manifest_with_abis = self.clone(); if let Some(abi_format) = &manifest_with_abis.world.inner.abi { - manifest_with_abis.world.inner.abi = Some(abi_format.to_embed(profile_dir)?); + manifest_with_abis.world.inner.abi = Some(abi_format.to_embed(root_dir)?); } for contract in &mut manifest_with_abis.contracts { if let Some(abi_format) = &contract.inner.abi { - contract.inner.abi = Some(abi_format.to_embed(profile_dir)?); + contract.inner.abi = Some(abi_format.to_embed(root_dir)?); } } for model in &mut manifest_with_abis.models { if let Some(abi_format) = &model.inner.abi { - model.inner.abi = Some(abi_format.to_embed(profile_dir)?); + model.inner.abi = Some(abi_format.to_embed(root_dir)?); } } diff --git a/crates/dojo-world/src/metadata.rs b/crates/dojo-world/src/metadata.rs index b796ae4636..e948cf2ada 100644 --- a/crates/dojo-world/src/metadata.rs +++ b/crates/dojo-world/src/metadata.rs @@ -93,7 +93,7 @@ pub fn dojo_metadata_from_workspace(ws: &Workspace<'_>) -> Result let manifest_dir = ws.manifest_path().parent().unwrap().to_path_buf(); let manifest_dir = manifest_dir.join(MANIFESTS_DIR).join(profile.as_str()); - let abi_dir = manifest_dir.join(ABIS_DIR).join(BASE_DIR); + let abi_dir = manifest_dir.join(BASE_DIR).join(ABIS_DIR); let source_dir = ws.target_dir().path_existent().unwrap(); let source_dir = source_dir.join(profile.as_str()); diff --git a/crates/dojo-world/src/metadata_test.rs b/crates/dojo-world/src/metadata_test.rs index adf9156617..ff32eda35c 100644 --- a/crates/dojo-world/src/metadata_test.rs +++ b/crates/dojo-world/src/metadata_test.rs @@ -131,7 +131,7 @@ async fn get_full_dojo_metadata_from_workspace() { let manifest_dir = manifest_dir.join(MANIFESTS_DIR).join(profile.as_str()); let target_dir = ws.target_dir().path_existent().unwrap(); let target_dir = target_dir.join(profile.as_str()); - let abis_dir = manifest_dir.join(ABIS_DIR).join(BASE_DIR); + let abis_dir = manifest_dir.join(BASE_DIR).join(ABIS_DIR); let dojo_metadata = dojo_metadata_from_workspace(&ws).expect("No current package with dojo metadata found."); diff --git a/crates/sozo/ops/src/migration/migrate.rs b/crates/sozo/ops/src/migration/migrate.rs index e2fcfcecbc..c38c40b0f2 100644 --- a/crates/sozo/ops/src/migration/migrate.rs +++ b/crates/sozo/ops/src/migration/migrate.rs @@ -9,9 +9,9 @@ use dojo_world::contracts::naming::{ }; use dojo_world::contracts::{cairo_utils, WorldContract}; use dojo_world::manifest::{ - AbiFormat, BaseManifest, DeploymentManifest, DojoContract, DojoModel, Manifest, + AbiFormat, BaseManifest, Class, DeploymentManifest, DojoContract, DojoModel, Manifest, ManifestMethods, WorldContract as ManifestWorldContract, WorldMetadata, ABIS_DIR, BASE_DIR, - DEPLOYMENTS_DIR, MANIFESTS_DIR, + DEPLOYMENT_DIR, MANIFESTS_DIR, }; use dojo_world::metadata::{dojo_metadata_from_workspace, ResourceMetadata}; use dojo_world::migration::class::ClassMigration; @@ -807,8 +807,10 @@ pub async fn update_manifests_and_abis( let ui = ws.config().ui(); ui.print_step(5, "✨", "Updating manifests..."); - let deployed_path = manifest_dir.join("manifest").with_extension("toml"); - let deployed_path_json = manifest_dir.join("manifest").with_extension("json"); + let deployment_dir = manifest_dir.join(DEPLOYMENT_DIR); + + let deployed_path = deployment_dir.join("manifest").with_extension("toml"); + let deployed_path_json = deployment_dir.join("manifest").with_extension("json"); let mut local_manifest: DeploymentManifest = local_manifest.into(); @@ -862,12 +864,19 @@ pub async fn update_manifests_and_abis( } }); - // copy abi files from `abi/base` to `abi/deployments/{chain_id}` and update abi path in + // copy abi files from `base/abi` to `deployment/abi` and update abi path in // local_manifest update_manifest_abis(&mut local_manifest, manifest_dir, profile_name).await; - local_manifest.write_to_path_toml(&deployed_path)?; - local_manifest.write_to_path_json(&deployed_path_json, manifest_dir)?; + local_manifest + .write_to_path_toml(&deployed_path) + .with_context(|| "Failed to write toml manifest")?; + + let root_dir = ws.manifest_path().parent().unwrap().to_path_buf(); + + local_manifest + .write_to_path_json(&deployed_path_json, &root_dir) + .with_context(|| "Failed to write json manifest")?; ui.print("\n✨ Done."); Ok(()) @@ -887,25 +896,26 @@ async fn update_manifest_abis( ) where T: ManifestMethods, { - // manifests/dev/abis/base/contract/dojo-world.json -> abis/base/contract/dojo-world.json let base_relative_path = manifest.inner.abi().unwrap().to_path().unwrap(); + + // manifests/dev/base/abis/contract/contract.json -> base/abis/contract/contract.json let base_relative_path = base_relative_path .strip_prefix(Utf8PathBuf::new().join(MANIFESTS_DIR).join(profile_name)) .unwrap(); - // abis/base/dojo-world.json -> dojo-world.json + // base/abis/contract/contract.json -> contract/contract.json let stripped_path = base_relative_path - .strip_prefix(Utf8PathBuf::new().join(ABIS_DIR).join(BASE_DIR)) + .strip_prefix(Utf8PathBuf::new().join(BASE_DIR).join(ABIS_DIR)) .unwrap(); - // abis/deployments/dojo-world.json + // deployment/abis/dojo-world.json let deployed_relative_path = - Utf8PathBuf::new().join(ABIS_DIR).join(DEPLOYMENTS_DIR).join(stripped_path); + Utf8PathBuf::new().join(DEPLOYMENT_DIR).join(ABIS_DIR).join(stripped_path); - // /abis/base/dojo-world.json + // /base/abis/dojo-world.json let full_base_path = manifest_dir.join(base_relative_path); - // /abis/deployments/dojo-world.json + // /deployment/abis/dojo-world.json let full_deployed_path = manifest_dir.join(deployed_relative_path.clone()); fs::create_dir_all(full_deployed_path.parent().unwrap()) @@ -914,12 +924,16 @@ async fn update_manifest_abis( fs::copy(full_base_path, full_deployed_path).await.expect("Failed to copy abi file"); - manifest.inner.set_abi(Some(AbiFormat::Path(deployed_relative_path))); + manifest.inner.set_abi(Some(AbiFormat::Path( + Utf8PathBuf::from(MANIFESTS_DIR).join(profile_name).join(deployed_relative_path), + ))); } inner_helper::(manifest_dir, profile_name, &mut local_manifest.world) .await; + inner_helper::(manifest_dir, profile_name, &mut local_manifest.base).await; + for contract in local_manifest.contracts.iter_mut() { inner_helper::(manifest_dir, profile_name, contract).await; } diff --git a/crates/torii/core/src/sql_test.rs b/crates/torii/core/src/sql_test.rs index b367eeab61..a1d3d55e37 100644 --- a/crates/torii/core/src/sql_test.rs +++ b/crates/torii/core/src/sql_test.rs @@ -64,7 +64,6 @@ async fn test_load_from_remote() { SqliteConnectOptions::from_str("sqlite::memory:").unwrap().create_if_missing(true); let pool = SqlitePoolOptions::new().max_connections(5).connect_with(options).await.unwrap(); sqlx::migrate!("../migrations").run(&pool).await.unwrap(); - let source_project_dir = Utf8PathBuf::from("../../../examples/spawn-and-move/"); let dojo_core_path = Utf8PathBuf::from("../../dojo-core"); diff --git a/examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples-actions-40b6994c.json b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples-actions-40b6994c.json rename to examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples-mock_token-31599eb2.json b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples-mock_token-31599eb2.json rename to examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples-others-61de2c18.json b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/contracts/dojo_examples-others-61de2c18.json rename to examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/dojo-base.json b/examples/spawn-and-move/manifests/dev/base/abis/dojo-base.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/dojo-base.json rename to examples/spawn-and-move/manifests/dev/base/abis/dojo-base.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/dojo-world.json b/examples/spawn-and-move/manifests/dev/base/abis/dojo-world.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/dojo-world.json rename to examples/spawn-and-move/manifests/dev/base/abis/dojo-world.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-ContractInitialized-376b7bd6.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-ContractInitialized-376b7bd6.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Message-1bb1d226.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Message-1bb1d226.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Message-1bb1d226.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Message-1bb1d226.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-MockToken-38903c7c.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-MockToken-38903c7c.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-MockToken-38903c7c.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-MockToken-38903c7c.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Moved-318ae40d.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Moved-318ae40d.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Moved-318ae40d.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Moved-318ae40d.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Moves-2e2accba.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Moves-2e2accba.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Moves-2e2accba.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Moves-2e2accba.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-PlayerConfig-3adad785.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-PlayerConfig-3adad785.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-PlayerConfig-3adad785.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-PlayerConfig-3adad785.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Position-1e145e26.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Position-1e145e26.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-Position-1e145e26.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-Position-1e145e26.json diff --git a/examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-ServerProfile-4caad1e6.json b/examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/base/models/dojo_examples-ServerProfile-4caad1e6.json rename to examples/spawn-and-move/manifests/dev/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml index 34d9543e28..99bc7921ee 100644 --- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml +++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" original_class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" base_class_hash = "0x0" -abi = "manifests/dev/abis/base/contracts/dojo_examples-actions-40b6994c.json" +abi = "manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json" reads = [] writes = [] computed = [] diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml index 1a2a64dea4..a0d11e457e 100644 --- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml +++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" original_class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" base_class_hash = "0x0" -abi = "manifests/dev/abis/base/contracts/dojo_examples-mock_token-31599eb2.json" +abi = "manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json" reads = [] writes = [] computed = [] diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml index 31438c1f0f..07b05e0714 100644 --- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml +++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" original_class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" base_class_hash = "0x0" -abi = "manifests/dev/abis/base/contracts/dojo_examples-others-61de2c18.json" +abi = "manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json" reads = [] writes = [] computed = [] diff --git a/examples/spawn-and-move/manifests/dev/base/dojo-base.toml b/examples/spawn-and-move/manifests/dev/base/dojo-base.toml index 4e2fc2e0bb..35f4edd8d1 100644 --- a/examples/spawn-and-move/manifests/dev/base/dojo-base.toml +++ b/examples/spawn-and-move/manifests/dev/base/dojo-base.toml @@ -1,6 +1,6 @@ kind = "Class" class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -abi = "manifests/dev/abis/base/dojo-base.json" +abi = "manifests/dev/base/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" diff --git a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml index 94821ba3f7..2e7374451b 100644 --- a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml +++ b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml @@ -1,6 +1,6 @@ kind = "Class" class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -abi = "manifests/dev/abis/base/dojo-world.json" +abi = "manifests/dev/base/abis/dojo-world.json" tag = "dojo-world" manifest_name = "dojo-world" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml index 0aacc170a4..f226e89204 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" original_class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" -abi = "manifests/dev/abis/base/models/dojo_examples-ContractInitialized-376b7bd6.json" +abi = "manifests/dev/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json" tag = "dojo_examples-ContractInitialized" manifest_name = "dojo_examples-ContractInitialized-376b7bd6" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml index 698d0a8f0e..1a2e2802f7 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" original_class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" -abi = "manifests/dev/abis/base/models/dojo_examples-Message-1bb1d226.json" +abi = "manifests/dev/base/abis/models/dojo_examples-Message-1bb1d226.json" tag = "dojo_examples-Message" manifest_name = "dojo_examples-Message-1bb1d226" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml index b607d23d57..23435c0a3a 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" original_class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" -abi = "manifests/dev/abis/base/models/dojo_examples-MockToken-38903c7c.json" +abi = "manifests/dev/base/abis/models/dojo_examples-MockToken-38903c7c.json" tag = "dojo_examples-MockToken" manifest_name = "dojo_examples-MockToken-38903c7c" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml index c8e044bd5a..b90e61eafe 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" original_class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" -abi = "manifests/dev/abis/base/models/dojo_examples-Moved-318ae40d.json" +abi = "manifests/dev/base/abis/models/dojo_examples-Moved-318ae40d.json" tag = "dojo_examples-Moved" manifest_name = "dojo_examples-Moved-318ae40d" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml index 0a661e61c7..c652d944a0 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" original_class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" -abi = "manifests/dev/abis/base/models/dojo_examples-Moves-2e2accba.json" +abi = "manifests/dev/base/abis/models/dojo_examples-Moves-2e2accba.json" tag = "dojo_examples-Moves" manifest_name = "dojo_examples-Moves-2e2accba" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml index a83db11151..22d3ca018e 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" original_class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" -abi = "manifests/dev/abis/base/models/dojo_examples-PlayerConfig-3adad785.json" +abi = "manifests/dev/base/abis/models/dojo_examples-PlayerConfig-3adad785.json" tag = "dojo_examples-PlayerConfig" manifest_name = "dojo_examples-PlayerConfig-3adad785" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml index 6eea086fef..db21e81459 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" original_class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" -abi = "manifests/dev/abis/base/models/dojo_examples-Position-1e145e26.json" +abi = "manifests/dev/base/abis/models/dojo_examples-Position-1e145e26.json" tag = "dojo_examples-Position" manifest_name = "dojo_examples-Position-1e145e26" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml index 4b77f78c88..4055b284ec 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" original_class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" -abi = "manifests/dev/abis/base/models/dojo_examples-ServerProfile-4caad1e6.json" +abi = "manifests/dev/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json" tag = "dojo_examples-ServerProfile" manifest_name = "dojo_examples-ServerProfile-4caad1e6" diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples-actions-40b6994c.json b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples-actions-40b6994c.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples-mock_token-31599eb2.json b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples-mock_token-31599eb2.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples-others-61de2c18.json b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/contracts/dojo_examples-others-61de2c18.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/dojo-base.json b/examples/spawn-and-move/manifests/dev/deployment/abis/dojo-base.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/dojo-base.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/dojo-base.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/dojo-world.json b/examples/spawn-and-move/manifests/dev/deployment/abis/dojo-world.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/dojo-world.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/dojo-world.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-ContractInitialized-376b7bd6.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-ContractInitialized-376b7bd6.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-ContractInitialized-376b7bd6.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-ContractInitialized-376b7bd6.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Message-1bb1d226.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Message-1bb1d226.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Message-1bb1d226.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Message-1bb1d226.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-MockToken-38903c7c.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-MockToken-38903c7c.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-MockToken-38903c7c.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-MockToken-38903c7c.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Moved-318ae40d.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Moved-318ae40d.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Moved-318ae40d.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Moved-318ae40d.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Moves-2e2accba.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Moves-2e2accba.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Moves-2e2accba.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Moves-2e2accba.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-PlayerConfig-3adad785.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-PlayerConfig-3adad785.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-PlayerConfig-3adad785.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-PlayerConfig-3adad785.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Position-1e145e26.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Position-1e145e26.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-Position-1e145e26.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-Position-1e145e26.json diff --git a/examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-ServerProfile-4caad1e6.json b/examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-ServerProfile-4caad1e6.json similarity index 100% rename from examples/spawn-and-move/manifests/dev/abis/deployments/models/dojo_examples-ServerProfile-4caad1e6.json rename to examples/spawn-and-move/manifests/dev/deployment/abis/models/dojo_examples-ServerProfile-4caad1e6.json diff --git a/examples/spawn-and-move/manifests/dev/manifest.json b/examples/spawn-and-move/manifests/dev/deployment/manifest.json similarity index 99% rename from examples/spawn-and-move/manifests/dev/manifest.json rename to examples/spawn-and-move/manifests/dev/deployment/manifest.json index 162816500f..655b688a82 100644 --- a/examples/spawn-and-move/manifests/dev/manifest.json +++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.json @@ -1122,7 +1122,7 @@ "kind": "Class", "class_hash": "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46", "original_class_hash": "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46", - "abi": "manifests/dev/abis/base/dojo-base.json", + "abi": "manifests/dev/deployment/abis/dojo-base.json", "tag": "dojo-base", "manifest_name": "dojo-base" }, diff --git a/examples/spawn-and-move/manifests/dev/manifest.toml b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml similarity index 85% rename from examples/spawn-and-move/manifests/dev/manifest.toml rename to examples/spawn-and-move/manifests/dev/deployment/manifest.toml index ad80716ce8..7097b14bc4 100644 --- a/examples/spawn-and-move/manifests/dev/manifest.toml +++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml @@ -2,7 +2,7 @@ kind = "WorldContract" class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -abi = "abis/deployments/dojo-world.json" +abi = "manifests/dev/deployment/abis/dojo-world.json" address = "0x104dd156d76aeab45146a10869637f161ca6cf9f804704f8bbb12ae5b1b5cfb" transaction_hash = "0x280e50610d4467bfe1be1adaae7f77642adbe2ad4106cb861e28441e94ff287" block_number = 3 @@ -17,7 +17,7 @@ rpc_url = "http://localhost:5050/" kind = "Class" class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -abi = "manifests/dev/abis/base/dojo-base.json" +abi = "manifests/dev/deployment/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" @@ -27,7 +27,7 @@ address = "0x2a570e12405096e725508ba1f4ade127edd42e0fcb5890b8f12f76ef043623" class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" original_class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" base_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -abi = "abis/deployments/contracts/dojo_examples-actions-40b6994c.json" +abi = "manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json" reads = [] writes = [ "dojo_examples-Moves", @@ -44,7 +44,7 @@ address = "0x26f33e8d81dad06c79c2d944ea519a850e007eb8432ae20d38db82caea590b2" class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" original_class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" base_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -abi = "abis/deployments/contracts/dojo_examples-mock_token-31599eb2.json" +abi = "manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json" reads = [] writes = [] computed = [] @@ -58,7 +58,7 @@ address = "0x3304896afaa421f362b3b8e8586773f9a7fcaca050b3fd6885400908803f344" class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" original_class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" base_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -abi = "abis/deployments/contracts/dojo_examples-others-61de2c18.json" +abi = "manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json" reads = [] writes = [] computed = [] @@ -74,7 +74,7 @@ manifest_name = "dojo_examples-others-61de2c18" kind = "DojoModel" class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" original_class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" -abi = "abis/deployments/models/dojo_examples-ContractInitialized-376b7bd6.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-ContractInitialized-376b7bd6.json" tag = "dojo_examples-ContractInitialized" manifest_name = "dojo_examples-ContractInitialized-376b7bd6" @@ -97,7 +97,7 @@ key = false kind = "DojoModel" class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" original_class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" -abi = "abis/deployments/models/dojo_examples-Message-1bb1d226.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-Message-1bb1d226.json" tag = "dojo_examples-Message" manifest_name = "dojo_examples-Message-1bb1d226" @@ -125,7 +125,7 @@ key = true kind = "DojoModel" class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" original_class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" -abi = "abis/deployments/models/dojo_examples-MockToken-38903c7c.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-MockToken-38903c7c.json" tag = "dojo_examples-MockToken" manifest_name = "dojo_examples-MockToken-38903c7c" @@ -143,7 +143,7 @@ key = false kind = "DojoModel" class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" original_class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" -abi = "abis/deployments/models/dojo_examples-Moved-318ae40d.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-Moved-318ae40d.json" tag = "dojo_examples-Moved" manifest_name = "dojo_examples-Moved-318ae40d" @@ -161,7 +161,7 @@ key = false kind = "DojoModel" class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" original_class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" -abi = "abis/deployments/models/dojo_examples-Moves-2e2accba.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-Moves-2e2accba.json" tag = "dojo_examples-Moves" manifest_name = "dojo_examples-Moves-2e2accba" @@ -184,7 +184,7 @@ key = false kind = "DojoModel" class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" original_class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" -abi = "abis/deployments/models/dojo_examples-PlayerConfig-3adad785.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-PlayerConfig-3adad785.json" tag = "dojo_examples-PlayerConfig" manifest_name = "dojo_examples-PlayerConfig-3adad785" @@ -212,7 +212,7 @@ key = false kind = "DojoModel" class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" original_class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" -abi = "abis/deployments/models/dojo_examples-Position-1e145e26.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-Position-1e145e26.json" tag = "dojo_examples-Position" manifest_name = "dojo_examples-Position-1e145e26" @@ -230,7 +230,7 @@ key = false kind = "DojoModel" class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" original_class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" -abi = "abis/deployments/models/dojo_examples-ServerProfile-4caad1e6.json" +abi = "manifests/dev/deployment/abis/models/dojo_examples-ServerProfile-4caad1e6.json" tag = "dojo_examples-ServerProfile" manifest_name = "dojo_examples-ServerProfile-4caad1e6" diff --git a/examples/spawn-and-move/manifests/release/abis/base/contracts/dojo_examples-actions-40b6994c.json b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/contracts/dojo_examples-actions-40b6994c.json rename to examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/contracts/dojo_examples-mock_token-31599eb2.json b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/contracts/dojo_examples-mock_token-31599eb2.json rename to examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/contracts/dojo_examples-others-61de2c18.json b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/contracts/dojo_examples-others-61de2c18.json rename to examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json diff --git a/examples/spawn-and-move/manifests/release/base/abis/dojo-base.json b/examples/spawn-and-move/manifests/release/base/abis/dojo-base.json new file mode 100644 index 0000000000..ee9ceaac66 --- /dev/null +++ b/examples/spawn-and-move/manifests/release/base/abis/dojo-base.json @@ -0,0 +1,98 @@ +[ + { + "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": "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": "constructor", + "name": "constructor", + "inputs": [] + }, + { + "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::base::base::Event", + "kind": "enum", + "variants": [ + { + "name": "UpgradeableEvent", + "type": "dojo::components::upgradeable::upgradeable::Event", + "kind": "flat" + } + ] + } +] \ No newline at end of file diff --git a/examples/spawn-and-move/manifests/release/abis/base/dojo-world.json b/examples/spawn-and-move/manifests/release/base/abis/dojo-world.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/dojo-world.json rename to examples/spawn-and-move/manifests/release/base/abis/dojo-world.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-ContractInitialized-376b7bd6.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-ContractInitialized-376b7bd6.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Message-1bb1d226.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Message-1bb1d226.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Message-1bb1d226.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Message-1bb1d226.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-MockToken-38903c7c.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-MockToken-38903c7c.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-MockToken-38903c7c.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-MockToken-38903c7c.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Moved-318ae40d.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Moved-318ae40d.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Moved-318ae40d.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Moved-318ae40d.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Moves-2e2accba.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Moves-2e2accba.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Moves-2e2accba.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Moves-2e2accba.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-PlayerConfig-3adad785.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-PlayerConfig-3adad785.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-PlayerConfig-3adad785.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-PlayerConfig-3adad785.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Position-1e145e26.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Position-1e145e26.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-Position-1e145e26.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-Position-1e145e26.json diff --git a/examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-ServerProfile-4caad1e6.json b/examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json similarity index 100% rename from examples/spawn-and-move/manifests/release/abis/base/models/dojo_examples-ServerProfile-4caad1e6.json rename to examples/spawn-and-move/manifests/release/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml index d50705247c..dd16bfa324 100644 --- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml +++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" original_class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" base_class_hash = "0x0" -abi = "manifests/release/abis/base/contracts/dojo_examples-actions-40b6994c.json" +abi = "manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json" reads = [] writes = [] computed = [] diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml index b9109222f9..e11d4ceb3c 100644 --- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml +++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" original_class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" base_class_hash = "0x0" -abi = "manifests/release/abis/base/contracts/dojo_examples-mock_token-31599eb2.json" +abi = "manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json" reads = [] writes = [] computed = [] diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml index 2b791ea2d5..6dd2fc4ebf 100644 --- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml +++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml @@ -2,7 +2,7 @@ kind = "DojoContract" class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" original_class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" base_class_hash = "0x0" -abi = "manifests/release/abis/base/contracts/dojo_examples-others-61de2c18.json" +abi = "manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json" reads = [] writes = [] computed = [] diff --git a/examples/spawn-and-move/manifests/release/base/dojo-base.toml b/examples/spawn-and-move/manifests/release/base/dojo-base.toml index feb0efd085..83de14f171 100644 --- a/examples/spawn-and-move/manifests/release/base/dojo-base.toml +++ b/examples/spawn-and-move/manifests/release/base/dojo-base.toml @@ -1,6 +1,6 @@ kind = "Class" class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -abi = "manifests/release/abis/base/dojo-base.json" +abi = "manifests/release/base/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" diff --git a/examples/spawn-and-move/manifests/release/base/dojo-world.toml b/examples/spawn-and-move/manifests/release/base/dojo-world.toml index cad6228974..7249b9c358 100644 --- a/examples/spawn-and-move/manifests/release/base/dojo-world.toml +++ b/examples/spawn-and-move/manifests/release/base/dojo-world.toml @@ -1,6 +1,6 @@ kind = "Class" class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -abi = "manifests/release/abis/base/dojo-world.json" +abi = "manifests/release/base/abis/dojo-world.json" tag = "dojo-world" manifest_name = "dojo-world" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml index 9e7ac1b5fa..ef09f4f8da 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" original_class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" -abi = "manifests/release/abis/base/models/dojo_examples-ContractInitialized-376b7bd6.json" +abi = "manifests/release/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json" tag = "dojo_examples-ContractInitialized" manifest_name = "dojo_examples-ContractInitialized-376b7bd6" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml index 415899e171..fdb190ac8c 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" original_class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" -abi = "manifests/release/abis/base/models/dojo_examples-Message-1bb1d226.json" +abi = "manifests/release/base/abis/models/dojo_examples-Message-1bb1d226.json" tag = "dojo_examples-Message" manifest_name = "dojo_examples-Message-1bb1d226" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml index 90d11271ae..71fa47c3e7 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" original_class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" -abi = "manifests/release/abis/base/models/dojo_examples-MockToken-38903c7c.json" +abi = "manifests/release/base/abis/models/dojo_examples-MockToken-38903c7c.json" tag = "dojo_examples-MockToken" manifest_name = "dojo_examples-MockToken-38903c7c" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml index 3dc784d978..4bb3b5cc3f 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" original_class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" -abi = "manifests/release/abis/base/models/dojo_examples-Moved-318ae40d.json" +abi = "manifests/release/base/abis/models/dojo_examples-Moved-318ae40d.json" tag = "dojo_examples-Moved" manifest_name = "dojo_examples-Moved-318ae40d" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml index 50f4c1774f..4eb4aa9f97 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" original_class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" -abi = "manifests/release/abis/base/models/dojo_examples-Moves-2e2accba.json" +abi = "manifests/release/base/abis/models/dojo_examples-Moves-2e2accba.json" tag = "dojo_examples-Moves" manifest_name = "dojo_examples-Moves-2e2accba" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml index 762114119b..4c0855b673 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" original_class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" -abi = "manifests/release/abis/base/models/dojo_examples-PlayerConfig-3adad785.json" +abi = "manifests/release/base/abis/models/dojo_examples-PlayerConfig-3adad785.json" tag = "dojo_examples-PlayerConfig" manifest_name = "dojo_examples-PlayerConfig-3adad785" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml index be845b84a8..0b5a593985 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" original_class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" -abi = "manifests/release/abis/base/models/dojo_examples-Position-1e145e26.json" +abi = "manifests/release/base/abis/models/dojo_examples-Position-1e145e26.json" tag = "dojo_examples-Position" manifest_name = "dojo_examples-Position-1e145e26" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml index b41cbad8c7..19ca33fbe3 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml @@ -1,7 +1,7 @@ kind = "DojoModel" class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" original_class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" -abi = "manifests/release/abis/base/models/dojo_examples-ServerProfile-4caad1e6.json" +abi = "manifests/release/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json" tag = "dojo_examples-ServerProfile" manifest_name = "dojo_examples-ServerProfile-4caad1e6" From 4a46303678aa463965a881505133ce4d126b0570 Mon Sep 17 00:00:00 2001 From: Larko <59736843+Larkooo@users.noreply.github.com> Date: Sun, 7 Jul 2024 22:55:32 -0400 Subject: [PATCH 3/4] refactor(torii-grpc): empty hashed keys in subscription match all entities (#2154) refactor: empty hashed keys in subscription match all entities --- crates/torii/grpc/src/server/subscriptions/entity.rs | 2 +- crates/torii/grpc/src/server/subscriptions/event_message.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/torii/grpc/src/server/subscriptions/entity.rs b/crates/torii/grpc/src/server/subscriptions/entity.rs index 79666a170a..d58c55969e 100644 --- a/crates/torii/grpc/src/server/subscriptions/entity.rs +++ b/crates/torii/grpc/src/server/subscriptions/entity.rs @@ -109,7 +109,7 @@ impl Service { // matches the key pattern of the subscriber. match &sub.keys { Some(EntityKeysClause::HashedKeys(hashed_keys)) => { - if !hashed_keys.contains(&hashed) { + if !hashed_keys.is_empty() && !hashed_keys.contains(&hashed) { continue; } } diff --git a/crates/torii/grpc/src/server/subscriptions/event_message.rs b/crates/torii/grpc/src/server/subscriptions/event_message.rs index 5e6c249129..9074800dd9 100644 --- a/crates/torii/grpc/src/server/subscriptions/event_message.rs +++ b/crates/torii/grpc/src/server/subscriptions/event_message.rs @@ -108,7 +108,7 @@ impl Service { // matches the key pattern of the subscriber. match &sub.keys { Some(EntityKeysClause::HashedKeys(hashed_keys)) => { - if !hashed_keys.contains(&hashed) { + if !hashed_keys.is_empty() && !hashed_keys.contains(&hashed) { continue; } } From 617fafba19d1f2f7cdc1a135bbcfdc4372db7a9c Mon Sep 17 00:00:00 2001 From: glihm Date: Sun, 7 Jul 2024 21:09:27 -0600 Subject: [PATCH 4/4] feat: bump cairo and scarb to latest nightly (#2152) * bump cairo and scarb to latest nightly * fix: fmt + clippy * fix: fix cairo test and update devcontainer rust version * fix: revert devcontainer to be done in an other PR * ci: update devcontainer * fix: fmt with new toolchain version * fix: remove dedup profiles as fixed in Scarb --- .github/workflows/ci.yml | 18 +- Cargo.lock | 1300 ++++++++--------- Cargo.toml | 48 +- bin/sozo/src/commands/build.rs | 5 +- bin/sozo/src/commands/clean.rs | 6 +- bin/sozo/src/commands/mod.rs | 4 +- crates/dojo-core/Scarb.lock | 4 +- crates/dojo-core/Scarb.toml | 6 +- crates/dojo-core/src/base_test.cairo | 2 +- crates/dojo-core/src/world.cairo | 10 +- crates/dojo-lang/src/compiler_test.rs | 5 +- .../compiler_cairo/Scarb.lock | 4 +- .../contracts/ccf-cairo_v240-8d921297.toml | 4 +- .../contracts/ccf-cairo_v260-465ec7fe.toml | 4 +- .../manifests/dev/base/dojo-base.toml | 4 +- .../manifests/dev/base/dojo-world.toml | 4 +- crates/dojo-lang/src/plugin.rs | 4 + crates/dojo-lang/src/plugin_test_data/print | 19 + crates/dojo-lang/src/plugin_test_data/system | 50 + crates/dojo-lang/src/scarb_internal/mod.rs | 6 +- crates/dojo-lang/src/semantics/test_data/set | 5 + crates/dojo-test-utils/build.rs | 5 +- crates/dojo-test-utils/src/compiler.rs | 5 +- crates/dojo-world/abigen/src/main.rs | 11 +- crates/dojo-world/src/contracts/model_test.rs | 2 +- crates/katana/node-bindings/src/json.rs | 1 + crates/katana/storage/provider/src/error.rs | 4 +- crates/torii/types-test/Scarb.lock | 4 +- crates/torii/types-test/Scarb.toml | 2 +- examples/spawn-and-move/Scarb.lock | 4 +- examples/spawn-and-move/Scarb.toml | 4 +- .../dojo_examples-actions-40b6994c.toml | 4 +- .../dojo_examples-mock_token-31599eb2.toml | 4 +- .../dojo_examples-others-61de2c18.toml | 4 +- .../manifests/dev/base/dojo-base.toml | 4 +- .../manifests/dev/base/dojo-world.toml | 4 +- ...examples-ContractInitialized-376b7bd6.toml | 4 +- .../dojo_examples-Message-1bb1d226.toml | 4 +- .../dojo_examples-MockToken-38903c7c.toml | 4 +- .../models/dojo_examples-Moved-318ae40d.toml | 4 +- .../models/dojo_examples-Moves-2e2accba.toml | 4 +- .../dojo_examples-PlayerConfig-3adad785.toml | 4 +- .../dojo_examples-Position-1e145e26.toml | 4 +- .../dojo_examples-ServerProfile-4caad1e6.toml | 4 +- .../manifests/dev/deployment/manifest.json | 68 +- .../manifests/dev/deployment/manifest.toml | 68 +- .../dojo_examples-actions-40b6994c.toml | 4 +- .../dojo_examples-mock_token-31599eb2.toml | 4 +- .../dojo_examples-others-61de2c18.toml | 4 +- .../manifests/release/base/dojo-base.toml | 4 +- .../manifests/release/base/dojo-world.toml | 4 +- ...examples-ContractInitialized-376b7bd6.toml | 4 +- .../dojo_examples-Message-1bb1d226.toml | 4 +- .../dojo_examples-MockToken-38903c7c.toml | 4 +- .../models/dojo_examples-Moved-318ae40d.toml | 4 +- .../models/dojo_examples-Moves-2e2accba.toml | 4 +- .../dojo_examples-PlayerConfig-3adad785.toml | 4 +- .../dojo_examples-Position-1e145e26.toml | 4 +- .../dojo_examples-ServerProfile-4caad1e6.toml | 4 +- rust-toolchain.toml | 2 +- 60 files changed, 937 insertions(+), 859 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcb238f9c1..6b0c327595 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: env: CARGO_TERM_COLOR: always - RUST_VERSION: 1.76.0 + RUST_VERSION: 1.79.0 jobs: build: @@ -31,7 +31,7 @@ jobs: needs: ensure-docker runs-on: ubuntu-latest-32-cores container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -54,7 +54,7 @@ jobs: ensure-wasm: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -114,7 +114,7 @@ jobs: needs: build runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/download-artifact@v4 with: @@ -129,7 +129,7 @@ jobs: needs: build runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/download-artifact@v4 with: @@ -143,7 +143,7 @@ jobs: dojo-world-bindings-check: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -152,7 +152,7 @@ jobs: clippy: runs-on: ubuntu-latest-4-cores container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -161,7 +161,7 @@ jobs: fmt: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 @@ -170,7 +170,7 @@ jobs: docs: runs-on: ubuntu-latest container: - image: ghcr.io/dojoengine/dojo-dev:v0.7.2 + image: ghcr.io/dojoengine/dojo-dev:ff30e1d steps: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 diff --git a/Cargo.lock b/Cargo.lock index e0fe4a86b6..f12cc5c211 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ dependencies = [ "async-trait", "base64 0.21.7", "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?rev=e67d925)", - "cairo-lang-starknet 2.6.4", + "cairo-lang-starknet 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "coset", "ecdsa", "futures", @@ -1860,10 +1860,10 @@ dependencies = [ "ark-secp256r1", "cached", "cairo-felt", - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-runner 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-casm 2.6.3", + "cairo-lang-runner 2.6.3", + "cairo-lang-starknet-classes 2.6.3", + "cairo-lang-utils 2.6.3", "cairo-vm 0.9.2", "derive_more", "indexmap 2.2.6", @@ -2268,7 +2268,7 @@ name = "cairo-lang-casm" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-utils 2.6.3", "indoc 2.0.5", "num-bigint", "num-traits 0.2.19", @@ -2278,10 +2278,11 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6296d5748288d9fb97175d31aff9f68ea3f602456923895e512b078e9a2210a0" dependencies = [ - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "indoc 2.0.5", "num-bigint", "num-traits 0.2.19", @@ -2292,10 +2293,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6296d5748288d9fb97175d31aff9f68ea3f602456923895e512b078e9a2210a0" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-utils 2.6.4", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "indoc 2.0.5", "num-bigint", "num-traits 0.2.19", @@ -2309,17 +2309,17 @@ version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ "anyhow", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-defs 2.6.3", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-lowering 2.6.3", + "cairo-lang-parser 2.6.3", + "cairo-lang-project 2.6.3", + "cairo-lang-semantic 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-sierra-generator 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-utils 2.6.3", "salsa", "smol_str", "thiserror", @@ -2327,22 +2327,22 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7be5083c3328dad2248a94f0a24b3520c588e7d3bd5891770e4c91d3facade3" dependencies = [ "anyhow", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "indoc 2.0.5", + "cairo-lang-defs 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-lowering 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-parser 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-project 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-semantic 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-generator 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "salsa", "smol_str", "thiserror", @@ -2351,21 +2351,21 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7be5083c3328dad2248a94f0a24b3520c588e7d3bd5891770e4c91d3facade3" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "anyhow", - "cairo-lang-defs 2.6.4", - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-lowering 2.6.4", - "cairo-lang-parser 2.6.4", - "cairo-lang-project 2.6.4", - "cairo-lang-semantic 2.6.4", - "cairo-lang-sierra 2.6.4", - "cairo-lang-sierra-generator 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-lowering 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-project 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-generator 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "indoc 2.0.5", "salsa", "smol_str", "thiserror", @@ -2376,24 +2376,24 @@ name = "cairo-lang-debug" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-utils 2.6.3", ] [[package]] name = "cairo-lang-debug" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a3cbf67fd766cb7ed48b72e6abf7041857518c9b9fd42475a60c138671c6603" dependencies = [ - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cairo-lang-debug" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a3cbf67fd766cb7ed48b72e6abf7041857518c9b9fd42475a60c138671c6603" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-utils 2.6.4", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", ] [[package]] @@ -2401,12 +2401,12 @@ name = "cairo-lang-defs" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-parser 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-utils 2.6.3", "itertools 0.11.0", "salsa", "smol_str", @@ -2414,16 +2414,17 @@ dependencies = [ [[package]] name = "cairo-lang-defs" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" -dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "itertools 0.12.1", +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b284e41dfc158dfbdc02612dbfdb27a55547d23063bdc53105eeec41d8df006" +dependencies = [ + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-parser 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.11.0", "salsa", "smol_str", ] @@ -2431,16 +2432,15 @@ dependencies = [ [[package]] name = "cairo-lang-defs" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b284e41dfc158dfbdc02612dbfdb27a55547d23063bdc53105eeec41d8df006" -dependencies = [ - "cairo-lang-debug 2.6.4", - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-parser 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-utils 2.6.4", - "itertools 0.11.0", +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" +dependencies = [ + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "itertools 0.12.1", "salsa", "smol_str", ] @@ -2450,33 +2450,47 @@ name = "cairo-lang-diagnostics" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-utils 2.6.3", "itertools 0.11.0", ] [[package]] name = "cairo-lang-diagnostics" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6314b24901af8be75cd0e1363e3ff1a8020066372501f4cfc9161726b06ec2a" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "itertools 0.12.1", + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.11.0", ] [[package]] name = "cairo-lang-diagnostics" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6314b24901af8be75cd0e1363e3ff1a8020066372501f4cfc9161726b06ec2a" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-debug 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-utils 2.6.4", - "itertools 0.11.0", + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "itertools 0.12.1", +] + +[[package]] +name = "cairo-lang-doc" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" +dependencies = [ + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-formatter", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "itertools 0.12.1", + "salsa", ] [[package]] @@ -2484,26 +2498,26 @@ name = "cairo-lang-eq-solver" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-utils 2.6.3", "good_lp", ] [[package]] name = "cairo-lang-eq-solver" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f95f5c8f7ea75580d164b5304251022e3d47f43fc1c778a01381b55ca9f268c" dependencies = [ - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "good_lp", ] [[package]] name = "cairo-lang-eq-solver" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f95f5c8f7ea75580d164b5304251022e3d47f43fc1c778a01381b55ca9f268c" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-utils 2.6.4", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "good_lp", ] @@ -2512,8 +2526,8 @@ name = "cairo-lang-filesystem" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", + "cairo-lang-utils 2.6.3", "path-clean", "salsa", "serde", @@ -2522,11 +2536,12 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e58b80f0b413ef1320358fde1a0877fc3fbf740f5cead0de3e947a1bc3bfd4" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "path-clean", "salsa", "serde", @@ -2536,11 +2551,10 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e58b80f0b413ef1320358fde1a0877fc3fbf740f5cead0de3e947a1bc3bfd4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-debug 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "path-clean", "salsa", "serde", @@ -2549,15 +2563,15 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "anyhow", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "diffy", "ignore", "itertools 0.12.1", @@ -2569,27 +2583,30 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "anyhow", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-doc", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-formatter", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-lowering 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-project 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-test-plugin", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "itertools 0.12.1", "salsa", "scarb-metadata 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_json", + "smol_str", "tokio", "tower-lsp", "tracing", @@ -2602,15 +2619,15 @@ name = "cairo-lang-lowering" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-proc-macros 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", + "cairo-lang-defs 2.6.3", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-parser 2.6.3", + "cairo-lang-proc-macros 2.6.3", + "cairo-lang-semantic 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-utils 2.6.3", "id-arena", "itertools 0.11.0", "log", @@ -2623,20 +2640,21 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" -dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-proc-macros 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe6d604a06ea96c05b3666f2e8fac63cb8709e13667de272912f81db004a16b" +dependencies = [ + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-defs 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-parser 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-proc-macros 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-semantic 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "id-arena", - "itertools 0.12.1", + "itertools 0.11.0", "log", "num-bigint", "num-traits 0.2.19", @@ -2648,20 +2666,19 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe6d604a06ea96c05b3666f2e8fac63cb8709e13667de272912f81db004a16b" -dependencies = [ - "cairo-lang-debug 2.6.4", - "cairo-lang-defs 2.6.4", - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-parser 2.6.4", - "cairo-lang-proc-macros 2.6.4", - "cairo-lang-semantic 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-utils 2.6.4", +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" +dependencies = [ + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-proc-macros 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "id-arena", - "itertools 0.11.0", + "itertools 0.12.1", "log", "num-bigint", "num-traits 0.2.19", @@ -2673,7 +2690,7 @@ dependencies = [ [[package]] name = "cairo-lang-macro" version = "0.0.1" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "cairo-lang-macro-attributes", "cairo-lang-macro-stable", @@ -2683,7 +2700,7 @@ dependencies = [ [[package]] name = "cairo-lang-macro-attributes" version = "0.0.1" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "quote", "scarb-stable-hash", @@ -2693,18 +2710,18 @@ dependencies = [ [[package]] name = "cairo-lang-macro-stable" version = "1.0.0" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" [[package]] name = "cairo-lang-parser" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax-codegen 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-syntax-codegen 2.6.3", + "cairo-lang-utils 2.6.3", "colored", "itertools 0.11.0", "num-bigint", @@ -2716,16 +2733,17 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf1c279de47a77422f81b8a98023cd523cf0ae79f7153d60c4cf8b62b8ece2f" dependencies = [ - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax-codegen 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax-codegen 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "colored", - "itertools 0.12.1", + "itertools 0.11.0", "num-bigint", "num-traits 0.2.19", "salsa", @@ -2736,16 +2754,15 @@ dependencies = [ [[package]] name = "cairo-lang-parser" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf1c279de47a77422f81b8a98023cd523cf0ae79f7153d60c4cf8b62b8ece2f" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-syntax-codegen 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax-codegen 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "colored", - "itertools 0.11.0", + "itertools 0.12.1", "num-bigint", "num-traits 0.2.19", "salsa", @@ -2758,12 +2775,12 @@ name = "cairo-lang-plugins" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-defs 2.6.3", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-parser 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-utils 2.6.3", "indent", "indoc 2.0.5", "itertools 0.11.0", @@ -2773,18 +2790,19 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" -dependencies = [ - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1177a07498bdf45cba62f0c727388ff7433072847dbf701c58fa3c3e358154e" +dependencies = [ + "cairo-lang-defs 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-parser 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "indent", "indoc 2.0.5", - "itertools 0.12.1", + "itertools 0.11.0", "salsa", "smol_str", ] @@ -2792,18 +2810,17 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1177a07498bdf45cba62f0c727388ff7433072847dbf701c58fa3c3e358154e" -dependencies = [ - "cairo-lang-defs 2.6.4", - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-parser 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-utils 2.6.4", +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" +dependencies = [ + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "indent", "indoc 2.0.5", - "itertools 0.11.0", + "itertools 0.12.1", "salsa", "smol_str", ] @@ -2813,17 +2830,18 @@ name = "cairo-lang-proc-macros" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", "quote", "syn 2.0.68", ] [[package]] name = "cairo-lang-proc-macros" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c90d812ec983c5a8e3173aca3fc55036b9739201c89f30271ee14a4c1189379" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "quote", "syn 2.0.68", ] @@ -2831,10 +2849,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c90d812ec983c5a8e3173aca3fc55036b9739201c89f30271ee14a4c1189379" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-debug 2.6.4", + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "quote", "syn 2.0.68", ] @@ -2844,8 +2861,8 @@ name = "cairo-lang-project" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-utils 2.6.3", "serde", "smol_str", "thiserror", @@ -2854,11 +2871,12 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3985495d7e9dc481e97135d7139cfa098024351fb51d5feef8366b5fbc104807" dependencies = [ - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "smol_str", "thiserror", @@ -2868,11 +2886,10 @@ dependencies = [ [[package]] name = "cairo-lang-project" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3985495d7e9dc481e97135d7139cfa098024351fb51d5feef8366b5fbc104807" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-filesystem 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "serde", "smol_str", "thiserror", @@ -2889,15 +2906,15 @@ dependencies = [ "ark-secp256r1", "ark-std 0.4.0", "cairo-felt", - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-ap-change 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-casm 2.6.3", + "cairo-lang-lowering 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-sierra-ap-change 2.6.3", + "cairo-lang-sierra-generator 2.6.3", + "cairo-lang-sierra-to-casm 2.6.3", + "cairo-lang-sierra-type-size 2.6.3", + "cairo-lang-starknet 2.6.3", + "cairo-lang-utils 2.6.3", "cairo-vm 0.9.2", "itertools 0.11.0", "keccak", @@ -2911,21 +2928,21 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "ark-ff 0.4.2", "ark-secp256k1", "ark-secp256r1", - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-ap-change 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-lowering 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-ap-change 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-generator 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-to-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-type-size 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-vm 1.0.0-rc3", "itertools 0.12.1", "keccak", @@ -2935,7 +2952,6 @@ dependencies = [ "rand", "sha2 0.10.8", "smol_str", - "starknet-crypto 0.6.2", "starknet-types-core", "thiserror", ] @@ -2945,15 +2961,15 @@ name = "cairo-lang-semantic" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-plugins 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-proc-macros 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", + "cairo-lang-defs 2.6.3", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-parser 2.6.3", + "cairo-lang-plugins 2.6.3", + "cairo-lang-proc-macros 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-utils 2.6.3", "id-arena", "indoc 2.0.5", "itertools 0.11.0", @@ -2966,53 +2982,53 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" -dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-plugins 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-proc-macros 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-test-utils", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5cfadbb9ca3479a6b5c02c0a125a5747835ba57a2de9c4e9764f42d85abe059" +dependencies = [ + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-defs 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-parser 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-plugins 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-proc-macros 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "id-arena", "indoc 2.0.5", - "itertools 0.12.1", + "itertools 0.11.0", "num-bigint", "num-traits 0.2.19", "once_cell", "salsa", "smol_str", - "toml 0.8.14", ] [[package]] name = "cairo-lang-semantic" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5cfadbb9ca3479a6b5c02c0a125a5747835ba57a2de9c4e9764f42d85abe059" -dependencies = [ - "cairo-lang-debug 2.6.4", - "cairo-lang-defs 2.6.4", - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-parser 2.6.4", - "cairo-lang-plugins 2.6.4", - "cairo-lang-proc-macros 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-utils 2.6.4", +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" +dependencies = [ + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-plugins 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-proc-macros 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-test-utils", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "id-arena", "indoc 2.0.5", - "itertools 0.11.0", + "itertools 0.12.1", "num-bigint", "num-traits 0.2.19", "once_cell", "salsa", "smol_str", + "toml 0.8.14", ] [[package]] @@ -3022,7 +3038,7 @@ source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd dependencies = [ "anyhow", "cairo-felt", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-utils 2.6.3", "const-fnv1a-hash", "convert_case 0.6.0", "derivative", @@ -3042,15 +3058,17 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74a57492267a5a8891866b6e48cdefa508b5f05931a5f8eaf004b9de15b1ffd6" dependencies = [ "anyhow", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-felt", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "const-fnv1a-hash", "convert_case 0.6.0", "derivative", - "itertools 0.12.1", + "itertools 0.11.0", "lalrpop", "lalrpop-util", "num-bigint", @@ -3061,33 +3079,33 @@ dependencies = [ "serde_json", "sha3", "smol_str", - "starknet-types-core", "thiserror", ] [[package]] name = "cairo-lang-sierra" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a57492267a5a8891866b6e48cdefa508b5f05931a5f8eaf004b9de15b1ffd6" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "anyhow", - "cairo-felt", - "cairo-lang-utils 2.6.4", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "const-fnv1a-hash", "convert_case 0.6.0", "derivative", - "itertools 0.11.0", + "itertools 0.12.1", "lalrpop", "lalrpop-util", "num-bigint", + "num-integer", "num-traits 0.2.19", + "once_cell", "regex", "salsa", "serde", "serde_json", "sha3", "smol_str", + "starknet-types-core", "thiserror", ] @@ -3096,10 +3114,10 @@ name = "cairo-lang-sierra-ap-change" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-eq-solver 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-eq-solver 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-sierra-type-size 2.6.3", + "cairo-lang-utils 2.6.3", "itertools 0.11.0", "num-traits 0.2.19", "thiserror", @@ -3107,15 +3125,15 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fdbb4bd95477123653b9200bd4e9dceae95a914f6fe85b2bed83b223e36fb5a" dependencies = [ - "cairo-lang-eq-solver 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "itertools 0.12.1", - "num-bigint", + "cairo-lang-eq-solver 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-type-size 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.11.0", "num-traits 0.2.19", "thiserror", ] @@ -3123,14 +3141,14 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fdbb4bd95477123653b9200bd4e9dceae95a914f6fe85b2bed83b223e36fb5a" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-eq-solver 2.6.4", - "cairo-lang-sierra 2.6.4", - "cairo-lang-sierra-type-size 2.6.4", - "cairo-lang-utils 2.6.4", - "itertools 0.11.0", + "cairo-lang-eq-solver 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-type-size 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "itertools 0.12.1", + "num-bigint", "num-traits 0.2.19", "thiserror", ] @@ -3140,10 +3158,10 @@ name = "cairo-lang-sierra-gas" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-eq-solver 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-eq-solver 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-sierra-type-size 2.6.3", + "cairo-lang-utils 2.6.3", "itertools 0.11.0", "num-traits 0.2.19", "thiserror", @@ -3151,15 +3169,15 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882cb178f1b79aabf70acce1d87b08d569d8a4b0ce8b1d8f538a02cdb36789db" dependencies = [ - "cairo-lang-eq-solver 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "itertools 0.12.1", - "num-bigint", + "cairo-lang-eq-solver 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-type-size 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.11.0", "num-traits 0.2.19", "thiserror", ] @@ -3167,14 +3185,14 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882cb178f1b79aabf70acce1d87b08d569d8a4b0ce8b1d8f538a02cdb36789db" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-eq-solver 2.6.4", - "cairo-lang-sierra 2.6.4", - "cairo-lang-sierra-type-size 2.6.4", - "cairo-lang-utils 2.6.4", - "itertools 0.11.0", + "cairo-lang-eq-solver 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-type-size 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "itertools 0.12.1", + "num-bigint", "num-traits 0.2.19", "thiserror", ] @@ -3184,16 +3202,16 @@ name = "cairo-lang-sierra-generator" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", + "cairo-lang-defs 2.6.3", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-lowering 2.6.3", + "cairo-lang-parser 2.6.3", + "cairo-lang-semantic 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-utils 2.6.3", "itertools 0.11.0", "num-traits 0.2.19", "once_cell", @@ -3203,48 +3221,48 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" -dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "itertools 0.12.1", +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d80c9d29e6d3f4ab60e698ebe2de84dcf90570c3dd1cfa7b01bd5c42470331c" +dependencies = [ + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-defs 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-lowering 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-parser 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-semantic 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.11.0", "num-traits 0.2.19", "once_cell", "salsa", - "serde", - "serde_json", "smol_str", ] [[package]] name = "cairo-lang-sierra-generator" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d80c9d29e6d3f4ab60e698ebe2de84dcf90570c3dd1cfa7b01bd5c42470331c" -dependencies = [ - "cairo-lang-debug 2.6.4", - "cairo-lang-defs 2.6.4", - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-lowering 2.6.4", - "cairo-lang-parser 2.6.4", - "cairo-lang-semantic 2.6.4", - "cairo-lang-sierra 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-utils 2.6.4", - "itertools 0.11.0", +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" +dependencies = [ + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-lowering 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "itertools 0.12.1", "num-traits 0.2.19", "once_cell", "salsa", + "serde", + "serde_json", "smol_str", ] @@ -3255,12 +3273,12 @@ source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd dependencies = [ "assert_matches", "cairo-felt", - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-ap-change 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-gas 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-casm 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-sierra-ap-change 2.6.3", + "cairo-lang-sierra-gas 2.6.3", + "cairo-lang-sierra-type-size 2.6.3", + "cairo-lang-utils 2.6.3", "indoc 2.0.5", "itertools 0.11.0", "num-bigint", @@ -3270,42 +3288,42 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ac02c90be2630ae861db6af226090da92741020519768332dd2c07e24d94c75" dependencies = [ "assert_matches", - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-ap-change 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-gas 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-type-size 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-felt", + "cairo-lang-casm 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-ap-change 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-gas 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-type-size 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "indoc 2.0.5", - "itertools 0.12.1", + "itertools 0.11.0", "num-bigint", "num-traits 0.2.19", - "starknet-types-core", "thiserror", ] [[package]] name = "cairo-lang-sierra-to-casm" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac02c90be2630ae861db6af226090da92741020519768332dd2c07e24d94c75" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "assert_matches", - "cairo-felt", - "cairo-lang-casm 2.6.4", - "cairo-lang-sierra 2.6.4", - "cairo-lang-sierra-ap-change 2.6.4", - "cairo-lang-sierra-gas 2.6.4", - "cairo-lang-sierra-type-size 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-ap-change 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-gas 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-type-size 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "indoc 2.0.5", - "itertools 0.11.0", + "itertools 0.12.1", "num-bigint", "num-traits 0.2.19", + "starknet-types-core", "thiserror", ] @@ -3314,27 +3332,27 @@ name = "cairo-lang-sierra-type-size" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-sierra 2.6.3", + "cairo-lang-utils 2.6.3", ] [[package]] name = "cairo-lang-sierra-type-size" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d102b10989f9637b1c916dd950cbd1bd8bb1b6a7aaa1a3035390be0683b92d85" dependencies = [ - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cairo-lang-sierra-type-size" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d102b10989f9637b1c916dd950cbd1bd8bb1b6a7aaa1a3035390be0683b92d85" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-sierra 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", ] [[package]] @@ -3344,18 +3362,18 @@ source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd dependencies = [ "anyhow", "cairo-felt", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-plugins 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-compiler 2.6.3", + "cairo-lang-defs 2.6.3", + "cairo-lang-diagnostics 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-lowering 2.6.3", + "cairo-lang-plugins 2.6.3", + "cairo-lang-semantic 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-sierra-generator 2.6.3", + "cairo-lang-starknet-classes 2.6.3", + "cairo-lang-syntax 2.6.3", + "cairo-lang-utils 2.6.3", "const_format", "indent", "indoc 2.0.5", @@ -3369,62 +3387,62 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27921a2bf82d191d28afd570b913341080c8fc25c83bf870dbf1252570b1b41" dependencies = [ "anyhow", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-plugins 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-felt", + "cairo-lang-compiler 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-defs 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-diagnostics 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-lowering 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-plugins 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-semantic 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-generator 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-starknet-classes 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-syntax 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "const_format", "indent", "indoc 2.0.5", - "itertools 0.12.1", + "itertools 0.11.0", "once_cell", "serde", "serde_json", "smol_str", - "starknet-types-core", "thiserror", ] [[package]] name = "cairo-lang-starknet" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27921a2bf82d191d28afd570b913341080c8fc25c83bf870dbf1252570b1b41" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "anyhow", - "cairo-felt", - "cairo-lang-compiler 2.6.4", - "cairo-lang-defs 2.6.4", - "cairo-lang-diagnostics 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-lowering 2.6.4", - "cairo-lang-plugins 2.6.4", - "cairo-lang-semantic 2.6.4", - "cairo-lang-sierra 2.6.4", - "cairo-lang-sierra-generator 2.6.4", - "cairo-lang-starknet-classes 2.6.4", - "cairo-lang-syntax 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-lowering 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-plugins 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-generator 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "const_format", "indent", "indoc 2.0.5", - "itertools 0.11.0", + "itertools 0.12.1", "once_cell", "serde", "serde_json", "smol_str", + "starknet-types-core", "thiserror", ] @@ -3434,10 +3452,10 @@ version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ "cairo-felt", - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-casm 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-sierra-to-casm 2.6.3", + "cairo-lang-utils 2.6.3", "convert_case 0.6.0", "itertools 0.11.0", "num-bigint", @@ -3454,15 +3472,17 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8623b076ef3569e4262da5da270a84658b1ff242fe0c9624fbe432e7a937d101" dependencies = [ - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-felt", + "cairo-lang-casm 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-sierra-to-casm 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "convert_case 0.6.0", - "itertools 0.12.1", + "itertools 0.11.0", "num-bigint", "num-integer", "num-traits 0.2.19", @@ -3472,23 +3492,20 @@ dependencies = [ "sha3", "smol_str", "starknet-crypto 0.6.2", - "starknet-types-core", "thiserror", ] [[package]] name = "cairo-lang-starknet-classes" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8623b076ef3569e4262da5da270a84658b1ff242fe0c9624fbe432e7a937d101" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-felt", - "cairo-lang-casm 2.6.4", - "cairo-lang-sierra 2.6.4", - "cairo-lang-sierra-to-casm 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-to-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "convert_case 0.6.0", - "itertools 0.11.0", + "itertools 0.12.1", "num-bigint", "num-integer", "num-traits 0.2.19", @@ -3497,7 +3514,7 @@ dependencies = [ "serde_json", "sha3", "smol_str", - "starknet-crypto 0.6.2", + "starknet-types-core", "thiserror", ] @@ -3506,9 +3523,9 @@ name = "cairo-lang-syntax" version = "2.6.3" source = "git+https://github.com/starkware-libs/cairo?tag=v2.6.3#2203a47f8a098cd4718d03bd109ca014049419e7" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-debug 2.6.3", + "cairo-lang-filesystem 2.6.3", + "cairo-lang-utils 2.6.3", "num-bigint", "num-traits 0.2.19", "salsa", @@ -3518,12 +3535,13 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c62f5bd74e249636e7c48d8b95e6cc0ee991206d4a6cbe5c2624184a828e70b" dependencies = [ - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-debug 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-filesystem 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-lang-utils 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint", "num-traits 0.2.19", "salsa", @@ -3534,12 +3552,11 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c62f5bd74e249636e7c48d8b95e6cc0ee991206d4a6cbe5c2624184a828e70b" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ - "cairo-lang-debug 2.6.4", - "cairo-lang-filesystem 2.6.4", - "cairo-lang-utils 2.6.4", + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "num-bigint", "num-traits 0.2.19", "salsa", @@ -3558,8 +3575,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a744747e9ab03b65480265304490f3e29d99e4cb297e39d0e6fdb047c1bc86a7" dependencies = [ "genco", "xshell", @@ -3568,8 +3586,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a744747e9ab03b65480265304490f3e29d99e4cb297e39d0e6fdb047c1bc86a7" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "genco", "xshell", @@ -3577,23 +3594,23 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "anyhow", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-lowering 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-generator 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "indoc 2.0.5", "itertools 0.12.1", "num-bigint", @@ -3604,19 +3621,19 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "anyhow", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-runner 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-runner 2.6.4", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-generator 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-to-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-test-plugin", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "colored", "itertools 0.12.1", "num-traits 0.2.19", @@ -3626,11 +3643,11 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ "cairo-lang-formatter", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "colored", "log", "pretty_assertions", @@ -3653,34 +3670,34 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632#d9984ef58e2f704909e271f2f01327f520ded632" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6f98e8769412907ceb106c21c70907cc0c87ca0a2a44c82b6229a695a6f9b48" dependencies = [ - "env_logger 0.11.3", "hashbrown 0.14.5", "indexmap 2.2.6", - "itertools 0.12.1", - "log", + "itertools 0.11.0", "num-bigint", "num-traits 0.2.19", "schemars", "serde", - "time", ] [[package]] name = "cairo-lang-utils" version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f98e8769412907ceb106c21c70907cc0c87ca0a2a44c82b6229a695a6f9b48" +source = "git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c#43cf361d9b6b26ec8cd5ee076dd15341bde7577c" dependencies = [ + "env_logger 0.11.3", "hashbrown 0.14.5", "indexmap 2.2.6", - "itertools 0.11.0", + "itertools 0.12.1", + "log", "num-bigint", "num-traits 0.2.19", "schemars", "serde", + "time", ] [[package]] @@ -4456,7 +4473,7 @@ dependencies = [ [[package]] name = "create-output-dir" version = "1.0.0" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "anyhow", "core-foundation", @@ -4867,16 +4884,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro 0.12.0", -] - -[[package]] -name = "derive_builder" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" -dependencies = [ - "derive_builder_macro 0.20.0", + "derive_builder_macro", ] [[package]] @@ -4891,38 +4899,16 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_core" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" -dependencies = [ - "darling 0.20.9", - "proc-macro2", - "quote", - "syn 2.0.68", -] - [[package]] name = "derive_builder_macro" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core 0.12.0", + "derive_builder_core", "syn 1.0.109", ] -[[package]] -name = "derive_builder_macro" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" -dependencies = [ - "derive_builder_core 0.20.0", - "syn 2.0.68", -] - [[package]] name = "derive_more" version = "0.99.18" @@ -5098,24 +5084,24 @@ version = "1.0.0-alpha.0" dependencies = [ "anyhow", "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-debug 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-debug 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-formatter", - "cairo-lang-lowering 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-parser 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-plugins 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-generator 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-lowering 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-plugins 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-project 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-generator 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-test-plugin", "cairo-lang-test-utils", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "camino", "convert_case 0.6.0", "directories", @@ -5180,10 +5166,10 @@ dependencies = [ "anyhow", "assert_fs", "async-trait", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-project 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "camino", "dojo-lang", "dojo-world", @@ -5234,10 +5220,10 @@ dependencies = [ "assert_matches", "async-trait", "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-project 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "camino", "convert_case 0.6.0", "dojo-lang", @@ -5270,8 +5256,8 @@ dependencies = [ name = "dojo-world-abigen" version = "1.0.0-alpha.0" dependencies = [ - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "camino", "scarb", "scarb-ui", @@ -8417,12 +8403,12 @@ dependencies = [ name = "katana-cairo" version = "1.0.0-alpha.0" dependencies = [ - "cairo-lang-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-runner 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?tag=v2.6.3)", + "cairo-lang-casm 2.6.3", + "cairo-lang-runner 2.6.3", + "cairo-lang-sierra 2.6.3", + "cairo-lang-starknet 2.6.3", + "cairo-lang-starknet-classes 2.6.3", + "cairo-lang-utils 2.6.3", "cairo-vm 0.9.2", ] @@ -8495,7 +8481,7 @@ name = "katana-db" version = "1.0.0-alpha.0" dependencies = [ "anyhow", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-vm 0.9.2", "criterion", "katana-primitives", @@ -8612,8 +8598,8 @@ dependencies = [ "anyhow", "assert_matches", "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "dojo-metrics", "dojo-test-utils", "dojo-world", @@ -11527,6 +11513,16 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "ra_ap_toolchain" +version = "0.0.218" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53393fc4d85057bcca4dd2d7fa24929a094bb94712980814695f56cb9aa0b1e2" +dependencies = [ + "camino", + "home", +] + [[package]] name = "radium" version = "0.7.0" @@ -12522,38 +12518,41 @@ dependencies = [ [[package]] name = "scarb" -version = "2.6.3" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +version = "2.6.4" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "anyhow", "async-trait", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-diagnostics 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-diagnostics 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-formatter", "cairo-lang-macro", "cairo-lang-macro-stable", - "cairo-lang-semantic 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-syntax 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-parser 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-semantic 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-to-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-syntax 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-test-plugin", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "camino", "clap", + "convert_case 0.6.0", "create-output-dir", "data-encoding", "deno_task_shell", - "derive_builder 0.20.0", + "derive_builder", "directories", "dunce", "fs4", "fs_extra", "futures", "gix", + "gix-path", "glob", "ignore", "include_dir", @@ -12563,10 +12562,11 @@ dependencies = [ "once_cell", "pathdiff", "petgraph", + "ra_ap_toolchain", "redb", "reqwest 0.11.27", "scarb-build-metadata", - "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43)", + "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79)", "scarb-stable-hash", "scarb-ui", "semver 1.0.23", @@ -12596,8 +12596,8 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.6.3" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +version = "2.6.4" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "cargo_metadata", ] @@ -12618,10 +12618,10 @@ dependencies = [ [[package]] name = "scarb-metadata" version = "1.12.0" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "camino", - "derive_builder 0.20.0", + "derive_builder", "semver 1.0.23", "serde", "serde_json", @@ -12631,7 +12631,7 @@ dependencies = [ [[package]] name = "scarb-stable-hash" version = "1.0.0" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "data-encoding", "xxhash-rust", @@ -12640,14 +12640,14 @@ dependencies = [ [[package]] name = "scarb-ui" version = "0.1.5" -source = "git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43#f1aa7b09507a84d209d83b2fa80472c82605cc43" +source = "git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79#4b75f435f68248a7c096ec0fa5939ecdd92e2d79" dependencies = [ "anyhow", "camino", "clap", "console", "indicatif", - "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?rev=f1aa7b09507a84d209d83b2fa80472c82605cc43)", + "scarb-metadata 1.12.0 (git+https://github.com/software-mansion/scarb?rev=4b75f435f68248a7c096ec0fa5939ecdd92e2d79)", "serde", "serde_json", "tracing-core", @@ -13353,17 +13353,17 @@ dependencies = [ "async-trait", "bigdecimal 0.4.5", "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-plugins 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-plugins 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-project 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-to-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-test-plugin", "cairo-lang-test-runner", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "camino", "clap", "clap-verbosity-flag", @@ -13413,17 +13413,17 @@ dependencies = [ "async-trait", "bigdecimal 0.4.5", "cainome 0.2.3 (git+https://github.com/cartridge-gg/cainome?tag=v0.3.0)", - "cairo-lang-compiler 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-defs 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-filesystem 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-plugins 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-project 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-sierra-to-casm 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", - "cairo-lang-starknet-classes 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-compiler 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-defs 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-filesystem 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-plugins 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-project 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-sierra-to-casm 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", + "cairo-lang-starknet-classes 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "cairo-lang-test-plugin", - "cairo-lang-utils 2.6.3 (git+https://github.com/starkware-libs/cairo?rev=d9984ef58e2f704909e271f2f01327f520ded632)", + "cairo-lang-utils 2.6.4 (git+https://github.com/starkware-libs/cairo?rev=43cf361d9b6b26ec8cd5ee076dd15341bde7577c)", "camino", "clap", "colored", @@ -14124,7 +14124,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "365ec5c0662466f299762bd012012da30e9a28319000cfade372b8787111f202" dependencies = [ - "cairo-lang-starknet-classes 2.6.4", + "cairo-lang-starknet-classes 2.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more", "hex", "indexmap 2.2.6", @@ -15941,7 +15941,7 @@ source = "git+https://github.com/cartridge-gg/wasm-webauthn?rev=972693f#972693fd dependencies = [ "ciborium", "coset", - "derive_builder 0.12.0", + "derive_builder", "js-sys", "serde", "serde-wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 0af6014b06..051997f1ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -115,28 +115,28 @@ auto_impl = "1.2.0" base64 = "0.21.2" bigdecimal = "0.4.1" bytes = "1.6" -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-plugins = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632", features = [ "testing" ] } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632", features = [ "testing" ] } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "d9984ef58e2f704909e271f2f01327f520ded632" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-plugins = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c", features = [ "testing" ] } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c", features = [ "testing" ] } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" } cairo-proof-parser = { git = "https://github.com/cartridge-gg/cairo-proof-parser", branch = "v0.3.0/new-felt" } cairo-vm = "0.9.2" camino = { version = "1.1.2", features = [ "serde1" ] } @@ -172,8 +172,8 @@ rpassword = "7.2.0" rstest = "0.18.2" rstest_reuse = "0.6.0" salsa = "0.16.1" -scarb = { git = "https://github.com/software-mansion/scarb", rev = "f1aa7b09507a84d209d83b2fa80472c82605cc43" } -scarb-ui = { git = "https://github.com/software-mansion/scarb", rev = "f1aa7b09507a84d209d83b2fa80472c82605cc43" } +scarb = { git = "https://github.com/software-mansion/scarb", rev = "4b75f435f68248a7c096ec0fa5939ecdd92e2d79" } +scarb-ui = { git = "https://github.com/software-mansion/scarb", rev = "4b75f435f68248a7c096ec0fa5939ecdd92e2d79" } semver = "1.0.5" serde = { version = "1.0", features = [ "derive" ] } serde_json = { version = "1.0", features = [ "arbitrary_precision" ] } diff --git a/bin/sozo/src/commands/build.rs b/bin/sozo/src/commands/build.rs index 8a21ef14dd..1f2d4598a3 100644 --- a/bin/sozo/src/commands/build.rs +++ b/bin/sozo/src/commands/build.rs @@ -78,8 +78,9 @@ impl BuildArgs { let compile_info = compile_workspace( config, CompileOpts { - include_targets: vec![], - exclude_targets: vec![TargetKind::TEST], + include_target_names: vec![], + include_target_kinds: vec![], + exclude_target_kinds: vec![TargetKind::TEST], features: features_opts, }, )?; diff --git a/bin/sozo/src/commands/clean.rs b/bin/sozo/src/commands/clean.rs index 59a76f15c1..79af666bdd 100644 --- a/bin/sozo/src/commands/clean.rs +++ b/bin/sozo/src/commands/clean.rs @@ -45,11 +45,7 @@ impl CleanArgs { trace!(ws=?ws, "Workspace read successfully."); let profile_names = if self.all_profiles { - let mut profiles = ws.profile_names().expect("given method never returns an error"); - // currently scarb can return duplicate profiles and since the vector is sorted we can - // remove duplicates by calling dedup - profiles.dedup(); - profiles + ws.profile_names() } else { vec![ ws.current_profile().expect("Scarb profile is expected at this point.").to_string(), diff --git a/bin/sozo/src/commands/mod.rs b/bin/sozo/src/commands/mod.rs index 158fd8bfed..788d0b8fe2 100644 --- a/bin/sozo/src/commands/mod.rs +++ b/bin/sozo/src/commands/mod.rs @@ -53,8 +53,8 @@ pub enum Commands { Init(InitArgs), #[command(about = "Remove generated artifacts, manifests and abis")] Clean(CleanArgs), - #[command(about = "Run a migration, declaring and deploying contracts as necessary to \ - update the world")] + #[command(about = "Run a migration, declaring and deploying contracts as necessary to update \ + the world")] Migrate(Box), #[command(about = "Developer mode: watcher for building and migration")] Dev(DevArgs), diff --git a/crates/dojo-core/Scarb.lock b/crates/dojo-core/Scarb.lock index 7ce0b7bfe8..d94b531218 100644 --- a/crates/dojo-core/Scarb.lock +++ b/crates/dojo-core/Scarb.lock @@ -10,5 +10,5 @@ dependencies = [ [[package]] name = "dojo_plugin" -version = "0.4.1" -source = "git+https://github.com/dojoengine/dojo?tag=v0.7.2#3da5cad9fdd39b81551e0668015d88262e6c5fc4" +version = "0.7.2" +source = "git+https://github.com/dojoengine/dojo?tag=v0.7.3#e8539d5b199efbd51c89c75da32f6592de5d9262" diff --git a/crates/dojo-core/Scarb.toml b/crates/dojo-core/Scarb.toml index 96ca4ac712..0aa197423e 100644 --- a/crates/dojo-core/Scarb.toml +++ b/crates/dojo-core/Scarb.toml @@ -1,9 +1,9 @@ [package] -cairo-version = "=2.6.3" +cairo-version = "=2.6.4" description = "The Dojo Core library for autonomous worlds." name = "dojo" version = "0.7.3" [dependencies] -dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.2" } -starknet = "=2.6.3" +dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.3" } +starknet = "=2.6.4" diff --git a/crates/dojo-core/src/base_test.cairo b/crates/dojo-core/src/base_test.cairo index 0532c1fa1b..958e893906 100644 --- a/crates/dojo-core/src/base_test.cairo +++ b/crates/dojo-core/src/base_test.cairo @@ -178,7 +178,7 @@ mod invalid_model { fn selector(self: @ContractState) -> felt252 { // NOTE: Need to update this value if address changes // Pre-computed address of a contract deployed through the world. - 0x3f692e9669a95a2ace68e1eec4fdc26594d4b1413d78a62262249d9108c4194 + 0x1130142d6bff3c9cb891a270922a4c6dbf4c222b675cdc1341905b17341e3ab } fn namespace(self: @ContractState) -> ByteArray { diff --git a/crates/dojo-core/src/world.cairo b/crates/dojo-core/src/world.cairo index bfe194ff02..d9decc460a 100644 --- a/crates/dojo-core/src/world.cairo +++ b/crates/dojo-core/src/world.cairo @@ -92,7 +92,7 @@ mod world { contract_address_const, get_caller_address, get_contract_address, get_tx_info, contract_address::ContractAddressIntoFelt252, ClassHash, Zeroable, ContractAddress, syscalls::{deploy_syscall, emit_event_syscall, replace_class_syscall}, SyscallResult, - SyscallResultTrait, SyscallResultTraitImpl + SyscallResultTrait, SyscallResultTraitImpl, storage::Map, }; use dojo::database; @@ -227,12 +227,12 @@ mod world { contract_base: ClassHash, nonce: usize, models_count: usize, - resources: LegacyMap::, - owners: LegacyMap::<(felt252, ContractAddress), bool>, - writers: LegacyMap::<(felt252, ContractAddress), bool>, + resources: Map::, + owners: Map::<(felt252, ContractAddress), bool>, + writers: Map::<(felt252, ContractAddress), bool>, #[substorage(v0)] config: Config::Storage, - initialized_contract: LegacyMap::, + initialized_contract: Map::, } #[derive(Drop, starknet::Store, Default, Debug)] diff --git a/crates/dojo-lang/src/compiler_test.rs b/crates/dojo-lang/src/compiler_test.rs index 01d71a6075..627fc85c86 100644 --- a/crates/dojo-lang/src/compiler_test.rs +++ b/crates/dojo-lang/src/compiler_test.rs @@ -17,8 +17,9 @@ fn test_compiler_cairo_features() { let compile_info = scarb_internal::compile_workspace( &config, CompileOpts { - include_targets: vec![], - exclude_targets: vec![TargetKind::TEST], + include_target_names: vec![], + include_target_kinds: vec![], + exclude_target_kinds: vec![TargetKind::TEST], features: features_opts, }, ) diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock index aaf6fd8731..8841ad26aa 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock @@ -17,5 +17,5 @@ dependencies = [ [[package]] name = "dojo_plugin" -version = "0.4.1" -source = "git+https://github.com/dojoengine/dojo?tag=v0.7.2#3da5cad9fdd39b81551e0668015d88262e6c5fc4" +version = "0.7.2" +source = "git+https://github.com/dojoengine/dojo?tag=v0.7.3#e8539d5b199efbd51c89c75da32f6592de5d9262" diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml index 2dc026c126..2fd8e54479 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x7468fbf6e47eb66fd898a4a68bbe801560fdd42b0d6909ec4f75fb38c613702" -original_class_hash = "0x7468fbf6e47eb66fd898a4a68bbe801560fdd42b0d6909ec4f75fb38c613702" +class_hash = "0x1b29f38120f222120acf9b3d66f7015d47c0b11d4e9acdfefa243958c60909d" +original_class_hash = "0x1b29f38120f222120acf9b3d66f7015d47c0b11d4e9acdfefa243958c60909d" base_class_hash = "0x0" abi = "manifests/dev/base/abis/contracts/ccf-cairo_v240-8d921297.json" reads = [] diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml index df70ed0ff9..cd8f1e26b2 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x4bbfcdc8d95ecfa332201e21f615e98b4d12e08f77d176761e32bb34e3bc333" -original_class_hash = "0x4bbfcdc8d95ecfa332201e21f615e98b4d12e08f77d176761e32bb34e3bc333" +class_hash = "0x412449a631f6652b3bbe27841fb6776639e493baad1a5894daeb9260d1b0a63" +original_class_hash = "0x412449a631f6652b3bbe27841fb6776639e493baad1a5894daeb9260d1b0a63" base_class_hash = "0x0" abi = "manifests/dev/base/abis/contracts/ccf-cairo_v260-465ec7fe.json" reads = [] diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml index 35f4edd8d1..aa92e94fac 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml @@ -1,6 +1,6 @@ kind = "Class" -class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" +class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" +original_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" abi = "manifests/dev/base/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml index 2e7374451b..08b3a3437f 100644 --- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml +++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml @@ -1,6 +1,6 @@ kind = "Class" -class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" +class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" +original_class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" abi = "manifests/dev/base/abis/dojo-world.json" tag = "dojo-world" manifest_name = "dojo-world" diff --git a/crates/dojo-lang/src/plugin.rs b/crates/dojo-lang/src/plugin.rs index 37b91398a8..fd6b46491c 100644 --- a/crates/dojo-lang/src/plugin.rs +++ b/crates/dojo-lang/src/plugin.rs @@ -549,6 +549,10 @@ impl MacroPlugin for BuiltinDojoPlugin { "computed".to_string(), ] } + + fn declared_derives(&self) -> Vec { + vec!["Introspect".to_string(), "IntrospectPacked".to_string()] + } } pub struct CairoPluginRepository(scarb::compiler::plugin::CairoPluginRepository); diff --git a/crates/dojo-lang/src/plugin_test_data/print b/crates/dojo-lang/src/plugin_test_data/print index 3e161917e9..0698716613 100644 --- a/crates/dojo-lang/src/plugin_test_data/print +++ b/crates/dojo-lang/src/plugin_test_data/print @@ -113,3 +113,22 @@ Enemy::OtherPlayer(v) => { core::debug::PrintTrait::print('OtherPlayer'); core:: } //! > expected_diagnostics +error: Unknown derive `Print` - a plugin might be missing. + --> test_src/lib.cairo:4:10 +#[derive(Print)] + ^***^ + +error: Unknown derive `Print` - a plugin might be missing. + --> test_src/lib.cairo:12:10 +#[derive(Print)] + ^***^ + +error: Unknown derive `Print` - a plugin might be missing. + --> test_src/lib.cairo:19:10 +#[derive(Print)] + ^***^ + +error: Unknown derive `Print` - a plugin might be missing. + --> test_src/lib.cairo:28:10 +#[derive(Print)] + ^***^ diff --git a/crates/dojo-lang/src/plugin_test_data/system b/crates/dojo-lang/src/plugin_test_data/system index 645bb25f34..aff6b4d446 100644 --- a/crates/dojo-lang/src/plugin_test_data/system +++ b/crates/dojo-lang/src/plugin_test_data/system @@ -515,6 +515,11 @@ error: Unsupported attribute. #[dojo::contract(namespace: 'my_namespace')] ^******************************************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:11:1 +#[dojo::contract(namespace: 'my_namespace')] +^******************************************^ + error: Unsupported attribute. --> test_src/lib.cairo:11:1 #[dojo::contract(namespace: 'my_namespace')] @@ -555,6 +560,11 @@ error: Unsupported attribute. #[dojo::contract(namespace: "my_namespace")] ^******************************************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:21:1 +#[dojo::contract(namespace: "my_namespace")] +^******************************************^ + error: Unsupported attribute. --> test_src/lib.cairo:21:1 #[dojo::contract(namespace: "my_namespace")] @@ -595,6 +605,11 @@ error: Unsupported attribute. #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:28:1 +#[dojo::contract] +^***************^ + error: Unsupported attribute. --> test_src/lib.cairo:28:1 #[dojo::contract] @@ -630,11 +645,21 @@ error: Unsupported attribute. #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:38:1 +#[dojo::contract] +^***************^ + error: Unsupported attribute. --> test_src/lib.cairo:38:1 #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:46:20 + #[derive(Drop, starknet::Event)] + ^*************^ + error: Unsupported attribute. --> test_src/lib.cairo:38:1 #[dojo::contract] @@ -700,6 +725,11 @@ error: Unsupported attribute. #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:64:1 +#[dojo::contract] +^***************^ + error: Unsupported attribute. --> test_src/lib.cairo:64:1 #[dojo::contract] @@ -750,6 +780,11 @@ error: Unsupported attribute. #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:124:1 +#[dojo::contract] +^***************^ + error: Unsupported attribute. --> test_src/lib.cairo:124:1 #[dojo::contract] @@ -795,6 +830,11 @@ error: Unsupported attribute. #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:171:1 +#[dojo::contract] +^***************^ + error: Unsupported attribute. --> test_src/lib.cairo:171:1 #[dojo::contract] @@ -835,6 +875,11 @@ error: Unsupported attribute. #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:222:1 +#[dojo::contract] +^***************^ + error: Unsupported attribute. --> test_src/lib.cairo:222:1 #[dojo::contract] @@ -875,6 +920,11 @@ error: Unsupported attribute. #[dojo::contract] ^***************^ +error: Unknown derive `starknet::Event` - a plugin might be missing. + --> test_src/lib.cairo:239:1 +#[dojo::contract] +^***************^ + error: Unsupported attribute. --> test_src/lib.cairo:239:1 #[dojo::contract] diff --git a/crates/dojo-lang/src/scarb_internal/mod.rs b/crates/dojo-lang/src/scarb_internal/mod.rs index 638c7a0d74..d58eb2ff2e 100644 --- a/crates/dojo-lang/src/scarb_internal/mod.rs +++ b/crates/dojo-lang/src/scarb_internal/mod.rs @@ -93,10 +93,10 @@ pub fn compile_workspace(config: &Config, opts: CompileOpts) -> Result>(); diff --git a/crates/dojo-lang/src/semantics/test_data/set b/crates/dojo-lang/src/semantics/test_data/set index 85a3ef80a7..d41133d396 100644 --- a/crates/dojo-lang/src/semantics/test_data/set +++ b/crates/dojo-lang/src/semantics/test_data/set @@ -224,6 +224,11 @@ Block( ) //! > semantic_diagnostics +error: Plugin diagnostic: Unknown derive `Model` - a plugin might be missing. + --> lib.cairo:3:29 +#[derive(Copy, Drop, Serde, Model)] + ^***^ + warning[E0001]: Unused variable. Consider ignoring by prefixing with `_`. --> lib.cairo:9:22 fn test_func() { let key: felt252 = 0xb0b; diff --git a/crates/dojo-test-utils/build.rs b/crates/dojo-test-utils/build.rs index 44f01457b9..881098a1ad 100644 --- a/crates/dojo-test-utils/build.rs +++ b/crates/dojo-test-utils/build.rs @@ -57,8 +57,9 @@ fn main() { compile_workspace( &config, CompileOpts { - include_targets: vec![], - exclude_targets: vec![TargetKind::TEST], + include_target_kinds: vec![], + exclude_target_kinds: vec![TargetKind::TEST], + include_target_names: vec![], features: features_opts, }, ) diff --git a/crates/dojo-test-utils/src/compiler.rs b/crates/dojo-test-utils/src/compiler.rs index e355673982..2d58848812 100644 --- a/crates/dojo-test-utils/src/compiler.rs +++ b/crates/dojo-test-utils/src/compiler.rs @@ -80,8 +80,9 @@ pub fn copy_build_project_temp( compile_workspace( &config, CompileOpts { - include_targets: vec![], - exclude_targets: vec![TargetKind::TEST], + include_target_names: vec![], + include_target_kinds: vec![], + exclude_target_kinds: vec![TargetKind::TEST], features: features_opts, }, ) diff --git a/crates/dojo-world/abigen/src/main.rs b/crates/dojo-world/abigen/src/main.rs index af3806a485..3b052b91e2 100644 --- a/crates/dojo-world/abigen/src/main.rs +++ b/crates/dojo-world/abigen/src/main.rs @@ -104,12 +104,12 @@ fn compile_dojo_core() { file, r#" [package] -cairo-version = "2.4.0" +cairo-version = "=2.6.4" name = "dojo" -version = "0.4.4" +version = "0.7.3" [dependencies] -starknet = "2.4.0" +starknet = "=2.6.4" [[target.starknet-contract]] sierra = true @@ -129,8 +129,9 @@ sierra = true scarb::ops::compile( packages, CompileOpts { - include_targets: vec![], - exclude_targets: vec![TargetKind::TEST], + include_target_names: vec![], + include_target_kinds: vec![], + exclude_target_kinds: vec![TargetKind::TEST], features: features_opts, }, &ws, diff --git a/crates/dojo-world/src/contracts/model_test.rs b/crates/dojo-world/src/contracts/model_test.rs index 5fa132f905..a3ff762cb6 100644 --- a/crates/dojo-world/src/contracts/model_test.rs +++ b/crates/dojo-world/src/contracts/model_test.rs @@ -81,7 +81,7 @@ async fn test_model() { assert_eq!( position.class_hash(), - felt!("0x059e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34") + felt!("0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13") ); let moves = world.model_reader("dojo_examples", "Moves").await.unwrap(); diff --git a/crates/katana/node-bindings/src/json.rs b/crates/katana/node-bindings/src/json.rs index ca717d38a1..9c85a6d411 100644 --- a/crates/katana/node-bindings/src/json.rs +++ b/crates/katana/node-bindings/src/json.rs @@ -12,6 +12,7 @@ //! 0x640466ebd2ce505209d3e5c4494b4276ed8f1cde764d757eb48831961f7cdea\"}]],\"address\":\"0.0.0.0: //! 5050\",\"seed\":\"0\"}"},"target":"katana::cli"} //! ``` +#![allow(dead_code)] use serde::Deserialize; diff --git a/crates/katana/storage/provider/src/error.rs b/crates/katana/storage/provider/src/error.rs index c02fda220d..3876bbeec7 100644 --- a/crates/katana/storage/provider/src/error.rs +++ b/crates/katana/storage/provider/src/error.rs @@ -73,9 +73,7 @@ pub enum ProviderError { /// Error when a contract nonce change entry is not found but the block number of when the /// change happen exists in the nonce change list. - #[error( - "Missing contract nonce change entry for contract {contract_address} at block {block}" - )] + #[error("Missing contract nonce change entry for contract {contract_address} at block {block}")] MissingContractNonceChangeEntry { /// The block number of when the change happen. block: BlockNumber, diff --git a/crates/torii/types-test/Scarb.lock b/crates/torii/types-test/Scarb.lock index 50ca9b8af4..8d835bdb65 100644 --- a/crates/torii/types-test/Scarb.lock +++ b/crates/torii/types-test/Scarb.lock @@ -10,8 +10,8 @@ dependencies = [ [[package]] name = "dojo_plugin" -version = "0.4.1" -source = "git+https://github.com/dojoengine/dojo?tag=v0.7.2#3da5cad9fdd39b81551e0668015d88262e6c5fc4" +version = "0.7.2" +source = "git+https://github.com/dojoengine/dojo?tag=v0.7.3#e8539d5b199efbd51c89c75da32f6592de5d9262" [[package]] name = "types_test" diff --git a/crates/torii/types-test/Scarb.toml b/crates/torii/types-test/Scarb.toml index 2f24b842f6..6ff4049f66 100644 --- a/crates/torii/types-test/Scarb.toml +++ b/crates/torii/types-test/Scarb.toml @@ -1,5 +1,5 @@ [package] -cairo-version = "2.6.3" +cairo-version = "=2.6.4" name = "types_test" version = "0.7.3" diff --git a/examples/spawn-and-move/Scarb.lock b/examples/spawn-and-move/Scarb.lock index 6d38546cd6..9fd20e2292 100644 --- a/examples/spawn-and-move/Scarb.lock +++ b/examples/spawn-and-move/Scarb.lock @@ -17,5 +17,5 @@ dependencies = [ [[package]] name = "dojo_plugin" -version = "0.4.1" -source = "git+https://github.com/dojoengine/dojo?tag=v0.7.2#3da5cad9fdd39b81551e0668015d88262e6c5fc4" +version = "0.7.2" +source = "git+https://github.com/dojoengine/dojo?tag=v0.7.3#e8539d5b199efbd51c89c75da32f6592de5d9262" diff --git a/examples/spawn-and-move/Scarb.toml b/examples/spawn-and-move/Scarb.toml index dfcf6791ad..0daf0d3ed4 100644 --- a/examples/spawn-and-move/Scarb.toml +++ b/examples/spawn-and-move/Scarb.toml @@ -1,5 +1,5 @@ [package] -cairo-version = "=2.6.3" +cairo-version = "=2.6.4" name = "dojo_examples" version = "0.7.3" # Use the prelude with the less imports as possible @@ -29,7 +29,7 @@ rpc_url = "http://localhost:5050/" # Default account for katana with seed = 0 account_address = "0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03" private_key = "0x1800000000300000180000000000030000000000003006001800006600" -world_address = "0x104dd156d76aeab45146a10869637f161ca6cf9f804704f8bbb12ae5b1b5cfb" +world_address = "0x6ffdafc135828e1428d94e9587bc36382cdf42a8cd463876b534be20a956397" # `release` profile # diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml index 99bc7921ee..0ef293bcd8 100644 --- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml +++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" -original_class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" +class_hash = "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6" +original_class_hash = "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6" base_class_hash = "0x0" abi = "manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json" reads = [] diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml index a0d11e457e..b385c1eb5f 100644 --- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml +++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" -original_class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" +class_hash = "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e" +original_class_hash = "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e" base_class_hash = "0x0" abi = "manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json" reads = [] diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml index 07b05e0714..246e93b7a1 100644 --- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml +++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" -original_class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" +class_hash = "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6" +original_class_hash = "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6" base_class_hash = "0x0" abi = "manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json" reads = [] diff --git a/examples/spawn-and-move/manifests/dev/base/dojo-base.toml b/examples/spawn-and-move/manifests/dev/base/dojo-base.toml index 35f4edd8d1..aa92e94fac 100644 --- a/examples/spawn-and-move/manifests/dev/base/dojo-base.toml +++ b/examples/spawn-and-move/manifests/dev/base/dojo-base.toml @@ -1,6 +1,6 @@ kind = "Class" -class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" +class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" +original_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" abi = "manifests/dev/base/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" diff --git a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml index 2e7374451b..08b3a3437f 100644 --- a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml +++ b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml @@ -1,6 +1,6 @@ kind = "Class" -class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" +class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" +original_class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" abi = "manifests/dev/base/abis/dojo-world.json" tag = "dojo-world" manifest_name = "dojo-world" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml index f226e89204..deca2eecd1 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ContractInitialized-376b7bd6.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" -original_class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" +class_hash = "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a" +original_class_hash = "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a" abi = "manifests/dev/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json" tag = "dojo_examples-ContractInitialized" manifest_name = "dojo_examples-ContractInitialized-376b7bd6" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml index 1a2e2802f7..58363d2a85 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Message-1bb1d226.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" -original_class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" +class_hash = "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a" +original_class_hash = "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a" abi = "manifests/dev/base/abis/models/dojo_examples-Message-1bb1d226.json" tag = "dojo_examples-Message" manifest_name = "dojo_examples-Message-1bb1d226" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml index 23435c0a3a..8faf9fa5f0 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-MockToken-38903c7c.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" -original_class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" +class_hash = "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb" +original_class_hash = "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb" abi = "manifests/dev/base/abis/models/dojo_examples-MockToken-38903c7c.json" tag = "dojo_examples-MockToken" manifest_name = "dojo_examples-MockToken-38903c7c" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml index b90e61eafe..b52523d008 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moved-318ae40d.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" -original_class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" +class_hash = "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38" +original_class_hash = "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38" abi = "manifests/dev/base/abis/models/dojo_examples-Moved-318ae40d.json" tag = "dojo_examples-Moved" manifest_name = "dojo_examples-Moved-318ae40d" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml index c652d944a0..319270b42b 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Moves-2e2accba.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" -original_class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" +class_hash = "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a" +original_class_hash = "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a" abi = "manifests/dev/base/abis/models/dojo_examples-Moves-2e2accba.json" tag = "dojo_examples-Moves" manifest_name = "dojo_examples-Moves-2e2accba" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml index 22d3ca018e..59a2ecd684 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-PlayerConfig-3adad785.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" -original_class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" +class_hash = "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec" +original_class_hash = "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec" abi = "manifests/dev/base/abis/models/dojo_examples-PlayerConfig-3adad785.json" tag = "dojo_examples-PlayerConfig" manifest_name = "dojo_examples-PlayerConfig-3adad785" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml index db21e81459..b010833f66 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-Position-1e145e26.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" -original_class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" +class_hash = "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13" +original_class_hash = "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13" abi = "manifests/dev/base/abis/models/dojo_examples-Position-1e145e26.json" tag = "dojo_examples-Position" manifest_name = "dojo_examples-Position-1e145e26" diff --git a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml index 4055b284ec..bff35fb980 100644 --- a/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml +++ b/examples/spawn-and-move/manifests/dev/base/models/dojo_examples-ServerProfile-4caad1e6.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" -original_class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" +class_hash = "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47" +original_class_hash = "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47" abi = "manifests/dev/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json" tag = "dojo_examples-ServerProfile" manifest_name = "dojo_examples-ServerProfile-4caad1e6" diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.json b/examples/spawn-and-move/manifests/dev/deployment/manifest.json index 655b688a82..cd7ce19061 100644 --- a/examples/spawn-and-move/manifests/dev/deployment/manifest.json +++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.json @@ -1,8 +1,8 @@ { "world": { "kind": "WorldContract", - "class_hash": "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2", - "original_class_hash": "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2", + "class_hash": "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92", + "original_class_hash": "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92", "abi": [ { "type": "impl", @@ -1108,8 +1108,8 @@ ] } ], - "address": "0x104dd156d76aeab45146a10869637f161ca6cf9f804704f8bbb12ae5b1b5cfb", - "transaction_hash": "0x280e50610d4467bfe1be1adaae7f77642adbe2ad4106cb861e28441e94ff287", + "address": "0x6ffdafc135828e1428d94e9587bc36382cdf42a8cd463876b534be20a956397", + "transaction_hash": "0x3dd147768d44804d306e22ab63943a7307a160367ff4cbbc9b65870f88850e2", "block_number": 3, "seed": "dojo_examples", "metadata": { @@ -1120,8 +1120,8 @@ }, "base": { "kind": "Class", - "class_hash": "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46", - "original_class_hash": "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46", + "class_hash": "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4", + "original_class_hash": "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4", "abi": "manifests/dev/deployment/abis/dojo-base.json", "tag": "dojo-base", "manifest_name": "dojo-base" @@ -1129,10 +1129,10 @@ "contracts": [ { "kind": "DojoContract", - "address": "0x2a570e12405096e725508ba1f4ade127edd42e0fcb5890b8f12f76ef043623", - "class_hash": "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75", - "original_class_hash": "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75", - "base_class_hash": "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46", + "address": "0x5954132061c8ba9fed715a01a2a1064d2d3791ef4c2f6203c790457362abfb5", + "class_hash": "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6", + "original_class_hash": "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6", + "base_class_hash": "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4", "abi": [ { "type": "impl", @@ -1513,10 +1513,10 @@ }, { "kind": "DojoContract", - "address": "0x26f33e8d81dad06c79c2d944ea519a850e007eb8432ae20d38db82caea590b2", - "class_hash": "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2", - "original_class_hash": "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2", - "base_class_hash": "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46", + "address": "0x34fa6c359d9f888d120d761eee8f8391ca4d8fd57ea7baa91b7fd1aabdbc343", + "class_hash": "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e", + "original_class_hash": "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e", + "base_class_hash": "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4", "abi": [ { "type": "impl", @@ -1721,10 +1721,10 @@ }, { "kind": "DojoContract", - "address": "0x3304896afaa421f362b3b8e8586773f9a7fcaca050b3fd6885400908803f344", - "class_hash": "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9", - "original_class_hash": "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9", - "base_class_hash": "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46", + "address": "0x6d375b5b8a43fee9ccb152fbb621ac1dae8c18a45f12c44933528908ed0b280", + "class_hash": "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6", + "original_class_hash": "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6", + "base_class_hash": "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4", "abi": [ { "type": "impl", @@ -1965,8 +1965,8 @@ "key": false } ], - "class_hash": "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a", - "original_class_hash": "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a", + "class_hash": "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a", + "original_class_hash": "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a", "abi": [ { "type": "impl", @@ -2394,8 +2394,8 @@ "key": true } ], - "class_hash": "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b", - "original_class_hash": "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b", + "class_hash": "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a", + "original_class_hash": "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a", "abi": [ { "type": "impl", @@ -2817,8 +2817,8 @@ "key": false } ], - "class_hash": "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519", - "original_class_hash": "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519", + "class_hash": "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb", + "original_class_hash": "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb", "abi": [ { "type": "impl", @@ -3232,8 +3232,8 @@ "key": false } ], - "class_hash": "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4", - "original_class_hash": "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4", + "class_hash": "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38", + "original_class_hash": "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38", "abi": [ { "type": "impl", @@ -3678,8 +3678,8 @@ "key": false } ], - "class_hash": "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609", - "original_class_hash": "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609", + "class_hash": "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a", + "original_class_hash": "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a", "abi": [ { "type": "impl", @@ -4133,8 +4133,8 @@ "key": false } ], - "class_hash": "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca", - "original_class_hash": "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca", + "class_hash": "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec", + "original_class_hash": "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec", "abi": [ { "type": "impl", @@ -4570,8 +4570,8 @@ "key": false } ], - "class_hash": "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34", - "original_class_hash": "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34", + "class_hash": "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13", + "original_class_hash": "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13", "abi": [ { "type": "impl", @@ -5004,8 +5004,8 @@ "key": false } ], - "class_hash": "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b", - "original_class_hash": "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b", + "class_hash": "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47", + "original_class_hash": "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47", "abi": [ { "type": "impl", diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml index 7097b14bc4..23c249df01 100644 --- a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml +++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml @@ -1,10 +1,10 @@ [world] kind = "WorldContract" -class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" +class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" +original_class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" abi = "manifests/dev/deployment/abis/dojo-world.json" -address = "0x104dd156d76aeab45146a10869637f161ca6cf9f804704f8bbb12ae5b1b5cfb" -transaction_hash = "0x280e50610d4467bfe1be1adaae7f77642adbe2ad4106cb861e28441e94ff287" +address = "0x6ffdafc135828e1428d94e9587bc36382cdf42a8cd463876b534be20a956397" +transaction_hash = "0x3dd147768d44804d306e22ab63943a7307a160367ff4cbbc9b65870f88850e2" block_number = 3 seed = "dojo_examples" manifest_name = "dojo-world" @@ -15,18 +15,18 @@ rpc_url = "http://localhost:5050/" [base] kind = "Class" -class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" +class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" +original_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" abi = "manifests/dev/deployment/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" [[contracts]] kind = "DojoContract" -address = "0x2a570e12405096e725508ba1f4ade127edd42e0fcb5890b8f12f76ef043623" -class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" -original_class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" -base_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" +address = "0x5954132061c8ba9fed715a01a2a1064d2d3791ef4c2f6203c790457362abfb5" +class_hash = "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6" +original_class_hash = "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6" +base_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" abi = "manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json" reads = [] writes = [ @@ -40,10 +40,10 @@ manifest_name = "dojo_examples-actions-40b6994c" [[contracts]] kind = "DojoContract" -address = "0x26f33e8d81dad06c79c2d944ea519a850e007eb8432ae20d38db82caea590b2" -class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" -original_class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" -base_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" +address = "0x34fa6c359d9f888d120d761eee8f8391ca4d8fd57ea7baa91b7fd1aabdbc343" +class_hash = "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e" +original_class_hash = "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e" +base_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" abi = "manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json" reads = [] writes = [] @@ -54,10 +54,10 @@ manifest_name = "dojo_examples-mock_token-31599eb2" [[contracts]] kind = "DojoContract" -address = "0x3304896afaa421f362b3b8e8586773f9a7fcaca050b3fd6885400908803f344" -class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" -original_class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" -base_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" +address = "0x6d375b5b8a43fee9ccb152fbb621ac1dae8c18a45f12c44933528908ed0b280" +class_hash = "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6" +original_class_hash = "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6" +base_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" abi = "manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json" reads = [] writes = [] @@ -72,8 +72,8 @@ manifest_name = "dojo_examples-others-61de2c18" [[models]] kind = "DojoModel" -class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" -original_class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" +class_hash = "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a" +original_class_hash = "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a" abi = "manifests/dev/deployment/abis/models/dojo_examples-ContractInitialized-376b7bd6.json" tag = "dojo_examples-ContractInitialized" manifest_name = "dojo_examples-ContractInitialized-376b7bd6" @@ -95,8 +95,8 @@ key = false [[models]] kind = "DojoModel" -class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" -original_class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" +class_hash = "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a" +original_class_hash = "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a" abi = "manifests/dev/deployment/abis/models/dojo_examples-Message-1bb1d226.json" tag = "dojo_examples-Message" manifest_name = "dojo_examples-Message-1bb1d226" @@ -123,8 +123,8 @@ key = true [[models]] kind = "DojoModel" -class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" -original_class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" +class_hash = "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb" +original_class_hash = "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb" abi = "manifests/dev/deployment/abis/models/dojo_examples-MockToken-38903c7c.json" tag = "dojo_examples-MockToken" manifest_name = "dojo_examples-MockToken-38903c7c" @@ -141,8 +141,8 @@ key = false [[models]] kind = "DojoModel" -class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" -original_class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" +class_hash = "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38" +original_class_hash = "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38" abi = "manifests/dev/deployment/abis/models/dojo_examples-Moved-318ae40d.json" tag = "dojo_examples-Moved" manifest_name = "dojo_examples-Moved-318ae40d" @@ -159,8 +159,8 @@ key = false [[models]] kind = "DojoModel" -class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" -original_class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" +class_hash = "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a" +original_class_hash = "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a" abi = "manifests/dev/deployment/abis/models/dojo_examples-Moves-2e2accba.json" tag = "dojo_examples-Moves" manifest_name = "dojo_examples-Moves-2e2accba" @@ -182,8 +182,8 @@ key = false [[models]] kind = "DojoModel" -class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" -original_class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" +class_hash = "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec" +original_class_hash = "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec" abi = "manifests/dev/deployment/abis/models/dojo_examples-PlayerConfig-3adad785.json" tag = "dojo_examples-PlayerConfig" manifest_name = "dojo_examples-PlayerConfig-3adad785" @@ -210,8 +210,8 @@ key = false [[models]] kind = "DojoModel" -class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" -original_class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" +class_hash = "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13" +original_class_hash = "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13" abi = "manifests/dev/deployment/abis/models/dojo_examples-Position-1e145e26.json" tag = "dojo_examples-Position" manifest_name = "dojo_examples-Position-1e145e26" @@ -228,8 +228,8 @@ key = false [[models]] kind = "DojoModel" -class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" -original_class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" +class_hash = "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47" +original_class_hash = "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47" abi = "manifests/dev/deployment/abis/models/dojo_examples-ServerProfile-4caad1e6.json" tag = "dojo_examples-ServerProfile" manifest_name = "dojo_examples-ServerProfile-4caad1e6" diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml index dd16bfa324..63be5c1917 100644 --- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml +++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" -original_class_hash = "0x7b394d087b5cf4f3b740253c591138bf98d177ef0d9b5c00b0477a145f3fb75" +class_hash = "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6" +original_class_hash = "0x32f7e90e503b8e7b828a1b5c2d24d97cca86eebb967d03fcad5cd305388f3a6" base_class_hash = "0x0" abi = "manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json" reads = [] diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml index e11d4ceb3c..783896e36c 100644 --- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml +++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" -original_class_hash = "0x6a55b3f612b0bc5e55603d805c188c0220aa53017fd2f690abe8bad50867ef2" +class_hash = "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e" +original_class_hash = "0xbfaafc36111f7cc26ed8616dae151bc891142fef3a35090378262b0fb1bb3e" base_class_hash = "0x0" abi = "manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json" reads = [] diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml index 6dd2fc4ebf..b1b631a5a1 100644 --- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml +++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml @@ -1,6 +1,6 @@ kind = "DojoContract" -class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" -original_class_hash = "0x3a61e2fafaee0ca4ed5166fbb417270563b4d8518cd1e086733cc346e8ea6b9" +class_hash = "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6" +original_class_hash = "0x15679777d999d9981b48c2b6d7db0bded1743d20fa037f8ccb61926c421f8c6" base_class_hash = "0x0" abi = "manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json" reads = [] diff --git a/examples/spawn-and-move/manifests/release/base/dojo-base.toml b/examples/spawn-and-move/manifests/release/base/dojo-base.toml index 83de14f171..78eebf072f 100644 --- a/examples/spawn-and-move/manifests/release/base/dojo-base.toml +++ b/examples/spawn-and-move/manifests/release/base/dojo-base.toml @@ -1,6 +1,6 @@ kind = "Class" -class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" -original_class_hash = "0x22f3e55b61d86c2ac5239fa3b3b8761f26b9a5c0b5f61ddbd5d756ced498b46" +class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" +original_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4" abi = "manifests/release/base/abis/dojo-base.json" tag = "dojo-base" manifest_name = "dojo-base" diff --git a/examples/spawn-and-move/manifests/release/base/dojo-world.toml b/examples/spawn-and-move/manifests/release/base/dojo-world.toml index 7249b9c358..15ff18b97f 100644 --- a/examples/spawn-and-move/manifests/release/base/dojo-world.toml +++ b/examples/spawn-and-move/manifests/release/base/dojo-world.toml @@ -1,6 +1,6 @@ kind = "Class" -class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" -original_class_hash = "0x1498dd1197805ec05d37da956d0fc568023a4c25578b0523b4f4f0d0e4f16c2" +class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" +original_class_hash = "0x21341ba6e0d96f909f15c4ed865188afc716563d34593fb443d56cb97ff7b92" abi = "manifests/release/base/abis/dojo-world.json" tag = "dojo-world" manifest_name = "dojo-world" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml index ef09f4f8da..cbeb4ea2dd 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ContractInitialized-376b7bd6.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" -original_class_hash = "0x1ba185f6f09a7a73f32e6e1d6767c182abe5635d3107c79b64dfdb9f25b3c3a" +class_hash = "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a" +original_class_hash = "0x728e99bfb4eb78333f233877df397568a2dd1178fbcef9f1aca871f89c59e2a" abi = "manifests/release/base/abis/models/dojo_examples-ContractInitialized-376b7bd6.json" tag = "dojo_examples-ContractInitialized" manifest_name = "dojo_examples-ContractInitialized-376b7bd6" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml index fdb190ac8c..ee0d8f81bb 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Message-1bb1d226.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" -original_class_hash = "0x6d9703c6df6af6f097cfdd2e7f838f4fd2b2f2ae27bf27e76065ffb903f9c9b" +class_hash = "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a" +original_class_hash = "0x119411fb88153fe44ad11d41b25e865fc52b9bce6ce196b813a5fcf7a42739a" abi = "manifests/release/base/abis/models/dojo_examples-Message-1bb1d226.json" tag = "dojo_examples-Message" manifest_name = "dojo_examples-Message-1bb1d226" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml index 71fa47c3e7..7256f93a45 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-MockToken-38903c7c.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" -original_class_hash = "0x637d1d7966a14967047e31f3512c694e32b4d6a6dda4afe4b225a8b6f8f3519" +class_hash = "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb" +original_class_hash = "0x50b9989aedf757df9b0a8e235b78d7e185fd4a6cbf05d61da097e19e5cf4efb" abi = "manifests/release/base/abis/models/dojo_examples-MockToken-38903c7c.json" tag = "dojo_examples-MockToken" manifest_name = "dojo_examples-MockToken-38903c7c" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml index 4bb3b5cc3f..3899657efa 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moved-318ae40d.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" -original_class_hash = "0x838672e7f67cd6e67336283805b0ef168c814e65b6ba1d3a7a5f31c10559c4" +class_hash = "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38" +original_class_hash = "0x3fd5ae468509ca258d45283bddd24dca8f9b09469a56dc0275f0a0f5413a38" abi = "manifests/release/base/abis/models/dojo_examples-Moved-318ae40d.json" tag = "dojo_examples-Moved" manifest_name = "dojo_examples-Moved-318ae40d" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml index 4eb4aa9f97..1c19d06578 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Moves-2e2accba.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" -original_class_hash = "0x4e9b10687f487bc0fe159affa3963cf0f7548136a2b614914e11af4497d609" +class_hash = "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a" +original_class_hash = "0x2d5c3490b29ddf08728213221a87566a2fa92e58e7ed688a146642a316e718a" abi = "manifests/release/base/abis/models/dojo_examples-Moves-2e2accba.json" tag = "dojo_examples-Moves" manifest_name = "dojo_examples-Moves-2e2accba" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml index 4c0855b673..054ff54ab4 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-PlayerConfig-3adad785.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" -original_class_hash = "0x3b94d89f5b3589438b8ffcf2cbc8061670deee1d0f81247ab2346d8991b4eca" +class_hash = "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec" +original_class_hash = "0x2e51c67a84751e6eac040a1ac757f7131ed3d8cb2979d985ee677b9b81856ec" abi = "manifests/release/base/abis/models/dojo_examples-PlayerConfig-3adad785.json" tag = "dojo_examples-PlayerConfig" manifest_name = "dojo_examples-PlayerConfig-3adad785" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml index 0b5a593985..4499459ee0 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-Position-1e145e26.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" -original_class_hash = "0x59e57c16c3bc8c59a768a342496837275e399509366640620a0682826275a34" +class_hash = "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13" +original_class_hash = "0x2fd0f7bf2373f0232270ac826f9a5bb206b04687ef7ee07f5ce3f688baf6c13" abi = "manifests/release/base/abis/models/dojo_examples-Position-1e145e26.json" tag = "dojo_examples-Position" manifest_name = "dojo_examples-Position-1e145e26" diff --git a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml index 19ca33fbe3..e3d572b447 100644 --- a/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml +++ b/examples/spawn-and-move/manifests/release/base/models/dojo_examples-ServerProfile-4caad1e6.toml @@ -1,6 +1,6 @@ kind = "DojoModel" -class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" -original_class_hash = "0x38986e1b875d48b2931932879412cf0b6c52d0e04aaac6e2780995b3f47b91b" +class_hash = "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47" +original_class_hash = "0x72d7c4cb46128c15db1993b664bc61043846f51e2bc737a3e9253409cd24f47" abi = "manifests/release/base/abis/models/dojo_examples-ServerProfile-4caad1e6.json" tag = "dojo_examples-ServerProfile" manifest_name = "dojo_examples-ServerProfile-4caad1e6" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 624eb0ea63..628740b12f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.76.0" +channel = "1.79.0"