@metadaoproject/futarchy 0.4.0-alpha.23 → 0.4.0-alpha.24
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.
|
@@ -21,6 +21,7 @@ export type RemoveLiquiditySimulation = {
|
|
|
21
21
|
minQuoteOut?: BN;
|
|
22
22
|
};
|
|
23
23
|
export declare class AmmMath {
|
|
24
|
+
static getHumanPriceFromReserves(baseReserves: BN, quoteReserves: BN, baseDecimals: number, quoteDecimals: number): number;
|
|
24
25
|
static getAmmPriceFromReserves(baseReserves: BN, quoteReserves: BN): BN;
|
|
25
26
|
static getChainAmount(humanAmount: number, decimals: number): BN;
|
|
26
27
|
static getHumanAmount(chainAmount: BN, decimals: number): number;
|
|
@@ -3,6 +3,9 @@ const BN_TEN = new BN(10);
|
|
|
3
3
|
const PRICE_SCALE = BN_TEN.pow(new BN(12));
|
|
4
4
|
const PRICE_SCALE_NUMBER = 1e12;
|
|
5
5
|
export class AmmMath {
|
|
6
|
+
static getHumanPriceFromReserves(baseReserves, quoteReserves, baseDecimals, quoteDecimals) {
|
|
7
|
+
return this.getHumanPrice(this.getAmmPriceFromReserves(baseReserves, quoteReserves), baseDecimals, quoteDecimals);
|
|
8
|
+
}
|
|
6
9
|
static getAmmPriceFromReserves(baseReserves, quoteReserves) {
|
|
7
10
|
return quoteReserves.mul(PRICE_SCALE).div(baseReserves);
|
|
8
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ammMath.js","sourceRoot":"","sources":["../../../src/v0.3/utils/ammMath.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ammMath.js","sourceRoot":"","sources":["../../../src/v0.3/utils/ammMath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import BN from "bn.js";
|
|
2
2
|
import { Amm } from "../types/index.js";
|
|
3
3
|
import { SwapType } from "../AmmClient.js";
|
|
4
|
+
import { AmmMath as V3AmmMath } from "../../v0.3/utils/ammMath.js";
|
|
4
5
|
export type AddLiquiditySimulation = {
|
|
5
6
|
baseAmount: BN;
|
|
6
7
|
quoteAmount: BN;
|
|
@@ -21,20 +22,21 @@ export type RemoveLiquiditySimulation = {
|
|
|
21
22
|
minQuoteOut?: BN;
|
|
22
23
|
};
|
|
23
24
|
export declare class AmmMath {
|
|
24
|
-
static
|
|
25
|
-
static
|
|
26
|
-
static
|
|
25
|
+
static getHumanPriceFromReserves: typeof V3AmmMath.getHumanPriceFromReserves;
|
|
26
|
+
static getAmmPriceFromReserves: typeof V3AmmMath.getAmmPriceFromReserves;
|
|
27
|
+
static getChainAmount: typeof V3AmmMath.getChainAmount;
|
|
28
|
+
static getHumanAmount: typeof V3AmmMath.getHumanAmount;
|
|
29
|
+
static getAmmPrice: typeof V3AmmMath.getAmmPrice;
|
|
30
|
+
static getAmmPrices: typeof V3AmmMath.getAmmPrices;
|
|
31
|
+
static scale: typeof V3AmmMath.scale;
|
|
32
|
+
static addSlippage: typeof V3AmmMath.addSlippage;
|
|
33
|
+
static subtractSlippage: typeof V3AmmMath.subtractSlippage;
|
|
34
|
+
static simulateAddLiquidity: typeof V3AmmMath.simulateAddLiquidity;
|
|
35
|
+
static simulateRemoveLiquidity: typeof V3AmmMath.simulateRemoveLiquidity;
|
|
27
36
|
static getHumanPrice(ammPrice: BN, baseDecimals: number, quoteDecimals: number): number;
|
|
28
|
-
static getAmmPrice(humanPrice: number, baseDecimals: number, quoteDecimals: number): BN;
|
|
29
|
-
static getAmmPrices(baseDecimals: number, quoteDecimals: number, ...prices: number[]): BN[];
|
|
30
|
-
static scale(number: number, decimals: number): BN;
|
|
31
|
-
static addSlippage(chainAmount: BN, slippageBps: BN): BN;
|
|
32
|
-
static subtractSlippage(chainAmount: BN, slippageBps: BN): BN;
|
|
33
37
|
static getTwap(amm: Amm): BN;
|
|
34
|
-
static simulateAddLiquidity(baseReserves: BN, quoteReserves: BN, lpMintSupply: number, baseAmount?: BN, quoteAmount?: BN, slippageBps?: BN): AddLiquiditySimulation;
|
|
35
38
|
static simulateSwapInner(inputAmount: BN, inputReserves: BN, outputReserves: BN): BN;
|
|
36
39
|
static simulateSwap(inputAmount: BN, swapType: SwapType, baseReserves: BN, quoteReserves: BN, slippageBps?: BN): SwapSimulation;
|
|
37
|
-
static simulateRemoveLiquidity(lpTokensToBurn: BN, baseReserves: BN, quoteReserves: BN, lpTotalSupply: BN, slippageBps?: BN): RemoveLiquiditySimulation;
|
|
38
40
|
/**
|
|
39
41
|
* Calculates the optimal swap amount and mergeable tokens without using square roots.
|
|
40
42
|
* @param userBalanceIn BN – Tokens that a user wants to dispose of.
|
|
@@ -1,24 +1,21 @@
|
|
|
1
1
|
import BN from "bn.js";
|
|
2
|
+
import { AmmMath as V3AmmMath } from "../../v0.3/utils/ammMath.js";
|
|
2
3
|
const BN_TEN = new BN(10);
|
|
3
4
|
const PRICE_SCALE = BN_TEN.pow(new BN(12));
|
|
4
5
|
const PRICE_SCALE_NUMBER = 1e12;
|
|
5
6
|
export class AmmMath {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
static getChainAmount
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
static getHumanAmount(chainAmount, decimals) {
|
|
20
|
-
return chainAmount.toNumber() / 10 ** decimals;
|
|
21
|
-
}
|
|
7
|
+
// Re-export common methods from v0.3
|
|
8
|
+
static getHumanPriceFromReserves = V3AmmMath.getHumanPriceFromReserves;
|
|
9
|
+
static getAmmPriceFromReserves = V3AmmMath.getAmmPriceFromReserves;
|
|
10
|
+
static getChainAmount = V3AmmMath.getChainAmount;
|
|
11
|
+
static getHumanAmount = V3AmmMath.getHumanAmount;
|
|
12
|
+
static getAmmPrice = V3AmmMath.getAmmPrice;
|
|
13
|
+
static getAmmPrices = V3AmmMath.getAmmPrices;
|
|
14
|
+
static scale = V3AmmMath.scale;
|
|
15
|
+
static addSlippage = V3AmmMath.addSlippage;
|
|
16
|
+
static subtractSlippage = V3AmmMath.subtractSlippage;
|
|
17
|
+
static simulateAddLiquidity = V3AmmMath.simulateAddLiquidity;
|
|
18
|
+
static simulateRemoveLiquidity = V3AmmMath.simulateRemoveLiquidity;
|
|
22
19
|
static getHumanPrice(ammPrice, baseDecimals, quoteDecimals) {
|
|
23
20
|
const decimalScalar = BN_TEN.pow(new BN(quoteDecimals - baseDecimals).abs());
|
|
24
21
|
const price1e12 = quoteDecimals > baseDecimals
|
|
@@ -33,59 +30,9 @@ export class AmmMath {
|
|
|
33
30
|
return price1e12.div(new BN(1e12)).toNumber();
|
|
34
31
|
}
|
|
35
32
|
}
|
|
36
|
-
static getAmmPrice(humanPrice, baseDecimals, quoteDecimals) {
|
|
37
|
-
let price1e12 = new BN(humanPrice * PRICE_SCALE_NUMBER);
|
|
38
|
-
let decimalScalar = BN_TEN.pow(new BN(quoteDecimals - baseDecimals).abs());
|
|
39
|
-
let scaledPrice = quoteDecimals > baseDecimals
|
|
40
|
-
? price1e12.mul(decimalScalar)
|
|
41
|
-
: price1e12.div(decimalScalar);
|
|
42
|
-
return scaledPrice;
|
|
43
|
-
}
|
|
44
|
-
static getAmmPrices(baseDecimals, quoteDecimals, ...prices) {
|
|
45
|
-
// Map through each price, scaling it using the scalePrice method
|
|
46
|
-
return prices.map((price) => this.getAmmPrice(price, baseDecimals, quoteDecimals));
|
|
47
|
-
}
|
|
48
|
-
static scale(number, decimals) {
|
|
49
|
-
return new BN(number * 10 ** decimals);
|
|
50
|
-
// return new BN(number).mul(new BN(10).pow(new BN(decimals)));
|
|
51
|
-
}
|
|
52
|
-
static addSlippage(chainAmount, slippageBps) {
|
|
53
|
-
return chainAmount.mul(slippageBps.addn(10_000)).divn(10_000);
|
|
54
|
-
}
|
|
55
|
-
static subtractSlippage(chainAmount, slippageBps) {
|
|
56
|
-
return chainAmount.mul(new BN(10_000).sub(slippageBps)).divn(10_000);
|
|
57
|
-
}
|
|
58
33
|
static getTwap(amm) {
|
|
59
34
|
return amm.oracle.aggregator.div(amm.oracle.lastUpdatedSlot.sub(amm.createdAtSlot));
|
|
60
35
|
}
|
|
61
|
-
static simulateAddLiquidity(baseReserves, quoteReserves, lpMintSupply, baseAmount, quoteAmount, slippageBps) {
|
|
62
|
-
if (lpMintSupply == 0) {
|
|
63
|
-
throw new Error("This AMM doesn't have existing liquidity so we can't fill in the blanks");
|
|
64
|
-
}
|
|
65
|
-
if (baseAmount == undefined && quoteAmount == undefined) {
|
|
66
|
-
throw new Error("Must specify either a base amount or a quote amount");
|
|
67
|
-
}
|
|
68
|
-
let expectedLpTokens;
|
|
69
|
-
if (quoteAmount == undefined) {
|
|
70
|
-
quoteAmount = baseAmount?.mul(quoteReserves).div(baseReserves);
|
|
71
|
-
}
|
|
72
|
-
baseAmount = quoteAmount?.mul(baseReserves).div(quoteReserves).addn(1);
|
|
73
|
-
expectedLpTokens = quoteAmount
|
|
74
|
-
?.mul(new BN(lpMintSupply))
|
|
75
|
-
.div(quoteReserves);
|
|
76
|
-
let minLpTokens, maxBaseAmount;
|
|
77
|
-
if (slippageBps) {
|
|
78
|
-
minLpTokens = AmmMath.subtractSlippage(expectedLpTokens, slippageBps);
|
|
79
|
-
maxBaseAmount = AmmMath.addSlippage(baseAmount, slippageBps);
|
|
80
|
-
}
|
|
81
|
-
return {
|
|
82
|
-
quoteAmount: quoteAmount,
|
|
83
|
-
baseAmount: baseAmount,
|
|
84
|
-
expectedLpTokens,
|
|
85
|
-
minLpTokens,
|
|
86
|
-
maxBaseAmount,
|
|
87
|
-
};
|
|
88
|
-
}
|
|
89
36
|
static simulateSwapInner(inputAmount, inputReserves, outputReserves) {
|
|
90
37
|
if (inputReserves.eqn(0) || outputReserves.eqn(0)) {
|
|
91
38
|
throw new Error("reserves must be non-zero");
|
|
@@ -126,23 +73,6 @@ export class AmmMath {
|
|
|
126
73
|
minExpectedOut,
|
|
127
74
|
};
|
|
128
75
|
}
|
|
129
|
-
static simulateRemoveLiquidity(lpTokensToBurn, baseReserves, quoteReserves, lpTotalSupply, slippageBps) {
|
|
130
|
-
const expectedBaseOut = lpTokensToBurn.mul(baseReserves).div(lpTotalSupply);
|
|
131
|
-
const expectedQuoteOut = lpTokensToBurn
|
|
132
|
-
.mul(quoteReserves)
|
|
133
|
-
.div(lpTotalSupply);
|
|
134
|
-
let minBaseOut, minQuoteOut;
|
|
135
|
-
if (slippageBps) {
|
|
136
|
-
minBaseOut = AmmMath.subtractSlippage(expectedBaseOut, slippageBps);
|
|
137
|
-
minQuoteOut = AmmMath.subtractSlippage(expectedQuoteOut, slippageBps);
|
|
138
|
-
}
|
|
139
|
-
return {
|
|
140
|
-
expectedBaseOut,
|
|
141
|
-
expectedQuoteOut,
|
|
142
|
-
minBaseOut,
|
|
143
|
-
minQuoteOut,
|
|
144
|
-
};
|
|
145
|
-
}
|
|
146
76
|
/**
|
|
147
77
|
* Calculates the optimal swap amount and mergeable tokens without using square roots.
|
|
148
78
|
* @param userBalanceIn BN – Tokens that a user wants to dispose of.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"priceMath.js","sourceRoot":"","sources":["../../../src/v0.4/utils/priceMath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"priceMath.js","sourceRoot":"","sources":["../../../src/v0.4/utils/priceMath.ts"],"names":[],"mappings":"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"}
|