exchanges: Okx Update

common/common.go

@@ -68,6 +68,7 @@ var (
 	ErrCannotCalculateOffline = errors.New("cannot calculate offline, unsupported")
 	ErrNoResponse             = errors.New("no response")
 	ErrTypeAssertFailure      = errors.New("type assert failure")
+	ErrNoResults              = errors.New("no results found")
 	ErrUnknownError           = errors.New("unknown error")
 )
 

database/repository/withdraw/withdraw.go

@@ -3,10 +3,10 @@ package withdraw
 import (
 	"context"
 	"database/sql"
-	"errors"
 	"time"
 
 	"github.com/gofrs/uuid"
+	"github.com/thrasher-corp/gocryptotrader/common"
 	"github.com/thrasher-corp/gocryptotrader/currency"
 	"github.com/thrasher-corp/gocryptotrader/database"
 	modelPSQL "github.com/thrasher-corp/gocryptotrader/database/models/postgres"
@@ -19,11 +19,6 @@ import (
 	"github.com/thrasher-corp/sqlboiler/queries/qm"
 )
 
-var (
-	// ErrNoResults is the error returned if no results are found
-	ErrNoResults = errors.New("no results found")
-)
-
 // Event stores Withdrawal Response details in database
 func Event(res *withdraw.Response) {
 	if database.DB.SQL == nil {
@@ -424,7 +419,7 @@ func getByColumns(q []qm.QueryMod) ([]*withdraw.Response, error) {
 		}
 	}
 	if len(resp) == 0 {
-		return nil, ErrNoResults
+		return nil, common.ErrNoResults
 	}
 	return resp, nil
 }

database/repository/withdraw/withdraw_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/thrasher-corp/gocryptotrader/common"
 	"github.com/thrasher-corp/gocryptotrader/currency"
 	"github.com/thrasher-corp/gocryptotrader/database"
 	"github.com/thrasher-corp/gocryptotrader/database/drivers"
@@ -159,7 +160,7 @@ func withdrawHelper(t *testing.T) {
 
 	_, err := GetEventByUUID(withdraw.DryRunID.String())
 	if err != nil {
-		if !errors.Is(err, ErrNoResults) {
+		if !errors.Is(err, common.ErrNoResults) {
 			t.Fatal(err)
 		}
 	}
@@ -181,7 +182,7 @@ func withdrawHelper(t *testing.T) {
 	if len(v) > 0 {
 		_, err = GetEventByUUID(v[0].ID.String())
 		if err != nil {
-			if !errors.Is(err, ErrNoResults) {
+			if !errors.Is(err, common.ErrNoResults) {
 				t.Error(err)
 			}
 		}

exchanges/asset/asset.go

@@ -29,6 +29,7 @@ const (
 	MarginFunding
 	Index
 	Binary
+	Spread
 	// Futures asset consts must come below this comment for method `IsFutures`
 	Futures
 	PerpetualContract
@@ -68,12 +69,13 @@ const (
 	options                = "options"
 	optionCombo            = "option_combo"
 	futureCombo            = "future_combo"
+	spread                 = "spread"
 	linearContract         = "linearcontract"
 	all                    = "all"
 )
 
 var (
-	supportedList = Items{Spot, Margin, CrossMargin, MarginFunding, Index, Binary, PerpetualContract, PerpetualSwap, Futures, DeliveryFutures, UpsideProfitContract, DownsideProfitContract, CoinMarginedFutures, USDTMarginedFutures, USDCMarginedFutures, Options, LinearContract, OptionCombo, FutureCombo}
+	supportedList = Items{Spot, Margin, CrossMargin, MarginFunding, Index, Binary, PerpetualContract, PerpetualSwap, Futures, DeliveryFutures, UpsideProfitContract, DownsideProfitContract, CoinMarginedFutures, USDTMarginedFutures, USDCMarginedFutures, Options, LinearContract, OptionCombo, FutureCombo, Spread}
 )
 
 // Supported returns a list of supported asset types
@@ -116,6 +118,8 @@ func (a Item) String() string {
 		return usdcMarginedFutures
 	case Options:
 		return options
+	case Spread:
+		return spread
 	case OptionCombo:
 		return optionCombo
 	case FutureCombo:
@@ -234,6 +238,8 @@ func New(input string) (Item, error) {
 		return USDCMarginedFutures, nil
 	case options, "option":
 		return Options, nil
+	case spread:
+		return Spread, nil
 	case optionCombo:
 		return OptionCombo, nil
 	case futureCombo:

exchanges/asset/asset_test.go

@@ -117,6 +117,7 @@ func TestNew(t *testing.T) {
 		{Input: "Future", Error: ErrNotSupported},
 		{Input: "option_combo", Expected: OptionCombo},
 		{Input: "future_combo", Expected: FutureCombo},
+		{Input: "spread", Expected: Spread},
 		{Input: "linearContract", Expected: LinearContract},
 	}
 

exchanges/collateral/collateral.go

@@ -34,6 +34,8 @@ func (t Mode) String() string {
 		return multiCollateralStr
 	case PortfolioMode:
 		return portfolioCollateralStr
+	case SpotFuturesMode:
+		return spotFuturesCollateralStr
 	case UnknownMode:
 		return unknownCollateralStr
 	}

exchanges/collateral/collateral_test.go

@@ -18,6 +18,9 @@ func TestValidCollateralType(t *testing.T) {
 	if !PortfolioMode.Valid() {
 		t.Fatal("expected 'true', received 'false'")
 	}
+	if !SpotFuturesMode.Valid() {
+		t.Fatal("expected 'true', received 'false'")
+	}
 	if UnsetMode.Valid() {
 		t.Fatal("expected 'false', received 'true'")
 	}

exchanges/collateral/collateral_types.go

@@ -24,20 +24,23 @@ const (
 	PortfolioMode
 	// UnknownMode has collateral allocated in an unknown manner at present, but is not unset
 	UnknownMode
+	// SpotFuturesMode has collateral allocated across spot and futures accounts
+	SpotFuturesMode
 )
 
 const (
-	unsetCollateralStr     = "unset"
-	singleCollateralStr    = "single"
-	multiCollateralStr     = "multi"
-	portfolioCollateralStr = "portfolio"
-	unknownCollateralStr   = "unknown"
+	unsetCollateralStr       = "unset"
+	singleCollateralStr      = "single"
+	multiCollateralStr       = "multi"
+	portfolioCollateralStr   = "portfolio"
+	spotFuturesCollateralStr = "spot_futures"
+	unknownCollateralStr     = "unknown"
 )
 
 // ErrInvalidCollateralMode is returned when converting invalid string to collateral mode
 var ErrInvalidCollateralMode = errors.New("invalid collateral mode")
 
-var supportedCollateralModes = SingleMode | MultiMode | PortfolioMode
+var supportedCollateralModes = SingleMode | MultiMode | PortfolioMode | SpotFuturesMode
 
 // ByPosition shows how much collateral is used
 // from positions