start adding subaccount ids to drift client

src/driftpy/account_subscription_config.py

@@ -0,0 +1,60 @@
+from typing import Literal, Optional
+
+from solders.pubkey import Pubkey
+
+from driftpy.accounts.bulk_account_loader import BulkAccountLoader
+from driftpy.accounts.cache import (
+    CachedDriftClientAccountSubscriber,
+    CachedUserAccountSubscriber,
+)
+from driftpy.accounts.polling import (
+    PollingDriftClientAccountSubscriber,
+    PollingUserAccountSubscriber,
+)
+from anchorpy import Program
+
+from driftpy.accounts.ws import (
+    WebsocketDriftClientAccountSubscriber,
+    WebsocketUserAccountSubscriber,
+)
+
+
+class AccountSubscriptionConfig:
+    @staticmethod
+    def default():
+        return AccountSubscriptionConfig("websocket")
+
+    def __init__(
+        self,
+        type: Literal["polling", "websocket", "cached"],
+        bulk_account_loader: Optional[BulkAccountLoader] = None,
+    ):
+        self.type = type
+
+        if self.type == "polling":
+            if bulk_account_loader is None:
+                raise ValueError("polling subscription requires bulk account loader")
+
+            self.bulk_account_loader = bulk_account_loader
+
+    def get_drift_client_subscriber(self, program: Program):
+        match self.type:
+            case "polling":
+                return PollingDriftClientAccountSubscriber(
+                    program, self.bulk_account_loader
+                )
+            case "websocket":
+                return WebsocketDriftClientAccountSubscriber(program)
+            case "cached":
+                return CachedDriftClientAccountSubscriber(program)
+
+    def get_user_client_subscriber(self, program: Program, user_pubkey: Pubkey):
+        match self.type:
+            case "polling":
+                return PollingUserAccountSubscriber(
+                    user_pubkey, program, self.bulk_account_loader
+                )
+            case "websocket":
+                return WebsocketUserAccountSubscriber(user_pubkey, program)
+            case "cached":
+                return CachedUserAccountSubscriber(user_pubkey, program)

src/driftpy/addresses.py

@@ -83,10 +83,10 @@ def get_user_stats_account_public_key(
 def get_user_account_public_key(
     program_id: Pubkey,
     authority: Pubkey,
-    user_id=0,
+    sub_account_id=0,
 ) -> Pubkey:
     return Pubkey.find_program_address(
-        [b"user", bytes(authority), int_to_le_bytes(user_id)], program_id
+        [b"user", bytes(authority), int_to_le_bytes(sub_account_id)], program_id
     )[0]