Skip to content

feat: DA hints in p2p #2891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

feat: DA hints in p2p #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b04da3
wip
alpe Nov 26, 2025
044903f
x
alpe Nov 27, 2025
2c9a212
Review feedback
alpe Nov 28, 2025
e2b0520
Encapsulate hint in sync package
alpe Nov 28, 2025
aaacbde
Async DA pull
alpe Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .mockery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ packages:
dir: ./block/internal/syncing
pkgname: syncing
filename: syncer_mock.go
HeightStore:
config:
dir: ./block/internal/syncing
pkgname: syncing
filename: height_store_mock.go
github.com/evstack/ev-node/block/internal/common:
interfaces:
Broadcaster:
Expand Down
6 changes: 3 additions & 3 deletions apps/evm/cmd/rollback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"

"github.com/evstack/ev-node/pkg/sync"
ds "github.com/ipfs/go-datastore"
kt "github.com/ipfs/go-datastore/keytransform"
"github.com/spf13/cobra"
Expand All @@ -13,7 +14,6 @@ import (
"github.com/evstack/ev-node/node"
rollcmd "github.com/evstack/ev-node/pkg/cmd"
"github.com/evstack/ev-node/pkg/store"
"github.com/evstack/ev-node/types"
)

// NewRollbackCmd creates a command to rollback ev-node state by one height.
Expand Down Expand Up @@ -70,7 +70,7 @@ func NewRollbackCmd() *cobra.Command {
}

