flash-sdk 2.43.1 → 2.44.1-alpha.1

package/dist/PerpetualsClient.js

@@ -588,27 +588,34 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.removeCustody = function (poolName, tokenMint, ratios) { return __awaiter(_this, void 0, void 0, function () {
+        this.removeCustody = function (poolName, tokenMint, ratios, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var custodyConfig, userReceivingTokenAccount;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4, this.program.methods
-                            .removeCustody({ ratios: ratios })
-                            .accounts({
-                            admin: this.admin,
-                            multisig: this.multisig.publicKey,
-                            transferAuthority: this.authority.publicKey,
-                            perpetuals: this.perpetuals.publicKey,
-                            pool: this.getPoolKey(poolName),
-                            custody: this.getCustodyKey(poolName, tokenMint),
-                            custodyTokenAccount: this.getCustodyTokenAccountKey(poolName, tokenMint),
-                            systemProgram: web3_js_1.SystemProgram.programId,
-                            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                        })
-                            .rpc()
-                            .catch(function (err) {
-                            console.error(err);
-                            throw err;
-                        })];
+                    case 0:
+                        custodyConfig = poolConfig.custodies.find(function (f) { return f.mintKey.equals(tokenMint); });
+                        userReceivingTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(tokenMint, this.admin, true);
+                        return [4, this.program.methods
+                                .removeCustody({ ratios: ratios })
+                                .accounts({
+                                admin: this.admin,
+                                receivingAccount: userReceivingTokenAccount,
+                                multisig: this.multisig.publicKey,
+                                transferAuthority: this.authority.publicKey,
+                                perpetuals: this.perpetuals.publicKey,
+                                pool: this.getPoolKey(poolName),
+                                custody: this.getCustodyKey(poolName, tokenMint),
+                                custodyTokenAccount: this.getCustodyTokenAccountKey(poolName, tokenMint),
+                                custodyOracleAccount: this.useExtOracleAccount ? custodyConfig.extOracleAccount : custodyConfig.intOracleAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+                            })
+                                .rpc()
+                                .catch(function (err) {
+                                console.error(err);
+                                throw err;
+                            })];
                     case 1:
                         _a.sent();
                         return [2];
@@ -1234,8 +1241,9 @@ var PerpetualsClient = (function () {
             }
             return collateralInInputToken;
         };
-        this.getDecreaseSizeCollateralAndFeeSync = function (positionAccount, marketCorrelation, sizeDeltaUsd, keepLevSame, targetPrice, targetEmaPrice, marketConfig, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, side, poolConfig, discountBps) {
+        this.getDecreaseSizeCollateralAndFeeSync = function (positionAccount, marketCorrelation, sizeDeltaUsd, keepLevSame, targetPrice, targetEmaPrice, marketConfig, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, side, poolConfig, discountBps, debugLogs) {
             if (discountBps === void 0) { discountBps = constants_1.BN_ZERO; }
+            if (debugLogs === void 0) { debugLogs = false; }
             if (!marketConfig.marketAccount.equals(positionAccount.market)) {
                 throw new Error("marketCustodyAccount mismatch");
             }
@@ -1272,6 +1280,9 @@ var PerpetualsClient = (function () {
             var liabilityUsd = newPnl.lossUsd.add(totalFeesUsd);
             var assetsUsd = newPnl.profitUsd.add(currentCollateralUsd);
             var closeAmount, feesAmount;
+            if (debugLogs) {
+                console.log("assetsUsd.sub(liabilityUsd):", collateralCustodyAccount.decimals, assetsUsd.toString(), liabilityUsd.toString(), assetsUsd.sub(liabilityUsd).toString());
+            }
             if (assetsUsd.gte(liabilityUsd)) {
                 closeAmount = collateralMinMaxPrice.max.getTokenAmount(assetsUsd.sub(liabilityUsd), collateralCustodyAccount.decimals);
                 feesAmount = collateralMinMaxPrice.min.getTokenAmount(totalFeesUsd, collateralCustodyAccount.decimals);
@@ -1306,11 +1317,18 @@ var PerpetualsClient = (function () {
                 var collateralAmountReceived = closeAmount;
                 var collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(collateralAmountReceived, collateralCustodyAccount.decimals);
                 var maxWithdrawableAmount = _this.getMaxWithdrawableAmountSyncInternal(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmount);
+                if (debugLogs) {
+                    console.log("maxWithdrawableAmount ", maxWithdrawableAmount.toString(), keepLevSame);
+                    console.log("collateralAmountReceived ", collateralAmountReceived.toString(), keepLevSame);
+                }
                 if (collateralAmountReceived.lt(constants_1.BN_ZERO)) {
                     collateralAmountReceived = constants_1.BN_ZERO;
                     collateralAmountRecievedUsd = constants_1.BN_ZERO;
                 }
                 else if (collateralAmountReceived.gt(maxWithdrawableAmount)) {
+                    if (debugLogs) {
+                        console.log("exceeding to redicing maxWithdrawableAmount ", maxWithdrawableAmount.toString(), collateralAmountReceived.toString());
+                    }
                     collateralAmountReceived = maxWithdrawableAmount;
                     collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(maxWithdrawableAmount, collateralCustodyAccount.decimals);
                 }
@@ -1997,9 +2015,11 @@ var PerpetualsClient = (function () {
                     if (markets.length != poolAccount.markets.length || !markets[index].publicKey.equals(poolAccount.markets[index])) {
                         throw Error("incorrect markets");
                     }
+                    var targetCustodyId = poolAccount.getCustodyId(markets[index].targetCustody);
+                    var collateralCustodyId = poolAccount.getCustodyId(markets[index].collateralCustody);
                     var position = markets[index].getCollectivePosition();
-                    var collectivePnl = _this.getPnlSync(position, tokenPrices[markets[index].targetCustodyId.toNumber()], tokenEmaPrices[markets[index].targetCustodyId.toNumber()], custodies[markets[index].targetCustodyId.toNumber()], tokenPrices[markets[index].collateralCustodyId.toNumber()], tokenEmaPrices[markets[index].collateralCustodyId.toNumber()], custodies[markets[index].collateralCustodyId.toNumber()], currentTime, custodies[markets[index].targetCustodyId.toNumber()].pricing.delaySeconds, poolConfig);
-                    var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(tokenPrices[markets[index].collateralCustodyId.toNumber()], tokenEmaPrices[markets[index].collateralCustodyId.toNumber()], custodies[markets[index].collateralCustodyId.toNumber()]);
+                    var collectivePnl = _this.getPnlSync(position, tokenPrices[targetCustodyId], tokenEmaPrices[targetCustodyId], custodies[targetCustodyId], tokenPrices[collateralCustodyId], tokenEmaPrices[collateralCustodyId], custodies[collateralCustodyId], currentTime, custodies[targetCustodyId].pricing.delaySeconds, poolConfig);
+                    var collateralMinMaxPrice = _this.getMinAndMaxOraclePriceSync(tokenPrices[collateralCustodyId], tokenEmaPrices[collateralCustodyId], custodies[collateralCustodyId]);
                     var collectiveCollateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(position.collateralAmount, position.collateralDecimals);
                     var collectiveLossUsd = anchor_1.BN.min(collectivePnl.lossUsd, collectiveCollateralUsd);
                     poolEquityUsd = (poolEquityUsd.add(collectiveLossUsd)).sub(collectivePnl.profitUsd);
@@ -6049,11 +6069,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.placeLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, receiveCustodyId, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
+        this.placeLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, limitPrice, reserveAmount, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, skipBalanceChecks, ephemeralSignerPubkey) {
             if (skipBalanceChecks === void 0) { skipBalanceChecks = false; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_40;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, userReserveTokenAccount, wrappedSolAccount, preInstructions, instructions, postInstructions, additionalSigners, accCreationLamports, lamports, unWrappedSolBalance, _a, tokenAccountBalance, _b, positionAccount, orderAccount, placeLimitOrder, err_40;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -6061,6 +6081,7 @@ var PerpetualsClient = (function () {
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             reserveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey); });
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            receiveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receiveSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             return [4, (0, spl_token_1.getAssociatedTokenAddress)(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey, publicKey)];
                         case 1:
@@ -6128,8 +6149,7 @@ var PerpetualsClient = (function () {
                                     reserveAmount: reserveAmount,
                                     sizeAmount: sizeAmount,
                                     stopLossPrice: stopLossPrice,
-                                    takeProfitPrice: takeProfitPrice,
-                                    receiveCustodyId: receiveCustodyId
+                                    takeProfitPrice: takeProfitPrice
                                 })
                                     .accounts({
                                     owner: publicKey,
@@ -6145,6 +6165,7 @@ var PerpetualsClient = (function () {
                                     reserveCustody: reserveCustodyConfig.custodyAccount,
                                     reserveOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
+                                    receiveCustody: receiveCustodyConfig.custodyAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -6168,11 +6189,11 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, receiveCustodyId, poolConfig, createUserATA, ephemeralSignerPubkey) {
+        this.editLimitOrder = function (targetSymbol, collateralSymbol, reserveSymbol, receiveSymbol, side, orderId, limitPrice, sizeAmount, stopLossPrice, takeProfitPrice, poolConfig, createUserATA, ephemeralSignerPubkey) {
             if (createUserATA === void 0) { createUserATA = true; }
             if (ephemeralSignerPubkey === void 0) { ephemeralSignerPubkey = undefined; }
             return __awaiter(_this, void 0, void 0, function () {
-                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_41;
+                var publicKey, targetCustodyConfig, reserveCustodyConfig, collateralCustodyConfig, receiveCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, wrappedSolAccount, userReceivingTokenAccount, lamports, _a, positionAccount, orderAccount, editLimitOrder, err_41;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -6180,6 +6201,7 @@ var PerpetualsClient = (function () {
                             targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                             reserveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(reserveSymbol).mintKey); });
                             collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                            receiveCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receiveSymbol).mintKey); });
                             marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                             preInstructions = [];
                             instructions = [];
@@ -6230,12 +6252,12 @@ var PerpetualsClient = (function () {
                                     limitPrice: limitPrice,
                                     sizeAmount: sizeAmount,
                                     stopLossPrice: stopLossPrice,
-                                    takeProfitPrice: takeProfitPrice,
-                                    receiveCustodyId: receiveCustodyId
+                                    takeProfitPrice: takeProfitPrice
                                 })
                                     .accounts({
                                     owner: publicKey,
                                     feePayer: publicKey,
+                                    receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
                                     transferAuthority: poolConfig.transferAuthority,
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
@@ -6247,7 +6269,7 @@ var PerpetualsClient = (function () {
                                     reserveCustody: reserveCustodyConfig.custodyAccount,
                                     reserveOracleAccount: this.useExtOracleAccount ? reserveCustodyConfig.extOracleAccount : reserveCustodyConfig.intOracleAccount,
                                     reserveCustodyTokenAccount: reserveCustodyConfig.tokenAccount,
-                                    receivingAccount: reserveSymbol == 'SOL' ? (ephemeralSignerPubkey ? ephemeralSignerPubkey : wrappedSolAccount.publicKey) : userReceivingTokenAccount,
+                                    receiveCustody: receiveCustodyConfig.custodyAccount,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     program: this.programId,
@@ -6403,14 +6425,15 @@ var PerpetualsClient = (function () {
                 });
             });
         };
-        this.placeTriggerOrder = function (targetSymbol, collateralSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, receiveCustodyId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_44;
+        this.placeTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, placeTriggerOrder, err_44;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
                         targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                         collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                        receivingCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receiveSymbol).mintKey); });
                         marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                         preInstructions = [];
                         instructions = [];
@@ -6425,8 +6448,7 @@ var PerpetualsClient = (function () {
                                 .placeTriggerOrder({
                                 triggerPrice: triggerPrice,
                                 deltaSizeAmount: deltaSizeAmount,
-                                isStopLoss: isStopLoss,
-                                receiveCustodyId: receiveCustodyId
+                                isStopLoss: isStopLoss
                             })
                                 .accounts({
                                 owner: publicKey,
@@ -6440,6 +6462,7 @@ var PerpetualsClient = (function () {
                                 targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                receiveCustody: receivingCustodyConfig.custodyAccount,
                                 systemProgram: web3_js_1.SystemProgram.programId,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId,
@@ -6461,14 +6484,15 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.editTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
-            var publicKey, targetCustodyConfig, collateralCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_45;
+        this.editTriggerOrder = function (targetSymbol, collateralSymbol, receiveSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, receivingCustodyConfig, marketAccount, preInstructions, instructions, postInstructions, additionalSigners, positionAccount, orderAccount, editTriggerOrder, err_45;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         publicKey = this.provider.wallet.publicKey;
                         targetCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(targetSymbol).mintKey); });
                         collateralCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(collateralSymbol).mintKey); });
+                        receivingCustodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(poolConfig.getTokenFromSymbol(receiveSymbol).mintKey); });
                         marketAccount = poolConfig.getMarketPk(targetCustodyConfig.custodyAccount, collateralCustodyConfig.custodyAccount, side);
                         preInstructions = [];
                         instructions = [];
@@ -6497,6 +6521,7 @@ var PerpetualsClient = (function () {
                                 targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
                                 collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
+                                receiveCustody: receivingCustodyConfig.custodyAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY

package/dist/PoolAccount.d.ts

@@ -22,6 +22,7 @@ export declare class PoolAccount implements Pool {
     lpMintBump: number;
     stakedLpVaultBump: number;
     vpVolumeFactor: number;
+    uniqueCustodyCount: number;
     padding: number[];
     stakingFeeBoostBps: BN[];
     compoundingMint: PublicKey;
@@ -32,5 +33,5 @@ export declare class PoolAccount implements Pool {
     constructor(publicKey: PublicKey, parseData: Pool);
     static from(publicKey: PublicKey, parseData: Pool): PoolAccount;
     updatePoolData(parseData: Pool): void;
-    getTokenId(custodyKey: PublicKey): number;
+    getCustodyId(custodyKey: PublicKey): number;
 }

package/dist/PoolAccount.js

@@ -12,7 +12,7 @@ var PoolAccount = (function () {
     PoolAccount.prototype.updatePoolData = function (parseData) {
         Object.assign(this, parseData);
     };
-    PoolAccount.prototype.getTokenId = function (custodyKey) {
+    PoolAccount.prototype.getCustodyId = function (custodyKey) {
         return this.custodies.findIndex(function (i) { return i.toBase58() == custodyKey.toBase58(); });
     };
     return PoolAccount;