flash-sdk 2.12.1 → 2.12.3

package/dist/PerpetualsClient.d.ts

@@ -2427,10 +2427,6 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    addLiquidityAndStakeComposibility: (inputSymbol: string, amountIn: BN, minLpAmountOut: BN, poolConfig: PoolConfig, skipBalanceChecks?: boolean) => Promise<{
-        instructions: TransactionInstruction[];
-        additionalSigners: Signer[];
-    }>;
     removeLiquidity: (recieveTokenSymbol: string, liquidityAmountIn: BN, minTokenAmountOut: BN, poolConfig: PoolConfig, closeLpATA?: boolean, createUserATA?: boolean, closeUsersWSOLATA?: boolean) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
@@ -2539,6 +2535,10 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
+    renameFlp: (flag: BN, lpTokenName: string, lpTokenSymbol: string, lpTokenUri: string, poolConfig: PoolConfig) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
     initRewardDistribution: (rewardSymbol: string, poolConfig: PoolConfig) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];

package/dist/PerpetualsClient.js

@@ -3381,138 +3381,6 @@ 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, stakedLpTokenMint, 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:
-                            publicKey = this.provider.wallet.publicKey;
-                            preInstructions = [];
-                            instructions = [];
-                            postInstructions = [];
-                            additionalSigners = [];
-                            stakedLpTokenMint = poolConfig.stakedLpTokenMint;
-                            inputCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(inputSymbol).mintKey); });
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(stakedLpTokenMint, publicKey)];
-                        case 1:
-                            lpTokenAccount = _f.sent();
-                            flpStakeAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("stake"), publicKey.toBuffer(), poolConfig.poolAddress.toBuffer()], this.programId)[0];
-                            poolStakedLpVault = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("staked_lp_token_account"), poolConfig.poolAddress.toBuffer(), stakedLpTokenMint.toBuffer()], this.programId)[0];
-                            if (!(inputSymbol == 'SOL')) return [3, 5];
-                            console.log("inputSymbol === SOL", inputSymbol);
-                            wrappedSolAccount = new web3_js_1.Keypair();
-                            return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
-                        case 2:
-                            accCreationLamports = (_f.sent());
-                            console.log("accCreationLamports:", accCreationLamports);
-                            lamports = amountIn.add(new anchor_1.BN(accCreationLamports));
-                            console.log("lamports:", lamports.toNumber());
-                            _a = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getBalance(publicKey)];
-                        case 3:
-                            unWrappedSolBalance = new (_a.apply(anchor_1.BN, [void 0, _f.sent()]))();
-                            if (unWrappedSolBalance.lt(lamports)) {
-                                throw "Insufficient SOL Funds";
-                            }
-                            return [4, (0, utils_1.checkIfAccountExists)(lpTokenAccount, this.provider.connection)];
-                        case 4:
-                            if (!(_f.sent())) {
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, lpTokenAccount, publicKey, poolConfig.stakedLpTokenMint));
-                            }
-                            preInstructions = [
-                                web3_js_1.SystemProgram.createAccount({
-                                    fromPubkey: publicKey,
-                                    newAccountPubkey: wrappedSolAccount.publicKey,
-                                    lamports: lamports.toNumber(),
-                                    space: 165,
-                                    programId: spl_token_1.TOKEN_PROGRAM_ID,
-                                }),
-                                (0, spl_token_1.createInitializeAccount3Instruction)(wrappedSolAccount.publicKey, spl_token_1.NATIVE_MINT, publicKey),
-                            ];
-                            postInstructions = [
-                                (0, spl_token_1.createCloseAccountInstruction)(wrappedSolAccount.publicKey, publicKey, publicKey),
-                            ];
-                            additionalSigners.push(wrappedSolAccount);
-                            return [3, 8];
-                        case 5:
-                            userInputTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(inputCustodyConfig.mintKey, publicKey, true);
-                            return [4, (0, utils_1.checkIfAccountExists)(userInputTokenAccount, this.provider.connection)];
-                        case 6:
-                            if (!(_f.sent())) {
-                                throw "Insufficient Funds , token Account doesn't exist";
-                            }
-                            if (!!skipBalanceChecks) return [3, 8];
-                            _b = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getTokenAccountBalance(userInputTokenAccount)];
-                        case 7:
-                            tokenAccountBalance = new (_b.apply(anchor_1.BN, [void 0, (_f.sent()).value.amount]))();
-                            if (tokenAccountBalance.lt(amountIn)) {
-                                throw "Insufficient Funds need more ".concat(amountIn.sub(tokenAccountBalance), " tokens");
-                            }
-                            _f.label = 8;
-                        case 8:
-                            custodyAccountMetas = [];
-                            custodyOracleAccountMetas = [];
-                            markets = [];
-                            for (_i = 0, _c = poolConfig.custodies; _i < _c.length; _i++) {
-                                custody = _c[_i];
-                                custodyAccountMetas.push({
-                                    pubkey: custody.custodyAccount,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
-                                custodyOracleAccountMetas.push({
-                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
-                            }
-                            for (_d = 0, _e = poolConfig.markets; _d < _e.length; _d++) {
-                                market = _e[_d];
-                                markets.push({
-                                    pubkey: market.marketAccount,
-                                    isSigner: false,
-                                    isWritable: false,
-                                });
-                            }
-                            return [4, this.programPerpComposability.methods.addLiquidityAndStake({
-                                    amountIn: amountIn,
-                                    minLpAmountOut: minLpAmountOut,
-                                }).accounts({
-                                    perpProgram: this.programId,
-                                    owner: publicKey,
-                                    feePayer: publicKey,
-                                    fundingAccount: inputSymbol == 'SOL' ? wrappedSolAccount.publicKey : userInputTokenAccount,
-                                    lpTokenAccount: lpTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    custody: inputCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: this.useExtOracleAccount ? inputCustodyConfig.extOracleAccount : inputCustodyConfig.intOracleAccount,
-                                    custodyTokenAccount: inputCustodyConfig.tokenAccount,
-                                    lpTokenMint: stakedLpTokenMint,
-                                    flpStakeAccount: flpStakeAccount,
-                                    poolStakedLpVault: poolStakedLpVault,
-                                    systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                    eventAuthority: this.eventAuthority.publicKey,
-                                    ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
-                                })
-                                    .remainingAccounts(__spreadArray(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true), markets, true))
-                                    .instruction()];
-                        case 9:
-                            instruction = _f.sent();
-                            instructions.push(instruction);
-                            return [2, {
-                                    instructions: __spreadArray(__spreadArray(__spreadArray([], preInstructions, true), instructions, true), postInstructions, true),
-                                    additionalSigners: additionalSigners
-                                }];
-                    }
-                });
-            });
-        };
         this.removeLiquidity = function (recieveTokenSymbol, liquidityAmountIn, minTokenAmountOut, poolConfig, closeLpATA, createUserATA, closeUsersWSOLATA) {
             if (closeLpATA === void 0) { closeLpATA = false; }
             if (createUserATA === void 0) { createUserATA = true; }
@@ -3984,6 +3852,7 @@ var PerpetualsClient = (function () {
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
                             })
                                 .instruction()];
                     case 3:
