Skip to content

feat: Public Allocator — withdraw + borrow integration #335

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
antoncoding merged 11 commits into from
Jan 28, 2026
Merged

feat: Public Allocator — withdraw + borrow integration #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fd6876f
chore: default usePublicAllocator to true, uncomment settings toggle
Jan 28, 2026
c439b5c
feat: integrate Public Allocator with withdraw and borrow flows
Jan 28, 2026
240b24d
fix: auto-trigger withdraw step 2 after sourcing succeeds
Jan 28, 2026
40620d3
fix: integrate ProcessModal into withdraw flow for PA sourcing
Jan 28, 2026
4800ae3
fix: seamless 2-step withdraw flow — single click, auto-proceed
Jan 28, 2026
e233449
feat: +PA indicator with liquidity icon and hoverable tooltip
Jan 28, 2026
0cf7de8
feat: show +PA liquidity indicator in MarketDetailsBlock
Jan 28, 2026
5cc5435
misc: fix icon
antoncoding Jan 28, 2026
846e3c4
fix: guard against undefined collateralAsset in PA sourcing
Jan 28, 2026
c0393f7
fix: use zeroAddress fallback for idle market collateralAsset
Jan 28, 2026
2d1ae8f
fix: use z-[2000] instead of z-2000 for Tailwind v4 compat
Jan 28, 2026
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
190 changes: 8 additions & 182 deletions src/features/market-detail/components/pull-liquidity-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@ import { Spinner } from '@/components/ui/spinner';
import { TokenIcon } from '@/components/shared/token-icon';
import { ExecuteTransactionButton } from '@/components/ui/ExecuteTransactionButton';
import { usePublicAllocator } from '@/hooks/usePublicAllocator';
import { usePublicAllocatorVaults, type ProcessedPublicAllocatorVault } from '@/hooks/usePublicAllocatorVaults';
import { usePublicAllocatorLiveData, type LiveMarketData } from '@/hooks/usePublicAllocatorLiveData';
import { usePublicAllocatorVaults } from '@/hooks/usePublicAllocatorVaults';
import { usePublicAllocatorLiveData } from '@/hooks/usePublicAllocatorLiveData';
import { PUBLIC_ALLOCATOR_ADDRESSES } from '@/constants/public-allocator';
import {
getVaultPullableAmount,
getVaultPullableAmountLive,
autoAllocateWithdrawals,
autoAllocateWithdrawalsLive,
} from '@/utils/public-allocator';
import type { Market } from '@/utils/types';
import type { SupportedNetworks } from '@/utils/networks';

Expand All @@ -24,186 +30,6 @@ type PullLiquidityModalProps = {
onSuccess?: () => void;
};

/**
* Calculate max pullable liquidity from a vault into the target market (API data only).
*
* Bounded by:
* 1. Per-source: min(flowCap.maxOut, vaultSupply, marketLiquidity)
* 2. Target market: flowCap.maxIn
* 3. Target market: supplyCap - currentSupply (remaining vault capacity)
*/
function getVaultPullableAmount(vault: ProcessedPublicAllocatorVault, targetMarketKey: string): bigint {
let total = 0n;

for (const alloc of vault.state.allocation) {
if (alloc.market.uniqueKey === targetMarketKey) continue;

const cap = vault.flowCapsByMarket.get(alloc.market.uniqueKey);
if (!cap || cap.maxOut === 0n) continue;

const vaultSupply = BigInt(alloc.supplyAssets);
const liquidity = BigInt(alloc.market.state.liquidityAssets);

let pullable = cap.maxOut;
if (vaultSupply < pullable) pullable = vaultSupply;
if (liquidity < pullable) pullable = liquidity;
if (pullable > 0n) total += pullable;
}

// Cap by target market's maxIn flow cap
const targetCap = vault.flowCapsByMarket.get(targetMarketKey);
if (!targetCap) {
return 0n;
}
if (total > targetCap.maxIn) {
total = targetCap.maxIn;
}

// Cap by remaining supply cap for the target market in this vault
const targetAlloc = vault.state.allocation.find((a) => a.market.uniqueKey === targetMarketKey);
if (targetAlloc) {
const supplyCap = BigInt(targetAlloc.supplyCap);
const currentSupply = BigInt(targetAlloc.supplyAssets);
const remainingCap = supplyCap > currentSupply ? supplyCap - currentSupply : 0n;
if (total > remainingCap) total = remainingCap;
}

return total;
}

