Merge pull request #37 from iosis-tech/proof_parser_standard

proof parser standard
iosis-tech · Sep 5, 2024 · a6a9fe6 · a6a9fe6
2 parents f3a5521 + a3965dd
commit a6a9fe6
Show file tree

Hide file tree

Showing 21 changed files with 4,397 additions and 913 deletions.
diff --git a/README.md b/README.md
@@ -71,6 +71,7 @@ cargo test
 - [x] small
 - [x] starknet
 - [x] starknet_with_keccak
+- [x] dynamic
 
 ### Commitment Hashes
 
@@ -83,19 +84,7 @@ cargo test
 
 - [x] WASM support
 - [x] [Web Demo](https://demo.swiftness.iosis.tech/)
-- [x] NPM packages:
-  - [swiftness-dex-blake2s](https://www.npmjs.com/package/swiftness-dex-blake2s)
-  - [swiftness-dex-keccak](https://www.npmjs.com/package/swiftness-dex-keccak)
-  - [swiftness-recursive-blake2s](https://www.npmjs.com/package/swiftness-recursive-blake2s)
-  - [swiftness-recursive-keccak](https://www.npmjs.com/package/swiftness-recursive-keccak)
-  - [swiftness-recursive-with-poseidon-blake2s](https://www.npmjs.com/package/swiftness-recursive-with-poseidon-blake2s)
-  - [swiftness-recursive-with-poseidon-keccak](https://www.npmjs.com/package/swiftness-recursive-with-poseidon-keccak)
-  - [swiftness-small-blake2s](https://www.npmjs.com/package/swiftness-small-blake2s)
-  - [swiftness-small-keccak](https://www.npmjs.com/package/swiftness-small-keccak)
-  - [swiftness-starknet-blake2s](https://www.npmjs.com/package/swiftness-starknet-blake2s)
-  - [swiftness-starknet-keccak](https://www.npmjs.com/package/swiftness-starknet-keccak)
-  - [swiftness-starknet-with-keccak-blake2s](https://www.npmjs.com/package/swiftness-starknet-with-keccak-blake2s)
-  - [swiftness-starknet-with-keccak-keccak](https://www.npmjs.com/package/swiftness-starknet-with-keccak-keccak)
+- [x] [NPM packages](https://www.npmjs.com/search?q=swiftness)
 
 ### Other Platforms Support
 

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -13,12 +13,19 @@ clap = { version = "4.4.4", features = ["derive"] }
 swiftness_air = { path = "../crates/air", default-features = false, features = [
     "std",
 ], version = "0.0.8" }
-swiftness_stark = { path = "../crates/stark", default-features = false, features = [
+swiftness_commitment = { path = "../crates/commitment", default-features = false, features = [
+    "std",
+], version = "0.0.8" }
+swiftness_fri = { path = "../crates/fri", default-features = false, features = [
     "std",
 ], version = "0.0.8" }
-swiftness_proof_parser = { path = "../proof_parser", default-features = false, features = [
+swiftness_pow = { path = "../crates/pow", default-features = false, features = [
+    "std",
+], version = "0.0.8" }
+swiftness_stark = { path = "../crates/stark", default-features = false, features = [
     "std",
 ], version = "0.0.8" }
+swiftness_proof_parser = { path = "../proof_parser", version = "0.0.8" }
 
 [features]
 default = ["recursive", "keccak_160_lsb"]
@@ -41,20 +48,16 @@ dynamic = [
 keccak_160_lsb = [
     "swiftness_air/keccak_160_lsb",
     "swiftness_stark/keccak_160_lsb",
-    "swiftness_proof_parser/keccak_160_lsb",
 ]
 keccak_248_lsb = [
     "swiftness_air/keccak_248_lsb",
     "swiftness_stark/keccak_248_lsb",
-    "swiftness_proof_parser/keccak_248_lsb",
 ]
 blake2s_160_lsb = [
     "swiftness_air/blake2s_160_lsb",
     "swiftness_stark/blake2s_160_lsb",
-    "swiftness_proof_parser/blake2s_160_lsb",
 ]
 blake2s_248_lsb = [
     "swiftness_air/blake2s_248_lsb",
     "swiftness_stark/blake2s_248_lsb",
-    "swiftness_proof_parser/blake2s_248_lsb",
 ]
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -1,2 +1,5 @@
+pub mod transform;
+
 pub use swiftness_proof_parser::*;
 pub use swiftness_stark::*;
+pub use transform::TransformTo;
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -1,6 +1,10 @@
+pub mod transform;
+
+use clap::Parser;
 use std::path::PathBuf;
 pub use swiftness_proof_parser::*;
 pub use swiftness_stark::*;
+pub use transform::TransformTo;
 
 #[cfg(feature = "dex")]
 use swiftness_air::layout::dex::Layout;
@@ -17,8 +21,6 @@ use swiftness_air::layout::starknet::Layout;
 #[cfg(feature = "starknet_with_keccak")]
 use swiftness_air::layout::starknet_with_keccak::Layout;
 
-use clap::Parser;
-
 #[derive(Parser)]
 #[command(author, version, about)]
 struct CairoVMVerifier {
@@ -29,7 +31,7 @@ struct CairoVMVerifier {
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let cli = CairoVMVerifier::parse();
-    let stark_proof = parse(std::fs::read_to_string(cli.proof)?)?;
+    let stark_proof = parse(std::fs::read_to_string(cli.proof)?)?.transform_to();
     let security_bits = stark_proof.config.security_bits();
     let result = stark_proof.verify::<Layout>(security_bits)?;
     println!("{:?}", result);