Skip to content
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

fix input field disabled #1049

Merged
merged 2 commits into from
Feb 3, 2025
Merged

fix input field disabled #1049

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3283887
fix input field disabled
borcherd Feb 3, 2025
faa84d0
fix: fixed but broke maxAmount
borcherd Feb 3, 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
106 changes: 61 additions & 45 deletions packages/mrgn-utils/src/actions/flashloans/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,57 +190,73 @@ export async function calculateMaxRepayableCollateral(
slippageBps: number,
slippageMode: "DYNAMIC" | "FIXED"
) {
const amount = repayBank.isActive && repayBank.position.isLending ? repayBank.position.amount : 0;
let maxRepayAmount = bank.isActive ? bank?.position.amount : 0;
if (!bank.isActive || !repayBank.isActive) return 0;

const maxUsdValue = 700_000;

if (maxRepayAmount * bank.info.oraclePrice.priceRealtime.price.toNumber() > maxUsdValue) {
maxRepayAmount = maxUsdValue / bank.info.oraclePrice.priceRealtime.price.toNumber();
// Fetch prices safely
const bankPrice = bank.info.oraclePrice?.priceRealtime?.price?.toNumber();
const repayPrice = repayBank.info.oraclePrice?.priceRealtime?.price?.toNumber();

// Initial max repayable amount in token Y
let maxRepayAmount = bank.position?.amount;

// Cap max repayable amount in USD
if (maxRepayAmount * bankPrice > maxUsdValue) {
maxRepayAmount = maxUsdValue / bankPrice;
}

if (amount !== 0) {
const quoteParams = {
amount: uiToNative(amount, repayBank.info.state.mintDecimals).toNumber(),
inputMint: repayBank.info.state.mint.toBase58(),
outputMint: bank.info.state.mint.toBase58(),
slippageBps: slippageMode === "FIXED" ? slippageBps : undefined,
dynamicSlippage: slippageMode === "DYNAMIC" ? true : false,
maxAccounts: 40,
swapMode: "ExactIn",
} as QuoteGetRequest;

try {
const swapQuoteInput = await getSwapQuoteWithRetry(quoteParams);

if (!swapQuoteInput) throw new Error();

const inputInOtherAmount = nativeToUi(swapQuoteInput.otherAmountThreshold, bank.info.state.mintDecimals);

if (inputInOtherAmount > maxRepayAmount) {
const quoteParams = {
amount: uiToNative(maxRepayAmount, bank.info.state.mintDecimals).toNumber(),
inputMint: repayBank.info.state.mint.toBase58(), // USDC
outputMint: bank.info.state.mint.toBase58(), // JITO
slippageBps: slippageMode === "FIXED" ? slippageBps : undefined,
dynamicSlippage: slippageMode === "DYNAMIC" ? true : false,
swapMode: "ExactOut",
} as QuoteGetRequest;

try {
const swapQuoteOutput = await getSwapQuoteWithRetry(quoteParams, 2);
if (!swapQuoteOutput) throw new Error();
return nativeToUi(swapQuoteOutput.otherAmountThreshold, repayBank.info.state.mintDecimals) * 1.01;
} catch (error) {
const bankAmountUsd = maxRepayAmount * bank.info.oraclePrice.priceRealtime.price.toNumber() * 0.9998;
const repayAmount = bankAmountUsd / repayBank.info.oraclePrice.priceRealtime.price.toNumber();
return repayAmount;
}
} else {
return amount;
// If there’s no position to repay, return 0
const repayAmountAvailable = repayBank.position?.isLending ? repayBank.position.amount : 0;
if (repayAmountAvailable === 0) return 0;

// First swap quote: ExactIn mode
const initialQuoteParams = {
amount: uiToNative(maxRepayAmount, repayBank.info.state.mintDecimals).toNumber(),
inputMint: repayBank.info.state.mint.toBase58(),
outputMint: bank.info.state.mint.toBase58(),
slippageBps: slippageMode === "FIXED" ? slippageBps : undefined,
dynamicSlippage: slippageMode === "DYNAMIC",
maxAccounts: 40,
swapMode: "ExactIn",
} as QuoteGetRequest;

try {
const swapQuoteInput = await getSwapQuoteWithRetry(initialQuoteParams);
if (!swapQuoteInput) throw new Error("Swap quote failed");

// Get the expected output amount
const inputInOtherAmount = nativeToUi(swapQuoteInput.otherAmountThreshold, bank.info.state.mintDecimals);

// If the swap quote suggests a different amount, get an ExactOut quote
if (inputInOtherAmount > maxRepayAmount) {
const secondQuoteParams = {
amount: uiToNative(maxRepayAmount, bank.info.state.mintDecimals).toNumber(),
inputMint: repayBank.info.state.mint.toBase58(),
outputMint: bank.info.state.mint.toBase58(),
slippageBps: slippageMode === "FIXED" ? slippageBps : undefined,
dynamicSlippage: slippageMode === "DYNAMIC",
swapMode: "ExactOut",
} as QuoteGetRequest;

try {
const swapQuoteOutput = await getSwapQuoteWithRetry(secondQuoteParams, 2);
if (!swapQuoteOutput) throw new Error("Second swap quote failed");

return nativeToUi(swapQuoteOutput.otherAmountThreshold, repayBank.info.state.mintDecimals) * 1.01;
} catch (error) {
console.error("Error in second swap attempt:", error);

// Fallback calculation using USD value
const bankAmountUsd = maxRepayAmount * bankPrice * 0.9998;
return bankAmountUsd / repayPrice;
}
} catch {
return 0;
} else {
return repayAmountAvailable;
}
} catch (error) {
console.error("Error in first swap attempt:", error);
return 0;
}
}

Expand Down