Revert "Fault proof part 1 (risc0#824)" (risc0#902)

This reverts commit 9fc1e65.

.github/workflows/main.yml

@@ -85,7 +85,6 @@ jobs:
       - run: cargo test -F $FEATURE -F profiler
       - run: cargo test --workspace -F $FEATURE --tests -- --ignored --test-threads 1
       - run: cargo test -F $FEATURE -F disable-dev-mode -p risc0-r0vm
-      - run: cargo test -F $FEATURE -F enable-fault-proof -p risc0-zkvm -- tests::memory_io tests::memory_access
         if: matrix.device == 'cpu'
       - run: cargo check -F $FEATURE --benches
       - run: cargo check -p risc0-build

.vscode/settings.json

@@ -39,7 +39,6 @@
     "Cargo.toml",
     "bonsai/examples/governance/Cargo.toml",
     "examples/Cargo.toml",
-    "risc0/fault/guest/Cargo.toml",
     "risc0/zkvm/methods/guest/Cargo.toml",
     "risc0/zkvm/methods/std/Cargo.toml"
   ]

Cargo.toml

@@ -8,7 +8,6 @@ members = [
   "risc0/circuit/rv32im",
   "risc0/circuit/rv32im-sys",
   "risc0/core",
-  "risc0/fault",
   "risc0/r0vm",
   "risc0/sys",
   "risc0/tools",

bonsai/rest-api-mock/src/prover.rs

@@ -102,9 +102,7 @@ impl Prover {
                         anyhow::anyhow!("failed to build executor environment: {:?}", e)
                     })?;
                 let mut exec = Executor::new(env, mem_img)?;
-                let session = exec
-                    .run()
-                    .context("Executor failed to generate a successful session")?;
+                let session = exec.run()?;
 
                 let receipt = Receipt {
                     inner: InnerReceipt::Fake,

bonsai/sdk/src/alpha.rs

@@ -93,8 +93,8 @@ pub mod responses {
         pub receipt_url: Option<String>,
         /// Session Error message
         ///
-        /// If the session is not `RUNNING` or `SUCCEEDED`, this is the error
-        /// raised from within bonsai, otherwise it is [None].
+        /// If the session is not `RUNNING` or `SUCCEEDED`, this is the error raised from within bonsai,
+        /// otherwise it is [None].
         pub error_msg: Option<String>,
         /// Session Proving State
         ///
@@ -163,8 +163,7 @@ pub mod responses {
         pub output: Option<SnarkReceipt>,
         /// Snark Error message
         ///
-        /// If the SNARK status is not `RUNNING` or `SUCCEEDED`, this is the
-        /// error raised from within bonsai.
+        /// If the SNARK status is not `RUNNING` or `SUCCEEDED`, this is the error raised from within bonsai.
         pub error_msg: Option<String>,
     }
 }

risc0/cargo-risczero/src/commands/build_guest.rs

@@ -214,15 +214,15 @@ mod test {
         let tester = Tester::new("risc0/zkvm/methods/guest/Cargo.toml");
         tester.compare_image_id(
             "risc0_zkvm_methods_guest/multi_test",
-            "b01dfc8bfe0a8bc637a64b58e843fe9ebe0c11da300d4dbacbc8f92f61a5e986",
+            "c094a8253e33eefda14e0a3b96f192ab30d8f35cc640191cf0533e9371c8c74a",
         );
         tester.compare_image_id(
             "risc0_zkvm_methods_guest/hello_commit",
             "c7c399c25ecf26b79e987ed060efce1f0836a594ad1059b138b6ed2f123dad38",
         );
         tester.compare_image_id(
             "risc0_zkvm_methods_guest/slice_io",
-            "a51a4b747f18b7e5f36a016bdd6f885e8293dbfca2759d6667a6df8edd5f2489",
+            "f5c6e9ed4296aff0db991f612794115010422465187a049ed72fb719ab94dcd9",
         );
     }
 }

risc0/zkp/src/verify/mod.rs

@@ -42,8 +42,6 @@ pub enum VerificationError {
     JournalDigestMismatch,
     UnexpectedExitCode,
     InvalidHashSuite,
-    FaultStateMismatch,
-    ValidFaultReceipt,
 }
 
 impl fmt::Debug for VerificationError {
@@ -68,12 +66,6 @@ impl fmt::Display for VerificationError {
             }
             VerificationError::UnexpectedExitCode => write!(f, "Unexpected exit_code"),
             VerificationError::InvalidHashSuite => write!(f, "Invalid hash suite"),
-            VerificationError::FaultStateMismatch => {
-                write!(f, "Fault checker generated incorrect guest state")
-            }
-            VerificationError::ValidFaultReceipt => {
-                write!(f, "Receipt is a valid fault proof")
-            }
         }
     }
 }

risc0/zkvm/Cargo.toml

@@ -37,7 +37,6 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 libm = "0.2"
 risc0-zkp = { workspace = true }
 risc0-zkvm-platform = { workspace = true }
-rrs-lib = "0.1"
 serde = { version = "1.0", default-features = false, features = [
   "alloc",
   "derive",
@@ -68,6 +67,7 @@ num-traits = { version = "0.2", default-features = false, optional = true }
 prost = { version = "0.12", optional = true }
 rand = { version = "0.8", optional = true }
 rayon = { version = "1.5", optional = true }
+rrs-lib = { version = "0.1", optional = true }
 sha2 = { version = "0.10", optional = true }
 tempfile = "3"
 thiserror = { version = "1.0", optional = true }
@@ -106,7 +106,6 @@ dual = []
 metal = ["prove", "risc0-circuit-rv32im/metal", "risc0-zkp/metal"]
 default = ["client", "prove"]
 disable-dev-mode = []
-fault-proof = []
 profiler = [
   "dep:addr2line",
   "dep:gimli",
@@ -116,7 +115,6 @@ profiler = [
 ]
 prove = [
   "client",
-  "fault-proof",
   "dep:addr2line",
   "dep:bincode",
   "dep:bytes",
@@ -130,6 +128,7 @@ prove = [
   "dep:protobuf-src",
   "dep:rand",
   "dep:rayon",
+  "dep:rrs-lib",
   "dep:sha2",
   "dep:thiserror",
   "dep:typetag",
@@ -145,6 +144,3 @@ std = [
   "risc0-zkp/std",
   "serde/std",
 ]
-
-# this is a temporary feature that will be removed after proof of fault becomes more stable
-enable-fault-proof = []