services/horizon: Add flag to choose a custom peering port for Captive Core

ingest/ledgerbackend/captive_core_backend.go

@@ -121,6 +121,10 @@ type CaptiveCoreConfig struct {
 	LedgerHashStore TrustedLedgerHashStore
 	// HTTPPort is the TCP port to listen for requests (defaults to 0, which disables the HTTP server)
 	HTTPPort uint
+	// PeerPort is the TCP port to bind to for connecting to the Stellar network
+	// (defaults to 11625). It may be useful for example when there's >1 Stellar-Core
+	// instance running on a machine.
+	PeerPort uint
 	// Log is an (optional) custom logger which will capture any output from the Stellar Core process.
 	// If Log is omitted then all output will be printed to stdout.
 	Log *log.Entry

ingest/ledgerbackend/stellar_core_runner.go

@@ -54,6 +54,7 @@ type stellarCoreRunner struct {
 	networkPassphrase string
 	historyURLs       []string
 	httpPort          uint
+	peerPort          uint
 	mode              stellarCoreRunnerMode
 
 	started      bool
@@ -89,6 +90,7 @@ func newStellarCoreRunner(config CaptiveCoreConfig, mode stellarCoreRunnerMode)
 		networkPassphrase: config.NetworkPassphrase,
 		historyURLs:       config.HistoryArchiveURLs,
 		httpPort:          config.HTTPPort,
+		peerPort:          config.PeerPort,
 		mode:              mode,
 		ctx:               ctx,
 		cancel:            cancel,
@@ -121,6 +123,10 @@ func (r *stellarCoreRunner) generateConfig() (string, error) {
 		fmt.Sprintf(`LOG_FILE_PATH="%s"`, r.logPath),
 	}
 
+	if r.peerPort > 0 {
+		lines = append(lines, fmt.Sprintf(`PEER_PORT=%d`, r.peerPort))
+	}
+
 	if r.mode == stellarCoreRunnerModeOffline {
 		// In offline mode, there is no need to connect to peers
 		lines = append(lines, "RUN_STANDALONE=true")
@@ -153,6 +159,8 @@ func (r *stellarCoreRunner) generateConfig() (string, error) {
 	}
 	result += strings.Join(lines, "\n")
 
+	fmt.Println(result)
+
 	return result, nil
 }
 

ingest/ledgerbackend/stellar_core_runner_test.go

@@ -44,6 +44,7 @@ func TestGenerateConfig(t *testing.T) {
 				HistoryArchiveURLs: []string{"http://localhost:1170"},
 				Log:                log.New(),
 				ConfigAppendPath:   testCase.appendPath,
+				PeerPort:           12345,
 				Context:            context.Background(),
 				NetworkPassphrase:  "Public Global Stellar Network ; September 2015",
 			}, testCase.mode)

ingest/ledgerbackend/testdata/expected-offline-core.cfg

@@ -5,6 +5,7 @@ NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"
 BUCKET_DIR_PATH="/test-temp-dir/buckets"
 HTTP_PORT=6789
 LOG_FILE_PATH=""
+PEER_PORT=12345
 RUN_STANDALONE=true
 UNSAFE_QUORUM=true
 [QUORUM_SET]

ingest/ledgerbackend/testdata/expected-offline-with-appendix-core.cfg

@@ -5,6 +5,7 @@ NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"
 BUCKET_DIR_PATH="/test-temp-dir/buckets"
 HTTP_PORT=6789
 LOG_FILE_PATH=""
+PEER_PORT=12345
 RUN_STANDALONE=true
 UNSAFE_QUORUM=true
 

ingest/ledgerbackend/testdata/expected-online-core.cfg

@@ -5,6 +5,7 @@ NETWORK_PASSPHRASE="Public Global Stellar Network ; September 2015"
 BUCKET_DIR_PATH="/test-temp-dir/buckets"
 HTTP_PORT=6789
 LOG_FILE_PATH=""
+PEER_PORT=12345
 
 [[HOME_DOMAINS]]
 HOME_DOMAIN="testnet.stellar.org"

services/horizon/internal/config.go

@@ -21,6 +21,7 @@ type Config struct {
 	CaptiveCoreConfigAppendPath string
 	RemoteCaptiveCoreURL        string
 	CaptiveCoreHTTPPort         uint
+	CaptiveCorePeerPort         uint
 	CaptiveCoreLogPath          string
 
 	StellarCoreDatabaseURL string

services/horizon/internal/flags.go

@@ -133,6 +133,14 @@ func Flags() (*Config, support.ConfigOptions) {
 			Usage:       "HTTP port for Captive Core to listen on (0 disables the HTTP server)",
 			ConfigKey:   &config.CaptiveCoreHTTPPort,
 		},
+		&support.ConfigOption{
+			Name:        "captive-core-peer-port",
+			OptType:     types.Uint,
+			FlagDefault: uint(0),
+			Required:    false,
+			Usage:       "port for Captive Core to bind to for connecting to the Stellar swarm (0 uses Stellar Core's default)",
+			ConfigKey:   &config.CaptiveCorePeerPort,
+		},
 		&support.ConfigOption{
 			Name:      StellarCoreDBURLFlagName,
 			EnvVar:    "STELLAR_CORE_DATABASE_URL",

services/horizon/internal/ingest/main.go

@@ -72,6 +72,7 @@ type Config struct {
 	CaptiveCoreBinaryPath       string
 	CaptiveCoreConfigAppendPath string
 	CaptiveCoreHTTPPort         uint
+	CaptiveCorePeerPort         uint
 	CaptiveCoreLogPath          string
 	RemoteCaptiveCoreURL        string
 	NetworkPassphrase           string
@@ -198,6 +199,7 @@ func NewSystem(config Config) (System, error) {
 					BinaryPath:          config.CaptiveCoreBinaryPath,
 					ConfigAppendPath:    config.CaptiveCoreConfigAppendPath,
 					HTTPPort:            config.CaptiveCoreHTTPPort,
+					PeerPort:            config.CaptiveCorePeerPort,
 					NetworkPassphrase:   config.NetworkPassphrase,
 					HistoryArchiveURLs:  []string{config.HistoryArchiveURL},
 					CheckpointFrequency: config.CheckpointFrequency,

services/horizon/internal/init.go

@@ -72,6 +72,7 @@ func initIngester(app *App) {
 		CaptiveCoreBinaryPath:       app.config.CaptiveCoreBinaryPath,
 		CaptiveCoreConfigAppendPath: app.config.CaptiveCoreConfigAppendPath,
 		CaptiveCoreHTTPPort:         app.config.CaptiveCoreHTTPPort,
+		CaptiveCorePeerPort:         app.config.CaptiveCorePeerPort,
 		CaptiveCoreLogPath:          app.config.CaptiveCoreLogPath,
 		RemoteCaptiveCoreURL:        app.config.RemoteCaptiveCoreURL,
 		EnableCaptiveCore:           app.config.EnableCaptiveCoreIngestion,