/**
* Calculate max pullable liquidity using live on-chain data for flow caps,
* vault supply, and market liquidity.
*
* Falls back to API values for supply cap constraints (which are less volatile).
*/
function getVaultPullableAmountLive(
vault: ProcessedPublicAllocatorVault,
targetMarketKey: string,
liveData: Map<string, LiveMarketData>,
): bigint {
let total = 0n;

for (const alloc of vault.state.allocation) {
if (alloc.market.uniqueKey === targetMarketKey) continue;

const live = liveData.get(alloc.market.uniqueKey);
if (!live || live.maxOut === 0n) continue;

let pullable = live.maxOut;
if (live.vaultSupplyAssets < pullable) pullable = live.vaultSupplyAssets;
if (live.marketLiquidity < pullable) pullable = live.marketLiquidity;
if (pullable > 0n) total += pullable;
}

// Cap by target market's live maxIn flow cap
const targetLive = liveData.get(targetMarketKey);
if (!targetLive) {
return 0n;
}
if (total > targetLive.maxIn) {
total = targetLive.maxIn;
}

// Cap by remaining supply cap (uses API data — supply caps rarely change)
const targetAlloc = vault.state.allocation.find((a) => a.market.uniqueKey === targetMarketKey);
if (targetAlloc) {
const supplyCap = BigInt(targetAlloc.supplyCap);
// Use live supply if available, fall back to API
const currentSupply = targetLive.vaultSupplyAssets;
const remainingCap = supplyCap > currentSupply ? supplyCap - currentSupply : 0n;
if (total > remainingCap) total = remainingCap;
}

return total;
}

/**
* Auto-allocate a pull amount across source markets greedily (API data).
* Pulls from the most liquid source first.
*/
function autoAllocateWithdrawals(
vault: ProcessedPublicAllocatorVault,
targetMarketKey: string,
requestedAmount: bigint,
): { marketKey: string; amount: bigint }[] {
const sources: { marketKey: string; maxPullable: bigint }[] = [];

for (const alloc of vault.state.allocation) {
if (alloc.market.uniqueKey === targetMarketKey) continue;

const cap = vault.flowCapsByMarket.get(alloc.market.uniqueKey);
if (!cap || cap.maxOut === 0n) continue;

const vaultSupply = BigInt(alloc.supplyAssets);
const liquidity = BigInt(alloc.market.state.liquidityAssets);

let maxPullable = cap.maxOut;
if (vaultSupply < maxPullable) maxPullable = vaultSupply;
if (liquidity < maxPullable) maxPullable = liquidity;

if (maxPullable > 0n) {
sources.push({ marketKey: alloc.market.uniqueKey, maxPullable });
}
}

sources.sort((a, b) => (b.maxPullable > a.maxPullable ? 1 : b.maxPullable < a.maxPullable ? -1 : 0));

const withdrawals: { marketKey: string; amount: bigint }[] = [];
let remaining = requestedAmount;

for (const source of sources) {
if (remaining <= 0n) break;
const pullAmount = remaining < source.maxPullable ? remaining : source.maxPullable;
withdrawals.push({ marketKey: source.marketKey, amount: pullAmount });
remaining -= pullAmount;
}

return withdrawals;
}

/**
* Auto-allocate a pull amount across source markets using live on-chain data.
* Same greedy algorithm but uses RPC-verified flow caps, supply, and liquidity.
*/
function autoAllocateWithdrawalsLive(
vault: ProcessedPublicAllocatorVault,
targetMarketKey: string,
requestedAmount: bigint,
liveData: Map<string, LiveMarketData>,
): { marketKey: string; amount: bigint }[] {
const sources: { marketKey: string; maxPullable: bigint }[] = [];

for (const alloc of vault.state.allocation) {
if (alloc.market.uniqueKey === targetMarketKey) continue;

const live = liveData.get(alloc.market.uniqueKey);
if (!live || live.maxOut === 0n) continue;

let maxPullable = live.maxOut;
if (live.vaultSupplyAssets < maxPullable) maxPullable = live.vaultSupplyAssets;
if (live.marketLiquidity < maxPullable) maxPullable = live.marketLiquidity;

if (maxPullable > 0n) {
sources.push({ marketKey: alloc.market.uniqueKey, maxPullable });
}
}

sources.sort((a, b) => (b.maxPullable > a.maxPullable ? 1 : b.maxPullable < a.maxPullable ? -1 : 0));

const withdrawals: { marketKey: string; amount: bigint }[] = [];
let remaining = requestedAmount;

for (const source of sources) {
if (remaining <= 0n) break;
const pullAmount = remaining < source.maxPullable ? remaining : source.maxPullable;
withdrawals.push({ marketKey: source.marketKey, amount: pullAmount });
remaining -= pullAmount;
}

return withdrawals;
}

