feat: github comments

mrgnlabs · Feb 19, 2025 · d5c0a3f · d5c0a3f
1 parent 6c3bd9b
commit d5c0a3f
Show file tree

Hide file tree

Showing 14 changed files with 649 additions and 378 deletions.
diff --git a/apps/marginfi-v2-trading/src/components/common/trade-box-v2/trade-box.tsx b/apps/marginfi-v2-trading/src/components/common/trade-box-v2/trade-box.tsx
@@ -13,7 +13,7 @@ import { IconSettings } from "@tabler/icons-react";
 import { dynamicNumeralFormatter } from "@mrgnlabs/mrgn-common";
 
 import { ArenaPoolV2 } from "~/types/trade-store.types";
-import {  SimulationStatus, TradeSide } from "~/components/common/trade-box-v2/utils";
+import { SimulationStatus, TradeSide } from "~/components/common/trade-box-v2/utils";
 import { Card, CardContent, CardHeader } from "~/components/ui/card";
 import { useTradeStoreV2, useUiStore } from "~/store";
 import { useWallet, useWalletStore } from "~/components/wallet-v2";
@@ -85,13 +85,7 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
     state.setBorrowBankPk,
     state.setMaxLeverage,
   ]);
-  const [
-    jupiterOptions,
-    platformFeeBps,
-    broadcastType,
-    priorityFees,
-    setDisplaySettings,
-  ] = useUiStore((state) => [
+  const [jupiterOptions, platformFeeBps, broadcastType, priorityFees, setDisplaySettings] = useUiStore((state) => [
     state.jupiterOptions,
     state.platformFeeBps,
     state.broadcastType,
@@ -141,16 +135,16 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
 
   // Loading states
   const [isTransactionExecuting, setIsTransactionExecuting] = React.useState(false);
-  const [isSimulating, setIsSimulating] = React.useState<{
+  const [simulationStatus, setSimulationStatus] = React.useState<{
     isLoading: boolean;
     status: SimulationStatus;
   }>({
     isLoading: false,
     status: SimulationStatus.IDLE,
   });
   const isLoading = React.useMemo(
-    () => isTransactionExecuting || isSimulating.isLoading,
-    [isTransactionExecuting, isSimulating.isLoading]
+    () => isTransactionExecuting || simulationStatus.isLoading,
+    [isTransactionExecuting, simulationStatus.isLoading]
   );
 
   // Memos
@@ -243,7 +237,7 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
     isEnabled: !actionMethods.filter((value) => value.isEnabled === false).length,
     setActionTxns: setActionTxns,
     setErrorMessage: setErrorMessage,
-    setIsLoading: setIsSimulating,
+    setIsLoading: setSimulationStatus,
     setSimulationResult,
     setMaxLeverage,
     tradeState,
@@ -261,10 +255,9 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
   // Trading Actions //
   /////////////////////
   const handleTradeAction = useCallback(() => {
-    if (!depositBank || !actionTxns || !borrowBank || !client) return 
-
+    if (!depositBank || !actionTxns || !borrowBank || !client) return;
 
-    const props : ExecuteTradeActionProps = {
+    const props: ExecuteTradeActionProps = {
       actionTxns,
       attemptUuid: uuidv4(),
       marginfiClient: client,
@@ -278,7 +271,7 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
             wallet,
             groupPk: activePoolExtended.groupPk,
             banks: [activePoolExtended.tokenBank.address, activePoolExtended.quoteBank.address],
-          })
+          });
         },
       },
       infoProps: {
@@ -287,13 +280,27 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
         borrowAmount: dynamicNumeralFormatter(actionTxns.borrowAmount.toNumber()),
         borrowToken: borrowBank.meta.tokenSymbol,
         tradeSide: tradeState,
-      }
-    } 
+      },
+    };
 
     ExecuteTradeAction(props);
 
     setAmountRaw("");
-  }, [depositBank, actionTxns, borrowBank, client, priorityFees, broadcastType, amountRaw, tradeState, setAmountRaw, refreshGroup, connection, wallet, activePoolExtended])
+  }, [
+    depositBank,
+    actionTxns,
+    borrowBank,
+    client,
+    priorityFees,
+    broadcastType,
+    amountRaw,
+    tradeState,
+    setAmountRaw,
+    refreshGroup,
+    connection,
+    wallet,
+    activePoolExtended,
+  ]);
 
   return (
     <Card className="shadow-none border-border w-full">
@@ -327,7 +334,7 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
             <AmountPreview
               tradeSide={tradeState}
               amount={leveragedAmount}
-              isLoading={isLoading && isSimulating.isLoading}
+              isLoading={isLoading && simulationStatus.isLoading}
               depositBank={activePoolExtended.tokenBank}
             />
           )}
