Skip to content

Commit a834a34

Browse files
author
tac0turtle
committed
cleanup chainid duplicate
1 parent 3c75c61 commit a834a34

File tree

21 files changed

+99
-91
lines changed

21 files changed

+99
-91
lines changed

‎apps/evm/based/cmd/init.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func InitCmd() *cobra.Command {
5555
}
5656

5757
// get chain ID or use default
58-
chainID, _ := cmd.Flags().GetString(rollconf.FlagChainID)
58+
chainID, _ := cmd.Flags().GetString("chain-id")
5959
if chainID == "" {
6060
chainID = "rollkit-test"
6161
}
@@ -85,6 +85,7 @@ func InitCmd() *cobra.Command {
8585

8686
// Add flags to the command
8787
rollconf.AddFlags(initCmd)
88+
initCmd.Flags().String("chain-id", "rollkit-test", "chain ID")
8889

8990
return initCmd
9091
}

‎apps/evm/based/cmd/run.go‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/evstack/ev-node/da/jsonrpc"
1616
rollcmd "github.com/evstack/ev-node/pkg/cmd"
1717
rollconf "github.com/evstack/ev-node/pkg/config"
18+
genesispkg "github.com/evstack/ev-node/pkg/genesis"
1819
"github.com/evstack/ev-node/pkg/p2p"
1920
"github.com/evstack/ev-node/pkg/p2p/key"
2021
"github.com/evstack/ev-node/pkg/store"
@@ -138,11 +139,16 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
138139
return fmt.Errorf("failed to create datastore: %w", err)
139140
}
140141

142+
genesisPath := filepath.Join(filepath.Dir(nodeConfig.ConfigPath()), "genesis.json")
143+
genesis, err := genesispkg.LoadGenesis(genesisPath)
144+
if err != nil {
145+
return fmt.Errorf("failed to load genesis: %w", err)
146+
}
141147
// Pass raw DA implementation and namespace to NewSequencer
142148
sequencer, err := based.NewSequencer(
143149
logger,
144150
basedDA,
145-
[]byte(nodeConfig.ChainID),
151+
[]byte(genesis.ChainID),
146152
basedStartHeight,
147153
basedMaxHeightDrift,
148154
datastore,
@@ -164,7 +170,7 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
164170
return fmt.Errorf("failed to load node key: %w", err)
165171
}
166172

167-
p2pClient, err := p2p.NewClient(nodeConfig, nodeKey, datastore, logger, p2p.NopMetrics())
173+
p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, p2p.NopMetrics())
168174
if err != nil {
169175
return fmt.Errorf("failed to create P2P client: %w", err)
170176
}
@@ -173,7 +179,7 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
173179
// StartNode might need adjustment if it strictly requires coreda.Client methods.
174180
// For now, assume it can work with coreda.DA or will be adjusted later.
175181
// We also need to pass the namespace config for rollDA.
176-
return rollcmd.StartNode(logger, cmd, executor, sequencer, rollDA, p2pClient, datastore, nodeConfig, node.NodeOptions{})
182+
return rollcmd.StartNode(logger, cmd, executor, sequencer, rollDA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
177183
},
178184
}
179185

‎apps/evm/single/cmd/init.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func InitCmd() *cobra.Command {
5555
}
5656

5757
// get chain ID or use default
58-
chainID, _ := cmd.Flags().GetString(rollconf.FlagChainID)
58+
chainID, _ := cmd.Flags().GetString("chain-id")
5959
if chainID == "" {
6060
chainID = "rollkit-test"
6161
}
@@ -85,6 +85,7 @@ func InitCmd() *cobra.Command {
8585

8686
// Add flags to the command
8787
rollconf.AddFlags(initCmd)
88+
initCmd.Flags().String("chain-id", "rollkit-test", "chain ID")
8889

8990
return initCmd
9091
}

‎apps/evm/single/cmd/run.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/evstack/ev-node/core/execution"
1818
rollcmd "github.com/evstack/ev-node/pkg/cmd"
1919
"github.com/evstack/ev-node/pkg/config"
20+
genesispkg "github.com/evstack/ev-node/pkg/genesis"
2021
"github.com/evstack/ev-node/pkg/p2p"
2122
"github.com/evstack/ev-node/pkg/p2p/key"
2223
"github.com/evstack/ev-node/pkg/store"
@@ -49,7 +50,13 @@ var RunCmd = &cobra.Command{
4950
return err
5051
}
5152

52-
singleMetrics, err := single.DefaultMetricsProvider(nodeConfig.Instrumentation.IsPrometheusEnabled())(nodeConfig.ChainID)
53+
genesisPath := filepath.Join(filepath.Dir(nodeConfig.ConfigPath()), "genesis.json")
54+
genesis, err := genesispkg.LoadGenesis(genesisPath)
55+
if err != nil {
56+
return fmt.Errorf("failed to load genesis: %w", err)
57+
}
58+
59+
singleMetrics, err := single.DefaultMetricsProvider(nodeConfig.Instrumentation.IsPrometheusEnabled())(genesis.ChainID)
5360
if err != nil {
5461
return err
5562
}
@@ -59,7 +66,7 @@ var RunCmd = &cobra.Command{
5966
logger,
6067
datastore,
6168
&daJrpc.DA,
62-
[]byte(nodeConfig.ChainID),
69+
[]byte(genesis.ChainID),
6370
nodeConfig.Node.BlockTime.Duration,
6471
singleMetrics,
6572
nodeConfig.Node.Aggregator,
@@ -73,12 +80,12 @@ var RunCmd = &cobra.Command{
7380
return err
7481
}
7582

76-
p2pClient, err := p2p.NewClient(nodeConfig, nodeKey, datastore, logger, nil)
83+
p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, nil)
7784
if err != nil {
7885
return err
7986
}
8087

81-
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, node.NodeOptions{})
88+
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
8289
},
8390
}
8491

‎apps/grpc/single/cmd/init.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ This will create the necessary configuration structure in the specified root dir
5757
}
5858

5959
// get chain ID or use default
60-
chainID, _ := cmd.Flags().GetString(rollconf.FlagChainID)
60+
chainID, _ := cmd.Flags().GetString("chain-id")
6161
if chainID == "" {
6262
chainID = "grpc-test-chain"
6363
}
@@ -87,6 +87,7 @@ This will create the necessary configuration structure in the specified root dir
8787

8888
// Add configuration flags
8989
rollconf.AddFlags(initCmd)
90+
initCmd.Flags().String("chain-id", "grpc-test-chain", "chain ID")
9091

9192
return initCmd
9293
}

‎apps/grpc/single/cmd/run.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/evstack/ev-node/node"
1313
rollcmd "github.com/evstack/ev-node/pkg/cmd"
1414
"github.com/evstack/ev-node/pkg/config"
15+
rollgenesis "github.com/evstack/ev-node/pkg/genesis"
1516
"github.com/evstack/ev-node/pkg/p2p"
1617
"github.com/evstack/ev-node/pkg/p2p/key"
1718
"github.com/evstack/ev-node/pkg/store"
@@ -56,8 +57,14 @@ The execution client must implement the Rollkit execution gRPC interface.`,
5657
return err
5758
}
5859

60+
// Load genesis
61+
genesis, err := rollgenesis.LoadGenesis(rollgenesis.GenesisPath(nodeConfig.RootDir))
62+
if err != nil {
63+
return err
64+
}
65+
5966
// Create metrics provider
60-
singleMetrics, err := single.DefaultMetricsProvider(nodeConfig.Instrumentation.IsPrometheusEnabled())(nodeConfig.ChainID)
67+
singleMetrics, err := single.DefaultMetricsProvider(nodeConfig.Instrumentation.IsPrometheusEnabled())(genesis.ChainID)
6168
if err != nil {
6269
return err
6370
}
@@ -68,7 +75,7 @@ The execution client must implement the Rollkit execution gRPC interface.`,
6875
logger,
6976
datastore,
7077
&daJrpc.DA,
71-
[]byte(nodeConfig.ChainID),
78+
[]byte(genesis.ChainID),
7279
nodeConfig.Node.BlockTime.Duration,
7380
singleMetrics,
7481
nodeConfig.Node.Aggregator,
@@ -84,13 +91,13 @@ The execution client must implement the Rollkit execution gRPC interface.`,
8491
}
8592

8693
// Create P2P client
87-
p2pClient, err := p2p.NewClient(nodeConfig, nodeKey, datastore, logger, nil)
94+
p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, nil)
8895
if err != nil {
8996
return err
9097
}
9198

9299
// Start the node
93-
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, node.NodeOptions{})
100+
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
94101
},
95102
}
96103

‎apps/testapp/cmd/init.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func InitCmd() *cobra.Command {
5555
}
5656

5757
// get chain ID or use default
58-
chainID, _ := cmd.Flags().GetString(rollconf.FlagChainID)
58+
chainID, _ := cmd.Flags().GetString("chain-id")
5959
if chainID == "" {
6060
chainID = "rollkit-test"
6161
}
@@ -85,6 +85,7 @@ func InitCmd() *cobra.Command {
8585

8686
// Add flags to the command
8787
rollconf.AddFlags(initCmd)
88+
initCmd.Flags().String("chain-id", "rollkit-test", "chain ID")
8889

8990
return initCmd
9091
}

‎apps/testapp/cmd/run.go‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/evstack/ev-node/da/jsonrpc"
1212
"github.com/evstack/ev-node/node"
1313
rollcmd "github.com/evstack/ev-node/pkg/cmd"
14+
genesispkg "github.com/evstack/ev-node/pkg/genesis"
1415
"github.com/evstack/ev-node/pkg/p2p"
1516
"github.com/evstack/ev-node/pkg/p2p/key"
1617
"github.com/evstack/ev-node/pkg/store"
@@ -75,12 +76,18 @@ var RunCmd = &cobra.Command{
7576
}
7677
}
7778

79+
genesisPath := filepath.Join(filepath.Dir(nodeConfig.ConfigPath()), "genesis.json")
80+
genesis, err := genesispkg.LoadGenesis(genesisPath)
81+
if err != nil {
82+
return fmt.Errorf("failed to load genesis: %w", err)
83+
}
84+
7885
sequencer, err := single.NewSequencer(
7986
ctx,
8087
logger,
8188
datastore,
8289
&daJrpc.DA,
83-
[]byte(nodeConfig.ChainID),
90+
[]byte(genesis.ChainID),
8491
nodeConfig.Node.BlockTime.Duration,
8592
singleMetrics,
8693
nodeConfig.Node.Aggregator,
@@ -89,11 +96,11 @@ var RunCmd = &cobra.Command{
8996
return err
9097
}
9198

92-
p2pClient, err := p2p.NewClient(nodeConfig, nodeKey, datastore, logger, p2p.NopMetrics())
99+
p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, datastore, genesis.ChainID, logger, p2p.NopMetrics())
93100
if err != nil {
94101
return err
95102
}
96103

97-
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, node.NodeOptions{})
104+
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig, genesis, node.NodeOptions{})
98105
},
99106
}

‎block/publish_block_p2p_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func setupBlockManager(t *testing.T, ctx context.Context, workDir string, mainKV
178178
}
179179

180180
logger := logging.Logger("test")
181-
p2pClient, err := p2p.NewClient(nodeConfig, nodeKey, mainKV, logger, p2p.NopMetrics())
181+
p2pClient, err := p2p.NewClient(nodeConfig.P2P, nodeKey.PrivKey, mainKV, genesisDoc.ChainID, logger, p2p.NopMetrics())
182182
require.NoError(t, err)
183183

184184
// Start p2p client before creating sync service

‎node/full_node_integration_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ func testTwoChainsInOneNamespace(t *testing.T, chainID1 string, chainID2 string)
421421

422422
// Set up nodes for the first chain
423423
configChain1 := getTestConfig(t, 1)
424-
configChain1.ChainID = chainID1
425424

426425
nodes1, cleanups := createNodesWithCleanup(t, 1, configChain1)
427426
for _, cleanup := range cleanups {
@@ -430,7 +429,6 @@ func testTwoChainsInOneNamespace(t *testing.T, chainID1 string, chainID2 string)
430429

431430
// Set up nodes for the second chain
432431
configChain2 := getTestConfig(t, 1000)
433-
configChain2.ChainID = chainID2
434432

435433
nodes2, cleanups := createNodesWithCleanup(t, 1, configChain2)
436434
for _, cleanup := range cleanups {

0 commit comments

Comments
 (0)