Chain sim interface update

cmd/logviewer/CLI.md

@@ -22,6 +22,9 @@ GLOBAL OPTIONS:
    --use-wss                  Will use wss instead of ws when creating the web socket
    --log-correlation          Boolean option for enabling log correlation elements.
    --log-logger-name          Boolean option for logger name in the logs.
+   --with-tls                 Will use tls connection with the server
+   --cert value               Certificate file for tls connection (default: "certificate.crt")
+   --cert-pk value            Certificate pk file for tls connection (default: "private_key.pem")
    --help, -h                 show help
    --version, -v              print the version
 

cmd/logviewer/main.go

@@ -30,10 +30,13 @@ type config struct {
 	workingDir         string
 	address            string
 	logLevel           string
+	certFile           string
+	certPkFile         string
 	logSave            bool
 	useWss             bool
 	logWithCorrelation bool
 	logWithLoggerName  bool
+	withTLS            bool
 }
 
 var (
@@ -100,6 +103,23 @@ VERSION:
 		Value:       "",
 		Destination: &argsConfig.workingDir,
 	}
+	withTLS = cli.BoolFlag{
+		Name:        "with-tls",
+		Usage:       "Will use tls connection with the server",
+		Destination: &argsConfig.withTLS,
+	}
+	certFile = cli.StringFlag{
+		Name:        "cert",
+		Usage:       "Certificate file for tls connection",
+		Value:       "certificate.crt",
+		Destination: &argsConfig.certFile,
+	}
+	certPkFile = cli.StringFlag{
+		Name:        "cert-pk",
+		Usage:       "Certificate pk file for tls connection",
+		Value:       "private_key.pem",
+		Destination: &argsConfig.certPkFile,
+	}
 
 	argsConfig = &config{}
 
