Rc/supernova

README.md

@@ -455,8 +455,12 @@ The **_[config.toml](./cmd/chainsimulator/config/config.toml)_** file:
         num-of-shards = 3
         # round-duration-in-milliseconds parameter specifies the duration of a simulated round. The timestamp between two headers will correspond to the round duration but will not reflect real-time
         round-duration-in-milliseconds = 6000
+        # supernova-round-duration-in-milliseconds parameter specifies the duration of a simulated round after supernova. The timestamp between two headers will correspond to the round duration but will not reflect real-time
+        supernova-round-duration-in-milliseconds = 600
         # rounds-per-epoch specifies the number of rounds per epoch
         rounds-per-epoch = 20
+        # supernova-rounds-per-epoch specifies the number of rounds per epoch after supernova
+        supernova-rounds-per-epoch = 200
         # initial-round specifies with what round the chain simulator will start
         initial-round = 0
         # initial-nonce specifies with what nonce the chain simulator will start

cmd/chainsimulator/config/config.toml

@@ -6,8 +6,12 @@
         num-of-shards = 3
         # round-duration-in-milliseconds parameter specifies the duration of a simulated round. The timestamp between two headers will correspond to the round duration but will not reflect real-time
         round-duration-in-milliseconds = 6000
+        # supernova-round-duration-in-milliseconds parameter specifies the duration of a simulated round after supernova. The timestamp between two headers will correspond to the round duration but will not reflect real-time
+        supernova-round-duration-in-milliseconds = 600
         # rounds-per-epoch specifies the number of rounds per epoch
         rounds-per-epoch = 20
+        # supernova-rounds-per-epoch specifies the number of rounds per epoch after supernova
+        supernova-rounds-per-epoch = 200
         # initial-round when the chain simulator will start
         initial-round = 0
         # initial-epoch when the chain simulator will start

cmd/chainsimulator/flags.go

@@ -4,8 +4,9 @@ import (
 	"time"
 
 	logger "github.com/multiversx/mx-chain-logger-go"
-	"github.com/multiversx/mx-chain-simulator-go/config"
 	"github.com/urfave/cli"
+
+	"github.com/multiversx/mx-chain-simulator-go/config"
 )
 
 const nodeOverrideDefaultFilename = "nodeOverrideDefault.toml"
@@ -66,6 +67,11 @@ var (
 		Usage: "The number of rounds per epoch",
 		Value: 20,
 	}
