-
-
Notifications
You must be signed in to change notification settings - Fork 303
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FEATURE: [okx] support query open orders #1498
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
package okex | ||
|
||
import ( | ||
"fmt" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
|
||
"github.com/c9s/bbgo/pkg/exchange/okex/okexapi" | ||
"github.com/c9s/bbgo/pkg/fixedpoint" | ||
"github.com/c9s/bbgo/pkg/types" | ||
) | ||
|
||
func Test_openOrderToGlobal(t *testing.T) { | ||
var ( | ||
assert = assert.New(t) | ||
|
||
orderId = 665576973905014786 | ||
// {"accFillSz":"0","algoClOrdId":"","algoId":"","attachAlgoClOrdId":"","attachAlgoOrds":[],"avgPx":"","cTime":"1704957916401","cancelSource":"","cancelSourceReason":"","category":"normal","ccy":"","clOrdId":"","fee":"0","feeCcy":"USDT","fillPx":"","fillSz":"0","fillTime":"","instId":"BTC-USDT","instType":"SPOT","lever":"","ordId":"665576973905014786","ordType":"limit","pnl":"0","posSide":"net","px":"48174.5","pxType":"","pxUsd":"","pxVol":"","quickMgnType":"","rebate":"0","rebateCcy":"BTC","reduceOnly":"false","side":"sell","slOrdPx":"","slTriggerPx":"","slTriggerPxType":"","source":"","state":"live","stpId":"","stpMode":"","sz":"0.00001","tag":"","tdMode":"cash","tgtCcy":"","tpOrdPx":"","tpTriggerPx":"","tpTriggerPxType":"","tradeId":"","uTime":"1704957916401"} | ||
openOrder = &okexapi.OpenOrder{ | ||
AccumulatedFillSize: fixedpoint.NewFromFloat(0), | ||
AvgPrice: fixedpoint.NewFromFloat(0), | ||
CreatedTime: types.NewMillisecondTimestampFromInt(1704957916401), | ||
Category: "normal", | ||
Currency: "BTC", | ||
ClientOrderId: "", | ||
Fee: fixedpoint.Zero, | ||
FeeCurrency: "USDT", | ||
FillTime: types.NewMillisecondTimestampFromInt(0), | ||
InstrumentID: "BTC-USDT", | ||
InstrumentType: okexapi.InstrumentTypeSpot, | ||
OrderId: types.StrInt64(orderId), | ||
OrderType: okexapi.OrderTypeLimit, | ||
Price: fixedpoint.NewFromFloat(48174.5), | ||
Side: okexapi.SideTypeBuy, | ||
State: okexapi.OrderStateLive, | ||
Size: fixedpoint.NewFromFloat(0.00001), | ||
UpdatedTime: types.NewMillisecondTimestampFromInt(1704957916401), | ||
} | ||
expOrder = &types.Order{ | ||
SubmitOrder: types.SubmitOrder{ | ||
ClientOrderID: openOrder.ClientOrderId, | ||
Symbol: toGlobalSymbol(openOrder.InstrumentID), | ||
Side: types.SideTypeBuy, | ||
Type: types.OrderTypeLimit, | ||
Quantity: fixedpoint.NewFromFloat(0.00001), | ||
Price: fixedpoint.NewFromFloat(48174.5), | ||
AveragePrice: fixedpoint.Zero, | ||
StopPrice: fixedpoint.Zero, | ||
TimeInForce: types.TimeInForceGTC, | ||
}, | ||
Exchange: types.ExchangeOKEx, | ||
OrderID: uint64(orderId), | ||
UUID: fmt.Sprintf("%d", orderId), | ||
Status: types.OrderStatusNew, | ||
OriginalStatus: string(okexapi.OrderStateLive), | ||
ExecutedQuantity: fixedpoint.Zero, | ||
IsWorking: true, | ||
CreationTime: types.Time(types.NewMillisecondTimestampFromInt(1704957916401).Time()), | ||
UpdateTime: types.Time(types.NewMillisecondTimestampFromInt(1704957916401).Time()), | ||
} | ||
) | ||
|
||
t.Run("succeeds", func(t *testing.T) { | ||
order, err := openOrderToGlobal(openOrder) | ||
assert.NoError(err) | ||
assert.Equal(expOrder, order) | ||
}) | ||
|
||
t.Run("unexpected order status", func(t *testing.T) { | ||
newOrder := *openOrder | ||
newOrder.State = "xxx" | ||
_, err := openOrderToGlobal(&newOrder) | ||
assert.ErrorContains(err, "xxx") | ||
}) | ||
|
||
t.Run("unexpected order type", func(t *testing.T) { | ||
newOrder := *openOrder | ||
newOrder.OrderType = "xxx" | ||
_, err := openOrderToGlobal(&newOrder) | ||
assert.ErrorContains(err, "xxx") | ||
}) | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
package okexapi | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/c9s/requestgen" | ||
|
||
"github.com/c9s/bbgo/pkg/fixedpoint" | ||
"github.com/c9s/bbgo/pkg/types" | ||
) | ||
|
||
//go:generate -command GetRequest requestgen -method GET -responseType .APIResponse -responseDataField Data | ||
//go:generate -command PostRequest requestgen -method POST -responseType .APIResponse -responseDataField Data | ||
|
||
type OpenOrder struct { | ||
AccumulatedFillSize fixedpoint.Value `json:"accFillSz"` | ||
// If none is filled, it will return "". | ||
AvgPrice fixedpoint.Value `json:"avgPx"` | ||
CreatedTime types.MillisecondTimestamp `json:"cTime"` | ||
Category string `json:"category"` | ||
ClientOrderId string `json:"clOrdId"` | ||
Fee fixedpoint.Value `json:"fee"` | ||
FeeCurrency string `json:"feeCcy"` | ||
// Last filled time | ||
FillTime types.MillisecondTimestamp `json:"fillTime"` | ||
InstrumentID string `json:"instId"` | ||
InstrumentType InstrumentType `json:"instType"` | ||
OrderId types.StrInt64 `json:"ordId"` | ||
OrderType OrderType `json:"ordType"` | ||
Price fixedpoint.Value `json:"px"` | ||
Side SideType `json:"side"` | ||
State OrderState `json:"state"` | ||
Size fixedpoint.Value `json:"sz"` | ||
TargetCurrency string `json:"tgtCcy"` | ||
UpdatedTime types.MillisecondTimestamp `json:"uTime"` | ||
|
||
// Margin currency | ||
// Only applicable to cross MARGIN orders in Single-currency margin. | ||
Currency string `json:"ccy"` | ||
TradeId string `json:"tradeId"` | ||
// Last filled price | ||
FillPrice fixedpoint.Value `json:"fillPx"` | ||
// Last filled quantity | ||
FillSize fixedpoint.Value `json:"fillSz"` | ||
// Leverage, from 0.01 to 125. | ||
// Only applicable to MARGIN/FUTURES/SWAP | ||
Lever string `json:"lever"` | ||
// Profit and loss, Applicable to orders which have a trade and aim to close position. It always is 0 in other conditions | ||
Pnl fixedpoint.Value `json:"pnl"` | ||
PositionSide string `json:"posSide"` | ||
// Options price in USDOnly applicable to options; return "" for other instrument types | ||
PriceUsd fixedpoint.Value `json:"pxUsd"` | ||
// Implied volatility of the options orderOnly applicable to options; return "" for other instrument types | ||
PriceVol fixedpoint.Value `json:"pxVol"` | ||
// Price type of options | ||
PriceType string `json:"pxType"` | ||
// Rebate amount, only applicable to spot and margin, the reward of placing orders from the platform (rebate) | ||
// given to user who has reached the specified trading level. If there is no rebate, this field is "". | ||
Rebate fixedpoint.Value `json:"rebate"` | ||
RebateCcy string `json:"rebateCcy"` | ||
// Client-supplied Algo ID when placing order attaching TP/SL. | ||
AttachAlgoClOrdId string `json:"attachAlgoClOrdId"` | ||
SlOrdPx fixedpoint.Value `json:"slOrdPx"` | ||
SlTriggerPx fixedpoint.Value `json:"slTriggerPx"` | ||
SlTriggerPxType string `json:"slTriggerPxType"` | ||
AttachAlgoOrds []interface{} `json:"attachAlgoOrds"` | ||
Source string `json:"source"` | ||
// Self trade prevention ID. Return "" if self trade prevention is not applicable | ||
StpId string `json:"stpId"` | ||
// Self trade prevention mode. Return "" if self trade prevention is not applicable | ||
StpMode string `json:"stpMode"` | ||
Tag string `json:"tag"` | ||
TradeMode string `json:"tdMode"` | ||
TpOrdPx fixedpoint.Value `json:"tpOrdPx"` | ||
TpTriggerPx fixedpoint.Value `json:"tpTriggerPx"` | ||
TpTriggerPxType string `json:"tpTriggerPxType"` | ||
ReduceOnly string `json:"reduceOnly"` | ||
QuickMgnType string `json:"quickMgnType"` | ||
AlgoClOrdId string `json:"algoClOrdId"` | ||
AlgoId string `json:"algoId"` | ||
} | ||
|
||
//go:generate GetRequest -url "/api/v5/trade/orders-pending" -type GetOpenOrdersRequest -responseDataType []OpenOrder | ||
type GetOpenOrdersRequest struct { | ||
client requestgen.AuthenticatedAPIClient | ||
|
||
instrumentID *string `param:"instId,query"` | ||
|
||
instrumentType InstrumentType `param:"instType,query"` | ||
|
||
orderType *OrderType `param:"ordType,query"` | ||
|
||
state *OrderState `param:"state,query"` | ||
category *string `param:"category,query"` | ||
// Pagination of data to return records earlier than the requested ordId | ||
after *string `param:"after,query"` | ||
// Pagination of data to return records newer than the requested ordId | ||
before *string `param:"before,query"` | ||
// Filter with a begin timestamp. Unix timestamp format in milliseconds, e.g. 1597026383085 | ||
begin *time.Time `param:"begin,query"` | ||
|
||
// Filter with an end timestamp. Unix timestamp format in milliseconds, e.g. 1597026383085 | ||
end *time.Time `param:"end,query"` | ||
limit *string `param:"limit,query"` | ||
} | ||
|
||
func (c *RestClient) NewGetOpenOrdersRequest() *GetOpenOrdersRequest { | ||
return &GetOpenOrdersRequest{ | ||
client: c, | ||
instrumentType: InstrumentTypeSpot, | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess you can use switch case here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why? The function represents only the working status- either live or partially filled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
like this: