Merge 7029a48 into d6034af

cmd/node/flags.go

@@ -384,6 +384,12 @@ var (
 		Usage: "String flag for specifying the desired `operation mode`(s) of the node, resulting in altering some configuration values accordingly. Possible values are: snapshotless-observer, full-archive, db-lookup-extension, historical-balances or `\"\"` (empty). Multiple values can be separated via ,",
 		Value: "",
 	}
+
+	// repopulateTokensSupplies defines a flag that, if set, will repopulate the tokens supplies database by iterating over the trie
+	repopulateTokensSupplies = cli.BoolFlag{
+		Name:  "repopulate-tokens-supplies",
+		Usage: "Boolean flag for repopulating the tokens supplies database. It will delete the current data, iterate over the entire trie and add he new obtained supplies",
+	}
 )
 
 func getFlags() []cli.Flag {
@@ -443,6 +449,7 @@ func getFlags() []cli.Flag {
 		dbDirectory,
 		logsDirectory,
 		operationMode,
+		repopulateTokensSupplies,
 	}
 }
 
@@ -472,6 +479,7 @@ func getFlagsConfig(ctx *cli.Context, log logger.Logger) *config.ContextFlagsCon
 	flagsConfig.NoKeyProvided = ctx.GlobalBool(noKey.Name)
 	flagsConfig.SnapshotsEnabled = ctx.GlobalBool(snapshotsEnabled.Name)
 	flagsConfig.OperationMode = ctx.GlobalString(operationMode.Name)
+	flagsConfig.RepopulateTokensSupplies = ctx.GlobalBool(repopulateTokensSupplies.Name)
 
 	return flagsConfig
 }

config/contextFlagsConfig.go

@@ -28,6 +28,7 @@ type ContextFlagsConfig struct {
 	NoKeyProvided                bool
 	SnapshotsEnabled             bool
 	OperationMode                string
+	RepopulateTokensSupplies     bool
 }
 
 // ImportDbConfig will hold the import-db parameters

consensus/mock/bootstrapperStub.go

@@ -11,7 +11,7 @@ type BootstrapperStub struct {
 	CreateAndCommitEmptyBlockCalled func(uint32) (data.BodyHandler, data.HeaderHandler, error)
 	AddSyncStateListenerCalled      func(func(bool))
 	GetNodeStateCalled              func() common.NodeState
-	StartSyncingBlocksCalled        func()
+	StartSyncingBlocksCalled        func() error
 }
 
 // CreateAndCommitEmptyBlock -
@@ -40,8 +40,12 @@ func (boot *BootstrapperStub) GetNodeState() common.NodeState {
 }
 
 // StartSyncingBlocks -
