Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,20 @@ tempfile = "3.10"

# Stwo-cairo
stwo = { git = "https://github.com/starkware-libs/stwo", rev = "45d0180", default-features = false }
cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c", default-features = false }
stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c" }
stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c" }
cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "e8bc9571675bb654b6e26a7bd53838a6ae78c344", default-features = false }
stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "e8bc9571675bb654b6e26a7bd53838a6ae78c344" }
stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "e8bc9571675bb654b6e26a7bd53838a6ae78c344" }
stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "e8bc9571675bb654b6e26a7bd53838a6ae78c344" }
cairo-program-runner-lib = { git = "https://github.com/m-kus/proving-utils", rev = "148b20f0489f5b1e28990afdfb9e9cbb9be960ce", default-features = false }
cairo-vm = { version = "3.0.0", features = ["std"] }

# Starknet
starknet-ff = "0.3.7"

[patch.crates-io]
cairo-lang-executable = { git = "https://github.com/m-kus/cairo", rev = "13f3701f3d6c50086beb25ee3a191949bcc8dddf" }
cairo-lang-runner = { git = "https://github.com/m-kus/cairo", rev = "13f3701f3d6c50086beb25ee3a191949bcc8dddf" }
cairo-lang-casm = { git = "https://github.com/m-kus/cairo", rev = "13f3701f3d6c50086beb25ee3a191949bcc8dddf" }
cairo-lang-execute-utils = { git = "https://github.com/m-kus/cairo", rev = "13f3701f3d6c50086beb25ee3a191949bcc8dddf" }
cairo-vm = { git = "https://github.com/m-kus/cairo-vm", rev = "c9aa51b9360a6c89389cf88c93ac30b5213e64a7" }
stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "e8bc9571675bb654b6e26a7bd53838a6ae78c344" }
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ assumevalid-bridge:

# Run the raito-assumevalid CLI Prove subcommand
assumevalid-prove:
cargo run -p raito-assumevalid -- \
RUSTFLAGS="-C target-cpu=native -C opt-level=3" cargo run --release -p raito-assumevalid -- \
$(if $(LOG_LEVEL),--log-level $(LOG_LEVEL)) \
$(if $(BRIDGE_URL),--bridge-url $(BRIDGE_URL)) \
prove \
Expand Down
16 changes: 11 additions & 5 deletions Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies = [
[[package]]
name = "bounded_int"
version = "0.1.0"
source = "git+https://github.com/maciejka/stwo-cairo?rev=d2793e9f19f575c13f6bc37c36f9b229797456e1#d2793e9f19f575c13f6bc37c36f9b229797456e1"
source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"

[[package]]
name = "client"
Expand Down Expand Up @@ -59,32 +59,38 @@ source = "git+https://github.com/keep-starknet-strange/shinigami.git?rev=1963116
[[package]]
name = "stwo_cairo_air"
version = "0.1.0"
source = "git+https://github.com/maciejka/stwo-cairo?rev=d2793e9f19f575c13f6bc37c36f9b229797456e1#d2793e9f19f575c13f6bc37c36f9b229797456e1"
source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
dependencies = [
"bounded_int",
"stwo_constraint_framework",
"stwo_verifier_core",
"stwo_verifier_utils",
]

[[package]]
name = "stwo_constraint_framework"
version = "0.1.0"
source = "git+https://github.com/maciejka/stwo-cairo?rev=d2793e9f19f575c13f6bc37c36f9b229797456e1#d2793e9f19f575c13f6bc37c36f9b229797456e1"
source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
dependencies = [
"stwo_verifier_core",
]

[[package]]
name = "stwo_verifier_core"
version = "0.1.0"
source = "git+https://github.com/maciejka/stwo-cairo?rev=d2793e9f19f575c13f6bc37c36f9b229797456e1#d2793e9f19f575c13f6bc37c36f9b229797456e1"
source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
dependencies = [
"bounded_int",
"stwo_verifier_utils",
]

[[package]]
name = "stwo_verifier_utils"
version = "0.1.0"
source = "git+https://github.com/maciejka/stwo-cairo?rev=d2793e9f19f575c13f6bc37c36f9b229797456e1#d2793e9f19f575c13f6bc37c36f9b229797456e1"
source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
dependencies = [
"bounded_int",
]

[[package]]
name = "utils"
Expand Down
8 changes: 7 additions & 1 deletion crates/raito-assumevalid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,18 @@ bitcoin = { workspace = true }

# Stwo-cairo
cairo-air = { workspace = true }
stwo = { workspace = true}
cairo-vm = { workspace = true }
stwo = { workspace = true }
stwo_cairo_prover = { workspace = true }
stwo-cairo-adapter = { workspace = true }
cairo-program-runner-lib = { workspace = true }

# Starknet
starknet-ff = { workspace = true }

# Memory stats
memory-stats = "1.0"

# Compression
flate2 = "1.0"
percent-encoding = "2"
Expand Down

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions crates/raito-assumevalid/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ pub mod generate_args;
pub mod prove;

pub use prove::{prove, ProveParams};

/// Embedded bootloader program (Cairo0 compiled)
pub(crate) const BOOTLOADER_STR: &str =
include_str!("../../../bootloaders/simple_bootloader_compiled.json");
20 changes: 7 additions & 13 deletions crates/raito-assumevalid/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,13 @@ enum Commands {
/// Path to the Cairo executable JSON file
#[arg(
long,
default_value = "target/proving/assumevalid-syscalls.executable.json"
default_value = "crates/raito-assumevalid/compiled/assumevalid-syscalls.executable.json"
)]
executable: PathBuf,

/// Path to the bootloader JSON file
#[arg(long, default_value = "bootloaders/simple_bootloader_compiled.json")]
bootloader: PathBuf,

/// Path to the prover parameters JSON file
#[arg(long, default_value = "packages/assumevalid/prover_params.json")]
prover_params: PathBuf,
#[arg(long)]
prover_params_file: Option<PathBuf>,

/// Don't delete temporary files after completion
#[arg(long, default_value = "false")]
Expand Down Expand Up @@ -106,28 +102,26 @@ async fn main() -> Result<()> {

match cli.command {
Commands::Prove {
executable,
load_from_gcs,
save_to_gcs,
gcs_bucket,
total_blocks,
step_size,
output_dir,
executable,
bootloader,
prover_params,
prover_params_file,
keep_temp_files,
} => {
let params = ProveParams {
executable,
load_from_gcs,
save_to_gcs,
gcs_bucket,
bridge_url: cli.bridge_url,
total_blocks,
step_size,
output_dir,
executable,
bootloader,
prover_params,
prover_params_file,
keep_temp_files,
};

Expand Down
Loading