/**
* Modal for pulling liquidity into a market via the Public Allocator.
*
Expand Down
7 changes: 6 additions & 1 deletion src/features/market-detail/market-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { SuppliersTable } from '@/features/market-detail/components/suppliers-ta
import SupplierFiltersModal from '@/features/market-detail/components/filters/supplier-filters-modal';
import TransactionFiltersModal from '@/features/market-detail/components/filters/transaction-filters-modal';
import { useMarketWarnings } from '@/hooks/useMarketWarnings';
import { useMarketLiquiditySourcing } from '@/hooks/useMarketLiquiditySourcing';
import { useAllMarketBorrowers, useAllMarketSuppliers } from '@/hooks/useAllMarketPositions';
import { MarketHeader } from './components/market-header';
import { PullLiquidityModal } from './components/pull-liquidity-modal';
Expand Down Expand Up @@ -85,6 +86,9 @@ function MarketContent() {
// Get all warnings for this market (hook handles undefined market)
const allWarnings = useMarketWarnings(market);

// Pre-fetch Public Allocator data eagerly so modals have instant access
const liquiditySourcing = useMarketLiquiditySourcing(market ?? undefined, network);

// Get dynamic chart colors
const chartColors = useChartColors();

Expand Down Expand Up @@ -260,7 +264,7 @@ function MarketContent() {

// Handlers for supply/borrow actions
const handleSupplyClick = () => {
openModal('supply', { market, position: userPosition, isMarketPage: true, refetch: handleRefreshAllSync });
openModal('supply', { market, position: userPosition, isMarketPage: true, refetch: handleRefreshAllSync, liquiditySourcing });
};

const handleBorrowClick = () => {
Expand Down Expand Up @@ -317,6 +321,7 @@ function MarketContent() {
refetch={handleRefreshAllSync}
isRefreshing={isRefreshing}
position={userPosition}
liquiditySourcing={liquiditySourcing}
/>
)}

Expand Down
39 changes: 27 additions & 12 deletions src/features/markets/components/market-details-block.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { useState, useMemo } from 'react';
import { ChevronDownIcon, ChevronUpIcon, ExternalLinkIcon } from '@radix-ui/react-icons';
import { LuDroplets } from 'react-icons/lu';
import { motion, AnimatePresence } from 'framer-motion';
import { formatUnits } from 'viem';
import { useMarketCampaigns } from '@/hooks/useMarketCampaigns';
import { useAppSettings } from '@/stores/useAppSettings';
import { useRateLabel } from '@/hooks/useRateLabel';
import { Tooltip } from '@/components/ui/tooltip';
import { formatBalance, formatReadable } from '@/utils/balance';
import { getIRMTitle, previewMarketState } from '@/utils/morpho';
import { getTruncatedAssetName } from '@/utils/oracle';
Expand All @@ -22,6 +24,8 @@ type MarketDetailsBlockProps = {
disableExpansion?: boolean;
supplyDelta?: bigint;
borrowDelta?: bigint;
/** Extra liquidity available from Public Allocator vaults (in raw token units) */
extraLiquidity?: bigint;
};

