flash-sdk 2.42.9-alpha.0 → 2.42.11

package/dist/PerpetualsClient.d.ts

@@ -4340,7 +4340,7 @@ export declare class PerpetualsClient {
         closeAmount: BN;
         feesAmount: BN;
     };
-    getMaxWithdrawableAmountSync: (positionAccount: PositionAccount, targetPrice: OraclePrice, targetEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, poolConfig: PoolConfig, errorBandwidthPercentageUi?: number) => BN;
+    getMaxWithdrawableAmountSync: (positionAccount: PositionAccount, targetPrice: OraclePrice, targetEmaPrice: OraclePrice, targetCustodyAccount: CustodyAccount, collateralPrice: OraclePrice, collateralEmaPrice: OraclePrice, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN, poolConfig: PoolConfig, closeAmount?: BN, errorBandwidthPercentageUi?: number) => BN;
     getCumulativeLockFeeSync: (custodyAccount: CustodyAccount, currentTimestamp: BN) => BN;
     getBorrowRateSync: (custodyAccount: CustodyAccount, currentUtilization: BN) => BN;
     getLockFeeAndUnsettledUsdForPosition: (position: PositionAccount, collateralCustodyAccount: CustodyAccount, currentTimestamp: BN) => BN;
@@ -4600,7 +4600,7 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    editTriggerOrder: (targetSymbol: string, collateralSymbol: string, receiveSymbol: string, side: Side, orderId: number, triggerPrice: ContractOraclePrice, deltaSizeAmount: BN, isStopLoss: boolean, poolConfig: PoolConfig) => Promise<{
+    editTriggerOrder: (targetSymbol: string, collateralSymbol: string, side: Side, orderId: number, triggerPrice: ContractOraclePrice, deltaSizeAmount: BN, isStopLoss: boolean, receiveCustodyId: number, poolConfig: PoolConfig) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;

package/dist/PerpetualsClient.js

@@ -1280,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);
@@ -1293,7 +1296,8 @@ var PerpetualsClient = (function () {
             newPosition.sizeUsd = positionAccount.sizeUsd.sub(positionDelta.sizeUsd);
             newPosition.lockedUsd = positionAccount.lockedUsd.sub(positionDelta.lockedUsd);
             newPosition.lockedAmount = positionAccount.lockedAmount.sub(positionDelta.lockedAmount);
-            newPosition.collateralAmount = positionAccount.collateralAmount.sub(closeAmount);
+            newPosition.collateralAmount = positionAccount.collateralAmount.sub(positionDelta.collateralAmount);
+            newPosition.unsettledFeesUsd = positionAccount.unsettledFeesUsd.sub(positionDelta.unsettledFeesUsd);
             newPosition.collateralUsd = collateralMinMaxPrice.min.getAssetAmountUsd(newPosition.collateralAmount, collateralCustodyAccount.decimals);
             var feeUsdWithDiscount = constants_1.BN_ZERO;
             var feeUsd = sizeDeltaUsd.mul(targetCustodyAccount.fees.closePosition).div(new anchor_1.BN(constants_1.RATE_POWER));
@@ -1312,7 +1316,7 @@ var PerpetualsClient = (function () {
                 var pnlUsdWithFee = pnlUsd.sub(lockAndUnsettledFeeUsd_1).sub(exitFee.exitFeeUsd);
                 var collateralAmountReceived = closeAmount;
                 var collateralAmountRecievedUsd = collateralMinMaxPrice.min.getAssetAmountUsd(collateralAmountReceived, collateralCustodyAccount.decimals);
-                var maxWithdrawableAmount = _this.getMaxWithdrawableAmountSync(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig);
+                var maxWithdrawableAmount = _this.getMaxWithdrawableAmountSync(newPosition, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmount);
                 if (debugLogs) {
                     console.log("maxWithdrawableAmount ", maxWithdrawableAmount.toString(), keepLevSame);
                     console.log("collateralAmountReceived ", collateralAmountReceived.toString(), keepLevSame);
@@ -1346,7 +1350,7 @@ var PerpetualsClient = (function () {
                 };
             }
             else {
-                var collateralAmountReceived = closeAmount.sub(positionDelta.collateralAmount);
+                var collateralAmountReceived = closeAmount;
                 if (collateralAmountReceived.lte(constants_1.BN_ZERO)) {
                     collateralAmountReceived = constants_1.BN_ZERO;
                 }
@@ -1366,7 +1370,7 @@ var PerpetualsClient = (function () {
                     newLev: newLev,
                     liquidationPrice: finalLiquidationPrice,
                     collateralAmountRecieved: collateralAmountReceived,
-                    newCollateralAmount: newPosition.collateralAmount.sub(collateralAmountReceived),
+                    newCollateralAmount: newPosition.collateralAmount,
                     newPnl: finalPnlUsd
                 };
             }
@@ -1391,20 +1395,16 @@ var PerpetualsClient = (function () {
             }
             return { closeAmount: closeAmount, feesAmount: feesAmount };
         };
-        this.getMaxWithdrawableAmountSync = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, errorBandwidthPercentageUi) {
+        this.getMaxWithdrawableAmountSync = function (positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, poolConfig, closeAmount, errorBandwidthPercentageUi) {
+            if (closeAmount === void 0) { closeAmount = constants_1.BN_ZERO; }
             if (errorBandwidthPercentageUi === void 0) { errorBandwidthPercentageUi = 5; }
             if (errorBandwidthPercentageUi > 100 || errorBandwidthPercentageUi < 0) {
                 throw new Error("errorBandwidthPercentageUi cannot be >100 or <0");
             }
             var MAX_INIT_LEVERAGE = targetCustodyAccount.pricing.maxInitialLeverage.mul(new anchor_1.BN(100 - errorBandwidthPercentageUi)).div(new anchor_1.BN(100));
-            var maxRemoveableCollateralUsdAfterMinRequired = positionAccount.collateralUsd.sub(targetCustodyAccount.pricing.minCollateralUsd.mul(new anchor_1.BN(100 + errorBandwidthPercentageUi)).div(new anchor_1.BN(100)));
-            if (maxRemoveableCollateralUsdAfterMinRequired.isNeg()) {
-                console.log("THIS cannot happen but still");
-                return constants_1.BN_ZERO;
-            }
             var profitLoss = _this.getPnlSync(positionAccount, targetPrice, targetEmaPrice, targetCustodyAccount, collateralPrice, collateralEmaPrice, collateralCustodyAccount, currentTimestamp, targetCustodyAccount.pricing.delaySeconds, poolConfig);
             var _a = _this.getMinAndMaxOraclePriceSync(collateralPrice, collateralEmaPrice, collateralCustodyAccount), collateralMinPrice = _a.min, collateralMaxPrice = _a.max;
-            var currentCollateralUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.collateralAmount, collateralCustodyAccount.decimals);
+            var currentCollateralUsd = collateralMinPrice.getAssetAmountUsd(positionAccount.collateralAmount.add(closeAmount), collateralCustodyAccount.decimals);
             var availableInitMarginUsd = constants_1.BN_ZERO;
             if (profitLoss.lossUsd.lt(currentCollateralUsd)) {
                 availableInitMarginUsd = currentCollateralUsd.sub(profitLoss.lossUsd);
@@ -1418,8 +1418,16 @@ var PerpetualsClient = (function () {
                 return constants_1.BN_ZERO;
             }
             var maxWithdrawableAmount;
-            if (maxRemoveableCollateralUsdAfterMinRequired.lt(maxRemovableCollateralUsd)) {
-                maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(maxRemoveableCollateralUsdAfterMinRequired, collateralCustodyAccount.decimals);
+            var remainingCollateralUsd = availableInitMarginUsd.sub(maxRemovableCollateralUsd);
+            if (remainingCollateralUsd < targetCustodyAccount.pricing.minCollateralUsd) {
+                var diff = targetCustodyAccount.pricing.minCollateralUsd.sub(remainingCollateralUsd);
+                var updatedMaxRemovableCollateralUsd = maxRemovableCollateralUsd.sub(diff);
+                if (updatedMaxRemovableCollateralUsd.isNeg()) {
+                    return constants_1.BN_ZERO;
+                }
+                else {
+                    maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(updatedMaxRemovableCollateralUsd, collateralCustodyAccount.decimals);
+                }
             }
             else {
                 maxWithdrawableAmount = collateralMaxPrice.getTokenAmount(maxRemovableCollateralUsd, collateralCustodyAccount.decimals);
@@ -6436,15 +6444,14 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        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;
+        this.editTriggerOrder = function (targetSymbol, collateralSymbol, side, orderId, triggerPrice, deltaSizeAmount, isStopLoss, receiveCustodyId, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var publicKey, targetCustodyConfig, collateralCustodyConfig, 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 = [];
@@ -6460,7 +6467,8 @@ var PerpetualsClient = (function () {
                                 orderId: orderId,
                                 triggerPrice: triggerPrice,
                                 deltaSizeAmount: deltaSizeAmount,
-                                isStopLoss: isStopLoss
+                                isStopLoss: isStopLoss,
+                                receiveCustodyId: receiveCustodyId
                             })
                                 .accounts({
                                 owner: publicKey,
@@ -6473,7 +6481,6 @@ 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/idl/perpetuals.d.ts

@@ -4233,99 +4233,6 @@ export type Perpetuals = {
                 }
             ];
         },
-        {
-            "name": "decreaseAndRemoveCollateral";
-            "accounts": [
-                {
-                    "name": "owner";
-                    "isMut": false;
-                    "isSigner": true;
-                },
-                {
-                    "name": "receivingAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "transferAuthority";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "perpetuals";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "pool";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "position";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "market";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "targetCustody";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "targetOracleAccount";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "collateralCustody";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "collateralOracleAccount";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "collateralCustodyTokenAccount";
-                    "isMut": true;
-                    "isSigner": false;
-                },
-                {
-                    "name": "tokenProgram";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "eventAuthority";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "program";
-                    "isMut": false;
-                    "isSigner": false;
-                },
-                {
-                    "name": "ixSysvar";
-                    "isMut": false;
-                    "isSigner": false;
-                }
-            ];
-            "args": [
-                {
-                    "name": "params";
-                    "type": {
-                        "defined": "DecreaseAndRemoveCollateralParams";
-                    };
-                }
-            ];
-        },
         {
             "name": "decreaseSize";
             "accounts": [
@@ -5153,11 +5060,6 @@ export type Perpetuals = {
                     "isMut": false;
                     "isSigner": false;
                 },
-                {
-                    "name": "receiveCustody";
-                    "isMut": false;
-                    "isSigner": false;
-                },
                 {
                     "name": "eventAuthority";
                     "isMut": false;
@@ -8244,30 +8146,6 @@ export type Perpetuals = {
                 ];
             };
         },
-        {
-            "name": "DecreaseAndRemoveCollateralParams";
-            "type": {
-                "kind": "struct";
-                "fields": [
-                    {
-                        "name": "priceWithSlippage";
-                        "type": {
-                            "defined": "OraclePrice";
-                        };
-                    },
-                    {
-                        "name": "sizeDelta";
-                        "type": "u64";
-                    },
-                    {
-                        "name": "privilege";
-                        "type": {
-                            "defined": "Privilege";
-                        };
-                    }
-                ];
-            };
-        },
         {
             "name": "DecreaseSizeParams";
             "type": {
@@ -8392,6 +8270,10 @@ export type Perpetuals = {
                     {
                         "name": "isStopLoss";
                         "type": "bool";
+                    },
+                    {
+                        "name": "receiveCustodyId";
+                        "type": "u8";
                     }
                 ];
             };
@@ -11083,9 +10965,6 @@ export type Perpetuals = {
                     },
                     {
                         "name": "CollectStakeReward";
-                    },
-                    {
-                        "name": "DecreaseAndRemoveCollateral";
                     }
                 ];
             };
@@ -12007,136 +11886,6 @@ export type Perpetuals = {
                 }
             ];
         },
-        {
-            "name": "DecreaseAndRemoveCollateralLog";
-            "fields": [
-                {
-                    "name": "owner";
-                    "type": "publicKey";
-                    "index": false;
-                },
-                {
-                    "name": "market";
-                    "type": "publicKey";
-                    "index": false;
-                },
-                {
-                    "name": "entryPrice";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "entryPriceExponent";
-                    "type": "i32";
-                    "index": false;
-                },
-                {
-                    "name": "duration";
-                    "type": "i64";
-                    "index": false;
-                },
-                {
-                    "name": "exitPrice";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "exitPriceExponent";
-                    "type": "i32";
-                    "index": false;
-                },
-                {
-                    "name": "deltaSizeAmount";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "deltaSizeUsd";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "collateralPrice";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "collateralPriceExponent";
-                    "type": "i32";
-                    "index": false;
-                },
-                {
-                    "name": "deltaCollateralAmount";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "finalSizeAmount";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "finalSizeUsd";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "finalCollateralAmount";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "finalCollateralUsd";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "profitUsd";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "lossUsd";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "feeAmount";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "feeRebateAmount";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "exitFeeAmount";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "oracleAccountTime";
-                    "type": "i64";
-                    "index": false;
-                },
-                {
-                    "name": "oracleAccountType";
-                    "type": "u8";
-                    "index": false;
-                },
-                {
-                    "name": "oracleAccountPrice";
-                    "type": "u64";
-                    "index": false;
-                },
-                {
-                    "name": "oracleAccountPriceExponent";
-                    "type": "i32";
-                    "index": false;
-                }
-            ];
-        },
         {
             "name": "DecreaseSizeLog";
             "fields": [