flash-sdk 2.11.11 → 2.12.0

package/dist/PerpetualsClient.js

@@ -3253,7 +3253,7 @@ var PerpetualsClient = (function () {
         this.addLiquidityAndStake = function (inputSymbol, amountIn, minLpAmountOut, poolConfig, skipBalanceChecks) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedFlpVault, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
+                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedLpVault, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3268,7 +3268,7 @@ var PerpetualsClient = (function () {
                         case 1:
                             lpTokenAccount = _f.sent();
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
-                            poolStakedFlpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                            poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                             if (!(inputSymbol == 'SOL')) return [3, 5];
                             console.log("inputSymbol === SOL", inputSymbol);
                             wrappedSolAccount = new web3_js_1.Keypair();
@@ -3361,7 +3361,7 @@ var PerpetualsClient = (function () {
                                     custodyTokenAccount: inputCustodyConfig.tokenAccount,
                                     lpTokenMint: lpTokenMint,
                                     flpStakeAccount: flpStakeAccount,
-                                    poolStakedFlpVault: poolStakedFlpVault,
+                                    poolStakedLpVault: poolStakedLpVault,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -3384,7 +3384,7 @@ var PerpetualsClient = (function () {
         this.addLiquidityAndStakeComposibility = function (inputSymbol, amountIn, minLpAmountOut, poolConfig, skipBalanceChecks) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedFlpVault, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
+                var publicKey, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, userInputTokenAccount, lpTokenMint, inputCustodyConfig, lpTokenAccount, flpStakeAccount, poolStakedLpVault, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _c, custody, _d, _e, market, instruction;
                 return __generator(this, function (_f) {
                     switch (_f.label) {
                         case 0:
@@ -3399,7 +3399,7 @@ var PerpetualsClient = (function () {
                         case 1:
                             lpTokenAccount = _f.sent();
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
-                            poolStakedFlpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                            poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                             if (!(inputSymbol == 'SOL')) return [3, 5];
                             console.log("inputSymbol === SOL", inputSymbol);
                             wrappedSolAccount = new web3_js_1.Keypair();
@@ -3494,7 +3494,7 @@ var PerpetualsClient = (function () {
                                     custodyTokenAccount: inputCustodyConfig.tokenAccount,
                                     lpTokenMint: lpTokenMint,
                                     flpStakeAccount: flpStakeAccount,
-                                    poolStakedFlpVault: poolStakedFlpVault,
+                                    poolStakedLpVault: poolStakedLpVault,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -3951,7 +3951,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.depositStake = function (owner, feePayer, depositAmount, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedFlpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_12;
+            var preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, depositStakeInstruction, err_12;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -3963,7 +3963,7 @@ var PerpetualsClient = (function () {
                     case 1:
                         _a.trys.push([1, 4, , 5]);
                         lpTokenMint = poolConfig.lpTokenMint;
-                        poolStakedFlpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                        poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                         flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), owner.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
                         return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, owner)];
                     case 2:
@@ -3975,12 +3975,12 @@ var PerpetualsClient = (function () {
                                 .accounts({
                                 owner: owner,
                                 feePayer: feePayer,
-                                fundingFlpTokenAccount: userLpTokenAccount,
+                                fundingLpTokenAccount: userLpTokenAccount,
                                 transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: this.perpetuals.publicKey,
                                 pool: poolConfig.poolAddress,
                                 flpStakeAccount: flpStakeAccount,
-                                poolStakedFlpVault: poolStakedFlpVault,
+                                poolStakedLpVault: poolStakedLpVault,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
@@ -4074,6 +4074,8 @@ var PerpetualsClient = (function () {
                                 pool: pool,
                                 rewardCustody: rewardCustodyConfig.custodyAccount,
                                 feeDistributionTokenAccount: feeDistributionTokenAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
+                                program: this.program.programId,
                             })
                                 .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), flpStakeAccountMetas, true))
                                 .instruction()];
@@ -4237,7 +4239,7 @@ var PerpetualsClient = (function () {
             if (deactivated === void 0) { deactivated = true; }
             if (createUserLPTA === void 0) { createUserLPTA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedFlpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_17;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, lpTokenMint, pool, poolStakedLpVault, flpStakeAccount, userLpTokenAccount, _a, withdrawStakeInstruction, err_17;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -4251,7 +4253,7 @@ var PerpetualsClient = (function () {
                             _b.trys.push([1, 6, , 7]);
                             lpTokenMint = poolConfig.lpTokenMint;
                             pool = poolConfig.poolAddress;
-                            poolStakedFlpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), pool.toBuffer(), lpTokenMint.toBuffer()], this.program.programId)[0];
+                            poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), pool.toBuffer(), lpTokenMint.toBuffer()], this.program.programId)[0];
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), pool.toBuffer()], this.program.programId)[0];
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
                         case 2:
@@ -4273,12 +4275,12 @@ var PerpetualsClient = (function () {
                                 })
                                     .accounts({
                                     owner: publicKey,
-                                    receivingFlpTokenAccount: userLpTokenAccount,
+                                    receivingLpTokenAccount: userLpTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: this.perpetuals.publicKey,
                                     pool: pool,
                                     flpStakeAccount: flpStakeAccount,
-                                    poolStakedFlpVault: poolStakedFlpVault,
+                                    poolStakedLpVault: poolStakedLpVault,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -5002,8 +5004,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.addCompoundingLiquidity = function (amountIn, minSflpAmountOut, inTokenSymbol, rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, sFlpTokenMint, wrappedSolAccount, lpTokenAccount, sflpTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, accCreationLamports, lamports, unWrappedSolBalance, _d, compoundingVault, addCompoundingLiquidity, err_30;
+        this.addCompoundingLiquidity = function (amountIn, minCompoundingAmountOut, inTokenSymbol, rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, additionalSigners, postInstructions, rewardCustody, inCustodyConfig, lpTokenMint, compoundingTokenMint, wrappedSolAccount, lpTokenAccount, compoundingTokenAccount, fundingAccount, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, accCreationLamports, lamports, unWrappedSolBalance, _d, compoundingLpVault, addCompoundingLiquidity, err_30;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -5015,13 +5017,13 @@ var PerpetualsClient = (function () {
                         rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardTokenMint); });
                         inCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inTokenSymbol).mintKey); });
                         lpTokenMint = poolConfig.lpTokenMint;
-                        sFlpTokenMint = poolConfig.sFlpTokenMint;
+                        compoundingTokenMint = poolConfig.compoundingTokenMint;
                         return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.lpTokenMint, publicKey)];
                     case 1:
                         lpTokenAccount = _e.sent();
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(sFlpTokenMint, publicKey)];
+                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(compoundingTokenMint, publicKey)];
                     case 2:
-                        sflpTokenAccount = _e.sent();
+                        compoundingTokenAccount = _e.sent();
                         return [4, (0, spl_token_1.getAssociatedTokenAddress)(inCustodyConfig.mintKey, publicKey)];
                     case 3:
                         fundingAccount = _e.sent();
@@ -5054,10 +5056,10 @@ var PerpetualsClient = (function () {
                         if (!(_e.sent())) {
                             instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.lpTokenMint));
                         }
-                        return [4, (0, utils_1.checkIfAccountExists)(sflpTokenAccount, this.provider.connection)];
+                        return [4, (0, utils_1.checkIfAccountExists)(compoundingTokenAccount, this.provider.connection)];
                     case 5:
                         if (!(_e.sent())) {
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, sflpTokenAccount, publicKey, poolConfig.sFlpTokenMint));
+                            instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoundingTokenAccount, publicKey, poolConfig.compoundingTokenMint));
                         }
                         if (!(inTokenSymbol == 'SOL')) return [3, 8];
                         console.log("inTokenSymbol === SOL", inTokenSymbol);
@@ -5096,20 +5098,20 @@ var PerpetualsClient = (function () {
                         }
                         _e.label = 10;
                     case 10:
-                        compoundingVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                        compoundingLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                         _e.label = 11;
                     case 11:
                         _e.trys.push([11, 13, , 14]);
                         return [4, this.program.methods
                                 .addCompoundingLiquidity({
                                 amountIn: amountIn,
-                                minSflpAmountOut: minSflpAmountOut
+                                minCompoundingAmountOut: minCompoundingAmountOut
                             })
                                 .accounts({
                                 owner: publicKey,
                                 fundingAccount: fundingAccount,
-                                sflpTokenAccount: sflpTokenAccount,
-                                poolCompoundingFlpVault: compoundingVault,
+                                compoundingTokenAccount: compoundingTokenAccount,
+                                poolCompoundingLpVault: compoundingLpVault,
                                 transferAuthority: poolConfig.transferAuthority,
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
@@ -5119,7 +5121,7 @@ var PerpetualsClient = (function () {
                                 rewardCustody: rewardCustody.custodyAccount,
                                 rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                 lpTokenMint: lpTokenMint,
-                                sflpTokenMint: sFlpTokenMint,
+                                compoundingTokenMint: compoundingTokenMint,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
@@ -5142,10 +5144,10 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.removeCompoundingLiquidity = function (sflpAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA) {
+        this.removeCompoundingLiquidity = function (compoundingAmountIn, minAmountOut, outTokenSymbol, rewardTokenMint, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, sFlpTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, sflpTokenAccount, receivingAccount, compoundingVault, removeCompoundingLiquidity, err_31;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, outCustodyConfig, lpTokenMint, compoundingTokenMint, lamports, _a, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, compoundingTokenAccount, receivingAccount, compoundingLpVault, removeCompoundingLiquidity, err_31;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -5157,7 +5159,7 @@ var PerpetualsClient = (function () {
                             rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardTokenMint); });
                             outCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(outTokenSymbol).mintKey); });
                             lpTokenMint = poolConfig.lpTokenMint;
-                            sFlpTokenMint = poolConfig.sFlpTokenMint;
+                            compoundingTokenMint = poolConfig.compoundingTokenMint;
                             if (!(outCustodyConfig.symbol == 'SOL')) return [3, 2];
                             wrappedSolAccount = new web3_js_1.Keypair();
                             userReceivingTokenAccount = wrappedSolAccount.publicKey;
@@ -5218,26 +5220,26 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                             }
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(sFlpTokenMint, publicKey)];
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(compoundingTokenMint, publicKey)];
                         case 7:
-                            sflpTokenAccount = _e.sent();
+                            compoundingTokenAccount = _e.sent();
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(outCustodyConfig.mintKey, publicKey)];
                         case 8:
                             receivingAccount = _e.sent();
-                            compoundingVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                            compoundingLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                             _e.label = 9;
                         case 9:
                             _e.trys.push([9, 11, , 12]);
                             return [4, this.program.methods
                                     .removeCompoundingLiquidity({
-                                    sflpAmountIn: sflpAmountIn,
+                                    compoundingAmountIn: compoundingAmountIn,
                                     minAmountOut: minAmountOut
                                 })
                                     .accounts({
                                     owner: publicKey,
                                     receivingAccount: outCustodyConfig.symbol == 'SOL' ? wrappedSolAccount.publicKey : userReceivingTokenAccount,
-                                    sflpTokenAccount: sflpTokenAccount,
-                                    poolCompoundingFlpVault: compoundingVault,
+                                    compoundingTokenAccount: compoundingTokenAccount,
+                                    poolCompoundingLpVault: compoundingLpVault,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
@@ -5247,7 +5249,7 @@ var PerpetualsClient = (function () {
                                     rewardCustody: rewardCustody.custodyAccount,
                                     rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
                                     lpTokenMint: lpTokenMint,
-                                    sflpTokenMint: sFlpTokenMint,
+                                    compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
@@ -5274,7 +5276,7 @@ var PerpetualsClient = (function () {
         this.migrateStake = function (amount, rewardTokenMint, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, sFlpTokenMint, sflpTokenAccount, _a, flpStakeAccount, compoundingVault, poolStakedFlpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_32;
+                var publicKey, preInstructions, instructions, postInstructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoudingTokenAccount, _a, flpStakeAccount, compoundingLpVault, poolStakedLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _b, custody, _c, _d, market, migrateStake, err_32;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -5285,23 +5287,23 @@ var PerpetualsClient = (function () {
                             additionalSigners = [];
                             rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardTokenMint); });
                             lpTokenMint = poolConfig.lpTokenMint;
-                            sFlpTokenMint = poolConfig.sFlpTokenMint;
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(sFlpTokenMint, publicKey)];
+                            compoundingTokenMint = poolConfig.compoundingTokenMint;
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(compoundingTokenMint, publicKey)];
                         case 1:
-                            sflpTokenAccount = _e.sent();
+                            compoudingTokenAccount = _e.sent();
                             _a = createUserATA;
                             if (!_a) return [3, 3];
-                            return [4, (0, utils_1.checkIfAccountExists)(sflpTokenAccount, this.provider.connection)];
+                            return [4, (0, utils_1.checkIfAccountExists)(compoudingTokenAccount, this.provider.connection)];
                         case 2:
                             _a = !(_e.sent());
                             _e.label = 3;
                         case 3:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, sflpTokenAccount, publicKey, sFlpTokenMint));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, compoudingTokenAccount, publicKey, compoundingTokenMint));
                             }
                             flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
-                            compoundingVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), poolConfig.lpTokenMint.toBuffer()], this.programId)[0];
-                            poolStakedFlpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
+                            compoundingLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), poolConfig.lpTokenMint.toBuffer()], this.programId)[0];
+                            poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), lpTokenMint.toBuffer()], this.programId)[0];
                             custodyAccountMetas = [];
                             custodyOracleAccountMetas = [];
                             markets = [];
