-
-
-
- You need to hold {activeGroup?.pool.quoteTokens[0].meta.tokenSymbol} to open a short position.{" "}
-
-
+ {connected &&
+ tradeState === "short" &&
+ activeGroup?.pool.quoteTokens[0].userInfo.tokenAccount.balance === 0 && (
+
+
+
+
+ You need to hold {activeGroup?.pool.quoteTokens[0].meta.tokenSymbol} to open a short position.{" "}
+
+
+
-
- )}
+ )}
{isActiveWithCollat ? (
<>
diff --git a/apps/marginfi-v2-trading/src/components/common/TradingBox/components/TradingBoxSettings/TradingBoxSettings.tsx b/apps/marginfi-v2-trading/src/components/common/TradingBox/components/TradingBoxSettings/TradingBoxSettings.tsx
index 6f31d1b87a..995286e5ee 100644
--- a/apps/marginfi-v2-trading/src/components/common/TradingBox/components/TradingBoxSettings/TradingBoxSettings.tsx
+++ b/apps/marginfi-v2-trading/src/components/common/TradingBox/components/TradingBoxSettings/TradingBoxSettings.tsx
@@ -3,7 +3,7 @@ import React from "react";
import { IconArrowLeft } from "@tabler/icons-react";
import { ToggleGroup, ToggleGroupItem } from "~/components/ui/toggle-group";
-import { Slippage, PriorityFees } from "./components";
+import { Slippage } from "./components";
type TradingBoxSettingsProps = {
toggleSettings: (mode: boolean) => void;
@@ -30,7 +30,7 @@ export const TradingBoxSettings = ({ toggleSettings, slippageBps, setSlippageBps
-
+ {/*
Slippage
@@ -40,12 +40,11 @@ export const TradingBoxSettings = ({ toggleSettings, slippageBps, setSlippageBps
Priority Fee
-
+
*/}
{settingsMode === SettingsState.Slippage && (
)}
- {settingsMode === SettingsState.PriorityFee &&
}
);
diff --git a/apps/marginfi-v2-trading/src/components/common/TradingBox/components/TradingBoxSettings/components/PriorityFees.tsx b/apps/marginfi-v2-trading/src/components/common/TradingBox/components/TradingBoxSettings/components/PriorityFees.tsx
deleted file mode 100644
index e47cbcb363..0000000000
--- a/apps/marginfi-v2-trading/src/components/common/TradingBox/components/TradingBoxSettings/components/PriorityFees.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React from "react";
-
-import { IconInfoCircle } from "@tabler/icons-react";
-import { cn } from "@mrgnlabs/mrgn-utils";
-
-import { useUiStore } from "~/store";
-
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "~/components/ui/tooltip";
-import { Button } from "~/components/ui/button";
-import { Input } from "~/components/ui/input";
-
-type PriorityFeesProps = {
- toggleSettings: (mode: boolean) => void;
-};
-
-const priorityFeeOptions = [
- {
- label: "Normal",
- value: 0,
- },
- {
- label: "High",
- value: 0.00005,
- },
- {
- label: "Mamas",
- value: 0.005,
- },
-];
-
-export const PriorityFees = ({ toggleSettings }: PriorityFeesProps) => {
- const [priorityFee, setPriorityFee] = useUiStore((state) => [state.priorityFee, state.setPriorityFee]);
- const [selectedPriorityFee, setSelectedPriorityFee] = React.useState
(priorityFee);
-
- const priorityFeeRef = React.useRef(null);
- const [isCustomPriorityFeeMode, setIsCustomPriorityFeeMode] = React.useState(false);
- const [customPriorityFee, setCustomPriorityFee] = React.useState(null);
-
- return (
-
-
- Set transaction priority{" "}
-
-
-
-
-
-
-
-
Priority fees are paid to the Solana network.
-
This additional fee helps boost how a transaction is prioritized.
-
-
- {priorityFeeOptions.map((option) => (
- -
-
-
- ))}
-
-
or set manually
-
- setIsCustomPriorityFeeMode(true)}
- onChange={() => setCustomPriorityFee(parseFloat(priorityFeeRef.current?.value || "0"))}
- />
- SOL
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/apps/marginfi-v2-ui/src/pages/api/bundles/tip.ts b/apps/marginfi-v2-ui/src/pages/api/bundles/tip.ts
new file mode 100644
index 0000000000..1790e42d29
--- /dev/null
+++ b/apps/marginfi-v2-ui/src/pages/api/bundles/tip.ts
@@ -0,0 +1,48 @@
+import { NextApiRequest, NextApiResponse } from "next";
+
+const JITO_API = "http://bundles-api-rest.jito.wtf";
+
+export interface TipFloorDataResponse {
+ time: string;
+ landed_tips_25th_percentile: number;
+ landed_tips_50th_percentile: number;
+ landed_tips_75th_percentile: number;
+ landed_tips_95th_percentile: number;
+ landed_tips_99th_percentile: number;
+ ema_landed_tips_50th_percentile: number;
+}
+
+/*
+ Get jito tip data for at least 50 percentile result
+*/
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+ // use abort controller to restrict fetch to 5 seconds
+ const controller = new AbortController();
+ const timeoutId = setTimeout(() => {
+ controller.abort();
+ }, 5000);
+
+ // Fetch from API and update cache
+ try {
+ const response = await fetch(`${JITO_API}/api/v1/bundles/tip_floor`, {
+ headers: {
+ Accept: "application/json",
+ },
+ signal: controller.signal,
+ });
+
+ clearTimeout(timeoutId);
+
+ if (!response.ok) {
+ throw new Error("Network response was not ok");
+ }
+ const data: TipFloorDataResponse = (await response.json())[0];
+
+ // cache for 4 minutes
+ res.setHeader("Cache-Control", "s-maxage=240, stale-while-revalidate=59");
+ res.status(200).json(data);
+ } catch (error) {
+ console.error("Error:", error);
+ res.status(500).json({ error: "Error fetching data" });
+ }
+}
diff --git a/apps/marginfi-v2-ui/src/pages/api/oracle/price.ts b/apps/marginfi-v2-ui/src/pages/api/oracle/price.ts
index 1c72dcff11..d4406da3aa 100644
--- a/apps/marginfi-v2-ui/src/pages/api/oracle/price.ts
+++ b/apps/marginfi-v2-ui/src/pages/api/oracle/price.ts
@@ -153,7 +153,7 @@ async function fetchCrossbarPrices(feedHashes: string[]): Promise {
controller.abort();
- }, 5000);
+ }, 8000);
try {
const feedHashesString = feedHashes.join(",");
diff --git a/apps/marginfi-v2-ui/src/store/uiStore.ts b/apps/marginfi-v2-ui/src/store/uiStore.ts
index d2f078f6c8..e3518e272a 100644
--- a/apps/marginfi-v2-ui/src/store/uiStore.ts
+++ b/apps/marginfi-v2-ui/src/store/uiStore.ts
@@ -1,10 +1,15 @@
import { create, StateCreator } from "zustand";
import { persist } from "zustand/middleware";
-import { ActionType } from "@mrgnlabs/marginfi-v2-ui-state";
-import { LendingModes, PoolTypes } from "@mrgnlabs/mrgn-utils";
+import {
+ MaxCapType,
+ TransactionBroadcastType,
+ TransactionPriorityType,
+ TransactionSettings,
+} from "@mrgnlabs/mrgn-common";
+import { LendingModes, PoolTypes, DEFAULT_PRIORITY_SETTINGS } from "@mrgnlabs/mrgn-utils";
-import { SortType, sortDirection, SortAssetOption, PreviousTxn } from "~/types";
+import { SortType, sortDirection, SortAssetOption } from "~/types";
const SORT_OPTIONS_MAP: { [key in SortType]: SortAssetOption } = {
APY_DESC: {
@@ -44,8 +49,11 @@ interface UiState {
lendingMode: LendingModes;
poolFilter: PoolTypes;
sortOption: SortAssetOption;
- priorityFee: number;
assetListSearch: string;
+ broadcastType: TransactionBroadcastType;
+ priorityType: TransactionPriorityType;
+ maxCap: number;
+ maxCapType: MaxCapType;
// Actions
setIsMenuDrawerOpen: (isOpen: boolean) => void;
@@ -55,20 +63,15 @@ interface UiState {
setLendingMode: (lendingMode: LendingModes) => void;
setPoolFilter: (poolType: PoolTypes) => void;
setSortOption: (sortOption: SortAssetOption) => void;
- setPriorityFee: (priorityFee: number) => void;
setAssetListSearch: (search: string) => void;
+ setTransactionSettings: (settings: TransactionSettings) => void;
}
function createUiStore() {
return create()(
persist(stateCreator, {
name: "uiStore",
- onRehydrateStorage: () => (state) => {
- // overwrite priority fee
- if (process.env.NEXT_PUBLIC_INIT_PRIO_FEE && process.env.NEXT_PUBLIC_INIT_PRIO_FEE !== "0") {
- state?.setPriorityFee(Number(process.env.NEXT_PUBLIC_INIT_PRIO_FEE));
- }
- },
+ onRehydrateStorage: () => (state) => {},
})
);
}
@@ -82,8 +85,8 @@ const stateCreator: StateCreator = (set, get) => ({
lendingMode: LendingModes.LEND,
poolFilter: PoolTypes.ALL,
sortOption: SORT_OPTIONS_MAP[SortType.TVL_DESC],
- priorityFee: 0,
assetListSearch: "",
+ ...DEFAULT_PRIORITY_SETTINGS,
// Actions
setIsMenuDrawerOpen: (isOpen: boolean) => set({ isMenuDrawerOpen: isOpen }),
@@ -97,8 +100,8 @@ const stateCreator: StateCreator = (set, get) => ({
setIsOraclesStale: (isOraclesStale: boolean) => set({ isOraclesStale: isOraclesStale }),
setPoolFilter: (poolType: PoolTypes) => set({ poolFilter: poolType }),
setSortOption: (sortOption: SortAssetOption) => set({ sortOption: sortOption }),
- setPriorityFee: (priorityFee: number) => set({ priorityFee: priorityFee }),
setAssetListSearch: (search: string) => set({ assetListSearch: search }),
+ setTransactionSettings: (settings: TransactionSettings) => set({ ...settings }),
});
export { createUiStore, SORT_OPTIONS_MAP };
diff --git a/packages/marginfi-client-v2/src/client.ts b/packages/marginfi-client-v2/src/client.ts
index 47a422d601..ef366db9bc 100644
--- a/packages/marginfi-client-v2/src/client.ts
+++ b/packages/marginfi-client-v2/src/client.ts
@@ -30,6 +30,7 @@ import {
NodeWallet,
simulateBundle,
sleep,
+ TransactionBroadcastType,
TransactionOptions,
Wallet,
} from "@mrgnlabs/mrgn-common";
@@ -47,6 +48,7 @@ import {
BankConfigOpt,
BankConfig,
makeBundleTipIx,
+ makeTxPriorityIx,
} from ".";
import { MarginfiAccountWrapper } from "./models/account/wrapper";
import {
@@ -607,20 +609,23 @@ class MarginfiClient {
*/
async createMarginfiAccount(
opts?: TransactionOptions,
- createOpts?: { newAccountKey?: PublicKey | undefined }
+ createOpts?: { newAccountKey?: PublicKey | undefined },
+ priorityFeeUi?: number,
+ broadcastType?: TransactionBroadcastType
): Promise {
const dbg = require("debug")("mfi:client");
const accountKeypair = Keypair.generate();
const newAccountKey = createOpts?.newAccountKey ?? accountKeypair.publicKey;
- const bundleTipIx = makeBundleTipIx(this.provider.publicKey);
+ const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(this.provider.publicKey, priorityFeeUi, broadcastType);
+
const ixs = await this.makeCreateMarginfiAccountIx(newAccountKey);
const signers = [...ixs.keys];
// If there was no newAccountKey provided, we need to sign with the ephemeraKeypair we generated.
if (!createOpts?.newAccountKey) signers.push(accountKeypair);
- const tx = new Transaction().add(bundleTipIx, ...ixs.instructions);
+ const tx = new Transaction().add(priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...ixs.instructions);
const sig = await this.processTransaction(tx, signers, opts);
dbg("Created Marginfi account %s", sig);
@@ -765,7 +770,9 @@ class MarginfiClient {
async processTransactions(
transactions: (VersionedTransaction | Transaction)[],
signers?: Array,
- opts?: TransactionOptions
+ opts?: TransactionOptions,
+ broadcastType: TransactionBroadcastType = "BUNDLE",
+ isSequentialTxs: boolean = true
): Promise {
let signatures: TransactionSignature[] = [""];
@@ -868,10 +875,34 @@ class MarginfiClient {
});
}
- signatures = await this.sendTransactionAsBundle(base58Txs).catch(
- async () =>
+ let sendTxsRpc = async (versionedTransaction: VersionedTransaction[]): Promise => [];
+
+ if (isSequentialTxs) {
+ sendTxsRpc = async (txs: VersionedTransaction[]) => {
+ let sigs = [];
+ for (const tx of txs) {
+ const signature = await connection.sendTransaction(tx, {
+ // minContextSlot: mergedOpts.minContextSlot,
+ skipPreflight: mergedOpts.skipPreflight,
+ preflightCommitment: mergedOpts.preflightCommitment,
+ maxRetries: mergedOpts.maxRetries,
+ });
+ await connection.confirmTransaction(
+ {
+ blockhash,
+ lastValidBlockHeight,
+ signature,
+ },
+ "confirmed"
+ );
+ sigs.push(signature);
+ }
+ return sigs;
+ };
+ } else {
+ sendTxsRpc = async (txs: VersionedTransaction[]) =>
await Promise.all(
- versionedTransactions.map(async (versionedTransaction) => {
+ txs.map(async (versionedTransaction) => {
const signature = await connection.sendTransaction(versionedTransaction, {
// minContextSlot: mergedOpts.minContextSlot,
skipPreflight: mergedOpts.skipPreflight,
@@ -880,8 +911,16 @@ class MarginfiClient {
});
return signature;
})
- )
- );
+ );
+ }
+
+ if (broadcastType === "BUNDLE") {
+ signatures = await this.sendTransactionAsBundle(base58Txs).catch(
+ async () => await sendTxsRpc(versionedTransactions)
+ );
+ } else {
+ signatures = await sendTxsRpc(versionedTransactions);
+ }
await Promise.all(
signatures.map(async (signature) => {
diff --git a/packages/marginfi-client-v2/src/models/account/wrapper.ts b/packages/marginfi-client-v2/src/models/account/wrapper.ts
index cd231053af..c4811e21b8 100644
--- a/packages/marginfi-client-v2/src/models/account/wrapper.ts
+++ b/packages/marginfi-client-v2/src/models/account/wrapper.ts
@@ -7,6 +7,8 @@ import {
createAssociatedTokenAccountIdempotentInstruction,
getAssociatedTokenAddressSync,
shortenAddress,
+ TransactionPriorityType,
+ TransactionBroadcastType,
} from "@mrgnlabs/mrgn-common";
import * as sb from "@switchboard-xyz/on-demand";
import { Address, BorshCoder, Idl, translateAddress } from "@coral-xyz/anchor";
@@ -28,6 +30,7 @@ import BigNumber from "bignumber.js";
import {
MakeBorrowIxOpts,
MakeDepositIxOpts,
+ makePriorityFeeIx,
MakeRepayIxOpts,
MakeWithdrawIxOpts,
MarginfiClient,
@@ -291,31 +294,6 @@ class MarginfiAccountWrapper {
return computeLoopingParams(principal, targetLeverage, depositBank, borrowBank, depositPriceInfo, borrowPriceInfo);
}
- makePriorityFeeIx(priorityFeeUi?: number): TransactionInstruction[] {
- const priorityFeeIx: TransactionInstruction[] = [];
- const limitCU = 1_400_000;
-
- let microLamports: number = 1;
-
- if (priorityFeeUi) {
- // if priority fee is above 0.2 SOL discard it for safety reasons
- const isAbsurdPriorityFee = priorityFeeUi > 0.2;
-
- if (!isAbsurdPriorityFee) {
- const priorityFeeMicroLamports = priorityFeeUi * LAMPORTS_PER_SOL * 1_000_000;
- microLamports = Math.round(priorityFeeMicroLamports / limitCU);
- }
- }
-
- priorityFeeIx.push(
- ComputeBudgetProgram.setComputeUnitPrice({
- microLamports,
- })
- );
-
- return priorityFeeIx;
- }
-
makeComputeBudgetIx(): TransactionInstruction[] {
// Add additional CU request if necessary
let cuRequestIxs: TransactionInstruction[] = [];
@@ -387,7 +365,8 @@ class MarginfiAccountWrapper {
repayAll: boolean = false,
swapIxs: TransactionInstruction[],
swapLookupTables: AddressLookupTableAccount[],
- priorityFeeUi?: number
+ priorityFeeUi?: number,
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise {
const debug = require("debug")(`mfi:margin-account:${this.address.toString()}:repay`);
debug("Repaying %s into marginfi account (bank: %s), repay all: %s", repayAmount, borrowBankAddress, repayAll);
@@ -404,8 +383,12 @@ class MarginfiAccountWrapper {
priorityFeeUi
);
- // assumes only one tx
- const sigs = await this.client.processTransactions([...feedCrankTxs, flashloanTx]);
+ const sigs = await this.client.processTransactions(
+ [...feedCrankTxs, flashloanTx],
+ undefined,
+ undefined,
+ broadcastType
+ );
debug("Repay with collateral successful %s", sigs.pop() ?? "");
return sigs;
@@ -476,7 +459,8 @@ class MarginfiAccountWrapper {
swapLookupTables: AddressLookupTableAccount[],
priorityFeeUi?: number,
isTxnSplitParam?: boolean,
- blockhashArg?: string
+ blockhashArg?: string,
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise<{
flashloanTx: VersionedTransaction;
feedCrankTxs: VersionedTransaction[];
@@ -486,7 +470,11 @@ class MarginfiAccountWrapper {
blockhashArg ?? (await this._program.provider.connection.getLatestBlockhash("confirmed")).blockhash;
const setupIxs = await this.makeSetupIx([borrowBankAddress, depositBankAddress]);
const cuRequestIxs = this.makeComputeBudgetIx();
- const priorityFeeIx = this.makePriorityFeeIx(priorityFeeUi);
+ const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ priorityFeeUi,
+ broadcastType
+ );
const withdrawIxs = await this.makeWithdrawIx(withdrawAmount, depositBankAddress, withdrawAll, {
createAtas: false,
wrapAndUnwrapSol: false,
@@ -495,7 +483,6 @@ class MarginfiAccountWrapper {
createAtas: false,
wrapAndUnwrapSol: false,
});
- const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
const lookupTables = this.client.addressLookupTables;
const { instructions: updateFeedIxs, luts: feedLuts } = await this.makeUpdateFeedIx([
@@ -507,23 +494,18 @@ class MarginfiAccountWrapper {
let feedCrankTxs: VersionedTransaction[] = [];
- // isTxnSplit forced set to true as we're always splitting now
- const isTxnSplit = true; //isTxnSplitParam
- if (isTxnSplit) {
- const message = new TransactionMessage({
- payerKey: this.client.wallet.publicKey,
- recentBlockhash: blockhash,
- instructions: [bundleTipIx, ...updateFeedIxs],
- }).compileToV0Message([...addressLookupTableAccounts, ...feedLuts]);
+ const message = new TransactionMessage({
+ payerKey: this.client.wallet.publicKey,
+ recentBlockhash: blockhash,
+ instructions: [priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...updateFeedIxs],
+ }).compileToV0Message([...addressLookupTableAccounts, ...feedLuts]);
- feedCrankTxs = [new VersionedTransaction(message)];
- }
+ feedCrankTxs = [new VersionedTransaction(message)];
const flashloanTx = await this.buildFlashLoanTx({
ixs: [
- ...priorityFeeIx,
+ ...[priorityFeeIx],
...cuRequestIxs,
- ...(isTxnSplit ? [] : [bundleTipIx]),
...setupIxs,
...withdrawIxs.instructions,
...swapIxs,
@@ -640,8 +622,8 @@ class MarginfiAccountWrapper {
swapIxs: TransactionInstruction[],
swapLookupTables: AddressLookupTableAccount[],
priorityFeeUi?: number,
- createAtas?: boolean
- // isTxnSplitParam?: boolean
+ createAtas?: boolean,
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise<{
flashloanTx: VersionedTransaction;
feedCrankTxs: VersionedTransaction[];
@@ -654,7 +636,12 @@ class MarginfiAccountWrapper {
const setupIxs = createAtas ? await this.makeSetupIx([depositBankAddress, borrowBankAddress]) : [];
const cuRequestIxs = this.makeComputeBudgetIx();
- const priorityFeeIx = this.makePriorityFeeIx(priorityFeeUi);
+
+ const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ priorityFeeUi,
+ broadcastType
+ );
const borrowIxs = await this.makeBorrowIx(borrowAmount, borrowBankAddress, {
createAtas: true,
wrapAndUnwrapSol: false,
@@ -662,7 +649,6 @@ class MarginfiAccountWrapper {
const depositIxs = await this.makeDepositIx(depositAmount, depositBankAddress, {
wrapAndUnwrapSol: true,
});
- const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
const clientLookupTables = this.client.addressLookupTables;
const { instructions: updateFeedIxs, luts: feedLuts } = await this.makeUpdateFeedIx([
@@ -675,13 +661,13 @@ class MarginfiAccountWrapper {
const message = new TransactionMessage({
payerKey: this.client.wallet.publicKey,
recentBlockhash: blockhash,
- instructions: [bundleTipIx, ...updateFeedIxs, ...setupIxs],
+ instructions: [priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...updateFeedIxs, ...setupIxs],
}).compileToV0Message([...clientLookupTables, ...feedLuts]);
const feedCrankTxs = [new VersionedTransaction(message)];
const flashloanTx = await this.buildFlashLoanTx({
- ixs: [...priorityFeeIx, ...cuRequestIxs, ...borrowIxs.instructions, ...swapIxs, ...depositIxs.instructions],
+ ixs: [...[priorityFeeIx], ...cuRequestIxs, ...borrowIxs.instructions, ...swapIxs, ...depositIxs.instructions],
addressLookupTableAccounts: [...clientLookupTables, ...swapLookupTables],
});
@@ -707,22 +693,35 @@ class MarginfiAccountWrapper {
);
}
- async deposit(amount: Amount, bankAddress: PublicKey, opt: MakeDepositIxOpts = {}): Promise {
+ async deposit(
+ amount: Amount,
+ bankAddress: PublicKey,
+ opt: MakeDepositIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
+ ): Promise {
const debug = require("debug")(`mfi:margin-account:${this.address.toString()}:deposit`);
debug("Depositing %s into marginfi account (bank: %s)", amount, shortenAddress(bankAddress));
- const tx = await this.makeDepositTx(amount, bankAddress, opt);
+ const tx = await this.makeDepositTx(amount, bankAddress, opt, broadcastType);
const sig = await this.client.processTransaction(tx, []);
debug("Depositing successful %s", sig);
return sig;
}
- async makeDepositTx(amount: Amount, bankAddress: PublicKey, opt: MakeDepositIxOpts = {}): Promise {
- const priorityFeeIx = this.makePriorityFeeIx(opt.priorityFeeUi);
- const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
+ async makeDepositTx(
+ amount: Amount,
+ bankAddress: PublicKey,
+ opt: MakeDepositIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
+ ): Promise {
+ const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ opt.priorityFeeUi,
+ broadcastType
+ );
const ixs = await this.makeDepositIx(amount, bankAddress, opt);
- const tx = new Transaction().add(bundleTipIx, ...priorityFeeIx, ...ixs.instructions);
+ const tx = new Transaction().add(priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...ixs.instructions);
return tx;
}
@@ -794,12 +793,13 @@ class MarginfiAccountWrapper {
amount: Amount,
bankAddress: PublicKey,
repayAll: boolean = false,
- opt: MakeRepayIxOpts = {}
+ opt: MakeRepayIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise {
const debug = require("debug")(`mfi:margin-account:${this.address.toString()}:repay`);
debug("Repaying %s into marginfi account (bank: %s), repay all: %s", amount, bankAddress, repayAll);
- const tx = await this.makeRepayTx(amount, bankAddress, repayAll, opt);
+ const tx = await this.makeRepayTx(amount, bankAddress, repayAll, opt, broadcastType);
const sig = await this.client.processTransaction(tx, []);
debug("Depositing successful %s", sig);
@@ -811,12 +811,17 @@ class MarginfiAccountWrapper {
amount: Amount,
bankAddress: PublicKey,
repayAll: boolean = false,
- opt: MakeRepayIxOpts = {}
+ opt: MakeRepayIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise {
- const priorityFeeIx = this.makePriorityFeeIx(opt.priorityFeeUi);
- const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
+ const { priorityFeeIx, bundleTipIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ opt.priorityFeeUi,
+ broadcastType
+ );
+
const ixs = await this.makeRepayIx(amount, bankAddress, repayAll, opt);
- const tx = new Transaction().add(bundleTipIx, ...priorityFeeIx, ...ixs.instructions);
+ const tx = new Transaction().add(priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...ixs.instructions);
return tx;
}
@@ -855,17 +860,22 @@ class MarginfiAccountWrapper {
amount: Amount;
bankAddress: PublicKey;
}[],
- opt: MakeWithdrawIxOpts = {}
+ opt: MakeWithdrawIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise {
const debug = require("debug")(`mfi:margin-account:${this.address.toString()}:withdraw`);
debug("Withdrawing all from marginfi account");
- const priorityFeeIx = this.makePriorityFeeIx(opt.priorityFeeUi);
+ const { priorityFeeIx, bundleTipIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ opt.priorityFeeUi,
+ broadcastType
+ );
const cuRequestIxs = this.makeComputeBudgetIx();
let ixs = [];
for (const bank of banks) {
ixs.push(...(await this.makeWithdrawIx(bank.amount, bank.bankAddress, true, opt)).instructions);
}
- const tx = new Transaction().add(...priorityFeeIx, ...cuRequestIxs, ...ixs);
+ const tx = new Transaction().add(...cuRequestIxs, priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...ixs);
return tx;
}
@@ -873,15 +883,27 @@ class MarginfiAccountWrapper {
amount: Amount,
bankAddress: PublicKey,
withdrawAll: boolean = false,
- opt: MakeWithdrawIxOpts = {}
+ opt: MakeWithdrawIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise {
const debug = require("debug")(`mfi:margin-account:${this.address.toString()}:withdraw`);
debug("Withdrawing %s from marginfi account", amount);
- const { feedCrankTxs, withdrawTx } = await this.makeWithdrawTx(amount, bankAddress, withdrawAll, opt);
+ const { feedCrankTxs, withdrawTx } = await this.makeWithdrawTx(
+ amount,
+ bankAddress,
+ withdrawAll,
+ opt,
+ broadcastType
+ );
// process multiple transactions if feed updates required
- const sigs = await this.client.processTransactions([...feedCrankTxs, withdrawTx]);
+ const sigs = await this.client.processTransactions(
+ [...feedCrankTxs, withdrawTx],
+ undefined,
+ undefined,
+ broadcastType
+ );
debug("Withdrawing successful %s", sigs.pop());
return sigs;
@@ -891,14 +913,18 @@ class MarginfiAccountWrapper {
amount: Amount,
bankAddress: PublicKey,
withdrawAll: boolean = false,
- opt: MakeWithdrawIxOpts = {}
+ opt: MakeWithdrawIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise<{
feedCrankTxs: VersionedTransaction[];
withdrawTx: VersionedTransaction;
addressLookupTableAccounts: AddressLookupTableAccount[];
}> {
- const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
- const priorityFeeIxs = this.makePriorityFeeIx(opt.priorityFeeUi);
+ const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ opt.priorityFeeUi,
+ broadcastType
+ );
const cuRequestIxs = this.makeComputeBudgetIx();
const { instructions: updateFeedIxs, luts: feedLuts } = await this.makeUpdateFeedIx([]);
const ixs = await this.makeWithdrawIx(amount, bankAddress, withdrawAll, opt);
@@ -913,7 +939,7 @@ class MarginfiAccountWrapper {
feedCrankTxs.push(
new VersionedTransaction(
new TransactionMessage({
- instructions: updateFeedIxs,
+ instructions: [priorityFeeIx, ...updateFeedIxs],
payerKey: this.authority,
recentBlockhash: blockhash,
}).compileToV0Message([...feedLuts])
@@ -923,7 +949,7 @@ class MarginfiAccountWrapper {
const withdrawTx = new VersionedTransaction(
new TransactionMessage({
- instructions: [bundleTipIx, ...cuRequestIxs, ...priorityFeeIxs, ...ixs.instructions],
+ instructions: [priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...cuRequestIxs, ...ixs.instructions],
payerKey: this.authority,
recentBlockhash: blockhash,
}).compileToV0Message([...this.client.addressLookupTables])
@@ -956,14 +982,24 @@ class MarginfiAccountWrapper {
);
}
- async borrow(amount: Amount, bankAddress: PublicKey, opt: MakeBorrowIxOpts = {}): Promise {
+ async borrow(
+ amount: Amount,
+ bankAddress: PublicKey,
+ opt: MakeBorrowIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
+ ): Promise {
const debug = require("debug")(`mfi:margin-account:${this.address.toString()}:borrow`);
debug("Borrowing %s from marginfi account", amount);
const { feedCrankTxs, borrowTx } = await this.makeBorrowTx(amount, bankAddress, opt);
// process multiple transactions if feed updates required
- const sigs = await this.client.processTransactions([...feedCrankTxs, borrowTx]);
+ const sigs = await this.client.processTransactions(
+ [...feedCrankTxs, borrowTx],
+ undefined,
+ undefined,
+ broadcastType
+ );
debug("Borrowing successful %s", sigs);
return sigs;
}
@@ -971,14 +1007,18 @@ class MarginfiAccountWrapper {
async makeBorrowTx(
amount: Amount,
bankAddress: PublicKey,
- opt: MakeBorrowIxOpts = {}
+ opt: MakeBorrowIxOpts = {},
+ broadcastType: TransactionBroadcastType = "BUNDLE"
): Promise<{
feedCrankTxs: VersionedTransaction[];
borrowTx: VersionedTransaction;
addressLookupTableAccounts: AddressLookupTableAccount[];
}> {
- const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
- const priorityFeeIxs = this.makePriorityFeeIx(opt.priorityFeeUi);
+ const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ opt.priorityFeeUi,
+ broadcastType
+ );
const cuRequestIxs = this.makeComputeBudgetIx();
const { instructions: updateFeedIxs, luts: feedLuts } = await this.makeUpdateFeedIx([bankAddress]);
const ixs = await this.makeBorrowIx(amount, bankAddress, opt);
@@ -993,7 +1033,7 @@ class MarginfiAccountWrapper {
feedCrankTxs.push(
new VersionedTransaction(
new TransactionMessage({
- instructions: updateFeedIxs,
+ instructions: [priorityFeeIx, ...updateFeedIxs],
payerKey: this.authority,
recentBlockhash: blockhash,
}).compileToV0Message([...feedLuts])
@@ -1003,7 +1043,7 @@ class MarginfiAccountWrapper {
const borrowTx = new VersionedTransaction(
new TransactionMessage({
- instructions: [bundleTipIx, ...cuRequestIxs, ...priorityFeeIxs, ...ixs.instructions],
+ instructions: [...cuRequestIxs, priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...ixs.instructions],
payerKey: this.authority,
recentBlockhash: blockhash,
}).compileToV0Message([...this.client.addressLookupTables])
@@ -1031,11 +1071,18 @@ class MarginfiAccountWrapper {
);
}
- async withdrawEmissions(bankAddresses: PublicKey[], priorityFeeUi?: number): Promise {
+ async withdrawEmissions(
+ bankAddresses: PublicKey[],
+ priorityFeeUi?: number,
+ broadcastType: TransactionBroadcastType = "BUNDLE"
+ ): Promise {
const debug = require("debug")(`mfi:margin-account:${this.address.toString()}:withdraw-emissions`);
debug("Withdrawing emission from marginfi account (bank: %s)", bankAddresses.map((b) => b.toBase58()).join(", "));
- const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
- const priorityFeeIx = this.makePriorityFeeIx(priorityFeeUi);
+ const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(
+ this.client.provider.publicKey,
+ priorityFeeUi,
+ broadcastType
+ );
const ixs: TransactionInstruction[] = [];
const signers = [];
for (const bankAddress of bankAddresses) {
@@ -1043,7 +1090,7 @@ class MarginfiAccountWrapper {
ixs.push(...ix.instructions);
signers.push(ix.keys);
}
- const tx = new Transaction().add(bundleTipIx, ...priorityFeeIx, ...ixs);
+ const tx = new Transaction().add(priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...ixs);
const sig = await this.client.processTransaction(tx, []);
debug("Withdrawing emission successful %s", sig);
return sig;
@@ -1259,7 +1306,27 @@ class MarginfiAccountWrapper {
}
}
-export function makeBundleTipIx(feePayer: PublicKey): TransactionInstruction {
+export function makeTxPriorityIx(
+ feePayer: PublicKey,
+ priorityFeeUi: number = 0,
+ broadcastType: TransactionBroadcastType = "BUNDLE"
+) {
+ let bundleTipIx: TransactionInstruction | undefined = undefined;
+ let priorityFeeIx: TransactionInstruction = makePriorityFeeIx()[0];
+
+ if (broadcastType === "BUNDLE") {
+ bundleTipIx = makeBundleTipIx(feePayer, Math.trunc(priorityFeeUi * LAMPORTS_PER_SOL));
+ } else {
+ priorityFeeIx = makePriorityFeeIx(priorityFeeUi)[0];
+ }
+
+ return {
+ bundleTipIx,
+ priorityFeeIx,
+ };
+}
+
+export function makeBundleTipIx(feePayer: PublicKey, bundleTip: number = 100_000): TransactionInstruction {
// they have remained constant so function not used (for now)
const getTipAccounts = async () => {
const response = await fetch("https://mainnet.block-engine.jito.wtf/api/v1/bundles", {
@@ -1294,7 +1361,7 @@ export function makeBundleTipIx(feePayer: PublicKey): TransactionInstruction {
return SystemProgram.transfer({
fromPubkey: feePayer,
toPubkey: new PublicKey(randomTipAccount),
- lamports: 100_000, // 100_000 lamports = 0.0001 SOL
+ lamports: bundleTip, // 100_000 lamports = 0.0001 SOL
});
}
diff --git a/packages/mrgn-common/src/index.ts b/packages/mrgn-common/src/index.ts
index d7ff60f805..5495925ef0 100644
--- a/packages/mrgn-common/src/index.ts
+++ b/packages/mrgn-common/src/index.ts
@@ -10,4 +10,5 @@ export * from "./formatters";
export * from "./conversion";
export * from "./accounting";
export * from "./spl";
+export * from "./priority";
export { NodeWallet };
diff --git a/packages/mrgn-common/src/priority.ts b/packages/mrgn-common/src/priority.ts
new file mode 100644
index 0000000000..fd61f2c7f6
--- /dev/null
+++ b/packages/mrgn-common/src/priority.ts
@@ -0,0 +1,212 @@
+import type { RecentPrioritizationFees } from "@solana/web3.js";
+import { Connection, type GetRecentPrioritizationFeesConfig } from "@solana/web3.js";
+
+export type TransactionBroadcastType = "BUNDLE" | "RPC";
+
+export type TransactionPriorityType = "NORMAL" | "HIGH" | "MAMAS";
+
+export type MaxCapType = "DYNAMIC" | "MANUAL";
+
+export type TransactionSettings = {
+ broadcastType: TransactionBroadcastType;
+ priorityType: TransactionPriorityType;
+ maxCapType: MaxCapType;
+ maxCap: number;
+};
+
+// easy to use values for user convenience
+export const enum PriotitizationFeeLevels {
+ LOW = 2500,
+ MEDIAN = 5000,
+ HIGH = 7500,
+ MAX = 10000,
+}
+
+// extending the original interface to include the percentile and fallback options and maintain compatibility
+interface GetRecentPrioritizationFeesByPercentileConfig extends GetRecentPrioritizationFeesConfig {
+ percentile?: PriotitizationFeeLevels | number;
+ fallback?: boolean;
+}
+
+interface RpcResponse {
+ jsonrpc: String;
+ id?: String;
+ result?: [];
+ error?: any;
+}
+
+export const getCalculatedPrioritizationFeeByPercentile = async (
+ connection: Connection,
+ config: GetRecentPrioritizationFeesByPercentileConfig,
+ slotsToReturn?: number
+) => {
+ const fees = await getRecentPrioritizationFeesByPercentile(connection, config, slotsToReturn);
+
+ // Calculate min, max, mean
+ const { min, max, sum } = fees.reduce(
+ (acc, fee) => ({
+ min: fee.prioritizationFee < acc.min.prioritizationFee ? fee : acc.min,
+ max: fee.prioritizationFee > acc.max.prioritizationFee ? fee : acc.max,
+ sum: acc.sum + fee.prioritizationFee,
+ }),
+ { min: fees[0], max: fees[0], sum: 0 }
+ );
+
+ const mean = Math.ceil(sum / fees.length);
+
+ // Calculate median
+ const sortedFees = [...fees].sort((a, b) => a.prioritizationFee - b.prioritizationFee);
+ const midIndex = Math.floor(fees.length / 2);
+
+ const median =
+ fees.length % 2 === 0
+ ? Math.ceil((sortedFees[midIndex - 1].prioritizationFee + sortedFees[midIndex].prioritizationFee) / 2)
+ : sortedFees[midIndex].prioritizationFee;
+
+ return {
+ min,
+ max,
+ mean,
+ median,
+ };
+};
+
+export const getMinPrioritizationFeeByPercentile = async (
+ connection: Connection,
+ config: GetRecentPrioritizationFeesByPercentileConfig,
+ slotsToReturn?: number
+): Promise => {
+ const recentPrioritizationFees = await getRecentPrioritizationFeesByPercentile(connection, config, slotsToReturn);
+
+ const minPriorityFee = recentPrioritizationFees.reduce((min, current) => {
+ return current.prioritizationFee < min.prioritizationFee ? current : min;
+ });
+
+ return minPriorityFee.prioritizationFee;
+};
+
+export const getMaxPrioritizationFeeByPercentile = async (
+ connection: Connection,
+ config: GetRecentPrioritizationFeesByPercentileConfig,
+ slotsToReturn?: number
+): Promise => {
+ const recentPrioritizationFees = await getRecentPrioritizationFeesByPercentile(connection, config, slotsToReturn);
+
+ const maxPriorityFee = recentPrioritizationFees.reduce((max, current) => {
+ return current.prioritizationFee > max.prioritizationFee ? current : max;
+ });
+
+ return maxPriorityFee.prioritizationFee;
+};
+
+export const getMeanPrioritizationFeeByPercentile = async (
+ connection: Connection,
+ config: GetRecentPrioritizationFeesByPercentileConfig,
+ slotsToReturn?: number
+): Promise => {
+ const recentPrioritizationFees = await getRecentPrioritizationFeesByPercentile(connection, config, slotsToReturn);
+
+ const mean = Math.ceil(
+ recentPrioritizationFees.reduce((acc, fee) => acc + fee.prioritizationFee, 0) / recentPrioritizationFees.length
+ );
+
+ return mean;
+};
+
+export const getMedianPrioritizationFeeByPercentile = async (
+ connection: Connection,
+ config: GetRecentPrioritizationFeesByPercentileConfig,
+ slotsToReturn?: number
+): Promise => {
+ const recentPrioritizationFees = await getRecentPrioritizationFeesByPercentile(connection, config, slotsToReturn);
+
+ recentPrioritizationFees.sort((a, b) => a.prioritizationFee - b.prioritizationFee);
+
+ const half = Math.floor(recentPrioritizationFees.length / 2);
+
+ if (recentPrioritizationFees.length % 2) {
+ return recentPrioritizationFees[half].prioritizationFee;
+ }
+
+ return Math.ceil(
+ (recentPrioritizationFees[half - 1].prioritizationFee + recentPrioritizationFees[half].prioritizationFee) / 2
+ );
+};
+
+// this function gets the recent prioritization fees from the RPC. The `rpcRequest` comes from webjs.Connection
+const getRecentPrioritizationFeesFromRpc = async (config: any, rpcRequest: any) => {
+ const accounts = config?.lockedWritableAccounts?.map((key: { toBase58: () => any }) => key.toBase58());
+ const args = accounts?.length ? [accounts] : [[]];
+ config.percentile && args.push({ percentile: config.percentile });
+
+ const response = await rpcRequest("getRecentPrioritizationFees", args);
+
+ return response;
+};
+
+export const getRecentPrioritizationFeesByPercentile = async (
+ connection: Connection,
+ config: GetRecentPrioritizationFeesByPercentileConfig,
+ slotsToReturn?: number
+): Promise => {
+ const { fallback = true, lockedWritableAccounts = [] } = config || {};
+ slotsToReturn = slotsToReturn && Number.isInteger(slotsToReturn) ? slotsToReturn : -1;
+
+ const promises = [];
+
+ let tritonRpcResponse: RpcResponse | undefined = undefined;
+ let fallbackRpcResponse: RpcResponse | undefined = undefined;
+
+ // @solana/web3.js uses the private method `_rpcRequest` internally to make RPC requests which is not exposed by TypeScript
+ // it is available in JavaScript, however, TypeScript enforces it as unavailable and complains, the following line is a workaround
+
+ /* @ts-ignore */
+ const rpcRequest = connection._rpcRequest;
+
+ // to save fallback roundtrips if your RPC is not Triton, both RPCs are called in parallel to minimize latency
+ promises.push(
+ getRecentPrioritizationFeesFromRpc(config, rpcRequest).then((result) => {
+ tritonRpcResponse = result;
+ })
+ );
+
+ if (fallback) {
+ promises.push(
+ getRecentPrioritizationFeesFromRpc({ lockedWritableAccounts }, rpcRequest).then((result) => {
+ fallbackRpcResponse = result;
+ })
+ );
+ }
+
+ await Promise.all(promises);
+
+ // satisfying typescript by casting the response to RpcResponse
+ const tritonGRPFResponse = tritonRpcResponse as unknown as RpcResponse;
+ const fallbackGRPFResponse = fallbackRpcResponse as unknown as RpcResponse;
+
+ let recentPrioritizationFees: RecentPrioritizationFees[] = [];
+
+ if (tritonGRPFResponse?.result) {
+ recentPrioritizationFees = tritonGRPFResponse.result!;
+ }
+
+ if (fallbackGRPFResponse?.result && !tritonGRPFResponse?.result) {
+ recentPrioritizationFees = fallbackGRPFResponse.result!;
+ }
+
+ if (fallback && fallbackGRPFResponse.error) {
+ return fallbackGRPFResponse.error;
+ }
+
+ if (tritonGRPFResponse?.error) {
+ return tritonGRPFResponse.error;
+ }
+
+ // sort the prioritization fees by slot
+ recentPrioritizationFees.sort((a, b) => a.slot - b.slot);
+
+ // return the first n prioritization fees
+ if (slotsToReturn > 0) return recentPrioritizationFees.slice(0, slotsToReturn);
+
+ return recentPrioritizationFees;
+};
diff --git a/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/hooks/use-lend-simulation.hooks.ts b/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/hooks/use-lend-simulation.hooks.ts
index be3c5ebe61..b97ad53980 100644
--- a/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/hooks/use-lend-simulation.hooks.ts
+++ b/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/hooks/use-lend-simulation.hooks.ts
@@ -5,8 +5,8 @@ import { Transaction, VersionedTransaction } from "@solana/web3.js";
import { AccountSummary, ActionType, ExtendedBankInfo } from "@mrgnlabs/marginfi-v2-ui-state";
import { MarginfiAccountWrapper, SimulationResult } from "@mrgnlabs/marginfi-client-v2";
import { ActionMethod, STATIC_SIMULATION_ERRORS, usePrevious } from "@mrgnlabs/mrgn-utils";
+import { TransactionBroadcastType } from "@mrgnlabs/mrgn-common";
-import { useActionBoxStore } from "../../../store";
import { calculateLendingTransaction, calculateSummary, getSimulationResult } from "../utils";
/*
@@ -27,6 +27,8 @@ type LendSimulationProps = {
additionalTxns: (VersionedTransaction | Transaction)[];
};
simulationResult: SimulationResult | null;
+ priorityFee: number;
+ broadcastType: TransactionBroadcastType;
setSimulationResult: (result: SimulationResult | null) => void;
setActionTxns: (actionTxns: {
actionTxn: VersionedTransaction | Transaction | null;
@@ -44,6 +46,8 @@ export function useLendSimulation({
lendMode,
actionTxns,
simulationResult,
+ priorityFee,
+ broadcastType,
setSimulationResult,
setActionTxns,
setErrorMessage,
@@ -51,8 +55,6 @@ export function useLendSimulation({
}: LendSimulationProps) {
const prevDebouncedAmount = usePrevious(debouncedAmount);
- const [priorityFee] = useActionBoxStore((state) => [state.priorityFee]);
-
const handleSimulation = React.useCallback(
async (txns: (VersionedTransaction | Transaction)[]) => {
try {
@@ -119,7 +121,8 @@ export function useLendSimulation({
selectedBank,
lendMode,
amount,
- 0 //priorityFee
+ priorityFee,
+ broadcastType
);
if (lendingObject && "actionTxn" in lendingObject) {
@@ -129,6 +132,7 @@ export function useLendSimulation({
setErrorMessage(errorMessage);
}
} catch (error) {
+ console.log(error);
setErrorMessage(STATIC_SIMULATION_ERRORS.BUILDING_LENDING_TX);
setIsLoading(false);
}
@@ -138,7 +142,7 @@ export function useLendSimulation({
// setIsLoading(false);
// }
},
- [selectedAccount, selectedBank, lendMode, setActionTxns, setErrorMessage, setIsLoading]
+ [selectedAccount, selectedBank, setIsLoading, setActionTxns, lendMode, priorityFee, broadcastType, setErrorMessage]
);
React.useEffect(() => {
diff --git a/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx b/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx
index e9f2192086..7c645b241c 100644
--- a/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx
+++ b/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx
@@ -11,7 +11,7 @@ import {
computeAccountSummary,
DEFAULT_ACCOUNT_SUMMARY,
} from "@mrgnlabs/marginfi-v2-ui-state";
-import { ActionMethod, MarginfiActionParams, PreviousTxn } from "@mrgnlabs/mrgn-utils";
+import { ActionMethod, MarginfiActionParams, PreviousTxn, useConnection, usePriorityFee } from "@mrgnlabs/mrgn-utils";
import { MarginfiAccountWrapper, MarginfiClient } from "@mrgnlabs/marginfi-client-v2";
import { ActionButton, ActionMessage, ActionSettingsButton } from "~/components/action-box-v2/components";
@@ -26,6 +26,7 @@ import { Collateral, ActionInput, Preview } from "./components";
import { useLendSimulation } from "./hooks";
import { useActionBoxStore } from "../../store";
import { HidePoolStats } from "../../contexts/actionbox/actionbox.context";
+import { useActionContext } from "../../contexts";
// error handling
export type LendBoxProps = {
@@ -109,15 +110,23 @@ export const LendBox = ({
state.setErrorMessage,
]);
+ const { priorityType, broadcastType, maxCap, maxCapType } = useActionContext();
+
+ const priorityFee = usePriorityFee(
+ priorityType,
+ broadcastType,
+ maxCapType,
+ maxCap,
+ marginfiClient?.provider.connection
+ );
+
const accountSummary = React.useMemo(() => {
return (
accountSummaryArg ?? (selectedAccount ? computeAccountSummary(selectedAccount, banks) : DEFAULT_ACCOUNT_SUMMARY)
);
}, [accountSummaryArg, selectedAccount, banks]);
- const [setIsSettingsDialogOpen, priorityFee, setPreviousTxn, setIsActionComplete] = useActionBoxStore((state) => [
- state.setIsSettingsDialogOpen,
- state.priorityFee,
+ const [setPreviousTxn, setIsActionComplete] = useActionBoxStore((state) => [
state.setPreviousTxn,
state.setIsActionComplete,
]);
@@ -136,6 +145,8 @@ export const LendBox = ({
lendMode,
actionTxns,
simulationResult,
+ priorityFee,
+ broadcastType,
setSimulationResult,
setActionTxns,
setErrorMessage,
@@ -200,7 +211,8 @@ export const LendBox = ({
params: {
bank: selectedBank,
marginfiAccount: selectedAccount,
- priorityFee: 0,
+ priorityFee,
+ broadcastType,
},
captureEvent: (event, properties) => {
captureEvent && captureEvent(event, properties);
@@ -236,6 +248,8 @@ export const LendBox = ({
}, [
selectedBank,
selectedAccount,
+ priorityFee,
+ broadcastType,
setAmountRaw,
captureEvent,
setIsActionComplete,
@@ -249,6 +263,9 @@ export const LendBox = ({
return;
}
+ console.log("priorityFee", priorityFee);
+ console.log("broadcastType", broadcastType);
+
const action = async () => {
const params = {
marginfiClient,
@@ -259,7 +276,8 @@ export const LendBox = ({
marginfiAccount: selectedAccount,
walletContextState,
actionTxns,
- priorityFee: 0,
+ priorityFee,
+ broadcastType,
} as MarginfiActionParams;
await handleExecuteLendingAction({
@@ -314,6 +332,8 @@ export const LendBox = ({
selectedAccount,
walletContextState,
actionTxns,
+ priorityFee,
+ broadcastType,
captureEvent,
setIsActionComplete,
setPreviousTxn,
@@ -369,8 +389,6 @@ export const LendBox = ({
/>