@@ -345,7 +352,7 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
                 })
               }
               refreshSimulation={refreshSimulation}
-              isRetrying={isSimulating.isLoading}
+              isRetrying={simulationStatus.isLoading}
               quoteBalance={maxAmount}
               quoteBank={activePoolExtended.quoteBank}
             />
@@ -363,7 +370,7 @@ export const TradeBoxV2 = ({ activePool, side = "long" }: TradeBoxV2Props) => {
           />
           <div className="flex items-center w-full justify-between">
             <ActionSimulationStatus
-              simulationStatus={isSimulating.status}
+              simulationStatus={simulationStatus.status}
               hasErrorMessages={dynamicActionMessages.length > 0}
               isActive={depositBank && amount > 0 ? true : false}
             />

diff --git a/...i-v2-ui/src/components/common/Portfolio/components/move-position/move-position-dialog.tsx b/...i-v2-ui/src/components/common/Portfolio/components/move-position/move-position-dialog.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 
 import { Transaction, VersionedTransaction } from "@solana/web3.js";
+import { v4 as uuidv4 } from "uuid";
 
 import {
   usdFormatter,
@@ -15,6 +16,8 @@ import {
   captureSentryException,
   checkLendActionAvailable,
   composeExplorerUrl,
+  ExecuteMovePositionAction,
+  ExecuteMovePositionActionProps,
   extractErrorString,
 } from "@mrgnlabs/mrgn-utils";
 import { MarginfiAccountWrapper, MarginfiClient } from "@mrgnlabs/marginfi-client-v2";
@@ -134,54 +137,44 @@ export const MovePositionDialog = ({
 
   const handleMovePosition = React.useCallback(async () => {
     if (!marginfiClient || !accountToMoveTo || !actionTxns || !broadcastType || !priorityFees) {
+      console.error("Missing required props for ExecuteMovePositionAction");
       return;
     }
 
-    const processOpts = { ...priorityFees, broadcastType };
+    const props: ExecuteMovePositionActionProps = {
+      actionTxns: { transactions: actionTxns },
+      attemptUuid: uuidv4(),
+      marginfiClient,
+      processOpts: { ...priorityFees, broadcastType },
+      txOpts: {},
+      infoProps: {
+        originAccountAddress: shortenAddress(selectedAccount?.address.toBase58() ?? ""),
+        destinationAccountAddress: shortenAddress(accountToMoveTo?.address.toBase58() ?? ""),
+      },
+      callbacks: {
+        onComplete: () => {
+          fetchMrgnlendState();
+        },
+      },
+    };
 
-    const multiStepToast = toastManager.createMultiStepToast("Moving position", [
-      { label: "Signing transaction" },
-      { label: `Withdrawing from account ${shortenAddress(selectedAccount?.address.toBase58() ?? "", 8)}` },
-      { label: `Depositing to account ${shortenAddress(accountToMoveTo?.address.toBase58(), 8)}` },
-      { label: "Updating accounts" },
-    ]);
-    multiStepToast.start();
-    setIsExecutionLoading(true);
-    try {
-      const sigs = await marginfiClient.processTransactions(actionTxns, {
-        ...processOpts,
-        callback: (index, success, sig, stepsToAdvance) =>
-          success && multiStepToast.successAndNext(stepsToAdvance,  composeExplorerUrl(sig), sig),
-      });
-      await fetchMrgnlendState();
-      multiStepToast.success();
-      setIsOpen(false);
-    } catch (error) {
-      const msg = extractErrorString(error);
-      console.error("Error moving position between accounts", msg);
-      multiStepToast.setFailed(msg);
-      captureSentryException(error, msg, {
-        action: "movePosition",
-        wallet: marginfiClient?.wallet.publicKey.toBase58(),
-      });
-    } finally {
-      setIsExecutionLoading(false);
-    }
+    ExecuteMovePositionAction(props);
+    setIsOpen(false);
   }, [
     marginfiClient,
     accountToMoveTo,
     actionTxns,
     broadcastType,
     priorityFees,
-    selectedAccount?.address,
+    selectedAccount,
     fetchMrgnlendState,
     setIsOpen,
   ]);
 
   React.useEffect(() => {
     if (!accountToMoveTo) return;
     handleSimulateTxns();
-  }, [accountToMoveTo]);
+  }, [accountToMoveTo, handleSimulateTxns]);
 
   return (
     <Dialog
@@ -262,8 +255,8 @@ export const MovePositionDialog = ({
                   actionSummary.health >= 0.5
                     ? "text-success"
                     : actionSummary.health >= 0.25
-                    ? "text-alert-foreground"
-                    : "text-destructive-foreground"
+                      ? "text-alert-foreground"
+                      : "text-destructive-foreground"
                 }`}
               >
                 <>

diff --git a/apps/marginfi-v2-ui/src/components/common/Portfolio/lending-portfolio.tsx b/apps/marginfi-v2-ui/src/components/common/Portfolio/lending-portfolio.tsx
@@ -1,13 +1,20 @@
 import React from "react";
 import Link from "next/link";
+import { v4 as uuidv4 } from "uuid";
 
 import { IconInfoCircle, IconX } from "@tabler/icons-react";
 import { Id, toast } from "react-toastify";
 
 import { numeralFormatter, SolanaTransaction } from "@mrgnlabs/mrgn-common";
 import { usdFormatter, usdFormatterDyn } from "@mrgnlabs/mrgn-common";
 import { ActionType, ActiveBankInfo } from "@mrgnlabs/marginfi-v2-ui-state";
-import { cn, usePrevious } from "@mrgnlabs/mrgn-utils";
+import {
+  cn,
+  ExecuteActionProps,
+  ExecuteCollectRewardsAction,
+  ExecuteLoopActionProps,
+  usePrevious,
+} from "@mrgnlabs/mrgn-utils";
 
 import { useMrgnlendStore, useUiStore, useUserProfileStore } from "~/store";
 
@@ -102,14 +109,26 @@ export const LendingPortfolio = () => {
     }
   }, [handleSimulation, marginfiClient, selectedAccount, shouldFetchRewards]);
 
-  const handleCollectExecution = React.useCallback(async () => {
+  const handleCollectRewardsAction = React.useCallback(async () => {
     if (!marginfiClient || !actionTxn) return;
-    await executeCollectTxn(marginfiClient, actionTxn, { ...priorityFees, broadcastType }, setRewardsLoading, () => {
-      setRewardsDialogOpen(false);
-    });
-    setRewardsState(initialRewardsState);
-    handleSimulation();
-  }, [marginfiClient, actionTxn, priorityFees, broadcastType, handleSimulation]);
+    const props: ExecuteActionProps = {
+      marginfiClient,
+      actionTxns: { transactions: [actionTxn] },
+      attemptUuid: uuidv4(),
+      processOpts: { ...priorityFees, broadcastType },
+      txOpts: {},
+      callbacks: {
+        onComplete: () => {
+          setRewardsState(initialRewardsState);
+          handleSimulation();
+        },
+      },
+    };
+
+    ExecuteCollectRewardsAction(props);
+
+    setRewardsDialogOpen(false);
+  }, [marginfiClient, actionTxn, priorityFees, broadcastType, handleSimulation, setRewardsDialogOpen]);
 
   const lendingBanks = React.useMemo(
     () =>
@@ -466,7 +485,7 @@ export const LendingPortfolio = () => {
           onOpenChange={(open) => {
             setRewardsDialogOpen(open);
           }}
-          onCollect={handleCollectExecution}
+          onCollect={handleCollectRewardsAction}
           isLoading={rewardsLoading}
         />
       </div>

diff --git a/packages/marginfi-client-v2/src/models/account/wrapper.ts b/packages/marginfi-client-v2/src/models/account/wrapper.ts
@@ -111,7 +111,11 @@ class MarginfiAccountWrapper {
   /**
    * @internal
    */
-  constructor(marginfiAccountPk: PublicKey, private readonly client: MarginfiClient, marginfiAccount: MarginfiAccount) {
+  constructor(
+    marginfiAccountPk: PublicKey,
+    private readonly client: MarginfiClient,
+    marginfiAccount: MarginfiAccount
+  ) {
     this.address = marginfiAccountPk;
     this._marginfiAccount = marginfiAccount;
   }
@@ -477,7 +481,7 @@ class MarginfiAccountWrapper {
       {
         signers: withdrawIxs.keys,
         addressLookupTables: lookupTables,
-        type: TransactionType.WITHDRAW,
+        type: TransactionType.MOVE_POSITION_WITHDRAW,
       }
     );
 
@@ -486,7 +490,7 @@ class MarginfiAccountWrapper {
     const depositTx = addTransactionMetadata(tx, {
       signers: depositIx.keys,
       addressLookupTables: lookupTables,
-      type: TransactionType.MOVE_POSITION,
+      type: TransactionType.MOVE_POSITION_DEPOSIT,
     });
 
     const transactions = [...feedCrankTxs, withdrawTx, depositTx];