chore: fix error handling for invalid proof in sdk client

Author: IAvecilla

batcher/aligned-sdk/src/communication/messaging.rs

@@ -96,7 +96,7 @@ pub async fn send_messages(
             }
             ValidityResponseMessage::InvalidProof(reason) => {
                 error!("Invalid Proof!: {}", reason);
-                return Err(SubmitError::InvalidProof);
+                return Err(SubmitError::InvalidProof(reason));
             }
             ValidityResponseMessage::InvalidMaxFee => {
                 error!("Invalid Max Fee!");
@@ -220,6 +220,9 @@ async fn process_batch_inclusion_data(
                 "Could not create task with merkle root ".to_owned() + &merkle_root,
             ));
         }
+        Ok(ResponseMessage::InvalidProof(reason)) => {
+            return Err(SubmitError::InvalidProof(reason));
+        }
         Err(e) => {
             return Err(SubmitError::SerializationError(e));
         }

batcher/aligned-sdk/src/core/errors.rs

@@ -9,6 +9,8 @@ use tokio_tungstenite::tungstenite::protocol::CloseFrame;
 
 use crate::communication::serialization::SerializationError;
 
+use super::types::ProofInvalidReason;
+
 #[derive(Debug)]
 pub enum AlignedError {
     SubmitError(SubmitError),
@@ -84,7 +86,7 @@ pub enum SubmitError {
     ProofQueueFlushed,
     InvalidSignature,
     InvalidChainId,
-    InvalidProof,
+    InvalidProof(ProofInvalidReason),
     ProofTooLarge,
     InvalidReplacementMessage,
     InsufficientBalance,
@@ -187,7 +189,7 @@ impl fmt::Display for SubmitError {
             SubmitError::GenericError(e) => write!(f, "Generic error: {}", e),
             SubmitError::InvalidSignature => write!(f, "Invalid Signature"),
             SubmitError::InvalidChainId => write!(f, "Invalid chain Id"),
-            SubmitError::InvalidProof => write!(f, "Invalid proof"),
+            SubmitError::InvalidProof(reason) => write!(f, "Invalid proof: {}", reason),
             SubmitError::ProofTooLarge => write!(f, "Proof too Large"),
             SubmitError::InvalidReplacementMessage => write!(f, "Invalid replacement message"),
             SubmitError::InsufficientBalance => write!(f, "Insufficient balance"),

batcher/aligned-sdk/src/core/types.rs

@@ -349,7 +349,7 @@ pub enum ValidityResponseMessage {
 pub enum ProofInvalidReason {
     RejectedProof,
     VerifierNotSupported,
-    DisabledVerifier,
+    DisabledVerifier(ProvingSystemId),
 }
 
 impl Display for ValidityResponseMessage {
@@ -387,7 +387,9 @@ impl Display for ProofInvalidReason {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
             ProofInvalidReason::VerifierNotSupported => write!(f, "Verifier not supported"),
-            ProofInvalidReason::DisabledVerifier => write!(f, "Disabled verifier"),
+            ProofInvalidReason::DisabledVerifier(id) => {
+                write!(f, "Disabled {} verifier ", id)
+            }
             ProofInvalidReason::RejectedProof => write!(f, "Proof did not verify"),
         }
     }
@@ -398,6 +400,7 @@ pub enum ResponseMessage {
     BatchInclusionData(BatchInclusionData),
     ProtocolVersion(u16),
     CreateNewTaskError(String),
+    InvalidProof(ProofInvalidReason),
     BatchReset,
     Error(String),
 }

batcher/aligned-sdk/src/sdk.rs

@@ -38,7 +38,7 @@ use log::debug;
 
 use futures_util::{
     stream::{SplitSink, SplitStream},
-    StreamExt, TryStreamExt,
+    SinkExt, StreamExt, TryStreamExt,
 };
 
 /// Submits multiple proofs to the batcher to be verified in Aligned and waits for the verification on-chain.
@@ -241,16 +241,22 @@ pub async fn submit_multiple(
 
     let ws_write = Arc::new(Mutex::new(ws_write));
 
-    _submit_multiple(
-        ws_write,
+    let submit_result = _submit_multiple(
+        ws_write.clone(),
         ws_read,
         network,
         verification_data,
         max_fees,
         wallet,
         nonce,
     )
-    .await
+    .await;
+
+    if submit_result.is_err() {
+        let mut ws_write = ws_write.lock().await;
+        ws_write.close().await?;
+    }
+    submit_result
 }
 
 pub fn get_payment_service_address(network: Network) -> ethers::types::H160 {