@@ -4216,6 +4085,7 @@ var PerpetualsClient = (function () {
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
+                                program: this.programId
                             })
                                 .instruction()];
                     case 2:
@@ -5443,8 +5313,57 @@ var PerpetualsClient = (function () {
                 });
             });
         };
+        this.renameFlp = function (flag, lpTokenName, lpTokenSymbol, lpTokenUri, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, instructions, additionalSigners, lpTokenMint, lpMetadataAccount, renameFlp, err_34;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        publicKey = this.provider.wallet.publicKey;
+                        instructions = [];
+                        additionalSigners = [];
+                        lpTokenMint = poolConfig.stakedLpTokenMint;
+                        lpMetadataAccount = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("metadata"), constants_1.METAPLEX_PROGRAM_ID.toBuffer(), lpTokenMint.toBuffer()], constants_1.METAPLEX_PROGRAM_ID)[0];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .renameFlp({
+                                flag: flag,
+                                lpTokenName: lpTokenName,
+                                lpTokenSymbol: lpTokenSymbol,
+                                lpTokenUri: lpTokenUri,
+                            })
+                                .accounts({
+                                admin: publicKey,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: poolConfig.transferAuthority,
+                                perpetuals: poolConfig.perpetuals,
+                                pool: poolConfig.poolAddress,
+                                lpTokenMint: lpTokenMint,
+                                lpMetadataAccount: lpMetadataAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                metadataProgram: constants_1.METAPLEX_PROGRAM_ID,
+                                rent: web3_js_1.SYSVAR_RENT_PUBKEY
+                            })
+                                .instruction()];
+                    case 2:
+                        renameFlp = _a.sent();
+                        instructions.push(renameFlp);
+                        return [3, 4];
+                    case 3:
+                        err_34 = _a.sent();
+                        console.log("perpClient renameFlp error:: ", err_34);
+                        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;
+            var publicKey, rewardMint, instructions, additionalSigners, fbNftProgramData, rewardVault, rewardTokenAccount, transferAuthority, initRewardVault, err_35;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5478,9 +5397,9 @@ var PerpetualsClient = (function () {
                         instructions.push(initRewardVault);
                         return [3, 4];
                     case 3:
-                        err_34 = _a.sent();
-                        console.log("rewardDistribution InitRewardVault error:: ", err_34);
-                        throw err_34;
+                        err_35 = _a.sent();
+                        console.log("rewardDistribution InitRewardVault error:: ", err_35);
+                        throw err_35;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5489,7 +5408,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.updateCounterReward = function () { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_35;
+            var publicKey, instructions, additionalSigners, rewardVault, updateCounter, err_36;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5512,9 +5431,9 @@ var PerpetualsClient = (function () {
                         instructions.push(updateCounter);
                         return [3, 4];
                     case 3:
-                        err_35 = _a.sent();
-                        console.log("rewardDistribution updateCounter error:: ", err_35);
-                        throw err_35;
+                        err_36 = _a.sent();
+                        console.log("rewardDistribution updateCounter error:: ", err_36);
+                        throw err_36;
                     case 4: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5523,7 +5442,7 @@ var PerpetualsClient = (function () {
             });
         }); };
         this.rewardDistribution = function (counter, owner, rewardAmount, rewardSymbol, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_36;
+            var publicKey, rewardCustodyMint, instructions, additionalSigners, fundingAccount, rewardVault, rewardTokenAccount, rewardRecord, distributeReward, err_37;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5564,9 +5483,9 @@ var PerpetualsClient = (function () {
                         instructions.push(distributeReward);
                         return [3, 5];
                     case 4:
-                        err_36 = _a.sent();
-                        console.log("rewardDistribution distributeReward error:: ", err_36);
-                        throw err_36;
+                        err_37 = _a.sent();
+                        console.log("rewardDistribution distributeReward error:: ", err_37);
+                        throw err_37;
                     case 5: return [2, {
                             instructions: __spreadArray([], instructions, true),
                             additionalSigners: additionalSigners
@@ -5577,7 +5496,7 @@ var PerpetualsClient = (function () {
         this.collectReward = function (counter, owner, rewardSymbol, poolConfig, createUserATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectNftReward, err_37;
+                var publicKey, rewardCustodyMint, instructions, additionalSigners, receivingTokenAccount, _a, rewardVault, rewardTokenAccount, rewardRecord, transferAuthority, collectNftReward, err_38;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -5625,8 +5544,8 @@ var PerpetualsClient = (function () {
                             instructions.push(collectNftReward);
                             return [3, 7];
                         case 6:
-                            err_37 = _b.sent();
-                            throw err_37;
+                            err_38 = _b.sent();
+                            throw err_38;
                         case 7: return [2, {
                                 instructions: __spreadArray([], instructions, true),
                                 additionalSigners: additionalSigners

package/dist/idl/perp_composability.d.ts

@@ -624,109 +624,6 @@ export type PerpComposability = {
                 }
             ];
             "args": [];
-        },
-        {
-            "name": "addLiquidityAndStake";
-            "accounts": [
-                {
-                    "name": "perpProgram";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "owner";
-                    "isMut": false;
-                    "isSigner": true;
-                },
-                {
-                    "name": "feePayer";
-                    "isMut": true;
-                    "isSigner": true;
-                },
-                {
-                    "name": "fundingAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "lpTokenAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "transferAuthority";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "perpetuals";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "pool";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "custody";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "custodyOracleAccount";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "custodyTokenAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "lpTokenMint";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "flpStakeAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "poolStakedLpVault";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "systemProgram";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "tokenProgram";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "eventAuthority";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "ixSysvar";
-                    "isMut": false;
-                    "isSigner": false;
-                }
-            ];
-            "args": [
-                {
-                    "name": "params";
-                    "type": {
-                        "defined": "AddLiquidityAndStakeParams";
-                    };
-                }
-            ];
         }
     ];
     "types": [
@@ -841,22 +738,6 @@ export type PerpComposability = {
                 "fields": [];
             };
         },
-        {
-            "name": "AddLiquidityAndStakeParams";
-            "type": {
-                "kind": "struct";
-                "fields": [
-                    {
-                        "name": "amountIn";
-                        "type": "u64";
-                    },
-                    {
-                        "name": "minLpAmountOut";
-                        "type": "u64";
-                    }
-                ];
-            };
-        },
         {
             "name": "Privilege";
             "type": {

package/dist/idl/perp_composability.js

@@ -627,109 +627,6 @@ exports.IDL = {
                 }
             ],
             "args": []
-        },
-        {
-            "name": "addLiquidityAndStake",
-            "accounts": [
-                {
-                    "name": "perpProgram",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "owner",
-                    "isMut": false,
-                    "isSigner": true
-                },
-                {
-                    "name": "feePayer",
-                    "isMut": true,
-                    "isSigner": true
-                },
-                {
-                    "name": "fundingAccount",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "lpTokenAccount",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "transferAuthority",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "perpetuals",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "pool",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "custody",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "custodyOracleAccount",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "custodyTokenAccount",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "lpTokenMint",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "flpStakeAccount",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "poolStakedLpVault",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "systemProgram",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "tokenProgram",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "eventAuthority",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "ixSysvar",
-                    "isMut": false,
-                    "isSigner": false
-                }
-            ],
-            "args": [
-                {
-                    "name": "params",
-                    "type": {
-                        "defined": "AddLiquidityAndStakeParams"
-                    }
-                }
-            ]
         }
     ],
     "types": [
@@ -844,22 +741,6 @@ exports.IDL = {
                 "fields": []
             }
         },
-        {
-            "name": "AddLiquidityAndStakeParams",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "amountIn",
-                        "type": "u64"
-                    },
-                    {
-                        "name": "minLpAmountOut",
-                        "type": "u64"
-                    }
-                ]
-            }
-        },
         {
             "name": "Privilege",
             "type": {