From 82e38f007afb2ad3addf4f6525130ee32f294de2 Mon Sep 17 00:00:00 2001 From: hopeyen <60078528+hopeyen@users.noreply.github.com> Date: Mon, 27 Jan 2025 23:04:25 -0600 Subject: [PATCH] fix(node): corev2 dup import with diff alias (#1169) --- disperser/apiserver/disperse_blob_v2.go | 3 --- node/node.go | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/disperser/apiserver/disperse_blob_v2.go b/disperser/apiserver/disperse_blob_v2.go index 4ad186343d..9b758b09ee 100644 --- a/disperser/apiserver/disperse_blob_v2.go +++ b/disperser/apiserver/disperse_blob_v2.go @@ -114,9 +114,6 @@ func (s *DispersalServerV2) validateDispersalRequest(ctx context.Context, req *p return api.NewErrorInvalidArg("blob header must contain commitments") } - if blobHeaderProto.GetCommitment() == nil { - return api.NewErrorInvalidArg("blob header must contain a commitment") - } commitmentLength := blobHeaderProto.GetCommitment().GetLength() if commitmentLength == 0 || commitmentLength != encoding.NextPowerOf2(commitmentLength) { return api.NewErrorInvalidArg("invalid commitment length, must be a power of 2") diff --git a/node/node.go b/node/node.go index 0faff82fe5..cdba392fa3 100644 --- a/node/node.go +++ b/node/node.go @@ -35,7 +35,6 @@ import ( "github.com/Layr-Labs/eigenda/core/eth" "github.com/Layr-Labs/eigenda/core/indexer" corev2 "github.com/Layr-Labs/eigenda/core/v2" - v2 "github.com/Layr-Labs/eigenda/core/v2" "github.com/Layr-Labs/eigensdk-go/logging" "github.com/Layr-Labs/eigensdk-go/metrics" @@ -395,7 +394,7 @@ func (n *Node) RefreshOnchainState(ctx context.Context) error { blobParams, err := n.Transactor.GetAllVersionedBlobParams(ctx) if err == nil { if existingBlobParams == nil || !existingBlobParams.Equal(blobParams) { - n.BlobVersionParams.Store(v2.NewBlobVersionParameterMap(blobParams)) + n.BlobVersionParams.Store(corev2.NewBlobVersionParameterMap(blobParams)) } } else { n.Logger.Error("error fetching blob params", "err", err) @@ -407,7 +406,7 @@ func (n *Node) RefreshOnchainState(ctx context.Context) error { continue } - existingURLs := map[v2.RelayKey]string{} + existingURLs := map[corev2.RelayKey]string{} if existingRelayClient != nil { existingURLs = existingRelayClient.GetSockets() }