Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion protocol-v2
Submodule protocol-v2 updated 81 files
+2 −0 .github/workflows/main.yml
+30 −0 CHANGELOG.md
+1 −1 Cargo.lock
+1 −1 programs/drift/Cargo.toml
+21 −3 programs/drift/src/controller/amm.rs
+253 −3 programs/drift/src/controller/insurance.rs
+26 −1 programs/drift/src/controller/liquidation.rs
+101 −16 programs/drift/src/controller/orders.rs
+17 −2 programs/drift/src/controller/orders/tests.rs
+1 −0 programs/drift/src/controller/pnl.rs
+2 −2 programs/drift/src/controller/position/tests.rs
+2 −0 programs/drift/src/controller/repeg.rs
+4 −2 programs/drift/src/controller/repeg/tests.rs
+1 −0 programs/drift/src/controller/spot_balance.rs
+4 −0 programs/drift/src/error.rs
+5 −0 programs/drift/src/ids.rs
+145 −8 programs/drift/src/instructions/admin.rs
+524 −1 programs/drift/src/instructions/if_staker.rs
+15 −15 programs/drift/src/instructions/keeper.rs
+34 −2 programs/drift/src/instructions/user.rs
+63 −3 programs/drift/src/lib.rs
+3 −3 programs/drift/src/math/amm_spread.rs
+23 −23 programs/drift/src/math/amm_spread/tests.rs
+58 −0 programs/drift/src/math/cp_curve/tests.rs
+165 −0 programs/drift/src/math/fees/tests.rs
+16 −1 programs/drift/src/math/insurance.rs
+6 −0 programs/drift/src/math/margin.rs
+7 −1 programs/drift/src/math/oracle.rs
+28 −0 programs/drift/src/math/orders.rs
+26 −0 programs/drift/src/math/orders/tests.rs
+1 −0 programs/drift/src/math/repeg.rs
+61 −1 programs/drift/src/state/events.rs
+108 −0 programs/drift/src/state/if_rebalance_config.rs
+1 −0 programs/drift/src/state/mod.rs
+3 −0 programs/drift/src/state/oracle_map.rs
+58 −23 programs/drift/src/state/order_params.rs
+10 −8 programs/drift/src/state/order_params/tests.rs
+23 −7 programs/drift/src/state/perp_market.rs
+55 −0 programs/drift/src/state/perp_market/tests.rs
+3 −0 programs/drift/src/state/perp_market_map.rs
+6 −0 programs/drift/src/state/spot_market.rs
+20 −41 programs/drift/src/state/user.rs
+11 −9 programs/drift/src/validation/perp_market.rs
+6 −7 sdk/README.md
+1 −1 sdk/VERSION
+2 −1 sdk/package.json
+1 −2 sdk/src/accounts/bulkAccountLoader.ts
+213 −0 sdk/src/accounts/customizedCadenceBulkAccountLoader.ts
+15 −0 sdk/src/addresses/pda.ts
+179 −6 sdk/src/adminClient.ts
+3 −1 sdk/src/constants/numericConstants.ts
+50 −0 sdk/src/constants/spotMarkets.ts
+114 −0 sdk/src/decode/customCoder.ts
+5 −1 sdk/src/dlob/DLOBSubscriber.ts
+96 −179 sdk/src/dlob/orderBookLevels.ts
+105 −7 sdk/src/driftClient.ts
+2 −0 sdk/src/driftClientConfig.ts
+9 −1 sdk/src/events/types.ts
+726 −42 sdk/src/idl/drift.json
+2 −0 sdk/src/index.ts
+39 −25 sdk/src/indicative-quotes/indicativeQuotesSender.ts
+26 −6 sdk/src/math/amm.ts
+96 −1 sdk/src/math/auction.ts
+11 −4 sdk/src/slot/SlotSubscriber.ts
+69 −0 sdk/src/types.ts
+69 −75 sdk/src/user.ts
+202 −0 sdk/tests/accounts/customizedCadenceBulkAccountLoader.test.ts
+242 −122 sdk/tests/ci/verifyConstants.ts
+3 −0 sdk/tests/dlob/helpers.ts
+1 −0 test-scripts/run-anchor-tests.sh
+1 −1 test-scripts/single-anchor-test.sh
+19 −0 tests/driftClient.ts
+496 −0 tests/ifRebalance.ts
+5 −0 tests/liquidatePerp.ts
+11 −1 tests/oracleFillPriceGuardrails.ts
+152 −0 tests/overwritePerpAccounts.ts
+6 −1 tests/placeAndMakePerp.ts
+248 −4 tests/placeAndMakeSignedMsg.ts
+3 −3 tests/placeAndMakeSignedMsgBankrun.ts
+1 −1 tests/switchboardTxCus.ts
+180 −1 tests/testHelpers.ts
36 changes: 36 additions & 0 deletions src/driftpy/constants/spot_markets.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class SpotMarketConfig:
),
]


mainnet_spot_market_configs: list[SpotMarketConfig] = [
SpotMarketConfig(
symbol="USDC",
Expand Down Expand Up @@ -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"),
),
]
6 changes: 1 addition & 5 deletions src/driftpy/drift_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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]:
Expand Down
Loading
Loading