Optimizations: Equihash & Feats: Assumevalid + SPV

Cargo.toml

@@ -1,22 +1,31 @@
 [workspace]
-resolver = "2"
 members = [
     "crates/zoro-spv-verify",
     "crates/zoro-bridge-node",
     "crates/zoro-zcash-client",
+    "crates/zoro-assumevalid",
 ]
+resolver = "2"
 
-[patch."https://github.com/m-kus/cairo-vm"]
-cairo-vm = { git = "https://github.com/maciejka/cairo-vm", rev = "19d8a07ce9799a8af9db6f8a14a8accaad900214" }
+# [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" }
 
 [workspace.dependencies]
 # Async runtime
 tokio = { version = "1.36", features = ["full"] }
 reqwest = { version = "0.12", features = ["json", "gzip", "brotli", "zstd"] }
 async-trait = "0.1"
-
+bytes = "1.0"
 # zcash
-zebra-chain = {version = "3.1.0"}   
+zcash_primitives = { version = "0.26.1" }
+zcash_protocol = { version = "0.7.1" }
+zcash_history = { version = "0.4" }
+zebra-chain = { version = "3.1.0" }
 
 # RPC
 jsonrpsee = { version = "0.25.1", features = ["http-client", "async-client"] }
@@ -25,6 +34,17 @@ base64 = "0.21"
 # Storage
 sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
 
+
+# Stwo-cairo
+stwo = { git = "https://github.com/starkware-libs/stwo", rev = "45d0180", default-features = false }
+cairo-air = { path = "../stwo-cairo/stwo_cairo_prover/crates/cairo-air", default-features = false }
+stwo-cairo-serialize = { path = "../stwo-cairo/stwo_cairo_prover/crates/cairo-serialize" }
+stwo_cairo_prover = { path = "../stwo-cairo/stwo_cairo_prover/crates/prover" }
+stwo-cairo-adapter = { path = "../stwo-cairo/stwo_cairo_prover/crates/adapter" }
+cairo-program-runner-lib = { path = "../proving-utils/crates/cairo-program-runner-lib", default-features = false }
+cairo-vm = { path = "../cairo-vm/vm", features = ["std"] }
+# Starknet
+starknet-ff = "0.3.7"
 # CLI
 clap = { version = "4.5", features = ["derive", "env"] }
 dotenv = "0.15"

Scarb.lock

@@ -13,7 +13,6 @@ dependencies = [
 [[package]]
 name = "bounded_int"
 version = "0.1.0"
-source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
 
 [[package]]
 name = "client"
@@ -26,39 +25,12 @@ dependencies = [
 name = "consensus"
 version = "0.1.0"
 dependencies = [
- "shinigami_engine",
  "utils",
 ]
 
-[[package]]
-name = "ripemd160"
-version = "0.1.0"
-source = "git+https://github.com/j1mbo64/ripemd160_cairo.git#833e07d7d074d4ee51ceb40a5bcb4af2fe6898f3"
-
-[[package]]
-name = "sha1"
-version = "0.1.0"
-source = "git+https://github.com/j1mbo64/sha1_cairo.git#2b65bc00a829bdcc244c140d0f31feda32f8d2c4"
-
-[[package]]
-name = "shinigami_engine"
-version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/shinigami.git?rev=1963116#1963116dc6f24eb32d0513c6394ad64da515ceff"
-dependencies = [
- "ripemd160",
- "sha1",
- "shinigami_utils",
-]
-
-[[package]]
-name = "shinigami_utils"
-version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/shinigami.git?rev=1963116#1963116dc6f24eb32d0513c6394ad64da515ceff"
-
 [[package]]
 name = "stwo_cairo_air"
 version = "0.1.0"
-source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
 dependencies = [
  "bounded_int",
  "stwo_constraint_framework",
@@ -69,15 +41,13 @@ dependencies = [
 [[package]]
 name = "stwo_constraint_framework"
 version = "0.1.0"
-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/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
 dependencies = [
  "bounded_int",
  "stwo_verifier_utils",
@@ -86,7 +56,6 @@ dependencies = [
 [[package]]
 name = "stwo_verifier_utils"
 version = "0.1.0"
-source = "git+https://github.com/starkware-libs/stwo-cairo?rev=e8bc9571675bb654b6e26a7bd53838a6ae78c344#e8bc9571675bb654b6e26a7bd53838a6ae78c344"
 dependencies = [
  "bounded_int",
 ]

Scarb.toml

@@ -11,7 +11,9 @@ license-file = "LICENSE"
 
 [workspace.dependencies]
 cairo_test = "2.12.2"
-shinigami_engine = { git = "https://github.com/keep-starknet-strange/shinigami.git", rev = "1963116" }
+
+[cairo]
+enable-gas = false
 
 [profile.proving]
 inherits = "release"