@@ -5335,17 +5337,17 @@ var PerpetualsClient = (function () {
                                 })
                                     .accounts({
                                     owner: publicKey,
-                                    sflpTokenAccount: sflpTokenAccount,
+                                    compoundingTokenAccount: compoudingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     flpStakeAccount: flpStakeAccount,
                                     rewardCustody: rewardCustody.custodyAccount,
                                     rewardCustodyOracleAccount: rewardCustody.intOracleAccount,
-                                    poolStakedFlpVault: poolStakedFlpVault,
-                                    poolCompoundingFlpVault: compoundingVault,
+                                    poolStakedLpVault: poolStakedLpVault,
+                                    poolCompoundingLpVault: compoundingLpVault,
                                     lpTokenMint: lpTokenMint,
-                                    sflpTokenMint: sFlpTokenMint,
+                                    compoundingTokenMint: compoundingTokenMint,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.program.programId,
@@ -5369,77 +5371,79 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.compoundingFee = function (rewardTokenMint, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, rewardCustody, lpTokenMint, sFlpTokenMint, compoundingVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_33;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        publicKey = this.provider.wallet.publicKey;
-                        instructions = [];
-                        additionalSigners = [];
-                        rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(rewardTokenMint); });
-                        lpTokenMint = poolConfig.lpTokenMint;
-                        sFlpTokenMint = poolConfig.sFlpTokenMint;
-                        compoundingVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), sFlpTokenMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
-                        custodyAccountMetas = [];
-                        custodyOracleAccountMetas = [];
-                        markets = [];
-                        for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
-                            custody = _a[_i];
-                            custodyAccountMetas.push({
-                                pubkey: custody.custodyAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                            custodyOracleAccountMetas.push({
-                                pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
-                            market = _c[_b];
-                            markets.push({
-                                pubkey: market.marketAccount,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 3, , 4]);
-                        return [4, this.program.methods
-                                .compoundFees({})
-                                .accounts({
-                                poolCompoundingFlpVault: compoundingVault,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                rewardCustody: rewardCustody.custodyAccount,
-                                rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
-                                lpTokenMint: lpTokenMint,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                eventAuthority: this.eventAuthority.publicKey,
-                                program: this.program.programId,
-                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                            })
-                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                .instruction()];
-                    case 2:
-                        compoundingFee = _d.sent();
-                        instructions.push(compoundingFee);
-                        return [3, 4];
-                    case 3:
-                        err_33 = _d.sent();
-                        console.log("perpClient compoundingFee error:: ", err_33);
-                        return [3, 4];
-                    case 4: return [2, {
-                            instructions: __spreadArray([], instructions, true),
-                            additionalSigners: additionalSigners
-                        }];
-                }
+        this.compoundingFee = function (poolConfig, rewardTokenSymbol) {
+            if (rewardTokenSymbol === void 0) { rewardTokenSymbol = 'USDC'; }
+            return __awaiter(_this, void 0, void 0, function () {
+                var instructions, additionalSigners, rewardCustody, lpTokenMint, compoundingTokenMint, compoundingLpVault, custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, compoundingFee, err_33;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            instructions = [];
+                            additionalSigners = [];
+                            rewardCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(rewardTokenSymbol).mintKey); });
+                            lpTokenMint = poolConfig.lpTokenMint;
+                            compoundingTokenMint = poolConfig.compoundingTokenMint;
+                            compoundingLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("compounding_lp_token_account"), poolConfig.poolAddress.toBuffer(), compoundingTokenMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                            custodyAccountMetas = [];
+                            custodyOracleAccountMetas = [];
+                            markets = [];
+                            for (_i = 0, _a = poolConfig.custodies; _i < _a.length; _i++) {
+                                custody = _a[_i];
+                                custodyAccountMetas.push({
+                                    pubkey: custody.custodyAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                                custodyOracleAccountMetas.push({
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            for (_b = 0, _c = poolConfig.markets; _b < _c.length; _b++) {
+                                market = _c[_b];
+                                markets.push({
+                                    pubkey: market.marketAccount,
+                                    isSigner: false,
+                                    isWritable: false,
+                                });
+                            }
+                            _d.label = 1;
+                        case 1:
+                            _d.trys.push([1, 3, , 4]);
+                            return [4, this.program.methods
+                                    .compoundFees({})
+                                    .accounts({
+                                    poolCompoundingLpVault: compoundingLpVault,
+                                    transferAuthority: poolConfig.transferAuthority,
+                                    perpetuals: poolConfig.perpetuals,
+                                    pool: poolConfig.poolAddress,
+                                    rewardCustody: rewardCustody.custodyAccount,
+                                    rewardCustodyOracleAccount: this.useExtOracleAccount ? rewardCustody.extOracleAccount : rewardCustody.intOracleAccount,
+                                    lpTokenMint: lpTokenMint,
+                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                    eventAuthority: this.eventAuthority.publicKey,
+                                    program: this.program.programId,
+                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                                })
+                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                                    .instruction()];
+                        case 2:
+                            compoundingFee = _d.sent();
+                            instructions.push(compoundingFee);
+                            return [3, 4];
+                        case 3:
+                            err_33 = _d.sent();
+                            console.log("perpClient compoundingFee error:: ", err_33);
+                            return [3, 4];
+                        case 4: return [2, {
+                                instructions: __spreadArray([], instructions, true),
+                                additionalSigners: additionalSigners
+                            }];
+                    }
+                });
             });
-        }); };
+        };
         this.initRewardDistribution = function (rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_34;
             return __generator(this, function (_a) {
@@ -5485,7 +5489,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.updateCounter = function () { return __awaiter(_this, void 0, void 0, function () {
+        this.updateCounterReward = function () { return __awaiter(_this, void 0, void 0, function () {
             var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {

package/dist/PoolAccount.d.ts

@@ -7,9 +7,9 @@ export declare class PoolAccount implements Pool {
     name: string;
     permissions: Permissions;
     inceptionTime: BN;
-    flpMint: PublicKey;
+    lpMint: PublicKey;
     oracleAuthority: PublicKey;
-    stakedFlpVault: PublicKey;
+    stakedLpVault: PublicKey;
     rewardCustody: PublicKey;
     custodies: PublicKey[];
     ratios: TokenRatios[];
@@ -19,16 +19,16 @@ export declare class PoolAccount implements Pool {
     totalStaked: StakeStats;
     stakingFeeShareBps: BN;
     bump: number;
-    flpMintBump: number;
-    stakedFlpVaultBump: number;
+    lpMintBump: number;
+    stakedLpVaultBump: number;
     vpVolumeFactor: number;
     padding: number[];
     stakingFeeBoostBps: BN[];
-    sflpMint: PublicKey;
-    compoundingFlpVault: PublicKey;
+    compoundingMint: PublicKey;
+    compoundingLpVault: PublicKey;
     compoundingStats: CompoundingStats;
-    sflpMintBump: number;
-    compoundingFlpVaultBump: number;
+    compoundingMintBump: number;
+    compoundingLpVaultBump: number;
     constructor(publicKey: PublicKey, parseData: Pool);
     static from(publicKey: PublicKey, parseData: Pool): PoolAccount;
     updatePoolData(parseData: Pool): void;

package/dist/PoolConfig.d.ts

@@ -50,11 +50,11 @@ export declare class PoolConfig {
     poolName: string;
     poolAddress: PublicKey;
     lpTokenMint: PublicKey;
-    sFlpTokenMint: PublicKey;
-    flpTokenAccount: PublicKey;
+    compoundingTokenMint: PublicKey;
+    stakedLpVault: PublicKey;
     lpDecimals: number;
+    compoundingLpTokenSymbol: string;
     lpTokenSymbol: string;
-    stakedLpTokenSymbol: string;
     perpetuals: PublicKey;
     transferAuthority: PublicKey;
     multisig: PublicKey;
@@ -71,7 +71,7 @@ export declare class PoolConfig {
     tokens: Token[];
     custodies: CustodyConfig[];
     markets: MarketConfig[];
-    constructor(programId: PublicKey, perpComposibilityProgramId: PublicKey, fbNftRewardProgramId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, sFlpTokenMint: PublicKey, flpTokenAccount: PublicKey, lpDecimals: number, lpTokenSymbol: string, stakedLpTokenSymbol: string, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], backupOracle: PublicKey, nftCollectionAddress: PublicKey, rewardDistributionProgram: {
+    constructor(programId: PublicKey, perpComposibilityProgramId: PublicKey, fbNftRewardProgramId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, compoundingTokenMint: PublicKey, stakedLpVault: PublicKey, lpDecimals: number, compoundingLpTokenSymbol: string, lpTokenSymbol: string, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], backupOracle: PublicKey, nftCollectionAddress: PublicKey, rewardDistributionProgram: {
         programId: PublicKey;
         transferAuthority: PublicKey;
         rewardVault: PublicKey;

package/dist/PoolConfig.js

@@ -19,7 +19,7 @@ var web3_js_1 = require("@solana/web3.js");
 var PoolConfig_json_1 = __importDefault(require("./PoolConfig.json"));
 var types_1 = require("./types");
 var PoolConfig = (function () {
-    function PoolConfig(programId, perpComposibilityProgramId, fbNftRewardProgramId, cluster, poolName, poolAddress, lpTokenMint, sFlpTokenMint, flpTokenAccount, lpDecimals, lpTokenSymbol, stakedLpTokenSymbol, perpetuals, transferAuthority, multisig, addressLookupTableAddresses, backupOracle, nftCollectionAddress, rewardDistributionProgram, tokens, custodies, markets) {
+    function PoolConfig(programId, perpComposibilityProgramId, fbNftRewardProgramId, cluster, poolName, poolAddress, lpTokenMint, compoundingTokenMint, stakedLpVault, lpDecimals, compoundingLpTokenSymbol, lpTokenSymbol, perpetuals, transferAuthority, multisig, addressLookupTableAddresses, backupOracle, nftCollectionAddress, rewardDistributionProgram, tokens, custodies, markets) {
         var _this = this;
         this.programId = programId;
         this.perpComposibilityProgramId = perpComposibilityProgramId;
@@ -28,11 +28,11 @@ var PoolConfig = (function () {
         this.poolName = poolName;
         this.poolAddress = poolAddress;
         this.lpTokenMint = lpTokenMint;
-        this.sFlpTokenMint = sFlpTokenMint;
-        this.flpTokenAccount = flpTokenAccount;
+        this.compoundingTokenMint = compoundingTokenMint;
+        this.stakedLpVault = stakedLpVault;
         this.lpDecimals = lpDecimals;
+        this.compoundingLpTokenSymbol = compoundingLpTokenSymbol;
         this.lpTokenSymbol = lpTokenSymbol;
-        this.stakedLpTokenSymbol = stakedLpTokenSymbol;
         this.perpetuals = perpetuals;
         this.transferAuthority = transferAuthority;
         this.multisig = multisig;
@@ -165,7 +165,7 @@ var PoolConfig = (function () {
         catch (error) {
             console.log("ERROR: buildPoolconfigFromJson  unable to load markets ");
         }
-        return new PoolConfig(new web3_js_1.PublicKey(poolConfig.programId), new web3_js_1.PublicKey(poolConfig.perpComposibilityProgramId), new web3_js_1.PublicKey(poolConfig.fbNftRewardProgramId), poolConfig.cluster, poolConfig.poolName, new web3_js_1.PublicKey(poolConfig.poolAddress), new web3_js_1.PublicKey(poolConfig.lpTokenMint), new web3_js_1.PublicKey(poolConfig.sFlpTokenMint), new web3_js_1.PublicKey(poolConfig.flpTokenAccount), poolConfig.lpDecimals, poolConfig.lpTokenSymbol, poolConfig.stakedLpTokenSymbol, new web3_js_1.PublicKey(poolConfig.perpetuals), new web3_js_1.PublicKey(poolConfig.transferAuthority), new web3_js_1.PublicKey(poolConfig.multisig), addressLookupTableAddresses, new web3_js_1.PublicKey(poolConfig.backupOracle), new web3_js_1.PublicKey(poolConfig.nftCollectionAddress), {
+        return new PoolConfig(new web3_js_1.PublicKey(poolConfig.programId), new web3_js_1.PublicKey(poolConfig.perpComposibilityProgramId), new web3_js_1.PublicKey(poolConfig.fbNftRewardProgramId), poolConfig.cluster, poolConfig.poolName, new web3_js_1.PublicKey(poolConfig.poolAddress), new web3_js_1.PublicKey(poolConfig.lpTokenMint), new web3_js_1.PublicKey(poolConfig.compoundingTokenMint), new web3_js_1.PublicKey(poolConfig.stakedLpVault), poolConfig.lpDecimals, poolConfig.compoundingLpTokenSymbol, poolConfig.lpTokenSymbol, new web3_js_1.PublicKey(poolConfig.perpetuals), new web3_js_1.PublicKey(poolConfig.transferAuthority), new web3_js_1.PublicKey(poolConfig.multisig), addressLookupTableAddresses, new web3_js_1.PublicKey(poolConfig.backupOracle), new web3_js_1.PublicKey(poolConfig.nftCollectionAddress), {
             programId: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.programId),
             rewardMint: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.rewardMint),
             rewardTokenAccount: new web3_js_1.PublicKey(poolConfig.rewardDistributionProgram.rewardTokenAccount),