fixes

tac0turtle · Apr 18, 2025 · Apr 9, 2025 · Apr 9, 2025 · Apr 9, 2025 · Apr 9, 2025
commit 4297ab1421d3683bdc2afa552e1d306d94c12264
diff --git a/da/cmd/local-da/local.go b/da/cmd/local-da/local.go
@@ -161,7 +161,24 @@ func (d *LocalDA) Commit(ctx context.Context, blobs []coreda.Blob, _ []byte) ([]
 }
 
 // SubmitWithOptions stores blobs in DA layer (options are ignored).
-func (d *LocalDA) Submit(ctx context.Context, blobs []coreda.Blob, gasPrice float64, _ []byte, _ []byte) ([]coreda.ID, error) {
+func (d *LocalDA) SubmitWithOptions(ctx context.Context, blobs []coreda.Blob, gasPrice float64, _ []byte, _ []byte) ([]coreda.ID, error) {
+	d.logger.Info("SubmitWithOptions called", "numBlobs", len(blobs), "gasPrice", gasPrice)
+	d.mu.Lock()
+	defer d.mu.Unlock()
+	ids := make([]coreda.ID, len(blobs))
+	d.height += 1
+	d.timestamps[d.height] = time.Now()
+	for i, blob := range blobs {
+		ids[i] = append(d.nextID(), d.getHash(blob)...)
+
+		d.data[d.height] = append(d.data[d.height], kvp{ids[i], blob})
+	}
+	d.logger.Info("SubmitWithOptions successful", "newHeight", d.height, "count", len(ids))
+	return ids, nil
+}
+
+// Submit stores blobs in DA layer (options are ignored).
+func (d *LocalDA) Submit(ctx context.Context, blobs []coreda.Blob, gasPrice float64, _ []byte) ([]coreda.ID, error) {
 	d.logger.Info("Submit called", "numBlobs", len(blobs), "gasPrice", gasPrice)
 	d.mu.Lock()
 	defer d.mu.Unlock()

diff --git a/da/da_test.go b/da/da_test.go
@@ -40,7 +40,8 @@ func TestMockDAErrors(t *testing.T) {
 		// Set up the mock to throw context deadline exceeded
 		mockDA.On("MaxBlobSize", mock.Anything).Return(uint64(1234), nil)
 		mockDA.
-			On("Submit", mock.Anything, blobs, float64(-1), []byte(nil), []byte(nil)).
+			On("SubmitWithOptions", mock.Anything, blobs, float64(-1), []byte(nil), []byte(nil)).
+			// On("SubmitWithOptions", mock.Anything, blobs, float64(-1), []byte(nil), []byte(nil)).
 			After(submitTimeout).
 			Return(nil, ErrContextDeadline)
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
@@ -76,7 +77,7 @@ func TestMockDAErrors(t *testing.T) {
 		// Set up the mock to throw tx too large
 		mockDA.On("MaxBlobSize", mock.Anything).Return(uint64(1234), nil)
 		mockDA.
-			On("Submit", mock.Anything, blobs, float64(-1), []byte(nil), []byte(nil)).
+			On("SubmitWithOptions", mock.Anything, blobs, float64(-1), []byte(nil), []byte(nil)).
 			Return([]coreda.ID{}, ErrTxTooLarge)
 
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second)

diff --git a/rollups/evm/based/cmd/init.go b/rollups/evm/based/cmd/init.go
@@ -0,0 +1,75 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	rollcmd "github.com/rollkit/rollkit/pkg/cmd"
+	rollconf "github.com/rollkit/rollkit/pkg/config"
+)
+
+// InitCmd initializes a new rollkit.yaml file in the current directory
+func InitCmd() *cobra.Command {
+	initCmd := &cobra.Command{
+		Use:   "init",
+		Short: "Initialize rollkit config",
+		Long:  fmt.Sprintf("This command initializes a new %s file in the specified directory (or current directory if not specified).", rollconf.ConfigName),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			homePath, err := cmd.Flags().GetString(rollconf.FlagRootDir)
+			if err != nil {
+				return fmt.Errorf("error reading home flag: %w", err)
+			}
+
+			aggregator, err := cmd.Flags().GetBool(rollconf.FlagAggregator)
+			if err != nil {
+				return fmt.Errorf("error reading aggregator flag: %w", err)
+			}
+
+			// ignore error, as we are creating a new config
+			// we use load in order to parse all the flags
+			cfg, _ := rollconf.Load(cmd)
+			cfg.Node.Aggregator = aggregator
+			if err := cfg.Validate(); err != nil {
+				return fmt.Errorf("error validating config: %w", err)
+			}
+
+			passphrase, err := cmd.Flags().GetString(rollconf.FlagSignerPassphrase)
+			if err != nil {
+				return fmt.Errorf("error reading passphrase flag: %w", err)
+			}
+
+			proposerAddress, err := rollcmd.InitializeSigner(&cfg, homePath, passphrase)
+			if err != nil {
+				return err
+			}
+
+			if err := cfg.SaveAsYaml(); err != nil {
+				return fmt.Errorf("error writing rollkit.yaml file: %w", err)
+			}
+
+			if err := rollcmd.InitializeNodeKey(homePath); err != nil {
+				return err
+			}
+
+			// get chain ID or use default
+			chainID, _ := cmd.Flags().GetString(rollconf.FlagChainID)
+			if chainID == "" {
+				chainID = "rollkit-test"
+			}
+
+			// Initialize genesis with empty app state
+			if err := rollcmd.InitializeGenesis(homePath, chainID, 1, proposerAddress, []byte("{}")); err != nil {
+				return fmt.Errorf("error initializing genesis file: %w", err)
+			}
+
+			cmd.Printf("Successfully initialized config file at %s\n", cfg.ConfigPath())
+			return nil
+		},
+	}
+
+	// Add flags to the command
+	rollconf.AddFlags(initCmd)
+
+	return initCmd
+}
diff --git a/rollups/evm/based/main.go b/rollups/evm/based/main.go
@@ -20,6 +20,7 @@ import (
 	"github.com/rollkit/rollkit/pkg/p2p"
 	"github.com/rollkit/rollkit/pkg/p2p/key"
 	"github.com/rollkit/rollkit/pkg/store"
+	"github.com/rollkit/rollkit/rollups/evm/based/cmd"
 	"github.com/rollkit/rollkit/sequencers/based"
 	"github.com/spf13/cobra"
 )
@@ -233,7 +234,7 @@ func main() {
 		rollcmd.NewDocsGenCmd(rootCmd, AppName),
 		NewExtendedRunNodeCmd(ctx),
 		rollcmd.VersionCmd,
-		rollcmd.InitCmd,
+		cmd.InitCmd(),
 	)
 
 	if err := rootCmd.Execute(); err != nil {

diff --git a/sequencers/single/go.mod b/sequencers/single/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/ipfs/go-datastore v0.8.2
 	github.com/prometheus/client_golang v1.21.1
 	github.com/rollkit/rollkit v0.0.0-00010101000000-000000000000
-	github.com/rollkit/rollkit/core v0.0.0-00010101000000-000000000000
+	github.com/rollkit/rollkit/core v0.0.0-20250312114929-104787ba1a4c
 	github.com/rollkit/rollkit/da v0.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.10.0
 	google.golang.org/protobuf v1.36.6

diff --git a/sequencers/single/sequencer_test.go b/sequencers/single/sequencer_test.go
@@ -363,7 +363,7 @@ func TestSequencer_GetNextBatch_BeforeDASubmission(t *testing.T) {
 	mockDA.On("MaxBlobSize", mock.Anything).Return(uint64(100_000_000), nil)
 	mockDA.On("GasPrice", mock.Anything).Return(float64(0), nil)
 	mockDA.On("GasMultiplier", mock.Anything).Return(float64(0), nil)
-	mockDA.On("Submit", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
+	mockDA.On("SubmitWithOptions", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
 		Return(nil, errors.New("mock DA always rejects submissions"))
 
 	// Submit a batch