[Merged by Bors] - Increase ATX limits again

datastore/store.go

@@ -52,7 +52,7 @@ type Config struct {
 
 func DefaultConfig() Config {
 	return Config{
-		ATXSize:         600_000,
+		ATXSize:         1_000_000, // to be in line with fetch.EpochData size (see fetch/wire_types.go)
 		MalfeasanceSize: 1_000,
 	}
 }

fetch/fetch.go

@@ -124,7 +124,7 @@ func DefaultConfig() Config {
 	return Config{
 		BatchTimeout:         50 * time.Millisecond,
 		QueueSize:            20,
-		BatchSize:            20,
+		BatchSize:            10,
 		RequestTimeout:       25 * time.Second,
 		MaxRetriesForRequest: 100,
 		ServersConfig: map[string]ServerConfig{

fetch/handler.go

@@ -77,7 +77,8 @@ func (h *handler) handleEpochInfoReq(ctx context.Context, msg []byte) ([]byte, e
 	}
 	h.logger.WithContext(ctx).With().Debug("serve: responded to epoch info request",
 		epoch,
-		log.Int("atx_count", len(ed.AtxIDs)))
+		log.Int("atx_count", len(ed.AtxIDs)),
+	)
 	bts, err := codec.Encode(&ed)
 	if err != nil {
 		h.logger.WithContext(ctx).With().Fatal("serve: failed to serialize epoch atx", epoch, log.Err(err))

fetch/wire_types.go

@@ -28,16 +28,16 @@ type ResponseMessage struct {
 // RequestBatch is a batch of requests and a hash of all requests as ID.
 type RequestBatch struct {
 	ID types.Hash32
-	// depends on fetch config `BatchSize` which defaults to 20, more than 1000 seems unlikely
-	Requests []RequestMessage `scale:"max=1000"`
+	// depends on fetch config `BatchSize` which defaults to 10, more than 100 seems unlikely
+	Requests []RequestMessage `scale:"max=100"`
 }
 
 // ResponseBatch is the response struct send for a RequestBatch. the ResponseBatch ID must be the same
 // as stated in RequestBatch even if not all Data is present.
 type ResponseBatch struct {
 	ID types.Hash32
-	// depends on fetch config `BatchSize` which defaults to 20, more than 1000 seems unlikely
-	Responses []ResponseMessage `scale:"max=1000"`
+	// depends on fetch config `BatchSize` which defaults to 10, more than 100 seems unlikely
+	Responses []ResponseMessage `scale:"max=100"`
 }
 
 // MeshHashRequest is used by ForkFinder to request the hashes of layers from
@@ -105,7 +105,7 @@ type MaliciousIDs struct {
 }
 
 type EpochData struct {
-	AtxIDs []types.ATXID `scale:"max=500000"` // for epoch 12 > 300k ATXs are expected, added some safety margin
+	AtxIDs []types.ATXID `scale:"max=1000000"` // for epoch 13 > 800k ATXs are expected, added some safety margin
 }
 
 // LayerData is the data response for a given layer ID.