Skip to content

feat: add margin ratio ix to open orders + swift prop #1864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lowkeynicc merged 14 commits into from
Sep 29, 2025
Merged

feat: add margin ratio ix to open orders + swift prop #1864

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
25c1d2b
feat: add margin ratio ix to open orders + swift prop
LukasDeco Sep 9, 2025
eee9676
fix: bug with max lev available calculation
LukasDeco Sep 10, 2025
3999959
fix: bug with swift msg encoding + margin ratio
LukasDeco Sep 11, 2025
ef5ed00
feat: re-add types for swift non-optional
LukasDeco Sep 11, 2025
54af3ae
rm: unneeded undefined check on swift maxMarginRation
LukasDeco Sep 11, 2025
bfbe20b
Merge branch 'master' into lukas/per-market-lev-swift-plus-more
lowkeynicc Sep 18, 2025
27588b2
allow enter HLM on position margin ratio update
lowkeynicc Sep 19, 2025
ce41149
merge master
lowkeynicc Sep 19, 2025
9b4228e
Merge branch 'master' into lukas/per-market-lev-swift-plus-more
lowkeynicc Sep 22, 2025
68ee193
fix margin ratio calc
lowkeynicc Sep 23, 2025
fd9c483
Merge branch 'master' into lukas/per-market-lev-swift-plus-more
lowkeynicc Sep 24, 2025
535ba24
updates
lowkeynicc Sep 25, 2025
34fac57
Merge branch 'master' into lukas/per-market-lev-swift-plus-more
lowkeynicc Sep 29, 2025
488e491
rm logs
lowkeynicc Sep 29, 2025
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
18 changes: 12 additions & 6 deletions sdk/src/driftClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,14 +1570,21 @@ export class DriftClient {
perpMarketIndex: number,
marginRatio: number,
subAccountId = 0,
txParams?: TxParams
txParams?: TxParams,
enterHighLeverageMode?: boolean
): Promise<TransactionSignature> {
const ix = await this.getUpdateUserPerpPositionCustomMarginRatioIx(
const ixs = [];
if (enterHighLeverageMode) {
Copy link
Collaborator Author

@LukasDeco LukasDeco Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lowkeynicc I think just wanna call out that we will need to update the slider in the modal to always have the HLM max as the absolute max leverage available.

const enableIx = await this.getEnableHighLeverageModeIx(subAccountId);
ixs.push(enableIx);
}
const updateIx = await this.getUpdateUserPerpPositionCustomMarginRatioIx(
perpMarketIndex,
marginRatio,
subAccountId
);
const tx = await this.buildTransaction(ix, txParams ?? this.txParams);
ixs.push(updateIx);
const tx = await this.buildTransaction(ixs, txParams ?? this.txParams);
const { txSig } = await this.sendTransaction(tx, [], this.opts);
return txSig;
}
Expand Down Expand Up @@ -4958,9 +4965,8 @@ export class DriftClient {
subAccountId?: number
): Promise<TransactionSignature> {
const { txSig, slot } = await this.sendTransaction(
(
await this.preparePlaceSpotOrderTx(orderParams, txParams, subAccountId)
).placeSpotOrderTx,
(await this.preparePlaceSpotOrderTx(orderParams, txParams, subAccountId))
.placeSpotOrderTx,
[],
this.opts,
false
Expand Down
6 changes: 4 additions & 2 deletions sdk/src/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,6 @@ export class User {

if (marketIndex === undefined || marketIndex === QUOTE_SPOT_MARKET_INDEX) {
if (netQuoteValue.gt(ZERO)) {

totalAssetValue = totalAssetValue.add(netQuoteValue);
} else {
totalLiabilityValue = totalLiabilityValue.add(netQuoteValue.abs());
Expand Down Expand Up @@ -2465,7 +2464,10 @@ export class User {
const marginRequirement = this.getInitialMarginRequirement(
enterHighLeverageMode
);
const marginRatio = Math.max(currentPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
const marginRatio = Math.max(
currentPosition.maxMarginRatio,
this.getUserAccount().maxMarginRatio
);
const marginFreedByClosing = perpLiabilityValue
.mul(new BN(marginRatio))
.div(MARGIN_PRECISION);
Expand Down