config/config.go

@@ -28,12 +28,11 @@ const (
 )
 
 var (
-	custodialURLBase    string
-	dataURLBase         string
-	BearerToken         string
-	aliasEnsURLBase     string
-	externalSMSBase     string
-	IncludeStablesParam string
+	custodialURLBase string
+	dataURLBase      string
+	BearerToken      string
+	aliasEnsURLBase  string
+	externalSMSBase  string
 )
 
 var (
@@ -65,7 +64,6 @@ func setBase() error {
 	aliasEnsURLBase = env.GetEnv("ALIAS_ENS_BASE", "http://localhost:5015")
 	externalSMSBase = env.GetEnv("EXTERNAL_SMS_BASE", "http://localhost:5035")
 	BearerToken = env.GetEnv("BEARER_TOKEN", "")
-	IncludeStablesParam = env.GetEnv("INCLUDE_STABLES_PARAM", "false")
 
 	_, err = url.Parse(custodialURLBase)
 	if err != nil {

remote/http/service.go

@@ -403,23 +403,20 @@ func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolA
 		PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
 	}
 
-	basePath, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to")
+	ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to")
+	if err != nil {
+		return nil, err
+	}
+	u, err := url.Parse(ep)
 	if err != nil {
 		return nil, err
 	}
 
-	parsedURL, err := url.Parse(basePath)
-	if err != nil {
-		return nil, err
-	}
+	query := u.Query()
+	query.Set("stable", "true")
+	u.RawQuery = query.Encode()
 
-	query := parsedURL.Query()
-	if config.IncludeStablesParam != "" {
-		query.Set("stables", config.IncludeStablesParam)
-	}
-	parsedURL.RawQuery = query.Encode()
-
-	req, err := http.NewRequest("GET", parsedURL.String(), nil)
+	req, err := http.NewRequest("GET", u.String(), nil)
 	if err != nil {
 		return nil, err
 	}