Merge branch 'feat/chain-go-sdk' into MX-15080-genesis-accounts-with-…

…esdt-tokens

cmd/sovereignnode/config/sovereignConfig.toml

@@ -33,6 +33,10 @@
     # Time to wait in seconds for outgoing operations that need to be bridged from sovereign chain to main chain.
     # If no confirmation of bridged data is received after this time, next leader should retry sending data.
     TimeToWaitForUnconfirmedOutGoingOperationInSeconds = 30
+
+    SubscribedEvents = [
+        { Identifier = "deposit", Addresses = ["erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"] }
+    ]
 
 [OutGoingBridge]
     GRPCHost = "localhost"

config/sovereignConfig.go

@@ -14,7 +14,8 @@ type SovereignConfig struct {
 
 // OutgoingSubscribedEvents holds config for outgoing subscribed events
 type OutgoingSubscribedEvents struct {
-	TimeToWaitForUnconfirmedOutGoingOperationInSeconds uint32 `toml:"TimeToWaitForUnconfirmedOutGoingOperationInSeconds"`
+	TimeToWaitForUnconfirmedOutGoingOperationInSeconds uint32            `toml:"TimeToWaitForUnconfirmedOutGoingOperationInSeconds"`
+	SubscribedEvents                                   []SubscribedEvent `toml:"SubscribedEvents"`
 }
 
 // MainChainNotarization defines necessary data to start main chain notarization on a sovereign shard

factory/processing/blockProcessorCreator.go

@@ -539,7 +539,7 @@ func (pcf *processComponentsFactory) createBlockProcessor(
 		// TODO: Radu Chis: move this in the factory of the sovereign block processor once the refactor is completed
 
 		outgoingOpFormatter, errOpFormatter := sovereign.CreateOutgoingOperationsFormatter(
-			pcf.config.SovereignConfig.NotifierConfig.SubscribedEvents,
+			pcf.config.SovereignConfig.OutgoingSubscribedEvents.SubscribedEvents,
 			pcf.coreData.AddressPubKeyConverter(),
 			pcf.coreData.RoundHandler(),
 		)

testscommon/components/configs.go

@@ -199,6 +199,14 @@ func GetGeneralConfig() config.Config {
 					},
 				},
 			},
+			OutgoingSubscribedEvents: config.OutgoingSubscribedEvents{
+				SubscribedEvents: []config.SubscribedEvent{
+					{
+						Identifier: "bridgeOps",
+						Addresses:  []string{"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"},
+					},
+				},
+			},
 		},
 	}
 }

testscommon/generalConfig.go

@@ -424,6 +424,14 @@ func GetGeneralConfig() config.Config {
 					},
 				},
 			},
+			OutgoingSubscribedEvents: config.OutgoingSubscribedEvents{
+				SubscribedEvents: []config.SubscribedEvent{
+					{
+						Identifier: "bridgeOps",
+						Addresses:  []string{"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"},
+					},
+				},
+			},
 		},
 	}
 }