Skip to content

Commit 6052079

Browse files
VictorFrWuVictorFrWu
committed
fix asset endpoints
1 parent 2cef19a commit 6052079

File tree

11 files changed

+195
-6
lines changed

11 files changed

+195
-6
lines changed

‎asset.go‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package bybit_connector
22

33
import (
44
"context"
5+
"github.com/wuhewuhe/bybit.go.api/handlers"
56
"net/http"
67
)
78

@@ -16,6 +17,7 @@ func (s *AssetClient) GetAssetOrderRecord(ctx context.Context, opts ...RequestOp
1617
endpoint: "/v5/asset/exchange/order-record",
1718
secType: secTypeSigned,
1819
}
20+
r.setParams(s.params)
1921
data, err := s.c.callAPI(ctx, r, opts...)
2022
if err != nil {
2123
return nil, err
@@ -34,6 +36,7 @@ func (s *AssetClient) GetAssetInfo(ctx context.Context, opts ...RequestOption) (
3436
endpoint: "/v5/asset/transfer/query-asset-info",
3537
secType: secTypeSigned,
3638
}
39+
r.setParams(s.params)
3740
data, err := s.c.callAPI(ctx, r, opts...)
3841
if err != nil {
3942
return nil, err
@@ -52,6 +55,7 @@ func (s *AssetClient) GetDeliveryRecord(ctx context.Context, opts ...RequestOpti
5255
endpoint: "/v5/asset/delivery-record",
5356
secType: secTypeSigned,
5457
}
58+
r.setParams(s.params)
5559
data, err := s.c.callAPI(ctx, r, opts...)
5660
if err != nil {
5761
return nil, err
@@ -70,6 +74,7 @@ func (s *AssetClient) GetUsdcSettlement(ctx context.Context, opts ...RequestOpti
7074
endpoint: "/v5/asset/settlement-record",
7175
secType: secTypeSigned,
7276
}
77+
r.setParams(s.params)
7378
data, err := s.c.callAPI(ctx, r, opts...)
7479
if err != nil {
7580
return nil, err
@@ -88,6 +93,7 @@ func (s *AssetClient) GetAllCoinsBalance(ctx context.Context, opts ...RequestOpt
8893
endpoint: "/v5/asset/transfer/query-account-coins-balance",
8994
secType: secTypeSigned,
9095
}
96+
r.setParams(s.params)
9197
data, err := s.c.callAPI(ctx, r, opts...)
9298
if err != nil {
9399
return nil, err
@@ -101,11 +107,15 @@ func (s *AssetClient) GetAllCoinsBalance(ctx context.Context, opts ...RequestOpt
101107
}
102108

103109
func (s *AssetClient) GetSingleCoinsBalance(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
110+
if err = handlers.ValidateParams(s.params); err != nil {
111+
return nil, err
112+
}
104113
r := &request{
105114
method: http.MethodGet,
106115
endpoint: "/v5/asset/transfer/query-account-coin-balance",
107116
secType: secTypeSigned,
108117
}
118+
r.setParams(s.params)
109119
data, err := s.c.callAPI(ctx, r, opts...)
110120
if err != nil {
111121
return nil, err
@@ -119,11 +129,15 @@ func (s *AssetClient) GetSingleCoinsBalance(ctx context.Context, opts ...Request
119129
}
120130

121131
func (s *AssetClient) GetTransferableCoin(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
132+
if err = handlers.ValidateParams(s.params); err != nil {
133+
return nil, err
134+
}
122135
r := &request{
123136
method: http.MethodGet,
124137
endpoint: "/v5/asset/transfer/query-transfer-coin-list",
125138
secType: secTypeSigned,
126139
}
140+
r.setParams(s.params)
127141
data, err := s.c.callAPI(ctx, r, opts...)
128142
if err != nil {
129143
return nil, err
@@ -137,11 +151,15 @@ func (s *AssetClient) GetTransferableCoin(ctx context.Context, opts ...RequestOp
137151
}
138152

139153
func (s *AssetClient) CreateInternalTransfer(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
154+
if err = handlers.ValidateParams(s.params); err != nil {
155+
return nil, err
156+
}
140157
r := &request{
141158
method: http.MethodPost,
142159
endpoint: "/v5/asset/transfer/inter-transfer",
143160
secType: secTypeSigned,
144161
}
162+
r.setParams(s.params)
145163
data, err := s.c.callAPI(ctx, r, opts...)
146164
if err != nil {
147165
return nil, err
@@ -155,11 +173,15 @@ func (s *AssetClient) CreateInternalTransfer(ctx context.Context, opts ...Reques
155173
}
156174

157175
func (s *AssetClient) CreateUniversalTransfer(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
176+
if err = handlers.ValidateParams(s.params); err != nil {
177+
return nil, err
178+
}
158179
r := &request{
159180
method: http.MethodPost,
160181
endpoint: "/v5/asset/transfer/universal-transfer",
161182
secType: secTypeSigned,
162183
}
184+
r.setParams(s.params)
163185
data, err := s.c.callAPI(ctx, r, opts...)
164186
if err != nil {
165187
return nil, err
@@ -173,11 +195,15 @@ func (s *AssetClient) CreateUniversalTransfer(ctx context.Context, opts ...Reque
173195
}
174196

175197
func (s *AssetClient) SetDepositAccount(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
198+
if err = handlers.ValidateParams(s.params); err != nil {
199+
return nil, err
200+
}
176201
r := &request{
177202
method: http.MethodPost,
178203
endpoint: "/v5/asset/deposit/deposit-to-account",
179204
secType: secTypeSigned,
180205
}
206+
r.setParams(s.params)
181207
data, err := s.c.callAPI(ctx, r, opts...)
182208
if err != nil {
183209
return nil, err
@@ -191,11 +217,15 @@ func (s *AssetClient) SetDepositAccount(ctx context.Context, opts ...RequestOpti
191217
}
192218

193219
func (s *AssetClient) WithdrawAsset(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
220+
if err = handlers.ValidateParams(s.params); err != nil {
221+
return nil, err
222+
}
194223
r := &request{
195224
method: http.MethodPost,
196225
endpoint: "/v5/asset/withdraw/create",
197226
secType: secTypeSigned,
198227
}
228+
r.setParams(s.params)
199229
data, err := s.c.callAPI(ctx, r, opts...)
200230
if err != nil {
201231
return nil, err
@@ -209,11 +239,15 @@ func (s *AssetClient) WithdrawAsset(ctx context.Context, opts ...RequestOption)
209239
}
210240

211241
func (s *AssetClient) CancelWithdrawAsset(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
242+
if err = handlers.ValidateParams(s.params); err != nil {
243+
return nil, err
244+
}
212245
r := &request{
213246
method: http.MethodPost,
214247
endpoint: "/v5/asset/withdraw/cancel",
215248
secType: secTypeSigned,
216249
}
250+
r.setParams(s.params)
217251
data, err := s.c.callAPI(ctx, r, opts...)
218252
if err != nil {
219253
return nil, err
@@ -227,11 +261,15 @@ func (s *AssetClient) CancelWithdrawAsset(ctx context.Context, opts ...RequestOp
227261
}
228262

229263
func (s *AssetClient) GetInternalTransfer(ctx context.Context, opts ...RequestOption) (res *ServerResponse, err error) {
264+
if err = handlers.ValidateParams(s.params); err != nil {
265+
return nil, err
266+
}
230267
r := &request{
231268
method: http.MethodGet,
232269
endpoint: "/v5/asset/transfer/query-inter-transfer-list",
233270
secType: secTypeSigned,
234271
}
272+
r.setParams(s.params)
235273
data, err := s.c.callAPI(ctx, r, opts...)
236274
if err != nil {
237275
return nil, err
@@ -250,6 +288,7 @@ func (s *AssetClient) GetUniversalTransfer(ctx context.Context, opts ...RequestO
250288
endpoint: "/v5/asset/transfer/query-universal-transfer-list",
251289
secType: secTypeSigned,
252290
}
291+
r.setParams(s.params)
253292
data, err := s.c.callAPI(ctx, r, opts...)
254293
if err != nil {
255294
return nil, err
@@ -268,6 +307,7 @@ func (s *AssetClient) GetSubUids(ctx context.Context, opts ...RequestOption) (re
268307
endpoint: "/v5/asset/transfer/query-sub-member-list",
269308
secType: secTypeSigned,
270309
}
310+
r.setParams(s.params)
271311
data, err := s.c.callAPI(ctx, r, opts...)
272312
if err != nil {
273313
return nil, err
@@ -286,6 +326,7 @@ func (s *AssetClient) GetAllowedDepositCoin(ctx context.Context, opts ...Request
286326
endpoint: "/v5/asset/deposit/query-allowed-list",
287327
secType: secTypeSigned,
288328
}
329+
r.setParams(s.params)
289330
data, err := s.c.callAPI(ctx, r, opts...)
290331
if err != nil {
291332
return nil, err
@@ -304,6 +345,7 @@ func (s *AssetClient) GetDepositRecords(ctx context.Context, opts ...RequestOpti
304345
endpoint: "/v5/asset/deposit/query-record",
305346
secType: secTypeSigned,
306347
}
348+
r.setParams(s.params)
307349
data, err := s.c.callAPI(ctx, r, opts...)
308350
if err != nil {
309351
return nil, err
@@ -322,6 +364,7 @@ func (s *AssetClient) GetSubDepositRecords(ctx context.Context, opts ...RequestO
322364
endpoint: "/v5/asset/deposit/query-sub-member-record",
323365
secType: secTypeSigned,
324366
}
367+
r.setParams(s.params)
325368
data, err := s.c.callAPI(ctx, r, opts...)
326369
if err != nil {
327370
return nil, err
@@ -340,6 +383,7 @@ func (s *AssetClient) GetInternalDepositRecords(ctx context.Context, opts ...Req
340383
endpoint: "/v5/asset/deposit/query-internal-record",
341384
secType: secTypeSigned,
342385
}
386+
r.setParams(s.params)
343387
data, err := s.c.callAPI(ctx, r, opts...)
344388
if err != nil {
345389
return nil, err
@@ -358,6 +402,7 @@ func (s *AssetClient) GetMasterDepositAddress(ctx context.Context, opts ...Reque
358402
endpoint: "/v5/asset/deposit/query-address",
359403
secType: secTypeSigned,
360404
}
405+
r.setParams(s.params)
361406
data, err := s.c.callAPI(ctx, r, opts...)
362407
if err != nil {
363408
return nil, err
@@ -376,6 +421,7 @@ func (s *AssetClient) GetSubDepositAddress(ctx context.Context, opts ...RequestO
376421
endpoint: "/v5/asset/deposit/query-sub-member-address",
377422
secType: secTypeSigned,
378423
}
424+
r.setParams(s.params)
379425
data, err := s.c.callAPI(ctx, r, opts...)
380426
if err != nil {
381427
return nil, err
@@ -394,6 +440,7 @@ func (s *AssetClient) GetCoinInfo(ctx context.Context, opts ...RequestOption) (r
394440
endpoint: "/v5/asset/coin/query-info",
395441
secType: secTypeSigned,
396442
}
443+
r.setParams(s.params)
397444
data, err := s.c.callAPI(ctx, r, opts...)
398445
if err != nil {
399446
return nil, err
@@ -412,6 +459,7 @@ func (s *AssetClient) GetWithdrawalAmount(ctx context.Context, opts ...RequestOp
412459
endpoint: "/v5/asset/withdraw/withdrawable-amount",
413460
secType: secTypeSigned,
414461
}
462+
r.setParams(s.params)
415463
data, err := s.c.callAPI(ctx, r, opts...)
416464
if err != nil {
417465
return nil, err
@@ -429,6 +477,7 @@ func (s *AssetClient) GetWithdrawalRecords(ctx context.Context, opts ...RequestO
429477
endpoint: "/v5/asset/withdraw/query-record",
430478
secType: secTypeSigned,
431479
}
480+
r.setParams(s.params)
432481
data, err := s.c.callAPI(ctx, r, opts...)
433482
if err != nil {
434483
return nil, err

‎bybit_api_client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func WithBaseURL(baseURL string) ClientOption {
5959
}
6060

6161
func PrettyPrint(i interface{}) string {
62-
s, _ := json.MarshalIndent(i, "", "\t")
62+
s, _ := json.MarshalIndent(i, "", " ")
6363
return string(s)
6464
}
6565

‎consts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package bybit_connector
22

33
const (
44
Name = "bybit.api.go"
5-
Version = "1.0.1"
5+
Version = "1.0.2"
66
// Https
77
MAINNET = "https://api.bybit.com"
88
MAINNET_BACKT = "https://api.bytick.com"

‎examples/Account/get_transaction.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package main
2+
3+
import (
4+
"context"
5+
"fmt"
6+
bybit "github.com/wuhewuhe/bybit.go.api"
7+
)
8+
9+
func main() {
10+
PlaceTrade()
11+
}
12+
13+
func PlaceTrade() {
14+
client := bybit.NewBybitHttpClient("8wYkmpLsMg10eNQyPm", "Ouxc34myDnXvei54XsBZgoQzfGxO4bkr2Zsj", bybit.WithBaseURL(bybit.TESTNET))
15+
params := map[string]interface{}{"accountType": "UNIFIED", "category": "linear"}
16+
accountResult, err := client.NewAccountService(params).GetTransactionLog(context.Background())
17+
if err != nil {
18+
fmt.Println(err)
19+
return
20+
}
21+
fmt.Println(bybit.PrettyPrint(accountResult))
22+
}

‎examples/Asset/get_coin_info.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package main
2+
3+
import (
4+
"context"
5+
"fmt"
6+
bybit "github.com/wuhewuhe/bybit.go.api"
7+
)
8+
9+
func main() {
10+
GetCoinInfo()
11+
}
12+
13+
func GetCoinInfo() {
14+
client := bybit.NewBybitHttpClient("8wYkmpLsMg10eNQyPm", "Ouxc34myDnXvei54XsBZgoQzfGxO4bkr2Zsj", bybit.WithBaseURL(bybit.TESTNET))
15+
params := map[string]interface{}{"coin": "USDT"}
16+
assetResult, err := client.NewAssetService(params).GetCoinInfo(context.Background())
17+
if err != nil {
18+
fmt.Println(err)
19+
return
20+
}
21+
fmt.Println(bybit.PrettyPrint(assetResult))
22+
}

‎examples/Asset/get_transfer_coin.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package main
2+
3+
import (
4+
"context"
5+
"fmt"
6+
bybit "github.com/wuhewuhe/bybit.go.api"
7+
)
8+
9+
func main() {
10+
PlaceOrder()
11+
}
12+
13+
func PlaceOrder() {
14+
client := bybit.NewBybitHttpClient("8wYkmpLsMg10eNQyPm", "Ouxc34myDnXvei54XsBZgoQzfGxO4bkr2Zsj", bybit.WithBaseURL(bybit.TESTNET))
15+
params := map[string]interface{}{"fromAccountType": "UNIFIED", "toAccountType": "CONTRACT"}
16+
response, err := client.NewAssetService(params).GetTransferableCoin(context.Background())
17+
if err != nil {
18+
fmt.Println(err)
19+
return
20+
}
21+
fmt.Println(bybit.PrettyPrint(response))
22+
}

0 commit comments

Comments
 (0)