Merge pull request #1776 from c9s/edwin/bybit/query-wallet-bal

pkg/exchange: update query wallet balance to latest

Author: bailantaotao

pkg/exchange/bybit/bybitapi/get_wallet_balances_request.go

@@ -70,14 +70,14 @@ type WalletBalances struct {
 	} `json:"coin"`
 }
 
-//go:generate GetRequest -url "/v5/account/wallet-balance" -type GetWalletBalancesRequest -responseDataType .WalletBalancesResponse -rateLimiter 1+15/1s
+//go:generate GetRequest -url "/v5/account/wallet-balance" -type GetWalletBalancesRequest -responseDataType .WalletBalancesResponse -rateLimiter 1+45/1s
 type GetWalletBalancesRequest struct {
 	client requestgen.AuthenticatedAPIClient
 
 	// Account type
 	// - Unified account: UNIFIED (trade spot/linear/options), CONTRACT(trade inverse)
 	// - Normal account: CONTRACT, SPOT
-	accountType AccountType `param:"accountType,query" validValues:"SPOT"`
+	accountType AccountType `param:"accountType,query" validValues:"UNIFIED"`
 	// Coin name
 	// - If not passed, it returns non-zero asset info
 	// - You can pass multiple coins to query, separated by comma. USDT,USDC
@@ -87,6 +87,6 @@ type GetWalletBalancesRequest struct {
 func (c *RestClient) NewGetWalletBalancesRequest() *GetWalletBalancesRequest {
 	return &GetWalletBalancesRequest{
 		client:      c,
-		accountType: AccountTypeSpot,
+		accountType: AccountTypeUnified,
 	}
 }

pkg/exchange/bybit/bybitapi/get_wallet_balances_request_requestgen.go

@@ -127,7 +127,7 @@ const (
 
 type AccountType string
 
-const AccountTypeSpot AccountType = "SPOT"
+const AccountTypeUnified AccountType = "UNIFIED"
 
 type MarketUnit string
 

pkg/exchange/bybit/bybitapi/types.go

@@ -362,14 +362,14 @@ func toGlobalTrade(trade bybitapi.Trade) (*types.Trade, error) {
 func toGlobalBalanceMap(events []bybitapi.WalletBalances) types.BalanceMap {
 	bm := types.BalanceMap{}
 	for _, event := range events {
-		if event.AccountType != bybitapi.AccountTypeSpot {
+		if event.AccountType != bybitapi.AccountTypeUnified {
 			continue
 		}
 
 		for _, obj := range event.Coins {
 			bm[obj.Coin] = types.Balance{
 				Currency:  obj.Coin,
-				Available: obj.Free,
+				Available: obj.WalletBalance.Sub(obj.Locked),
 				Locked:    obj.Locked,
 			}
 		}