+	supernovaRoundsPerEpoch = cli.IntFlag{
+		Name:  "supernova-rounds-per-epoch",
+		Usage: "The number of rounds per epoch after supernova",
+		Value: 200,
+	}
 	numOfShards = cli.IntFlag{
 		Name:  "num-of-shards",
 		Usage: "The number of shards",
@@ -81,10 +87,28 @@ var (
 		Usage: "The round duration in milliseconds",
 		Value: 6000,
 	}
+	supernovaRoundDurationInMs = cli.IntFlag{
+		Name:  "supernova-round-duration",
+		Usage: "The round duration in milliseconds after supernova",
+		Value: 600,
+	}
 	bypassTransactionsSignature = cli.BoolTFlag{
 		Name:  "bypass-txs-signature",
 		Usage: "This flag is used to bypass the transactions signature verification (by default true)",
 	}
+	bypassBlocksSignature = cli.BoolTFlag{
+		Name:  "bypass-blocks-signature",
+		Usage: "This flag is used to bypass the blocks signature verification (by default true)",
+	}
+	bypassCreateBlockTimeCheck = cli.BoolTFlag{
+		Name:  "bypass-create-block-time-check",
+		Usage: "This flag is used to bypass the create block time check (by default true)",
+	}
+	createBlockMaxTimePercent = cli.Float64Flag{
+		Name:  "create-block-max-time-percent",
+		Usage: "The max time percent of round duration to create block (by default 25%)",
+		Value: 0.25,
+	}
 	numValidatorsPerShard = cli.IntFlag{
 		Name:  "num-validators-per-shard",
 		Usage: "This flag is used to specify the number of validators per shard",
@@ -137,13 +161,21 @@ var (
 		Name:  "fetch-configs-and-close",
 		Usage: "This flag is used to specify to fetch all configs and close the chain simulator after",
 	}
+	enableProfiling = cli.BoolFlag{
+		Name:  "enable-profiling",
+		Usage: "Boolean option for enabling CPU profiling. If set, CPU profile will be saved to a file.",
+	}
 )
 
 func applyFlags(ctx *cli.Context, cfg *config.Config) {
 	if ctx.IsSet(roundsPerEpoch.Name) {
 		cfg.Config.Simulator.RoundsPerEpoch = ctx.GlobalInt(roundsPerEpoch.Name)
 	}
 
+	if ctx.IsSet(supernovaRoundsPerEpoch.Name) {
+		cfg.Config.Simulator.SupernovaRoundsPerEpoch = ctx.GlobalInt(supernovaRoundsPerEpoch.Name)
+	}
+
 	if ctx.IsSet(numOfShards.Name) {
 		cfg.Config.Simulator.NumOfShards = ctx.GlobalInt(numOfShards.Name)
 	}
@@ -156,6 +188,10 @@ func applyFlags(ctx *cli.Context, cfg *config.Config) {
 		cfg.Config.Simulator.RoundDurationInMs = ctx.GlobalInt(roundDurationInMs.Name)
 	}
 
+	if ctx.IsSet(supernovaRoundDurationInMs.Name) {
+		cfg.Config.Simulator.SupernovaRoundDurationInMs = ctx.GlobalInt(supernovaRoundDurationInMs.Name)
+	}
+
 	if ctx.IsSet(initialRound.Name) {
 		cfg.Config.Simulator.InitialRound = ctx.GlobalInt64(initialRound.Name)
 	}

cmd/chainsimulator/main.go

@@ -3,14 +3,17 @@ package main
 import (
 	"errors"
 	"fmt"
+	"net/http"
 	"os"
 	"os/signal"
 	"runtime/debug"
+	"runtime/pprof"
 	"strconv"
 	"strings"
 	"syscall"
 	"time"
 
+	"github.com/gin-gonic/gin"
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/multiversx/mx-chain-core-go/core/closing"
@@ -20,14 +23,15 @@ import (
 	"github.com/multiversx/mx-chain-go/node/chainSimulator/components/api"
 	logger "github.com/multiversx/mx-chain-logger-go"
 	"github.com/multiversx/mx-chain-logger-go/file"
+	"github.com/urfave/cli"
+
 	"github.com/multiversx/mx-chain-simulator-go/config"
 	"github.com/multiversx/mx-chain-simulator-go/pkg/facade"
 	"github.com/multiversx/mx-chain-simulator-go/pkg/factory"
 	endpoints "github.com/multiversx/mx-chain-simulator-go/pkg/proxy/api"
 	"github.com/multiversx/mx-chain-simulator-go/pkg/proxy/configs"
 	"github.com/multiversx/mx-chain-simulator-go/pkg/proxy/configs/git"
 	"github.com/multiversx/mx-chain-simulator-go/pkg/proxy/creator"
-	"github.com/urfave/cli"
 )
 
 const timeToAllowProxyToStart = time.Millisecond * 10
@@ -68,10 +72,15 @@ func main() {
 		pathToProxyConfigs,
 		startTime,
 		roundsPerEpoch,
+		supernovaRoundsPerEpoch,
 		numOfShards,
 		serverPort,
 		roundDurationInMs,
+		supernovaRoundDurationInMs,
 		bypassTransactionsSignature,
+		bypassBlocksSignature,
+		createBlockMaxTimePercent,
+		bypassCreateBlockTimeCheck,
 		numValidatorsPerShard,
 		numWaitingValidatorsPerShard,
 		numValidatorsMeta,
@@ -84,6 +93,7 @@ func main() {
 		skipConfigsDownload,
 		fetchConfigsAndClose,
 		pathWhereToSaveLogs,
+		enableProfiling,
 	}
 
 	app.Authors = []cli.Author{
@@ -136,12 +146,21 @@ func startChainSimulator(ctx *cli.Context) error {
 	}
 
 	bypassTxsSignature := ctx.GlobalBool(bypassTransactionsSignature.Name)
-	log.Warn("signature", "bypass", bypassTxsSignature)
+	log.Debug("signature", "bypass", bypassTxsSignature)
+	bypassBlocksSignature := ctx.GlobalBool(bypassBlocksSignature.Name)
+	log.Debug("blocks", "bypass", bypassBlocksSignature)
 	roundDurationInMillis := uint64(cfg.Config.Simulator.RoundDurationInMs)
+	supernovaRoundDurationInMillis := uint64(cfg.Config.Simulator.SupernovaRoundDurationInMs)
 	rounds := core.OptionalUint64{
 		HasValue: true,
 		Value:    uint64(cfg.Config.Simulator.RoundsPerEpoch),
 	}
+	supernovaRounds := core.OptionalUint64{
+		HasValue: true,
+		Value:    uint64(cfg.Config.Simulator.SupernovaRoundsPerEpoch),
+	}
+	createBlockMaxTimePercent := ctx.GlobalFloat64(createBlockMaxTimePercent.Name)
+	bypassCreateBlockTimeCheck := ctx.GlobalBool(bypassCreateBlockTimeCheck.Name)
 
 	numValidatorsShard := ctx.GlobalInt(numValidatorsPerShard.Name)
 	if numValidatorsShard < 1 {
@@ -170,23 +189,45 @@ func startChainSimulator(ctx *cli.Context) error {
 		return err
 	}
 
+	// CPU profiling setup - only if enable-profiling flag is set
+	var profileFile *os.File
+	profilingEnabled := ctx.GlobalBool(enableProfiling.Name)
+	if profilingEnabled {
+		pathLogsSave := ctx.GlobalString(pathWhereToSaveLogs.Name)
+		profileFile, err = startCPUProfiling(pathLogsSave, startTimeUnix)
+		if err != nil {
+			return fmt.Errorf("%w while starting CPU profiling", err)
+		}
+
+		// Ensure pprof is stopped and file is synced/closed even on early exits
+		defer func() {
+			log.Info("stopping CPU profile (defer)")
+			stopCPUProfiling(profileFile)
+		}()
+	}
+
 	var alterConfigsError error
 	argsChainSimulator := chainSimulator.ArgsChainSimulator{
-		BypassTxSignatureCheck:   bypassTxsSignature,
-		TempDir:                  tempDir,
-		PathToInitialConfig:      nodeConfigs,
-		NumOfShards:              uint32(cfg.Config.Simulator.NumOfShards),
-		GenesisTimestamp:         startTimeUnix,
-		RoundDurationInMillis:    roundDurationInMillis,
-		RoundsPerEpoch:           rounds,
-		ApiInterface:             apiConfigurator,
-		MinNodesPerShard:         uint32(numValidatorsShard),
-		NumNodesWaitingListShard: uint32(numWaitingValidatorsShard),
-		MetaChainMinNodes:        uint32(numValidatorsMetaShard),
-		NumNodesWaitingListMeta:  uint32(numWaitingValidatorsMetaShard),
-		InitialRound:             cfg.Config.Simulator.InitialRound,
-		InitialNonce:             cfg.Config.Simulator.InitialNonce,
-		InitialEpoch:             cfg.Config.Simulator.InitialEpoch,
+		BypassTxSignatureCheck:         bypassTxsSignature,
+		BypassBlockSignatureCheck:      bypassBlocksSignature,
+		BypassCreateBlockTimeCheck:     bypassCreateBlockTimeCheck,
+		CreateBlockMaxTimePercent:      createBlockMaxTimePercent,
+		TempDir:                        tempDir,
+		PathToInitialConfig:            nodeConfigs,
+		NumOfShards:                    uint32(cfg.Config.Simulator.NumOfShards),
+		GenesisTimestamp:               startTimeUnix,
+		RoundDurationInMillis:          roundDurationInMillis,
+		SupernovaRoundDurationInMillis: supernovaRoundDurationInMillis,
+		RoundsPerEpoch:                 rounds,
+		SupernovaRoundsPerEpoch:        supernovaRounds,
+		ApiInterface:                   apiConfigurator,
+		MinNodesPerShard:               uint32(numValidatorsShard),
+		NumNodesWaitingListShard:       uint32(numWaitingValidatorsShard),
+		MetaChainMinNodes:              uint32(numValidatorsMetaShard),
+		NumNodesWaitingListMeta:        uint32(numWaitingValidatorsMetaShard),
+		InitialRound:                   cfg.Config.Simulator.InitialRound,
+		InitialNonce:                   cfg.Config.Simulator.InitialNonce,
+		InitialEpoch:                   cfg.Config.Simulator.InitialEpoch,
 		AlterConfigsFunction: func(cfg *nodeConfig.Configs) {
 			alterConfigsError = overridableConfig.OverrideConfigValues(overrideCfg.OverridableConfigTomlValues, cfg)
 		},
@@ -268,7 +309,28 @@ func startChainSimulator(ctx *cli.Context) error {
 		return err
 	}
 
-	err = endpointsProc.ExtendProxyServer(proxyInstance.GetHttpServer())
+	// Create a channel for programmatic shutdown
+	shutdownChan := make(chan struct{})
+
+	// Add a shutdown endpoint before extending the proxy server
+	httpServer := proxyInstance.GetHttpServer()
+	ginEngine, ok := httpServer.Handler.(*gin.Engine)
+	if !ok {
+		return fmt.Errorf("cannot cast httpServer.Handler to gin.Engine")
+	}
+
+	ginEngine.POST("/simulator/shutdown", func(c *gin.Context) {
+		log.Info("shutdown requested via HTTP endpoint")
+		c.JSON(http.StatusOK, gin.H{"message": "shutdown initiated"})
+
+		// Trigger shutdown in a goroutine to allow the response to be sent
+		go func() {
+			time.Sleep(100 * time.Millisecond)
+			close(shutdownChan)
+		}()
+	})
+
+	err = endpointsProc.ExtendProxyServer(httpServer)
 	if err != nil {
 		return err
 	}
@@ -280,9 +342,19 @@ func startChainSimulator(ctx *cli.Context) error {
 
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, syscall.SIGINT, syscall.SIGTERM)
-	<-interrupt
 
-	log.Info("close")
+	// Wait for either signal or programmatic shutdown
+	select {
+	case sig := <-interrupt:
+		log.Info("close", "signal", sig)
+	case <-shutdownChan:
+		log.Info("close", "trigger", "HTTP shutdown endpoint")
+	}
+
+	// Stop CPU profiling FIRST and flush to disk (only if profiling is enabled)
+	if profilingEnabled {
+		stopCPUProfiling(profileFile)
+	}
 
 	generator.Close()
 
@@ -297,6 +369,43 @@ func startChainSimulator(ctx *cli.Context) error {
 	return nil
 }
 
+func startCPUProfiling(pathLogsSave string, startTimeUnix int64) (*os.File, error) {
+	timestampMilisecond := time.Unix(startTimeUnix, 0).UnixNano() / 1000000
+	cpuProfilePath := fmt.Sprintf("%s/cpu-%d.pprof", pathLogsSave, timestampMilisecond)
+
+	profileFile, err := os.Create(cpuProfilePath)
+	if err != nil {
+		return nil, fmt.Errorf("could not create CPU profile: %w", err)
+	}
+
+	if err := pprof.StartCPUProfile(profileFile); err != nil {
+		_ = profileFile.Close()
+		return nil, fmt.Errorf("could not start CPU profile: %w", err)
+	}
+
+	log.Info("CPU profiling started", "path", cpuProfilePath)
+	return profileFile, nil
+}
+
+func stopCPUProfiling(profileFile *os.File) {
+	if profileFile == nil {
+		return
+	}
+
+	log.Info("stopping CPU profile")
+	pprof.StopCPUProfile()
+
+	if err := profileFile.Sync(); err != nil {
+		log.Error("error syncing CPU profile file", "err", err)
+	}
+
+	if err := profileFile.Close(); err != nil {
+		log.Error("error closing CPU profile file", "err", err)
+	} else {
+		log.Info("CPU profile file closed successfully")
+	}
+}
+
 func initializeLogger(ctx *cli.Context, cfg config.Config) (closing.Closer, error) {
 	logLevelFlagValue := ctx.GlobalString(logLevel.Name)
 	err := logger.SetLogLevel(logLevelFlagValue)
@@ -313,7 +422,7 @@ func initializeLogger(ctx *cli.Context, cfg config.Config) (closing.Closer, erro
 	fileLogging, err := file.NewFileLogging(file.ArgsFileLogging{
 		WorkingDir:      pathLogsSave,
 		DefaultLogsPath: cfg.Config.Logs.LogsPath,
-		LogFilePrefix:   cfg.Config.Logs.LogFilePrefix,
+		LogFilePrefix:   cfg.Config.Logs.LogFilePrefix + "-" + strconv.Itoa(cfg.Config.Simulator.ServerPort),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("%w creating a log file", err)

config/config.go

@@ -6,15 +6,17 @@ import "github.com/multiversx/mx-chain-go/config"
 type Config struct {
 	Config struct {
 		Simulator struct {
-			ServerPort        int    `toml:"server-port"`
-			NumOfShards       int    `toml:"num-of-shards"`
-			RoundsPerEpoch    int    `toml:"rounds-per-epoch"`
-			RoundDurationInMs int    `toml:"round-duration-in-milliseconds"`
-			InitialRound      int64  `toml:"initial-round"`
-			InitialNonce      uint64 `toml:"initial-nonce"`
-			InitialEpoch      uint32 `toml:"initial-epoch"`
-			MxChainRepo       string `toml:"mx-chain-go-repo"`
-			MxProxyRepo       string `toml:"mx-chain-proxy-go-repo"`
+			ServerPort                 int    `toml:"server-port"`
+			NumOfShards                int    `toml:"num-of-shards"`
+			RoundsPerEpoch             int    `toml:"rounds-per-epoch"`
+			SupernovaRoundsPerEpoch    int    `toml:"supernova-rounds-per-epoch"`
+			RoundDurationInMs          int    `toml:"round-duration-in-milliseconds"`
+			SupernovaRoundDurationInMs int    `toml:"supernova-round-duration-in-milliseconds"`
+			InitialRound               int64  `toml:"initial-round"`
+			InitialNonce               uint64 `toml:"initial-nonce"`
+			InitialEpoch               uint32 `toml:"initial-epoch"`
+			MxChainRepo                string `toml:"mx-chain-go-repo"`
+			MxProxyRepo                string `toml:"mx-chain-proxy-go-repo"`
 		} `toml:"simulator"`
 		Logs struct {
 			LogFileLifeSpanInMB  int    `toml:"log-file-life-span-in-mb"`

examples/contracts/issue-esdt-with-contract/issue-with-contract.py

@@ -93,8 +93,8 @@ def main():
     if status.status != "pending":
         sys.exit(f"incorrect status of transaction: expected->pending, received->{status}")
 
-    provider.do_post_generic(f"{GENERATE_BLOCKS_URL}/3", {})
-    status = status = provider.get_transaction_status(tx_hash)
+    provider.do_post_generic(f"{GENERATE_BLOCKS_URL}/6", {})
+    status = provider.get_transaction_status(tx_hash)
     if status.status != "fail":
         sys.exit(f"incorrect status of transaction: expected->fail, received->{status}")