Update - add new oracles

src/driftpy/accounts/bulk_account_loader.py

@@ -1,11 +1,11 @@
 import asyncio
-from typing import Callable, List, Optional
-from dataclasses import dataclass
-import jsonrpcclient
 from base64 import b64decode
+from dataclasses import dataclass
+from typing import Callable, List, Optional
 
-from solana.rpc.commitment import Commitment
+import jsonrpcclient
 from solana.rpc.async_api import AsyncClient
+from solana.rpc.commitment import Commitment
 from solders.pubkey import Pubkey
 
 
@@ -63,7 +63,11 @@ def add_account(
         if existing_account_to_load is not None:
             buffer_and_slot = self.buffer_and_slot_map.get(pubkey_str)
             if buffer_and_slot is not None and buffer_and_slot.buffer is not None:
-                self.handle_callbacks(existing_account_to_load, buffer_and_slot.buffer, buffer_and_slot.slot)
+                self.handle_callbacks(
+                    existing_account_to_load,
+                    buffer_and_slot.buffer,
+                    buffer_and_slot.slot,
+                )
 
         return callback_id
 

src/driftpy/accounts/ws/drift_client.py

@@ -2,24 +2,28 @@
 from typing import Optional, Sequence, Union
 
 from anchorpy import Program
+from solana.rpc.commitment import Commitment
+
 from driftpy.accounts.oracle import get_oracle_decode_fn
-from driftpy.accounts.types import DataAndSlot
-from driftpy.accounts.types import DriftClientAccountSubscriber
-from driftpy.accounts.types import FullOracleWrapper
+from driftpy.accounts.types import (
+    DataAndSlot,
+    DriftClientAccountSubscriber,
+    FullOracleWrapper,
+)
 from driftpy.accounts.ws.account_subscriber import WebsocketAccountSubscriber
 from driftpy.addresses import *
 from driftpy.constants.config import find_all_market_and_oracles
 from driftpy.market_map.market_map import MarketMap
-from driftpy.market_map.market_map_config import MarketMapConfig
-from driftpy.market_map.market_map_config import WebsocketConfig
+from driftpy.market_map.market_map_config import MarketMapConfig, WebsocketConfig
 from driftpy.oracles.oracle_id import get_oracle_id
-from driftpy.types import MarketType
-from driftpy.types import OracleInfo
-from driftpy.types import OraclePriceData
-from driftpy.types import PerpMarketAccount
-from driftpy.types import SpotMarketAccount
-from driftpy.types import StateAccount
-from solana.rpc.commitment import Commitment
+from driftpy.types import (
+    MarketType,
+    OracleInfo,
+    OraclePriceData,
+    PerpMarketAccount,
+    SpotMarketAccount,
+    StateAccount,
+)
 
 
 class WebsocketDriftClientAccountSubscriber(DriftClientAccountSubscriber):
@@ -349,4 +353,3 @@ def get_oracle_price_data_and_slot_for_spot_market(
             asyncio.create_task(self._set_spot_oracle_map())
 
         return self.get_oracle_price_data_and_slot(oracle_id)
-

src/driftpy/admin.py

@@ -1,23 +1,31 @@
 from typing import Optional
+
+from anchorpy import Context
 from solders.pubkey import Pubkey
 from solders.signature import Signature
 from solders.system_program import ID
 from solders.sysvar import RENT
 from spl.token.constants import TOKEN_PROGRAM_ID
-from anchorpy import Context
 
-from driftpy.drift_client import (
-    DriftClient,
-)
-from driftpy.constants.numeric_constants import BASE_PRECISION, PEG_PRECISION, PRICE_PRECISION
-from driftpy.types import AssetTier, ContractTier, OracleGuardRails, OracleSource, PrelaunchOracleParams
+from driftpy.accounts import get_perp_market_account, get_state_account
 from driftpy.addresses import *
-from driftpy.accounts import get_state_account
 from driftpy.constants.numeric_constants import (
+    BASE_PRECISION,
+    PEG_PRECISION,
+    PRICE_PRECISION,
     SPOT_RATE_PRECISION,
     SPOT_WEIGHT_PRECISION,
 )
-from driftpy.accounts import get_perp_market_account
+from driftpy.drift_client import (
+    DriftClient,
+)
+from driftpy.types import (
+    AssetTier,
+    ContractTier,
+    OracleGuardRails,
+    OracleSource,
+    PrelaunchOracleParams,
+)
 
 
 class Admin(DriftClient):

src/driftpy/setup/helpers.py

@@ -1,32 +1,31 @@
-from solana.rpc.async_api import AsyncClient
+import math
 from base64 import b64decode
 from dataclasses import dataclass
 from typing import Optional
+
+from anchorpy import Context, Program, Provider
 from construct import Int32sl, Int64ul
+from solana.rpc.async_api import AsyncClient
+from solana.transaction import Signature, Transaction
 from solders.keypair import Keypair
 from solders.pubkey import Pubkey
-from solders.system_program import create_account, CreateAccountParams
-from anchorpy import Program, Context, Provider
-from solana.transaction import Transaction
-from spl.token.constants import TOKEN_PROGRAM_ID
-from spl.token._layouts import MINT_LAYOUT
+from solders.system_program import CreateAccountParams, create_account
+from spl.token._layouts import ACCOUNT_LAYOUT, MINT_LAYOUT
 from spl.token.async_client import AsyncToken
-from spl.token.instructions import initialize_mint, InitializeMintParams
-import math
-
-from spl.token._layouts import ACCOUNT_LAYOUT
+from spl.token.constants import TOKEN_PROGRAM_ID
 from spl.token.instructions import (
-    initialize_account,
     InitializeAccountParams,
-    mint_to,
+    InitializeMintParams,
     MintToParams,
+    initialize_account,
+    initialize_mint,
+    mint_to,
 )
-from solana.transaction import Signature
 
-from driftpy.types import *
-from driftpy.math.amm import calculate_amm_reserves_after_swap, calculate_price
 from driftpy.admin import Admin
 from driftpy.constants.numeric_constants import *
+from driftpy.math.amm import calculate_amm_reserves_after_swap, calculate_price
+from driftpy.types import *
 
 NATIVE_MINT = Pubkey.from_string("So11111111111111111111111111111111111111112")
 
@@ -334,7 +333,10 @@ async def mock_oracle(
 
 
 async def initialize_sol_spot_market(
-    admin: Admin, sol_oracle: Pubkey, sol_mint: Pubkey = NATIVE_MINT, oracle_source: OracleSource = OracleSource.Pyth()
+    admin: Admin,
+    sol_oracle: Pubkey,
+    sol_mint: Pubkey = NATIVE_MINT,
+    oracle_source: OracleSource = OracleSource.Pyth(),
 ):
     optimal_utilization = SPOT_RATE_PRECISION // 2
     optimal_rate = SPOT_RATE_PRECISION * 20