Skip to content

fix: gas bigint throwing #298

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 3 commits into from
Jan 14, 2026
Merged

fix: gas bigint throwing #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cc15f0
fix: gas bigint throwing
antoncoding Jan 14, 2026
71e92fb
chore: lint
antoncoding Jan 14, 2026
a962578
chore: cleanup
antoncoding Jan 14, 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
14 changes: 8 additions & 6 deletions src/features/markets/components/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ export enum SortColumn {

export const GAS_COSTS = {
// direct supply through bundler, no approval
BUNDLER_SUPPLY: 180_000,
BUNDLER_SUPPLY: 180_000n,

// An additional supply through the bundler, already approved
SINGLE_SUPPLY: 80_000,
SINGLE_SUPPLY: 80_000n,

SINGLE_WITHDRAW: 100_000,
SINGLE_WITHDRAW: 100_000n,

// single withdraw + supply
BUNDLER_REBALANCE: 240_000,
BUNDLER_REBALANCE: 240_000n,

// directly borrow from Morpho Blue
DIRECT_WITHDRAW: 100_000,
DIRECT_WITHDRAW: 100_000n,
};

// additional multiplier for buffer gas. Rabby uses 1.5
export const GAS_MULTIPLIER = 1.4;
// Using fraction (14/10) to avoid floating-point precision issues with BigInt
export const GAS_MULTIPLIER_NUMERATOR = 14n;
export const GAS_MULTIPLIER_DENOMINATOR = 10n;
8 changes: 4 additions & 4 deletions src/hooks/useMultiMarketSupply.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { formatBalance } from '@/utils/balance';
import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
import { SupportedNetworks } from '@/utils/networks';
import type { Market } from '@/utils/types';
import { GAS_COSTS, GAS_MULTIPLIER } from '@/features/markets/components/constants';
import { GAS_COSTS, GAS_MULTIPLIER_NUMERATOR, GAS_MULTIPLIER_DENOMINATOR } from '@/features/markets/components/constants';
import { useERC20Approval } from './useERC20Approval';
import { useStyledToast } from './useStyledToast';
import { useUserMarketsCache } from '@/stores/useUserMarketsCache';
Expand Down Expand Up @@ -76,7 +76,7 @@ export function useMultiMarketSupply(

const txs: `0x${string}`[] = [];

let gas = undefined;
let gas: bigint | undefined = undefined;

try {
// Handle ETH wrapping if needed
Expand Down Expand Up @@ -121,7 +121,7 @@ export function useMultiMarketSupply(
);

const numOfSupplies = supplies.length;
gas = GAS_COSTS.BUNDLER_SUPPLY + GAS_COSTS.SINGLE_SUPPLY * (numOfSupplies - 1);
gas = GAS_COSTS.BUNDLER_SUPPLY + GAS_COSTS.SINGLE_SUPPLY * BigInt(numOfSupplies - 1);
}

tracking.update('supplying');
Expand Down Expand Up @@ -164,7 +164,7 @@ export function useMultiMarketSupply(
value: useEth ? totalAmount : 0n,

// Only add gas for standard approval flow -> skip gas estimation
gas: gas ? BigInt(gas * GAS_MULTIPLIER) : undefined,
gas: gas ? (gas * GAS_MULTIPLIER_NUMERATOR) / GAS_MULTIPLIER_DENOMINATOR : undefined,
});

batchAddUserMarkets(
Expand Down
12 changes: 6 additions & 6 deletions src/hooks/useRebalance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useTransactionWithToast } from '@/hooks/useTransactionWithToast';
import { useTransactionTracking } from '@/hooks/useTransactionTracking';
import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
import type { GroupedPosition, RebalanceAction } from '@/utils/types';
import { GAS_COSTS, GAS_MULTIPLIER } from '@/features/markets/components/constants';
import { GAS_COSTS, GAS_MULTIPLIER_NUMERATOR, GAS_MULTIPLIER_DENOMINATOR } from '@/features/markets/components/constants';
import { useERC20Approval } from './useERC20Approval';
import { useMorphoAuthorization } from './useMorphoAuthorization';
import { usePermit2 } from './usePermit2';
Expand Down Expand Up @@ -255,7 +255,7 @@ export const useRebalance = (groupedPosition: GroupedPosition, onRebalance?: ()
try {
const { withdrawTxs, supplyTxs, allMarketKeys } = generateRebalanceTxData();

let multicallGas = undefined;
let multicallGas: bigint | undefined = undefined;

if (usePermit2Setting) {
// --- Permit2 Flow ---
Expand Down Expand Up @@ -318,14 +318,14 @@ export const useRebalance = (groupedPosition: GroupedPosition, onRebalance?: ()
multicallGas = GAS_COSTS.BUNDLER_REBALANCE;

if (supplyTxs.length > 1) {
multicallGas += GAS_COSTS.SINGLE_SUPPLY * (supplyTxs.length - 1);
multicallGas += GAS_COSTS.SINGLE_SUPPLY * BigInt(supplyTxs.length - 1);
}

if (withdrawTxs.length > 1) {
multicallGas += GAS_COSTS.SINGLE_WITHDRAW * (withdrawTxs.length - 1);
multicallGas += GAS_COSTS.SINGLE_WITHDRAW * BigInt(withdrawTxs.length - 1);
}

console.log('multicallGas', multicallGas);
console.log('multicallGas', multicallGas.toString());
}

// Step Final: Execute multicall
Expand All @@ -341,7 +341,7 @@ export const useRebalance = (groupedPosition: GroupedPosition, onRebalance?: ()
to: bundlerAddress,
data: multicallTx,
chainId: groupedPosition.chainId,
gas: multicallGas ? BigInt(multicallGas * GAS_MULTIPLIER) : undefined,
gas: multicallGas ? (multicallGas * GAS_MULTIPLIER_NUMERATOR) / GAS_MULTIPLIER_DENOMINATOR : undefined,
});

batchAddUserMarkets(
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/useSupplyMarket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useTransactionTracking } from '@/hooks/useTransactionTracking';
import { formatBalance } from '@/utils/balance';
import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
import type { Market } from '@/utils/types';
import { GAS_COSTS, GAS_MULTIPLIER } from '@/features/markets/components/constants';
import { GAS_COSTS, GAS_MULTIPLIER_NUMERATOR, GAS_MULTIPLIER_DENOMINATOR } from '@/features/markets/components/constants';

export type SupplyStepType = 'approve' | 'signing' | 'supplying';

Expand Down Expand Up @@ -163,7 +163,7 @@ export function useSupplyMarket(market: Market, onSuccess?: () => void): UseSupp
try {
const txs: `0x${string}`[] = [];

let gas = undefined;
let gas: bigint | undefined = undefined;

if (useEth) {
txs.push(
Expand Down Expand Up @@ -244,7 +244,7 @@ export function useSupplyMarket(market: Market, onSuccess?: () => void): UseSupp
value: useEth ? supplyAmount : 0n,

// Only add gas for standard approval flow -> skip gas estimation
gas: gas ? BigInt(gas * GAS_MULTIPLIER) : undefined,
gas: gas ? (gas * GAS_MULTIPLIER_NUMERATOR) / GAS_MULTIPLIER_DENOMINATOR : undefined,
});

batchAddUserMarkets([
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/useVaultV2Deposit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useTransactionWithToast } from '@/hooks/useTransactionWithToast';
import { useTransactionTracking } from '@/hooks/useTransactionTracking';
import { formatBalance } from '@/utils/balance';
import { getBundlerV2, MONARCH_TX_IDENTIFIER } from '@/utils/morpho';
import { GAS_COSTS, GAS_MULTIPLIER } from '@/features/markets/components/constants';
import { GAS_COSTS, GAS_MULTIPLIER_NUMERATOR, GAS_MULTIPLIER_DENOMINATOR } from '@/features/markets/components/constants';

export type VaultDepositStepType = 'approve' | 'signing' | 'depositing';

Expand Down Expand Up @@ -141,7 +141,7 @@ export function useVaultV2Deposit({
const executeDepositTransaction = useCallback(async () => {
try {
const txs: `0x${string}`[] = [];
let gas = undefined;
let gas: bigint | undefined = undefined;

if (usePermit2Setting) {
// Permit2 flow: Sign permit and use bundler to deposit
Expand Down Expand Up @@ -200,7 +200,7 @@ export function useVaultV2Deposit({
value: 0n,

// Only add gas for standard approval flow -> skip gas estimation
gas: gas ? BigInt(gas * GAS_MULTIPLIER) : undefined,
gas: gas ? (gas * GAS_MULTIPLIER_NUMERATOR) / GAS_MULTIPLIER_DENOMINATOR : undefined,
});

tracking.complete();
Expand Down