// rollback ev-node goheader state
headerStore, err := goheaderstore.NewStore[*types.SignedHeader](
headerStore, err := goheaderstore.NewStore[*sync.SignedHeaderWithDAHint](
evolveDB,
goheaderstore.WithStorePrefix("headerSync"),
goheaderstore.WithMetrics(),
Expand All @@ -79,7 +79,7 @@ func NewRollbackCmd() *cobra.Command {
return err
}

dataStore, err := goheaderstore.NewStore[*types.Data](
dataStore, err := goheaderstore.NewStore[*sync.DataWithDAHint](
evolveDB,
goheaderstore.WithStorePrefix("dataSync"),
goheaderstore.WithMetrics(),
Expand Down
9 changes: 4 additions & 5 deletions apps/testapp/cmd/rollback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ import (
"errors"
"fmt"

goheaderstore "github.com/celestiaorg/go-header/store"
kvexecutor "github.com/evstack/ev-node/apps/testapp/kv"
"github.com/evstack/ev-node/node"
rollcmd "github.com/evstack/ev-node/pkg/cmd"
"github.com/evstack/ev-node/pkg/store"
"github.com/evstack/ev-node/types"

goheaderstore "github.com/celestiaorg/go-header/store"
"github.com/evstack/ev-node/pkg/sync"
ds "github.com/ipfs/go-datastore"
kt "github.com/ipfs/go-datastore/keytransform"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -76,7 +75,7 @@ func NewRollbackCmd() *cobra.Command {
}

// rollback ev-node goheader state
headerStore, err := goheaderstore.NewStore[*types.SignedHeader](
headerStore, err := goheaderstore.NewStore[*sync.SignedHeaderWithDAHint](
evolveDB,
goheaderstore.WithStorePrefix("headerSync"),
goheaderstore.WithMetrics(),
Expand All @@ -85,7 +84,7 @@ func NewRollbackCmd() *cobra.Command {
return err
}

dataStore, err := goheaderstore.NewStore[*types.Data](
dataStore, err := goheaderstore.NewStore[*sync.DataWithDAHint](
evolveDB,
goheaderstore.WithStorePrefix("dataSync"),
goheaderstore.WithMetrics(),
Expand Down
14 changes: 7 additions & 7 deletions block/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"errors"
"fmt"

"github.com/evstack/ev-node/pkg/sync"
"github.com/rs/zerolog"

"github.com/evstack/ev-node/block/internal/cache"
"github.com/evstack/ev-node/block/internal/common"
"github.com/evstack/ev-node/block/internal/executing"
"github.com/evstack/ev-node/block/internal/reaping"
"github.com/evstack/ev-node/block/internal/submitting"
Expand Down Expand Up @@ -132,8 +132,8 @@ func NewSyncComponents(
store store.Store,
exec coreexecutor.Executor,
da coreda.DA,
headerStore common.Broadcaster[*types.SignedHeader],
dataStore common.Broadcaster[*types.Data],
headerStore *sync.HeaderSyncService,
dataStore *sync.DataSyncService,
logger zerolog.Logger,
metrics *Metrics,
blockOpts BlockOptions,
Expand Down Expand Up @@ -165,7 +165,7 @@ func NewSyncComponents(
)

// Create submitter for sync nodes (no signer, only DA inclusion processing)
daSubmitter := submitting.NewDASubmitter(daClient, config, genesis, blockOpts, metrics, logger)
daSubmitter := submitting.NewDASubmitter(daClient, config, genesis, blockOpts, metrics, logger, headerStore, dataStore)
submitter := submitting.NewSubmitter(
store,
exec,
Expand Down Expand Up @@ -198,8 +198,8 @@ func NewAggregatorComponents(
sequencer coresequencer.Sequencer,
da coreda.DA,
signer signer.Signer,
headerBroadcaster common.Broadcaster[*types.SignedHeader],
dataBroadcaster common.Broadcaster[*types.Data],
headerBroadcaster *sync.HeaderSyncService,
dataBroadcaster *sync.DataSyncService,
logger zerolog.Logger,
metrics *Metrics,
blockOpts BlockOptions,
Expand Down Expand Up @@ -247,7 +247,7 @@ func NewAggregatorComponents(

// Create DA client and submitter for aggregator nodes (with signer for submission)
daClient := NewDAClient(da, config, logger)
daSubmitter := submitting.NewDASubmitter(daClient, config, genesis, blockOpts, metrics, logger)
daSubmitter := submitting.NewDASubmitter(daClient, config, genesis, blockOpts, metrics, logger, headerBroadcaster, dataBroadcaster)
submitter := submitting.NewSubmitter(
store,
exec,
Expand Down
143 changes: 124 additions & 19 deletions block/internal/common/broadcaster_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions block/internal/common/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ type DAHeightEvent struct {
DaHeight uint64
// Source indicates where this event originated from (DA or P2P)
Source EventSource

// Optional DA height hints from P2P. first is the DA height hint for the header, second is the DA height hint for the data
DaHeightHints [2]uint64
}
11 changes: 9 additions & 2 deletions block/internal/common/expected_interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ package common
import (
"context"

"github.com/evstack/ev-node/types"
pubsub "github.com/libp2p/go-libp2p-pubsub"

"github.com/celestiaorg/go-header"
)

// broadcaster interface for P2P broadcasting
type (
HeaderP2PBroadcaster = Broadcaster[*types.SignedHeader]
DataP2PBroadcaster = Broadcaster[*types.Data]
)

// Broadcaster interface for P2P broadcasting
type Broadcaster[H header.Header[H]] interface {
WriteToStoreAndBroadcast(ctx context.Context, payload H, opts ...pubsub.PubOpt) error
Store() header.Store[H]
AppendDAHint(ctx context.Context, daHeight uint64, hashes ...types.Hash) error
GetByHeight(ctx context.Context, height uint64) (H, uint64, error)
}
8 changes: 4 additions & 4 deletions block/internal/executing/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ type Executor struct {
metrics *common.Metrics

// Broadcasting
headerBroadcaster common.Broadcaster[*types.SignedHeader]
dataBroadcaster common.Broadcaster[*types.Data]
headerBroadcaster common.HeaderP2PBroadcaster
dataBroadcaster common.DataP2PBroadcaster

// Configuration
config config.Config
Expand Down Expand Up @@ -76,8 +76,8 @@ func NewExecutor(
metrics *common.Metrics,
config config.Config,
genesis genesis.Genesis,
headerBroadcaster common.Broadcaster[*types.SignedHeader],
dataBroadcaster common.Broadcaster[*types.Data],
headerBroadcaster common.HeaderP2PBroadcaster,
dataBroadcaster common.DataP2PBroadcaster,
logger zerolog.Logger,
options common.BlockOptions,
errorCh chan<- error,
Expand Down
Loading
Loading