Skip to content

fix/historical orders by market ids #206

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.

Sign up for GitHub

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

Merged
aarmoa merged 2 commits into from
May 27, 2023
Merged

fix/historical orders by market ids #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b5ee86
(fix) Solved issue preventing executing historical orders request bot…
May 26, 2023
8b2c988
(fix) Add bugfix description in the changelog in README file
May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ make tests
### Changelogs
**0.6.3**(change before release)
* Change logging logic to use different loggers for each module and class
* Solved issue preventing requesting spot and derivative historical orders for more than one market_id
* Add `pytest` as a development dependency to implement and run unit tests

**0.6.2.7**
Expand Down
28 changes: 18 additions & 10 deletions pyinjective/async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,12 +660,15 @@ async def get_spot_orders(self, market_id: str, **kwargs):
)
return await self.stubSpotExchange.Orders(req)

async def get_historical_spot_orders(self, market_id: str, **kwargs):
async def get_historical_spot_orders(self, market_id: Optional[str] = None, **kwargs):
market_ids = kwargs.get("market_ids", [])
if market_id is not None:
market_ids.append(market_id)
req = spot_exchange_rpc_pb.OrdersHistoryRequest(
market_id=market_id,
market_ids=kwargs.get("market_ids", []),
direction=kwargs.get("direction"),
order_types=kwargs.get("order_types"),
execution_types=kwargs.get("execution_types"),
order_types=kwargs.get("order_types", []),
execution_types=kwargs.get("execution_types", []),
subaccount_id=kwargs.get("subaccount_id"),
skip=kwargs.get("skip"),
limit=kwargs.get("limit"),
Expand Down Expand Up @@ -820,14 +823,19 @@ async def get_derivative_orders(self, market_id: str, **kwargs):
)
return await self.stubDerivativeExchange.Orders(req)

async def get_historical_derivative_orders(self, market_id: str, **kwargs):
async def get_historical_derivative_orders(self, market_id: Optional[str] = None, **kwargs):
market_ids = kwargs.get("market_ids", [])
if market_id is not None:
market_ids.append(market_id)
order_types = kwargs.get("order_types", [])
order_type = kwargs.get("order_type")
if order_type is not None:
order_types.append(market_id)
req = derivative_exchange_rpc_pb.OrdersHistoryRequest(
market_id=market_id,
market_ids=kwargs.get("market_ids"),
market_ids=market_ids,
direction=kwargs.get("direction"),
order_type=kwargs.get("order_type"),
order_types=kwargs.get("order_types"),
execution_types=kwargs.get("execution_types"),
order_types=order_types,
execution_types=kwargs.get("execution_types", []),
subaccount_id=kwargs.get("subaccount_id"),
is_conditional=kwargs.get("is_conditional"),
skip=kwargs.get("skip"),
Expand Down