diff --git a/disperser/batcher/grpc/dispatcher.go b/disperser/batcher/grpc/dispatcher.go index ca84504ffb..1ea3375444 100644 --- a/disperser/batcher/grpc/dispatcher.go +++ b/disperser/batcher/grpc/dispatcher.go @@ -132,7 +132,7 @@ func (c *dispatcher) sendChunks(ctx context.Context, blobs []*core.BlobMessage, if err != nil { return nil, err } - c.logger.Debug("sending chunks to operator", "operator", op.Socket, "num blobs", len(blobs), "size", totalSize, "request message size", proto.Size(request), "request serialization time", time.Since(start)) + c.logger.Debug("sending chunks to operator", "operator", op.Socket, "num blobs", len(blobs), "size", totalSize, "request message size", proto.Size(request), "request serialization time", time.Since(start), "use Gnark chunk encoding", c.EnableGnarkBundleEncoding) opt := grpc.MaxCallSendMsgSize(60 * 1024 * 1024 * 1024) reply, err := gc.StoreChunks(ctx, request, opt) @@ -173,7 +173,7 @@ func (c *dispatcher) SendBlobsToOperator(ctx context.Context, blobs []*core.Blob if err != nil { return nil, err } - c.logger.Debug("sending chunks to operator", "operator", op.Socket, "num blobs", len(blobs), "size", totalSize, "request message size", proto.Size(request), "request serialization time", time.Since(start)) + c.logger.Debug("sending chunks to operator", "operator", op.Socket, "num blobs", len(blobs), "size", totalSize, "request message size", proto.Size(request), "request serialization time", time.Since(start), "use Gnark chunk encoding", c.EnableGnarkBundleEncoding) opt := grpc.MaxCallSendMsgSize(60 * 1024 * 1024 * 1024) reply, err := gc.StoreBlobs(ctx, request, opt) diff --git a/node/grpc/server.go b/node/grpc/server.go index d1f76f5c8e..7329e638d7 100644 --- a/node/grpc/server.go +++ b/node/grpc/server.go @@ -388,6 +388,7 @@ func (s *Server) RetrieveChunks(ctx context.Context, in *pb.RetrieveChunksReques return nil, fmt.Errorf("could not find chunks for batchHeaderHash %v, blob index: %v, quorumID: %v", hex.EncodeToString(batchHeaderHash[:]), in.GetBlobIndex(), in.GetQuorumId()) } if !s.config.EnableGnarkBundleEncoding && format == pb.ChunkEncodingFormat_GNARK { + s.node.Logger.Info("Converting chunks from Gnark back to Gob", "batchHeaderHash", hex.EncodeToString(batchHeaderHash[:]), "blobIndex", in.GetBlobIndex(), "quorumId", in.GetQuorumId()) format = pb.ChunkEncodingFormat_GOB gobChunks := make([][]byte, 0, len(chunks)) for _, c := range chunks { diff --git a/node/node.go b/node/node.go index 48aeffd5c8..a90c593e81 100644 --- a/node/node.go +++ b/node/node.go @@ -158,7 +158,7 @@ func NewNode(reg *prometheus.Registry, config *Config, pubIPProvider pubip.Provi nodeLogger.Info("Creating node", "chainID", chainID.String(), "operatorID", config.ID.Hex(), "dispersalPort", config.DispersalPort, "retrievalPort", config.RetrievalPort, "churnerUrl", config.ChurnerUrl, "quorumIDs", fmt.Sprint(config.QuorumIDList), "registerNodeAtStart", config.RegisterNodeAtStart, "pubIPCheckInterval", config.PubIPCheckInterval, - "eigenDAServiceManagerAddr", config.EigenDAServiceManagerAddr, "blockStaleMeasure", blockStaleMeasure, "storeDurationBlocks", storeDurationBlocks) + "eigenDAServiceManagerAddr", config.EigenDAServiceManagerAddr, "blockStaleMeasure", blockStaleMeasure, "storeDurationBlocks", storeDurationBlocks, "enableGnarkBundleEncoding", config.EnableGnarkBundleEncoding) return &Node{ Config: config, diff --git a/node/store.go b/node/store.go index 2cb3265e55..c0afb7111b 100644 --- a/node/store.go +++ b/node/store.go @@ -594,12 +594,13 @@ func (s *Store) GetChunks(ctx context.Context, batchHeaderHash [32]byte, blobInd if err != nil { return nil, node.ChunkEncodingFormat_UNKNOWN, err } - log.Debug("Retrieved chunk", "blobKey", hexutil.Encode(blobKey), "length", len(data)) chunks, format, err := DecodeChunks(data) if err != nil { return nil, format, err } + log.Debug("Retrieved chunk", "blobKey", hexutil.Encode(blobKey), "length", len(data), "chunk encoding format", format) + return chunks, format, nil }