Update prover (#184)

* Update prover

* Update polylang-prover and polylang abi

* Fix unused import

Author: mateuszmlc

Cargo.lock

@@ -15,8 +15,8 @@ indexer_rocksdb = { path = "../indexer_rocksdb" }
 indexer = { path = "../indexer" }
 gateway = { path = "../gateway" }
 solid = { path = "../solid" }
-polylang-prover = { git = "https://github.com/polybase/polylang", rev = "91996dea0efa572666e6f82cbc9a1d2641082ebe", version = "0.1.0" }
-abi = { git = "https://github.com/polybase/polylang", rev = "91996dea0efa572666e6f82cbc9a1d2641082ebe", version = "0.1.0" }
+polylang-prover = { git = "https://github.com/polybase/polylang", rev = "5f7a0230823284d3478b5a3ae4c885fb57820621", version = "0.1.0" }
+abi = { git = "https://github.com/polybase/polylang", rev = "5f7a0230823284d3478b5a3ae4c885fb57820621", version = "0.1.0" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["raw_value"] }
 serde_with = { version = "2.2", features = ["json"] }

polybase/Cargo.toml

@@ -57,9 +57,6 @@ pub enum AppError {
     #[error("failed to compile Miden program")]
     MidenCompile(Box<dyn std::error::Error>),
 
-    #[error("ABI is missing `this` type")]
-    ABIIsMissingThisType,
-
     #[error("prover error")]
     ProveError(Box<dyn std::error::Error>),
 

polybase/src/errors.rs

@@ -9,14 +9,13 @@ use crate::errors::AppError;
 use crate::txn::CallTxn;
 use crate::ArcDbIndexer;
 use crate::{auth, util::hash};
-use abi::Parser;
 use actix_cors::Cors;
 use actix_server::Server;
 use actix_web::{get, post, web, App, HttpRequest, HttpResponse, HttpServer, Responder};
 use base64::Engine;
 // use indexer::adaptor::IndexerAdaptor;
 use indexer::{auth_user::AuthUser, cursor, list_query, where_query};
-use polylang_prover::{compile_program, hash_this, Inputs, ProgramExt};
+use polylang_prover::{compile_program, Inputs, ProgramExt};
 use schema::record;
 use serde::{de::IntoDeserializer, Deserialize, Serialize};
 use serde_with::serde_as;
@@ -420,8 +419,9 @@ struct ProveRequest {
     abi: abi::Abi,
     ctx_public_key: Option<abi::publickey::Key>,
     this: Option<serde_json::Value>,
+    this_salts: Vec<u32>,
     args: Vec<serde_json::Value>,
-    other_records: HashMap<String, Vec<serde_json::Value>>,
+    other_records: HashMap<String, Vec<(serde_json::Value, Vec<u32>)>>,
 }
 
 #[tracing::instrument(skip_all, fields(
@@ -458,29 +458,13 @@ async fn prove(req: web::Json<ProveRequest>) -> Result<impl Responder, HTTPError
             })?,
     );
 
-    let this_hash = hash_this(
-        req.abi.this_type.clone().ok_or_else(|| {
-            HTTPError::new(
-                ReasonCode::Internal,
-                Some(Box::new(AppError::ABIIsMissingThisType)),
-            )
-        })?,
-        &req.abi
-            .this_type
-            .as_ref()
-            .ok_or_else(|| {
-                HTTPError::new(
-                    ReasonCode::Internal,
-                    Some(Box::new(AppError::ABIIsMissingThisType)),
-                )
-            })?
-            .parse(&this)
-            .map_err(|err| {
-                HTTPError::new(
-                    ReasonCode::Internal,
-                    Some(Box::new(AppError::ABIError(Box::new(err)))),
-                )
-            })?,
+    let inputs = Inputs::new(
+        req.abi.clone(),
+        req.ctx_public_key.clone(),
+        req.this_salts.clone(),
+        this.clone(),
+        req.args.clone(),
+        req.other_records.clone(),
     )
     .map_err(|err| {
         HTTPError::new(
@@ -489,15 +473,6 @@ async fn prove(req: web::Json<ProveRequest>) -> Result<impl Responder, HTTPError
         )
     })?;
 
-    let inputs = Inputs {
-        abi: req.abi.clone(),
-        ctx_public_key: req.ctx_public_key.clone(),
-        this: this.clone(),
-        this_hash,
-        args: req.args.clone(),
-        other_records: req.other_records.clone(),
-    };
-
     let output = polylang_prover::prove(&program, &inputs).map_err(|err| {
         HTTPError::new(
             ReasonCode::Internal,
@@ -516,12 +491,12 @@ async fn prove(req: web::Json<ProveRequest>) -> Result<impl Responder, HTTPError
     Ok(HttpResponse::Ok().json(serde_json::json!({
         "old": {
             "this": this,
-            "hash": inputs.this_hash,
+            "hashes": inputs.this_field_hashes,
         },
         "new": {
             "selfDestructed": output.self_destructed,
             "this": new_this,
-            "hash": output.new_hash,
+            "hashes": output.new_hashes,
         },
         "stack": {
             "input": output.input_stack,