@@ -140,6 +160,9 @@ func initCliFlags() {
 		useWss,
 		logWithCorrelation,
 		logWithLoggerName,
+		withTLS,
+		certFile,
+		certPkFile,
 	}
 	cliApp.Authors = []cli.Author{
 		{
@@ -258,7 +281,18 @@ func openWebSocket(address string) (*websocket.Conn, error) {
 		Path:   wsLogPath,
 	}
 
-	conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
+	dialer := websocket.DefaultDialer
+
+	if argsConfig.withTLS {
+		cert, err := loadTLSClientConfig(argsConfig.certFile, argsConfig.certPkFile)
+		if err != nil {
+			return nil, err
+		}
+
+		dialer.TLSClientConfig = cert
+	}
+
+	conn, _, err := dialer.Dial(u.String(), nil)
 	if err != nil {
 		return nil, err
 	}

cmd/logviewer/tls.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+)
+
+func loadTLSClientConfig(certFile string, keyFile string) (*tls.Config, error) {
+	cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+	if err != nil {
+		return nil, err
+	}
+
+	certPool, err := createCertPool(cert)
+	if err != nil {
+		return nil, err
+	}
+
+	return &tls.Config{
+		Certificates: []tls.Certificate{cert},
+		RootCAs:      certPool,
+	}, nil
+}
+
+func createCertPool(cert tls.Certificate) (*x509.CertPool, error) {
+	certLeaf, err := x509.ParseCertificate(cert.Certificate[0])
+	if err != nil {
+		return nil, err
+	}
+
+	certPool := x509.NewCertPool()
+	certPool.AddCert(certLeaf)
+
+	return certPool, nil
+}

cmd/node/config/config.toml

@@ -667,6 +667,7 @@
     MinSizeInBytes = 104857 # 104857 is 10% from 1MB
     MaxSizeInBytes = 943718 # 943718 is 90% from 1MB
 
+# TODO MX-14985 resolve after override structs branch is merged
 [VirtualMachine]
     [VirtualMachine.Execution]
         TimeOutForSCExecutionInMilliseconds = 10000 # 10 seconds = 10000 milliseconds

cmd/node/config/enableEpochs.toml

@@ -336,6 +336,9 @@
     # RelayedTransactionsV3EnableEpoch represents the epoch when the relayed transactions v3 will be enabled
     RelayedTransactionsV3EnableEpoch = 2
 
+    # ConsensusModelV2EnableEpoch represents the epoch when the consensus model V2 is enabled
+    ConsensusModelV2EnableEpoch = 2
+
     # BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
     BLSMultiSignerEnableEpoch = [
         { EnableEpoch = 0, Type = "no-KOSK" },

cmd/node/config/systemSmartContractsConfig.toml

@@ -17,6 +17,7 @@
 [ESDTSystemSCConfig]
     BaseIssuingCost = "5000000000000000000" #5 eGLD
     OwnerAddress = "erd1fpkcgel4gcmh8zqqdt043yfcn5tyx8373kg6q2qmkxzu4dqamc0swts65c"
+    ESDTPrefix = ""
 
 [GovernanceSystemSCConfig]
     OwnerAddress = "erd1vxy22x0fj4zv6hktmydg8vpfh6euv02cz4yg0aaws6rrad5a5awqgqky80" #should use a multisign contract instead of a wallet address

cmd/sovereignnode/CLI.md

@@ -0,0 +1,60 @@
+
+# Node CLI
+
+The **MultiversX Sovereign Node** exposes the following Command Line Interface:
+
+```
+$ sovereignNode --help
+
+NAME:
+   MultiversX Sovereign Node CLI App - This is the entry point for starting a new MultiversX sovereign node - the app will start after the genesis timestamp
+USAGE:
+   sovereignNode [global options]
+
+AUTHOR:
+   The MultiversX Team <[email protected]>
+
+GLOBAL OPTIONS:
+   --genesis-file [path]                  The [path] for the genesis file. This JSON file contains initial data to bootstrap from, such as initial balances for accounts. (default: "./config/genesis.json")
+   --smart-contracts-file [path]          The [path] for the initial smart contracts file. This JSON file contains data used to deploy initial smart contracts such as delegation smart contracts (default: "./config/genesisSmartContracts.json")
+   --nodes-setup-file [path]              The [path] for the nodes setup. This JSON file contains initial nodes info, such as consensus group size, round duration, validators public keys and so on. (default: "./config/nodesSetup.json")
+   --config [path]                        The [path] for the main configuration file. This TOML file contain the main configurations such as storage setups, epoch duration and so on. (default: "./config/config.toml")
+   --config-api [path]                    The [path] for the api configuration file. This TOML file contains all available routes for Rest API and options to enable or disable them. (default: "./config/api.toml")
+   --config-economics [path]              The [path] for the economics configuration file. This TOML file contains economics configurations such as minimum gas price for a transactions and so on. (default: "./config/economics.toml")
+   --config-systemSmartContracts [path]   The [path] for the system smart contracts configuration file. (default: "./config/systemSmartContractsConfig.toml")
+   --config-ratings value                 The ratings configuration file to load (default: "./config/ratings.toml")
+   --config-preferences [path]            The [path] for the preferences configuration file. This TOML file contains preferences configurations, such as the node display name or the shard to start in when starting as observer (default: "./config/prefs.toml")
+   --config-external [path]               The [path] for the external configuration file. This TOML file contains external configurations such as ElasticSearch's URL and login information (default: "./config/external.toml")
+   --p2p-config [path]                    The [path] for the p2p configuration file. This TOML file contains peer-to-peer configurations such as port, target peer count or KadDHT settings (default: "./config/p2p.toml")
+   --gas-costs-config [path]              The [path] for the gas costs configuration file. This TOML file contains gas costs used in SmartContract execution (default: "./config/gasSchedule.toml")
+   --sk-index value                       The index in the PEM file of the private key to be used by the node. (default: 0)
+   --validator-key-pem-file filepath      The filepath for the PEM file which contains the secret keys for the validator key. (default: "./config/validatorKey.pem")
+   --port [p2p port]                      The [p2p port] number on which the application will start. Can use single values such as `0, 10230, 15670` or range of ports such as `5000-10000` (default: "0")
+   --profile-mode                         Boolean option for enabling the profiling mode. If set, the /debug/pprof routes will be available on the node for profiling the application.
+   --use-health-service                   Boolean option for enabling the health service.
+   --storage-cleanup                      Boolean option for starting the node with clean storage. If set, the Node will empty its storage before starting, otherwise it will start from the last state stored on disk..
+   --gops-enable                          Boolean option for enabling gops over the process. If set, stack can be viewed by calling 'gops stack <pid>'.
+   --display-name value                   The user-friendly name for the node, appearing in the public monitoring tools. Will override the name set in the preferences TOML file.
+   --keybase-identity value               The keybase's identity. If set, will override the one set in the preferences TOML file.
+   --rest-api-interface address and port  The interface address and port to which the REST API will attempt to bind. To bind to all available interfaces, set this flag to :8080 (default: "localhost:8080")
+   --rest-api-debug                       Boolean option for starting the Rest API in debug mode.
+   --disable-ansi-color                   Boolean option for disabling ANSI colors in the logging system.
+   --log-level level(s)                   This flag specifies the logger level(s). It can contain multiple comma-separated value. For example, if set to *:INFO the logs for all packages will have the INFO level. However, if set to *:INFO,api:DEBUG the logs for all packages will have the INFO level, excepting the api package which will receive a DEBUG log level. (default: "*:INFO ")
+   --log-save                             Boolean option for enabling log saving. If set, it will automatically save all the logs into a file.
+   --log-correlation                      Boolean option for enabling log correlation elements.
+   --log-logger-name                      Boolean option for logger name in the logs.
+   --use-log-view                         Boolean option for enabling the simple node's interface. If set, the node will not enable the user-friendly terminal view of the node.
+   --bootstrap-round-index index          This flag specifies the round index from which node should bootstrap from storage. (default: 18446744073709551615)
+   --working-directory directory          This flag specifies the directory where the node will store databases, logs and statistics.
+   --destination-shard-as-observer value  This flag specifies the shard to start in when running as an observer. It will override the configuration set in the preferences TOML config file.
+   --keep-old-epochs-data                 Boolean option for enabling a node to keep old epochs data. If set, the node won't remove any database and will have a full history over epochs.
+   --num-epochs-to-keep value             This flag represents the number of epochs which will kept in the databases. It is relevant only if the full archive flag is not set. (default: 2)
+   --num-active-persisters value          This flag represents the number of databases (1 database = 1 epoch) which are kept open at a moment. It is relevant even if the node is full archive or not. (default: 2)
+   --start-in-epoch                       Boolean option for enabling a node the fast bootstrap mechanism from the network.Should be enabled if data is not available in local disk.
+   --no-key                               Boolean flag for enabling the node to generate a signing key when it starts (if the validatorKey.pem file is present, setting this flag to true will overwrite the BLS key used by the node)
+   --help, -h                             show help
+   --version, -v                          print the version
+
+
+```
+

cmd/sovereignnode/chainSimulator/common/common.go

@@ -0,0 +1,39 @@
+package common
+
+import (
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-go/config"
+	"github.com/multiversx/mx-chain-go/factory"
+	"github.com/multiversx/mx-chain-go/factory/runType"
+	"github.com/multiversx/mx-chain-go/node/chainSimulator/process"
+	sovRunType "github.com/multiversx/mx-chain-go/sovereignnode/runType"
+)
+
+// GetCurrentSovereignHeader returns current sovereign chain block handler from blockchain hook
+func GetCurrentSovereignHeader(nodeHandler process.NodeHandler) data.SovereignChainHeaderHandler {
+	return nodeHandler.GetChainHandler().GetCurrentBlockHeader().(data.SovereignChainHeaderHandler)
+}
+
+// CreateSovereignRunTypeComponents will create sovereign run type components
+func CreateSovereignRunTypeComponents(args runType.ArgsRunTypeComponents, sovereignExtraConfig config.SovereignConfig) (factory.RunTypeComponentsHolder, error) {
+	argsSovRunType, err := sovRunType.CreateSovereignArgsRunTypeComponents(args, sovereignExtraConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	sovereignComponentsFactory, err := runType.NewSovereignRunTypeComponentsFactory(*argsSovRunType)
+	if err != nil {
+		return nil, err
+	}
+
+	managedRunTypeComponents, err := runType.NewManagedRunTypeComponents(sovereignComponentsFactory)
+	if err != nil {
+		return nil, err
+	}
+	err = managedRunTypeComponents.Create()
+	if err != nil {
+		return nil, err
+	}
+
+	return managedRunTypeComponents, nil
+}

cmd/sovereignnode/chainSimulator/process/sovereignBlockProcessorFactory.go

@@ -0,0 +1,45 @@
+package process
+
+import (
+	"time"
+
+	chainSimulatorProcess "github.com/multiversx/mx-chain-go/node/chainSimulator/process"
+	"github.com/multiversx/mx-chain-go/process"
+
+	"github.com/multiversx/mx-chain-core-go/core/check"
+	"github.com/multiversx/mx-chain-core-go/data"
+)
+
+type sovereignBlockProcessorFactory struct {
+}
+
+// NewSovereignBlockProcessorFactory creates a new block processor factory for sovereign chain simulator
+func NewSovereignBlockProcessorFactory() chainSimulatorProcess.BlocksProcessorFactory {
+	return &sovereignBlockProcessorFactory{}
+}
+
+// ProcessBlock will create and process a block in sovereign chain simulator
+func (sbpf *sovereignBlockProcessorFactory) ProcessBlock(blockProcessor process.BlockProcessor, header data.HeaderHandler) (data.HeaderHandler, data.BodyHandler, error) {
+	if check.IfNil(blockProcessor) {
+		return nil, nil, process.ErrNilBlockProcessor
+	}
+	if check.IfNil(header) {
+		return nil, nil, process.ErrNilHeaderHandler
+	}
+
+	header, block, err := blockProcessor.CreateBlock(header, func() bool {
+		return true
+	})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return blockProcessor.ProcessBlock(header, block, func() time.Duration {
+		return time.Second
+	})
+}
+
+// IsInterfaceNil returns true if there is no value under the interface
+func (sbpf *sovereignBlockProcessorFactory) IsInterfaceNil() bool {
+	return sbpf == nil
+}

cmd/sovereignnode/chainSimulator/process/sovereignBlockProcessorFactory_test.go

@@ -0,0 +1,61 @@
+package process
+
+import (
+	"testing"
+	"time"
+
+	"github.com/multiversx/mx-chain-go/process"
+	"github.com/multiversx/mx-chain-go/testscommon"
+
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewSovereignBlockProcessorFactory(t *testing.T) {
+	t.Parallel()
+
+	fact := NewSovereignBlockProcessorFactory()
+
+	require.False(t, fact.IsInterfaceNil())
+	require.IsType(t, new(sovereignBlockProcessorFactory), fact)
+}
+
+func TestNewSovereignBlockProcessorFactory_ProcessBlock(t *testing.T) {
+	t.Parallel()
+
+	t.Run("nil block processor should error", func(t *testing.T) {
+		fact := NewSovereignBlockProcessorFactory()
+		header, block, err := fact.ProcessBlock(nil, &testscommon.HeaderHandlerStub{})
+		require.ErrorIs(t, err, process.ErrNilBlockProcessor)
+		require.Nil(t, header)
+		require.Nil(t, block)
+	})
+	t.Run("nil header handler should error", func(t *testing.T) {
+		fact := NewSovereignBlockProcessorFactory()
+		header, block, err := fact.ProcessBlock(&testscommon.BlockProcessorStub{}, nil)
+		require.ErrorIs(t, err, process.ErrNilHeaderHandler)
+		require.Nil(t, header)
+		require.Nil(t, block)
+	})
+	t.Run("should work", func(t *testing.T) {
+		fact := NewSovereignBlockProcessorFactory()
+
+		createWasCalled := false
+		processWasCalled := false
+		bp := &testscommon.BlockProcessorStub{
+			CreateBlockCalled: func(initialHdrData data.HeaderHandler, haveTime func() bool) (data.HeaderHandler, data.BodyHandler, error) {
+				createWasCalled = true
+				return nil, nil, nil
+			},
+			ProcessBlockCalled: func(header data.HeaderHandler, body data.BodyHandler, haveTime func() time.Duration) (data.HeaderHandler, data.BodyHandler, error) {
+				processWasCalled = true
+				return nil, nil, nil
+			},
+		}
+
+		_, _, err := fact.ProcessBlock(bp, &testscommon.HeaderHandlerStub{})
+		require.Nil(t, err)
+		require.Equal(t, true, createWasCalled)
+		require.Equal(t, true, processWasCalled)
+	})
+}

cmd/sovereignnode/chainSimulator/sovereignChainHandlerFactory.go

@@ -0,0 +1,25 @@
+package chainSimulator
+
+import (
+	"github.com/multiversx/mx-chain-go/node/chainSimulator"
+	"github.com/multiversx/mx-chain-go/node/chainSimulator/process"
+	sovProcess "github.com/multiversx/mx-chain-go/sovereignnode/chainSimulator/process"
+)
+
+type sovereignProcessorFactory struct {
+}
+
+// NewSovereignChainHandlerFactory creates a new chain handler factory for sovereign chain simulator
+func NewSovereignChainHandlerFactory() chainSimulator.ChainHandlerFactory {
+	return &sovereignProcessorFactory{}
+}
+
+// CreateChainHandler creates a new chain handler for sovereign chain simulator
+func (spf *sovereignProcessorFactory) CreateChainHandler(nodeHandler process.NodeHandler) (chainSimulator.ChainHandler, error) {
+	return process.NewBlocksCreator(nodeHandler, sovProcess.NewSovereignBlockProcessorFactory())
+}
+
+// IsInterfaceNil returns true if there is no value under the interface
+func (spf *sovereignProcessorFactory) IsInterfaceNil() bool {
+	return spf == nil
+}