export function MarketDetailsBlock({
Expand All @@ -33,6 +37,7 @@ export function MarketDetailsBlock({
disableExpansion = false,
supplyDelta,
borrowDelta,
extraLiquidity,
}: MarketDetailsBlockProps): JSX.Element {
const [isExpanded, setIsExpanded] = useState(!defaultCollapsed && !disableExpansion);

Expand Down Expand Up @@ -240,19 +245,29 @@ export function MarketDetailsBlock({
</div>
<div className="flex items-start justify-between">
<p className="font-zen text-sm opacity-50">Liquidity:</p>
{previewState !== null ? (
<p className="text-right font-zen text-sm">
<span className="line-through opacity-50">
<div className="flex items-center gap-1">
{previewState !== null ? (
<p className="text-right font-zen text-sm">
<span className="line-through opacity-50">
{formatReadable(formatBalance(market.state.liquidityAssets, market.loanAsset.decimals))}
</span>
{' → '}
<span>{formatReadable(formatBalance(previewState.liquidityAssets.toString(), market.loanAsset.decimals))}</span>
</p>
) : (
<p className="text-right font-zen text-sm">
{formatReadable(formatBalance(market.state.liquidityAssets, market.loanAsset.decimals))}
</span>
{' → '}
<span>{formatReadable(formatBalance(previewState.liquidityAssets.toString(), market.loanAsset.decimals))}</span>
</p>
) : (
<p className="text-right font-zen text-sm">
{formatReadable(formatBalance(market.state.liquidityAssets, market.loanAsset.decimals))}
</p>
)}
</p>
)}
{extraLiquidity != null && extraLiquidity > 0n && (
<Tooltip
className="z-[2000]"
content={`+${formatReadable(formatBalance(extraLiquidity.toString(), market.loanAsset.decimals))} ${market.loanAsset.symbol} available from Public Allocator vaults`}
>
<LuDroplets className="mr-0.5 h-3 w-3" />
</Tooltip>
)}
Comment thread
antoncoding marked this conversation as resolved.
</div>
</div>
<div className="flex items-start justify-between">
<p className="font-zen text-sm opacity-50">Utilization:</p>
Expand Down
19 changes: 17 additions & 2 deletions src/hooks/useBorrowTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ import { useStyledToast } from './useStyledToast';
import { useTransactionWithToast } from './useTransactionWithToast';
import { useUserMarketsCache } from '@/stores/useUserMarketsCache';
import { useTransactionTracking } from '@/hooks/useTransactionTracking';
import type { LiquiditySourcingResult } from '@/hooks/useMarketLiquiditySourcing';

type UseBorrowTransactionProps = {
market: Market;
collateralAmount: bigint;
borrowAmount: bigint;
onSuccess?: () => void;
liquiditySourcing?: LiquiditySourcingResult;
};

// Define step types similar to useRebalance
Expand All @@ -30,7 +32,7 @@ export type BorrowStepType =
| 'approve_token' // For standard flow: Step 2 (if needed)
| 'execute'; // Common final step

export function useBorrowTransaction({ market, collateralAmount, borrowAmount, onSuccess }: UseBorrowTransactionProps) {
export function useBorrowTransaction({ market, collateralAmount, borrowAmount, onSuccess, liquiditySourcing }: UseBorrowTransactionProps) {
const { usePermit2: usePermit2Setting } = useAppSettings();
const [useEth, setUseEth] = useState<boolean>(false);

Expand Down Expand Up @@ -133,6 +135,18 @@ export function useBorrowTransaction({ market, collateralAmount, borrowAmount, o

try {
const transactions: `0x${string}`[] = [];
let reallocationFee = 0n;

// --- Public Allocator: prepend reallocateTo if borrow exceeds market liquidity ---
const marketLiquidity = BigInt(market.state.liquidityAssets);
if (borrowAmount > 0n && borrowAmount > marketLiquidity && liquiditySourcing?.canSourceLiquidity) {
const extraNeeded = borrowAmount - marketLiquidity;
const reallocation = liquiditySourcing.computeReallocation(extraNeeded);
if (reallocation) {
transactions.push(reallocation.bundlerCalldata);
reallocationFee = reallocation.fee;
}
}

// --- ETH Flow: Skip permit2/ERC20 approval, native ETH can't be permit-signed ---
if (useEth) {
Expand Down Expand Up @@ -278,7 +292,7 @@ export function useBorrowTransaction({ market, collateralAmount, borrowAmount, o
functionName: 'multicall',
args: [transactions],
}) + MONARCH_TX_IDENTIFIER) as `0x${string}`,
value: useEth ? collateralAmount : 0n,
value: (useEth ? collateralAmount : 0n) + reallocationFee,
});

batchAddUserMarkets([
Expand Down Expand Up @@ -316,6 +330,7 @@ export function useBorrowTransaction({ market, collateralAmount, borrowAmount, o
bundlerAddress,
toast,
tracking,
liquiditySourcing,
]);

// Combined approval and borrow flow
Expand Down
Loading