Merge branch 'master' into engine

2026-06-05 07:26:47 +00:00 · 2019-08-09 15:46:24 +10:00
parent e8c9a9a2a4 2078ba907f
commit 8ecd8a0c16
353 changed files with 4966 additions and 4196 deletions
--- a/config/README.md
+++ b/config/README.md
@@ -1,13 +1,13 @@
 # GoCryptoTrader package Config

-<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">
+<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/page-logo.png?raw=true" width="350px" height="350px" hspace="70">


-[![Build Status](https://travis-ci.org/thrasher-/gocryptotrader.svg?branch=master)](https://travis-ci.org/thrasher-/gocryptotrader)
-[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-/gocryptotrader/blob/master/LICENSE)
-[![GoDoc](https://godoc.org/github.com/thrasher-/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-/gocryptotrader/config)
-[![Coverage Status](http://codecov.io/github/thrasher-/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-/gocryptotrader?branch=master)
-[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-/gocryptotrader)
+[![Build Status](https://travis-ci.org/thrasher-corp/gocryptotrader.svg?branch=master)](https://travis-ci.org/thrasher-corp/gocryptotrader)
+[![Software License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square)](https://github.com/thrasher-corp/gocryptotrader/blob/master/LICENSE)
+[![GoDoc](https://godoc.org/github.com/thrasher-corp/gocryptotrader?status.svg)](https://godoc.org/github.com/thrasher-corp/gocryptotrader/config)
+[![Coverage Status](http://codecov.io/github/thrasher-corp/gocryptotrader/coverage.svg?branch=master)](http://codecov.io/github/thrasher-corp/gocryptotrader?branch=master)
+[![Go Report Card](https://goreportcard.com/badge/github.com/thrasher-corp/gocryptotrader)](https://goreportcard.com/report/github.com/thrasher-corp/gocryptotrader)


 This config package is part of the GoCryptoTrader codebase.
@@ -46,7 +46,7 @@ Join our slack to discuss all things related to GoCryptoTrader! [GoCryptoTrader

 + Linux example for quickly creating and testing configuration file
 ```sh
-cd ~/go/src/github.com/thrasher-/gocryptotrader
+cd ~/go/src/github.com/thrasher-corp/gocryptotrader
 cp config_example.json config.json
 # Test config
 go build
@@ -56,7 +56,7 @@ go build
 + or custom config, can also pass in absolute path to "configuration".json file.

 ```sh
-cd ~/go/src/github.com/thrasher-/gocryptotrader
+cd ~/go/src/github.com/thrasher-corp/gocryptotrader
 cp config_example.json custom.json
 # Test config
 go build
@@ -82,7 +82,9 @@ have multiple deposit accounts for different FIAT deposit currencies.
  "Websocket": false,
  "UseSandbox": false,
  "RESTPollingDelay": 10,
-  "HTTPTimeout": 15000000000,
+  "websocketResponseCheckTimeout": 30000000,
+  "websocketResponseMaxLimit": 7000000000,
+  "httpTimeout": 15000000000,
  "AuthenticatedAPISupport": false,
  "APIKey": "Key",
  "APISecret": "Secret",
@@ -238,12 +240,12 @@ When submitting a PR, please abide by our coding guidelines:

 + Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
 + Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
-+ Code must adhere to our [coding style](https://github.com/thrasher-/gocryptotrader/blob/master/doc/coding_style.md).
+ Code must adhere to our [coding style](https://github.com/thrasher-corp/gocryptotrader/blob/master/doc/coding_style.md).
 + Pull requests need to be based on and opened against the `master` branch.

 ## Donations

-<img src="https://github.com/thrasher-/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">
+<img src="https://github.com/thrasher-corp/gocryptotrader/blob/master/web/src/assets/donate.png?raw=true" hspace="70">

 If this framework helped you in any way, or you would like to support the developers working on it, please donate Bitcoin to:

--- a/config/config.go
+++ b/config/config.go
@@ -16,30 +16,32 @@ import (
 	"sync"
 	"time"

-	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/common/convert"
-	"github.com/thrasher-/gocryptotrader/connchecker"
-	"github.com/thrasher-/gocryptotrader/currency"
-	"github.com/thrasher-/gocryptotrader/currency/forexprovider"
-	"github.com/thrasher-/gocryptotrader/currency/forexprovider/base"
-	"github.com/thrasher-/gocryptotrader/exchanges/asset"
-	log "github.com/thrasher-/gocryptotrader/logger"
+	"github.com/thrasher-corp/gocryptotrader/common"
+	"github.com/thrasher-corp/gocryptotrader/common/convert"
+	"github.com/thrasher-corp/gocryptotrader/connchecker"
+	"github.com/thrasher-corp/gocryptotrader/currency"
+	"github.com/thrasher-corp/gocryptotrader/currency/forexprovider"
+	"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/base"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
+	log "github.com/thrasher-corp/gocryptotrader/logger"
 )

 // Constants declared here are filename strings and test strings
 const (
-	FXProviderFixer                        = "fixer"
-	EncryptedConfigFile                    = "config.dat"
-	ConfigFile                             = "config.json"
-	ConfigTestFile                         = "../testdata/configtest.json"
-	configFileEncryptionPrompt             = 0
-	configFileEncryptionEnabled            = 1
-	configFileEncryptionDisabled           = -1
-	configPairsLastUpdatedWarningThreshold = 30 // 30 days
-	configDefaultHTTPTimeout               = time.Second * 15
-	defaultNTPAllowedDifference            = 50000000
-	defaultNTPAllowedNegativeDifference    = 50000000
-	configMaxAuthFailures                  = 3
+	FXProviderFixer                            = "fixer"
+	EncryptedConfigFile                        = "config.dat"
+	ConfigFile                                 = "config.json"
+	ConfigTestFile                             = "../testdata/configtest.json"
+	configFileEncryptionPrompt                 = 0
+	configFileEncryptionEnabled                = 1
+	configFileEncryptionDisabled               = -1
+	configPairsLastUpdatedWarningThreshold     = 30 // 30 days
+	configDefaultHTTPTimeout                   = time.Second * 15
+	configDefaultWebsocketResponseCheckTimeout = time.Millisecond * 30
+	configDefaultWebsocketResponseMaxLimit     = time.Second * 7
+	configMaxAuthFailures                      = 3
+	defaultNTPAllowedDifference                = 50000000
+	defaultNTPAllowedNegativeDifference        = 50000000

 	DefaultAPIKey      = "Key"
 	DefaultAPISecret   = "Secret"
@@ -1010,6 +1012,18 @@ func (c *Config) CheckExchangeConfigValues() error {
 				}
 			}

+			if c.Exchanges[i].WebsocketResponseCheckTimeout <= 0 {
+				log.Warnf(log.ExchangeSys, "Exchange %s Websocket response check timeout value not set, defaulting to %v.",
+					c.Exchanges[i].Name, configDefaultWebsocketResponseCheckTimeout)
+				c.Exchanges[i].WebsocketResponseCheckTimeout = configDefaultWebsocketResponseCheckTimeout
+			}
+
+			if c.Exchanges[i].WebsocketResponseMaxLimit <= 0 {
+				log.Warnf(log.ExchangeSys, "Exchange %s Websocket response max limit value not set, defaulting to %v.",
+					c.Exchanges[i].Name, configDefaultWebsocketResponseMaxLimit)
+				c.Exchanges[i].WebsocketResponseMaxLimit = configDefaultWebsocketResponseMaxLimit
+			}
+
 			err := c.CheckPairConsistency(c.Exchanges[i].Name)
 			if err != nil {
 				log.Errorf(log.ExchangeSys, "Exchange %s: CheckPairConsistency error: %s\n", c.Exchanges[i].Name, err)
--- a/config/config_encryption.go
+++ b/config/config_encryption.go
@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"io"

-	"github.com/thrasher-/gocryptotrader/common"
-	gctcrypto "github.com/thrasher-/gocryptotrader/common/crypto"
+	"github.com/thrasher-corp/gocryptotrader/common"
+	"github.com/thrasher-corp/gocryptotrader/common/crypto"
 	"golang.org/x/crypto/scrypt"
 )

@@ -191,7 +191,7 @@ func getScryptDK(key, salt []byte) ([]byte, error) {

 func makeNewSessionDK(key []byte) ([]byte, error) {
 	var err error
-	storedSalt, err = gctcrypto.GetRandomSalt([]byte(SaltPrefix), SaltRandomLength)
+	storedSalt, err = crypto.GetRandomSalt([]byte(SaltPrefix), SaltRandomLength)
 	if err != nil {
 		return nil, err
 	}
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -4,11 +4,11 @@ import (
 	"strings"
 	"testing"

-	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/currency"
-	"github.com/thrasher-/gocryptotrader/exchanges/asset"
-	log "github.com/thrasher-/gocryptotrader/logger"
-	"github.com/thrasher-/gocryptotrader/ntpclient"
+	"github.com/thrasher-corp/gocryptotrader/common"
+	"github.com/thrasher-corp/gocryptotrader/currency"
+	"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
+	log "github.com/thrasher-corp/gocryptotrader/logger"
+	"github.com/thrasher-corp/gocryptotrader/ntpclient"
 )

 const (
@@ -631,7 +631,6 @@ func TestUpdateExchangeConfig(t *testing.T) {
 // TestCheckExchangeConfigValues logic test
 func TestCheckExchangeConfigValues(t *testing.T) {
 	checkExchangeConfigValues := Config{}
-
 	err := checkExchangeConfigValues.LoadConfig(ConfigTestFile)
 	if err != nil {
 		t.Errorf(
@@ -646,8 +645,24 @@ func TestCheckExchangeConfigValues(t *testing.T) {
 		)
 	}

+	checkExchangeConfigValues.Exchanges[0].WebsocketResponseMaxLimit = 0
+	checkExchangeConfigValues.Exchanges[0].WebsocketResponseCheckTimeout = 0
 	checkExchangeConfigValues.Exchanges[0].HTTPTimeout = 0
-	checkExchangeConfigValues.CheckExchangeConfigValues()
+	err = checkExchangeConfigValues.CheckExchangeConfigValues()
+	if err != nil {
+		t.Errorf("Test failed. checkExchangeConfigValues.CheckExchangeConfigValues: %s",
+			err.Error(),
+		)
+	}
+
+	if checkExchangeConfigValues.Exchanges[0].WebsocketResponseMaxLimit == 0 {
+		t.Fatalf("Test failed. Expected exchange %s to have updated WebsocketResponseMaxLimit value", checkExchangeConfigValues.Exchanges[0].Name)
+	}
+
+	if checkExchangeConfigValues.Exchanges[0].WebsocketResponseCheckTimeout == 0 {
+		t.Fatalf("Test failed. Expected exchange %s to have updated WebsocketResponseCheckTimeout value", checkExchangeConfigValues.Exchanges[0].Name)
+	}
+
 	if checkExchangeConfigValues.Exchanges[0].HTTPTimeout == 0 {
 		t.Fatalf("Test failed. Expected exchange %s to have updated HTTPTimeout value", checkExchangeConfigValues.Exchanges[0].Name)
 	}
--- a/config/config_types.go
+++ b/config/config_types.go
@@ -3,10 +3,10 @@ package config
 import (
 	"time"

-	"github.com/thrasher-/gocryptotrader/currency"
-	"github.com/thrasher-/gocryptotrader/currency/forexprovider/base"
-	log "github.com/thrasher-/gocryptotrader/logger"
-	"github.com/thrasher-/gocryptotrader/portfolio"
+	"github.com/thrasher-corp/gocryptotrader/currency"
+	"github.com/thrasher-corp/gocryptotrader/currency/forexprovider/base"
+	log "github.com/thrasher-corp/gocryptotrader/logger"
+	"github.com/thrasher-corp/gocryptotrader/portfolio"
 )

 // Config is the overarching object that holds all the information for
@@ -45,20 +45,22 @@ type ConnectionMonitorConfig struct {

 // ExchangeConfig holds all the information needed for each enabled Exchange.
 type ExchangeConfig struct {
-	Name            string                 `json:"name"`
-	Enabled         bool                   `json:"enabled"`
-	Verbose         bool                   `json:"verbose"`
-	UseSandbox      bool                   `json:"useSandbox,omitempty"`
-	HTTPTimeout     time.Duration          `json:"httpTimeout"`
-	HTTPUserAgent   string                 `json:"httpUserAgent,omitempty"`
-	HTTPDebugging   bool                   `json:"httpDebugging,omitempty"`
-	HTTPRateLimiter *HTTPRateLimitConfig   `json:"httpRateLimiter,omitempty"`
-	ProxyAddress    string                 `json:"proxyAddress,omitempty"`
-	BaseCurrencies  currency.Currencies    `json:"baseCurrencies"`
-	CurrencyPairs   *currency.PairsManager `json:"currencyPairs"`
-	API             APIConfig              `json:"api"`
-	Features        *FeaturesConfig        `json:"features"`
-	BankAccounts    []BankAccount          `json:"bankAccounts,omitempty"`
+	Name                          string                 `json:"name"`
+	Enabled                       bool                   `json:"enabled"`
+	Verbose                       bool                   `json:"verbose"`
+	UseSandbox                    bool                   `json:"useSandbox,omitempty"`
+	HTTPTimeout                   time.Duration          `json:"httpTimeout"`
+	HTTPUserAgent                 string                 `json:"httpUserAgent,omitempty"`
+	HTTPDebugging                 bool                   `json:"httpDebugging,omitempty"`
+	HTTPRateLimiter               *HTTPRateLimitConfig   `json:"httpRateLimiter,omitempty"`
+	WebsocketResponseCheckTimeout time.Duration          `json:"websocketResponseCheckTimeout"`
+	WebsocketResponseMaxLimit     time.Duration          `json:"websocketResponseMaxLimit"`
+	ProxyAddress                  string                 `json:"proxyAddress,omitempty"`
+	BaseCurrencies                currency.Currencies    `json:"baseCurrencies"`
+	CurrencyPairs                 *currency.PairsManager `json:"currencyPairs"`
+	API                           APIConfig              `json:"api"`
+	Features                      *FeaturesConfig        `json:"features"`
+	BankAccounts                  []BankAccount          `json:"bankAccounts,omitempty"`

 	// Deprecated settings which will be removed in a future update
 	AvailablePairs                   *currency.Pairs      `json:"availablePairs,omitempty"`