Update sncast crate so it depends on cairo-lang-runner and cairo-lang-runnable-utils directly

commit-id:2b801af1

Author: cptartur

Cargo.lock

@@ -30,12 +30,9 @@ license-file = "LICENSE"
 blockifier = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.13.5-modified-sierra-dep", default-features = false, features = ["testing", "tracing"] }
 starknet_api = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.13.5-modified-sierra-dep" }
 cairo-lang-casm = { version = "2.11.2", features = ["serde"] }
-cairo-lang-runner = "2.11.2"
-cairo-lang-sierra-to-casm = "2.11.2"
 cairo-lang-sierra = "2.11.2"
 cairo-lang-utils = "2.11.2"
 cairo-lang-starknet = "2.11.2"
-cairo-lang-runnable-utils = "2.11.2"
 cairo-lang-filesystem = "2.11.2"
 cairo-lang-diagnostics = "2.11.2"
 cairo-lang-sierra-type-size = "2.11.2"

Cargo.toml

@@ -32,9 +32,8 @@ data-transformer = { path = "../data-transformer" }
 configuration = { path = "../configuration" }
 shared = { path = "../shared" }
 forge_runner = { path = "../forge-runner" }
-cairo-lang-runner.workspace = true
-cairo-lang-sierra-to-casm.workspace = true
-cairo-lang-runnable-utils.workspace = true
+cairo-lang-runner = "2.11.2"
+cairo-lang-runnable-utils = "2.11.2"
 cairo-lang-utils.workspace = true
 cairo-lang-sierra.workspace = true
 cairo-lang-casm.workspace = true
@@ -54,6 +53,7 @@ regex.workspace = true
 dirs.workspace = true
 dialoguer.workspace = true
 toml_edit.workspace = true
+num-traits.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true

crates/sncast/Cargo.toml

@@ -1,4 +1,3 @@
-#![allow(unused_imports, dead_code)]
 use crate::starknet_commands::declare::Declare;
 use crate::starknet_commands::{call, declare, deploy, invoke, tx_status};
 use crate::{WaitForTx, get_account};
@@ -15,7 +14,6 @@ use cairo_lang_runner::casm_run::hint_to_hint_params;
 use cairo_lang_runner::short_string::as_cairo_short_string;
 use cairo_lang_runner::{Arg, RunResultValue, SierraCasmRunner};
 use cairo_lang_sierra::program::VersionedProgram;
-use cairo_lang_sierra_to_casm::metadata::MetadataComputationConfig;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use cairo_vm::serde::deserialize_program::HintParams;
 use cairo_vm::types::relocatable::Relocatable;
@@ -34,6 +32,7 @@ use runtime::{
 };
 use scarb_api::{StarknetContractArtifacts, package_matches_version_requirement};
 use scarb_metadata::{Metadata, PackageMetadata};
+use script_runtime::CastScriptRuntime;
 use semver::{Comparator, Op, Version, VersionReq};
 use shared::print::print_as_warning;
 use shared::utils::build_readable_text;
@@ -57,6 +56,8 @@ use std::collections::HashMap;
 use std::fs;
 use tokio::runtime::Runtime;
 
+mod script_runtime;
+
 type ScriptStarknetContractArtifacts = StarknetContractArtifacts;
 
 #[derive(Args, Debug)]
