Merge pull request #352 from multiversx/rc/barnard-patch-3

Rc/barnard patch 3

Author: sstanculeanu

cmd/elasticindexer/config/enableEpochs.toml

@@ -0,0 +1,2 @@
+# relayed-transactions-v1v2-disable-epoch represents the epoch when relayed transactions v1 and v2 are disabled
+relayed-transactions-v1v2-disable-epoch = 3

cmd/elasticindexer/flags.go

@@ -29,6 +29,11 @@ var (
 			"all available routes for Rest API and options to enable or disable them.",
 		Value: "config/api.toml",
 	}
+	configurationEnableEpochsFile = cli.StringFlag{
+		Name:  "config-enable-epochs",
+		Usage: "The configuration file for the activation epochs",
+		Value: "./config/enableEpochs.toml",
+	}
 
 	logLevel = cli.StringFlag{
 		Name: "log-level",

cmd/elasticindexer/main.go

@@ -58,6 +58,7 @@ func main() {
 	app.Usage = "This tool will index data in an Elasticsearch database"
 	app.Flags = []cli.Flag{
 		configurationFile,
+		configurationEnableEpochsFile,
 		configurationPreferencesFile,
 		configurationApiFile,
 		logLevel,
@@ -97,8 +98,13 @@ func startIndexer(ctx *cli.Context) error {
 		return fmt.Errorf("%w while initializing the logger", err)
 	}
 
+	epochsCfg, err := loadEpochsConfig(ctx.GlobalString(configurationEnableEpochsFile.Name))
+	if err != nil {
+		return fmt.Errorf("%w while loading the enable epochs config file", err)
+	}
+
 	statusMetrics := metrics.NewStatusMetrics()
-	wsHost, err := factory.CreateWsIndexer(cfg, clusterCfg, statusMetrics, ctx.App.Version)
+	wsHost, err := factory.CreateWsIndexer(cfg, clusterCfg, epochsCfg, statusMetrics, ctx.App.Version)
 	if err != nil {
 		return fmt.Errorf("%w while creating the indexer", err)
 	}
@@ -173,6 +179,13 @@ func loadMainConfig(filepath string) (config.Config, error) {
 	return cfg, err
 }
 
+func loadEpochsConfig(filepath string) (config.EnableEpochsConfig, error) {
+	cfg := config.EnableEpochsConfig{}
+	err := core.LoadTomlFile(&cfg, filepath)
+
+	return cfg, err
+}
+
 func loadClusterConfig(filepath string) (config.ClusterConfig, error) {
 	cfg := config.ClusterConfig{}
 	err := core.LoadTomlFile(&cfg, filepath)

config/config.go

@@ -70,3 +70,8 @@ type RouteConfig struct {
 	Name string `toml:"name"`
 	Open bool   `toml:"open"`
 }
+
+// EnableEpochsConfig holds the configuration for activation epochs
+type EnableEpochsConfig struct {
+	RelayedTransactionsV1V2DisableEpoch uint32 `toml:"relayed-transactions-v1v2-disable-epoch"`
+}

factory/wsIndexerFactory.go

@@ -17,13 +17,19 @@ import (
 var log = logger.GetOrCreate("elasticindexer")
 
 // CreateWsIndexer will create a new instance of wsindexer.WSClient
-func CreateWsIndexer(cfg config.Config, clusterCfg config.ClusterConfig, statusMetrics core.StatusMetricsHandler, version string) (wsindexer.WSClient, error) {
+func CreateWsIndexer(
+	cfg config.Config,
+	clusterCfg config.ClusterConfig,
+	epochsCfg config.EnableEpochsConfig,
+	statusMetrics core.StatusMetricsHandler,
+	version string,
+) (wsindexer.WSClient, error) {
 	wsMarshaller, err := factoryMarshaller.NewMarshalizer(clusterCfg.Config.WebSocket.DataMarshallerType)
 	if err != nil {
 		return nil, err
 	}
 
-	dataIndexer, err := createDataIndexer(cfg, clusterCfg, wsMarshaller, statusMetrics, version)
+	dataIndexer, err := createDataIndexer(cfg, clusterCfg, epochsCfg, wsMarshaller, statusMetrics, version)
 	if err != nil {
 		return nil, err
 	}
@@ -54,6 +60,7 @@ func CreateWsIndexer(cfg config.Config, clusterCfg config.ClusterConfig, statusM
 func createDataIndexer(
 	cfg config.Config,
 	clusterCfg config.ClusterConfig,
+	enableEpochsCfg config.EnableEpochsConfig,
 	wsMarshaller marshal.Marshalizer,
 	statusMetrics core.StatusMetricsHandler,
 	version string,
@@ -90,6 +97,7 @@ func createDataIndexer(
 		HeaderMarshaller:         wsMarshaller,
 		StatusMetrics:            statusMetrics,
 		Version:                  version,
+		EnableEpochsConfig:       enableEpochsCfg,
 	})
 }
 

integrationtests/utils.go

@@ -13,6 +13,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core/pubkeyConverter"
 	"github.com/multiversx/mx-chain-es-indexer-go/client"
 	"github.com/multiversx/mx-chain-es-indexer-go/client/logging"
+	"github.com/multiversx/mx-chain-es-indexer-go/config"
 	"github.com/multiversx/mx-chain-es-indexer-go/mock"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/dataindexer"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/elasticproc"
@@ -61,6 +62,9 @@ func CreateElasticProcessor(
 			dataindexer.ReceiptsIndex, dataindexer.BlockIndex, dataindexer.AccountsIndex, dataindexer.TokensIndex, dataindexer.TagsIndex, dataindexer.EventsIndex,
 			dataindexer.OperationsIndex, dataindexer.DelegatorsIndex, dataindexer.ESDTsIndex, dataindexer.SCDeploysIndex, dataindexer.MiniblocksIndex, dataindexer.ValuesIndex},
 		Denomination: 18,
+		EnableEpochsConfig: config.EnableEpochsConfig{
+			RelayedTransactionsV1V2DisableEpoch: 1,
+		},
 	}
 
 	return factory.CreateElasticProcessor(args)

process/elasticproc/block/blockProcessor.go

@@ -4,11 +4,12 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"strconv"
+
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	coreData "github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/api"
-	"github.com/multiversx/mx-chain-core-go/data/block"
 	nodeBlock "github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/outport"
 	"github.com/multiversx/mx-chain-core-go/hashing"
@@ -17,7 +18,6 @@ import (
 	indexer "github.com/multiversx/mx-chain-es-indexer-go/process/dataindexer"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/elasticproc/converters"
 	logger "github.com/multiversx/mx-chain-logger-go"
-	"strconv"
 )
 
 const (
@@ -188,7 +188,7 @@ func getTxsCount(header coreData.HeaderHandler) (numTxs, notarizedTxs uint32) {
 	notarizedTxs = metaHeader.TxCount
 	numTxs = 0
 	for _, mb := range metaHeader.MiniBlockHeaders {
-		if mb.Type == block.PeerBlock {
+		if mb.Type == nodeBlock.PeerBlock {
 			continue
 		}
 
@@ -269,7 +269,7 @@ func (bp *blockProcessor) addEpochStartShardDataForMeta(epochStartShardData node
 	block.EpochStartShardsData = append(block.EpochStartShardsData, shardData)
 }
 
-func (bp *blockProcessor) getEncodedMBSHashes(body *block.Body, intraShardMbs []*nodeBlock.MiniBlock) []string {
+func (bp *blockProcessor) getEncodedMBSHashes(body *nodeBlock.Body, intraShardMbs []*nodeBlock.MiniBlock) []string {
 	miniblocksHashes := make([]string, 0)
 	mbs := append(body.MiniBlocks, intraShardMbs...)
 	for _, miniblock := range mbs {
@@ -287,7 +287,7 @@ func (bp *blockProcessor) getEncodedMBSHashes(body *block.Body, intraShardMbs []
 	return miniblocksHashes
 }
 
-func appendBlockDetailsFromHeaders(block *data.Block, header coreData.HeaderHandler, body *block.Body, pool *outport.TransactionPool) {
+func appendBlockDetailsFromHeaders(block *data.Block, header coreData.HeaderHandler, body *nodeBlock.Body, pool *outport.TransactionPool) {
 	for idx, mbHeader := range header.GetMiniBlockHeaderHandlers() {
 		mbType := nodeBlock.Type(mbHeader.GetTypeInt32())
 		if mbType == nodeBlock.PeerBlock {
@@ -309,7 +309,7 @@ func appendBlockDetailsFromHeaders(block *data.Block, header coreData.HeaderHand
 	}
 }
 
-func appendBlockDetailsFromIntraShardMbs(block *data.Block, intraShardMbs []*block.MiniBlock, pool *outport.TransactionPool, offset int) {
+func appendBlockDetailsFromIntraShardMbs(block *data.Block, intraShardMbs []*nodeBlock.MiniBlock, pool *outport.TransactionPool, offset int) {
 	for idx, intraMB := range intraShardMbs {
 		if intraMB.Type == nodeBlock.PeerBlock || intraMB.Type == nodeBlock.ReceiptBlock {
 			continue
@@ -329,7 +329,7 @@ func appendBlockDetailsFromIntraShardMbs(block *data.Block, intraShardMbs []*blo
 	}
 }
 
-func extractExecutionOrderIntraShardMBUnsigned(mb *block.MiniBlock, pool *outport.TransactionPool) []int {
+func extractExecutionOrderIntraShardMBUnsigned(mb *nodeBlock.MiniBlock, pool *outport.TransactionPool) []int {
 	executionOrderTxsIndices := make([]int, len(mb.TxHashes))
 	for idx, txHash := range mb.TxHashes {
 		executionOrder, found := getExecutionOrderForTx(txHash, int32(mb.Type), pool)
@@ -396,7 +396,7 @@ func getExecutionOrderForTx(txHash []byte, mbType int32, pool *outport.Transacti
 	return tx.GetExecutionOrder(), true
 }
 
-func (bp *blockProcessor) computeBlockSize(headerBytes []byte, body *block.Body) (int, error) {
+func (bp *blockProcessor) computeBlockSize(headerBytes []byte, body *nodeBlock.Body) (int, error) {
 	bodyBytes, err := bp.marshalizer.Marshal(body)
 	if err != nil {
 		return 0, err

process/elasticproc/factory/elasticProcessorFactory.go

@@ -4,6 +4,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/hashing"
 	"github.com/multiversx/mx-chain-core-go/marshal"
+	"github.com/multiversx/mx-chain-es-indexer-go/config"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/dataindexer"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/elasticproc"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/elasticproc/accounts"
@@ -31,6 +32,7 @@ type ArgElasticProcessorFactory struct {
 	BulkRequestMaxSize       int
 	UseKibana                bool
 	ImportDB                 bool
+	EnableEpochsConfig       config.EnableEpochsConfig
 }
 
 // CreateElasticProcessor will create a new instance of ElasticProcessor
@@ -79,6 +81,7 @@ func CreateElasticProcessor(arguments ArgElasticProcessorFactory) (dataindexer.E
 		Hasher:                 arguments.Hasher,
 		Marshalizer:            arguments.Marshalizer,
 		BalanceConverter:       balanceConverter,
+		EnableEpochsConfig:     arguments.EnableEpochsConfig,
 	}
 	txsProc, err := transactions.NewTransactionsProcessor(argsTxsProc)
 	if err != nil {

process/elasticproc/transactions/smartContractResultsProcessor.go

@@ -2,6 +2,8 @@ package transactions
 
 import (
 	"encoding/hex"
+	"strconv"
+
 	"github.com/multiversx/mx-chain-core-go/core"
 	coreData "github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/block"
@@ -11,15 +13,15 @@ import (
 	indexerData "github.com/multiversx/mx-chain-es-indexer-go/data"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/dataindexer"
 	"github.com/multiversx/mx-chain-es-indexer-go/process/elasticproc/converters"
-	"strconv"
 )
 
 type smartContractResultsProcessor struct {
-	pubKeyConverter  core.PubkeyConverter
-	hasher           hashing.Hasher
-	marshalizer      marshal.Marshalizer
-	dataFieldParser  DataFieldParser
-	balanceConverter dataindexer.BalanceConverter
+	pubKeyConverter         core.PubkeyConverter
+	hasher                  hashing.Hasher
+	marshalizer             marshal.Marshalizer
+	dataFieldParser         DataFieldParser
+	balanceConverter        dataindexer.BalanceConverter
+	relayedV1V2DisableEpoch uint32
 }
 
 func newSmartContractResultsProcessor(
@@ -28,13 +30,15 @@ func newSmartContractResultsProcessor(
 	hasher hashing.Hasher,
 	dataFieldParser DataFieldParser,
 	balanceConverter dataindexer.BalanceConverter,
+	relayedV1V2DisableEpoch uint32,
 ) *smartContractResultsProcessor {
 	return &smartContractResultsProcessor{
-		pubKeyConverter:  pubKeyConverter,
-		marshalizer:      marshalzier,
-		hasher:           hasher,
-		dataFieldParser:  dataFieldParser,
-		balanceConverter: balanceConverter,
+		pubKeyConverter:         pubKeyConverter,
+		marshalizer:             marshalzier,
+		hasher:                  hasher,
+		dataFieldParser:         dataFieldParser,
+		balanceConverter:        balanceConverter,
+		relayedV1V2DisableEpoch: relayedV1V2DisableEpoch,
 	}
 }
 
@@ -155,6 +159,8 @@ func (proc *smartContractResultsProcessor) prepareSmartContractResult(
 		esdtValues = res.ESDTValues
 	}
 
+	isRelayed := res.IsRelayed && header.GetEpoch() < proc.relayedV1V2DisableEpoch
+
 	feeInfo := getFeeInfo(scrInfo)
 	return &indexerData.ScResult{
 		Hash:               scrHashHex,
@@ -186,7 +192,7 @@ func (proc *smartContractResultsProcessor) prepareSmartContractResult(
 		Tokens:             converters.TruncateSliceElementsIfExceedsMaxLength(res.Tokens),
 		Receivers:          receiversAddr,
 		ReceiversShardIDs:  res.ReceiversShardID,
-		IsRelayed:          res.IsRelayed,
+		IsRelayed:          isRelayed,
 		OriginalSender:     originalSenderAddr,
 		InitialTxFee:       feeInfo.Fee.String(),
 		InitialTxGasUsed:   feeInfo.GasUsed,

process/elasticproc/transactions/smartContractResultsProcessor_test.go

@@ -2,6 +2,9 @@ package transactions
 
 import (
 	"encoding/hex"
+	"math/big"
+	"testing"
+
 	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-core-go/data/outport"
 	"github.com/multiversx/mx-chain-core-go/data/smartContractResult"
@@ -10,8 +13,6 @@ import (
 	"github.com/multiversx/mx-chain-es-indexer-go/process/elasticproc/converters"
 	datafield "github.com/multiversx/mx-chain-vm-common-go/parsers/dataField"
 	"github.com/stretchr/testify/require"
-	"math/big"
-	"testing"
 )
 
 func createDataFieldParserMock() DataFieldParser {
@@ -30,7 +31,7 @@ func TestPrepareSmartContractResult(t *testing.T) {
 	parser := createDataFieldParserMock()
 	pubKeyConverter := &mock.PubkeyConverterMock{}
 	ap, _ := converters.NewBalanceConverter(18)
-	scrsProc := newSmartContractResultsProcessor(pubKeyConverter, &mock.MarshalizerMock{}, &mock.HasherMock{}, parser, ap)
+	scrsProc := newSmartContractResultsProcessor(pubKeyConverter, &mock.MarshalizerMock{}, &mock.HasherMock{}, parser, ap, 0)
 
 	nonce := uint64(10)
 	txHash := []byte("txHash")