@drift-labs/sdk-browser 2.128.0-beta.9 → 2.129.0-beta.0
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/VERSION +1 -1
- package/lib/browser/idl/drift.json +1 -1
- package/lib/browser/math/amm.js +32 -5
- package/lib/node/idl/drift.json +1 -1
- package/lib/node/math/amm.d.ts.map +1 -1
- package/lib/node/math/amm.js +32 -5
- package/package.json +1 -1
- package/src/idl/drift.json +2 -2
- package/src/math/amm.ts +39 -5
package/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.
|
|
1
|
+
2.129.0-beta.0
|
package/lib/browser/math/amm.js
CHANGED
|
@@ -521,17 +521,44 @@ function calculateSpreadReserves(amm, oraclePriceData, now, isPrediction = false
|
|
|
521
521
|
const reservePrice = calculatePrice(amm.baseAssetReserve, amm.quoteAssetReserve, amm.pegMultiplier);
|
|
522
522
|
// always allow 10 bps of price offset, up to a half of the market's max_spread
|
|
523
523
|
let maxOffset = 0;
|
|
524
|
-
let referencePriceOffset =
|
|
524
|
+
let referencePriceOffset = 0;
|
|
525
525
|
if (amm.curveUpdateIntensity > 100) {
|
|
526
526
|
maxOffset = Math.max(amm.maxSpread / 2, (numericConstants_1.PERCENTAGE_PRECISION.toNumber() / 10000) *
|
|
527
527
|
(amm.curveUpdateIntensity - 100));
|
|
528
528
|
const liquidityFraction = calculateInventoryLiquidityRatio(amm.baseAssetAmountWithAmm, amm.baseAssetReserve, amm.minBaseAssetReserve, amm.maxBaseAssetReserve);
|
|
529
529
|
const liquidityFractionSigned = liquidityFraction.mul((0, __1.sigNum)(amm.baseAssetAmountWithAmm.add(amm.baseAssetAmountWithUnsettledLp)));
|
|
530
|
-
referencePriceOffset = calculateReferencePriceOffset(reservePrice, amm.last24HAvgFundingRate, liquidityFractionSigned, amm.historicalOracleData.lastOraclePriceTwap5Min, amm.lastMarkPriceTwap5Min, amm.historicalOracleData.lastOraclePriceTwap, amm.lastMarkPriceTwap, maxOffset);
|
|
530
|
+
referencePriceOffset = calculateReferencePriceOffset(reservePrice, amm.last24HAvgFundingRate, liquidityFractionSigned, amm.historicalOracleData.lastOraclePriceTwap5Min, amm.lastMarkPriceTwap5Min, amm.historicalOracleData.lastOraclePriceTwap, amm.lastMarkPriceTwap, maxOffset).toNumber();
|
|
531
|
+
}
|
|
532
|
+
let [longSpread, shortSpread] = calculateSpread(amm, oraclePriceData, now, reservePrice);
|
|
533
|
+
const signChanged = referencePriceOffset === 0 ||
|
|
534
|
+
Math.sign(referencePriceOffset) !== Math.sign(amm.referencePriceOffset);
|
|
535
|
+
const hasOffset = Math.abs(amm.referencePriceOffset) > 1;
|
|
536
|
+
if (signChanged && hasOffset) {
|
|
537
|
+
if (oraclePriceData.slot !== amm.lastUpdateSlot) {
|
|
538
|
+
const rawDecay = Math.trunc((Math.abs(amm.referencePriceOffset) *
|
|
539
|
+
12 *
|
|
540
|
+
(oraclePriceData.slot.toNumber() - amm.lastUpdateSlot.toNumber())) /
|
|
541
|
+
100);
|
|
542
|
+
const maxOffset = Math.abs(amm.referencePriceOffset);
|
|
543
|
+
const decayMagnitude = Math.min(Math.max(rawDecay, 10), maxOffset);
|
|
544
|
+
const decay = Math.sign(amm.referencePriceOffset) * decayMagnitude;
|
|
545
|
+
if (amm.referencePriceOffset > 0) {
|
|
546
|
+
referencePriceOffset = amm.referencePriceOffset - decay;
|
|
547
|
+
longSpread += decay;
|
|
548
|
+
shortSpread += referencePriceOffset;
|
|
549
|
+
}
|
|
550
|
+
else {
|
|
551
|
+
referencePriceOffset = amm.referencePriceOffset + decay;
|
|
552
|
+
shortSpread += decay;
|
|
553
|
+
longSpread += Math.abs(referencePriceOffset);
|
|
554
|
+
}
|
|
555
|
+
}
|
|
556
|
+
}
|
|
557
|
+
else {
|
|
558
|
+
amm.referencePriceOffset = referencePriceOffset;
|
|
531
559
|
}
|
|
532
|
-
const
|
|
533
|
-
const
|
|
534
|
-
const bidReserves = calculateSpreadReserve(-shortSpread + referencePriceOffset.toNumber(), types_1.PositionDirection.SHORT, amm);
|
|
560
|
+
const askReserves = calculateSpreadReserve(longSpread + referencePriceOffset, types_1.PositionDirection.LONG, amm);
|
|
561
|
+
const bidReserves = calculateSpreadReserve(-shortSpread + referencePriceOffset, types_1.PositionDirection.SHORT, amm);
|
|
535
562
|
return [bidReserves, askReserves];
|
|
536
563
|
}
|
|
537
564
|
exports.calculateSpreadReserves = calculateSpreadReserves;
|
package/lib/node/idl/drift.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amm.d.ts","sourceRoot":"","sources":["../../../src/math/amm.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"amm.d.ts","sourceRoot":"","sources":["../../../src/math/amm.ts"],"names":[],"mappings":"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"}
|
package/lib/node/math/amm.js
CHANGED
|
@@ -521,17 +521,44 @@ function calculateSpreadReserves(amm, oraclePriceData, now, isPrediction = false
|
|
|
521
521
|
const reservePrice = calculatePrice(amm.baseAssetReserve, amm.quoteAssetReserve, amm.pegMultiplier);
|
|
522
522
|
// always allow 10 bps of price offset, up to a half of the market's max_spread
|
|
523
523
|
let maxOffset = 0;
|
|
524
|
-
let referencePriceOffset =
|
|
524
|
+
let referencePriceOffset = 0;
|
|
525
525
|
if (amm.curveUpdateIntensity > 100) {
|
|
526
526
|
maxOffset = Math.max(amm.maxSpread / 2, (numericConstants_1.PERCENTAGE_PRECISION.toNumber() / 10000) *
|
|
527
527
|
(amm.curveUpdateIntensity - 100));
|
|
528
528
|
const liquidityFraction = calculateInventoryLiquidityRatio(amm.baseAssetAmountWithAmm, amm.baseAssetReserve, amm.minBaseAssetReserve, amm.maxBaseAssetReserve);
|
|
529
529
|
const liquidityFractionSigned = liquidityFraction.mul((0, __1.sigNum)(amm.baseAssetAmountWithAmm.add(amm.baseAssetAmountWithUnsettledLp)));
|
|
530
|
-
referencePriceOffset = calculateReferencePriceOffset(reservePrice, amm.last24HAvgFundingRate, liquidityFractionSigned, amm.historicalOracleData.lastOraclePriceTwap5Min, amm.lastMarkPriceTwap5Min, amm.historicalOracleData.lastOraclePriceTwap, amm.lastMarkPriceTwap, maxOffset);
|
|
530
|
+
referencePriceOffset = calculateReferencePriceOffset(reservePrice, amm.last24HAvgFundingRate, liquidityFractionSigned, amm.historicalOracleData.lastOraclePriceTwap5Min, amm.lastMarkPriceTwap5Min, amm.historicalOracleData.lastOraclePriceTwap, amm.lastMarkPriceTwap, maxOffset).toNumber();
|
|
531
|
+
}
|
|
532
|
+
let [longSpread, shortSpread] = calculateSpread(amm, oraclePriceData, now, reservePrice);
|
|
533
|
+
const signChanged = referencePriceOffset === 0 ||
|
|
534
|
+
Math.sign(referencePriceOffset) !== Math.sign(amm.referencePriceOffset);
|
|
535
|
+
const hasOffset = Math.abs(amm.referencePriceOffset) > 1;
|
|
536
|
+
if (signChanged && hasOffset) {
|
|
537
|
+
if (oraclePriceData.slot !== amm.lastUpdateSlot) {
|
|
538
|
+
const rawDecay = Math.trunc((Math.abs(amm.referencePriceOffset) *
|
|
539
|
+
12 *
|
|
540
|
+
(oraclePriceData.slot.toNumber() - amm.lastUpdateSlot.toNumber())) /
|
|
541
|
+
100);
|
|
542
|
+
const maxOffset = Math.abs(amm.referencePriceOffset);
|
|
543
|
+
const decayMagnitude = Math.min(Math.max(rawDecay, 10), maxOffset);
|
|
544
|
+
const decay = Math.sign(amm.referencePriceOffset) * decayMagnitude;
|
|
545
|
+
if (amm.referencePriceOffset > 0) {
|
|
546
|
+
referencePriceOffset = amm.referencePriceOffset - decay;
|
|
547
|
+
longSpread += decay;
|
|
548
|
+
shortSpread += referencePriceOffset;
|
|
549
|
+
}
|
|
550
|
+
else {
|
|
551
|
+
referencePriceOffset = amm.referencePriceOffset + decay;
|
|
552
|
+
shortSpread += decay;
|
|
553
|
+
longSpread += Math.abs(referencePriceOffset);
|
|
554
|
+
}
|
|
555
|
+
}
|
|
556
|
+
}
|
|
557
|
+
else {
|
|
558
|
+
amm.referencePriceOffset = referencePriceOffset;
|
|
531
559
|
}
|
|
532
|
-
const
|
|
533
|
-
const
|
|
534
|
-
const bidReserves = calculateSpreadReserve(-shortSpread + referencePriceOffset.toNumber(), types_1.PositionDirection.SHORT, amm);
|
|
560
|
+
const askReserves = calculateSpreadReserve(longSpread + referencePriceOffset, types_1.PositionDirection.LONG, amm);
|
|
561
|
+
const bidReserves = calculateSpreadReserve(-shortSpread + referencePriceOffset, types_1.PositionDirection.SHORT, amm);
|
|
535
562
|
return [bidReserves, askReserves];
|
|
536
563
|
}
|
|
537
564
|
exports.calculateSpreadReserves = calculateSpreadReserves;
|
package/package.json
CHANGED
package/src/idl/drift.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "2.
|
|
2
|
+
"version": "2.128.0",
|
|
3
3
|
"name": "drift",
|
|
4
4
|
"instructions": [
|
|
5
5
|
{
|
|
@@ -15947,4 +15947,4 @@
|
|
|
15947
15947
|
"metadata": {
|
|
15948
15948
|
"address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
|
|
15949
15949
|
}
|
|
15950
|
-
}
|
|
15950
|
+
}
|
package/src/math/amm.ts
CHANGED
|
@@ -999,7 +999,7 @@ export function calculateSpreadReserves(
|
|
|
999
999
|
|
|
1000
1000
|
// always allow 10 bps of price offset, up to a half of the market's max_spread
|
|
1001
1001
|
let maxOffset = 0;
|
|
1002
|
-
let referencePriceOffset =
|
|
1002
|
+
let referencePriceOffset = 0;
|
|
1003
1003
|
if (amm.curveUpdateIntensity > 100) {
|
|
1004
1004
|
maxOffset = Math.max(
|
|
1005
1005
|
amm.maxSpread / 2,
|
|
@@ -1025,23 +1025,57 @@ export function calculateSpreadReserves(
|
|
|
1025
1025
|
amm.historicalOracleData.lastOraclePriceTwap,
|
|
1026
1026
|
amm.lastMarkPriceTwap,
|
|
1027
1027
|
maxOffset
|
|
1028
|
-
);
|
|
1028
|
+
).toNumber();
|
|
1029
1029
|
}
|
|
1030
1030
|
|
|
1031
|
-
|
|
1031
|
+
let [longSpread, shortSpread] = calculateSpread(
|
|
1032
1032
|
amm,
|
|
1033
1033
|
oraclePriceData,
|
|
1034
1034
|
now,
|
|
1035
1035
|
reservePrice
|
|
1036
1036
|
);
|
|
1037
1037
|
|
|
1038
|
+
const signChanged =
|
|
1039
|
+
referencePriceOffset === 0 ||
|
|
1040
|
+
Math.sign(referencePriceOffset) !== Math.sign(amm.referencePriceOffset);
|
|
1041
|
+
|
|
1042
|
+
const hasOffset = Math.abs(amm.referencePriceOffset) > 1;
|
|
1043
|
+
|
|
1044
|
+
if (signChanged && hasOffset) {
|
|
1045
|
+
if (oraclePriceData.slot !== amm.lastUpdateSlot) {
|
|
1046
|
+
const rawDecay = Math.trunc(
|
|
1047
|
+
(Math.abs(amm.referencePriceOffset) *
|
|
1048
|
+
12 *
|
|
1049
|
+
(oraclePriceData.slot.toNumber() - amm.lastUpdateSlot.toNumber())) /
|
|
1050
|
+
100
|
|
1051
|
+
);
|
|
1052
|
+
|
|
1053
|
+
const maxOffset = Math.abs(amm.referencePriceOffset);
|
|
1054
|
+
const decayMagnitude = Math.min(Math.max(rawDecay, 10), maxOffset);
|
|
1055
|
+
|
|
1056
|
+
const decay = Math.sign(amm.referencePriceOffset) * decayMagnitude;
|
|
1057
|
+
|
|
1058
|
+
if (amm.referencePriceOffset > 0) {
|
|
1059
|
+
referencePriceOffset = amm.referencePriceOffset - decay;
|
|
1060
|
+
longSpread += decay;
|
|
1061
|
+
shortSpread += referencePriceOffset;
|
|
1062
|
+
} else {
|
|
1063
|
+
referencePriceOffset = amm.referencePriceOffset + decay;
|
|
1064
|
+
shortSpread += decay;
|
|
1065
|
+
longSpread += Math.abs(referencePriceOffset);
|
|
1066
|
+
}
|
|
1067
|
+
}
|
|
1068
|
+
} else {
|
|
1069
|
+
amm.referencePriceOffset = referencePriceOffset;
|
|
1070
|
+
}
|
|
1071
|
+
|
|
1038
1072
|
const askReserves = calculateSpreadReserve(
|
|
1039
|
-
longSpread + referencePriceOffset
|
|
1073
|
+
longSpread + referencePriceOffset,
|
|
1040
1074
|
PositionDirection.LONG,
|
|
1041
1075
|
amm
|
|
1042
1076
|
);
|
|
1043
1077
|
const bidReserves = calculateSpreadReserve(
|
|
1044
|
-
-shortSpread + referencePriceOffset
|
|
1078
|
+
-shortSpread + referencePriceOffset,
|
|
1045
1079
|
PositionDirection.SHORT,
|
|
1046
1080
|
amm
|
|
1047
1081
|
);
|