merge master

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.42
+current_version = 0.6.43
 commit = True
 tag = True
 tag_name = {new_version}

.github/workflows/tests.yml

@@ -6,8 +6,8 @@ on:
     branches: [master]
 
 env:
-  solana_verion: 1.8.5
-  anchor_version: 0.19.0
+  solana_verion: 1.14.7
+  anchor_version: 0.26.0
 
 jobs:
   tests:

docs/accounts.md

@@ -18,7 +18,7 @@ print(
 
 # get usdc spot market info
 usdc_spot_market_index = 0
-usdc_market = await get_spot_market_account(clearing_house.program, usdc_spot_market_index)
+usdc_market = await get_spot_market_account(drift_client.program, usdc_spot_market_index)
 print(
     usdc.market_index,
     usdc.deposit_balance,

docs/index.md

@@ -47,8 +47,8 @@ wallet = Wallet(kp)
 connection = AsyncClient(config.default_http)
 provider = Provider(connection, wallet)
 
-drfit_client = DriftClient.from_config(config, provider)
-drift_user = User(clearing_house)
+drift_client = DriftClient.from_config(config, provider)
+drift_user = User(drift_client)
 
 # open a 10 SOL long position
 sig = await drift_client.open_position(
@@ -68,12 +68,12 @@ leverage = await drift_user.get_leverage()
 print('current leverage:', leverage / 10_000)
 
 # you can also inspect other accounts information using the (authority=) flag
-bigz_acc = ser(clearing_house, authority=PublicKey('bigZ'))
+bigz_acc = User(drift_client, authority=PublicKey('bigZ'))
 leverage = await bigz_acc.get_leverage()
 print('bigZs leverage:', leverage / 10_000)
 
 # clearing house user calls can be expensive on the rpc so we can cache them
-drift_user = User(clearing_house, use_cache=True)
+drift_user = User(drift_client, use_cache=True)
 await drift_user.set_cache()
 
 # works without any rpc calls (uses the cached data)

examples/if_stake.py

@@ -13,7 +13,7 @@
 from driftpy.constants.config import configs
 from driftpy.drift_client import DriftClient
 from driftpy.accounts import *
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 
 async def view_logs(
     sig: str,

examples/limit_order_grid.py

@@ -16,7 +16,7 @@
 from driftpy.accounts.oracle import get_oracle_price_data_and_slot
 from driftpy.math.spot_market import get_signed_token_amount, get_token_amount
 from driftpy.drift_client import DriftClient
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 from driftpy.constants.numeric_constants import BASE_PRECISION, PRICE_PRECISION
 from borsh_construct.enum import _rust_enum
 import time

examples/start_lp.py

@@ -12,7 +12,7 @@
 
 # todo: airdrop udsc + init account for any kp
 # rn do it through UI 
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 from driftpy.constants.numeric_constants import AMM_RESERVE_PRECISION
 from solana.rpc import commitment
 import pprint

examples/view.py

@@ -11,7 +11,7 @@
 from driftpy.math.positions import is_available
 from driftpy.constants.numeric_constants import *
 
-from driftpy.drift_user import User
+from driftpy.drift_user import DriftUser
 
 async def main(
     authority, 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "driftpy"
-version = "0.6.42"
+version = "0.6.43"
 description = "A Python client for the Drift DEX"
 authors = ["x19 <https://twitter.com/[email protected]>", "bigz <https://twitter.com/bigz_pubkey>"]
 license = "MIT"

src/driftpy/__init__.py

@@ -1 +1 @@
-__version__ = "0.6.42"
+__version__ = "0.6.43"

src/driftpy/drift_client.py

@@ -92,8 +92,7 @@ def from_config(config: Config, provider: Provider, authority: Keypair = None):
             provider,
         )
 
-        drift_client = DriftClient
-        (program, authority)
+        drift_client = DriftClient(program, authority)
         drift_client.config = config
         drift_client.idl = idl
 
@@ -662,7 +661,7 @@ async def place_spot_order(
         return await self.send_ixs(
             [
                 self.get_increase_compute_ix(),
-                await self.get_place_spot_order_ix(order_params, maker_info, user_id),
+                await self.get_place_spot_order_ix(order_params, user_id),
             ]
         )
 
@@ -740,62 +739,64 @@ async def place_perp_order(
         user_id: int = 0,
     ):
         return await self.send_ixs(
-            [
+            [   
                 self.get_increase_compute_ix(),
-                await self.get_place_perp_order_ix(order_params, maker_info, user_id),
+                (await self.get_place_perp_order_ix(order_params, user_id))[-1]
             ]
+
         )
 
     async def get_place_perp_order_ix(
         self,
         order_params: OrderParams,
         user_id: int = 0,
-    ):
+    ) -> TransactionInstruction:
         user_account_public_key = self.get_user_account_public_key(user_id)
         remaining_accounts = await self.get_remaining_accounts(
             writable_market_index=order_params.market_index, user_id=user_id
         )
 
         ix = self.program.instruction["place_perp_order"](
-            order_params,
-            ctx=Context(
-                accounts={
-                    "state": self.get_state_public_key(),
-                    "user": user_account_public_key,
-                    "authority": self.signer.public_key,
-                },
-                remaining_accounts=remaining_accounts,
-            ),
-        )
+                order_params,
+                ctx=Context(
+                    accounts={
+                        "state": self.get_state_public_key(),
+                        "user": user_account_public_key,
+                        "authority": self.signer.public_key,
+                    },
+                    remaining_accounts=remaining_accounts,
+                ),
+            )
 
         return ix
 
     async def get_place_perp_orders_ix(
         self,
         order_params: List[OrderParams],
         user_id: int = 0,
+        cancel_all=True
     ):
         user_account_public_key = self.get_user_account_public_key(user_id)
         writeable_market_indexes = list(set([x.market_index for x in order_params]))
         remaining_accounts = await self.get_remaining_accounts(
             writable_market_index=writeable_market_indexes, user_id=user_id
         )
-
-        ixs = [
-            self.program.instruction["cancel_orders"](
-                None,
-                None,
-                None,
-                ctx=Context(
-                    accounts={
-                        "state": self.get_state_public_key(),
-                        "user": self.get_user_account_public_key(user_id),
-                        "authority": self.signer.public_key,
-                    },
-                    remaining_accounts=remaining_accounts,
-                ),
-            )
-        ]
+        ixs = []
+        if cancel_all:
+            ixs.append(
+                self.program.instruction["cancel_orders"](
+                    None,
+                    None,
+                    None,
+                    ctx=Context(
+                        accounts={
+                            "state": self.get_state_public_key(),
+                            "user": self.get_user_account_public_key(user_id),
+                            "authority": self.signer.public_key,
+                        },
+                        remaining_accounts=remaining_accounts,
+                    ),
+                ))
         for order_param in order_params:
             ix = self.program.instruction["place_perp_order"](
                 order_param,
@@ -977,7 +978,7 @@ def default_order_params(
             price=0,
             market_index=market_index,
             reduce_only=False,
-            post_only=PostOnlyParam.NONE(),
+            post_only=PostOnlyParams.NONE(),
             immediate_or_cancel=False,
             trigger_price=0,
             trigger_condition=OrderTriggerCondition.ABOVE(),

src/driftpy/drift_user.py

@@ -8,8 +8,8 @@
 from driftpy.types import OraclePriceData
 
 
-class User:
-    """This class is the main way to retrieve and inspect user account data."""
+class DriftUser:
+    """This class is the main way to retrieve and inspect drift user account data."""
 
     def __init__(
         self,
@@ -61,6 +61,16 @@ async def get_perp_market(self, market_index: int) -> PerpMarket:
     async def get_user(self) -> User:
         return (await self.account_subscriber.get_user_account_and_slot()).data
 
+
+    async def get_open_orders(self, 
+                            #   market_type: MarketType, 
+                            #   market_index: int,
+                            #   position_direction: PositionDirection
+                              ):
+        user: User = await self.get_user()
+        return user.orders
+
+
     async def get_spot_market_liability(
         self,
         market_index=None,

src/driftpy/types.py

@@ -175,7 +175,7 @@ class OracleSource:
     PYTH_STABLE_COIN = constructor()
 
 @_rust_enum
-class PostOnlyParam:
+class PostOnlyParams:
     NONE = constructor()
     MUST_POST_ONLY = constructor()
     TRY_POST_ONLY = constructor()
@@ -298,7 +298,7 @@ class OrderParams:
     price: int
     market_index: int
     reduce_only: bool
-    post_only: PostOnlyParam
+    post_only: PostOnlyParams
     immediate_or_cancel: bool
     max_ts: Optional[int]
     trigger_price: Optional[int]
@@ -314,7 +314,7 @@ class ModifyOrderParams:
     base_asset_amount: Optional[int]
     price: Optional[int]
     reduce_only: Optional[bool]
-    post_only: Optional[PostOnlyParam]
+    post_only: Optional[PostOnlyParams]
     immediate_or_cancel: Optional[bool]
     max_ts: Optional[int]
     trigger_price: Optional[int]

tests/test.py

@@ -7,12 +7,14 @@
 from driftpy.constants.numeric_constants import (
     PRICE_PRECISION,
     AMM_RESERVE_PRECISION,
+    BASE_PRECISION,
     QUOTE_PRECISION,
     SPOT_BALANCE_PRECISION,
     SPOT_WEIGHT_PRECISION,
 )
 from math import sqrt
 
+from driftpy.drift_user import DriftUser
 from driftpy.drift_client import DriftClient
 from driftpy.setup.helpers import (
     _create_mint,
@@ -28,6 +30,8 @@
     PositionDirection,
     OracleSource,
     PerpMarket,
+    OrderType,
+    OrderParams
     # SwapDirection,
 )
 from driftpy.accounts import (
@@ -200,6 +204,40 @@ async def test_usdc_deposit(
         == USDC_AMOUNT / QUOTE_PRECISION * SPOT_BALANCE_PRECISION
     )
 
+@mark.asyncio
+async def test_open_orders(
+    drift_client: Admin,
+):
+
+    drift_user = DriftUser(drift_client)
+    user_account = await get_user_account(
+        drift_client.program, drift_client.authority
+    )
+
+    assert(len(user_account.orders)==32)
+    assert(user_account.orders[0].market_index == 0)
+
+    open_orders = await drift_user.get_open_orders()
+    assert(len(open_orders)==32)
+    assert(open_orders==user_account.orders)
+
+    order_params: OrderParams = drift_client.default_order_params(
+        OrderType.MARKET(), 0, int(1 * BASE_PRECISION), PositionDirection.LONG()
+        )
+    order_params.user_order_id = 169
+    ixs = await drift_client.get_place_perp_orders_ix([order_params])
+    await drift_client.send_ixs(ixs)
+    open_orders_after = await drift_user.get_open_orders()
+    assert(open_orders_after[0].base_asset_amount == BASE_PRECISION)
+    assert(open_orders_after[0].order_id == 1)
+    assert(open_orders_after[0].user_order_id == 169)
+
+    await drift_client.cancel_order(1, 0)
+    open_orders_after2 = await drift_user.get_open_orders()
+    assert(open_orders_after2[0].base_asset_amount == 0)
+
+
+
 
 @mark.asyncio
 async def test_update_curve(