Merge pull request #243 from drift-labs/sina/add-rebalance

Add rebalance

Author: SinaKhalili

protocol-v2

@@ -75,6 +75,7 @@ class SpotMarketConfig:
     ),
 ]
 
+
 mainnet_spot_market_configs: list[SpotMarketConfig] = [
     SpotMarketConfig(
         symbol="USDC",
@@ -419,4 +420,39 @@ class SpotMarketConfig:
         oracle_source=OracleSource.PythLazerStableCoin(),  # type: ignore
         mint=Pubkey.from_string("Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB"),
     ),
+    SpotMarketConfig(
+        symbol="SOL-2",
+        market_index=49,
+        oracle=Pubkey.from_string("3PiwrLLyiuWaxS7zJL5znGR9iYD3KWubZThdQzsCdg2e"),
+        oracle_source=OracleSource.SwitchboardOnDemand(),  # type: ignore
+        mint=Pubkey.from_string("So11111111111111111111111111111111111111112"),
+    ),
+    SpotMarketConfig(
+        symbol="JitoSOL-2",
+        market_index=50,
+        oracle=Pubkey.from_string("Fqv8vT5fdjvBbHd5k4B4ZvnXLH6bbdKP8cMv93ybCP8W"),
+        oracle_source=OracleSource.SwitchboardOnDemand(),  # type: ignore
+        mint=Pubkey.from_string("J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn"),
+    ),
+    SpotMarketConfig(
+        symbol="JTO-2",
+        market_index=51,
+        oracle=Pubkey.from_string("DPvVSQYhZXQ2ygfT2Qjdg6iyeQVAyiz8okj88YRjy6NN"),
+        oracle_source=OracleSource.SwitchboardOnDemand(),  # type: ignore
+        mint=Pubkey.from_string("jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL"),
+    ),
+    SpotMarketConfig(
+        symbol="dfdvSOL",
+        market_index=52,
+        oracle=Pubkey.from_string("EUQQD2fNN7h7su5TbWpUnf22zeGtF3RjEX2hgX2YPfLd"),
+        oracle_source=OracleSource.SwitchboardOnDemand(),  # type: ignore
+        mint=Pubkey.from_string("sctmB7GPi5L2Q5G9tUSzXvhZ4YiDMEGcRov9KfArQpx"),
+    ),
+    SpotMarketConfig(
+        symbol="sACRED-4",
+        market_index=53,
+        oracle=Pubkey.from_string("GheMfcCB49SuVCWrFReQDD2tLkcPDMG3qZEZWU44mHu"),
+        oracle_source=OracleSource.SwitchboardOnDemand(),  # type: ignore
+        mint=Pubkey.from_string("59CwZq5b6drmDizgGfxECG7f16hxDpG1nXrxPoQx4y8g"),
+    ),
 ]

src/driftpy/constants/spot_markets.py

@@ -1697,7 +1697,7 @@ def get_fuel_bonus(
                     GOV_SPOT_MARKET_INDEX
                 )
                 fuel_bonus_numerator_user_stats = (
-                    now - user_stats.last_fuel_bonus_update_ts
+                    now - user_stats.last_fuel_if_bonus_update_ts
                 )
                 total_fuel["insurance_fuel"] += calculate_insurance_fuel_bonus(
                     spot_market_account,
@@ -1707,10 +1707,6 @@ def get_fuel_bonus(
 
         return total_fuel
 
-    def get_active_spot_positions(self) -> list[SpotPosition]:
-        user = self.get_user_account()
-        return self.get_active_spot_positions_for_user_account(user)
-
     def get_active_spot_positions_for_user_account(
         self, user: UserAccount
     ) -> list[SpotPosition]: