Skip to content

Commit 4e69248

Browse files
committed
chore: add new commands, fix linter errors, cleanup
1 parent 84a9a7f commit 4e69248

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

block/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ func (m *Manager) publishBlock(ctx context.Context) error {
11951195
}
11961196

11971197
m.logger.Debug("Submitting transaction to sequencer",
1198-
"txCount", len(execTxs), "rollupId", m.genesis.ChainID)
1198+
"txCount", len(execTxs))
11991199
_, err = m.sequencer.SubmitRollupBatchTxs(ctx, coresequencer.SubmitRollupBatchTxsRequest{
12001200
RollupId: sequencing.RollupId(m.genesis.ChainID),
12011201
Batch: &coresequencer.Batch{Transactions: execTxs},

node/full.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ func (n *FullNode) Run(ctx context.Context) error {
392392
go n.headerPublishLoop(ctx)
393393
go n.dataPublishLoop(ctx)
394394
} else {
395-
//go n.blockManager.RetrieveLoop(ctx)
396395
go n.blockManager.HeaderStoreRetrieveLoop(ctx)
397396
go n.blockManager.DataStoreRetrieveLoop(ctx)
398397
go n.blockManager.SyncLoop(ctx)

rollups/evm/single/cmd/main.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import (
44
"fmt"
55
"os"
66

7-
rollkitconfig "github.com/rollkit/rollkit/pkg/config"
87
"github.com/spf13/cobra"
98

109
"github.com/rollkit/rollkit/pkg/cmd"
10+
rollkitconfig "github.com/rollkit/rollkit/pkg/config"
1111
)
1212

1313
func main() {
1414
// Initiate the root command
15-
rootCmd := cobra.Command{
15+
rootCmd := &cobra.Command{
1616
Use: "evm-single",
1717
Short: "Rollkit with EVM; single sequencer",
1818
}
1919

20-
rollkitconfig.AddGlobalFlags(&rootCmd, "evm-single")
20+
rollkitconfig.AddGlobalFlags(rootCmd, "evm-single")
2121

2222
// Add subcommands to the root command
2323
initCmd := cmd.InitCmd
@@ -26,6 +26,9 @@ func main() {
2626
rootCmd.AddCommand(
2727
initCmd,
2828
RunCmd,
29+
cmd.NewDocsGenCmd(rootCmd, "evm-single"),
30+
cmd.VersionCmd,
31+
cmd.NodeInfoCmd,
2932
)
3033

3134
if err := rootCmd.Execute(); err != nil {

rollups/evm/single/cmd/run.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/ethereum/go-ethereum/common"
6-
evm "github.com/rollkit/go-execution-evm"
7-
"github.com/rollkit/rollkit/core/execution"
85
"os"
6+
"path/filepath"
97

108
"cosmossdk.io/log"
9+
"github.com/ethereum/go-ethereum/common"
1110
"github.com/spf13/cobra"
1211

12+
evm "github.com/rollkit/go-execution-evm"
13+
1314
coreda "github.com/rollkit/rollkit/core/da"
15+
"github.com/rollkit/rollkit/core/execution"
1416
coresequencer "github.com/rollkit/rollkit/core/sequencer"
1517
"github.com/rollkit/rollkit/da"
1618
rollcmd "github.com/rollkit/rollkit/pkg/cmd"
@@ -42,7 +44,7 @@ var RunCmd = &cobra.Command{
4244
logger := log.NewLogger(os.Stdout)
4345
dac := da.NewDAClient(dummyDA, 0, 1.0, []byte("test"), []byte(""), logger)
4446

45-
nodeKey, err := key.LoadNodeKey(nodeConfig.ConfigPath())
47+
nodeKey, err := key.LoadNodeKey(filepath.Dir(nodeConfig.ConfigPath()))
4648
if err != nil {
4749
panic(err)
4850
}

0 commit comments

Comments
 (0)