From 886839599a37c887b061e4fd85f38295bc935811 Mon Sep 17 00:00:00 2001 From: quangkeu95 Date: Wed, 11 Dec 2024 01:45:06 +0700 Subject: [PATCH 1/5] feat: Add seed liquidity single bin --- ts-client/src/dlmm/index.ts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ts-client/src/dlmm/index.ts b/ts-client/src/dlmm/index.ts index d3d91778..7bd75add 100644 --- a/ts-client/src/dlmm/index.ts +++ b/ts-client/src/dlmm/index.ts @@ -4494,6 +4494,26 @@ export class DLMM { return ixs; } + /** + * Initializes bin arrays for the given bin array bitmap extension if it wasn't initialized. + * + * @param {PublicKey} binArrayBitmapExtension - The public key of the bin array bitmap extension + * @param {PublicKey} funder - The public key of the funder. + * @return {Promise} An array of transaction instructions to initialize the bin arrays. + */ + public async initializeBinArrayBitMapExtension(binArrayBitmapExtension: PublicKey, funder: PublicKey): Promise { + const ixs: TransactionInstruction[] = []; + + const initializeBinArrayBitmapExtensionIx = await this.program.methods.initializeBinArrayBitMapExtension().accounts({ + binArrayBitmapExtension, + funder, + lbPair: this.pubkey, + }).instruction(); + ixs.push(initializeBinArrayBitmapExtensionIx) + + return ixs; + } + /** * * @param From ef105c9e484ec33a13d668397458b4af35500203 Mon Sep 17 00:00:00 2001 From: quangkeu95 Date: Wed, 11 Dec 2024 11:04:04 +0700 Subject: [PATCH 2/5] chore: Format code --- ts-client/src/dlmm/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-client/src/dlmm/index.ts b/ts-client/src/dlmm/index.ts index 7bd75add..1bcac7eb 100644 --- a/ts-client/src/dlmm/index.ts +++ b/ts-client/src/dlmm/index.ts @@ -4504,7 +4504,7 @@ export class DLMM { public async initializeBinArrayBitMapExtension(binArrayBitmapExtension: PublicKey, funder: PublicKey): Promise { const ixs: TransactionInstruction[] = []; - const initializeBinArrayBitmapExtensionIx = await this.program.methods.initializeBinArrayBitMapExtension().accounts({ + const initializeBinArrayBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accounts({ binArrayBitmapExtension, funder, lbPair: this.pubkey, From 53433f7f69ca195d104b453f06048ce645652cbe Mon Sep 17 00:00:00 2001 From: quangkeu95 Date: Wed, 11 Dec 2024 12:04:47 +0700 Subject: [PATCH 3/5] draft: Add single bin test --- ts-client/src/test/single_bin.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-client/src/test/single_bin.test.ts b/ts-client/src/test/single_bin.test.ts index f1b65c43..a6aa4f57 100644 --- a/ts-client/src/test/single_bin.test.ts +++ b/ts-client/src/test/single_bin.test.ts @@ -214,4 +214,4 @@ describe("Single Bin Seed Liquidity Test", () => { }) -}); \ No newline at end of file +}); From 256833daacf8a4ccbf981c9150a84f6a3df153b4 Mon Sep 17 00:00:00 2001 From: quangkeu95 Date: Fri, 13 Dec 2024 10:32:39 +0700 Subject: [PATCH 4/5] fix: Update seedLiquiditySingleBin function --- ts-client/src/dlmm/index.ts | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/ts-client/src/dlmm/index.ts b/ts-client/src/dlmm/index.ts index 1bcac7eb..d3d91778 100644 --- a/ts-client/src/dlmm/index.ts +++ b/ts-client/src/dlmm/index.ts @@ -4494,26 +4494,6 @@ export class DLMM { return ixs; } - /** - * Initializes bin arrays for the given bin array bitmap extension if it wasn't initialized. - * - * @param {PublicKey} binArrayBitmapExtension - The public key of the bin array bitmap extension - * @param {PublicKey} funder - The public key of the funder. - * @return {Promise} An array of transaction instructions to initialize the bin arrays. - */ - public async initializeBinArrayBitMapExtension(binArrayBitmapExtension: PublicKey, funder: PublicKey): Promise { - const ixs: TransactionInstruction[] = []; - - const initializeBinArrayBitmapExtensionIx = await this.program.methods.initializeBinArrayBitmapExtension().accounts({ - binArrayBitmapExtension, - funder, - lbPair: this.pubkey, - }).instruction(); - ixs.push(initializeBinArrayBitmapExtensionIx) - - return ixs; - } - /** * * @param From 261924b120b0a869a0596ed891a5e9b62b1ece2e Mon Sep 17 00:00:00 2001 From: quangkeu95 Date: Fri, 13 Dec 2024 11:57:23 +0700 Subject: [PATCH 5/5] fix: Remove isTokenX argument --- ts-client/src/dlmm/index.ts | 12 +++++------- ts-client/src/test/single_bin.test.ts | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ts-client/src/dlmm/index.ts b/ts-client/src/dlmm/index.ts index d3d91778..5210007a 100644 --- a/ts-client/src/dlmm/index.ts +++ b/ts-client/src/dlmm/index.ts @@ -4291,8 +4291,7 @@ export class DLMM { * @param * - `owner`: The public key of the positions owner. * - `base`: Base key - * - `seedAmount`: Lamport amount to be seeded to the pool. - * - `isTokenX`: Indicate that the seed amount will be 100 percent token X or token Y. + * - `seedAmount`: Token X lamport amount to be seeded to the pool. * - `price`: TokenX/TokenY Price in UI format * - `roundingUp`: Whether to round up the price * - `feeOwner`: Position fee owner @@ -4306,7 +4305,6 @@ export class DLMM { owner: PublicKey, base: PublicKey, seedAmount: BN, - isTokenX: boolean, price: number, roundingUp: boolean, feeOwner: PublicKey, @@ -4427,13 +4425,13 @@ export class DLMM { const binLiquidityDist: BinLiquidityDistribution = { binId: binIdNumber, - distributionX: isTokenX ? 10000 : 0, - distributionY: isTokenX ? 0 : 10000, + distributionX: 10000, + distributionY: 0, }; const addLiquidityParams: LiquidityParameter = { - amountX: isTokenX ? seedAmount : new BN(0), - amountY: isTokenX ? new BN(0) : seedAmount, + amountX: seedAmount, + amountY: new BN(0), binLiquidityDist: [binLiquidityDist] }; diff --git a/ts-client/src/test/single_bin.test.ts b/ts-client/src/test/single_bin.test.ts index a6aa4f57..5cbb3039 100644 --- a/ts-client/src/test/single_bin.test.ts +++ b/ts-client/src/test/single_bin.test.ts @@ -176,7 +176,6 @@ describe("Single Bin Seed Liquidity Test", () => { owner.publicKey, baseKeypair.publicKey, wenSeedAmount, - true, initialPrice, true, owner.publicKey,