flash-sdk 1.0.29 → 1.0.31

package/dist/PerpetualsClient.js

@@ -72,6 +72,31 @@ var PerpetualsClient = (function () {
     function PerpetualsClient(provider, programId, opts) {
         var _this = this;
         var _a;
+        this.addressLookupTables = [];
+        this.loadAddressLookupTable = function (poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var _i, _a, address, addressLookupTable;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _i = 0, _a = poolConfig.addressLookupTableAddresses;
+                        _b.label = 1;
+                    case 1:
+                        if (!(_i < _a.length)) return [3, 4];
+                        address = _a[_i];
+                        return [4, this.provider.connection.getAddressLookupTable(address)];
+                    case 2:
+                        addressLookupTable = (_b.sent()).value;
+                        if (addressLookupTable) {
+                            this.addressLookupTables.push(addressLookupTable);
+                        }
+                        _b.label = 3;
+                    case 3:
+                        _i++;
+                        return [3, 1];
+                    case 4: return [2];
+                }
+            });
+        }); };
         this.findProgramAddress = function (label, extraSeeds) {
             if (extraSeeds === void 0) { extraSeeds = null; }
             var seeds = [Buffer.from(anchor_1.utils.bytes.utf8.encode(label))];
@@ -556,7 +581,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.liquidate = function (wallet, poolName, tokenMint, side, receivingAccount, rewardsReceivingAccount) { return __awaiter(_this, void 0, void 0, function () {
+        this.liquidate = function (wallet, poolName, tokenMint, collateralMint, side, receivingAccount, rewardsReceivingAccount) { return __awaiter(_this, void 0, void 0, function () {
             var _a, _b;
             var _c;
             return __generator(this, function (_d) {
@@ -576,8 +601,12 @@ var PerpetualsClient = (function () {
                             custody: this.getCustodyKey(poolName, tokenMint)
                         };
                         return [4, this.getCustodyOracleAccountKey(poolName, tokenMint)];
-                    case 1: return [4, _b.apply(_a, [(_c.custodyOracleAccount = _d.sent(),
-                                _c.custodyTokenAccount = this.getCustodyTokenAccountKey(poolName, tokenMint),
+                    case 1:
+                        _c.custodyOracleAccount = _d.sent(),
+                            _c.collateralCustody = this.getCustodyKey(poolName, collateralMint);
+                        return [4, this.getCustodyOracleAccountKey(poolName, collateralMint)];
+                    case 2: return [4, _b.apply(_a, [(_c.collateralCustodyOracleAccount = _d.sent(),
+                                _c.collateralCustodyTokenAccount = this.getCustodyTokenAccountKey(poolName, collateralMint),
                                 _c.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID,
                                 _c)])
                             .rpc()
@@ -585,7 +614,7 @@ var PerpetualsClient = (function () {
                             console.error(err);
                             throw err;
                         })];
-                    case 2: return [2, _d.sent()];
+                    case 3: return [2, _d.sent()];
                 }
             });
         }); };
@@ -751,8 +780,8 @@ var PerpetualsClient = (function () {
                         case 0:
                             _b = (_a = this.program.methods
                                 .getLiquidationPrice({
-                                addCollateral: addCollateral,
-                                removeCollateral: removeCollateral,
+                                addCollateralDelta: addCollateral,
+                                removeCollateralDelta: removeCollateral,
                             }))
                                 .accounts;
                             _c = {
@@ -785,8 +814,8 @@ var PerpetualsClient = (function () {
                         case 0:
                             _b = (_a = this.program.methods
                                 .getLiquidationPrice({
-                                addCollateral: addCollateral,
-                                removeCollateral: removeCollateral,
+                                addCollateralDelta: addCollateral,
+                                removeCollateralDelta: removeCollateral,
                             }))
                                 .accounts;
                             _c = {
@@ -992,20 +1021,21 @@ var PerpetualsClient = (function () {
         this.getAumSdk = function (poolAccount, token_prices, token_ema_prices, custodies, aum_calc_mode, currentTime) {
             return poolAccount.getAssetsUnderManagementUsd(token_prices, token_ema_prices, custodies, aum_calc_mode, currentTime);
         };
-        this.openPosition = function (payTokenSymbol, priceAfterSlippage, collateralWithfee, fee, size, side, poolConfig, createUserWSOLATA, skipBalanceChecks) {
+        this.openPosition = function (marketSymbol, collateralSymbol, priceAfterSlippage, collateralWithfee, fee, size, side, poolConfig, createUserWSOLATA, skipBalanceChecks) {
             if (createUserWSOLATA === void 0) { createUserWSOLATA = true; }
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, payTokenCustody, userCustodyTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, tokenAccountBalance, _a, positionAccount, params, instruction, error_2;
+                var publicKey, marketCustodyConfig, collateralCustodyConfig, userCollateralTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, tokenAccountBalance, _a, positionAccount, params, instruction, error_2;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            console.log("open position :::", payTokenSymbol, poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey.toBase58());
+                            console.log("open position :::", marketSymbol, poolConfig.getTokenFromSymbol(marketSymbol).mintKey.toBase58());
                             publicKey = this.provider.wallet.publicKey;
-                            payTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey); });
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey, publicKey)];
+                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey)];
                         case 1:
-                            userCustodyTokenAccount = _b.sent();
+                            userCollateralTokenAccount = _b.sent();
                             preInstructions = [];
                             instructions = [];
                             postInstructions = [];
@@ -1013,8 +1043,8 @@ var PerpetualsClient = (function () {
                             _b.label = 2;
                         case 2:
                             _b.trys.push([2, 10, , 11]);
-                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3, 4];
-                            console.log("payTokenSymbol === sol", payTokenSymbol);
+                            if (!(collateralSymbol == 'SOL' && createUserWSOLATA)) return [3, 4];
+                            console.log("collateralSymbol === SOL", collateralSymbol);
                             wrappedSolAccount = new web3_js_1.Keypair();
                             return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
                         case 3:
@@ -1040,14 +1070,14 @@ var PerpetualsClient = (function () {
                             if (!(createUserWSOLATA == false)) return [3, 5];
                             console.log("skip WSOL checks and creation ,since createUserWSOLATA == false");
                             return [3, 8];
-                        case 5: return [4, (0, utils_1.checkIfAccountExists)(userCustodyTokenAccount, this.provider.connection)];
+                        case 5: return [4, (0, utils_1.checkIfAccountExists)(userCollateralTokenAccount, this.provider.connection)];
                         case 6:
                             if (!(_b.sent())) {
                                 throw "Insufficient Funds , token Account doesn't exist";
                             }
                             if (!!skipBalanceChecks) return [3, 8];
                             _a = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)];
+                            return [4, this.provider.connection.getTokenAccountBalance(userCollateralTokenAccount)];
                         case 7:
                             tokenAccountBalance = new (_a.apply(anchor_1.BN, [void 0, (_b.sent()).value.amount]))();
                             if (tokenAccountBalance.lt(collateralWithfee)) {
@@ -1059,7 +1089,7 @@ var PerpetualsClient = (function () {
                                 Buffer.from("position"),
                                 publicKey.toBuffer(),
                                 poolConfig.poolAddress.toBuffer(),
-                                payTokenCustody.custodyAccount.toBuffer(),
+                                marketCustodyConfig.custodyAccount.toBuffer(),
                                 (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
                             ], this.programId)[0];
                             params = {
@@ -1072,14 +1102,17 @@ var PerpetualsClient = (function () {
                                     .openPosition(params)
                                     .accounts({
                                     owner: publicKey,
-                                    fundingAccount: payTokenSymbol == 'SOL' ? wrappedSolAccount.publicKey : userCustodyTokenAccount,
+                                    fundingAccount: marketSymbol == 'SOL' ? wrappedSolAccount.publicKey : userCollateralTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     position: positionAccount,
-                                    custody: payTokenCustody.custodyAccount,
-                                    custodyOracleAccount: payTokenCustody.oracleAddress,
-                                    custodyTokenAccount: payTokenCustody.tokenAccount,
+                                    custody: marketCustodyConfig.custodyAccount,
+                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 }).instruction()];
@@ -1099,15 +1132,15 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.closePosition = function (receivingTokenSymbol, priceAfterSlippage, side, poolConfig, createUserATA, closeUsersWSOLATA) {
+        this.closePosition = function (marketSymbol, collateralSymbol, priceAfterSlippage, side, poolConfig, createUserATA, closeUsersWSOLATA) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (closeUsersWSOLATA === void 0) { closeUsersWSOLATA = false; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, receivingTokenCustody, positionAccount, params, instruction, closeWsolATAIns, error_3;
+                var publicKey, userReceivingTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, lamports, _a, collateralCustodyConfig, marketCustodyConfig, positionAccount, params, instruction, closeWsolATAIns, error_3;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
+                            console.log("close position :::", marketSymbol, poolConfig.getTokenFromSymbol(marketSymbol).mintKey.toBase58());
                             publicKey = this.provider.wallet.publicKey;
                             preInstructions = [];
                             instructions = [];
@@ -1116,7 +1149,7 @@ var PerpetualsClient = (function () {
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 9, , 10]);
-                            if (!(receivingTokenSymbol == 'SOL')) return [3, 3];
+                            if (!(collateralSymbol == 'SOL')) return [3, 3];
                             wrappedSolAccount = new web3_js_1.Keypair();
                             userReceivingTokenAccount = wrappedSolAccount.publicKey;
                             return [4, (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(this.provider.connection)];
@@ -1137,7 +1170,7 @@ var PerpetualsClient = (function () {
                             ];
                             additionalSigners.push(wrappedSolAccount);
                             return [3, 7];
-                        case 3: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey, publicKey)];
+                        case 3: return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey, publicKey)];
                         case 4:
                             userReceivingTokenAccount = _b.sent();
                             _a = createUserATA;
@@ -1148,16 +1181,17 @@ var PerpetualsClient = (function () {
                             _b.label = 6;
                         case 6:
                             if (_a) {
-                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey));
+                                preInstructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(collateralSymbol).mintKey));
                             }
                             _b.label = 7;
                         case 7:
-                            receivingTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey); });
+                            collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
                             positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
                                 Buffer.from("position"),
                                 publicKey.toBuffer(),
                                 poolConfig.poolAddress.toBuffer(),
-                                receivingTokenCustody.custodyAccount.toBuffer(),
+                                marketCustodyConfig.custodyAccount.toBuffer(),
                                 (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
                             ], this.programId)[0];
                             params = {
@@ -1172,15 +1206,18 @@ var PerpetualsClient = (function () {
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     position: positionAccount,
-                                    custody: receivingTokenCustody.custodyAccount,
-                                    custodyOracleAccount: receivingTokenCustody.oracleAddress,
-                                    custodyTokenAccount: receivingTokenCustody.tokenAccount,
+                                    custody: marketCustodyConfig.custodyAccount,
+                                    custodyOracleAccount: marketCustodyConfig.oracleAddress,
+                                    collateralCustody: collateralCustodyConfig.custodyAccount,
+                                    collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
+                                    collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 }).instruction()];
                         case 8:
                             instruction = _b.sent();
                             instructions.push(instruction);
-                            if (receivingTokenSymbol == 'WSOL' && closeUsersWSOLATA) {
+                            if (collateralSymbol == 'WSOL' && closeUsersWSOLATA) {
                                 closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
                                 postInstructions.push(closeWsolATAIns);
                             }
@@ -1197,187 +1234,6 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.openPositionOld = function (payTokenSymbol, priceAfterSlippage, collateral, fee, size, side, poolConfig, createUserWSOLATA) {
-            if (createUserWSOLATA === void 0) { createUserWSOLATA = true; }
-            return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, payTokenCustody, userCustodyTokenAccount, instructions, wsolAssociatedTokenAccount, wsolATAExist, collateralWithfee, wsolBalance, _a, _b, unWrappedSolBalance, _c, totalSolBal, conversionAmt, tokenAccountBalance, _d, positionAccount, params, instruction, error_4;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
-                        case 0:
-                            console.log("open position :::", payTokenSymbol, poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey.toBase58());
-                            publicKey = this.provider.wallet.publicKey;
-                            payTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey); });
-                            return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(payTokenSymbol).mintKey, publicKey)];
-                        case 1:
-                            userCustodyTokenAccount = _e.sent();
-                            instructions = [];
-                            _e.label = 2;
-                        case 2:
-                            _e.trys.push([2, 15, , 16]);
-                            if (!(payTokenSymbol == 'SOL' && createUserWSOLATA)) return [3, 9];
-                            console.log("payTokenSymbol === sol", payTokenSymbol);
-                            wsolAssociatedTokenAccount = userCustodyTokenAccount;
-                            return [4, (0, utils_1.checkIfAccountExists)(wsolAssociatedTokenAccount, this.provider.connection)];
-                        case 3:
-                            wsolATAExist = _e.sent();
-                            if (!wsolATAExist) {
-                                console.log("wsol ata does not exist");
-                                instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, wsolAssociatedTokenAccount, publicKey, spl_token_1.NATIVE_MINT));
-                            }
-                            collateralWithfee = collateral.add(fee);
-                            _a = anchor_1.BN.bind;
-                            if (!wsolATAExist) return [3, 5];
-                            return [4, this.provider.connection.getTokenAccountBalance(wsolAssociatedTokenAccount)];
-                        case 4:
-                            _b = (_e.sent()).value.amount;
-                            return [3, 6];
-                        case 5:
-                            _b = 0;
-                            _e.label = 6;
-                        case 6:
-                            wsolBalance = new (_a.apply(anchor_1.BN, [void 0, _b]))();
-                            if (!wsolBalance.lt(collateralWithfee)) return [3, 8];
-                            console.log("WSOL balance insufficient \n so Convert SOL to WSOL");
-                            _c = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getBalance(publicKey)];
-                        case 7:
-                            unWrappedSolBalance = new (_c.apply(anchor_1.BN, [void 0, _e.sent()]))();
-                            totalSolBal = unWrappedSolBalance.add(wsolBalance);
-                            if (totalSolBal.lt(collateralWithfee)) {
-                                throw "Insufficient SOL Funds";
-                            }
-                            else {
-                                console.log("SOL balance sufficient so transfer from SOL to WSOL ATA");
-                            }
-                            conversionAmt = collateralWithfee.sub(wsolBalance);
-                            console.log("conversionAmt:", conversionAmt.toString());
-                            instructions.push(web3_js_1.SystemProgram.transfer({
-                                fromPubkey: publicKey,
-                                toPubkey: wsolAssociatedTokenAccount,
-                                lamports: conversionAmt.toNumber(),
-                            }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
-                            _e.label = 8;
-                        case 8: return [3, 13];
-                        case 9:
-                            if (!(createUserWSOLATA == false)) return [3, 10];
-                            console.log("skip WSOL checks and creation ,since createUserWSOLATA == false");
-                            return [3, 13];
-                        case 10: return [4, (0, utils_1.checkIfAccountExists)(userCustodyTokenAccount, this.provider.connection)];
-                        case 11:
-                            if (!(_e.sent())) {
-                                throw "Insufficient Funds , token Account doesn't exist";
-                            }
-                            _d = anchor_1.BN.bind;
-                            return [4, this.provider.connection.getTokenAccountBalance(userCustodyTokenAccount)];
-                        case 12:
-                            tokenAccountBalance = new (_d.apply(anchor_1.BN, [void 0, (_e.sent()).value.amount]))();
-                            if (tokenAccountBalance.lt(collateral.add(fee))) {
-                                throw "Insufficient Funds";
-                            }
-                            _e.label = 13;
-                        case 13:
-                            positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                                Buffer.from("position"),
-                                publicKey.toBuffer(),
-                                poolConfig.poolAddress.toBuffer(),
-                                payTokenCustody.custodyAccount.toBuffer(),
-                                (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                            ], this.programId)[0];
-                            params = {
-                                price: priceAfterSlippage,
-                                collateral: collateral,
-                                size: size,
-                                side: side,
-                            };
-                            return [4, this.program.methods
-                                    .openPosition(params)
-                                    .accounts({
-                                    owner: publicKey,
-                                    fundingAccount: userCustodyTokenAccount,
-                                    transferAuthority: poolConfig.transferAuthority,
-                                    perpetuals: poolConfig.perpetuals,
-                                    pool: poolConfig.poolAddress,
-                                    position: positionAccount,
-                                    custody: payTokenCustody.custodyAccount,
-                                    custodyOracleAccount: payTokenCustody.oracleAddress,
-                                    custodyTokenAccount: payTokenCustody.tokenAccount,
-                                    systemProgram: web3_js_1.SystemProgram.programId,
-                                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                                }).instruction()];
-                        case 14:
-                            instruction = _e.sent();
-                            instructions.push(instruction);
-                            return [3, 16];
-                        case 15:
-                            error_4 = _e.sent();
-                            console.log("perpClient openPosition error:", error_4);
-                            return [3, 16];
-                        case 16: return [2, instructions];
-                    }
-                });
-            });
-        };
-        this.closePositionOld = function (receivingTokenSymbol, priceAfterSlippage, side, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, userReceivingTokenAccount, instructions, receivingTokenCustody, positionAccount, params, instruction, closeWsolATAIns, error_5;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        console.log("close position :::", receivingTokenSymbol, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey.toBase58());
-                        publicKey = this.provider.wallet.publicKey;
-                        return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey, publicKey)];
-                    case 1:
-                        userReceivingTokenAccount = _a.sent();
-                        instructions = [];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 5, , 6]);
-                        return [4, (0, utils_1.checkIfAccountExists)(userReceivingTokenAccount, this.provider.connection)];
-                    case 3:
-                        if (!(_a.sent())) {
-                            instructions.push((0, spl_token_1.createAssociatedTokenAccountInstruction)(publicKey, userReceivingTokenAccount, publicKey, poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey));
-                        }
-                        receivingTokenCustody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receivingTokenSymbol).mintKey); });
-                        positionAccount = web3_js_1.PublicKey.findProgramAddressSync([
-                            Buffer.from("position"),
-                            publicKey.toBuffer(),
-                            poolConfig.poolAddress.toBuffer(),
-                            receivingTokenCustody.custodyAccount.toBuffer(),
-                            (0, types_1.isVariant)(side, 'long') ? Buffer.from([1]) : Buffer.from([2]),
-                        ], this.programId)[0];
-                        console.log("positionAccount:", positionAccount.toBase58());
-                        params = {
-                            price: priceAfterSlippage,
-                        };
-                        return [4, this.program.methods
-                                .closePosition(params)
-                                .accounts({
-                                owner: publicKey,
-                                receivingAccount: userReceivingTokenAccount,
-                                transferAuthority: poolConfig.transferAuthority,
-                                perpetuals: poolConfig.perpetuals,
-                                pool: poolConfig.poolAddress,
-                                position: positionAccount,
-                                custody: receivingTokenCustody.custodyAccount,
-                                custodyOracleAccount: receivingTokenCustody.oracleAddress,
-                                custodyTokenAccount: receivingTokenCustody.tokenAccount,
-                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                            }).instruction()];
-                    case 4:
-                        instruction = _a.sent();
-                        instructions.push(instruction);
-                        if (receivingTokenSymbol == 'SOL') {
-                            closeWsolATAIns = (0, spl_token_1.createCloseAccountInstruction)(userReceivingTokenAccount, publicKey, publicKey);
-                            instructions.push(closeWsolATAIns);
-                        }
-                        return [3, 6];
-                    case 5:
-                        error_5 = _a.sent();
-                        console.error("perpclient closePosition error:", error_5);
-                        return [3, 6];
-                    case 6: return [2, instructions];
-                }
-            });
-        }); };
         this.swap = function (poolReceivingTokenSymbol, poolDispensingTokenSymbol, amountIn, minAmountOut, poolConfig, unWrapSol) {
             if (unWrapSol === void 0) { unWrapSol = false; }
             return __awaiter(_this, void 0, void 0, function () {
@@ -1484,6 +1340,7 @@ var PerpetualsClient = (function () {
                                     dispensingCustody: poolDispensingCustodyConfig.custodyAccount,
                                     dispensingCustodyOracleAccount: poolDispensingCustodyConfig.oracleAddress,
                                     dispensingCustodyTokenAccount: poolDispensingCustodyConfig.tokenAccount,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 })
                                     .instruction()];
@@ -1504,18 +1361,19 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.addCollateral = function (collateralWithoutFee, fee, collateralSymbol, positionPubKey, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custody, instructions, userPayingTokenAccount, collateralWithfee, wsolAssociatedTokenAccount, wsolATAExist, wsolBalance, _a, _b, unWrappedSolBalance, _c, totalSolBal, conversionAmt, inx;
+        this.addCollateral = function (collateralWithoutFee, fee, marketSymbol, collateralSymbol, positionPubKey, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, collateralCustodyConfig, marketCustodyConfig, instructions, userPayingTokenAccount, collateralWithfee, wsolAssociatedTokenAccount, wsolATAExist, wsolBalance, _a, _b, unWrappedSolBalance, _c, totalSolBal, conversionAmt, inx;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        custody = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
-                        if (!custody) {
+                        collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                        marketCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(marketSymbol).mintKey); });
+                        if (!collateralCustodyConfig || !marketCustodyConfig) {
                             throw "payTokenCustody  not found";
                         }
                         instructions = [];
-                        userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(custody.mintKey, publicKey);
+                        userPayingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(collateralCustodyConfig.mintKey, publicKey);
                         collateralWithfee = collateralWithoutFee.add(fee);
                         if (!(collateralSymbol == 'SOL')) return [3, 7];
                         console.log("collateralSymbol === sol", collateralSymbol);
@@ -1557,7 +1415,7 @@ var PerpetualsClient = (function () {
                         }), (0, spl_token_1.createSyncNativeInstruction)(wsolAssociatedTokenAccount));
                         _d.label = 7;
                     case 7: return [4, this.program.methods.addCollateral({
-                            collateral: collateralWithoutFee
+                            collateralDelta: collateralWithoutFee
                         }).accounts({
                             owner: publicKey,
                             position: positionPubKey,
@@ -1565,9 +1423,12 @@ var PerpetualsClient = (function () {
                             transferAuthority: poolConfig.transferAuthority,
                             perpetuals: poolConfig.perpetuals,
                             pool: poolConfig.poolAddress,
-                            custody: custody.custodyAccount,
-                            custodyOracleAccount: custody.oracleAddress,
-                            custodyTokenAccount: custody.tokenAccount,
+                            custody: marketCustodyConfig.custodyAccount,
+                            custodyOracleAccount: marketCustodyConfig.oracleAddress,
+                            collateralCustody: collateralCustodyConfig.custodyAccount,
+                            collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
+                            collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                            eventAuthority: this.eventAuthority.publicKey,
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                         })
                             .instruction()];
@@ -1578,16 +1439,19 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.removeCollateral = function (collateralWithoutFee, collateralSymbol, positionPubKey, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, custody, instructions, userReceivingTokenAccount, ix, closeWsolATAIns;
+        this.removeCollateral = function (collateralWithoutFee, marketSymbol, collateralSymbol, positionPubKey, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, collateralCustodyConfig, marketCustodyConfig, instructions, userReceivingTokenAccount, ix, closeWsolATAIns;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
-                        custody = poolConfig.custodies.find(function (i) {
+                        collateralCustodyConfig = poolConfig.custodies.find(function (i) {
                             return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
                         });
-                        if (!custody) {
+                        marketCustodyConfig = poolConfig.custodies.find(function (i) {
+                            return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey);
+                        });
+                        if (!collateralCustodyConfig) {
                             throw "payTokenCustody  not found";
                         }
                         instructions = [];
@@ -1599,7 +1463,7 @@ var PerpetualsClient = (function () {
                         }
                         return [4, this.program.methods
                                 .removeCollateral({
-                                collateralUsd: collateralWithoutFee,
+                                collateralDelta: collateralWithoutFee,
                             })
                                 .accounts({
                                 owner: publicKey,
@@ -1608,9 +1472,12 @@ var PerpetualsClient = (function () {
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 position: positionPubKey,
-                                custody: custody.custodyAccount,
-                                custodyOracleAccount: custody.oracleAddress,
-                                custodyTokenAccount: custody.tokenAccount,
+                                custody: marketCustodyConfig.custodyAccount,
+                                custodyOracleAccount: marketCustodyConfig.oracleAddress,
+                                collateralCustody: collateralCustodyConfig.custodyAccount,
+                                collateralCustodyOracleAccount: collateralCustodyConfig.oracleAddress,
+                                collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
+                                eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                             })
                                 .instruction()];
@@ -1734,6 +1601,7 @@ var PerpetualsClient = (function () {
                             custodyOracleAccount: payTokenCustody.oracleAddress,
                             custodyTokenAccount: payTokenCustody.tokenAccount,
                             lpTokenMint: poolConfig.lpTokenMint,
+                            eventAuthority: this.eventAuthority.publicKey,
                             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                         })
                             .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
@@ -1809,6 +1677,7 @@ var PerpetualsClient = (function () {
                                     custodyOracleAccount: recieveTokenCustody.oracleAddress,
                                     custodyTokenAccount: recieveTokenCustody.tokenAccount,
                                     lpTokenMint: poolConfig.lpTokenMint,
+                                    eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 })
                                     .remainingAccounts(__spreadArray(__spreadArray([], custodyAccountMetas, true), custodyOracleAccountMetas, true))
@@ -1842,6 +1711,7 @@ var PerpetualsClient = (function () {
         this.multisig = this.findProgramAddress("multisig");
         this.authority = this.findProgramAddress("transfer_authority");
         this.perpetuals = this.findProgramAddress("perpetuals");
+        this.eventAuthority = this.findProgramAddress("__event_authority");
         this.prioritizationFee = (opts === null || opts === void 0 ? void 0 : opts.prioritizationFee) || 0;
         this.postSendTxCallback = opts === null || opts === void 0 ? void 0 : opts.postSendTxCallback;
         this.txConfirmationCommitment = (_a = opts === null || opts === void 0 ? void 0 : opts.txConfirmationCommitment) !== null && _a !== void 0 ? _a : 'processed';
@@ -1850,13 +1720,12 @@ var PerpetualsClient = (function () {
         };
     }
     PerpetualsClient.prototype.sendTransaction = function (ixs, opts) {
-        var _a;
         if (opts === void 0) { opts = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4, (0, rpc_1.sendTransaction)(this.program.provider, ixs, (_a = opts.alts) !== null && _a !== void 0 ? _a : [], __assign({ postSendTxCallback: this.postSendTxCallback, prioritizationFee: this.prioritizationFee, txConfirmationCommitment: this.txConfirmationCommitment }, opts))];
-                    case 1: return [2, _b.sent()];
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, (0, rpc_1.sendTransaction)(this.program.provider, ixs, __assign({ postSendTxCallback: this.postSendTxCallback, prioritizationFee: this.prioritizationFee }, opts))];
+                    case 1: return [2, _a.sent()];
                 }
             });
         });

package/dist/PoolConfig.d.ts

@@ -27,9 +27,10 @@ export declare class PoolConfig {
     perpetuals: PublicKey;
     transferAuthority: PublicKey;
     multisig: PublicKey;
+    addressLookupTableAddresses: PublicKey[];
     tokens: Token[];
     custodies: CustodyConfig[];
-    constructor(programId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, tokens: Token[], custodies: CustodyConfig[]);
+    constructor(programId: PublicKey, cluster: Cluster, poolName: string, poolAddress: PublicKey, lpTokenMint: PublicKey, lpDecimals: number, perpetuals: PublicKey, transferAuthority: PublicKey, multisig: PublicKey, addressLookupTableAddresses: PublicKey[], tokens: Token[], custodies: CustodyConfig[]);
     getAllTokenMints(): PublicKey[];
     getNonStableTokens(): PublicKey[];
     getAllCustodies(): PublicKey[];