Merge remote-tracking branch 'origin/master' into merge-master-xdr-next

.github/workflows/horizon.yml

@@ -87,7 +87,8 @@ jobs:
  # Workaround for https://github.com/actions/virtual-environments/issues/5245,
  # libc++1-8 won't be installed if another version is installed (but apt won't give you a helpul
  # message about why the installation fails)
- sudo apt-get remove -y libc++1-10 libc++abi1-10 || true
+ sudo apt list --installed | grep libc++
+ sudo apt-get remove -y libc++1-* libc++abi1-* || true
 
  sudo wget -qO - https://apt.stellar.org/SDF.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true sudo apt-key add -
  sudo bash -c 'echo "deb https://apt.stellar.org focal unstable" > /etc/apt/sources.list.d/SDF-unstable.list'

go.mod

@@ -115,15 +115,14 @@ require (
  golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
  golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
  golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
- golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
- golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
+ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+ golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
  golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 // indirect
- golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
+ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
  golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
- golang.org/x/text v0.3.7 // indirect
+ golang.org/x/text v0.3.8 // indirect
  golang.org/x/time v0.0.0-20220224211638-0e9765cccd65
- golang.org/x/tools v0.1.10 // indirect
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+ golang.org/x/tools v0.1.12 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 // indirect
  google.golang.org/grpc v1.38.0 // indirect

go.sum

@@ -458,8 +458,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
-golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -501,8 +501,9 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -581,8 +582,9 @@ golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -594,8 +596,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -653,12 +656,11 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
-golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=

ingest/ledgerbackend/toml.go

@@ -3,7 +3,7 @@ package ledgerbackend
 import (
  "bytes"
  "fmt"
- "io/ioutil"
+ "os"
  "os/exec"
  "regexp"
  "strconv"
@@ -331,13 +331,19 @@ type CaptiveCoreTomlParams struct {
 // NewCaptiveCoreTomlFromFile constructs a new CaptiveCoreToml instance by merging configuration
 // from the toml file located at `configPath` and the configuration provided by `params`.
 func NewCaptiveCoreTomlFromFile(configPath string, params CaptiveCoreTomlParams) (*CaptiveCoreToml, error) {
- var captiveCoreToml CaptiveCoreToml
- data, err := ioutil.ReadFile(configPath)
+ data, err := os.ReadFile(configPath)
  if err != nil {
  return nil, errors.Wrap(err, "could not load toml path")
  }
+ return NewCaptiveCoreTomlFromData(data, params)
+}
+
+// NewCaptiveCoreTomlFromData constructs a new CaptiveCoreToml instance by merging configuration
+// from the toml data and the configuration provided by `params`.
+func NewCaptiveCoreTomlFromData(data []byte, params CaptiveCoreTomlParams) (*CaptiveCoreToml, error) {
+ var captiveCoreToml CaptiveCoreToml
 
- if err = captiveCoreToml.unmarshal(data, params.Strict); err != nil {
+ if err := captiveCoreToml.unmarshal(data, params.Strict); err != nil {
  return nil, errors.Wrap(err, "could not unmarshal captive core toml")
  }
  // disallow setting BUCKET_DIR_PATH through a file since it can cause multiple
@@ -346,14 +352,13 @@ func NewCaptiveCoreTomlFromFile(configPath string, params CaptiveCoreTomlParams)
  return nil, errors.New("could not unmarshal captive core toml: setting BUCKET_DIR_PATH is disallowed for Captive Core, use CAPTIVE_CORE_STORAGE_PATH instead")
  }
 
- if err = captiveCoreToml.validate(params); err != nil {
+ if err := captiveCoreToml.validate(params); err != nil {
  return nil, errors.Wrap(err, "invalid captive core toml")
  }
 
  if len(captiveCoreToml.HistoryEntries) > 0 {
  log.Warnf(
- "Configuring captive core with history archive from %s instead of %v",
- configPath,
+ "Configuring captive core with history archive from %s",
  params.HistoryArchiveURLs,
  )
  }

network/main.go

@@ -21,6 +21,18 @@ const (
  FutureNetworkPassphrase = "Test SDF Future Network ; October 2022"
 )
 
+var (
+ // PublicNetworkhistoryArchiveURLs is a list of history archive URLs for stellar 'pubnet'
+ PublicNetworkhistoryArchiveURLs = []string{"https://history.stellar.org/prd/core-live/core_live_001/",
+ "https://history.stellar.org/prd/core-live/core_live_002/",
+ "https://history.stellar.org/prd/core-live/core_live_003/"}
+
+ // TestNetworkhistoryArchiveURLs is a list of history archive URLs for stellar 'testnet'
+ TestNetworkhistoryArchiveURLs = []string{"https://history.stellar.org/prd/core-testnet/core_testnet_001/",
+ "https://history.stellar.org/prd/core-testnet/core_testnet_002/",
+ "https://history.stellar.org/prd/core-testnet/core_testnet_003"}
+)
+
 // ID returns the network ID derived from the provided passphrase. This value
 // also happens to be the raw (i.e. not strkey encoded) secret key for the root
 // account of the network.

services/horizon/CHANGELOG.md

@@ -3,13 +3,11 @@
 All notable changes to this project will be documented in this
 file. This project adheres to [Semantic Versioning](https://semver.org/).
 
+
 ## Unreleased
 
-### Changes
-- Update XDR definitions for soroban usage ([4576](https://github.com/stellar/go/pull/4576))
-- Include InvokeHostFunction Details on Operation API resources ([4608](https://github.com/stellar/go/pull/4608))
 - The command line flag --remote-captive-core-url has been removed as remote captive core functionality is now deprecated ([4940](https://github.com/stellar/go/pull/4940)).
-
+- Added new command-line flag --network to specify the Stellar network (pubnet or testnet), aiming at simplifying the configuration process by automatically configuring the following parameters based on the chosen network: --history-archive-urls, --network-passphrase, --captive-core-config-path. ([4949](https://github.com/stellar/go/pull/4949)).
 
 ## 2.26.0
 ### Changes

services/horizon/cmd/ingest.go

@@ -121,7 +121,7 @@ var ingestVerifyRangeCmd = &cobra.Command{
  }
 
  if ingestVerifyState && !mngr.IsCheckpoint(ingestVerifyTo) {
- return fmt.Errorf("`--to` must be a checkpoint ledger when `--verify-state` is set.")
+ return fmt.Errorf("`--to` must be a checkpoint ledger when `--verify-state` is set")
  }
 
  ingestConfig := ingest.Config{
@@ -276,7 +276,7 @@ var ingestTriggerStateRebuildCmd = &cobra.Command{
  return fmt.Errorf("cannot open Horizon DB: %v", err)
  }
 
- historyQ := &history.Q{horizonSession}
+ historyQ := &history.Q{SessionInterface: horizonSession}
  if err := historyQ.UpdateIngestVersion(ctx, 0); err != nil {
  return fmt.Errorf("cannot trigger state rebuild: %v", err)
  }
@@ -300,7 +300,7 @@ var ingestInitGenesisStateCmd = &cobra.Command{
  return fmt.Errorf("cannot open Horizon DB: %v", err)
  }
 
- historyQ := &history.Q{horizonSession}
+ historyQ := &history.Q{SessionInterface: horizonSession}
 
  lastIngestedLedger, err := historyQ.GetLastLedgerIngestNonBlocking(ctx)
  if err != nil {
@@ -372,7 +372,7 @@ var ingestBuildStateCmd = &cobra.Command{
  return fmt.Errorf("cannot open Horizon DB: %v", err)
  }
 
- historyQ := &history.Q{horizonSession}
+ historyQ := &history.Q{SessionInterface: horizonSession}
 
  lastIngestedLedger, err := historyQ.GetLastLedgerIngestNonBlocking(context.Background())
  if err != nil {

services/horizon/cmd/root.go

@@ -36,7 +36,7 @@ func (e ErrUsage) Error() string {
  return e.cmd.UsageString()
 }
 
-// Indicates we want to exit with a specific error code without printing an error.
+// ErrExitCode Indicates we want to exit with a specific error code without printing an error.
 type ErrExitCode int
 
 func (e ErrExitCode) Error() string {