@exponent-labs/market-three-math 0.9.11 → 0.9.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/addLiquidity.d.ts +5 -1
- package/build/addLiquidity.js +94 -37
- package/build/addLiquidity.js.map +1 -1
- package/build/bisect.js +1 -2
- package/build/bisect.js.map +1 -1
- package/build/liquidityHistogram.js +2 -3
- package/build/liquidityHistogram.js.map +1 -1
- package/build/quote.js +2 -2
- package/build/quote.js.map +1 -1
- package/build/swap.js +1 -2
- package/build/swap.js.map +1 -1
- package/build/swapV2.js +145 -65
- package/build/swapV2.js.map +1 -1
- package/build/utils.js +17 -17
- package/build/utils.js.map +1 -1
- package/build/utilsV2.js +4 -4
- package/build/utilsV2.js.map +1 -1
- package/build/withdrawLiquidity.js +1 -2
- package/build/withdrawLiquidity.js.map +1 -1
- package/build/ytTrades.js +3 -4
- package/build/ytTrades.js.map +1 -1
- package/build/ytTradesLegacy.js +3 -4
- package/build/ytTradesLegacy.js.map +1 -1
- package/package.json +2 -2
- package/src/addLiquidity.ts +109 -31
- package/src/swapV2.ts +192 -110
package/build/utilsV2.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.TicksWrapper = exports.EffSnap = void 0;
|
|
4
|
+
exports.normalizedTimeRemaining = normalizedTimeRemaining;
|
|
5
|
+
exports.calculateFeeRate = calculateFeeRate;
|
|
6
|
+
exports.getFeeFromAmount = getFeeFromAmount;
|
|
4
7
|
const SECONDS_PER_YEAR = 365 * 24 * 60 * 60;
|
|
5
8
|
const TICK_KEY_BASE_POINTS = 1_000_000;
|
|
6
9
|
const PRECISE_NUMBER_DENOM = 1000000000000000000n;
|
|
@@ -282,7 +285,6 @@ exports.TicksWrapper = TicksWrapper;
|
|
|
282
285
|
function normalizedTimeRemaining(secondsRemaining) {
|
|
283
286
|
return secondsRemaining / SECONDS_PER_YEAR;
|
|
284
287
|
}
|
|
285
|
-
exports.normalizedTimeRemaining = normalizedTimeRemaining;
|
|
286
288
|
/**
|
|
287
289
|
* Calculate current fee rate
|
|
288
290
|
*/
|
|
@@ -290,7 +292,6 @@ function calculateFeeRate(lnFeeRateRoot, secondsRemaining) {
|
|
|
290
292
|
const timeFactor = normalizedTimeRemaining(secondsRemaining);
|
|
291
293
|
return Math.exp(lnFeeRateRoot * timeFactor);
|
|
292
294
|
}
|
|
293
|
-
exports.calculateFeeRate = calculateFeeRate;
|
|
294
295
|
/**
|
|
295
296
|
* Calculate fee from amount
|
|
296
297
|
* Mirrors Rust: ((amount as f64) * (fee_rate - 1.0)).ceil() as u64
|
|
@@ -298,5 +299,4 @@ exports.calculateFeeRate = calculateFeeRate;
|
|
|
298
299
|
function getFeeFromAmount(amount, feeRate) {
|
|
299
300
|
return Math.ceil(amount * (feeRate - 1.0));
|
|
300
301
|
}
|
|
301
|
-
exports.getFeeFromAmount = getFeeFromAmount;
|
|
302
302
|
//# sourceMappingURL=utilsV2.js.map
|
package/build/utilsV2.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilsV2.js","sourceRoot":"","sources":["../src/utilsV2.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utilsV2.js","sourceRoot":"","sources":["../src/utilsV2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPtAndSyOnWithdrawLiquidity =
|
|
3
|
+
exports.getPtAndSyOnWithdrawLiquidity = getPtAndSyOnWithdrawLiquidity;
|
|
4
4
|
const utils_1 = require("./utils");
|
|
5
5
|
function projectAnchorSharesToCurrentTicks(ticks, rootShares) {
|
|
6
6
|
const SENTINEL = 0xffffffff; // Sentinel value for tree traversal (matches Rust implementation)
|
|
@@ -176,5 +176,4 @@ function getPtAndSyOnWithdrawLiquidity(marketEmissions, ticks, position, liquidi
|
|
|
176
176
|
const updatedPosition = updateLpPositionShares(marketEmissions, ticks, position);
|
|
177
177
|
return calculatePtSyRemoval(updatedPosition, ticks, liquidityToRemove);
|
|
178
178
|
}
|
|
179
|
-
exports.getPtAndSyOnWithdrawLiquidity = getPtAndSyOnWithdrawLiquidity;
|
|
180
179
|
//# sourceMappingURL=withdrawLiquidity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawLiquidity.js","sourceRoot":"","sources":["../src/withdrawLiquidity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"withdrawLiquidity.js","sourceRoot":"","sources":["../src/withdrawLiquidity.ts"],"names":[],"mappings":"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"}
|
package/build/ytTrades.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.simulateBuyYt = simulateBuyYt;
|
|
4
|
+
exports.simulateBuyYtWithSyIn = simulateBuyYtWithSyIn;
|
|
5
|
+
exports.simulateSellYt = simulateSellYt;
|
|
4
6
|
/**
|
|
5
7
|
* YT (Yield Token) trade simulations
|
|
6
8
|
*
|
|
@@ -84,7 +86,6 @@ function simulateBuyYt(marketState, args) {
|
|
|
84
86
|
finalSpotPrice: swapResult.finalSpotPrice,
|
|
85
87
|
};
|
|
86
88
|
}
|
|
87
|
-
exports.simulateBuyYt = simulateBuyYt;
|
|
88
89
|
/**
|
|
89
90
|
* Helper to calculate net SY cost for a given YT amount
|
|
90
91
|
*/
|
|
@@ -253,7 +254,6 @@ function simulateBuyYtWithSyIn(marketState, args) {
|
|
|
253
254
|
}
|
|
254
255
|
return result;
|
|
255
256
|
}
|
|
256
|
-
exports.simulateBuyYtWithSyIn = simulateBuyYtWithSyIn;
|
|
257
257
|
/**
|
|
258
258
|
* Simulates selling YT tokens
|
|
259
259
|
*
|
|
@@ -309,5 +309,4 @@ function simulateSellYt(marketState, args) {
|
|
|
309
309
|
finalSpotPrice: swapResult.finalSpotPrice,
|
|
310
310
|
};
|
|
311
311
|
}
|
|
312
|
-
exports.simulateSellYt = simulateSellYt;
|
|
313
312
|
//# sourceMappingURL=ytTrades.js.map
|
package/build/ytTrades.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ytTrades.js","sourceRoot":"","sources":["../src/ytTrades.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ytTrades.js","sourceRoot":"","sources":["../src/ytTrades.ts"],"names":[],"mappings":"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"}
|
package/build/ytTradesLegacy.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.simulateBuyYt = simulateBuyYt;
|
|
4
|
+
exports.simulateBuyYtWithSyIn = simulateBuyYtWithSyIn;
|
|
5
|
+
exports.simulateSellYt = simulateSellYt;
|
|
4
6
|
/**
|
|
5
7
|
* YT (Yield Token) trade simulations
|
|
6
8
|
*
|
|
@@ -74,7 +76,6 @@ function simulateBuyYt(marketState, args) {
|
|
|
74
76
|
finalSpotPrice: swapResult.finalSpotPrice,
|
|
75
77
|
};
|
|
76
78
|
}
|
|
77
|
-
exports.simulateBuyYt = simulateBuyYt;
|
|
78
79
|
/**
|
|
79
80
|
* Simulates buying YT tokens given a SY input amount
|
|
80
81
|
*
|
|
@@ -207,7 +208,6 @@ function simulateBuyYtWithSyIn(marketState, args) {
|
|
|
207
208
|
priceSpotLimit,
|
|
208
209
|
});
|
|
209
210
|
}
|
|
210
|
-
exports.simulateBuyYtWithSyIn = simulateBuyYtWithSyIn;
|
|
211
211
|
/**
|
|
212
212
|
* Simulates selling YT tokens
|
|
213
213
|
*
|
|
@@ -288,5 +288,4 @@ function simulateSellYt(marketState, args) {
|
|
|
288
288
|
finalSpotPrice: swapResult.finalSpotPrice,
|
|
289
289
|
};
|
|
290
290
|
}
|
|
291
|
-
exports.simulateSellYt = simulateSellYt;
|
|
292
291
|
//# sourceMappingURL=ytTradesLegacy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ytTradesLegacy.js","sourceRoot":"","sources":["../src/ytTradesLegacy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ytTradesLegacy.js","sourceRoot":"","sources":["../src/ytTradesLegacy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@exponent-labs/market-three-math",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.13",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "AGPL-3.0",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"test:live": "ts-node examples/test-live-market.ts"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@exponent-labs/exponent-fetcher": "0.9.
|
|
13
|
+
"@exponent-labs/exponent-fetcher": "0.9.13",
|
|
14
14
|
"@solana/web3.js": "^1.95.8"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
package/src/addLiquidity.ts
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
* CLMM Add Liquidity simulation
|
|
3
3
|
* Ported from exponent_clmm/src/state/market_three/helpers/add_liquidity.rs
|
|
4
4
|
*/
|
|
5
|
+
import { Ticks } from "@exponent-labs/exponent-fetcher"
|
|
6
|
+
|
|
5
7
|
import { simulateSwap, simulateSwapExactOut } from "./swapV2"
|
|
6
8
|
import {
|
|
7
9
|
AddLiquidityArgs,
|
|
@@ -12,15 +14,22 @@ import {
|
|
|
12
14
|
MarketThreeState,
|
|
13
15
|
SwapDirection,
|
|
14
16
|
} from "./types"
|
|
15
|
-
import { EffSnap, normalizedTimeRemaining, TicksWrapper } from "./utilsV2"
|
|
16
17
|
import { findTickByKey, getSuccessorTickKey } from "./utils"
|
|
17
|
-
import {
|
|
18
|
+
import { EffSnap, TicksWrapper, normalizedTimeRemaining } from "./utilsV2"
|
|
18
19
|
|
|
19
20
|
const TICK_KEY_BASE_POINTS = 1_000_000
|
|
20
21
|
// Keep this in sync with exponent_clmm's add_liquidity helper so off-chain
|
|
21
22
|
// quotes match the on-chain classic deposit path as closely as possible.
|
|
22
|
-
const GAP_TOKEN_NEEDS =
|
|
23
|
-
const
|
|
23
|
+
const GAP_TOKEN_NEEDS = 20
|
|
24
|
+
const MIN_SWAP_EXACT_OUT_SY_HEADROOM = 100
|
|
25
|
+
const SWAP_EXACT_OUT_SY_HEADROOM = 100
|
|
26
|
+
const SWAP_EXACT_OUT_HEADROOM_PT_THRESHOLD = 10_000_000
|
|
27
|
+
const MIN_SWAP_AND_SUPPLY_SY_BUDGET = 1_000_000
|
|
28
|
+
const FLASH_SY_POSITION_HEADROOM = 1_000
|
|
29
|
+
const MAX_SWAP_AND_SUPPLY_UNDERSPEND_LAMPORTS = 1_000
|
|
30
|
+
const MAX_SWAP_AND_SUPPLY_SIMULATED_OVERSPEND_LAMPORTS = 0
|
|
31
|
+
const LARGE_SWAP_AND_SUPPLY_SY_BUDGET = 50_000_000_000
|
|
32
|
+
const PT_ONLY_SWAP_EXACT_OUT_ESTIMATE_SLACK = 0
|
|
24
33
|
|
|
25
34
|
const EMPTY_CROSSING_TICK_STATE: CrossingTickState = {
|
|
26
35
|
principalPt: 0,
|
|
@@ -416,12 +425,12 @@ function simulateAccruePrincipalForDeposit(params: {
|
|
|
416
425
|
return predecessor ?? candidateKey
|
|
417
426
|
}
|
|
418
427
|
|
|
419
|
-
const visitIntervals = (
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
rightPrice: number
|
|
424
|
-
|
|
428
|
+
const visitIntervals = (
|
|
429
|
+
startKey: number,
|
|
430
|
+
priceStart: number,
|
|
431
|
+
priceEnd: number,
|
|
432
|
+
visitor: (params: { leftKey: number; rightKey: number; leftPrice: number; rightPrice: number }) => void,
|
|
433
|
+
) => {
|
|
425
434
|
if (!(priceStart < priceEnd)) {
|
|
426
435
|
return
|
|
427
436
|
}
|
|
@@ -953,8 +962,7 @@ export function simulateWrapperProvideLiquidity(
|
|
|
953
962
|
const priceEffUpper = snap.getEffectivePrice(upperPrice)
|
|
954
963
|
|
|
955
964
|
// Step 3: Get crossing tick state (matches wrapper_provide_liquidity.rs)
|
|
956
|
-
const { crossingTickState, crossingTickPriceLeft, crossingTickPriceRight } =
|
|
957
|
-
getCrossingTickStateFromTicks(ticks)
|
|
965
|
+
const { crossingTickState, crossingTickPriceLeft, crossingTickPriceRight } = getCrossingTickStateFromTicks(ticks)
|
|
958
966
|
|
|
959
967
|
// Step 4: Calculate mock token needs using compute_token_needs_with_crossing
|
|
960
968
|
// max_sy = syAmount, max_pt = syAmount * syExchangeRate (as on-chain)
|
|
@@ -997,6 +1005,10 @@ export function simulateWrapperProvideLiquidity(
|
|
|
997
1005
|
syExchangeRate,
|
|
998
1006
|
})
|
|
999
1007
|
|
|
1008
|
+
if (!hasLpSupplyCapacity(marketState, depositResult.deltaL)) {
|
|
1009
|
+
return null
|
|
1010
|
+
}
|
|
1011
|
+
|
|
1000
1012
|
return {
|
|
1001
1013
|
lpOut: depositResult.deltaL,
|
|
1002
1014
|
ytOut: Math.floor(ytOut),
|
|
@@ -1047,9 +1059,9 @@ export function simulateSwapAndSupply(
|
|
|
1047
1059
|
// Wrapper provide-liquidity-base debits base as:
|
|
1048
1060
|
// base_needed = ceil(total_sy_spent * sy_exchange_rate)
|
|
1049
1061
|
// So the strict SY budget for a user-provided base input is floor(base / rate).
|
|
1050
|
-
const syBudget = convertBaseToSyBudget(amountBase)
|
|
1062
|
+
const syBudget = convertBaseToSyBudget(amountBase, syExchangeRate)
|
|
1051
1063
|
|
|
1052
|
-
if (syBudget <= 0) {
|
|
1064
|
+
if (syBudget <= 0 || syBudget < MIN_SWAP_AND_SUPPLY_SY_BUDGET) {
|
|
1053
1065
|
return {
|
|
1054
1066
|
lpOut: 0,
|
|
1055
1067
|
ptToBuy: 0,
|
|
@@ -1062,6 +1074,11 @@ export function simulateSwapAndSupply(
|
|
|
1062
1074
|
}
|
|
1063
1075
|
}
|
|
1064
1076
|
|
|
1077
|
+
const flashSyAvailable = Math.max(0, Number(marketState.financials.syBalance) - FLASH_SY_POSITION_HEADROOM)
|
|
1078
|
+
if (syBudget > flashSyAvailable) {
|
|
1079
|
+
return null
|
|
1080
|
+
}
|
|
1081
|
+
|
|
1065
1082
|
const MOCK_AMOUNT = 1e9
|
|
1066
1083
|
const mockNeeds = simulateAddLiquidity(marketState, {
|
|
1067
1084
|
lowerTick,
|
|
@@ -1070,8 +1087,6 @@ export function simulateSwapAndSupply(
|
|
|
1070
1087
|
maxPt: MOCK_AMOUNT,
|
|
1071
1088
|
syExchangeRate,
|
|
1072
1089
|
})
|
|
1073
|
-
const searchBudget = Math.max(0, syBudget - SWAP_EXACT_OUT_SY_HEADROOM)
|
|
1074
|
-
|
|
1075
1090
|
// Wrapper flow still executes a flash swap even when external_pt_to_buy is 0
|
|
1076
1091
|
// (effective exact-out target becomes 2 due +2 safety margin).
|
|
1077
1092
|
let externalPtToBuy = 0
|
|
@@ -1103,6 +1118,15 @@ export function simulateSwapAndSupply(
|
|
|
1103
1118
|
externalPtToBuy = Math.max(0, Math.floor(guessSwap.amountOut))
|
|
1104
1119
|
}
|
|
1105
1120
|
}
|
|
1121
|
+
const baseSwapExactOutSyHeadroom =
|
|
1122
|
+
externalPtToBuy >= SWAP_EXACT_OUT_HEADROOM_PT_THRESHOLD
|
|
1123
|
+
? SWAP_EXACT_OUT_SY_HEADROOM
|
|
1124
|
+
: MIN_SWAP_EXACT_OUT_SY_HEADROOM
|
|
1125
|
+
const swapExactOutSyHeadroom = syBudget >= LARGE_SWAP_AND_SUPPLY_SY_BUDGET ? 0 : baseSwapExactOutSyHeadroom
|
|
1126
|
+
const simulatedOverspendTolerance =
|
|
1127
|
+
syBudget >= LARGE_SWAP_AND_SUPPLY_SY_BUDGET ? MAX_SWAP_AND_SUPPLY_SIMULATED_OVERSPEND_LAMPORTS : 0
|
|
1128
|
+
const searchBudget = Math.max(0, syBudget - swapExactOutSyHeadroom + simulatedOverspendTolerance)
|
|
1129
|
+
const exactOutEstimateSlack = mockNeeds.sySpent === 0 ? PT_ONLY_SWAP_EXACT_OUT_ESTIMATE_SLACK : 0
|
|
1106
1130
|
|
|
1107
1131
|
const candidateCache = new Map<number, SwapAndSupplyCandidate | null>()
|
|
1108
1132
|
const evaluateCandidate = (ptConstraint: number) => {
|
|
@@ -1118,13 +1142,35 @@ export function simulateSwapAndSupply(
|
|
|
1118
1142
|
syBudget,
|
|
1119
1143
|
key,
|
|
1120
1144
|
syExchangeRate,
|
|
1145
|
+
exactOutEstimateSlack,
|
|
1121
1146
|
)
|
|
1122
1147
|
candidateCache.set(key, candidate)
|
|
1123
1148
|
return candidate
|
|
1124
1149
|
}
|
|
1150
|
+
|
|
1151
|
+
if (mockNeeds.ptSpent <= 0) {
|
|
1152
|
+
const selected = evaluateCandidate(0)
|
|
1153
|
+
if (!selected || !hasLpSupplyCapacity(marketState, selected.lpOut)) {
|
|
1154
|
+
return null
|
|
1155
|
+
}
|
|
1156
|
+
if (!isSyDebitWithinTolerance(syBudget, selected.totalSySpent, simulatedOverspendTolerance)) {
|
|
1157
|
+
return null
|
|
1158
|
+
}
|
|
1159
|
+
|
|
1160
|
+
return {
|
|
1161
|
+
lpOut: selected.lpOut,
|
|
1162
|
+
ptToBuy: 0,
|
|
1163
|
+
syConstraint: syBudget,
|
|
1164
|
+
syForSwap: selected.tradeSySpent,
|
|
1165
|
+
syRemainder: selected.syRemainderAfterSwap,
|
|
1166
|
+
ptFromSwap: selected.tradePtOut,
|
|
1167
|
+
syDeposited: selected.depositSySpent,
|
|
1168
|
+
ptDeposited: selected.depositPtSpent,
|
|
1169
|
+
}
|
|
1170
|
+
}
|
|
1171
|
+
|
|
1125
1172
|
const ptCap = 1_000_000_000
|
|
1126
1173
|
let bestUnderBudget: SwapAndSupplyCandidate | null = null
|
|
1127
|
-
let leastOverspend: SwapAndSupplyCandidate | null = null
|
|
1128
1174
|
const considerCandidate = (candidate: SwapAndSupplyCandidate | null) => {
|
|
1129
1175
|
if (!candidate) {
|
|
1130
1176
|
return
|
|
@@ -1139,14 +1185,6 @@ export function simulateSwapAndSupply(
|
|
|
1139
1185
|
}
|
|
1140
1186
|
return
|
|
1141
1187
|
}
|
|
1142
|
-
|
|
1143
|
-
if (
|
|
1144
|
-
!leastOverspend ||
|
|
1145
|
-
candidate.totalSySpent < leastOverspend.totalSySpent ||
|
|
1146
|
-
(candidate.totalSySpent === leastOverspend.totalSySpent && candidate.lpOut > leastOverspend.lpOut)
|
|
1147
|
-
) {
|
|
1148
|
-
leastOverspend = candidate
|
|
1149
|
-
}
|
|
1150
1188
|
}
|
|
1151
1189
|
|
|
1152
1190
|
// Always evaluate from zero to establish a valid lower bound.
|
|
@@ -1200,14 +1238,21 @@ export function simulateSwapAndSupply(
|
|
|
1200
1238
|
considerCandidate(evaluateCandidate(pt))
|
|
1201
1239
|
}
|
|
1202
1240
|
|
|
1203
|
-
const selected = bestUnderBudget
|
|
1241
|
+
const selected = bestUnderBudget
|
|
1204
1242
|
if (!selected) {
|
|
1205
|
-
throw new Error("Unable to simulate swap & supply
|
|
1243
|
+
throw new Error("Unable to simulate swap & supply within SY budget")
|
|
1244
|
+
}
|
|
1245
|
+
if (!hasLpSupplyCapacity(marketState, selected.lpOut)) {
|
|
1246
|
+
return null
|
|
1247
|
+
}
|
|
1248
|
+
if (!isSyDebitWithinTolerance(syBudget, selected.totalSySpent, simulatedOverspendTolerance)) {
|
|
1249
|
+
return null
|
|
1206
1250
|
}
|
|
1207
1251
|
if (process.env.DEBUG_SWAP_SUPPLY === "1") {
|
|
1208
1252
|
console.log("[simulateSwapAndSupply]", {
|
|
1209
1253
|
syBudget,
|
|
1210
1254
|
searchBudget,
|
|
1255
|
+
swapExactOutSyHeadroom,
|
|
1211
1256
|
mockNeeds,
|
|
1212
1257
|
externalPtToBuy,
|
|
1213
1258
|
selected,
|
|
@@ -1248,6 +1293,7 @@ function simulateSwapAndSupplyForPtConstraint(
|
|
|
1248
1293
|
syBudget: number,
|
|
1249
1294
|
ptConstraint: number,
|
|
1250
1295
|
syExchangeRate: number,
|
|
1296
|
+
exactOutEstimateSlack: number,
|
|
1251
1297
|
): SwapAndSupplyCandidate | null {
|
|
1252
1298
|
let swapResult: {
|
|
1253
1299
|
sySpent: number
|
|
@@ -1261,6 +1307,7 @@ function simulateSwapAndSupplyForPtConstraint(
|
|
|
1261
1307
|
syBudget,
|
|
1262
1308
|
ptConstraint,
|
|
1263
1309
|
syExchangeRate,
|
|
1310
|
+
exactOutEstimateSlack,
|
|
1264
1311
|
)
|
|
1265
1312
|
} catch {
|
|
1266
1313
|
// Budget insufficient for this PT constraint
|
|
@@ -1268,7 +1315,6 @@ function simulateSwapAndSupplyForPtConstraint(
|
|
|
1268
1315
|
}
|
|
1269
1316
|
|
|
1270
1317
|
const depositState = swapResult.postMarketState ?? marketState
|
|
1271
|
-
const syAvailableForDeposit = Math.max(0, syBudget - swapResult.sySpent)
|
|
1272
1318
|
const depositResult = simulateAddLiquidity(depositState, {
|
|
1273
1319
|
lowerTick,
|
|
1274
1320
|
upperTick,
|
|
@@ -1302,9 +1348,39 @@ function simulateSwapAndSupplyForPtConstraint(
|
|
|
1302
1348
|
}
|
|
1303
1349
|
}
|
|
1304
1350
|
|
|
1305
|
-
function convertBaseToSyBudget(amountBase: number): number {
|
|
1351
|
+
function convertBaseToSyBudget(amountBase: number, syExchangeRate: number): number {
|
|
1306
1352
|
const baseAmount = Math.max(0, Math.floor(amountBase))
|
|
1307
|
-
|
|
1353
|
+
if (syExchangeRate <= 0) {
|
|
1354
|
+
return 0
|
|
1355
|
+
}
|
|
1356
|
+
return Math.floor(baseAmount / syExchangeRate)
|
|
1357
|
+
}
|
|
1358
|
+
|
|
1359
|
+
function hasLpSupplyCapacity(marketState: MarketThreeState, deltaL: number): boolean {
|
|
1360
|
+
const deltaLiquidity = Math.ceil(deltaL)
|
|
1361
|
+
if (!Number.isFinite(deltaLiquidity) || deltaLiquidity < 0 || !Number.isSafeInteger(deltaLiquidity)) {
|
|
1362
|
+
return false
|
|
1363
|
+
}
|
|
1364
|
+
|
|
1365
|
+
const liquidityBalance = BigInt(marketState.financials.liquidityBalance.toString())
|
|
1366
|
+
const maxLpSupply = BigInt(marketState.configurationOptions.maxLpSupply.toString())
|
|
1367
|
+
|
|
1368
|
+
return liquidityBalance + BigInt(deltaLiquidity) <= maxLpSupply
|
|
1369
|
+
}
|
|
1370
|
+
|
|
1371
|
+
function isSyDebitWithinTolerance(
|
|
1372
|
+
syBudget: number,
|
|
1373
|
+
totalSySpent: number,
|
|
1374
|
+
simulatedOverspendTolerance: number,
|
|
1375
|
+
): boolean {
|
|
1376
|
+
const targetSyDebit = Math.max(0, Math.floor(syBudget))
|
|
1377
|
+
const estimatedSyDebit = Math.max(0, Math.floor(totalSySpent))
|
|
1378
|
+
const underSpendLamports = targetSyDebit - estimatedSyDebit
|
|
1379
|
+
if (underSpendLamports < 0) {
|
|
1380
|
+
return Math.abs(underSpendLamports) <= simulatedOverspendTolerance
|
|
1381
|
+
}
|
|
1382
|
+
|
|
1383
|
+
return underSpendLamports <= MAX_SWAP_AND_SUPPLY_UNDERSPEND_LAMPORTS
|
|
1308
1384
|
}
|
|
1309
1385
|
|
|
1310
1386
|
function simulateBuyPtExactOutWrapper(
|
|
@@ -1312,12 +1388,14 @@ function simulateBuyPtExactOutWrapper(
|
|
|
1312
1388
|
syBudget: number,
|
|
1313
1389
|
ptConstraint: number,
|
|
1314
1390
|
syExchangeRate: number,
|
|
1391
|
+
exactOutEstimateSlack: number,
|
|
1315
1392
|
): {
|
|
1316
1393
|
sySpent: number
|
|
1317
1394
|
ptOut: number
|
|
1318
1395
|
postMarketState?: MarketThreeState
|
|
1319
1396
|
} {
|
|
1320
1397
|
const maxSyBudget = Math.max(0, Math.floor(syBudget))
|
|
1398
|
+
const exactOutSyConstraint = maxSyBudget + Math.max(0, Math.floor(exactOutEstimateSlack))
|
|
1321
1399
|
const effectivePtOutTarget = Math.max(0, Math.floor(ptConstraint)) + 2
|
|
1322
1400
|
|
|
1323
1401
|
if (maxSyBudget === 0) {
|
|
@@ -1334,7 +1412,7 @@ function simulateBuyPtExactOutWrapper(
|
|
|
1334
1412
|
amountOut: targetPtOut,
|
|
1335
1413
|
syExchangeRate,
|
|
1336
1414
|
isCurrentFlashSwap: true,
|
|
1337
|
-
amountInConstraint:
|
|
1415
|
+
amountInConstraint: exactOutSyConstraint,
|
|
1338
1416
|
})
|
|
1339
1417
|
}
|
|
1340
1418
|
|