@@ -95,7 +96,7 @@ impl CastScriptExtension<'_> {
 }
 
 impl<'a> ExtensionLogic for CastScriptExtension<'a> {
-    type Runtime = StarknetRuntime<'a>;
+    type Runtime = CastScriptRuntime<'a>;
 
     #[expect(clippy::too_many_lines)]
     fn handle_cheatcode(
@@ -273,136 +274,139 @@ impl<'a> ExtensionLogic for CastScriptExtension<'a> {
     }
 }
 
-#[expect(clippy::too_many_arguments)]
+#[expect(clippy::too_many_arguments, clippy::too_many_lines)]
 pub fn run(
-    _module_name: &str,
-    _metadata: &Metadata,
-    _package_metadata: &PackageMetadata,
-    _artifacts: &mut HashMap<String, StarknetContractArtifacts>,
-    _provider: &JsonRpcClient<HttpTransport>,
-    _tokio_runtime: Runtime,
-    _config: &CastConfig,
-    _state_file_path: Option<Utf8PathBuf>,
+    module_name: &str,
+    metadata: &Metadata,
+    package_metadata: &PackageMetadata,
+    artifacts: &mut HashMap<String, StarknetContractArtifacts>,
+    provider: &JsonRpcClient<HttpTransport>,
+    tokio_runtime: Runtime,
+    config: &CastConfig,
+    state_file_path: Option<Utf8PathBuf>,
 ) -> Result<ScriptRunResponse> {
-    todo!("Use blockifier to run");
-    // warn_if_sncast_std_not_compatible(metadata)?;
-    // let artifacts = inject_lib_artifact(metadata, package_metadata, artifacts)?;
-    //
-    // let artifact = artifacts
-    //     .get(SCRIPT_LIB_ARTIFACT_NAME)
-    //     .ok_or(anyhow!("Failed to find script artifact"))?;
-    //
-    // let sierra_program = serde_json::from_str::<VersionedProgram>(&artifact.sierra)
-    //     .with_context(|| "Failed to deserialize Sierra program")?
-    //     .into_v1()
-    //     .with_context(|| "Failed to load Sierra program")?
-    //     .program;
-    //
-    // let runner = SierraCasmRunner::new(
-    //     sierra_program.clone(),
-    //     Some(MetadataComputationConfig::default()),
-    //     OrderedHashMap::default(),
-    //     None,
-    // )
-    // .with_context(|| "Failed to set up runner")?;
-    //
-    // // `builder` field in `SierraCasmRunner` is private, hence the need to create a new `RunnableBuilder`
-    // // https://github.com/starkware-libs/cairo/blob/66f5c7223f7a6c27c5f800816dba05df9b60674e/crates/cairo-lang-runner/src/lib.rs#L184
-    // let builder = RunnableBuilder::new(sierra_program, Some(MetadataComputationConfig::default()))
-    //     .with_context(|| "Failed to create builder")?;
-    //
-    // let name_suffix = module_name.to_string() + "::main";
-    // let func = runner.find_function(name_suffix.as_str())
-    //     .context("Failed to find main function in script - please make sure `sierra-replace-ids` is not set to `false` for `dev` profile in script's Scarb.toml")?;
-    //
-    // let entry_code_config = EntryCodeConfig::testing();
-    // let casm_program_wrapper_info = builder.create_wrapper_info(func, entry_code_config)?;
-    // let entry_code = casm_program_wrapper_info.header;
-    // let builtins = casm_program_wrapper_info.builtins;
-    // let footer = create_code_footer();
-    //
-    // // import from cairo-lang-runner
-    // let assembled_program = builder
-    //     .casm_program()
-    //     .clone()
-    //     .assemble_ex(&entry_code, &footer);
-    // let (hints_dict, string_to_hint) = hints_to_params(assembled_program.hints);
-    //
-    // // hint processor
-    // let mut context = build_context(
-    //     &SerializableBlockInfo::default().into(),
-    //     None,
-    //     &TrackedResource::CairoSteps,
-    // );
-    //
-    // let mut blockifier_state = CachedState::new(DictStateReader::default());
-    //
-    // // TODO(#2954)
-    // let param_types = builder.generic_id_and_size_from_concrete(&func.signature.param_types);
-    //
-    // let segment_index = syscall_handler_offset(builtins.len(), has_segment_arena(&param_types));
-    // let syscall_handler = SyscallHintProcessor::new(
-    //     &mut blockifier_state,
-    //     &mut context,
-    //     // This segment is created by SierraCasmRunner
-    //     Relocatable {
-    //         segment_index: segment_index
-    //             .try_into()
-    //             .expect("Failed to convert index to isize"),
-    //         offset: 0,
-    //     },
-    //     ExecutableCallEntryPoint::default(),
-    //     &string_to_hint,
-    //     ReadOnlySegments::default(),
-    // );
-    //
-    // let account = if config.account.is_empty() {
-    //     None
-    // } else {
-    //     Some(tokio_runtime.block_on(get_account(
-    //         &config.account,
-    //         &config.accounts_file,
-    //         provider,
-    //         config.keystore.clone(),
-    //     ))?)
-    // };
-    // let state = StateManager::from(_state_file_path)?;
-    //
-    // let cast_extension = CastScriptExtension {
-    //     provider,
-    //     tokio_runtime,
-    //     config,
-    //     artifacts: &artifacts,
-    //     account: account.as_ref(),
-    //     state,
-    // };
-    //
-    // let mut cast_runtime = ExtendedRuntime {
-    //     extension: cast_extension,
-    //     extended_runtime: StarknetRuntime {
-    //         hint_handler: syscall_handler,
-    //     },
-    // };
-    //
-    // match runner.run_function(
-    //     func,
-    //     &mut cast_runtime,
-    //     hints_dict,
-    //     assembled_program.bytecode.iter(),
-    //     builtins,
-    // ) {
-    //     Ok(result) => match result.value {
-    //         RunResultValue::Success(data) => Ok(ScriptRunResponse {
-    //             status: "success".to_string(),
-    //             message: build_readable_text(&data),
-    //         }),
-    //         RunResultValue::Panic(panic_data) => Ok(ScriptRunResponse {
-    //             status: "script panicked".to_string(),
-    //             message: build_readable_text(&panic_data),
-    //         }),
-    //     },
-    //     Err(err) => Err(err.into()),
-    // }
+    warn_if_sncast_std_not_compatible(metadata)?;
+    let artifacts = inject_lib_artifact(metadata, package_metadata, artifacts)?;
+
+    let artifact = artifacts
+        .get(SCRIPT_LIB_ARTIFACT_NAME)
+        .ok_or(anyhow!("Failed to find script artifact"))?;
+
+    let sierra_program = serde_json::from_str::<VersionedProgram>(&artifact.sierra)
+        .with_context(|| "Failed to deserialize Sierra program")?
+        .into_v1()
+        .with_context(|| "Failed to load Sierra program")?
+        .program;
+
+    let runner = SierraCasmRunner::new(
+        sierra_program.clone(),
+        None,
+        OrderedHashMap::default(),
+        None,
+    )
+    .with_context(|| "Failed to set up runner")?;
+
+    // `builder` field in `SierraCasmRunner` is private, hence the need to create a new `RunnableBuilder`
+    // https://github.com/starkware-libs/cairo/blob/66f5c7223f7a6c27c5f800816dba05df9b60674e/crates/cairo-lang-runner/src/lib.rs#L184
+    let builder =
+        RunnableBuilder::new(sierra_program, None).with_context(|| "Failed to create builder")?;
+
+    let name_suffix = module_name.to_string() + "::main";
+    let func = runner.find_function(name_suffix.as_str())
+        .context("Failed to find main function in script - please make sure `sierra-replace-ids` is not set to `false` for `dev` profile in script's Scarb.toml")?;
+
+    let entry_code_config = EntryCodeConfig::testing();
+    let casm_program_wrapper_info = builder.create_wrapper_info(func, entry_code_config)?;
+    let entry_code = casm_program_wrapper_info.header;
+    let builtins = casm_program_wrapper_info.builtins;
+    let footer = create_code_footer();
+
+    // import from cairo-lang-runner
+    let assembled_program = builder
+        .casm_program()
+        .clone()
+        .assemble_ex(&entry_code, &footer);
+    let (hints_dict, string_to_hint) = hints_to_params(assembled_program.hints);
+
+    // hint processor
+    let mut context = build_context(
+        &SerializableBlockInfo::default().into(),
+        None,
+        &TrackedResource::CairoSteps,
+    );
+
+    let mut blockifier_state = CachedState::new(DictStateReader::default());
+
+    // TODO(#2954)
+    let param_types = builder.generic_id_and_size_from_concrete(&func.signature.param_types);
+
+    let segment_index = syscall_handler_offset(builtins.len(), has_segment_arena(&param_types));
+    let syscall_handler = SyscallHintProcessor::new(
+        &mut blockifier_state,
+        &mut context,
+        // This segment is created by SierraCasmRunner
+        Relocatable {
+            segment_index: segment_index
+                .try_into()
+                .expect("Failed to convert index to isize"),
+            offset: 0,
+        },
+        ExecutableCallEntryPoint::default(),
+        &string_to_hint,
+        ReadOnlySegments::default(),
+    );
+
+    let account = if config.account.is_empty() {
+        None
+    } else {
+        Some(tokio_runtime.block_on(get_account(
+            &config.account,
+            &config.accounts_file,
+            provider,
+            config.keystore.clone(),
+        ))?)
+    };
+    let state = StateManager::from(state_file_path)?;
+
+    let cast_extension = CastScriptExtension {
+        provider,
+        tokio_runtime,
+        config,
+        artifacts: &artifacts,
+        account: account.as_ref(),
+        state,
+    };
+
+    let mut cast_runtime = ExtendedRuntime {
+        extension: cast_extension,
+        extended_runtime: CastScriptRuntime {
+            starknet_runtime: StarknetRuntime {
+                hint_handler: syscall_handler,
+                panic_traceback: None,
+            },
+            user_args: vec![vec![Arg::Value(Felt::from(i64::MAX))]],
+        },
+    };
+
+    match runner.run_function(
+        func,
+        &mut cast_runtime,
+        hints_dict,
+        assembled_program.bytecode.iter(),
+        builtins,
+    ) {
+        Ok(result) => match result.value {
+            RunResultValue::Success(data) => Ok(ScriptRunResponse {
+                status: "success".to_string(),
+                message: build_readable_text(&data),
+            }),
+            RunResultValue::Panic(panic_data) => Ok(ScriptRunResponse {
+                status: "script panicked".to_string(),
+                message: build_readable_text(&panic_data),
+            }),
+        },
+        Err(err) => Err(err.into()),
+    }
 }
 
 fn sncast_std_version_requirement() -> VersionReq {