bigz/fix-test.py (#34)

* bigz/fix-test.py * fix test * rename ch to drift client in tests * update protocol v2 --------- Co-authored-by: Chris Heaney <[email protected]>
drift-labs · Nov 15, 2023 · f908649 · f908649
1 parent 3ce200f
commit f908649
Show file tree

Hide file tree

Showing 5 changed files with 9,905 additions and 9,900 deletions.
diff --git a/protocol-v2 b/protocol-v2
diff --git a/src/driftpy/admin.py b/src/driftpy/admin.py
@@ -88,6 +88,7 @@ async def initialize(
 
     async def initialize_perp_market(
         self,
+        market_index: int,
         price_oracle: PublicKey,
         base_asset_reserve: int,
         quote_asset_reserve: int,
@@ -108,6 +109,7 @@ async def initialize_perp_market(
         )
 
         return await self.program.rpc["initialize_perp_market"](
+            market_index,
             base_asset_reserve,
             quote_asset_reserve,
             periodicity,

diff --git a/src/driftpy/drift_client.py b/src/driftpy/drift_client.py
@@ -26,6 +26,7 @@
 
 DEFAULT_USER_NAME = "Main Account"
 
+DEFAULT_PUBKEY = PublicKey("11111111111111111111111111111111")
 
 class DriftClient:
     """This class is the main way to interact with Drift Protocol including
@@ -232,7 +233,7 @@ async def track_market(market_index, is_writable):
                 spot_market = await get_spot_market_account(
                     self.program, perp_market.quote_spot_market_index
                 )
-                if spot_market.oracle is not None:
+                if spot_market.oracle != DEFAULT_PUBKEY:
                     oracle_map[str(spot_market.oracle)] = AccountMeta(
                         pubkey=spot_market.oracle, is_signer=False, is_writable=False
                     )
@@ -248,7 +249,7 @@ async def track_spot_market(spot_market_index, is_writable):
                 is_writable=is_writable,
             )
 
-            if include_oracles:
+            if include_oracles and spot_market.oracle != DEFAULT_PUBKEY:
                 oracle_map[str(spot_market.pubkey)] = AccountMeta(
                     pubkey=spot_market.oracle, is_signer=False, is_writable=False
                 )