bet-test-sdk 1.1.6 → 1.1.7
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/README.md +4 -3
- package/dist/browser/index.js +34 -22
- package/dist/browser/index.js.map +1 -1
- package/dist/browser/types/bet.d.ts.map +1 -1
- package/dist/browser/types/constants.d.ts +1 -0
- package/dist/browser/types/constants.d.ts.map +1 -1
- package/dist/browser/types/curveState.d.ts +2 -2
- package/dist/browser/types/curveState.d.ts.map +1 -1
- package/dist/browser/types/util.d.ts.map +1 -1
- package/dist/cjs/bet.d.ts.map +1 -1
- package/dist/cjs/bet.js +21 -11
- package/dist/cjs/bet.js.map +1 -1
- package/dist/cjs/constants.d.ts +1 -0
- package/dist/cjs/constants.d.ts.map +1 -1
- package/dist/cjs/constants.js +2 -1
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/curveState.d.ts +2 -2
- package/dist/cjs/curveState.d.ts.map +1 -1
- package/dist/cjs/curveState.js +11 -9
- package/dist/cjs/curveState.js.map +1 -1
- package/dist/cjs/util.d.ts.map +1 -1
- package/dist/cjs/util.js +2 -1
- package/dist/cjs/util.js.map +1 -1
- package/dist/esm/bet.d.ts.map +1 -1
- package/dist/esm/bet.js +22 -12
- package/dist/esm/bet.js.map +1 -1
- package/dist/esm/constants.d.ts +1 -0
- package/dist/esm/constants.d.ts.map +1 -1
- package/dist/esm/constants.js +1 -0
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/curveState.d.ts +2 -2
- package/dist/esm/curveState.d.ts.map +1 -1
- package/dist/esm/curveState.js +11 -9
- package/dist/esm/curveState.js.map +1 -1
- package/dist/esm/util.d.ts.map +1 -1
- package/dist/esm/util.js +2 -1
- package/dist/esm/util.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bet.d.ts","sourceRoot":"","sources":["../src/bet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAQpG,OAAO,EAGL,WAAW,EACX,gBAAgB,EAChB,YAAY,EAEZ,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EAEpB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"bet.d.ts","sourceRoot":"","sources":["../src/bet.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,4 +15,5 @@ export declare const DEFAULT_CURVE_INITIALIZE_SUPPLY = 1000000000000000;
|
|
|
15
15
|
export declare const REACH_CURVE_SOL_AMOUNT = 85000000000;
|
|
16
16
|
export declare const DEFAULT_DECIMALS = 6;
|
|
17
17
|
export declare const FEE_BASIS_POINTS = 100n;
|
|
18
|
+
export declare const DENOMINATOR = 10000n;
|
|
18
19
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,iDAAiD,CAAC;AACzE,eAAO,MAAM,OAAO,4CAA4C,CAAC;AAEjE,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,eAAe,eAAe,CAAC;AAC5C,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,eAAO,MAAM,yBAAyB,yBAAyB,CAAC;AAChE,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,4CAA4C,mBAAwB,CAAC;AAClF,eAAO,MAAM,8CAA8C,mBAAwB,CAAC;AACpF,eAAO,MAAM,sCAAsC,IAAI,CAAC;AACxD,eAAO,MAAM,yCAAyC,cAAiB,CAAC;AACxE,eAAO,MAAM,+BAA+B,mBAAwB,CAAC;AACrE,eAAO,MAAM,sBAAsB,cAAiB,CAAC;AACrD,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,gBAAgB,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,iDAAiD,CAAC;AACzE,eAAO,MAAM,OAAO,4CAA4C,CAAC;AAEjE,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,eAAe,eAAe,CAAC;AAC5C,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,eAAO,MAAM,yBAAyB,yBAAyB,CAAC;AAChE,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,4CAA4C,mBAAwB,CAAC;AAClF,eAAO,MAAM,8CAA8C,mBAAwB,CAAC;AACpF,eAAO,MAAM,sCAAsC,IAAI,CAAC;AACxD,eAAO,MAAM,yCAAyC,cAAiB,CAAC;AACxE,eAAO,MAAM,+BAA+B,mBAAwB,CAAC;AACrE,eAAO,MAAM,sBAAsB,cAAiB,CAAC;AACrD,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,gBAAgB,OAAO,CAAC;AACrC,eAAO,MAAM,WAAW,SAAS,CAAC"}
|
|
@@ -15,8 +15,8 @@ export declare class CurveState {
|
|
|
15
15
|
realSolReserves: bigint;
|
|
16
16
|
realTokenReserves: bigint;
|
|
17
17
|
constructor(discriminator: bigint, initReservedToken: bigint, supply: bigint, virtualSolReserves: bigint, virtualTokenReserves: bigint, realSolReserves: bigint, realTokenReserves: bigint);
|
|
18
|
-
getBuyPrice(amount: bigint,
|
|
19
|
-
getSellPrice(amount: bigint, feeBasisPoints: bigint,
|
|
18
|
+
getBuyPrice(amount: bigint, isCompleted: boolean): bigint;
|
|
19
|
+
getSellPrice(amount: bigint, feeBasisPoints: bigint, isCompleted: boolean): bigint;
|
|
20
20
|
getMarketCapSOL(): bigint;
|
|
21
21
|
getFinalMarketCapSOL(feeBasisPoints: bigint): bigint;
|
|
22
22
|
getBuyOutPrice(amount: bigint, feeBasisPoints: bigint): bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"curveState.d.ts","sourceRoot":"","sources":["../src/curveState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAgC,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"curveState.d.ts","sourceRoot":"","sources":["../src/curveState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAgC,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAGxE,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,uBAAuB,CAI7D,CAAC;AAGH,qBAAa,UAAU;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;gBAG/B,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,MAAM,EACvB,iBAAiB,EAAE,MAAM;IAW3B,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM;IAyBzD,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM;IAoBlF,eAAe,IAAI,MAAM;IAWzB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAepD,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM;WAWhD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU;CAsBrD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,UAAU,EACV,QAAQ,EACR,OAAO,EACP,SAAS,EAET,WAAW,EAEX,oBAAoB,EACpB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,UAAU,EACV,QAAQ,EACR,OAAO,EACP,SAAS,EAET,WAAW,EAEX,oBAAoB,EACpB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGzD,eAAO,MAAM,kBAAkB,EAAE,UAAwB,CAAC;AAC1D,eAAO,MAAM,gBAAgB,EAAE,QAAsB,CAAC;AAItD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,MAAM,EACd,aAAa,MAAM,WAGpB,CAAC;AAEF,wBAAsB,MAAM,CAC1B,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,OAAO,EAAE,EAClB,YAAY,CAAC,EAAE,WAAW,EAC1B,UAAU,GAAE,UAA+B,EAC3C,QAAQ,GAAE,QAA2B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAkD5B;AAED,eAAO,MAAM,gBAAgB,GAC3B,YAAY,UAAU,EACtB,OAAO,SAAS,EAChB,IAAI,WAAW,EACf,aAAY,UAA+B,KAC1C,OAAO,CAAC,oBAAoB,CAW9B,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,YAAY,UAAU,EACtB,KAAK,MAAM,EACX,aAAY,UAA+B,EAC3C,WAAU,QAA2B,KACpC,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAe7C,CAAC"}
|
package/dist/cjs/bet.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bet.d.ts","sourceRoot":"","sources":["../../src/bet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAQpG,OAAO,EAGL,WAAW,EACX,gBAAgB,EAChB,YAAY,EAEZ,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EAEpB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"bet.d.ts","sourceRoot":"","sources":["../../src/bet.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/bet.js
CHANGED
|
@@ -121,8 +121,8 @@ class BetSDK {
|
|
|
121
121
|
if (!curveState) {
|
|
122
122
|
throw new Error(`Curve state account not found: ${mint.toBase58()}`);
|
|
123
123
|
}
|
|
124
|
-
const
|
|
125
|
-
let minSolOutput = curveState.getSellPrice(sellTokenAmount, constants_1.FEE_BASIS_POINTS,
|
|
124
|
+
const isCompleted = betState.isCompted;
|
|
125
|
+
let minSolOutput = curveState.getSellPrice(sellTokenAmount, constants_1.FEE_BASIS_POINTS, isCompleted);
|
|
126
126
|
let minSolOutputWithSlippage = (0, util_1.calculateWithSlippage)(minSolOutput, slippageBasisPoints);
|
|
127
127
|
return await this.getSellInstructions(seller, mint, sellTokenAmount, minSolOutputWithSlippage);
|
|
128
128
|
}
|
|
@@ -275,6 +275,7 @@ class BetSDK {
|
|
|
275
275
|
if (amount <= 0n) {
|
|
276
276
|
return 0n;
|
|
277
277
|
}
|
|
278
|
+
amount = amount * (constants_1.DENOMINATOR - constants_1.FEE_BASIS_POINTS) / constants_1.DENOMINATOR;
|
|
278
279
|
const initVirtualSol = new bignumber_js_1.default(constants_1.DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN);
|
|
279
280
|
const initVirtualToken = new bignumber_js_1.default(constants_1.DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN);
|
|
280
281
|
const initRealReservedToken = new bignumber_js_1.default(constants_1.DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN);
|
|
@@ -297,46 +298,56 @@ class BetSDK {
|
|
|
297
298
|
}
|
|
298
299
|
let shouldOutTokens = curveStateAccount.getBuyPrice(solAmountIn, false);
|
|
299
300
|
if (slippageBasisPoints) {
|
|
300
|
-
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) /
|
|
301
|
+
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / constants_1.DENOMINATOR;
|
|
301
302
|
}
|
|
302
303
|
return shouldOutTokens;
|
|
303
304
|
}
|
|
304
305
|
// Buy: Fixed token amount out, estimated sol amount in
|
|
305
306
|
async getMinSolAmountIn(mint, tokenAmountOut, slippageBasisPoints) {
|
|
307
|
+
if (tokenAmountOut <= 0) {
|
|
308
|
+
return 0n;
|
|
309
|
+
}
|
|
306
310
|
const curveStateAccount = await this.getValidCurveState(mint);
|
|
307
311
|
if (!curveStateAccount) {
|
|
308
312
|
return 0n;
|
|
309
313
|
}
|
|
310
|
-
let shouldOutTokens = tokenAmountOut > curveStateAccount.
|
|
311
|
-
? curveStateAccount.
|
|
314
|
+
let shouldOutTokens = tokenAmountOut > curveStateAccount.realTokenReserves
|
|
315
|
+
? curveStateAccount.realTokenReserves
|
|
312
316
|
: tokenAmountOut;
|
|
313
317
|
let minSolAmountIn = (shouldOutTokens * curveStateAccount.virtualSolReserves) /
|
|
314
318
|
(curveStateAccount.virtualTokenReserves - shouldOutTokens) +
|
|
315
319
|
1n;
|
|
320
|
+
let fee = (minSolAmountIn * constants_1.FEE_BASIS_POINTS) / constants_1.DENOMINATOR;
|
|
316
321
|
if (slippageBasisPoints) {
|
|
317
|
-
minSolAmountIn += (minSolAmountIn * slippageBasisPoints) /
|
|
322
|
+
minSolAmountIn += (minSolAmountIn * slippageBasisPoints) / constants_1.DENOMINATOR;
|
|
318
323
|
}
|
|
319
|
-
let fee = (minSolAmountIn * constants_1.FEE_BASIS_POINTS) / 10000n;
|
|
320
324
|
return minSolAmountIn + fee;
|
|
321
325
|
}
|
|
322
326
|
// Sell: Fixed token amount in, estimated sol amount out
|
|
323
327
|
async getSolAmountOut(mint, tokenAmountIn, slippageBasisPoints) {
|
|
328
|
+
if (tokenAmountIn <= 0) {
|
|
329
|
+
return 0n;
|
|
330
|
+
}
|
|
324
331
|
const curveStateAccount = await this.getValidCurveState(mint);
|
|
325
332
|
if (!curveStateAccount) {
|
|
326
333
|
return 0n;
|
|
327
334
|
}
|
|
328
335
|
let shouldOutTokens = curveStateAccount.getSellPrice(tokenAmountIn, constants_1.FEE_BASIS_POINTS, false);
|
|
329
336
|
if (slippageBasisPoints) {
|
|
330
|
-
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) /
|
|
337
|
+
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / constants_1.DENOMINATOR;
|
|
331
338
|
}
|
|
332
339
|
return shouldOutTokens;
|
|
333
340
|
}
|
|
334
341
|
// Sell: Fixed sol amount out, estimated token amount in
|
|
335
342
|
async getMinTokenAmountIn(mint, solAmountOut, slippageBasisPoints) {
|
|
343
|
+
if (solAmountOut <= 0) {
|
|
344
|
+
return 0n;
|
|
345
|
+
}
|
|
336
346
|
const curveStateAccount = await this.getValidCurveState(mint);
|
|
337
347
|
if (!curveStateAccount) {
|
|
338
348
|
return 0n;
|
|
339
349
|
}
|
|
350
|
+
solAmountOut = solAmountOut * (constants_1.DENOMINATOR - constants_1.FEE_BASIS_POINTS) / constants_1.DENOMINATOR;
|
|
340
351
|
let shouldOutSols = solAmountOut > curveStateAccount.virtualSolReserves - curveStateAccount.realSolReserves
|
|
341
352
|
? curveStateAccount.virtualSolReserves - curveStateAccount.realSolReserves
|
|
342
353
|
: solAmountOut;
|
|
@@ -344,10 +355,9 @@ class BetSDK {
|
|
|
344
355
|
(curveStateAccount.virtualSolReserves - shouldOutSols) +
|
|
345
356
|
1n;
|
|
346
357
|
if (slippageBasisPoints) {
|
|
347
|
-
minTokenAmountIn += (minTokenAmountIn * slippageBasisPoints) /
|
|
358
|
+
minTokenAmountIn += (minTokenAmountIn * slippageBasisPoints) / constants_1.DENOMINATOR;
|
|
348
359
|
}
|
|
349
|
-
|
|
350
|
-
return minTokenAmountIn + fee;
|
|
360
|
+
return minTokenAmountIn;
|
|
351
361
|
}
|
|
352
362
|
async getValidCurveState(mint) {
|
|
353
363
|
const curveStateAccount = await this.getCurveStateAccount(mint);
|
package/dist/cjs/bet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bet.js","sourceRoot":"","sources":["../../src/bet.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bet.js","sourceRoot":"","sources":["../../src/bet.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/constants.d.ts
CHANGED
|
@@ -15,4 +15,5 @@ export declare const DEFAULT_CURVE_INITIALIZE_SUPPLY = 1000000000000000;
|
|
|
15
15
|
export declare const REACH_CURVE_SOL_AMOUNT = 85000000000;
|
|
16
16
|
export declare const DEFAULT_DECIMALS = 6;
|
|
17
17
|
export declare const FEE_BASIS_POINTS = 100n;
|
|
18
|
+
export declare const DENOMINATOR = 10000n;
|
|
18
19
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,iDAAiD,CAAC;AACzE,eAAO,MAAM,OAAO,4CAA4C,CAAC;AAEjE,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,eAAe,eAAe,CAAC;AAC5C,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,eAAO,MAAM,yBAAyB,yBAAyB,CAAC;AAChE,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,4CAA4C,mBAAwB,CAAC;AAClF,eAAO,MAAM,8CAA8C,mBAAwB,CAAC;AACpF,eAAO,MAAM,sCAAsC,IAAI,CAAC;AACxD,eAAO,MAAM,yCAAyC,cAAiB,CAAC;AACxE,eAAO,MAAM,+BAA+B,mBAAwB,CAAC;AACrE,eAAO,MAAM,sBAAsB,cAAiB,CAAC;AACrD,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,gBAAgB,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,iDAAiD,CAAC;AACzE,eAAO,MAAM,OAAO,4CAA4C,CAAC;AAEjE,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,eAAe,eAAe,CAAC;AAC5C,eAAO,MAAM,cAAc,cAAc,CAAC;AAC1C,eAAO,MAAM,wBAAwB,wBAAwB,CAAC;AAC9D,eAAO,MAAM,yBAAyB,yBAAyB,CAAC;AAChE,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,4CAA4C,mBAAwB,CAAC;AAClF,eAAO,MAAM,8CAA8C,mBAAwB,CAAC;AACpF,eAAO,MAAM,sCAAsC,IAAI,CAAC;AACxD,eAAO,MAAM,yCAAyC,cAAiB,CAAC;AACxE,eAAO,MAAM,+BAA+B,mBAAwB,CAAC;AACrE,eAAO,MAAM,sBAAsB,cAAiB,CAAC;AACrD,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,gBAAgB,OAAO,CAAC;AACrC,eAAO,MAAM,WAAW,SAAS,CAAC"}
|
package/dist/cjs/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FEE_BASIS_POINTS = exports.DEFAULT_DECIMALS = exports.REACH_CURVE_SOL_AMOUNT = exports.DEFAULT_CURVE_INITIALIZE_SUPPLY = exports.DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN = exports.DEFAULT_CURVE_INITIALIZE_TOKEN_DEMICAL = exports.DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN = exports.DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN = exports.POOL_SEED = exports.TOKEN_MINT_AUTHORITY_SEED = exports.FEE_RECIVED_ACCOUNT_SEED = exports.FEE_STORE_SEED = exports.APP_CONFIG_SEED = exports.CURVE_STATE_SEED = exports.BET_STATE_SEED = exports.BET_API = exports.PROGRAM_ID = void 0;
|
|
3
|
+
exports.DENOMINATOR = exports.FEE_BASIS_POINTS = exports.DEFAULT_DECIMALS = exports.REACH_CURVE_SOL_AMOUNT = exports.DEFAULT_CURVE_INITIALIZE_SUPPLY = exports.DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN = exports.DEFAULT_CURVE_INITIALIZE_TOKEN_DEMICAL = exports.DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN = exports.DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN = exports.POOL_SEED = exports.TOKEN_MINT_AUTHORITY_SEED = exports.FEE_RECIVED_ACCOUNT_SEED = exports.FEE_STORE_SEED = exports.APP_CONFIG_SEED = exports.CURVE_STATE_SEED = exports.BET_STATE_SEED = exports.BET_API = exports.PROGRAM_ID = void 0;
|
|
4
4
|
exports.PROGRAM_ID = "E3zXK7VRyn39uuyshkQCriRXUAsR1KKQXaJ55KyDW4bp";
|
|
5
5
|
exports.BET_API = "https://dev-jeffery.openhub.network/api";
|
|
6
6
|
exports.BET_STATE_SEED = "bet-state";
|
|
@@ -18,4 +18,5 @@ exports.DEFAULT_CURVE_INITIALIZE_SUPPLY = 1_000_000_000_000_000;
|
|
|
18
18
|
exports.REACH_CURVE_SOL_AMOUNT = 85_000_000_000;
|
|
19
19
|
exports.DEFAULT_DECIMALS = 6;
|
|
20
20
|
exports.FEE_BASIS_POINTS = 100n;
|
|
21
|
+
exports.DENOMINATOR = 10000n;
|
|
21
22
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,OAAO,GAAG,yCAAyC,CAAC;AAEpD,QAAA,cAAc,GAAG,WAAW,CAAC;AAC7B,QAAA,gBAAgB,GAAG,aAAa,CAAC;AACjC,QAAA,eAAe,GAAG,YAAY,CAAC;AAC/B,QAAA,cAAc,GAAG,WAAW,CAAC;AAC7B,QAAA,wBAAwB,GAAG,qBAAqB,CAAC;AACjD,QAAA,yBAAyB,GAAG,sBAAsB,CAAC;AACnD,QAAA,SAAS,GAAG,MAAM,CAAC;AAEnB,QAAA,4CAA4C,GAAG,qBAAqB,CAAC;AACrE,QAAA,8CAA8C,GAAG,qBAAqB,CAAC;AACvE,QAAA,sCAAsC,GAAG,CAAC,CAAC;AAC3C,QAAA,yCAAyC,GAAG,cAAc,CAAC;AAC3D,QAAA,+BAA+B,GAAG,qBAAqB,CAAC;AACxD,QAAA,sBAAsB,GAAG,cAAc,CAAC;AACxC,QAAA,gBAAgB,GAAG,CAAC,CAAC;AACrB,QAAA,gBAAgB,GAAG,IAAI,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,OAAO,GAAG,yCAAyC,CAAC;AAEpD,QAAA,cAAc,GAAG,WAAW,CAAC;AAC7B,QAAA,gBAAgB,GAAG,aAAa,CAAC;AACjC,QAAA,eAAe,GAAG,YAAY,CAAC;AAC/B,QAAA,cAAc,GAAG,WAAW,CAAC;AAC7B,QAAA,wBAAwB,GAAG,qBAAqB,CAAC;AACjD,QAAA,yBAAyB,GAAG,sBAAsB,CAAC;AACnD,QAAA,SAAS,GAAG,MAAM,CAAC;AAEnB,QAAA,4CAA4C,GAAG,qBAAqB,CAAC;AACrE,QAAA,8CAA8C,GAAG,qBAAqB,CAAC;AACvE,QAAA,sCAAsC,GAAG,CAAC,CAAC;AAC3C,QAAA,yCAAyC,GAAG,cAAc,CAAC;AAC3D,QAAA,+BAA+B,GAAG,qBAAqB,CAAC;AACxD,QAAA,sBAAsB,GAAG,cAAc,CAAC;AACxC,QAAA,gBAAgB,GAAG,CAAC,CAAC;AACrB,QAAA,gBAAgB,GAAG,IAAI,CAAC;AACxB,QAAA,WAAW,GAAG,MAAM,CAAC"}
|
package/dist/cjs/curveState.d.ts
CHANGED
|
@@ -15,8 +15,8 @@ export declare class CurveState {
|
|
|
15
15
|
realSolReserves: bigint;
|
|
16
16
|
realTokenReserves: bigint;
|
|
17
17
|
constructor(discriminator: bigint, initReservedToken: bigint, supply: bigint, virtualSolReserves: bigint, virtualTokenReserves: bigint, realSolReserves: bigint, realTokenReserves: bigint);
|
|
18
|
-
getBuyPrice(amount: bigint,
|
|
19
|
-
getSellPrice(amount: bigint, feeBasisPoints: bigint,
|
|
18
|
+
getBuyPrice(amount: bigint, isCompleted: boolean): bigint;
|
|
19
|
+
getSellPrice(amount: bigint, feeBasisPoints: bigint, isCompleted: boolean): bigint;
|
|
20
20
|
getMarketCapSOL(): bigint;
|
|
21
21
|
getFinalMarketCapSOL(feeBasisPoints: bigint): bigint;
|
|
22
22
|
getBuyOutPrice(amount: bigint, feeBasisPoints: bigint): bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"curveState.d.ts","sourceRoot":"","sources":["../../src/curveState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAgC,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"curveState.d.ts","sourceRoot":"","sources":["../../src/curveState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAgC,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAGxE,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,uBAAuB,CAI7D,CAAC;AAGH,qBAAa,UAAU;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;gBAG/B,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,oBAAoB,EAAE,MAAM,EAC5B,eAAe,EAAE,MAAM,EACvB,iBAAiB,EAAE,MAAM;IAW3B,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM;IAyBzD,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM;IAoBlF,eAAe,IAAI,MAAM;IAWzB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAepD,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM;WAWhD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU;CAsBrD"}
|
package/dist/cjs/curveState.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CurveState = exports.TOKEN_ACCOUNT_DATA = void 0;
|
|
4
4
|
const borsh_1 = require("@coral-xyz/borsh");
|
|
5
|
+
const constants_1 = require("./constants");
|
|
5
6
|
exports.TOKEN_ACCOUNT_DATA = (0, borsh_1.struct)([
|
|
6
7
|
(0, borsh_1.publicKey)("mint"),
|
|
7
8
|
(0, borsh_1.publicKey)('owner'),
|
|
@@ -25,13 +26,14 @@ class CurveState {
|
|
|
25
26
|
this.realSolReserves = realSolReserves;
|
|
26
27
|
this.realTokenReserves = realTokenReserves;
|
|
27
28
|
}
|
|
28
|
-
getBuyPrice(amount,
|
|
29
|
-
if (
|
|
30
|
-
throw new Error("Curve is
|
|
29
|
+
getBuyPrice(amount, isCompleted) {
|
|
30
|
+
if (isCompleted) {
|
|
31
|
+
throw new Error("Curve is completed");
|
|
31
32
|
}
|
|
32
33
|
if (amount <= 0n) {
|
|
33
34
|
return 0n;
|
|
34
35
|
}
|
|
36
|
+
amount = amount * (constants_1.DENOMINATOR - constants_1.FEE_BASIS_POINTS) / constants_1.DENOMINATOR;
|
|
35
37
|
// Calculate the product of virtual reserves
|
|
36
38
|
let n = this.virtualSolReserves * this.virtualTokenReserves;
|
|
37
39
|
// Calculate the new virtual sol reserves after the purchase
|
|
@@ -43,8 +45,8 @@ class CurveState {
|
|
|
43
45
|
// Return the minimum of the calculated tokens and real token reserves
|
|
44
46
|
return s < this.realTokenReserves ? s : this.realTokenReserves;
|
|
45
47
|
}
|
|
46
|
-
getSellPrice(amount, feeBasisPoints,
|
|
47
|
-
if (
|
|
48
|
+
getSellPrice(amount, feeBasisPoints, isCompleted) {
|
|
49
|
+
if (isCompleted) {
|
|
48
50
|
throw new Error("Curve is complete");
|
|
49
51
|
}
|
|
50
52
|
if (amount <= 0n) {
|
|
@@ -53,7 +55,7 @@ class CurveState {
|
|
|
53
55
|
// Calculate the proportional amount of virtual sol reserves to be received
|
|
54
56
|
let n = (amount * this.virtualSolReserves) / (this.virtualTokenReserves + amount);
|
|
55
57
|
// Calculate the fee amount in the same units
|
|
56
|
-
let a = (n * feeBasisPoints) /
|
|
58
|
+
let a = (n * feeBasisPoints) / constants_1.DENOMINATOR;
|
|
57
59
|
// Return the net amount after deducting the fee
|
|
58
60
|
return n - a;
|
|
59
61
|
}
|
|
@@ -78,7 +80,7 @@ class CurveState {
|
|
|
78
80
|
let totalSellValue = (solTokens * this.virtualSolReserves) /
|
|
79
81
|
(this.virtualTokenReserves - solTokens) +
|
|
80
82
|
1n;
|
|
81
|
-
let fee = (totalSellValue * feeBasisPoints) /
|
|
83
|
+
let fee = (totalSellValue * feeBasisPoints) / constants_1.DENOMINATOR;
|
|
82
84
|
return totalSellValue + fee;
|
|
83
85
|
}
|
|
84
86
|
static fromBuffer(buffer) {
|
|
@@ -86,13 +88,13 @@ class CurveState {
|
|
|
86
88
|
(0, borsh_1.u64)("discriminator"),
|
|
87
89
|
(0, borsh_1.u64)("initReservedToken"),
|
|
88
90
|
(0, borsh_1.u64)("supply"),
|
|
89
|
-
(0, borsh_1.u64)("virtualTokenReserves"),
|
|
90
91
|
(0, borsh_1.u64)("virtualSolReserves"),
|
|
92
|
+
(0, borsh_1.u64)("virtualTokenReserves"),
|
|
91
93
|
(0, borsh_1.u64)("realSolReserves"),
|
|
92
94
|
(0, borsh_1.u64)("realTokenReserves"),
|
|
93
95
|
]);
|
|
94
96
|
let value = structure.decode(buffer);
|
|
95
|
-
return new CurveState(BigInt(value.discriminator), BigInt(value.initReservedToken), BigInt(value.supply), BigInt(value.
|
|
97
|
+
return new CurveState(BigInt(value.discriminator), BigInt(value.initReservedToken), BigInt(value.supply), BigInt(value.virtualSolReserves), BigInt(value.virtualTokenReserves), BigInt(value.realSolReserves), BigInt(value.realTokenReserves));
|
|
96
98
|
}
|
|
97
99
|
}
|
|
98
100
|
exports.CurveState = CurveState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"curveState.js","sourceRoot":"","sources":["../../src/curveState.ts"],"names":[],"mappings":";;;AACA,4CAAwE;
|
|
1
|
+
{"version":3,"file":"curveState.js","sourceRoot":"","sources":["../../src/curveState.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,UAAU,EACV,QAAQ,EACR,OAAO,EACP,SAAS,EAET,WAAW,EAEX,oBAAoB,EACpB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,UAAU,EACV,QAAQ,EACR,OAAO,EACP,SAAS,EAET,WAAW,EAEX,oBAAoB,EACpB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGzD,eAAO,MAAM,kBAAkB,EAAE,UAAwB,CAAC;AAC1D,eAAO,MAAM,gBAAgB,EAAE,QAAsB,CAAC;AAItD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,MAAM,EACd,aAAa,MAAM,WAGpB,CAAC;AAEF,wBAAsB,MAAM,CAC1B,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,OAAO,EAAE,EAClB,YAAY,CAAC,EAAE,WAAW,EAC1B,UAAU,GAAE,UAA+B,EAC3C,QAAQ,GAAE,QAA2B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAkD5B;AAED,eAAO,MAAM,gBAAgB,GAC3B,YAAY,UAAU,EACtB,OAAO,SAAS,EAChB,IAAI,WAAW,EACf,aAAY,UAA+B,KAC1C,OAAO,CAAC,oBAAoB,CAW9B,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,YAAY,UAAU,EACtB,KAAK,MAAM,EACX,aAAY,UAA+B,EAC3C,WAAU,QAA2B,KACpC,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAe7C,CAAC"}
|
package/dist/cjs/util.js
CHANGED
|
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getTxDetails = exports.buildVersionedTx = exports.calculateWithSlippage = exports.DEFAULT_FINALITY = exports.DEFAULT_COMMITMENT = void 0;
|
|
4
4
|
exports.sendTx = sendTx;
|
|
5
5
|
const web3_js_1 = require("@solana/web3.js");
|
|
6
|
+
const constants_1 = require("./constants");
|
|
6
7
|
exports.DEFAULT_COMMITMENT = "finalized";
|
|
7
8
|
exports.DEFAULT_FINALITY = "finalized";
|
|
8
9
|
// token amount => token amount
|
|
9
10
|
// sol amount => sol amount
|
|
10
11
|
const calculateWithSlippage = (amount, basisPoints) => {
|
|
11
|
-
return amount - (amount * basisPoints) /
|
|
12
|
+
return amount - (amount * basisPoints) / constants_1.DENOMINATOR;
|
|
12
13
|
};
|
|
13
14
|
exports.calculateWithSlippage = calculateWithSlippage;
|
|
14
15
|
async function sendTx(connection, tx, payer, signers, priorityFees, commitment = exports.DEFAULT_COMMITMENT, finality = exports.DEFAULT_FINALITY) {
|
package/dist/cjs/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/bet.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bet.d.ts","sourceRoot":"","sources":["../../src/bet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAQpG,OAAO,EAGL,WAAW,EACX,gBAAgB,EAChB,YAAY,EAEZ,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EAEpB,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"bet.d.ts","sourceRoot":"","sources":["../../src/bet.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/bet.js
CHANGED
|
@@ -3,7 +3,7 @@ import { Keypair, PublicKey, Transaction } from "@solana/web3.js";
|
|
|
3
3
|
import { DEFAULT_COMMITMENT, DEFAULT_FINALITY, calculateWithSlippage, sendTx } from "./util";
|
|
4
4
|
import { getAccount, createAssociatedTokenAccountInstruction, getAssociatedTokenAddress, getAssociatedTokenAddressSync } from "@solana/spl-token";
|
|
5
5
|
import { MigrateType, MigrateDex } from "./types";
|
|
6
|
-
import { APP_CONFIG_SEED, BET_STATE_SEED, CURVE_STATE_SEED, FEE_RECIVED_ACCOUNT_SEED, FEE_BASIS_POINTS, BET_API, DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN } from "./constants";
|
|
6
|
+
import { APP_CONFIG_SEED, BET_STATE_SEED, CURVE_STATE_SEED, FEE_RECIVED_ACCOUNT_SEED, FEE_BASIS_POINTS, BET_API, DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN, DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN, DENOMINATOR } from "./constants";
|
|
7
7
|
import { toCompleteEvent, toCreateEvent, toTradeEvent } from "./events";
|
|
8
8
|
import { CurveState } from "./curveState";
|
|
9
9
|
import { BetState } from "./betState";
|
|
@@ -115,8 +115,8 @@ export class BetSDK {
|
|
|
115
115
|
if (!curveState) {
|
|
116
116
|
throw new Error(`Curve state account not found: ${mint.toBase58()}`);
|
|
117
117
|
}
|
|
118
|
-
const
|
|
119
|
-
let minSolOutput = curveState.getSellPrice(sellTokenAmount, FEE_BASIS_POINTS,
|
|
118
|
+
const isCompleted = betState.isCompted;
|
|
119
|
+
let minSolOutput = curveState.getSellPrice(sellTokenAmount, FEE_BASIS_POINTS, isCompleted);
|
|
120
120
|
let minSolOutputWithSlippage = calculateWithSlippage(minSolOutput, slippageBasisPoints);
|
|
121
121
|
return await this.getSellInstructions(seller, mint, sellTokenAmount, minSolOutputWithSlippage);
|
|
122
122
|
}
|
|
@@ -269,6 +269,7 @@ export class BetSDK {
|
|
|
269
269
|
if (amount <= 0n) {
|
|
270
270
|
return 0n;
|
|
271
271
|
}
|
|
272
|
+
amount = amount * (DENOMINATOR - FEE_BASIS_POINTS) / DENOMINATOR;
|
|
272
273
|
const initVirtualSol = new BigNumber(DEFAULT_CURVE_INITIALIZE_VITUAL_SOL_TOKEN);
|
|
273
274
|
const initVirtualToken = new BigNumber(DEFAULT_CURVE_INITIALIZE_VITUAL_RESERVED_TOKEN);
|
|
274
275
|
const initRealReservedToken = new BigNumber(DEFAULT_CURVE_INITIALIZE_INIT_RESERVED_TOKEN);
|
|
@@ -291,46 +292,56 @@ export class BetSDK {
|
|
|
291
292
|
}
|
|
292
293
|
let shouldOutTokens = curveStateAccount.getBuyPrice(solAmountIn, false);
|
|
293
294
|
if (slippageBasisPoints) {
|
|
294
|
-
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) /
|
|
295
|
+
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / DENOMINATOR;
|
|
295
296
|
}
|
|
296
297
|
return shouldOutTokens;
|
|
297
298
|
}
|
|
298
299
|
// Buy: Fixed token amount out, estimated sol amount in
|
|
299
300
|
async getMinSolAmountIn(mint, tokenAmountOut, slippageBasisPoints) {
|
|
301
|
+
if (tokenAmountOut <= 0) {
|
|
302
|
+
return 0n;
|
|
303
|
+
}
|
|
300
304
|
const curveStateAccount = await this.getValidCurveState(mint);
|
|
301
305
|
if (!curveStateAccount) {
|
|
302
306
|
return 0n;
|
|
303
307
|
}
|
|
304
|
-
let shouldOutTokens = tokenAmountOut > curveStateAccount.
|
|
305
|
-
? curveStateAccount.
|
|
308
|
+
let shouldOutTokens = tokenAmountOut > curveStateAccount.realTokenReserves
|
|
309
|
+
? curveStateAccount.realTokenReserves
|
|
306
310
|
: tokenAmountOut;
|
|
307
311
|
let minSolAmountIn = (shouldOutTokens * curveStateAccount.virtualSolReserves) /
|
|
308
312
|
(curveStateAccount.virtualTokenReserves - shouldOutTokens) +
|
|
309
313
|
1n;
|
|
314
|
+
let fee = (minSolAmountIn * FEE_BASIS_POINTS) / DENOMINATOR;
|
|
310
315
|
if (slippageBasisPoints) {
|
|
311
|
-
minSolAmountIn += (minSolAmountIn * slippageBasisPoints) /
|
|
316
|
+
minSolAmountIn += (minSolAmountIn * slippageBasisPoints) / DENOMINATOR;
|
|
312
317
|
}
|
|
313
|
-
let fee = (minSolAmountIn * FEE_BASIS_POINTS) / 10000n;
|
|
314
318
|
return minSolAmountIn + fee;
|
|
315
319
|
}
|
|
316
320
|
// Sell: Fixed token amount in, estimated sol amount out
|
|
317
321
|
async getSolAmountOut(mint, tokenAmountIn, slippageBasisPoints) {
|
|
322
|
+
if (tokenAmountIn <= 0) {
|
|
323
|
+
return 0n;
|
|
324
|
+
}
|
|
318
325
|
const curveStateAccount = await this.getValidCurveState(mint);
|
|
319
326
|
if (!curveStateAccount) {
|
|
320
327
|
return 0n;
|
|
321
328
|
}
|
|
322
329
|
let shouldOutTokens = curveStateAccount.getSellPrice(tokenAmountIn, FEE_BASIS_POINTS, false);
|
|
323
330
|
if (slippageBasisPoints) {
|
|
324
|
-
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) /
|
|
331
|
+
shouldOutTokens -= (shouldOutTokens * slippageBasisPoints) / DENOMINATOR;
|
|
325
332
|
}
|
|
326
333
|
return shouldOutTokens;
|
|
327
334
|
}
|
|
328
335
|
// Sell: Fixed sol amount out, estimated token amount in
|
|
329
336
|
async getMinTokenAmountIn(mint, solAmountOut, slippageBasisPoints) {
|
|
337
|
+
if (solAmountOut <= 0) {
|
|
338
|
+
return 0n;
|
|
339
|
+
}
|
|
330
340
|
const curveStateAccount = await this.getValidCurveState(mint);
|
|
331
341
|
if (!curveStateAccount) {
|
|
332
342
|
return 0n;
|
|
333
343
|
}
|
|
344
|
+
solAmountOut = solAmountOut * (DENOMINATOR - FEE_BASIS_POINTS) / DENOMINATOR;
|
|
334
345
|
let shouldOutSols = solAmountOut > curveStateAccount.virtualSolReserves - curveStateAccount.realSolReserves
|
|
335
346
|
? curveStateAccount.virtualSolReserves - curveStateAccount.realSolReserves
|
|
336
347
|
: solAmountOut;
|
|
@@ -338,10 +349,9 @@ export class BetSDK {
|
|
|
338
349
|
(curveStateAccount.virtualSolReserves - shouldOutSols) +
|
|
339
350
|
1n;
|
|
340
351
|
if (slippageBasisPoints) {
|
|
341
|
-
minTokenAmountIn += (minTokenAmountIn * slippageBasisPoints) /
|
|
352
|
+
minTokenAmountIn += (minTokenAmountIn * slippageBasisPoints) / DENOMINATOR;
|
|
342
353
|
}
|
|
343
|
-
|
|
344
|
-
return minTokenAmountIn + fee;
|
|
354
|
+
return minTokenAmountIn;
|
|
345
355
|
}
|
|
346
356
|
async getValidCurveState(mint) {
|
|
347
357
|
const curveStateAccount = await this.getCurveStateAccount(mint);
|