Merge pull request dymensionxyz#17 from dymensionxyz/omritoptix/block…

…-batch

Omritoptix/block batch

config/config.go

@@ -9,13 +9,14 @@ import (
 )
 
 const (
-	flagAggregator    = "optimint.aggregator"
-	flagDALayer       = "optimint.da_layer"
-	flagDAConfig      = "optimint.da_config"
-	flagBlockTime     = "optimint.block_time"
-	flagDABlockTime   = "optimint.da_block_time"
-	flagDAStartHeight = "optimint.da_start_height"
-	flagNamespaceID   = "optimint.namespace_id"
+	flagAggregator     = "optimint.aggregator"
+	flagDALayer        = "optimint.da_layer"
+	flagDAConfig       = "optimint.da_config"
+	flagBlockTime      = "optimint.block_time"
+	flagDABlockTime    = "optimint.da_block_time"
+	flagDAStartHeight  = "optimint.da_start_height"
+	flagNamespaceID    = "optimint.namespace_id"
+	flagBlockBatchSize = "optimint.block_batch_size"
 )
 
 // NodeConfig stores Optimint node configuration.
@@ -41,6 +42,8 @@ type BlockManagerConfig struct {
 	// DAStartHeight allows skipping first DAStartHeight-1 blocks when querying for blocks.
 	DAStartHeight uint64  `mapstructure:"da_start_height"`
 	NamespaceID   [8]byte `mapstructure:"namespace_id"`
+	// The size of the batch in blocks. Every batch we'll write to the DA and the settlement layer.
+	BlockBatchSize uint64 `mapstructure:"block_batch_size"`
 }
 
 // GetViperConfig reads configuration parameters from Viper instance.
@@ -53,6 +56,7 @@ func (nc *NodeConfig) GetViperConfig(v *viper.Viper) error {
 	nc.DAStartHeight = v.GetUint64(flagDAStartHeight)
 	nc.DABlockTime = v.GetDuration(flagDABlockTime)
 	nc.BlockTime = v.GetDuration(flagBlockTime)
+	nc.BlockBatchSize = v.GetUint64(flagBlockBatchSize)
 	nsID := v.GetString(flagNamespaceID)
 	bytes, err := hex.DecodeString(nsID)
 	if err != nil {
@@ -67,11 +71,13 @@ func (nc *NodeConfig) GetViperConfig(v *viper.Viper) error {
 // This function is called in cosmos-sdk.
 func AddFlags(cmd *cobra.Command) {
 	def := DefaultNodeConfig
+
 	cmd.Flags().Bool(flagAggregator, def.Aggregator, "run node in aggregator mode")
 	cmd.Flags().String(flagDALayer, def.DALayer, "Data Availability Layer Client name (mock or grpc")
 	cmd.Flags().String(flagDAConfig, def.DAConfig, "Data Availability Layer Client config")
 	cmd.Flags().Duration(flagBlockTime, def.BlockTime, "block time (for aggregator mode)")
 	cmd.Flags().Duration(flagDABlockTime, def.DABlockTime, "DA chain block time (for syncing)")
 	cmd.Flags().Uint64(flagDAStartHeight, def.DAStartHeight, "starting DA block height (for syncing)")
 	cmd.Flags().BytesHex(flagNamespaceID, def.NamespaceID[:], "namespace identifies (8 bytes in hex)")
+	cmd.Flags().Uint64(flagBlockBatchSize, def.BlockBatchSize, "block batch size")
 }

config/config_test.go

@@ -24,6 +24,7 @@ func TestViperAndCobra(t *testing.T) {
 	assert.NoError(cmd.Flags().Set(flagDAConfig, `{"json":true}`))
 	assert.NoError(cmd.Flags().Set(flagBlockTime, "1234s"))
 	assert.NoError(cmd.Flags().Set(flagNamespaceID, "0102030405060708"))
+	assert.NoError(cmd.Flags().Set(flagBlockBatchSize, "10"))
 
 	nc := DefaultNodeConfig
 	assert.NoError(nc.GetViperConfig(v))
@@ -33,4 +34,5 @@ func TestViperAndCobra(t *testing.T) {
 	assert.Equal(`{"json":true}`, nc.DAConfig)
 	assert.Equal(1234*time.Second, nc.BlockTime)
 	assert.Equal([8]byte{1, 2, 3, 4, 5, 6, 7, 8}, nc.NamespaceID)
+	assert.Equal(uint64(10), nc.BlockBatchSize)
 }