-func (boot *BootstrapperStub) StartSyncingBlocks() {
-	boot.StartSyncingBlocksCalled()
+func (boot *BootstrapperStub) StartSyncingBlocks() error {
+	if boot.StartSyncingBlocksCalled != nil {
+		return boot.StartSyncingBlocksCalled()
+	}
+
+	return nil
 }
 
 // Close -

dblookupext/esdtSupply/proto/supplyESDT.proto

@@ -12,4 +12,5 @@ message SupplyESDT {
   bytes  Supply = 1  [(gogoproto.jsontag) = "value", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
   bytes  Burned = 2  [(gogoproto.jsontag) = "burned", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
   bytes  Minted = 3  [(gogoproto.jsontag) = "minted", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"];
+  bool   RecomputedSupply = 4 [(gogoproto.jsontag) = "recomputedSupply"];
 }

epochStart/bootstrap/metaStorageHandler.go

@@ -54,6 +54,7 @@ func NewMetaStorageHandler(
 			CreateTrieEpochRootHashStorer: false,
 			NodeProcessingMode:            nodeProcessingMode,
 			SnapshotsEnabled:              snapshotsEnabled,
+			RepopulateTokensSupplies:      false, // tokens supplies cannot be repopulated at this time
 			ManagedPeersHolder:            managedPeersHolder,
 		},
 	)

epochStart/bootstrap/process.go

@@ -1123,6 +1123,7 @@ func (e *epochStartBootstrap) createStorageService(
 			CreateTrieEpochRootHashStorer: createTrieEpochRootHashStorer,
 			NodeProcessingMode:            e.nodeProcessingMode,
 			SnapshotsEnabled:              e.flagsConfig.SnapshotsEnabled,
+			RepopulateTokensSupplies:      e.flagsConfig.RepopulateTokensSupplies,
 			ManagedPeersHolder:            e.cryptoComponentsHolder.ManagedPeersHolder(),
 		})
 	if err != nil {

epochStart/bootstrap/shardStorageHandler.go

@@ -58,6 +58,7 @@ func NewShardStorageHandler(
 			CreateTrieEpochRootHashStorer: false,
 			NodeProcessingMode:            nodeProcessingMode,
 			SnapshotsEnabled:              snapshotsEnabled,
+			RepopulateTokensSupplies:      false, // tokens supplies cannot be repopulated at this time
 			ManagedPeersHolder:            managedPeersHolder,
 		},
 	)

factory/consensus/consensusComponents.go

@@ -39,6 +39,7 @@ const defaultSpan = 300 * time.Second
 // ConsensusComponentsFactoryArgs holds the arguments needed to create a consensus components factory
 type ConsensusComponentsFactoryArgs struct {
 	Config                config.Config
+	FlagsConfig           config.ContextFlagsConfig
 	BootstrapRoundIndex   uint64
 	CoreComponents        factory.CoreComponentsHolder
 	NetworkComponents     factory.NetworkComponentsHolder
@@ -55,6 +56,7 @@ type ConsensusComponentsFactoryArgs struct {
 
 type consensusComponentsFactory struct {
 	config                config.Config
+	flagsConfig           config.ContextFlagsConfig
 	bootstrapRoundIndex   uint64
 	coreComponents        factory.CoreComponentsHolder
 	networkComponents     factory.NetworkComponentsHolder
@@ -88,6 +90,7 @@ func NewConsensusComponentsFactory(args ConsensusComponentsFactoryArgs) (*consen
 
 	return &consensusComponentsFactory{
 		config:                args.Config,
+		flagsConfig:           args.FlagsConfig,
 		bootstrapRoundIndex:   args.BootstrapRoundIndex,
 		coreComponents:        args.CoreComponents,
 		networkComponents:     args.NetworkComponents,
@@ -133,7 +136,10 @@ func (ccf *consensusComponentsFactory) Create() (*consensusComponents, error) {
 		return nil, err
 	}
 
-	cc.bootstrapper.StartSyncingBlocks()
+	err = cc.bootstrapper.StartSyncingBlocks()
+	if err != nil {
+		return nil, err
+	}
 
 	epoch := ccf.getEpoch()
 	consensusState, err := ccf.createConsensusState(epoch, cc.consensusGroupSize)
@@ -471,6 +477,7 @@ func (ccf *consensusComponentsFactory) createShardBootstrapper() (process.Bootst
 		HistoryRepo:                  ccf.processComponents.HistoryRepository(),
 		ScheduledTxsExecutionHandler: ccf.processComponents.ScheduledTxsExecutionHandler(),
 		ProcessWaitTime:              time.Duration(ccf.config.GeneralSettings.SyncProcessTimeInMillis) * time.Millisecond,
+		RepopulateTokensSupplies:     ccf.flagsConfig.RepopulateTokensSupplies,
 	}
 
 	argsShardBootstrapper := sync.ArgShardBootstrapper{
@@ -600,6 +607,7 @@ func (ccf *consensusComponentsFactory) createMetaChainBootstrapper() (process.Bo
 		HistoryRepo:                  ccf.processComponents.HistoryRepository(),
 		ScheduledTxsExecutionHandler: ccf.processComponents.ScheduledTxsExecutionHandler(),
 		ProcessWaitTime:              time.Duration(ccf.config.GeneralSettings.SyncProcessTimeInMillis) * time.Millisecond,
+		RepopulateTokensSupplies:     ccf.flagsConfig.RepopulateTokensSupplies,
 	}
 
 	argsMetaBootstrapper := sync.ArgMetaBootstrapper{

factory/data/dataComponents.go

@@ -27,10 +27,10 @@ type DataComponentsFactoryArgs struct {
 	Core                          factory.CoreComponentsHolder
 	StatusCore                    factory.StatusCoreComponentsHolder
 	Crypto                        factory.CryptoComponentsHolder
+	FlagsConfigs                  config.ContextFlagsConfig
 	CurrentEpoch                  uint32
 	CreateTrieEpochRootHashStorer bool
 	NodeProcessingMode            common.NodeProcessingMode
-	SnapshotsEnabled              bool
 }
 
 type dataComponentsFactory struct {
@@ -40,10 +40,10 @@ type dataComponentsFactory struct {
 	core                          factory.CoreComponentsHolder
 	statusCore                    factory.StatusCoreComponentsHolder
 	crypto                        factory.CryptoComponentsHolder
+	flagsConfig                   config.ContextFlagsConfig
 	currentEpoch                  uint32
 	createTrieEpochRootHashStorer bool
 	nodeProcessingMode            common.NodeProcessingMode
-	snapshotsEnabled              bool
 }
 
 // dataComponents struct holds the data components
@@ -79,8 +79,8 @@ func NewDataComponentsFactory(args DataComponentsFactoryArgs) (*dataComponentsFa
 		statusCore:                    args.StatusCore,
 		currentEpoch:                  args.CurrentEpoch,
 		createTrieEpochRootHashStorer: args.CreateTrieEpochRootHashStorer,
+		flagsConfig:                   args.FlagsConfigs,
 		nodeProcessingMode:            args.NodeProcessingMode,
-		snapshotsEnabled:              args.SnapshotsEnabled,
 		crypto:                        args.Crypto,
 	}, nil
 }
@@ -171,7 +171,8 @@ func (dcf *dataComponentsFactory) createDataStoreFromConfig() (dataRetriever.Sto
 			StorageType:                   storageFactory.ProcessStorageService,
 			CreateTrieEpochRootHashStorer: dcf.createTrieEpochRootHashStorer,
 			NodeProcessingMode:            dcf.nodeProcessingMode,
-			SnapshotsEnabled:              dcf.snapshotsEnabled,
+			SnapshotsEnabled:              dcf.flagsConfig.SnapshotsEnabled,
+			RepopulateTokensSupplies:      dcf.flagsConfig.RepopulateTokensSupplies,
 			ManagedPeersHolder:            dcf.crypto.ManagedPeersHolder(),
 		})
 	if err != nil {