Index incoming tokens

cmd/node/config/external.toml

@@ -15,6 +15,17 @@
     # ["rating", "transactions", "blocks", "validators", "miniblocks", "rounds", "accounts", "accountshistory", "receipts", "scresults", "accountsesdt", "accountsesdthistory", "epochinfo", "scdeploys", "tokens", "tags", "logs", "delegators", "operations", "esdts"]
     EnabledIndexes    = ["rating", "transactions", "blocks", "validators", "miniblocks", "rounds", "accounts", "accountshistory", "receipts", "scresults", "accountsesdt", "accountsesdthistory", "epochinfo", "scdeploys", "tokens", "tags", "logs", "delegators", "operations", "esdts"]
 
+# MainChainElasticSearchConnector defines settings related to ElasticSearch such as login information or URL
+[MainChainElasticSearchConnector]
+    ## We do not recommend to activate this indexer on a validator node since
+    #the node might lose rating (even facing penalties) due to the fact that
+    #the indexer is called synchronously and might block due to external causes.
+    #Strongly suggested to activate this on a regular observer node.
+    Enabled = false
+    URL = "http://localhost:9201"
+    Username = ""
+    Password = ""
+
 # EventNotifierConnector defines settings needed to configure and launch the event notifier component
 # HTTP event notifier connector integration will be DEPRECATED in the following iterations
 [EventNotifierConnector]

cmd/sovereignnode/go.mod

@@ -120,7 +120,7 @@ require (
 	github.com/multiversx/concurrent-map v0.1.4 // indirect
 	github.com/multiversx/mx-chain-communication-go v1.1.1 // indirect
 	github.com/multiversx/mx-chain-crypto-go v1.2.12 // indirect
-	github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4 // indirect
+	github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20250128112625-86bc0754b1e9 // indirect
 	github.com/multiversx/mx-chain-scenario-go v1.4.4 // indirect
 	github.com/multiversx/mx-chain-storage-go v1.0.16 // indirect
 	github.com/multiversx/mx-chain-vm-common-go v1.5.17-0.20241119132002-2fa80c5ec516 // indirect

cmd/sovereignnode/go.sum

@@ -389,8 +389,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241209142414-762196f8dd06 h1:
 github.com/multiversx/mx-chain-core-go v1.2.24-0.20241209142414-762196f8dd06/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0=
 github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk=
 github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4=
-github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4 h1:IfjK6IQy65eMWr/FEv3CMUz13ZqH9sWLnKv85/AoayM=
-github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY=
+github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20250128112625-86bc0754b1e9 h1:rQL4GS2fLvSHzPqbZ08emtfh+IzMkFJOlwtNenyHtAI=
+github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20250128112625-86bc0754b1e9/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY=
 github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc=
 github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ=
 github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460=

cmd/sovereignnode/sovereignNodeRunner.go

@@ -1226,6 +1226,7 @@ func (snr *sovereignNodeRunner) CreateManagedStatusComponents(
 		StatusCoreComponents: managedStatusCoreComponents,
 		CryptoComponents:     cryptoComponents,
 		IsSovereign:          true,
+		ESDTPrefix:           snr.configs.SystemSCConfig.ESDTSystemSCConfig.ESDTPrefix,
 	}
 
 	statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs)

config/externalConfig.go

@@ -2,9 +2,10 @@ package config
 
 // ExternalConfig will hold the configurations for external tools, such as Explorer or Elasticsearch
 type ExternalConfig struct {
-	ElasticSearchConnector ElasticSearchConfig
-	EventNotifierConnector EventNotifierConfig
-	HostDriversConfig      []HostDriversConfig
+	ElasticSearchConnector          ElasticSearchConfig
+	MainChainElasticSearchConnector MainChainElasticSearchConfig
+	EventNotifierConnector          EventNotifierConfig
+	HostDriversConfig               []HostDriversConfig
 }
 
 // ElasticSearchConfig will hold the configuration for the elastic search
@@ -19,6 +20,14 @@ type ElasticSearchConfig struct {
 	EnabledIndexes            []string
 }
 
