Merge branch 'main' into julien/strategies

Author: julienrbrt

block/internal/syncing/da_retriever.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/rs/zerolog"
@@ -72,10 +71,6 @@ func (r *DARetriever) RetrieveFromDA(ctx context.Context, daHeight uint64) ([]co
 
 	blobsResp, err := r.fetchBlobs(ctx, daHeight)
 	if err != nil {
-		if strings.Contains(err.Error(), coreda.ErrHeightFromFuture.Error()) {
-			return nil, fmt.Errorf("%w: height from future", coreda.ErrHeightFromFuture)
-		}
-
 		return nil, err
 	}
 
@@ -84,11 +79,6 @@ func (r *DARetriever) RetrieveFromDA(ctx context.Context, daHeight uint64) ([]co
 		return nil, err
 	}
 
-	if blobsResp.Code == coreda.StatusNotFound {
-		r.logger.Debug().Uint64("da_height", daHeight).Msg("no blob data found")
-		return nil, coreda.ErrBlobNotFound
-	}
-
 	r.logger.Debug().Int("blobs", len(blobsResp.Data)).Uint64("da_height", daHeight).Msg("retrieved blob data")
 	return r.processBlobs(ctx, blobsResp.Data, daHeight), nil
 }
@@ -107,13 +97,15 @@ func (r *DARetriever) fetchBlobs(ctx context.Context, daHeight uint64) (coreda.R
 
 	// Validate responses
 	headerErr := r.validateBlobResponse(headerRes, daHeight)
-	dataErr := r.validateBlobResponse(dataRes, daHeight)
+	// ignoring error not found, as data can have data
+	if headerErr != nil && !errors.Is(headerErr, coreda.ErrBlobNotFound) {
+		return headerRes, headerErr
+	}
 
-	// Handle errors
-	if errors.Is(headerErr, coreda.ErrHeightFromFuture) || errors.Is(dataErr, coreda.ErrHeightFromFuture) {
-		return coreda.ResultRetrieve{
-			BaseResult: coreda.BaseResult{Code: coreda.StatusHeightFromFuture},
-		}, fmt.Errorf("%w: height from future", coreda.ErrHeightFromFuture)
+	dataErr := r.validateBlobResponse(dataRes, daHeight)
+	// ignoring error not found, as header can have data
+	if dataErr != nil && !errors.Is(dataErr, coreda.ErrBlobNotFound) {
+		return dataRes, dataErr
 	}
 
 	// Combine successful results
@@ -127,28 +119,35 @@ func (r *DARetriever) fetchBlobs(ctx context.Context, daHeight uint64) (coreda.R
 
 	if headerRes.Code == coreda.StatusSuccess {
 		combinedResult.Data = append(combinedResult.Data, headerRes.Data...)
-		if len(headerRes.IDs) > 0 {
-			combinedResult.IDs = append(combinedResult.IDs, headerRes.IDs...)
-		}
+		combinedResult.IDs = append(combinedResult.IDs, headerRes.IDs...)
 	}
 
 	if dataRes.Code == coreda.StatusSuccess {
 		combinedResult.Data = append(combinedResult.Data, dataRes.Data...)
-		if len(dataRes.IDs) > 0 {
-			combinedResult.IDs = append(combinedResult.IDs, dataRes.IDs...)
-		}
+		combinedResult.IDs = append(combinedResult.IDs, dataRes.IDs...)
+	}
+
+	// Re-throw error not found if both were not found.
+	if len(combinedResult.Data) == 0 && len(combinedResult.IDs) == 0 {
+		r.logger.Debug().Uint64("da_height", daHeight).Msg("no blob data found")
+		combinedResult.Code = coreda.StatusNotFound
+		combinedResult.Message = coreda.ErrBlobNotFound.Error()
+		return combinedResult, coreda.ErrBlobNotFound
 	}
 
 	return combinedResult, nil
 }
 
 // validateBlobResponse validates a blob response from DA layer
+// those are the only error code returned by da.RetrieveWithHelpers
 func (r *DARetriever) validateBlobResponse(res coreda.ResultRetrieve, daHeight uint64) error {
 	switch res.Code {
 	case coreda.StatusError:
 		return fmt.Errorf("DA retrieval failed: %s", res.Message)
 	case coreda.StatusHeightFromFuture:
 		return fmt.Errorf("%w: height from future", coreda.ErrHeightFromFuture)
+	case coreda.StatusNotFound:
+		return fmt.Errorf("%w: blob not found", coreda.ErrBlobNotFound)
 	case coreda.StatusSuccess:
 		r.logger.Debug().Uint64("da_height", daHeight).Msg("successfully retrieved from DA")
 		return nil

block/internal/syncing/da_retriever_test.go

@@ -69,11 +69,28 @@ func makeSignedDataBytes(t *testing.T, chainID string, height uint64, proposer [
 	return bin, sd
 }
 
+func TestDARetriever_RetrieveFromDA_Invalid(t *testing.T) {
+	ds := dssync.MutexWrap(datastore.NewMapDatastore())
+	st := store.New(ds)
+	cm, err := cache.NewManager(config.DefaultConfig(), st, zerolog.Nop())
+	assert.NoError(t, err)
+
+	mockDA := testmocks.NewMockDA(t)
+
+	mockDA.EXPECT().GetIDs(mock.Anything, mock.Anything, mock.Anything).
+		Return(nil, errors.New("just invalid")).Maybe()
+
+	r := NewDARetriever(mockDA, cm, config.DefaultConfig(), genesis.Genesis{}, common.DefaultBlockOptions(), zerolog.Nop())
+	events, err := r.RetrieveFromDA(context.Background(), 42)
+	assert.Error(t, err)
+	assert.Len(t, events, 0)
+}
+
 func TestDARetriever_RetrieveFromDA_NotFound(t *testing.T) {
 	ds := dssync.MutexWrap(datastore.NewMapDatastore())
 	st := store.New(ds)
 	cm, err := cache.NewManager(config.DefaultConfig(), st, zerolog.Nop())
-	require.NoError(t, err)
+	assert.NoError(t, err)
 
 	mockDA := testmocks.NewMockDA(t)
 
@@ -83,7 +100,7 @@ func TestDARetriever_RetrieveFromDA_NotFound(t *testing.T) {
 
 	r := NewDARetriever(mockDA, cm, config.DefaultConfig(), genesis.Genesis{}, common.DefaultBlockOptions(), zerolog.Nop())
 	events, err := r.RetrieveFromDA(context.Background(), 42)
-	require.Error(t, err, coreda.ErrBlobNotFound)
+	assert.True(t, errors.Is(err, coreda.ErrBlobNotFound))
 	assert.Len(t, events, 0)
 }
 

docs/adr/adr-017-node-pruning.md

@@ -943,5 +943,5 @@ Proposed
 ## References
 
 - [Rollkit Store Implementation](https://github.com/evstack/ev-node/blob/main/pkg/store/store.go)
-- [Block Manager](https://github.com/evstack/ev-node/blob/main/block/manager.go)
+- [Block components](https://github.com/evstack/ev-node/blob/main/block/components.go)
 - [Store Interface](https://github.com/evstack/ev-node/blob/main/pkg/store/types.go)

docs/guides/da/celestia-da.md

@@ -9,7 +9,7 @@ import constants from '../../.vitepress/constants/constants.js'
 
 This tutorial serves as a comprehensive guide for deploying your chain on Celestia's data availability (DA) network. From the Evolve perspective, there's no difference in posting blocks to Celestia's testnets or Mainnet Beta.
 
-Before proceeding, ensure that you have completed the [gm-world](./gm-world.md) tutorial, which covers installing the Testapp CLI and running a chain against a local DA network.
+Before proceeding, ensure that you have completed the [gm-world](../gm-world.md) tutorial, which covers installing the Testapp CLI and running a chain against a local DA network.
 
 ## 🪶 Running a Celestia light node
 
@@ -46,7 +46,7 @@ After successfully starting a light node, it's time to start posting the batches
 
 ## 🏗️ Prerequisites {#prerequisites}
 
-- `gmd` CLI installed from the [gm-world](./gm-world.md) tutorial.
+- `gmd` CLI installed from the [gm-world](../gm-world.md) tutorial.
 
 ## 🛠️ Configuring flags for DA
 

docs/guides/da/local-da.md

@@ -9,7 +9,7 @@ import constants from '../../.vitepress/constants/constants.js'
 
 This tutorial serves as a comprehensive guide for using the [local-da](https://github.com/evstack/ev-node/tree/main/da/cmd/local-da) with your chain.
 
-Before proceeding, ensure that you have completed the [build a chain](./gm-world.md) tutorial, which covers setting-up, building and running your chain.
+Before proceeding, ensure that you have completed the [build a chain](../gm-world.md) tutorial, which covers setting-up, building and running your chain.
 
 ## Setting Up a Local DA Network
 

docs/guides/da/visualizer.md

@@ -235,6 +235,6 @@ done
 
 ## Related Configuration
 
-For complete DA layer configuration options, see the [Config Reference](../learn/config.md#data-availability-configuration-da).
+For complete DA layer configuration options, see the [Config Reference](../../learn/config.md#data-availability-configuration-da).
 
-For metrics and monitoring setup, see the [Metrics Guide](./metrics.md).
+For metrics and monitoring setup, see the [Metrics Guide](../metrics.md).

docs/guides/execution/cosmwasm.md

@@ -24,7 +24,7 @@ this tutorial.
 
 ## 💻 CosmWasm dependency {#dependencies}
 
-As with the [GM Chain](./gm-world.md), we use [kurtosis](https://docs.kurtosis.com/) to help with managing all the services we need to run. You can [install kurtosis here](https://docs.kurtosis.com/install).
+As with the [GM Chain](../gm-world.md), we use [kurtosis](https://docs.kurtosis.com/) to help with managing all the services we need to run. You can [install kurtosis here](https://docs.kurtosis.com/install).
 
 Once installed, you can verify the installation by running:
 
@@ -174,7 +174,7 @@ we want it to be as small as possible.
 <!-- markdownlint-disable MD051 -->
 
 The CosmWasm team provides a tool called `rust-optimizer`, which requires
-[Docker](#docker-installation) in order to compile.
+Docker in order to compile.
 
 <!-- markdownlint-enable MD051 -->
 

docs/guides/gm-world.md

@@ -284,7 +284,9 @@ Connecting your wallet to your chain is as straightforward as connecting to any
 
 ## 🔗 Connecting your wallet
 
+<!-- markdown-link-check-disable -->
 Simply open your browser and go to [http://localhost:3000](https://localhost:3000) and use the Ignite UI to interact with your chain.
+<!-- markdown-link-check-enable -->
 
 Click the "Connect Wallet" button on the page, and approve the connection request in the Keplr prompt.
 

docs/learn/config.md

@@ -25,7 +25,7 @@ This document provides a comprehensive reference for all configuration options a
   - [DA Gas Multiplier](#da-gas-multiplier)
   - [DA Submit Options](#da-submit-options)
   - [DA Namespace](#da-namespace)
-  - [DA Header Namespace](#da-header-namespace)
+  - [DA Header Namespace](#da-namespace)
   - [DA Data Namespace](#da-data-namespace)
   - [DA Block Time](#da-block-time)
   - [DA Start Height](#da-start-height)
@@ -623,7 +623,7 @@ _Example:_ `--rollkit.rpc.enable_da_visualization`
 _Default:_ `false`
 _Constant:_ `FlagRPCEnableDAVisualization`
 
-See the [DA Visualizer Guide](../guides/da/da-visualizer.md) for detailed information on using this feature.
+See the [DA Visualizer Guide](../guides/da/visualizer.md) for detailed information on using this feature.
 
 ## Instrumentation Configuration (`instrumentation`)
 

docs/learn/data-availability.md

@@ -28,6 +28,6 @@ Evolve is designed to be DA-agnostic, meaning it can integrate with different da
 
 ## Learn More
 
-- [Set up a local DA](./guides/da/local-da.md)
-- [Set up Celestia DA](./guides/da/celestia-da.md)
+- [Set up a local DA](../guides/da/local-da.md)
+- [Set up Celestia DA](../guides/da/celestia-da.md)
 - [Celestia Docs](https://docs.celestia.org/)