Merge pull request #325 from threefoldtech/feat/horizon-url

make horizon url configurable

cmds/stellar/multisig.go

@@ -31,7 +31,7 @@ func create(c *cli.Context) error {
 		return err
 	}
 
-	wallet, err := stellar.New(seed, network, nil)
+	wallet, err := stellar.New(seed, network, nil, "")
 	if err != nil {
 		return err
 	}
@@ -53,7 +53,7 @@ func signAndSubmit(c *cli.Context) error {
 	network := c.String("network")
 	transaction := c.String("transaction")
 
-	wallet, err := stellar.New(seed, network, nil)
+	wallet, err := stellar.New(seed, network, nil, "")
 	if err != nil {
 		return err
 	}

cmds/tfexplorer/main.go

@@ -73,6 +73,7 @@ func main() {
 	flag.BoolVar(&f.flushEscrows, "flush-escrows", false, "flush all escrows in the database, including currently active ones, and their associated addressses")
 	flag.BoolVar(&f.enablePProf, "pprof", false, "enable pprof")
 	flag.Int64Var(&f.prometheusPort, "prometheus-port", 3200, "port the run the prometheus server on")
+	flag.StringVar(&config.Config.HorizonURL, "horizon", "", "Horizon server URL to communicate with")
 
 	flag.Parse()
 
@@ -188,7 +189,7 @@ func createServer(f flags, client *mongo.Client, dropEscrowData bool) (*http.Ser
 			log.Fatal().Err(err).Msg("failed to create escrow database indexes")
 		}
 
-		wallet, err := stellar.New(f.seed, config.Config.WalletNetwork, f.backupSigners)
+		wallet, err := stellar.New(f.seed, config.Config.WalletNetwork, f.backupSigners, config.Config.HorizonURL)
 		if err != nil {
 			log.Fatal().Err(err).Msg("failed to create stellar wallet")
 		}

config/global.go

@@ -13,6 +13,7 @@ import (
 type Settings struct {
 	WalletNetwork string
 	TFNetwork     string
+	HorizonURL    string
 }
 
 var (

pkg/directory/types/farm.go

@@ -49,7 +49,7 @@ func (f *Farm) Validate() error {
 	if config.Config.WalletNetwork != "" {
 		found := false
 		for _, a := range f.WalletAddresses {
-			validator, err := stellar.NewAddressValidator(config.Config.WalletNetwork, a.Asset)
+			validator, err := stellar.NewAddressValidator(config.Config.WalletNetwork, a.Asset, config.Config.HorizonURL)
 			if err != nil {
 				if errors.Is(err, stellar.ErrAssetCodeNotSupported) {
 					continue

pkg/escrow/stellar_test.go

@@ -87,7 +87,7 @@ func TestPayoutDistribution(t *testing.T) {
 		assert.NoError(t, pd.Valid())
 	}
 
-	w, err := stellar.New("", stellar.NetworkTest, nil)
+	w, err := stellar.New("", stellar.NetworkTest, nil, "")
 	assert.NoError(t, err)
 
 	e := NewStellar(w, nil, "", gridnetworks.GridNetworkMainnet)

pkg/stellar/stellar.go

@@ -32,10 +32,11 @@ type (
 	// stellarWallet is the foundation wallet
 	// Payments will be funded and fees will be taken with this wallet
 	stellarWallet struct {
-		keypair *keypair.Full
-		network string
-		assets  map[Asset]struct{}
-		signers Signers
+		keypair    *keypair.Full
+		network    string
+		assets     map[Asset]struct{}
+		signers    Signers
+		horizonURL string
 	}
 
 	// Wallet interface
@@ -81,17 +82,18 @@ var (
 // New stellar wallet from an optional seed. If no seed is given (i.e. empty string),
 // the wallet will panic on all actions which need to be signed, or otherwise require
 // a key to be loaded.
-func New(seed, network string, signers []string) (Wallet, error) {
+func New(seed, network string, signers []string, horizonURL string) (Wallet, error) {
 	assets := mainnetAssets
 
 	if len(signers) < 3 && seed != "" {
 		log.Warn().Msg("to enable escrow account recovery, provide at least 3 signers")
 	}
 
 	w := &stellarWallet{
-		network: network,
-		assets:  assets,
-		signers: signers,
+		network:    network,
+		assets:     assets,
+		signers:    signers,
+		horizonURL: horizonURL,
 	}
 
 	var err error
@@ -632,6 +634,10 @@ func (w *stellarWallet) keypairFromEncryptedSeed(seed string) (keypair.Full, err
 
 // GetHorizonClient gets the horizon client based on the wallet's network
 func (w *stellarWallet) GetHorizonClient() (*horizonclient.Client, error) {
+	if w.horizonURL != "" {
+		return &horizonclient.Client{HorizonURL: w.horizonURL}, nil
+	}
+
 	switch w.network {
 	case "testnet":
 		return horizonclient.DefaultTestNetClient, nil

pkg/stellar/validation.go

@@ -11,21 +11,22 @@ import (
 
 // AddressValidator validates stellar address
 type AddressValidator struct {
-	network string
-	asset   Asset
+	network    string
+	asset      Asset
+	horizonURL string
 }
 
 // NewAddressValidator creates an address validator instance
-func NewAddressValidator(network, assetCode string) (*AddressValidator, error) {
-	w, err := New("", network, nil)
+func NewAddressValidator(network, assetCode, horizonURL string) (*AddressValidator, error) {
+	w, err := New("", network, nil, "")
 	if err != nil {
 		return nil, errors.Wrap(err, "could not create wallet")
 	}
 	asset, err := w.AssetFromCode(assetCode)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not load asset code")
 	}
-	return &AddressValidator{network: network, asset: asset}, nil
+	return &AddressValidator{network: network, asset: asset, horizonURL: horizonURL}, nil
 }
 
 // Valid validates a stellar address, and only return nil if address is valid
@@ -70,6 +71,10 @@ func (a *AddressValidator) getAccountDetails(address string) (account hProtocol.
 }
 
 func (a *AddressValidator) getHorizonClient() (*horizonclient.Client, error) {
+	if a.horizonURL != "" {
+		return &horizonclient.Client{HorizonURL: a.horizonURL}, nil
+	}
+
 	switch a.network {
 	case NetworkTest:
 		return horizonclient.DefaultTestNetClient, nil