flash-sdk 2.6.9 → 2.8.0

package/dist/PerpetualsClient.d.ts

@@ -275,6 +275,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -304,7 +306,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -536,6 +538,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -565,7 +569,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -796,6 +800,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -825,7 +831,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -1059,6 +1065,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -1088,7 +1096,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -1321,6 +1329,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -1350,7 +1360,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -1581,6 +1591,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -1610,7 +1622,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -1874,6 +1886,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -1903,7 +1917,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -2134,6 +2148,8 @@ export declare class PerpetualsClient {
         flpMintBump: number;
         flpTokenAccountBump: number;
         vpVolumeFactor: number;
+        padding: number[] | BN[] | BN[];
+        stakingFeeBoostBps: BN[];
         market: PublicKey;
         delegate: PublicKey;
         openTime: BN;
@@ -2163,7 +2179,7 @@ export declare class PerpetualsClient {
         lockedDecimals: number;
         collateralDecimals: number;
         refererTradingAccount: PublicKey;
-        padding: BN[] | BN[];
+        refererBoosterAccount: PublicKey;
         nftMint: PublicKey;
         level: number;
         voltagePoints: BN;
@@ -2191,6 +2207,7 @@ export declare class PerpetualsClient {
     editCustody: (poolName: string, tokenMint: PublicKey, isStable: boolean, oracle: OracleParams, pricing: PricingParams, permissions: Permissions, fees: Fees, borrowRate: BorrowRateParams, ratios: TokenRatios[]) => Promise<void>;
     removeCustody: (poolName: string, tokenMint: PublicKey, ratios: TokenRatios[]) => Promise<void>;
     getLiquidationState: (positionAccount: PublicKey, poolName: string, tokenMint: PublicKey, collateralMint: PublicKey, poolConfig: PoolConfig) => Promise<any>;
+    getLpTokenPrice: (poolConfig: PoolConfig) => Promise<any>;
     liquidate: (positionAccount: PublicKey, poolConfig: PoolConfig, tokenMint: PublicKey, collateralMint: PublicKey, marketPk: PublicKey) => Promise<TransactionInstruction>;
     getApyPercentageUi: (rewardCustodyAccount: CustodyAccount, previousSnapShotRewardPerLpStaked: BN, lpTokenUsdPrice: BN) => string;
     getAddLiquidityAmountAndFeeSync: (amountIn: BN, poolAccount: PoolAccount, inputTokenPrice: OraclePrice, inputTokenEmaPrice: OraclePrice, inputTokenCustodyAccount: CustodyAccount, lpTokenSupplyAmount: BN, poolAumUsdMax: BN, poolConfig: PoolConfig) => AddLiquidityAmountAndFee;
@@ -2312,7 +2329,7 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    updateNftAccount: (nftMint: PublicKey) => Promise<{
+    updateNftAccount: (nftMint: PublicKey, updateReferer: boolean, updateBooster: boolean, flpStakeAccounts: PublicKey[]) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
@@ -2343,7 +2360,7 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    collectStakeFees: (rewardSymbol: string, poolConfig: PoolConfig, nftTradingAccount?: PublicKey, createUserATA?: boolean) => Promise<{
+    collectStakeFees: (rewardSymbol: string, poolConfig: PoolConfig, nftTradingAccount?: PublicKey, nftBoostingAccount?: PublicKey, createUserATA?: boolean) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;

package/dist/PerpetualsClient.js

@@ -543,6 +543,53 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.getLpTokenPrice = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 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,
+                            });
+                        }
+                        return [4, this.program.methods
+                                .getLpTokenPrice({})
+                                .accounts({
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: poolConfig.poolAddress,
+                                lpTokenMint: poolConfig.lpTokenMint,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
+                            })
+                                .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
+                                .view()
+                                .catch(function (err) {
+                                console.error(err);
+                                throw err;
+                            })];
+                    case 1: return [2, _d.sent()];
+                }
+            });
+        }); };
         this.liquidate = function (positionAccount, poolConfig, tokenMint, collateralMint, marketPk) { return __awaiter(_this, void 0, void 0, function () {
             var targetCustodyConfig, collateralCustodyConfig;
             return __generator(this, function (_a) {
@@ -3217,8 +3264,8 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.updateNftAccount = function (nftMint) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, updateNftTradingAccountInstruction, err_7;
+        this.updateNftAccount = function (nftMint, updateReferer, updateBooster, flpStakeAccounts) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, preInstructions, instructions, postInstructions, additionalSigners, nftTradingAccount, nftReferralAccount, nftTokenAccount, flpStakeAccountMetas, _i, flpStakeAccounts_1, flpStakeAccountPk, updateNftTradingAccountInstruction, err_7;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -3241,8 +3288,20 @@ var PerpetualsClient = (function () {
                         return [4, (0, spl_token_1.getAssociatedTokenAddress)(nftMint, publicKey)];
                     case 2:
                         nftTokenAccount = _a.sent();
+                        flpStakeAccountMetas = [];
+                        for (_i = 0, flpStakeAccounts_1 = flpStakeAccounts; _i < flpStakeAccounts_1.length; _i++) {
+                            flpStakeAccountPk = flpStakeAccounts_1[_i];
+                            flpStakeAccountMetas.push({
+                                pubkey: flpStakeAccountPk,
+                                isSigner: false,
+                                isWritable: true,
+                            });
+                        }
                         return [4, this.program.methods
-                                .updateTradingAccount({})
+                                .updateTradingAccount({
+                                updateReferer: updateReferer,
+                                updateBooster: updateBooster
+                            })
                                 .accounts({
                                 owner: publicKey,
                                 feePayer: publicKey,
@@ -3417,7 +3476,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.refreshStakeWithAllFlpStakeAccounts = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var flpStakeAccounts, maxFlpStakeAccountLength, pendingActivationAccounts, _i, flpStakeAccounts_1, flpStakeAccount, account, refreshStakeInstructions, i, batch, instruction;
+            var flpStakeAccounts, maxFlpStakeAccountLength, pendingActivationAccounts, _i, flpStakeAccounts_2, flpStakeAccount, account, refreshStakeInstructions, i, batch, instruction;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.program.account.flpStake.all()];
@@ -3426,8 +3485,8 @@ var PerpetualsClient = (function () {
                         console.log("total no of flpStakeAccounts: ", flpStakeAccounts.length);
                         maxFlpStakeAccountLength = 32 - (4 + poolConfig.custodies.length);
                         pendingActivationAccounts = [];
-                        for (_i = 0, flpStakeAccounts_1 = flpStakeAccounts; _i < flpStakeAccounts_1.length; _i++) {
-                            flpStakeAccount = flpStakeAccounts_1[_i];
+                        for (_i = 0, flpStakeAccounts_2 = flpStakeAccounts; _i < flpStakeAccounts_2.length; _i++) {
+                            flpStakeAccount = flpStakeAccounts_2[_i];
                             account = flpStakeAccount.account;
                             pendingActivationAccounts.push(flpStakeAccount.publicKey);
                         }
@@ -3714,10 +3773,10 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.collectStakeFees = function (rewardSymbol, poolConfig, nftTradingAccount, createUserATA) {
+        this.collectStakeFees = function (rewardSymbol, poolConfig, nftTradingAccount, nftBoostingAccount, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, withdrawStakeInstruction, err_16;
+                var publicKey, rewardCustodyMint, rewardCustodyConfig, preInstructions, instructions, postInstructions, additionalSigners, pool, flpStakeAccount, receivingTokenAccount, _a, tradingAccount, boostingAccount, withdrawStakeInstruction, err_16;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -3752,6 +3811,14 @@ var PerpetualsClient = (function () {
                                     isWritable: true,
                                 });
                             }
+                            boostingAccount = [];
+                            if (nftBoostingAccount) {
+                                boostingAccount.push({
+                                    pubkey: nftBoostingAccount,
+                                    isSigner: false,
+                                    isWritable: true,
+                                });
+                            }
                             return [4, this.program.methods
                                     .collectStakeFees({})
                                     .accounts({
@@ -3769,7 +3836,7 @@ var PerpetualsClient = (function () {
                                     eventAuthority: this.eventAuthority.publicKey,
                                     ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                                 })
-                                    .remainingAccounts(tradingAccount)
+                                    .remainingAccounts(__spreadArray(__spreadArray([], tradingAccount, true), boostingAccount, true))
                                     .instruction()];
                         case 4:
                             withdrawStakeInstruction = _b.sent();

package/dist/PoolAccount.d.ts

@@ -22,6 +22,8 @@ export declare class PoolAccount implements Pool {
     flpMintBump: number;
     flpTokenAccountBump: number;
     vpVolumeFactor: number;
+    padding: number[];
+    stakingFeeBoostBps: BN[];
     constructor(publicKey: PublicKey, parseData: Pool);
     static from(publicKey: PublicKey, parseData: Pool): PoolAccount;
     updatePoolData(parseData: Pool): void;

package/dist/TradingAccount.d.ts

@@ -10,11 +10,11 @@ export declare class TradingAccount implements Trading {
     isInitialized: boolean;
     level: number;
     bump: number;
-    counter: BN;
     voltagePoints: BN;
     stats: VoltageStats;
     snapshot: VoltageStats;
     timestamp: BN;
+    counter: BN;
     padding: BN[];
     constructor(publicKey: PublicKey, parseData: Trading);
     static from(publicKey: PublicKey, parseData: Trading): TradingAccount;

package/dist/constants/index.js

@@ -13,5 +13,5 @@ exports.RATE_POWER = Math.pow(10, (exports.RATE_DECIMALS));
 exports.ORACLE_EXPONENT = 9;
 exports.BN_ZERO = new bn_js_1.BN(0);
 exports.BN_ONE = new bn_js_1.BN(1);
-exports.DAY_SECONDS = new bn_js_1.BN(86400);
+exports.DAY_SECONDS = new bn_js_1.BN(3600);
 exports.METAPLEX_PROGRAM_ID = new web3_js_1.PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");