feat: add new types to ValidityResponseMessage

Author: uri-99

batcher/aligned-batcher/src/lib.rs

@@ -968,7 +968,7 @@ impl Batcher {
                     let merkle_root = hex::encode(batch_merkle_tree.root);
                     send_message(
                         ws_sink.clone(),
-                        ResponseMessage::CreateNewTaskError(merkle_root),
+                        ResponseMessage::CreateNewTaskError(merkle_root, format!("{:?}", e)),
                     )
                     .await
                 } else {

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

@@ -133,6 +133,16 @@ pub async fn send_messages(
                     expected_addr,
                 ));
             }
+            ValidityResponseMessage::BatchInclusionData(data) => {
+                debug!("Message was valid and included with the following BatchInclusionData: {:?}", data);
+
+            }
+            ValidityResponseMessage::CreateNewTaskError(merkle_root, error) => {
+                return Err(SubmitError::BatchSubmissionFailed(
+                    "Could not create task with merkle root ".to_owned() + &merkle_root + ", failed with error: " + &error, 
+                ));
+            }
+
         };
 
         sent_verification_data.push(verification_data.clone());
@@ -215,9 +225,9 @@ async fn process_batch_inclusion_data(
         Ok(ResponseMessage::Error(e)) => {
             error!("Batcher responded with error: {}", e);
         }
-        Ok(ResponseMessage::CreateNewTaskError(merkle_root)) => {
+        Ok(ResponseMessage::CreateNewTaskError(merkle_root, error)) => {
             return Err(SubmitError::BatchSubmissionFailed(
-                "Could not create task with merkle root ".to_owned() + &merkle_root,
+                "Could not create task with merkle root ".to_owned() + &merkle_root + ", failed with error: " + &error, 
             ));
         }
         Ok(ResponseMessage::InvalidProof(reason)) => {

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

@@ -343,6 +343,9 @@ pub enum ValidityResponseMessage {
     InsufficientBalance(Address),
     EthRpcError,
     InvalidPaymentServiceAddress(Address, Address),
+    BatchInclusionData(BatchInclusionData),
+    CreateNewTaskError(String, String), //merkle-root, error
+
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -379,6 +382,8 @@ impl Display for ValidityResponseMessage {
                     addr, expected
                 )
             }
+            ValidityResponseMessage::BatchInclusionData(data) => write!(f, "Received Batch inclusion data, this means the task was processed: {:?}", data),
+            ValidityResponseMessage::CreateNewTaskError(merkle_root, error) => write!(f, "Create new task error: merkle root: {}, error: {}", merkle_root, error)
         }
     }
 }
@@ -399,7 +404,7 @@ impl Display for ProofInvalidReason {
 pub enum ResponseMessage {
     BatchInclusionData(BatchInclusionData),
     ProtocolVersion(u16),
-    CreateNewTaskError(String),
+    CreateNewTaskError(String, String), //merkle-root, error
     InvalidProof(ProofInvalidReason),
     BatchReset,
     Error(String),