Merge branch 'eigen-client-extra-features' into eigen-client-m0-imple…

…mentation-merge-extra-features
lambdaclass · Dec 13, 2024 · c4b5b0b · c4b5b0b
2 parents 452fc6c + 4b3c059
commit c4b5b0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/core/lib/protobuf_config/src/da_client.rs b/core/lib/protobuf_config/src/da_client.rs
@@ -63,10 +63,7 @@ impl ProtoRepr for proto::DataAvailabilityClient {
                     &conf.settlement_layer_confirmation_depth,
                 )
                 .context("settlement_layer_confirmation_depth")?,
-                eigenda_eth_rpc: match required(&conf.eigenda_eth_rpc) {
-                    Ok(rpc) => Some(rpc.clone()),
-                    Err(_) => None,
-                },
+                eigenda_eth_rpc: required(&conf.eigenda_eth_rpc).ok().cloned(),
                 eigenda_svc_manager_address: required(&conf.eigenda_svc_manager_address)
                     .context("eigenda_svc_manager_address")?
                     .clone(),

diff --git a/core/node/da_clients/src/eigen/sdk.rs b/core/node/da_clients/src/eigen/sdk.rs
@@ -118,7 +118,10 @@ impl<T: GetBlobData> RawEigenClient<T> {
             | disperser::BlobStatus::InsufficientSignatures
             | disperser::BlobStatus::Unknown => Err(anyhow::anyhow!("Blob dispatch failed")),
 
-            _ => Ok(hex::encode(disperse_reply.request_id)),
+            disperser::BlobStatus::Dispersing
+            | disperser::BlobStatus::Processing
+            | disperser::BlobStatus::Finalized
+            | disperser::BlobStatus::Confirmed => Ok(hex::encode(disperse_reply.request_id)),
         }
     }
 
@@ -163,7 +166,10 @@ impl<T: GetBlobData> RawEigenClient<T> {
             | disperser::BlobStatus::InsufficientSignatures
             | disperser::BlobStatus::Unknown => Err(anyhow::anyhow!("Blob dispatch failed")),
 
-            _ => Ok(hex::encode(disperse_reply.request_id)),
+            disperser::BlobStatus::Dispersing
+            | disperser::BlobStatus::Processing
+            | disperser::BlobStatus::Finalized
+            | disperser::BlobStatus::Confirmed => Ok(hex::encode(disperse_reply.request_id)),
         }
     }