x

Author: alpe

apps/evm/single/cmd/run.go

@@ -19,7 +19,6 @@ import (
 	rollcmd "github.com/evstack/ev-node/pkg/cmd"
 	"github.com/evstack/ev-node/pkg/config"
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
-	"github.com/evstack/ev-node/pkg/p2p"
 	"github.com/evstack/ev-node/pkg/p2p/key"
 	"github.com/evstack/ev-node/pkg/store"
 )
@@ -95,12 +94,7 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, nil)
-		if err != nil {
-			return err
-		}
-
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
+		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }
 

apps/testapp/cmd/run.go

@@ -13,7 +13,6 @@ import (
 	"github.com/evstack/ev-node/node"
 	rollcmd "github.com/evstack/ev-node/pkg/cmd"
 	genesispkg "github.com/evstack/ev-node/pkg/genesis"
-	"github.com/evstack/ev-node/pkg/p2p"
 	"github.com/evstack/ev-node/pkg/p2p/key"
 	"github.com/evstack/ev-node/pkg/store"
 	"github.com/evstack/ev-node/sequencers/single"
@@ -106,11 +105,6 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, p2p.NopMetrics())
-		if err != nil {
-			return err
-		}
-
-		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
+		return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, datastore, nodeConfig, genesis, node.NodeOptions{})
 	},
 }

block/internal/common/raft.go

@@ -1,14 +1,22 @@
 package common
 
-import "context"
+import (
+	"context"
+)
 
 // RaftNode interface for raft consensus integration
 type RaftNode interface {
 	IsLeader() bool
-	ProposeBlock(ctx context.Context, state *RaftBlockState) error
+	NodeID() string
 	GetState() *RaftBlockState
+
+	Broadcast(ctx context.Context, state *RaftBlockState) error
+
 	SetApplyCallback(ch chan<- RaftApplyMsg)
 	Shutdown() error
+
+	AddPeer(nodeID, addr string) error
+	RemovePeer(nodeID string) error
 }
 
 // todo: refactor to use proto

block/internal/executing/executor.go

@@ -298,8 +298,7 @@ func (e *Executor) produceBlock() error {
 
 	// Check raft leadership if raft is enabled
 	if e.raftNode != nil && !e.raftNode.IsLeader() {
-		e.logger.Debug().Msg("not raft leader, skipping block production")
-		return nil
+		return errors.New("not raft leader")
 	}
 
 	currentState := e.GetLastState()
@@ -407,8 +406,7 @@ func (e *Executor) produceBlock() error {
 			Header:    headerBytes,
 			Data:      dataBytes,
 		}
-
-		if err := e.raftNode.ProposeBlock(e.ctx, raftState); err != nil {
+		if err := e.raftNode.Broadcast(e.ctx, raftState); err != nil {
 			return fmt.Errorf("failed to propose block to raft: %w", err)
 		}
 		e.logger.Debug().Uint64("height", newHeight).Msg("proposed block to raft")

block/internal/syncing/raft_retriever.go

@@ -55,7 +55,7 @@ func (r *raftRetriever) Start(ctx context.Context) error {
 		return errors.New("syncer already started")
 	}
 	ctx, r.cancel = context.WithCancel(ctx)
-	applyCh := make(chan common.RaftApplyMsg, 100)
+	applyCh := make(chan common.RaftApplyMsg)
 	r.raftNode.SetApplyCallback(applyCh)
 
 	r.wg.Add(1)

node/failover.go

@@ -63,7 +63,7 @@ func newSyncMode(
 			raftNode,
 		)
 	}
-	return setupFailoverState(nodeConfig, nodeKey, database, genesis, logger, mainKV, rktStore, blockComponentsFn)
+	return setupFailoverState(nodeConfig, nodeKey, database, genesis, logger, mainKV, rktStore, blockComponentsFn, raftNode)
 }
 func newAggregatorMode(
 	nodeConfig config.Config,
@@ -100,7 +100,7 @@ func newAggregatorMode(
 		)
 	}
 
-	return setupFailoverState(nodeConfig, nodeKey, database, genesis, logger, mainKV, rktStore, blockComponentsFn)
+	return setupFailoverState(nodeConfig, nodeKey, database, genesis, logger, mainKV, rktStore, blockComponentsFn, raftNode)
 }
 
 func setupFailoverState(
@@ -112,6 +112,7 @@ func setupFailoverState(
 	mainKV ds.Batching,
 	rktStore store.Store,
 	buildComponentsFn func(headerSyncService *evsync.HeaderSyncService, dataSyncService *evsync.DataSyncService) (*block.Components, error),
+	raftNode block.RaftNode,
 ) (*failoverState, error) {
 	p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, database, genesis.ChainID, logger, nil)
 	if err != nil {
@@ -133,7 +134,7 @@ func setupFailoverState(
 		dHeight := dataSyncService.Store().Height()
 		return min(hHeight, dHeight)
 	}
-	handler, err := rpcserver.NewServiceHandler(rktStore, p2pClient, genesis.ProposerAddress, logger, nodeConfig, bestKnownHeightProvider)
+	handler, err := rpcserver.NewServiceHandler(rktStore, p2pClient, genesis.ProposerAddress, logger, nodeConfig, bestKnownHeightProvider, raftNode)
 	if err != nil {
 		return nil, fmt.Errorf("error creating RPC handler: %w", err)
 	}