+// MainChainElasticSearchConfig will hold the configuration for the main chain elastic search
+type MainChainElasticSearchConfig struct {
+	Enabled  bool
+	URL      string
+	Username string
+	Password string
+}
+
 // EventNotifierConfig will hold the configuration for the events notifier driver
 type EventNotifierConfig struct {
 	Enabled           bool

factory/status/statusComponents.go

@@ -6,6 +6,7 @@ import (
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	factoryMarshalizer "github.com/multiversx/mx-chain-core-go/marshal/factory"
+	esFactory "github.com/multiversx/mx-chain-es-indexer-go/process/elasticproc/factory"
 	indexerFactory "github.com/multiversx/mx-chain-es-indexer-go/process/factory"
 	logger "github.com/multiversx/mx-chain-logger-go"
 
@@ -47,6 +48,7 @@ type StatusComponentsFactoryArgs struct {
 	CryptoComponents     factory.CryptoComponentsHolder
 	IsInImportMode       bool
 	IsSovereign          bool
+	ESDTPrefix           string
 }
 
 type statusComponentsFactory struct {
@@ -64,6 +66,7 @@ type statusComponentsFactory struct {
 	cryptoComponents     factory.CryptoComponentsHolder
 	isInImportMode       bool
 	isSovereign          bool
+	esdtPrefix           string
 }
 
 var log = logger.GetOrCreate("factory")
@@ -109,6 +112,7 @@ func NewStatusComponentsFactory(args StatusComponentsFactoryArgs) (*statusCompon
 		isInImportMode:       args.IsInImportMode,
 		cryptoComponents:     args.CryptoComponents,
 		isSovereign:          args.IsSovereign,
+		esdtPrefix:           args.ESDTPrefix,
 	}, nil
 }
 
@@ -218,6 +222,13 @@ func (scf *statusComponentsFactory) createOutportDriver() (outport.OutportHandle
 
 func (scf *statusComponentsFactory) makeElasticIndexerArgs() indexerFactory.ArgsIndexerFactory {
 	elasticSearchConfig := scf.externalConfig.ElasticSearchConnector
+	mainChainElastic := esFactory.ElasticConfig{
+		Enabled:  scf.externalConfig.MainChainElasticSearchConnector.Enabled,
+		Url:      scf.externalConfig.MainChainElasticSearchConnector.URL,
+		UserName: scf.externalConfig.MainChainElasticSearchConnector.Username,
+		Password: scf.externalConfig.MainChainElasticSearchConnector.Password,
+	}
+
 	return indexerFactory.ArgsIndexerFactory{
 		Enabled:                  elasticSearchConfig.Enabled,
 		BulkRequestMaxSize:       elasticSearchConfig.BulkRequestMaxSizeInBytes,
@@ -234,6 +245,8 @@ func (scf *statusComponentsFactory) makeElasticIndexerArgs() indexerFactory.Args
 		ImportDB:                 scf.isInImportMode,
 		HeaderMarshaller:         scf.coreComponents.InternalMarshalizer(),
 		Sovereign:                scf.isSovereign,
+		ESDTPrefix:               scf.esdtPrefix,
+		MainChainElastic:         mainChainElastic,
 	}
 }
 

factory/status/statusComponents_test.go

@@ -65,6 +65,7 @@ func createMockStatusComponentsFactoryArgs() statusComp.StatusComponentsFactoryA
 		},
 		IsInImportMode: false,
 		IsSovereign:    false,
+		ESDTPrefix:     "",
 	}
 }
 

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/multiversx/mx-chain-communication-go v1.1.1
 	github.com/multiversx/mx-chain-core-go v1.2.24-0.20241209142414-762196f8dd06
 	github.com/multiversx/mx-chain-crypto-go v1.2.12
-	github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4
+	github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20250128112625-86bc0754b1e9
 	github.com/multiversx/mx-chain-logger-go v1.0.15
 	github.com/multiversx/mx-chain-scenario-go v1.4.4
 	github.com/multiversx/mx-chain-storage-go v1.0.16

go.sum

@@ -391,8 +391,8 @@ github.com/multiversx/mx-chain-core-go v1.2.24-0.20241209142414-762196f8dd06 h1:
 github.com/multiversx/mx-chain-core-go v1.2.24-0.20241209142414-762196f8dd06/go.mod h1:P/YBoFnt25XUaCQ7Q/SD15vhnc9yV5JDhHxyFO9P8Z0=
 github.com/multiversx/mx-chain-crypto-go v1.2.12 h1:zWip7rpUS4CGthJxfKn5MZfMfYPjVjIiCID6uX5BSOk=
 github.com/multiversx/mx-chain-crypto-go v1.2.12/go.mod h1:HzcPpCm1zanNct/6h2rIh+MFrlXbjA5C8+uMyXj3LI4=
-github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4 h1:IfjK6IQy65eMWr/FEv3CMUz13ZqH9sWLnKv85/AoayM=
-github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20241211094055-23de51462ca4/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY=
+github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20250128112625-86bc0754b1e9 h1:rQL4GS2fLvSHzPqbZ08emtfh+IzMkFJOlwtNenyHtAI=
+github.com/multiversx/mx-chain-es-indexer-go v1.7.11-0.20250128112625-86bc0754b1e9/go.mod h1:i5xoCUsrHteffxx3yfR8bj9tmpP/DtastZGOc/KRAoY=
 github.com/multiversx/mx-chain-logger-go v1.0.15 h1:HlNdK8etyJyL9NQ+6mIXyKPEBo+wRqOwi3n+m2QIHXc=
 github.com/multiversx/mx-chain-logger-go v1.0.15/go.mod h1:t3PRKaWB1M+i6gUfD27KXgzLJJC+mAQiN+FLlL1yoGQ=
 github.com/multiversx/mx-chain-scenario-go v1.4.4 h1:DVE2V+FPeyD/yWoC+KEfPK3jsFzHeruelESfpTlf460=

