cairo1-run as dependency

Cargo.toml

@@ -8,42 +8,62 @@ members = [
     "bin/keygen",
     "bin/register",
 ]
+
 [workspace.package]
 version = "0.1.0"
 edition = "2021"
+
 [workspace.dependencies]
-axum = { version = "0.7.5", features = ["http2", "macros", "multipart", "ws"] }
-clap = { version = "4.5.16", features = ["derive", "env"] }
-tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-tokio = { version = "1.39.3", features = ["full"] }
-thiserror = "1.0.63"
+anyhow = "1.0.89"
+async-stream = "0.3.5"
+base64 = "0.22.1"
+bytes = "1.7.1"
+chrono = "0.4.38"
+futures = "0.3.30"
+jsonwebtoken = "9.3.0"
+once_cell = "1.19.0"
+prefix-hex = "0.7.1"
+rand = "0.8.5"
+reqwest_cookie_store = "0.7.0"
 serde_json = "1.0.127"
+serde_with = "3.9.0"
+starknet-crypto = "0.7.0"
+starknet-types-core = "~0.1.4"
 tempfile = "3.12.0"
-serde = { version = "1.0.209", features = ["derive"] }
+thiserror = "1.0.63"
+tracing = "0.1.40"
+url = "2.5.2"
+
+axum = { version = "0.7.5", features = ["http2", "macros", "multipart", "ws"] }
+axum-extra = { version = "0.9.3", features = ["typed-header"] }
+cairo-proof-parser = { git = "https://github.com/cartridge-gg/cairo-proof-parser.git", rev = "f175d58" }
+clap = { version = "4.5.16", features = ["derive", "env"] }
 common = { path = "common" }
+ed25519-dalek = { version = "2.1.1", features = ["rand_core", "serde"] }
 prover-sdk = { path = "prover-sdk" }
 reqwest = { version = "0.12.7", features = [
     "blocking",
     "json",
     "rustls-tls",
     "stream",
 ], default-features = false }
-reqwest_cookie_store = "0.7.0"
-url = "2.5.2"
-jsonwebtoken = "9.3.0"
-axum-extra = { version = "0.9.3", features = ["typed-header"] }
-once_cell = "1.19.0"
-serde_with = "3.9.0"
-bytes = "1.7.1"
-prefix-hex = "0.7.1"
-rand = "0.8.5"
-ed25519-dalek = { version = "2.1.1", features = ["rand_core", "serde"] }
-chrono = "0.4.38"
-base64 = "0.22.1"
-starknet-types-core = "~0.1.4"
-futures = "0.3.30"
-async-stream = "0.3.5"
-cairo-proof-parser = {git = "https://github.com/cartridge-gg/cairo-proof-parser.git",rev = "f175d58"}
-starknet-crypto = "0.7.0"
-anyhow = "1.0.89"
+
+serde = { version = "1.0.209", features = ["derive"] }
+tokio = { version = "1.39.3", features = ["full"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+cairo-lang-sierra-type-size = { version = "2.7.0", default-features = false }
+cairo-lang-sierra-ap-change = { version = "2.7.0", default-features = false }
+cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm.git", features = [
+    "cairo-1-hints",
+],rev = "93f1f54" }
+num-bigint = { version = "0.4", default-features = false, features = [
+    "serde",
+    "rand",
+] }
+num-traits = { version = "0.2", default-features = false }
+cairo-lang-casm = { version = "2.7.0", default-features = false }
+cairo-lang-starknet-classes = { version = "2.7.0", default-features = false }
+cairo-lang-sierra-to-casm = { version = "2.7.0", default-features = false }
+cairo-lang-sierra = { version = "2.7.0", default-features = false }
+cairo-lang-utils = { version = "2.7.0", default-features = false }
+itertools = "0.12.1"

Dockerfile

@@ -18,7 +18,6 @@ WORKDIR /app
 COPY --from=planner /app/recipe.json recipe.json
 # Build dependencies - this is the caching Docker layer!
 RUN cargo chef cook --release --recipe-path recipe.json
-RUN cargo install --git https://github.com/lambdaclass/cairo-vm --rev ed3117098dd33c96056880af6fa67f9b2caebfb4 cairo1-run
 RUN cargo build --release -p prover
 
 # Build application
@@ -44,7 +43,6 @@ RUN pip install cairo-lang==0.13.1
 RUN pip install sympy==1.12.1
 
 COPY --from=builder /app/target/release/prover /usr/local/bin/prover
-COPY --from=builder /usr/local/cargo/bin/cairo1-run /usr/local/bin/cairo1-run
 COPY --from=prover /usr/bin/cpu_air_prover /usr/local/bin/cpu_air_prover
 COPY --from=prover /usr/bin/cpu_air_verifier /usr/local/bin/cpu_air_verifier
 

prover/Cargo.toml

@@ -29,4 +29,19 @@ futures.workspace = true
 async-stream.workspace = true
 cairo-proof-parser.workspace = true
 starknet-crypto.workspace = true
-anyhow.workspace = true
+anyhow.workspace = true
+cairo-vm.workspace = true
+cairo-lang-sierra.workspace = true
+
+cairo-lang-sierra-type-size.workspace = true
+cairo-lang-sierra-ap-change.workspace =true
+num-bigint.workspace =true
+num-traits.workspace =true
+cairo-lang-casm.workspace =true
+cairo-lang-starknet-classes.workspace =true
+cairo-lang-sierra-to-casm.workspace =true
+cairo-lang-utils.workspace =true
+itertools.workspace =true
+bincode = { version = "2.0.0-rc.3", default-features = false, features = [
+    "serde",
+] }