Merge pull request #205 from a16z/ncitron/improve-prove-ux

feat: add prove macros to sdk

common/Cargo.toml

@@ -12,9 +12,4 @@ ark-ff = "0.4.2"
 ark-std = "0.4.0"
 ark-ec = "0.4.2"
 ark-serialize = "0.4.2"
-bellpepper-core = "0.4.0"
-ff = "0.13.0"
-spartan2 = { git = "https://github.com/a16z/Spartan2" }
-ruint = "1.11.1"
-halo2curves = "0.6.0"
 rayon = { version = "^1.8.0" }

common/src/lib.rs

@@ -3,7 +3,6 @@ pub fn to_ram_address(index: usize) -> usize {
 }
 
 pub mod constants;
-pub mod field_conversion;
 pub mod parallel;
 pub mod rv_trace;
 pub mod serializable;

examples/fibonacci/Cargo.toml

@@ -1,12 +1,11 @@
-cargo-features = ["per-package-target"]
-
 [package]
 name = "fibonacci"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
 jolt-sdk = { path = "../../jolt-sdk", features = ["std"] }
+guest = { package = "fibonacci-guest", path = "./guest" }
 
 hex = "0.4.3"
 sha3 = { version = "0.10.8", default-features = false }

examples/fibonacci/guest/Cargo.toml

@@ -1,13 +1,13 @@
-cargo-features = ["per-package-target"]
-
 [package]
 name = "fibonacci-guest"
 version = "0.1.0"
 edition = "2021"
 
-forced-target = "riscv32i-unknown-none-elf"
+[lib]
+path = "src/main.rs"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+guest = []
 
 [dependencies]
 jolt-sdk = { path = "../../../jolt-sdk" }

examples/fibonacci/guest/src/main.rs

@@ -1,17 +1,17 @@
-#![no_std]
-#![no_main]
+#![cfg_attr(feature = "guest", no_std)]
+#![cfg_attr(feature = "guest", no_main)]
 
 #[jolt_sdk::main]
-fn fib(n: u32) -> u32 {
-    fib_rec(n)
-}
-
-fn fib_rec(n: u32) -> u32 {
-    if n <= 1 {
-        n
-    } else {
-        fib_rec(n - 1) + fib_rec(n - 2)
+fn fib(n: u32) -> u128 {
+    let mut a: u128 = 0;
+    let mut b: u128 = 1;
+    let mut sum: u128;
+    for _ in 1..n {
+        sum = a + b;
+        a = b;
+        b = sum;
     }
-}
 
+    b
+}