fixing

Author: distractedm1nd

Cargo.toml

@@ -22,13 +22,7 @@ members = [
     "crates/errors",
     "crates/sp1",
 ]
-default-members = [
-    "crates/prism",
-    "crates/common",
-    "crates/nova",
-    "crates/groth16",
-    "crates/errors",
-]
+default-members = ["crates/prism", "crates/common", "crates/errors"]
 resolver = "2"
 
 [workspace.dependencies]

crates/prism/src/da/mod.rs

@@ -1,9 +1,8 @@
-use crate::utils::SignedContent;
 use anyhow::Result;
 use async_trait::async_trait;
 use bincode;
 use ed25519::Signature;
-use prism_common::{operation::Operation, tree::Digest};
+use prism_common::{operation::Operation, signed_content::SignedContent, tree::Digest};
 use prism_errors::GeneralError;
 use serde::{Deserialize, Serialize};
 use sp1_sdk::SP1ProofWithPublicValues;

crates/prism/src/node_types/lightclient.rs

@@ -7,7 +7,8 @@ use sp1_sdk::{ProverClient, SP1VerifyingKey};
 use std::{self, sync::Arc};
 use tokio::{sync::broadcast, task::spawn};
 
-use crate::{da::DataAvailabilityLayer, node_types::NodeType, utils::verify_signature};
+use crate::{da::DataAvailabilityLayer, node_types::NodeType};
+use prism_common::signed_content::verify_signature;
 
 pub const PRISM_ELF: &[u8] = include_bytes!("../../../../elf/riscv32im-succinct-zkvm-elf");
 

crates/prism/src/node_types/sequencer.rs

@@ -429,26 +429,13 @@ impl Sequencer {
 
                 Ok(Proof::Update(proof))
             }
-            Operation::CreateAccount(CreateAccountArgs {
-                id,
-                value,
-                signature,
-                service_id,
-                challenge,
-            }) => {
-                // validation of account source
-                match challenge {
-                    // TODO: use Signature, not String
-                    AccountSource::SignedBySequencer { signature } => {
-                        let sig = Signature::from_str(signature)
-                            .context("Failed to parse sequencer's signature")?;
-                        self.key
-                            .verify(format!("{}{:?}", id, value).as_bytes(), &sig)
-                            .map_err(GeneralError::InvalidSignature)
-                    }
-                }?;
+            Operation::CreateAccount(args) => {
+                let id = args.id.clone();
+                match &args.challenge {
+                    ServiceChallengeInput::Signed(_) => debug!("Signature verification for service challenge gate not yet implemented. Skipping verification.")
+                };
 
-                let hashchain: Result<Hashchain> = self.db.get_hashchain(id);
+                let hashchain: Result<Hashchain> = self.db.get_hashchain(id.as_str());
                 if hashchain.is_ok() {
                     return Err(DatabaseError::NotFoundError(format!(
                         "empty slot for ID {}",
@@ -457,13 +444,13 @@ impl Sequencer {
                     .into());
                 }
 
-                debug!("creating new hashchain for user id {}", id.clone());
-                let mut chain = Hashchain::new(id.clone());
-                // TODO: Challenge is a placeholder rn
+                debug!("creating new hashchain for user id {}", args.id);
+                let mut chain = Hashchain::new(id);
                 chain.create_account(
-                    *value,
-                    *signature,
-                    *service_id,
+                    args.value.clone(),
+                    args.signature.clone(),
+                    args.service_id.clone(),
+                    // TODO: Challenge is a placeholder rn
                     ServiceChallengeInput::Signed(Vec::new()),
                 )?;
 
@@ -472,7 +459,7 @@ impl Sequencer {
                     operation
                 ))?;
 
-                let hashed_id = hash(id.as_bytes());
+                let hashed_id = hash(args.id.as_bytes());
 
                 Ok(Proof::Insert(
                     tree.insert(KeyHash::with::<Hasher>(hashed_id), chain)?,

crates/prism/src/webserver.rs

@@ -1,8 +1,4 @@
-use crate::{
-    cfg::WebServerConfig,
-    node_types::sequencer::Sequencer,
-    utils::{verify_signature, SignedContent},
-};
+use crate::{cfg::WebServerConfig, node_types::sequencer::Sequencer};
 use anyhow::{Context, Result};
 use axum::{
     extract::State,
@@ -11,18 +7,13 @@ use axum::{
     routing::{get, post},
     Json, Router,
 };
-use ed25519::Signature;
 use indexed_merkle_tree::{
     tree::{Proof, UpdateProof},
     Hash as TreeHash,
 };
-use prism_common::{
-    hashchain::Hashchain,
-    operation::{CreateAccountArgs, KeyOperationArgs, Operation, ServiceChallengeInput},
-};
-use prism_errors::GeneralError;
+use prism_common::{hashchain::Hashchain, operation::Operation};
 use serde::{Deserialize, Serialize};
-use std::{self, str::FromStr, sync::Arc};
+use std::{self, sync::Arc};
 use tower_http::cors::CorsLayer;
 use utoipa::{OpenApi, ToSchema};
 use utoipa_swagger_ui::SwaggerUi;