Feature: Implement funding rates, futures and coin margin (exchange API coverage) (#530)

* ALMOST THERE * more api wips * more api thingz * testing n more api wipz * more apiz * more wips * what is goin on * more wips * whip n testing * testing * testing no keys * remove log * kraken is broken ugh * still broken * fixing auth funcs + usdtm api docs * wip * api stuffs * whip * more wips * whip * more wip * api wip n testing * wip * wip * unsaved * wip n testing * wip * wip * wip * wip * wip * wip * wip * wip * wip * whip * wrapper authenticated functions * adding asset type and fixing dependencies * wip * binance auth wrapper start * wrapper functionality * wip * wip * wip * wrapper cancel functions * order submission for wrappers * wip * more error fixing and nits * websocket beginning n error fix * wip * WOW * glorious n shazzy nits * useless nits * wip * fixing things * merge stuffs * crapveyor * crapveyor rebuild * probably broke more things than he fixed * rm lns n other thangs * hope * please * stop it * done * ofcourse * rm vb * fix lbank * appveyor please * float lev * DONT ASK RYAN FOR HELP EVER * wip * wip * endpoint upgrades continued * path upgrade * NeeeNeeeNeeeNeeeNING * fix stuffs * fixing time issue * fixing broken funcs * glorious nits * shaz changes * fixing errors for fundmon * more error fixing for fundmon * test running past 30s * basic changes * THX AGAIN SHAZBERT * path system upgrade * config upgrade * unsaved stuffs * broken wip config upgrade * path system upgrade contd. * path system upgrade contd * path upgrade ready for review * testing verbose removed * linter stuffs * appveyor stuffs * appveyor stuff * fixed? * bugfix * wip * broken stuff * fix test * wierd hack fix * appveyor pls stop * error found * more useless nits * bitmex err * broken wip * broken wip path upgrade change to uint32 * changed url lookups to uint * WOW * ready4review * config fixed HOPEFULLY * config fix and glorious changes * efficient way of getting orders and open orders * binance wrapper logic fixing * testing, adding tests and fixing lot of errrrrs * merge master * appveyor stuffs * appveyor stuffs * fmt * test * octalLiteral issue fix? * octalLiteral fix? * rm vb * prnt ln to restart * adding testz * test fixzzz * READY FOR REVIEW * Actually ready now * FORMATTING * addressing shazzy n glorious nits * crapveyor * rm vb * small change * fixing err * shazbert nits * review changes * requested changes * more requested changes * noo * last nit fixes * restart appveyor * improving test cov * Update .golangci.yml * shazbert changes * moving pair formatting * format pair update wip * path upgrade complete * error fix * appveyor linters * more linters * remove testexch * more formatting changes * changes * shazbert changes * checking older requested changes to ensure completion * wip * fixing broken code * error fix * all fixed * additional changes * more changes * remove commented code * ftx margin api * appveyor fixes * more appveyor issues + test addition * more appveyor issues + test addition * remove unnecessary * testing * testing, fixing okex api, error fix * git merge fix * go sum * glorious changes and error fix * rm vb * more glorious changes and go mod tidy * fixed now * okex testing upgrade * old config migration and batch fetching fix * added test * glorious requested changes WIP * tested and fixed * go fmted * go fmt and test fix * additional funcs and tests for fundingRates * OKEX tested and fixed * appveyor fixes * ineff assign * 1 glorious change * error fix * typo * shazbert changes * glorious code changes and path fixing huobi WIP * adding assetType to accountinfo functions * fixing panic * panic fix and updating account info wrappers WIP * updateaccountinfo updated * testing WIP binance USDT n Coin Margined and Kraken Futures * auth functions tested and fixed * added test * config reverted * shazbert and glorious changes * shazbert and glorious changes * latest changes and portfolio update * go fmt change: * remove commented codes * improved error checking * index out of range fix * rm ln * critical nit * glorious latest changes * appveyor changes * shazbert change * easier readability * latest glorious changes * shadow dec * assetstore updated * last change * another last change * merge changes * go mod tidy * thrasher requested changes wip * improving struct layouts * appveyor go fmt * remove unnecessary code * shazbert changes * small change * oopsie * tidy * configtest reverted * error fix * oopsie * for what * test patch fix * insecurities * fixing tests * fix config
2026-05-23 23:16:49 +00:00 · 2021-02-12 16:19:18 +11:00
parent e9bd2ad4d8
commit 504c2fad6d
169 changed files with 227754 additions and 31776 deletions
--- a/cmd/exchange_template/wrapper_file.tmpl
+++ b/cmd/exchange_template/wrapper_file.tmpl
@@ -113,8 +113,12 @@ func ({{.Variable}} *{{.CapitalName}}) SetDefaults() {
 	{{.Variable}}.Requester = request.New({{.Variable}}.Name,
 		common.NewHTTPClientWithTimeout(exchange.DefaultHTTPTimeout))

-	{{.Variable}}.API.Endpoints.URLDefault = {{.Name}}APIURL
-	{{.Variable}}.API.Endpoints.URL = {{.Variable}}.API.Endpoints.URLDefault
+	// NOTE: SET THE URLs HERE
+	{{.Variable}}.API.Endpoints = {{.Variable}}.NewEndpoints()
+	{{.Variable}}.API.Endpoints.SetDefaultEndpoints(map[exchange.URL]string{
+		exchange.RestSpot:  {{.Name}}APIURL,
+		// exchange.WebsocketSpot: {{.Name}}WSAPIURL,
+	})
 	{{.Variable}}.Websocket = stream.New()
 	{{.Variable}}.WebsocketResponseMaxLimit = exchange.DefaultWebsocketResponseMaxLimit
 	{{.Variable}}.WebsocketResponseCheckTimeout = exchange.DefaultWebsocketResponseCheckTimeout
@@ -130,17 +134,23 @@ func ({{.Variable}} *{{.CapitalName}}) Setup(exch *config.ExchangeConfig) error

 	{{.Variable}}.SetupDefaults(exch)

-	// If websocket is supported, please fill out the following
 	/*
+	wsRunningEndpoint, err := {{.Variable}}.API.Endpoints.GetURL(exchange.WebsocketSpot)
+	if err != nil {
+		return err
+	}
+
+	// If websocket is supported, please fill out the following
+
 	err = {{.Variable}}.Websocket.Setup(
 		&stream.WebsocketSetup{
 			Enabled:                          exch.Features.Enabled.Websocket,
 			Verbose:                          exch.Verbose,
 			AuthenticatedWebsocketAPISupport: exch.API.AuthenticatedWebsocketSupport,
 			WebsocketTimeout:                 exch.WebsocketTrafficTimeout,
-			DefaultURL:                       {{.Name}}WSURL,
+			DefaultURL:                       {{.Name}}WSAPIURL,
 			ExchangeName:                     exch.Name,
-			RunningURL:                       exch.API.Endpoints.WebsocketURL,
+			RunningURL:                       wsRunningEndpoint,
 			Connector:                        {{.Variable}}.WsConnect,
 			Subscriber:                       {{.Variable}}.Subscribe,
 			UnSubscriber:                     {{.Variable}}.Unsubscribe,
@@ -310,12 +320,12 @@ func ({{.Variable}} *{{.CapitalName}}) UpdateOrderbook(p currency.Pair, assetTyp
 }

 // UpdateAccountInfo retrieves balances for all enabled currencies
-func ({{.Variable}} *{{.CapitalName}}) UpdateAccountInfo() (account.Holdings, error) {
+func ({{.Variable}} *{{.CapitalName}}) UpdateAccountInfo(assetType asset.Item) (account.Holdings, error) {
 	return account.Holdings{}, common.ErrNotYetImplemented
 }

 // FetchAccountInfo retrieves balances for all enabled currencies
-func ({{.Variable}} *{{.CapitalName}}) FetchAccountInfo() (account.Holdings, error) {
+func ({{.Variable}} *{{.CapitalName}}) FetchAccountInfo(assetType asset.Item) (account.Holdings, error) {
 	return account.Holdings{}, common.ErrNotYetImplemented
 }

@@ -439,8 +449,8 @@ func ({{.Variable}} *{{.CapitalName}}) GetFeeByType(feeBuilder *exchange.FeeBuil
 }

 // ValidateCredentials validates current credentials used for wrapper
-func ({{.Variable}} *{{.CapitalName}}) ValidateCredentials() error {
-	_, err := {{.Variable}}.UpdateAccountInfo()
+func ({{.Variable}} *{{.CapitalName}}) ValidateCredentials(assetType asset.Item) error {
+	_, err := {{.Variable}}.UpdateAccountInfo(assetType)
 	return {{.Variable}}.CheckTransientError(err)
 }

--- a/cmd/exchange_wrapper_coverage/main.go
+++ b/cmd/exchange_wrapper_coverage/main.go
@@ -112,7 +112,7 @@ func testWrappers(e exchange.IBotExchange) []string {
 		funcs = append(funcs, "UpdateTradablePairs")
 	}

-	_, err = e.FetchAccountInfo()
+	_, err = e.FetchAccountInfo(assetType)
 	if err == common.ErrNotYetImplemented {
 		funcs = append(funcs, "GetAccountInfo")
 	}
@@ -201,7 +201,7 @@ func testWrappers(e exchange.IBotExchange) []string {
 		funcs = append(funcs, "GetHistoricCandlesExtended")
 	}

-	_, err = e.UpdateAccountInfo()
+	_, err = e.UpdateAccountInfo(assetType)
 	if err == common.ErrNotYetImplemented {
 		funcs = append(funcs, "UpdateAccountInfo")
 	}
--- a/cmd/exchange_wrapper_issues/main.go
+++ b/cmd/exchange_wrapper_issues/main.go
@@ -478,7 +478,7 @@ func testWrappers(e exchange.IBotExchange, base *exchange.Base, config *Config)
 		}

 		var fetchAccountInfoResponse account.Holdings
-		fetchAccountInfoResponse, err = e.FetchAccountInfo()
+		fetchAccountInfoResponse, err = e.FetchAccountInfo(assetTypes[i])
 		msg = ""
 		if err != nil {
 			msg = err.Error()
--- a/cmd/exchange_wrapper_issues/types.go
+++ b/cmd/exchange_wrapper_issues/types.go
@@ -99,9 +99,10 @@ type Bank struct {

 // OrderSubmission contains all data required for a wrapper order submission
 type OrderSubmission struct {
-	OrderSide string  `json:"orderSide"`
-	OrderType string  `json:"orderType"`
-	Amount    float64 `json:"amount"`
-	Price     float64 `json:"price"`
-	OrderID   string  `json:"orderID"`
+	OrderSide string     `json:"orderSide"`
+	OrderType string     `json:"orderType"`
+	Amount    float64    `json:"amount"`
+	Price     float64    `json:"price"`
+	OrderID   string     `json:"orderID"`
+	AssetType asset.Item `json:"assetType"`
 }
--- a/cmd/gctcli/commands.go
+++ b/cmd/gctcli/commands.go
@@ -725,13 +725,17 @@ func getOrderbooks(_ *cli.Context) error {
 var getAccountInfoCommand = cli.Command{
 	Name:      "getaccountinfo",
 	Usage:     "gets the exchange account balance info",
-	ArgsUsage: "<exchange>",
+	ArgsUsage: "<exchange> <asset>",
 	Action:    getAccountInfo,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the account info for",
 		},
+		cli.StringFlag{
+			Name:  "asset",
+			Usage: "the asset type to get the account info for",
+		},
 	},
 }

@@ -746,11 +750,21 @@ func getAccountInfo(c *cli.Context) error {
 	} else {
 		exchange = c.Args().First()
 	}
+	var assetType string
+	if c.IsSet("asset") {
+		assetType = c.String("asset")
+	} else {
+		assetType = c.Args().Get(1)
+	}

 	if !validExchange(exchange) {
 		return errInvalidExchange
 	}

+	if !validAsset(assetType) {
+		return errInvalidAsset
+	}
+
 	conn, err := setupClient()
 	if err != nil {
 		return err
@@ -760,7 +774,8 @@ func getAccountInfo(c *cli.Context) error {
 	client := gctrpc.NewGoCryptoTraderClient(conn)
 	result, err := client.GetAccountInfo(context.Background(),
 		&gctrpc.GetAccountInfoRequest{
-			Exchange: exchange,
+			Exchange:  exchange,
+			AssetType: assetType,
 		},
 	)
 	if err != nil {
@@ -774,13 +789,17 @@ func getAccountInfo(c *cli.Context) error {
 var getAccountInfoStreamCommand = cli.Command{
 	Name:      "getaccountinfostream",
 	Usage:     "gets the account info stream for a specific exchange",
-	ArgsUsage: "<exchange>",
+	ArgsUsage: "<exchange> <asset>",
 	Action:    getAccountInfoStream,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the account info stream from",
 		},
+		cli.StringFlag{
+			Name:  "asset",
+			Usage: "the asset type to get the account info stream for",
+		},
 	},
 }

@@ -797,10 +816,21 @@ func getAccountInfoStream(c *cli.Context) error {
 		exchangeName = c.Args().First()
 	}

+	var assetType string
+	if c.IsSet("asset") {
+		assetType = c.String("asset")
+	} else {
+		assetType = c.Args().Get(1)
+	}
+
 	if !validExchange(exchangeName) {
 		return errInvalidExchange
 	}

+	if !validAsset(assetType) {
+		return errInvalidAsset
+	}
+
 	conn, err := setupClient()
 	if err != nil {
 		return err
@@ -809,7 +839,7 @@ func getAccountInfoStream(c *cli.Context) error {

 	client := gctrpc.NewGoCryptoTraderClient(conn)
 	result, err := client.GetAccountInfoStream(context.Background(),
-		&gctrpc.GetAccountInfoRequest{Exchange: exchangeName})
+		&gctrpc.GetAccountInfoRequest{Exchange: exchangeName, AssetType: assetType})
 	if err != nil {
 		return err
 	}
@@ -834,13 +864,17 @@ func getAccountInfoStream(c *cli.Context) error {
 var updateAccountInfoCommand = cli.Command{
 	Name:      "updateaccountinfo",
 	Usage:     "updates the exchange account balance info",
-	ArgsUsage: "<exchange>",
+	ArgsUsage: "<exchange> <asset>",
 	Action:    updateAccountInfo,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the account info for",
 		},
+		cli.StringFlag{
+			Name:  "asset",
+			Usage: "the asset type to get the account info for",
+		},
 	},
 }

@@ -856,10 +890,21 @@ func updateAccountInfo(c *cli.Context) error {
 		exchange = c.Args().First()
 	}

+	var assetType string
+	if c.IsSet("asset") {
+		assetType = c.String("asset")
+	} else {
+		assetType = c.Args().Get(1)
+	}
+
 	if !validExchange(exchange) {
 		return errInvalidExchange
 	}

+	if !validAsset(assetType) {
+		return errInvalidAsset
+	}
+
 	conn, err := setupClient()
 	if err != nil {
 		return err
@@ -869,7 +914,8 @@ func updateAccountInfo(c *cli.Context) error {
 	client := gctrpc.NewGoCryptoTraderClient(conn)
 	result, err := client.UpdateAccountInfo(context.Background(),
 		&gctrpc.GetAccountInfoRequest{
-			Exchange: exchange,
+			Exchange:  exchange,
+			AssetType: assetType,
 		},
 	)
 	if err != nil {