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
This commit is contained in:
Adam
2021-02-12 16:19:18 +11:00
committed by GitHub
parent e9bd2ad4d8
commit 504c2fad6d
169 changed files with 227754 additions and 31776 deletions

View File

@@ -5,7 +5,7 @@ exch := import("exchange")
load := func() {
// retrieve account information from exchange and store in info variable
info := exch.accountinfo("BTC Markets")
info := exch.accountinfo("BTC Markets", "spot")
// print out info
fmt.println(info)
}

View File

@@ -213,7 +213,7 @@ func ExchangePairs(args ...objects.Object) (objects.Object, error) {
// ExchangeAccountInfo returns account information for requested exchange
func ExchangeAccountInfo(args ...objects.Object) (objects.Object, error) {
if len(args) != 1 {
if len(args) != 2 {
return nil, objects.ErrWrongNumArguments
}
@@ -221,7 +221,15 @@ func ExchangeAccountInfo(args ...objects.Object) (objects.Object, error) {
if !ok {
return nil, fmt.Errorf(ErrParameterConvertFailed, exchangeName)
}
rtnValue, err := wrappers.GetWrapper().AccountInformation(exchangeName)
assetString, ok := objects.ToString(args[1])
if !ok {
return nil, fmt.Errorf(ErrParameterConvertFailed, assetString)
}
assetType, err := asset.New(assetString)
if err != nil {
return nil, err
}
rtnValue, err := wrappers.GetWrapper().AccountInformation(exchangeName, assetType)
if err != nil {
return nil, err
}

View File

@@ -133,12 +133,12 @@ func TestAccountInfo(t *testing.T) {
t.Error(err)
}
_, err = ExchangeAccountInfo(exch)
_, err = ExchangeAccountInfo(exch, assetType)
if err != nil {
t.Error(err)
}
_, err = ExchangeAccountInfo(exchError)
_, err = ExchangeAccountInfo(exchError, assetType)
if err != nil && !errors.Is(err, errTestFailed) {
t.Error(err)
}

View File

@@ -9,7 +9,8 @@ import (
const (
// ErrParameterConvertFailed error to return when type conversion fails
ErrParameterConvertFailed = "%v failed conversion"
ErrEmptyParameter = "received empty parameter for %v"
// ErrEmptyParameter error to return when empty parameter is received
ErrEmptyParameter = "received empty parameter for %v"
)
var errInvalidInterval = errors.New("invalid interval")

View File

@@ -38,7 +38,7 @@ type Exchange interface {
QueryOrder(exch, orderid string, pair currency.Pair, assetType asset.Item) (*order.Detail, error)
SubmitOrder(submit *order.Submit) (*order.SubmitResponse, error)
CancelOrder(exch, orderid string, pair currency.Pair, item asset.Item) (bool, error)
AccountInformation(exch string) (account.Holdings, error)
AccountInformation(exch string, assetType asset.Item) (account.Holdings, error)
DepositAddress(exch string, currencyCode currency.Code) (string, error)
WithdrawalFiatFunds(bankAccountID string, request *withdraw.Request) (out string, err error)
WithdrawalCryptoFunds(request *withdraw.Request) (out string, err error)

View File

@@ -125,13 +125,13 @@ func (e Exchange) CancelOrder(exch, orderID string, cp currency.Pair, a asset.It
}
// AccountInformation returns account information (balance etc) for requested exchange
func (e Exchange) AccountInformation(exch string) (account.Holdings, error) {
func (e Exchange) AccountInformation(exch string, assetType asset.Item) (account.Holdings, error) {
ex, err := e.GetExchange(exch)
if err != nil {
return account.Holdings{}, err
}
accountInfo, err := ex.FetchAccountInfo()
accountInfo, err := ex.FetchAccountInfo(assetType)
if err != nil {
return account.Holdings{}, err
}

View File

@@ -129,7 +129,7 @@ func TestExchange_AccountInformation(t *testing.T) {
if !configureExchangeKeys() {
t.Skip("no exchange configured test skipped")
}
_, err := exchangeTest.AccountInformation(exchName)
_, err := exchangeTest.AccountInformation(exchName, asset.Spot)
if err != nil {
t.Fatal(err)
}

View File

@@ -153,7 +153,7 @@ func TestAccountInfo(t *testing.T) {
if !errors.Is(err, objects.ErrWrongNumArguments) {
t.Fatal(err)
}
_, err = gct.ExchangeAccountInfo(exch)
_, err = gct.ExchangeAccountInfo(exch, assetType)
if err != nil &&
!strings.Contains(err.Error(), "unset/default API keys") {
t.Error(err)

View File

@@ -184,7 +184,7 @@ func (w Wrapper) CancelOrder(exch, orderid string, cp currency.Pair, a asset.Ite
}
// AccountInformation validator for test execution/scripts
func (w Wrapper) AccountInformation(exch string) (account.Holdings, error) {
func (w Wrapper) AccountInformation(exch string, assetType asset.Item) (account.Holdings, error) {
if exch == exchError.String() {
return account.Holdings{}, errTestFailed
}

View File

@@ -63,12 +63,12 @@ func TestWrapper_IsEnabled(t *testing.T) {
func TestWrapper_AccountInformation(t *testing.T) {
t.Parallel()
_, err := testWrapper.AccountInformation(exchName)
_, err := testWrapper.AccountInformation(exchName, asset.Spot)
if err != nil {
t.Fatal(err)
}
_, err = testWrapper.AccountInformation(exchError.String())
_, err = testWrapper.AccountInformation(exchError.String(), asset.Spot)
if err == nil {
t.Fatal("expected AccountInformation to return error on invalid name")
}