{/* Modal needs to be rendered outside of the table so that dialog can be used. Otherwise react throws a dom nesting error */}
- {tableInstance.getRowModel().rows.map((row) => {
- const modalId = `${row.original.hyperdriveAddress}-${row.original.assetId}`;
+ {tableInstance.getRowModel().rows.map(({ original }) => {
+ const modalId = `${original.hyperdrive.address}-${original.assetId}`;
return (
);
})}
@@ -288,13 +280,20 @@ function getColumns({
}),
columnHelper.display({
id: "status",
- header: `Status`,
+ header: "Status / Current Balance",
cell: ({ row }) => {
return (
-
+
+
+
+
);
},
}),
diff --git a/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx b/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx
index a393b35b4..b687e7e7a 100644
--- a/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx
+++ b/apps/hyperdrive-trading/src/ui/portfolio/shorts/ShortsContainer.tsx
@@ -8,7 +8,7 @@ import { NonIdealState } from "src/ui/base/components/NonIdealState";
import { NoWalletConnected } from "src/ui/portfolio/NoWalletConnected";
import { PositionContainer } from "src/ui/portfolio/PositionContainer";
import { OpenShortsTableDesktop } from "src/ui/portfolio/shorts/OpenShortsTable/OpenShortsTableDesktop";
-import { usePortfolioShortsData } from "src/ui/portfolio/shorts/usePortfolioShortsData";
+import { usePortfolioShortsSnapshotData } from "src/ui/portfolio/shorts/usePortfolioShortsSnapshotData";
import { Address } from "viem";
export function OpenShortsContainer({
@@ -17,7 +17,7 @@ export function OpenShortsContainer({
account: Address | undefined;
}): ReactElement | null {
const { openShortPositions, openShortPositionsStatus } =
- usePortfolioShortsData({ account });
+ usePortfolioShortsSnapshotData({ account });
const appConfig = useAppConfigForConnectedChain();
const hyperdrivesByChainAndYieldSource = groupBy(
appConfig.hyperdrives,
diff --git a/apps/hyperdrive-trading/src/ui/portfolio/shorts/usePortfolioShortsSnapshotData.ts b/apps/hyperdrive-trading/src/ui/portfolio/shorts/usePortfolioShortsSnapshotData.ts
new file mode 100644
index 000000000..3dd8121f0
--- /dev/null
+++ b/apps/hyperdrive-trading/src/ui/portfolio/shorts/usePortfolioShortsSnapshotData.ts
@@ -0,0 +1,182 @@
+import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
+import { hyperdriveAbi, OpenShort } from "@delvtech/hyperdrive-js";
+import { useQuery } from "@tanstack/react-query";
+import { makeQueryKey, makeQueryKey2 } from "src/base/makeQueryKey";
+import { getDrift } from "src/drift/getDrift";
+import { POSITIONS_SNAPSHOT } from "src/hyperdrive/positionsSnapshot";
+import { useAppConfigForConnectedChain } from "src/ui/appconfig/useAppConfigForConnectedChain";
+import type { OpenShortPositionsData } from "src/ui/portfolio/shorts/usePortfolioShortsData";
+import { Address } from "viem";
+
+export function usePortfolioShortsSnapshotData({
+ account,
+}: {
+ account: Address | undefined;
+}): {
+ openShortPositions: OpenShortPositionsData | undefined;
+ openShortPositionsStatus: "error" | "success" | "loading";
+} {
+ const appConfigForConnectedChain = useAppConfigForConnectedChain();
+ const queryEnabled = !!account && !!appConfigForConnectedChain;
+
+ const { data: openShortPositions, status: openShortPositionsStatus } =
+ useQuery({
+ queryKey: makeQueryKey("portfolioShorts", { account }),
+ enabled: queryEnabled,
+ queryFn: queryEnabled
+ ? async () => {
+ const openShortsByHyperdrive = new Map<
+ HyperdriveConfig,
+ {
+ hyperdrive: HyperdriveConfig;
+ openShorts: OpenShort[];
+ }
+ >();
+
+ await Promise.all(
+ POSITIONS_SNAPSHOT.shorts.map(async (short) => {
+ if (
+ short.accountAddress.toLowerCase() !== account.toLowerCase()
+ ) {
+ return;
+ }
+
+ const hyperdrive = appConfigForConnectedChain.hyperdrives.find(
+ (h) =>
+ h.chainId === short.chainId &&
+ h.address.toLowerCase() ===
+ short.hyperdriveAddress.toLowerCase(),
+ );
+ if (!hyperdrive) {
+ return;
+ }
+
+ const drift = await getDrift({ chainId: short.chainId });
+ const currentBalance = await drift.read({
+ abi: hyperdriveAbi,
+ address: short.hyperdriveAddress,
+ fn: "balanceOf",
+ args: {
+ owner: short.accountAddress,
+ tokenId: short.assetId,
+ },
+ });
+ if (!currentBalance) {
+ return;
+ }
+
+ if (!openShortsByHyperdrive.has(hyperdrive)) {
+ openShortsByHyperdrive.set(hyperdrive, {
+ hyperdrive,
+ openShorts: [],
+ });
+ }
+
+ openShortsByHyperdrive.get(hyperdrive)!.openShorts.push({
+ assetId: short.assetId,
+ baseAmountPaid: short.baseAmountPaid,
+ baseProceeds: short.baseProceeds,
+ bondAmount: short.bondAmount,
+ checkpointTime: short.checkpointTime,
+ fixedRatePaid: short.fixedRatePaid,
+ hyperdriveAddress: short.hyperdriveAddress,
+ maturity: short.maturity,
+ openedTimestamp: short.openedTimestamp,
+ });
+ }),
+ );
+
+ return Array.from(openShortsByHyperdrive.values());
+ }
+ : undefined,
+ });
+ return {
+ openShortPositions,
+ openShortPositionsStatus,
+ };
+}
+
+export function usePortfolioShortsSnapshotDataFromHyperdrives({
+ hyperdrives,
+ account,
+}: {
+ hyperdrives: HyperdriveConfig[];
+ account: Address | undefined;
+}): {
+ openShortPositions:
+ | (OpenShort & { hyperdrive: HyperdriveConfig })[]
+ | undefined;
+ openShortPositionsStatus: "error" | "success" | "loading";
+} {
+ const queryEnabled = !!account && !!hyperdrives.length;
+ const { data: openShortPositions, status: openShortPositionsStatus } =
+ useQuery({
+ queryKey: makeQueryKey2({
+ namespace: "portfolio",
+ queryId: "openShortPositions",
+ params: { account, hyperdrives },
+ }),
+ queryFn: queryEnabled
+ ? async () => {
+ const openShorts: (OpenShort & {
+ hyperdrive: HyperdriveConfig;
+ })[] = [];
+
+ await Promise.all(
+ POSITIONS_SNAPSHOT.shorts.map(async (short) => {
+ if (
+ short.accountAddress.toLowerCase() !== account.toLowerCase()
+ ) {
+ return;
+ }
+
+ const hyperdrive = hyperdrives.find(
+ (h) =>
+ h.chainId === short.chainId &&
+ h.address.toLowerCase() ===
+ short.hyperdriveAddress.toLowerCase(),
+ );
+ if (!hyperdrive) {
+ return;
+ }
+
+ const drift = await getDrift({ chainId: short.chainId });
+ const currentBalance = await drift.read({
+ abi: hyperdriveAbi,
+ address: short.hyperdriveAddress,
+ fn: "balanceOf",
+ args: {
+ owner: short.accountAddress,
+ tokenId: short.assetId,
+ },
+ });
+ if (!currentBalance) {
+ return;
+ }
+
+ openShorts.push({
+ hyperdrive,
+ assetId: short.assetId,
+ baseAmountPaid: short.baseAmountPaid,
+ baseProceeds: short.baseProceeds,
+ bondAmount: short.bondAmount,
+ checkpointTime: short.checkpointTime,
+ fixedRatePaid: short.fixedRatePaid,
+ hyperdriveAddress: short.hyperdriveAddress,
+ maturity: short.maturity,
+ openedTimestamp: short.openedTimestamp,
+ });
+ }),
+ );
+
+ return openShorts;
+ }
+ : undefined,
+ enabled: queryEnabled,
+ });
+
+ return {
+ openShortPositions,
+ openShortPositionsStatus,
+ };
+}