diff --git a/CHANGELOG.md b/CHANGELOG.md index 24c5686..b2aa44d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [1.4.3] - 2024-JUL-22 + +### Added +- - `order_ids`, `time_in_forces` and `sort_by` parameters in List Orders + - `trade_ids` and `sort_by` in List Fills + +### Changed +- `skip_fcm_risk_check` parameter removed from various Orders methods. +- `product_id` and `order_type` has been replaced by `product_ids` and `order_types` in List Orders +- `order_id` and `product_id` has been replaced by `order_ids` and `product_ids` in List Fills + ## [1.4.2] - 2024-JUN-17 ### Added diff --git a/README.md b/README.md index c4fe034..0d5dd9f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ pip3 install coinbase-advanced-py ___ ## Coinbase Developer Platform (CDP) API Keys -This SDK uses Cloud Developer Platform (CDP) API keys. To use this SDK, you will need to create a CDP API key and secret by following the instructions [here](https://docs.cdp.coinbase.com/advanced-trade/docs/auth). +This SDK uses Cloud Developer Platform (CDP) API keys. To use this SDK, you will need to create a CDP API key and secret by following the instructions [here](https://docs.cdp.coinbase.com/advanced-trade/docs/getting-started). Make sure to save your API key and secret in a safe place. You will not be able to retrieve your secret again. WARNING: We do not recommend that you save your API secrets directly in your code outside of testing purposes. Best practice is to use a secrets manager and access your secrets that way. You should be careful about exposing your secrets publicly if posting code that leverages this library. diff --git a/coinbase/__version__.py b/coinbase/__version__.py index daa50c7..aa56ed4 100644 --- a/coinbase/__version__.py +++ b/coinbase/__version__.py @@ -1 +1 @@ -__version__ = "1.4.2" +__version__ = "1.4.3" diff --git a/coinbase/rest/fees.py b/coinbase/rest/fees.py index a2ba3e5..5df8e98 100644 --- a/coinbase/rest/fees.py +++ b/coinbase/rest/fees.py @@ -7,6 +7,7 @@ def get_transaction_summary( self, product_type: Optional[str] = None, contract_expiry_type: Optional[str] = None, + product_venue: Optional[str] = None, **kwargs, ) -> Dict[str, Any]: """ @@ -30,6 +31,7 @@ def get_transaction_summary( params = { "product_type": product_type, "contract_expiry_type": contract_expiry_type, + "product_venue": product_venue, } return self.get(endpoint, params=params, **kwargs) diff --git a/coinbase/rest/orders.py b/coinbase/rest/orders.py index 3344965..df7afec 100644 --- a/coinbase/rest/orders.py +++ b/coinbase/rest/orders.py @@ -1423,12 +1423,13 @@ def get_order(self, order_id: str, **kwargs) -> Dict[str, Any]: def list_orders( self, - product_id: Optional[str] = None, + order_ids: Optional[List[str]] = None, + product_ids: Optional[List[str]] = None, order_status: Optional[List[str]] = None, limit: Optional[int] = None, start_date: Optional[str] = None, end_date: Optional[str] = None, - order_type: Optional[str] = None, + order_types: Optional[str] = None, order_side: Optional[str] = None, cursor: Optional[str] = None, product_type: Optional[str] = None, @@ -1436,6 +1437,8 @@ def list_orders( contract_expiry_type: Optional[str] = None, asset_filters: Optional[List[str]] = None, retail_portfolio_id: Optional[str] = None, + time_in_forces: Optional[str] = None, + sort_by: Optional[str] = None, **kwargs, ) -> Dict[str, Any]: """ @@ -1457,12 +1460,13 @@ def list_orders( """ endpoint = f"{API_PREFIX}/orders/historical/batch" params = { - "product_id": product_id, + "order_ids": order_ids, + "product_ids": product_ids, "order_status": order_status, "limit": limit, "start_date": start_date, "end_date": end_date, - "order_type": order_type, + "order_types": order_types, "order_side": order_side, "cursor": cursor, "product_type": product_type, @@ -1470,6 +1474,8 @@ def list_orders( "contract_expiry_type": contract_expiry_type, "asset_filters": asset_filters, "retail_portfolio_id": retail_portfolio_id, + "time_in_forces": time_in_forces, + "sort_by": sort_by, } return self.get(endpoint, params=params, **kwargs) @@ -1477,13 +1483,15 @@ def list_orders( def get_fills( self, - order_id: Optional[str] = None, - product_id: Optional[str] = None, + order_ids: Optional[List[str]] = None, + trade_ids: Optional[List[str]] = None, + product_ids: Optional[List[str]] = None, start_sequence_timestamp: Optional[str] = None, end_sequence_timestamp: Optional[str] = None, retail_portfolio_id: Optional[str] = None, limit: Optional[int] = None, cursor: Optional[str] = None, + sort_by: Optional[str] = None, **kwargs, ) -> Dict[str, Any]: """ @@ -1505,13 +1513,15 @@ def get_fills( """ endpoint = f"{API_PREFIX}/orders/historical/fills" params = { - "order_id": order_id, - "product_id": product_id, + "order_ids": order_ids, + "trade_ids": trade_ids, + "product_ids": product_ids, "start_sequence_timestamp": start_sequence_timestamp, "end_sequence_timestamp": end_sequence_timestamp, "retail_portfolio_id": retail_portfolio_id, "limit": limit, "cursor": cursor, + "sort_by": sort_by, } return self.get(endpoint, params=params, **kwargs) @@ -1619,7 +1629,6 @@ def preview_order( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -1654,7 +1663,6 @@ def preview_order( "commission_rate": commission_rate, "is_max": is_max, "tradable_balance": tradable_balance, - "skip_fcm_risk_check": skip_fcm_risk_check, "leverage": leverage, "margin_type": margin_type, "retail_portfolio_id": retail_portfolio_id, @@ -1673,7 +1681,6 @@ def preview_market_order( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -1712,7 +1719,6 @@ def preview_market_order( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -1728,7 +1734,6 @@ def preview_market_order_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -1760,7 +1765,6 @@ def preview_market_order_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -1775,7 +1779,6 @@ def preview_market_order_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -1806,7 +1809,6 @@ def preview_market_order_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -1824,7 +1826,6 @@ def preview_limit_order_ioc( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -1859,7 +1860,6 @@ def preview_limit_order_ioc( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -1875,7 +1875,6 @@ def preview_limit_order_ioc_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -1907,7 +1906,6 @@ def preview_limit_order_ioc_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -1923,7 +1921,6 @@ def preview_limit_order_ioc_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -1955,7 +1952,6 @@ def preview_limit_order_ioc_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -1974,7 +1970,6 @@ def preview_limit_order_gtc( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2013,7 +2008,6 @@ def preview_limit_order_gtc( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2030,7 +2024,6 @@ def preview_limit_order_gtc_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2063,7 +2056,6 @@ def preview_limit_order_gtc_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2080,7 +2072,6 @@ def preview_limit_order_gtc_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2113,7 +2104,6 @@ def preview_limit_order_gtc_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2133,7 +2123,6 @@ def preview_limit_order_gtd( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2173,7 +2162,6 @@ def preview_limit_order_gtd( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2191,7 +2179,6 @@ def preview_limit_order_gtd_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2225,7 +2212,6 @@ def preview_limit_order_gtd_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2243,7 +2229,6 @@ def preview_limit_order_gtd_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2277,7 +2262,6 @@ def preview_limit_order_gtd_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2294,7 +2278,6 @@ def preview_limit_order_fok( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2329,7 +2312,6 @@ def preview_limit_order_fok( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2345,7 +2327,6 @@ def preview_limit_order_fok_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2377,7 +2358,6 @@ def preview_limit_order_fok_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2393,7 +2373,6 @@ def preview_limit_order_fok_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2425,7 +2404,6 @@ def preview_limit_order_fok_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2445,7 +2423,6 @@ def preview_stop_limit_order_gtc( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2485,7 +2462,6 @@ def preview_stop_limit_order_gtc( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2503,7 +2479,6 @@ def preview_stop_limit_order_gtc_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2537,7 +2512,6 @@ def preview_stop_limit_order_gtc_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2555,7 +2529,6 @@ def preview_stop_limit_order_gtc_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2589,7 +2562,6 @@ def preview_stop_limit_order_gtc_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2610,7 +2582,6 @@ def preview_stop_limit_order_gtd( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2651,7 +2622,6 @@ def preview_stop_limit_order_gtd( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2670,7 +2640,6 @@ def preview_stop_limit_order_gtd_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2705,7 +2674,6 @@ def preview_stop_limit_order_gtd_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2724,7 +2692,6 @@ def preview_stop_limit_order_gtd_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2759,7 +2726,6 @@ def preview_stop_limit_order_gtd_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2778,7 +2744,6 @@ def preview_trigger_bracket_order_gtc( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2817,7 +2782,6 @@ def preview_trigger_bracket_order_gtc( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2834,7 +2798,6 @@ def preview_trigger_bracket_order_gtc_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2867,7 +2830,6 @@ def preview_trigger_bracket_order_gtc_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2884,7 +2846,6 @@ def preview_trigger_bracket_order_gtc_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2917,7 +2878,6 @@ def preview_trigger_bracket_order_gtc_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2937,7 +2897,6 @@ def preview_trigger_bracket_order_gtd( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -2977,7 +2936,6 @@ def preview_trigger_bracket_order_gtd( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -2995,7 +2953,6 @@ def preview_trigger_bracket_order_gtd_buy( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -3029,7 +2986,6 @@ def preview_trigger_bracket_order_gtd_buy( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, @@ -3047,7 +3003,6 @@ def preview_trigger_bracket_order_gtd_sell( commission_rate: Optional[str] = None, is_max: Optional[bool] = False, tradable_balance: Optional[str] = None, - skip_fcm_risk_check: Optional[bool] = False, leverage: Optional[str] = None, margin_type: Optional[str] = None, retail_portfolio_id: Optional[str] = None, @@ -3081,7 +3036,6 @@ def preview_trigger_bracket_order_gtd_sell( commission_rate=commission_rate, is_max=is_max, tradable_balance=tradable_balance, - skip_fcm_risk_check=skip_fcm_risk_check, leverage=leverage, margin_type=margin_type, retail_portfolio_id=retail_portfolio_id, diff --git a/tests/rest/test_fees.py b/tests/rest/test_fees.py index b39581b..808aa72 100644 --- a/tests/rest/test_fees.py +++ b/tests/rest/test_fees.py @@ -20,13 +20,13 @@ def test_get_transaction_summary(self): json=expected_response, ) summary = client.get_transaction_summary( - "product_type", "contract_expiry_type" + "product_type", "contract_expiry_type", "product_venue" ) captured_request = m.request_history[0] self.assertEqual( captured_request.query, - "product_type=product_type&contract_expiry_type=contract_expiry_type", + "product_type=product_type&contract_expiry_type=contract_expiry_type&product_venue=product_venue", ) self.assertEqual(summary, expected_response) diff --git a/tests/rest/test_orders.py b/tests/rest/test_orders.py index af06ee4..91928bd 100644 --- a/tests/rest/test_orders.py +++ b/tests/rest/test_orders.py @@ -1099,7 +1099,7 @@ def test_list_orders(self): json=expected_response, ) orders = client.list_orders( - product_id="product_id_1", + product_ids=["product_id_1", "product_id_2"], order_status="OPEN", limit=2, product_type="SPOT", @@ -1109,7 +1109,7 @@ def test_list_orders(self): self.assertEqual( captured_request.query, - "product_id=product_id_1&order_status=open&limit=2&product_type=spot", + "product_ids=product_id_1&product_ids=product_id_2&order_status=open&limit=2&product_type=spot", ) self.assertEqual(orders, expected_response) @@ -1125,8 +1125,8 @@ def test_get_fills(self): json=expected_response, ) orders = client.get_fills( - order_id="1234", - product_id="product_id_1", + order_ids=["1234"], + product_ids=["product_id_1"], retail_portfolio_id="portfolio_id_1", limit=2, cursor="abc", @@ -1136,7 +1136,7 @@ def test_get_fills(self): self.assertEqual( captured_request.query, - "order_id=1234&product_id=product_id_1&retail_portfolio_id=portfolio_id_1&limit=2&cursor=abc", + "order_ids=1234&product_ids=product_id_1&retail_portfolio_id=portfolio_id_1&limit=2&cursor=abc", ) self.assertEqual(orders, expected_response) @@ -1225,7 +1225,6 @@ def test_preview_order(self): commission_rate="0.005", is_max=False, tradable_balance="100", - skip_fcm_risk_check=False, leverage="5", margin_type="CROSS", retail_portfolio_id="portfolio_id_1", @@ -1244,7 +1243,6 @@ def test_preview_order(self): "commission_rate": {"value": "0.005"}, "is_max": False, "tradable_balance": "100", - "skip_fcm_risk_check": False, "leverage": "5", "margin_type": "CROSS", "retail_portfolio_id": "portfolio_id_1", @@ -1277,7 +1275,6 @@ def test_preview_market_order(self): "side": "BUY", "order_configuration": {"market_market_ioc": {"quote_size": "1"}}, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1307,7 +1304,6 @@ def test_preview_market_order_buy(self): "side": "BUY", "order_configuration": {"market_market_ioc": {"quote_size": "1"}}, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1337,7 +1333,6 @@ def test_preview_market_order_sell(self): "side": "SELL", "order_configuration": {"market_market_ioc": {"base_size": "1"}}, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1368,7 +1363,6 @@ def test_preview_limit_order_ioc(self): "sor_limit_ioc": {"base_size": "1", "limit_price": "100"} }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1399,7 +1393,6 @@ def test_preview_limit_order_ioc_buy(self): "sor_limit_ioc": {"base_size": "1", "limit_price": "100"} }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1430,7 +1423,6 @@ def test_preview_limit_order_ioc_sell(self): "sor_limit_ioc": {"base_size": "1", "limit_price": "100"} }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1471,7 +1463,6 @@ def test_preview_limit_order_gtc(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1511,7 +1502,6 @@ def test_preview_limit_order_gtc_buy(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1551,7 +1541,6 @@ def test_preview_limit_order_gtc_sell(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1593,7 +1582,6 @@ def test_preview_limit_order_gtd(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1631,7 +1619,6 @@ def test_preview_limit_order_gtd_buy(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1669,7 +1656,6 @@ def test_preview_limit_order_gtd_sell(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1700,7 +1686,6 @@ def test_preview_limit_order_fok(self): "limit_limit_fok": {"base_size": "1", "limit_price": "100"} }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1731,7 +1716,6 @@ def test_preview_limit_order_fok_buy(self): "limit_limit_fok": {"base_size": "1", "limit_price": "100"} }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1762,7 +1746,6 @@ def test_preview_limit_order_fok_sell(self): "limit_limit_fok": {"base_size": "1", "limit_price": "100"} }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1805,7 +1788,6 @@ def test_preview_stop_limit_order_gtc(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1847,7 +1829,6 @@ def test_preview_stop_limit_order_gtc_buy(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1889,7 +1870,6 @@ def test_preview_stop_limit_order_gtc_sell(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1934,7 +1914,6 @@ def test_preview_stop_limit_order_gtd(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -1978,7 +1957,6 @@ def test_preview_stop_limit_order_gtd_buy(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -2022,7 +2000,6 @@ def test_preview_stop_limit_order_gtd_sell(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -2063,7 +2040,6 @@ def test_preview_trigger_bracket_order_gtc(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -2100,7 +2076,6 @@ def test_preview_trigger_bracket_order_gtc_buy(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -2137,7 +2112,6 @@ def test_preview_trigger_bracket_gtc_sell(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -2180,7 +2154,6 @@ def test_preview_trigger_bracket_order_gtd(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -2222,7 +2195,6 @@ def test_preview_trigger_bracket_order_gtd_buy(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response) @@ -2260,7 +2232,6 @@ def test_preview_trigger_bracket_gtd_sell(self): } }, "is_max": False, - "skip_fcm_risk_check": False, }, ) self.assertEqual(preview, expected_response)