pass the p2pclient instead of the key

Author: facundomedica

go.mod

@@ -2,12 +2,12 @@ module github.com/rollkit/go-execution-abci
 
 go 1.23.3
 
+toolchain go1.24.1
+
 require (
 	github.com/celestiaorg/go-header v0.6.4
 	github.com/cosmos/cosmos-sdk v0.50.12
 	github.com/gorilla/rpc v1.2.1
-	github.com/ipfs/go-datastore v0.7.0
-	github.com/rollkit/go-execution v0.2.3
 	github.com/rollkit/go-sequencing v0.4.1
 	github.com/rollkit/rollkit/core v0.0.0-00010101000000-000000000000
 )
@@ -51,6 +51,7 @@ require (
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/ipfs/boxo v0.27.4 // indirect
+	github.com/ipfs/go-datastore v0.7.0 // indirect
 	github.com/ipfs/go-ds-badger4 v0.1.5 // indirect
 	github.com/ipfs/go-log v1.0.5 // indirect
 	github.com/ipld/go-ipld-prime v0.21.0 // indirect
@@ -107,6 +108,7 @@ require (
 	github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
 	github.com/raulk/go-watchdog v1.3.0 // indirect
 	github.com/rollkit/go-da v0.9.0 // indirect
+	github.com/rollkit/go-execution v0.2.3 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
@@ -285,5 +287,6 @@ require (
 replace (
 	github.com/rollkit/rollkit => ../rollkit
 	github.com/rollkit/rollkit/core => ../rollkit/core
+	github.com/rollkit/rollkit/da => ../rollkit/da
 	github.com/rollkit/rollkit/p2p => ../rollkit/p2p
 )

server/start.go

@@ -7,7 +7,7 @@ import (
 	"os"
 
 	cmtcfg "github.com/cometbft/cometbft/config"
-	"github.com/cometbft/cometbft/p2p"
+	cmtp2p "github.com/cometbft/cometbft/p2p"
 	pvm "github.com/cometbft/cometbft/privval"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -20,6 +20,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/version"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/hashicorp/go-metrics"
+	"github.com/rollkit/rollkit/p2p"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -242,7 +243,7 @@ func startNode(
 	app sdktypes.Application,
 	svrCtx *server.Context,
 ) (rolllkitNode node.Node, cleanupFn func(), err error) {
-	nodeKey, err := p2p.LoadOrGenNodeKey(cfg.NodeKeyFile())
+	nodeKey, err := cmtp2p.LoadOrGenNodeKey(cfg.NodeKeyFile())
 	if err != nil {
 		return nil, cleanupFn, err
 	}
@@ -257,7 +258,7 @@ func startNode(
 		return nil, cleanupFn, err
 	}
 
-	signingKey, err := types.GetNodeKey(&p2p.NodeKey{PrivKey: pval.Key.PrivKey})
+	signingKey, err := types.GetNodeKey(&cmtp2p.NodeKey{PrivKey: pval.Key.PrivKey})
 	if err != nil {
 		return nil, cleanupFn, err
 	}
@@ -294,27 +295,34 @@ func startNode(
 		return nil, cleanupFn, err
 	}
 
+	metrics := node.DefaultMetricsProvider(cmtcfg.DefaultInstrumentationConfig())
+
+	_, p2pMetrics := metrics(cmtGenDoc.ChainID)
+	p2pClient, err := p2p.NewClient(nodeConfig.P2P, p2pKey, cmtGenDoc.ChainID, database, svrCtx.Logger.With("module", "p2p"), p2pMetrics)
+	if err != nil {
+		return nil, cleanupFn, err
+	}
+
 	executor := adapter.NewABCIExecutor(
 		app,
 		store.New(database),
-		nil,
+		p2pClient,
 		svrCtx.Logger,
 		cfg,
-		appGenesis, // pass AppGenesis to the executor
+		appGenesis,
 	)
+
 	ctxWithCancel, cancelFn := context.WithCancel(ctx)
 	cleanupFn = func() {
 		cancelFn()
 	}
 
-	metrics := node.DefaultMetricsProvider(cmtcfg.DefaultInstrumentationConfig())
-
 	rolllkitNode, err = node.NewNode(
 		ctxWithCancel,
 		nodeConfig,
 		executor,
 		node.NewDummySequencer(),
-		p2pKey,
+		p2pClient,
 		signingKey,
 		cmtGenDoc,
 		database,