exchanges: Okx Update (#1420)

* update acccount ratelimits and added missing endpoints

* completed mapping missing trade accoung REST endpoints and Rate Limit

* added orderbook trading missing REST endpoints

* Added few missing endpoints and unit tests

* Completed grid trading and signal bot trading with unit tests

* Added Recurring Buy endpoints and corresponding unit tests

* Added copy trading endpoints and unit tests

* added newly added block trading and spread endpoints

* completed mapping spread endpoints

* Added new endpoints and unit tests

* Added round 1: Okx types and converts update.

* Update endpoints handling and types update

* Removed constants, updated unit tests, and updated endpoint methods

* Slight endpoint and unit test update

* Added spread and other websocket endpoints and update

* completed Spread WS Orderbook handler

* Added missing spread channels and handlers

* Adding Bussinss websocket and missing subscriptions, update unit tests, and endpoints

* Added spread endpoints to wrapper and unit tests update

* Added missing websocket subscriptions and copy trading endpoints

* Added missing endpoints and re-organize business websocket handlers

* Docs update

* Endpoints code updates

* types, unit test and endpoints update

* Minor unit tests update

* spelling fix

* fix unit test issues

* Updating unit tests error handling

* Updating unit tests error handling

* Unit tests assertion handling update

* Unit tests update

* Resolve linter issues

* linter issues fix

* Orderbook unit test error fix

* Minor fixes

* Change on test handling and types

* Updating unit tests and cleanups

* Fix unit test issues

* Add ratelimit test and update unit tests and methods

* Update method parameters and error declarations

* Added lending endpoints, unit tests, and update endpoint methods and error declarations

* Update ratelimiters, add missing lending and trading endpoints and unit tests

* Update websocket authentication and subscription handling

* Minor update to unit test and types

* Types, error handling, and other minor updates

* Update unit tests and endpoint functions

* error declarations update and unit tests

* Overall update on unit endpoint, unit tests, and types

* Adding review fixes

* Update on endpoints, order types, and unit tests

* Update unit tests and endpoint functions

* Update on endpoint and update missing parameters

* Implemented and tested newly added trading endpoints

* endpoints update and unit tests

* Update missing endpoints and update overall code

* added and testing funding and fiat related endpoints

* Update on convert and fiat related endpoints

* linter fix, types, endpoints, and unit tests update

* linter issues fix

* revert changes on tempos

* Fix Panic and update websocket auth calls handling

* config linter issue fix

* Fix panic issues and update unit tests

* Fix race condition, TestAllExchangeWrappers unit test issues

* Fix withdrawal manager test issue

* Rename ClosePositionForContractrID --> ClosePositionForContractID

* Rename ClosePositionForContractrID --> ClosePositionForContractID

* Fix error

* endpoints update and fix unit test issues

* added unit tests, updated comments, and code sections

* revert change in defaultSubscriptions

* few types comments update

* Minor changes

* remove lending endpoints

* rm mistakenly added code

* fix unit test

* minor unit test fix

* Adding offline error tests, update endpoints function, config update

* Update unit test coverage for offline error handliing

* Updating wrapper algo order coverage, endpoint calls, and unit tests

* Updating wrapper trade functions to accomodate algo orders

* update wrapper unit tests

* Fix wrapper order functions offline errors handling

* Tested and updated wrapper order functions

* Address review comments

* update order unit tests, and okx endpoint functions

* finalize affected order, endpoint, and margin endpoints

* Slight change on margin unit test

* fix margin unit test issues

* Minor change on unit test

* updates on contract settlement and future contract wrapper function

* add test coverage for contract functions and minor fix on wrapper

* Overall update and unit testing

* codespell, unit tests, type declaration and naming, and code-structure updates

* margin types value and validation function fix

* Update tests and helper funcs

* Improve test coverage

* helper functions and unit tests update

* Fix margin unit test

* Minor review updates

* minor fix on if statement

* Update helper functions

* error handling and functions naming update

* update comment

* minor error return fixes

* minor unit test fix

* Minor fix on spread websocket orders handling

* codespell fix

* skip orderbook depth with incomplete price

* skip orderbook depth with incomplete price

Author: samuael

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")
 	ErrGettingField           = errors.New("error getting field")
 	ErrSettingField           = errors.New("error setting field")

config_example.json

@@ -2135,7 +2135,8 @@
      "margin",
      "option",
      "perpetualswap",
-     "spot"
+     "spot",
+     "spread"
     ],
     "pairs": {
      "futures": {
@@ -2162,6 +2163,11 @@
       "assetEnabled": true,
       "enabled": "BTC-USDT,ETH-USDT,OKB-USDT",
       "available": "OKT-USDT,LTC-USDT,DOT-USDT,DOGE-USDT,LUNC-USDT,ETHW-USDT,LUNA-USDT,FIL-USDT,XRP-USDT,CITY-USDT,MENGO-USDT,ARG-USDT,POR-USDT,1INCH-USDT,AAVE-USDT,ABT-USDT,ACA-USDT,ADA-USDT,AERGO-USDT,AGLD-USDT,XMR-ETH,YFI-ETH,ZEC-ETH,LTC-OKB,XRP-OKB,ETC-OKB,BTC-USDT,ETH-USDT,OKB-USDT,OKT-USDT,LTC-USDT,DOT-USDT,DOGE-USDT,LUNC-USDT,ETHW-USDT,LUNA-USDT,FIL-USDT,XRP-USDT,CITY-USDT,MENGO-USDT,ARG-USDT,POR-USDT,1INCH-USDT,AAVE-USDT,ABT-USDT,ACA-USDT,ADA-USDT,AERGO-USDT,AGLD-USDT,AKITA-USDT,ALCX-USDT,ALGO-USDT,ALPHA-USDT,ANC-USDT,ANT-USDT,ANW-USDT,APE-USDT,APIX-USDT,API3-USDT,APM-USDT,AR-USDT,ARK-USDT,AST-USDT,ASTR-USDT,ATOM-USDT,AUCTION-USDT,AVAX-USDT,AXS-USDT,AZY-USDT,BABYDOGE-USDT,BADGER-USDT,BAL-USDT,BAND-USDT,BAT-USDT,BCD-USDT,BCH-USDT,BETH-USDT,BHP-USDT,BICO-USDT,BLOK-USDT,BNT-USDT,BORING-USDT,BORA-USDT,BRWL-USDT,BSV-USDT,BTG-USDT,BTM-USDT,BTT-USDT,BZZ-USDT,CELO-USDT,CEL-USDT,CELR-USDT,CELT-USDT,CFG-USDT,CFX-USDT,CGS-USDT,CHAT-USDT,CHE-USDT,CHZ-USDT,CLV-USDT,CMT-USDT,CNTM-USDT,COMP-USDT,CONV-USDT,COVER-USDT,CQT-USDT,CRO-USDT,CRV-USDT,CSPR-USDT,CTC-USDT,CTXC-USDT,CVC-USDT,CVP-USDT,CVT-USDT,CVX-USDT,DAI-USDT,DAO-USDT,DASH-USDT,DCR-USDT,DEP-USDT,DEVT-USDT,DGB-USDT,DHT-USDT,DIA-USDT,DMD-USDT,DNA-USDT,DOME-USDT,DORA-USDT,DOSE-USDT,DYDX-USDT,EC-USDT,EDEN-USDT,EFI-USDT,EGLD-USDT,EGT-USDT,ELF-USDT,ELON-USDT,ELT-USDT,EM-USDT,ENJ-USDT,ENS-USDT,EOS-USDT,ERN-USDT,ETC-USDT,EURT-USDT,FAIR-USDT,FAME-USDT,FITFI-USDT,FLM-USDT,FLOW-USDT,FODL-USDT,FORTH-USDT,FRONT-USDT,FSN-USDT,FTM-USDT,GALA-USDT,GALFT-USDT,GARI-USDT,GAS-USDT,GF-USDT,GHST-USDT,GLM-USDT,GLMR-USDT,GM-USDT,GMT-USDT,GODS-USDT,GOG-USDT,GRT-USDT,GTO-USDT,GUSD-USDT,HBAR-USDT,HC-USDT,HDAO-USDT,HEGIC-USDT,HYC-USDT,ICP-USDT,ICX-USDT,ILV-USDT,IMX-USDT,INT-USDT,INX-USDT,IOST-USDT,IOTA-USDT,IQ-USDT,JFI-USDT,JOE-USDT,JST-USDT,KAN-USDT,KAR-USDT,KCASH-USDT,KDA-USDT,KINE-USDT,KISHU-USDT,KLAY-USDT,KNC-USDT,KOL-USDT,KONO-USDT,KP3R-USDT,KSM-USDT,LAMB-USDT,LAT-USDT,LBA-USDT,LDN-USDT,LDO-USDT,LEASH-USDT,LEO-USDT,LET-USDT,LINK-USDT,LING-USDT,LITH-USDT,LON-USDT,LOON-USDT,LOOKS-USDT,LPT-USDT,LRC-USDT,LSK-USDT,MAGIC-USDT,MANA-USDT,MASK-USDT,MATIC-USDT,MCO-USDT,MDA-USDT,MDT-USDT,MEME-USDT,METIS-USDT,MILO-USDT,MINA-USDT,MIR-USDT,MITH-USDT,MKR-USDT,MLN-USDT,MOF-USDT,MON-USDT,MOVR-USDT,MOVEZ-USDT,MXC-USDT,MXT-USDT,NAS-USDT,NEAR-USDT,NEO-USDT,NFT-USDT,NMR-USDT,NULS-USDT,NYM-USDT,OM-USDT,OMG-USDT,OMI-USDT,ONE-USDT,ONT-USDT,OP-USDT,ORBS-USDT,ORB-USDT,ORS-USDT,OXT-USDT,PAY-USDT,PCI-USDT,PEOPLE-USDT,PERP-USDT,PHA-USDT,PICKLE-USDT,PIT-USDT,PLG-USDT,PNK-USDT,POLS-USDT,POLYDOGE-USDT,PPT-USDT,PRQ-USDT,PST-USDT,PSTAKE-USDT,QOM-USDT,QTUM-USDT,RACA-USDT,RAY-USDT,REN-USDT,REP-USDT,REVV-USDT,RFUEL-USDT,RIO-USDT,RNT-USDT,ROAD-USDT,RON-USDT,RSR-USDT,RSS3-USDT,RVN-USDT,SAITAMA-USDT,SAMO-USDT,SAND-USDT,SC-USDT,SD-USDT,SFG-USDT,SHIB-USDT,SIS-USDT,SKEB-USDT,SKL-USDT,SLP-USDT,SNT-USDT,SNX-USDT,SOC-USDT,SOL-USDT,SOS-USDT,SPELL-USDT,SRM-USDT,STARL-USDT,STC-USDT,STORJ-USDT,STRK-USDT,STX-USDT,SUN-USDT,SUSHI-USDT,SWEAT-USDT,SWFTC-USDT,SWRV-USDT,T-USDT,TAI-USDT,TAKI-USDT,TCT-USDT,THETA-USDT,THG-USDT,TON-USDT,TOPC-USDT,TORN-USDT,TOWN-USDT,TRADE-USDT,TRA-USDT,TRB-USDT,TRUE-USDT,TRX-USDT,TUP-USDT,TUSD-USDT,UMA-USDT,UMEE-USDT,UNI-USDT,USDC-USDT,USDP-USDT,USTC-USDT,UTK-USDT,VALUE-USDT,VELO-USDT,VRA-USDT,VSYS-USDT,WAVES-USDT,WAXP-USDT,WBTC-USDT,WEMIX-USDT,WGRT-USDT,WING-USDT,WIN-USDT,WNCG-USDT,WNXM-USDT,WOO-USDT,WSB-USDT,WXT-USDT,XAUT-USDT,XCH-USDT,XEC-USDT,XEM-USDT,XETA-USDT,XLM-USDT,XMR-USDT,XNO-USDT,XPR-USDT,XTZ-USDT,YEE-USDT,YFI-USDT,YFII-USDT,YGG-USDT,YOU-USDT,YOYO-USDT,ZBC-USDT,ZEC-USDT,ZEN-USDT,ZIL-USDT,ZKS-USDT,ZRX-USDT,ZYRO-USDT,BTC-USDC,ETH-USDC,ETH-BTC,OKB-USDC,OKT-USDC,LTC-USDC,DOT-USDC,DOGE-USDC,LUNC-USDC,ETHW-USDC,LUNA-USDC,FIL-USDC,XRP-USDC,1INCH-USDC,AAVE-USDC,ADA-USDC,AGLD-USDC,ALGO-USDC,ANC-USDC,ANT-USDC,APE-USDC,API3-USDC,AR-USDC,ASTR-USDC,ATOM-USDC,AVAX-USDC,AXS-USDC,AZY-USDC,BABYDOGE-USDC,BAT-USDC,BCH-USDC,BICO-USDC,BSV-USDC,CEL-USDC,CELO-USDC,CELT-USDC,CHZ-USDC,COMP-USDC,CRO-USDC,CRV-USDC,CSPR-USDC,DASH-USDC,DEP-USDC,DOME-USDC,DYDX-USDC,EGLD-USDC,ELT-USDC,ENS-USDC,EOS-USDC,ETC-USDC,FITFI-USDC,FLM-USDC,FLOW-USDC,FTM-USDC,GALA-USDC,GALFT-USDC,GARI-USDC,GLMR-USDC,GMT-USDC,GODS-USDC,GRT-USDC,HBAR-USDC,ICP-USDC,IMX-USDC,IOST-USDC,JST-USDC,KISHU-USDC,KLAY-USDC,KNC-USDC,KSM-USDC,LINK-USDC,LOOKS-USDC,LRC-USDC,MANA-USDC,MASK-USDC,MATIC-USDC,MINA-USDC,MKR-USDC,MOF-USDC,MOVEZ-USDC,MXC-USDC,NEAR-USDC,NFT-USDC,NMR-USDC,NYM-USDC,OMG-USDC,OP-USDC,PEOPLE-USDC,PERP-USDC,RACA-USDC,RSR-USDC,SAITAMA-USDC,SAND-USDC,SHIB-USDC,SLP-USDC,SNX-USDC,SOC-USDC,SOL-USDC,SOS-USDC,SRM-USDC,STARL-USDC,STC-USDC,STORJ-USDC,STX-USDC,SUSHI-USDC,SWFTC-USDC,THETA-USDC,TON-USDC,TORN-USDC,TRB-USDC,TRX-USDC,UNI-USDC,USDP-USDC,USTC-USDC,VRA-USDC,WAVES-USDC,XCH-USDC,XEM-USDC,XLM-USDC,XMR-USDC,XNO-USDC,XTZ-USDC,YFI-USDC,YFII-USDC,YGG-USDC,ZEC-USDC,ZIL-USDC,BTC-DAI,ETH-DAI,BTC-USDK,ETH-USDK,USDT-USDK,OKB-BTC,OKT-BTC,LTC-BTC,DOT-BTC,DOGE-BTC,FIL-BTC,XRP-BTC,AAVE-BTC,ADA-BTC,ALGO-BTC,ALPHA-BTC,ANT-BTC,ATOM-BTC,AVAX-BTC,BADGER-BTC,BAT-BTC,BCD-BTC,BCH-BTC,BNT-BTC,BSV-BTC,BTG-BTC,BTM-BTC,CELO-BTC,CELT-BTC,CHZ-BTC,COMP-BTC,CQT-BTC,CRO-BTC,CRV-BTC,CTC-BTC,CVC-BTC,DASH-BTC,DCR-BTC,DGB-BTC,EGLD-BTC,ELF-BTC,ENJ-BTC,EOS-BTC,ETC-BTC,FLOW-BTC,GAS-BTC,GRT-BTC,GTO-BTC,HBAR-BTC,HC-BTC,ICP-BTC,ICX-BTC,INT-BTC,IOST-BTC,IOTA-BTC,KLAY-BTC,KNC-BTC,KSM-BTC,LINK-BTC,LRC-BTC,LSK-BTC,MANA-BTC,MITH-BTC,MKR-BTC,NAS-BTC,NEAR-BTC,NEO-BTC,NULS-BTC,OMG-BTC,ONT-BTC,PST-BTC,QTUM-BTC,REN-BTC,RSR-BTC,RVN-BTC,SC-BTC,SNT-BTC,SOL-BTC,SRM-BTC,STX-BTC,SWFTC-BTC,THETA-BTC,TRUE-BTC,TRX-BTC,UNI-BTC,VSYS-BTC,WAVES-BTC,WBTC-BTC,WXT-BTC,XCH-BTC,XEM-BTC,XLM-BTC,XMR-BTC,XTZ-BTC,YFI-BTC,YOU-BTC,ZEC-BTC,ZEN-BTC,ZIL-BTC,ZRX-BTC,OKB-ETH,OKT-ETH,LTC-ETH,DOT-ETH,DOGE-ETH,FIL-ETH,XRP-ETH,AAVE-ETH,ADA-ETH,API3-ETH,ATOM-ETH,AVAX-ETH,BETH-ETH,CRV-ETH,DASH-ETH,EOS-ETH,ETC-ETH,FLOW-ETH,GAS-ETH,GHST-ETH,HEGIC-ETH,INT-ETH,IOST-ETH,KSM-ETH,LINK-ETH,MANA-ETH,MKR-ETH,NEAR-ETH,NEO-ETH,NULS-ETH,OM-ETH,QTUM-ETH,SNX-ETH,SOL-ETH,SUSHI-ETH,SWFTC-ETH,TRX-ETH,UNI-ETH,WBTC-ETH,XLM-ETH,XMR-ETH,YFI-ETH,ZEC-ETH,LTC-OKB,XRP-OKB,ETC-OKB,OKDOT1-DOT,OKDOT2-DOT,BTC-EURT,ETH-EURT"
+     },
+     "spread": {
+      "assetEnabled": true,
+      "enabled": "BTC-USDT-SWAP_BTC-USDT-250328,ETH-USDT-SWAP_ETH-USD-SWAP,ETH-USDT_ETH-USD-250627",
+      "available": "BTC-USDT-SWAP_BTC-USDT-250328,ETH-USDT-SWAP_ETH-USD-SWAP,ETH-USDT_ETH-USD-250627,BTC-USD-241220_BTC-USD-250328,BTC-USDT-SWAP_BTC-USDT-250228,BTC-USDT_BTC-USDT-250131,BTC-USD-SWAP_BTC-USD-250328,BTC-USDT-241220_BTC-USDT-250627,ETH-USDT-241220_ETH-USDT-250328,BTC-USD-250228_BTC-USD-250627,ETH-USDT-SWAP_ETH-USDT-250328,BTC-USD-241220_BTC-USD-250228,ETH-USDT-250328_ETH-USDT-250627,DOGE-USDT_DOGE-USDT-SWAP,ETH-USD-SWAP_ETH-USD-241227,BTC-USDT_BTC-USD-241227,BTC-USDT-SWAP_BTC-USDT-250131,ETH-USDT-241220_ETH-USDT-250627,ETH-USD-SWAP_ETH-USD-241220,BTC-USD-SWAP_BTC-USD-250228,ETH-USD-241227_ETH-USD-250228,BTC-USDT_BTC-USDT-250328,LTC-USDT_LTC-USDT-SWAP,ETH-USDT_ETH-USD-250328,ETH-USD-250328_ETH-USD-250627,ETH-USD-241227_ETH-USD-250328,BTC-USD-SWAP_BTC-USD-250131,BTC-USDT_BTC-USDT-250228,ETH-USD-250228_ETH-USD-250328,SOL-USDT_SOL-USDT-SWAP,ETH-USDT_ETH-USD-SWAP,BTC-USD-241220_BTC-USD-241227,ETH-USD-250131_ETH-USD-250328,ETH-USD-SWAP_ETH-USD-250131,BTC-USDT-241227_BTC-USDT-250131,ETH-USDT_ETH-USDT-250627,ETH-USDT-SWAP_ETH-USDT-250627,BTC-USDT_BTC-USDT-SWAP,BTC-USDT-SWAP_BTC-USDT-250627,BTC-USDT_BTC-USD-SWAP,BTC-USDT-SWAP_BTC-USD-SWAP,ETH-USDT-241220_ETH-USDT-241227,ETH-USD-241220_ETH-USD-250131,ETH-USD-SWAP_ETH-USD-250228,ETH-USD-241227_ETH-USD-250131,BTC-USDT_BTC-USD-250627,BTC-USD-241220_BTC-USD-250131,ETH-USD-241220_ETH-USD-241227,BTC-USD-SWAP_BTC-USD-250627,BTC-USD-241227_BTC-USD-250131,ETH-USD-SWAP_ETH-USD-250328,ETH-USD-250228_ETH-USD-250627,BTC-USDT-241227_BTC-USDT-250228,BTC-USDT_BTC-USD-250328,ETH-USD-250131_ETH-USD-250627,BTC-USDT_BTC-USDT-250627,BTC-USDT-241227_BTC-USDT-250328,BTC-USD-241227_BTC-USD-250328,BTC-USDT-250131_BTC-USDT-250328,BCH-USDT_BCH-USDT-SWAP,BTC-USDT-250228_BTC-USDT-250328,BTC-USD-250328_BTC-USD-250627,BTC-USDT-241220_BTC-USDT-241227,BTC-USD-241227_BTC-USD-250228,ETH-USDT_ETH-USDT-250328,BTC-USDT-250131_BTC-USDT-250228,BTC-USD-250131_BTC-USD-250627,ETH-USD-SWAP_ETH-USD-250627,ETH-USD-241220_ETH-USD-250228,BTC-USD-SWAP_BTC-USD-241227,BTC-USD-SWAP_BTC-USD-241220,BTC-USD-250131_BTC-USD-250328,BTC-USDT-241227_BTC-USDT-250627,ETH-USD-250131_ETH-USD-250228,ETH-USD-241220_ETH-USD-250328,ETH-USDT_ETH-USDT-241227,ETH-USDT-SWAP_ETH-USDT-241220,BTC-USDT-241220_BTC-USDT-250328,BTC-USD-250228_BTC-USD-250328,ETH-USDT-SWAP_ETH-USDT-241227,BTC-USDT-SWAP_BTC-USDT-241220,ETH-USDT_ETH-USDT-241220,ETH-USDT-241227_ETH-USDT-250627,BTC-USD-241227_BTC-USD-250627,BTC-USDT-241220_BTC-USDT-250228,BTC-USDT-250131_BTC-USDT-250627,BTC-USD-241220_BTC-USD-250627,BTC-USDT-SWAP_BTC-USDT-241227,BTC-USD-250131_BTC-USD-250228,BTC-USDT-250328_BTC-USDT-250627,ETH-USD-241220_ETH-USD-250627,XRP-USDT_XRP-USDT-SWAP,ETH-USD-241227_ETH-USD-250627,BTC-USDT_BTC-USDT-241227,BTC-USDT-250228_BTC-USDT-250627,BTC-USDT_BTC-USDT-241220,ETH-USDT_ETH-USD-241227,BTC-USDT-241220_BTC-USDT-250131,ETH-USDT_ETH-USDT-SWAP,ETH-USDT-241227_ETH-USDT-25032"
      }
     }
    },

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

@@ -41,6 +41,7 @@ const (
 	USDCMarginedFutures
 	FutureCombo
 	LinearContract
+	Spread
 	// Options asset consts must come below this comment for method `IsOptions`
 	Options
 	OptionCombo
@@ -58,6 +59,7 @@ const (
 	perpetualContract      = "perpetualcontract"
 	perpetualSwap          = "perpetualswap"
 	swap                   = "swap"
+	spread                 = "spread"
 	futures                = "futures"
 	deliveryFutures        = "delivery"
 	upsideProfitContract   = "upsideprofitcontract"
@@ -73,7 +75,7 @@ const (
 )
 
 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
@@ -100,6 +102,8 @@ func (a Item) String() string {
 		return perpetualContract
 	case PerpetualSwap:
 		return perpetualSwap
+	case Spread:
+		return spread
 	case Futures:
 		return futures
 	case DeliveryFutures:
@@ -220,6 +224,8 @@ func New(input string) (Item, error) {
 		return PerpetualContract, nil
 	case perpetualSwap, swap:
 		return PerpetualSwap, nil
+	case spread:
+		return Spread, nil
 	case futures:
 		return Futures, nil
 	case upsideProfitContract:

exchanges/asset/asset_test.go

@@ -70,7 +70,7 @@ func TestIsValid(t *testing.T) {
 
 func TestIsFutures(t *testing.T) {
 	t.Parallel()
-	valid := []Item{PerpetualContract, PerpetualSwap, Futures, DeliveryFutures, UpsideProfitContract, DownsideProfitContract, CoinMarginedFutures, USDTMarginedFutures, USDCMarginedFutures, FutureCombo, LinearContract}
+	valid := []Item{PerpetualContract, PerpetualSwap, Futures, DeliveryFutures, UpsideProfitContract, DownsideProfitContract, CoinMarginedFutures, USDTMarginedFutures, USDCMarginedFutures, FutureCombo, LinearContract, Spread}
 	for a := range All {
 		if slices.Contains(valid, a) {
 			require.Truef(t, a.IsFutures(), "IsFutures must return true for %s", a)
@@ -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

exchanges/futures/contract.go

@@ -1,6 +1,8 @@
 package futures
 
 import (
+	"errors"
+	"strings"
 	"time"
 
 	"github.com/shopspring/decimal"
@@ -9,6 +11,11 @@ import (
 	"github.com/thrasher-corp/gocryptotrader/exchanges/fundingrate"
 )
 
+// var error definitions
+var (
+	ErrInvalidContractSettlementType = errors.New("invalid contract settlement type")
+)
+
 // Contract holds details on futures contracts
 type Contract struct {
 	Exchange       string
@@ -41,6 +48,7 @@ const (
 	Inverse
 	Quanto
 	LinearOrInverse
+	Hybrid
 )
 
 // String returns the string representation of a contract settlement type
@@ -56,11 +64,34 @@ func (d ContractSettlementType) String() string {
 		return "quanto"
 	case LinearOrInverse:
 		return "linearOrInverse"
+	case Hybrid:
+		return "hybrid"
 	default:
 		return "unknown"
 	}
 }
 
+// StringToContractSettlementType for converting case insensitive contract settlement type
+func StringToContractSettlementType(cstype string) (ContractSettlementType, error) {
+	cstype = strings.ToLower(cstype)
+	switch cstype {
+	case UnsetSettlementType.String(), "":
+		return UnsetSettlementType, nil
+	case Linear.String():
+		return Linear, nil
+	case Inverse.String():
+		return Inverse, nil
+	case Quanto.String():
+		return Quanto, nil
+	case "linearorinverse":
+		return LinearOrInverse, nil
+	case Hybrid.String():
+		return Hybrid, nil
+	default:
+		return UnsetSettlementType, ErrInvalidContractSettlementType
+	}
+}
+
 // ContractType holds the various style of contracts offered by futures exchanges
 type ContractType uint8