@dahlia-labs/stableswap-sdk
Advanced tools
Comparing version 0.5.7 to 0.5.12
@@ -172,2 +172,4 @@ "use strict"; | ||
const calculateEstimatedMintAmount = (exchange, depositAmountA, depositAmountB) => { | ||
const normalizedDepositAmountA = (0, exports.normalizeAmount)(new token_utils_1.TokenAmount(exchange.reserves[0].token, depositAmountA)); | ||
const normalizedDepositAmountB = (0, exports.normalizeAmount)(new token_utils_1.TokenAmount(exchange.reserves[1].token, depositAmountB)); | ||
if (jsbi_1.default.equal(depositAmountA, token_utils_1.ZERO) && jsbi_1.default.equal(depositAmountB, token_utils_1.ZERO)) { | ||
@@ -184,3 +186,3 @@ const zero = new token_utils_1.TokenAmount(exchange.lpTotalSupply.token, token_utils_1.ZERO); | ||
const d0 = (0, curve_1.computeD)(amp, (0, exports.normalizeAmount)(reserveA), (0, exports.normalizeAmount)(reserveB)); | ||
const d1 = (0, curve_1.computeD)(amp, jsbi_1.default.add((0, exports.normalizeAmount)(reserveA), depositAmountA), jsbi_1.default.add((0, exports.normalizeAmount)(reserveB), depositAmountB)); | ||
const d1 = (0, curve_1.computeD)(amp, jsbi_1.default.add((0, exports.normalizeAmount)(reserveA), normalizedDepositAmountA), jsbi_1.default.add((0, exports.normalizeAmount)(reserveB), normalizedDepositAmountB)); | ||
if (jsbi_1.default.lessThan(d1, d0)) { | ||
@@ -191,4 +193,4 @@ throw new Error("New D cannot be less than previous D"); | ||
const newBalances = [ | ||
jsbi_1.default.add((0, exports.normalizeAmount)(reserveA), depositAmountA), | ||
jsbi_1.default.add((0, exports.normalizeAmount)(reserveB), depositAmountB), | ||
jsbi_1.default.add((0, exports.normalizeAmount)(reserveA), normalizedDepositAmountA), | ||
jsbi_1.default.add((0, exports.normalizeAmount)(reserveB), normalizedDepositAmountB), | ||
]; | ||
@@ -195,0 +197,0 @@ const adjustedBalances = newBalances.map((newBalance, i) => { |
@@ -161,2 +161,4 @@ import { Fraction, ONE, TEN, TokenAmount, ZERO, } from "@dahlia-labs/token-utils"; | ||
export const calculateEstimatedMintAmount = (exchange, depositAmountA, depositAmountB) => { | ||
const normalizedDepositAmountA = normalizeAmount(new TokenAmount(exchange.reserves[0].token, depositAmountA)); | ||
const normalizedDepositAmountB = normalizeAmount(new TokenAmount(exchange.reserves[1].token, depositAmountB)); | ||
if (JSBI.equal(depositAmountA, ZERO) && JSBI.equal(depositAmountB, ZERO)) { | ||
@@ -173,3 +175,3 @@ const zero = new TokenAmount(exchange.lpTotalSupply.token, ZERO); | ||
const d0 = computeD(amp, normalizeAmount(reserveA), normalizeAmount(reserveB)); | ||
const d1 = computeD(amp, JSBI.add(normalizeAmount(reserveA), depositAmountA), JSBI.add(normalizeAmount(reserveB), depositAmountB)); | ||
const d1 = computeD(amp, JSBI.add(normalizeAmount(reserveA), normalizedDepositAmountA), JSBI.add(normalizeAmount(reserveB), normalizedDepositAmountB)); | ||
if (JSBI.lessThan(d1, d0)) { | ||
@@ -180,4 +182,4 @@ throw new Error("New D cannot be less than previous D"); | ||
const newBalances = [ | ||
JSBI.add(normalizeAmount(reserveA), depositAmountA), | ||
JSBI.add(normalizeAmount(reserveB), depositAmountB), | ||
JSBI.add(normalizeAmount(reserveA), normalizedDepositAmountA), | ||
JSBI.add(normalizeAmount(reserveB), normalizedDepositAmountB), | ||
]; | ||
@@ -184,0 +186,0 @@ const adjustedBalances = newBalances.map((newBalance, i) => { |
@@ -10,3 +10,3 @@ { | ||
], | ||
"version": "0.5.7", | ||
"version": "0.5.12", | ||
"repository": { | ||
@@ -29,5 +29,5 @@ "type": "git", | ||
"devDependencies": { | ||
"@types/bn.js": "^5.1.0", | ||
"@types/bn.js": "^5.1.1", | ||
"@types/lodash.mapvalues": "^4.6.7", | ||
"@types/node": "^18.0.0", | ||
"@types/node": "^18.7.14", | ||
"bn.js": "^5.2.1", | ||
@@ -41,4 +41,4 @@ "jsbi": "^4.3.0" | ||
"dependencies": { | ||
"@dahlia-labs/token-utils": "^0.5.7", | ||
"@saberhq/tsconfig": "^1.13.29", | ||
"@dahlia-labs/token-utils": "^0.5.12", | ||
"@saberhq/tsconfig": "^1.13.32", | ||
"lodash.mapvalues": "^4.6.0", | ||
@@ -59,3 +59,3 @@ "tslib": "^2.4.0" | ||
"homepage": "https://github.com/DahliaLabs/dahlia-common#readme", | ||
"gitHead": "efb09e5dcfb6443703c223fd77f28fda5cf320c9" | ||
"gitHead": "83936cc4102f35853a382994cd3f0e561bf69d4c" | ||
} |
@@ -340,2 +340,9 @@ import type { Token } from "@dahlia-labs/token-utils"; | ||
} => { | ||
const normalizedDepositAmountA = normalizeAmount( | ||
new TokenAmount(exchange.reserves[0].token, depositAmountA) | ||
); | ||
const normalizedDepositAmountB = normalizeAmount( | ||
new TokenAmount(exchange.reserves[1].token, depositAmountB) | ||
); | ||
if (JSBI.equal(depositAmountA, ZERO) && JSBI.equal(depositAmountB, ZERO)) { | ||
@@ -360,4 +367,4 @@ const zero = new TokenAmount(exchange.lpTotalSupply.token, ZERO); | ||
amp, | ||
JSBI.add(normalizeAmount(reserveA), depositAmountA), | ||
JSBI.add(normalizeAmount(reserveB), depositAmountB) | ||
JSBI.add(normalizeAmount(reserveA), normalizedDepositAmountA), | ||
JSBI.add(normalizeAmount(reserveB), normalizedDepositAmountB) | ||
); | ||
@@ -373,4 +380,4 @@ if (JSBI.lessThan(d1, d0)) { | ||
const newBalances = [ | ||
JSBI.add(normalizeAmount(reserveA), depositAmountA), | ||
JSBI.add(normalizeAmount(reserveB), depositAmountB), | ||
JSBI.add(normalizeAmount(reserveA), normalizedDepositAmountA), | ||
JSBI.add(normalizeAmount(reserveB), normalizedDepositAmountB), | ||
] as const; | ||
@@ -377,0 +384,0 @@ const adjustedBalances = newBalances.map((newBalance, i) => { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
151158
1588