node/nodeRunner.go

@@ -1115,6 +1115,7 @@ func (nr *nodeRunner) CreateManagedStatusComponents(
 		StatusCoreComponents: managedStatusCoreComponents,
 		CryptoComponents:     cryptoComponents,
 		IsSovereign:          false,
+		ESDTPrefix:           nr.configs.SystemSCConfig.ESDTSystemSCConfig.ESDTPrefix,
 	}
 
 	statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs)

scripts/testnet/include/config.sh

@@ -174,6 +174,7 @@ updateNodeConfig() {
 
 	if [ $USE_ELASTICSEARCH -eq 1 ]; then
 	  sed -i '/^\[ElasticSearchConnector\]/,/^\[/ s/Enabled *= *false/Enabled = true/' external_observer.toml
+	  sed -i '/^\[MainChainElasticSearchConnector\]/,/^\[/ s/Enabled *= *false/Enabled = true/' external_observer.toml
 	fi
 
   sed -i '/^\[DbLookupExtensions\]/,/^\[/ s/Enabled *= *false/Enabled = true/' config_observer.toml

scripts/testnet/sovereignBridge/config/configs.cfg

@@ -8,6 +8,7 @@ WALLET="~/wallet.pem"
 WALLET_SOVEREIGN="~/MultiversX/testnet/node/config/walletKey.pem"
 
 #=========== NETWORK CONFIGURATION ===========
+MAIN_CHAIN_ELASTIC=https://testnet-index.multiversx.com
 PROXY=https://testnet-gateway.multiversx.com
 CHAIN_ID=T
 PROXY_SOVEREIGN=http://localhost:${PORT_PROXY}

scripts/testnet/sovereignBridge/config/deploy.snippets.sh

@@ -71,15 +71,6 @@ sovereignStart() {
     $TESTNET_DIR/sovereignStart.sh
 }
 
-# This function will restart sovereign:
-# - stop sovereign nodes and services
-# - deploy sovereign nodes with all services
-sovereignRestart() {
-    stopSovereign
-
-    sovereignStart
-}
-
 # This function will reset sovereign:
 # - stop sovereign nodes and services
 # - deploy sovereign nodes with all services

scripts/testnet/sovereignBridge/config/py.snippets.sh

@@ -44,7 +44,7 @@ updateSovereignConfig() {
         ESDT_PREFIX=$1
     fi
 
-    python3 $SCRIPT_PATH/pyScripts/update_toml.py $ESDT_SAFE_ADDRESS $ESDT_SAFE_ADDRESS_SOVEREIGN $ESDT_PREFIX
+    python3 $SCRIPT_PATH/pyScripts/update_toml.py $ESDT_SAFE_ADDRESS $ESDT_SAFE_ADDRESS_SOVEREIGN $ESDT_PREFIX $MAIN_CHAIN_ELASTIC
 }
 
 generateRandomEsdtPrefix() {

scripts/testnet/sovereignBridge/pyScripts/update_toml.py

@@ -1,6 +1,6 @@
 import os
-import sys
 import re
+import sys
 
 
 def update_subscribed_addresses(lines, section, identifier, main_chain_address) -> []:
@@ -68,11 +68,37 @@ def update_node_configs(config_path, esdt_prefix, sovereign_chain_address):
     update_transfer_and_execute_address(config_path + "/config.toml", sovereign_chain_address)
 
 
+def update_main_chain_elastic_url(lines, section, key, value):
+    updated_lines = []
+    section_found = False
+
+    for line in lines:
+        if line.startswith("[" + section + "]"):
+            section_found = True
+        if section_found and key in line:
+            line = re.sub(rf'({re.escape(key)}\s*=\s*)".*?"', rf'\1"{value}"', line)
+            section_found = False
+        updated_lines.append(line)
+
+    return updated_lines
+
+
+def update_external_config(file_path, main_chain_elastic):
+    with open(file_path, 'r') as file:
+        lines = file.readlines()
+
+    updated_lines = update_main_chain_elastic_url(lines, "MainChainElasticSearchConnector", "URL", main_chain_elastic)
+
+    with open(file_path, 'w') as file:
+        file.writelines(updated_lines)
+
+
 def main():
     # input arguments
     main_chain_address = sys.argv[1]
     sovereign_chain_address = sys.argv[2]
     esdt_prefix = sys.argv[3]
+    main_chain_elastic = sys.argv[4]
 
     current_path = os.getcwd()
     project = 'mx-chain-go'
@@ -84,6 +110,9 @@ def main():
     config_path = project_path + "/cmd/node/config"
     update_node_configs(config_path, esdt_prefix, sovereign_chain_address)
 
+    external_path = project_path + "/cmd/node/config/external.toml"
+    update_external_config(external_path, main_chain_elastic)
+
 
 if __name__ == "__main__":
     main()