aftermath-ts-sdk 1.3.23-perps.21 → 1.3.23-wc-0.1

package/dist/packages/perpetuals/perpetualsAccount.js

@@ -23,39 +23,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PerpetualsAccount = void 0;
 const caller_1 = require("../../general/utils/caller");
 const types_1 = require("../../types");
+const iFixedUtils_1 = require("../../general/utils/iFixedUtils");
 const utils_1 = require("../../general/utils");
 const perpetuals_1 = require("./perpetuals");
 const __1 = require("..");
-const transactions_1 = require("@mysten/sui/transactions");
-// TODO: create refresh account positions function ?
 class PerpetualsAccount extends caller_1.Caller {
     // =========================================================================
     //  Constructor
     // =========================================================================
-    constructor(account, accountCap, config, Provider) {
-        const vaultId = "vaultId" in accountCap ? accountCap.vaultId : undefined;
+    constructor(account, accountCap, config) {
         super(config, "perpetuals");
         this.account = account;
         this.accountCap = accountCap;
-        this.Provider = Provider;
-        // public async getOwnedWithdrawRequests() {
-        // 	return new Perpetuals(
-        // 		this.config,
-        // 		this.Provider
-        // 	).getOwnedWithdrawRequests({
-        // 		walletAddress: this.ownerAddress(),
-        // 	});
-        // }
         // =========================================================================
         //  Calculations
         // =========================================================================
         this.calcFreeCollateralForPosition = (inputs) => {
             var _a, _b;
             const marketId = inputs.market.marketId;
-            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : inputs.market.emptyPosition();
+            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : this.emptyPosition({ market: inputs.market });
             const funding = this.calcUnrealizedFundingsForPosition(inputs);
             const { pnl, minInitialMargin } = this.calcPnLAndMarginForPosition(inputs);
-            let collateralUsd = position.collateral * inputs.collateralPrice;
+            let collateralUsd = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.collateral) *
+                inputs.collateralPrice;
             collateralUsd += funding;
             let cappedMargin;
             if (pnl < 0) {
@@ -74,12 +64,14 @@ class PerpetualsAccount extends caller_1.Caller {
             var _a, _b;
             const { market, indexPrice, collateralPrice } = inputs;
             const marketId = market.marketId;
-            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : market.emptyPosition();
+            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : this.emptyPosition({ market });
             const funding = this.calcUnrealizedFundingsForPosition({
                 market,
                 position,
             });
-            const collateralUsd = (position === null || position === void 0 ? void 0 : position.collateral) * collateralPrice + funding;
+            const collateralUsd = iFixedUtils_1.IFixedUtils.numberFromIFixed(position === null || position === void 0 ? void 0 : position.collateral) *
+                collateralPrice +
+                funding;
             const { pnl, netAbsBaseValue } = this.calcPnLAndMarginForPosition({
                 market,
                 indexPrice,
@@ -104,31 +96,31 @@ class PerpetualsAccount extends caller_1.Caller {
         this.calcUnrealizedFundingsForPosition = (inputs) => {
             var _a, _b;
             const marketId = inputs.market.marketId;
-            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : inputs.market.emptyPosition();
-            const baseAmount = position.baseAssetAmount;
+            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : this.emptyPosition({ market: inputs.market });
+            const baseAmount = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.baseAssetAmount);
             const isLong = Math.sign(baseAmount);
             if (isLong < 0) {
-                const fundingShort = position.cumFundingRateShort;
-                const marketFundingShort = inputs.market.marketState.cumFundingRateShort;
+                const fundingShort = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.cumFundingRateShort);
+                const marketFundingShort = iFixedUtils_1.IFixedUtils.numberFromIFixed(inputs.market.marketState.cumFundingRateShort);
                 return -baseAmount * (marketFundingShort - fundingShort);
             }
             else {
-                const fundingLong = position.cumFundingRateLong;
-                const marketFundingLong = inputs.market.marketState.cumFundingRateLong;
+                const fundingLong = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.cumFundingRateLong);
+                const marketFundingLong = iFixedUtils_1.IFixedUtils.numberFromIFixed(inputs.market.marketState.cumFundingRateLong);
                 return -baseAmount * (marketFundingLong - fundingLong);
             }
         };
         this.calcPnLAndMarginForPosition = (inputs) => {
             var _a, _b;
             const marketId = inputs.market.marketId;
-            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : inputs.market.emptyPosition();
-            const marginRatioInitial = 1 / (position.leverage || 1);
+            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : this.emptyPosition({ market: inputs.market });
+            const marginRatioInitial = 1 / position.leverage;
             // const marginRatioInitial = inputs.market.initialMarginRatio();
-            const marginRatioMaintenance = inputs.market.marketParams.marginRatioMaintenance;
-            const baseAssetAmount = position.baseAssetAmount;
-            const quoteAssetAmount = position.quoteAssetNotionalAmount;
-            const bidsQuantity = position.bidsQuantity;
-            const asksQuantity = position.asksQuantity;
+            const marginRatioMaintenance = iFixedUtils_1.IFixedUtils.numberFromIFixed(inputs.market.marketParams.marginRatioMaintenance);
+            const baseAssetAmount = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.baseAssetAmount);
+            const quoteAssetAmount = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.quoteAssetNotionalAmount);
+            const bidsQuantity = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.bidsQuantity);
+            const asksQuantity = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.asksQuantity);
             const pnl = baseAssetAmount * inputs.indexPrice - quoteAssetAmount;
             const netAbs = Math.max(Math.abs(baseAssetAmount + bidsQuantity), Math.abs(baseAssetAmount - asksQuantity));
             const netAbsBaseValue = netAbs * inputs.indexPrice;
@@ -139,30 +131,33 @@ class PerpetualsAccount extends caller_1.Caller {
         this.calcLiquidationPriceForPosition = (inputs) => {
             var _a, _b;
             const marketId = inputs.market.marketId;
-            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : inputs.market.emptyPosition();
+            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : this.emptyPosition({ market: inputs.market });
             const funding = this.calcUnrealizedFundingsForPosition(inputs);
-            const baseAssetAmount = position.baseAssetAmount;
-            const quoteAssetAmount = position.quoteAssetNotionalAmount;
-            const numerator = position.collateral * inputs.collateralPrice +
-                funding -
-                quoteAssetAmount;
-            const MMR = inputs.market.marketParams.marginRatioMaintenance;
-            const bidsQuantity = position.bidsQuantity;
-            const asksQuantity = position.asksQuantity;
-            const netAbs = Math.max(Math.abs(baseAssetAmount + bidsQuantity), Math.abs(baseAssetAmount - asksQuantity));
-            const denominator = netAbs * MMR - baseAssetAmount;
-            if (!denominator)
-                return 0;
-            const liquidationPrice = numerator / denominator;
-            return liquidationPrice <= 0 ? 0 : liquidationPrice;
+            const collateralUsd = iFixedUtils_1.IFixedUtils.numberFromIFixed(position === null || position === void 0 ? void 0 : position.collateral) *
+                inputs.collateralPrice +
+                funding;
+            const baseAssetAmount = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.baseAssetAmount);
+            const quoteAssetAmount = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.quoteAssetNotionalAmount);
+            const MMR = iFixedUtils_1.IFixedUtils.numberFromIFixed(inputs.market.marketParams.marginRatioMaintenance);
+            const numerator = collateralUsd - quoteAssetAmount;
+            const price = (() => {
+                if (baseAssetAmount > 0) {
+                    return numerator / ((1 - MMR) * -baseAssetAmount);
+                }
+                else {
+                    return numerator / ((1 + MMR) * -baseAssetAmount);
+                }
+            })();
+            return price < 0 ? 0 : price;
         };
         this.calcFreeMarginUsdForPosition = (inputs) => {
             var _a, _b;
             const marketId = inputs.market.marketId;
-            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : inputs.market.emptyPosition();
+            const position = (_b = (_a = inputs.position) !== null && _a !== void 0 ? _a : this.positionForMarketId({ marketId })) !== null && _b !== void 0 ? _b : this.emptyPosition({ market: inputs.market });
             const totalFunding = this.calcUnrealizedFundingsForPosition(inputs);
             const { pnl, minInitialMargin } = this.calcPnLAndMarginForPosition(inputs);
-            let collateralUsd = position.collateral * inputs.collateralPrice;
+            let collateralUsd = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.collateral) *
+                inputs.collateralPrice;
             const margin = collateralUsd + totalFunding + pnl;
             if (margin >= minInitialMargin) {
                 return margin - minInitialMargin;
@@ -179,7 +174,7 @@ class PerpetualsAccount extends caller_1.Caller {
             zipped.forEach(([market, indexPrice]) => {
                 var _a;
                 const marketId = market.marketId;
-                const position = (_a = this.positionForMarketId({ marketId })) !== null && _a !== void 0 ? _a : market.emptyPosition();
+                const position = (_a = this.positionForMarketId({ marketId })) !== null && _a !== void 0 ? _a : this.emptyPosition({ market });
                 const funding = this.calcUnrealizedFundingsForPosition({
                     market,
                     position,
@@ -189,7 +184,8 @@ class PerpetualsAccount extends caller_1.Caller {
                     indexPrice,
                     position,
                 });
-                let collateralUsd = position.collateral * inputs.collateralPrice;
+                let collateralUsd = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.collateral) *
+                    inputs.collateralPrice;
                 totalPnL += pnl;
                 totalFunding += funding;
                 totalCollateralAllocated += collateralUsd;
@@ -204,9 +200,9 @@ class PerpetualsAccount extends caller_1.Caller {
         };
         this.closePositionTxInputs = (inputs) => {
             var _a;
-            const { size, market, orderDatas, collateralPrice } = inputs;
+            const { size, market, walletAddress, orderDatas, collateralPrice } = inputs;
             const marketId = market.marketId;
-            const position = (_a = this.positionForMarketId({ marketId })) !== null && _a !== void 0 ? _a : market.emptyPosition();
+            const position = (_a = this.positionForMarketId({ marketId })) !== null && _a !== void 0 ? _a : this.emptyPosition({ market });
             // TODO: move conversion to helper function, since used often
             const ordersCollateral = __1.Coin.normalizeBalance(utils_1.Helpers.sum(orderDatas
                 .filter((orderData) => orderData.marketId === market.marketId)
@@ -216,25 +212,40 @@ class PerpetualsAccount extends caller_1.Caller {
                 (1 -
                     PerpetualsAccount.constants
                         .closePositionMarginOfError))), BigInt(0)) * BigInt(-1);
-            const positionSize = BigInt(Math.round(Math.abs(position.baseAssetAmount / market.lotSize())));
-            // NOTE: is this safe / correct ?
-            const collateralChange = __1.Coin.balanceWithDecimals(BigInt(Math.round(Number(fullPositionCollateralChange) *
-                (Number(size) / Number(positionSize)))), this.collateralDecimals());
+            const positionSize = BigInt(Math.round(Math.abs(utils_1.Casting.IFixed.numberFromIFixed(position.baseAssetAmount) /
+                market.lotSize())));
+            const collateralChange = BigInt(Math.round(Number(fullPositionCollateralChange) *
+                (Number(size) / Number(positionSize))));
             const positionSide = perpetuals_1.Perpetuals.positionSide(position);
             return {
                 size,
                 marketId,
+                walletAddress,
                 collateralChange,
-                // leverage: position.leverage || 1,
-                // leverage: undefined,
                 side: positionSide === types_1.PerpetualsOrderSide.Bid
                     ? types_1.PerpetualsOrderSide.Ask
                     : types_1.PerpetualsOrderSide.Bid,
-                // hasPosition: this.positionForMarketId({ marketId }) !== undefined,
-                reduceOnly: true,
+                hasPosition: this.positionForMarketId({ marketId }) !== undefined,
+            };
+        };
+        this.emptyPosition = (inputs) => {
+            const { market } = inputs;
+            return {
+                marketId: market.marketId,
+                collateralCoinType: this.accountCap.collateralCoinType,
+                collateral: BigInt(0),
+                baseAssetAmount: BigInt(0),
+                quoteAssetNotionalAmount: BigInt(0),
+                cumFundingRateLong: market.marketState.cumFundingRateLong,
+                cumFundingRateShort: market.marketState.cumFundingRateShort,
+                asksQuantity: BigInt(0),
+                bidsQuantity: BigInt(0),
+                pendingOrders: [],
+                makerFee: BigInt(1000000000000000000), // 100%
+                takerFee: BigInt(1000000000000000000), // 100%
+                leverage: 1,
             };
         };
-        this.vaultId = vaultId;
     }
     // =========================================================================
     //  Transactions
@@ -244,98 +255,29 @@ class PerpetualsAccount extends caller_1.Caller {
     // =========================================================================
     getDepositCollateralTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx } = inputs, otherInputs = __rest(inputs, ["tx"]);
-            // TODO: add vault support
-            if (this.vaultId)
-                throw new Error("this function is not supported for vaults");
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/deposit-collateral", Object.assign(Object.assign(Object.assign(Object.assign({}, otherInputs), { walletAddress: this.ownerAddress(), collateralCoinType: this.accountCap.collateralCoinType }), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({
-                    tx: tx !== null && tx !== void 0 ? tx : new transactions_1.Transaction(),
-                })) }), undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/deposit-collateral", Object.assign(Object.assign({}, inputs), { collateralCoinType: this.accountCap.collateralCoinType, accountCapId: this.accountCap.objectId }));
         });
     }
     getWithdrawCollateralTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { withdrawAmount, recipientAddress, tx: txFromInputs } = inputs;
-            // TODO: add vault support
-            if (this.vaultId)
-                throw new Error("this function is not supported for vaults");
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/withdraw-collateral", Object.assign(Object.assign({ withdrawAmount,
-                recipientAddress, walletAddress: this.ownerAddress(), collateralCoinType: this.accountCap.collateralCoinType }, ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({
-                    tx: txFromInputs !== null && txFromInputs !== void 0 ? txFromInputs : new transactions_1.Transaction(),
-                })) }), undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/withdraw-collateral", Object.assign(Object.assign({}, inputs), { collateralCoinType: this.accountCap.collateralCoinType, accountCapId: this.accountCap.objectId }));
         });
     }
     getAllocateCollateralTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx, allocateAmount, marketId } = inputs;
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/allocate-collateral", Object.assign(Object.assign({ marketId,
-                allocateAmount }, ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { walletAddress: this.ownerAddress(), txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx: tx !== null && tx !== void 0 ? tx : new transactions_1.Transaction() })) }), undefined, {
-                txKind: true,
-            });
+            const { market } = inputs;
+            return this.fetchApiTransaction("transactions/allocate-collateral", Object.assign(Object.assign({}, inputs), { packageId: market.marketData.packageId, marketInitialSharedVersion: market.marketData.initialSharedVersion, marketId: market.marketId, collateralCoinType: this.accountCap.collateralCoinType, accountCapId: this.accountCap.objectId }));
         });
     }
     getDeallocateCollateralTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx, deallocateAmount, marketId } = inputs;
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/deallocate-collateral", Object.assign(Object.assign({ marketId,
-                deallocateAmount }, ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { walletAddress: this.ownerAddress(), txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx: tx !== null && tx !== void 0 ? tx : new transactions_1.Transaction() })) }), undefined, {
-                txKind: true,
-            });
+            const { market } = inputs;
+            return this.fetchApiTransaction("transactions/deallocate-collateral", Object.assign(Object.assign({}, inputs), { packageId: market.marketData.packageId, marketInitialSharedVersion: market.marketData.initialSharedVersion, marketId: market.marketId, basePriceFeedId: market.marketParams.basePriceFeedId, collateralPriceFeedId: market.marketParams.collateralPriceFeedId, collateralCoinType: this.accountCap.collateralCoinType, accountCapId: this.accountCap.objectId }));
         });
     }
     getTransferCollateralTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { transferAmount, toAccountId, tx } = inputs;
-            if ("vaultId" in this.accountCap)
-                throw new Error("`getTransferCollateralTx` not supported by vault accounts");
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/transfer-collateral", {
-                transferAmount,
-                toAccountId,
-                walletAddress: this.ownerAddress(),
-                collateralCoinType: this.accountCap.collateralCoinType,
-                fromAccountId: this.accountCap.accountId,
-                txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx: tx !== null && tx !== void 0 ? tx : new transactions_1.Transaction() })),
-            }, undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/transfer-collateral", Object.assign(Object.assign({}, inputs), { collateralCoinType: this.accountCap.collateralCoinType, fromAccountCapId: this.accountCap.objectId }));
         });
     }
     // =========================================================================
@@ -343,167 +285,33 @@ class PerpetualsAccount extends caller_1.Caller {
     // =========================================================================
     getPlaceMarketOrderTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx: txFromInputs, slTp } = inputs, otherInputs = __rest(inputs, ["tx", "slTp"]);
-            const tx = txFromInputs !== null && txFromInputs !== void 0 ? txFromInputs : new transactions_1.Transaction();
-            // tx.setSender(this.ownerAddress());
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/place-market-order", Object.assign(Object.assign(Object.assign(Object.assign({}, otherInputs), { slTp: slTp
-                    ? Object.assign({ walletAddress: this.ownerAddress() }, slTp) : undefined, txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { hasPosition: this.positionForMarketId(otherInputs) !== undefined }), undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/market-order", Object.assign(Object.assign({}, inputs), { accountObjectId: this.accountCap.objectId, accountObjectVersion: this.accountCap.objectVersion, accountObjectDigest: this.accountCap.objectDigest, hasPosition: this.positionForMarketId(inputs) !== undefined }));
         });
     }
     getPlaceLimitOrderTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx: txFromInputs, slTp } = inputs, otherInputs = __rest(inputs, ["tx", "slTp"]);
-            const tx = txFromInputs !== null && txFromInputs !== void 0 ? txFromInputs : new transactions_1.Transaction();
-            // tx.setSender(this.ownerAddress());
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/place-limit-order", Object.assign(Object.assign(Object.assign(Object.assign({}, otherInputs), { slTp: slTp
-                    ? Object.assign({ walletAddress: this.ownerAddress() }, slTp) : undefined, txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { hasPosition: this.positionForMarketId(otherInputs) !== undefined }), undefined, {
-                txKind: true,
-            });
-        });
-    }
-    getCancelOrdersTx(inputs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx } = inputs, otherInputs = __rest(inputs, ["tx"]);
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/cancel-orders", Object.assign(Object.assign(Object.assign({}, otherInputs), { txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/limit-order", Object.assign(Object.assign({}, inputs), { accountObjectId: this.accountCap.objectId, accountObjectVersion: this.accountCap.objectVersion, accountObjectDigest: this.accountCap.objectDigest, hasPosition: this.positionForMarketId(inputs) !== undefined }));
         });
     }
-    getCancelStopOrdersTx(inputs) {
+    getPlaceSLTPOrder(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx } = inputs, otherInputs = __rest(inputs, ["tx"]);
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/cancel-stop-orders", Object.assign(Object.assign(Object.assign({}, otherInputs), { txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/sltp-order", Object.assign(Object.assign({}, inputs), { accountObjectId: this.accountCap.objectId, accountObjectVersion: this.accountCap.objectVersion, accountObjectDigest: this.accountCap.objectDigest }));
         });
     }
-    getPlaceStopOrdersTx(inputs) {
+    getCancelOrderTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx: txFromInputs, isSponsoredTx, stopOrders, gasCoinArg, } = inputs;
-            const tx = txFromInputs !== null && txFromInputs !== void 0 ? txFromInputs : new transactions_1.Transaction();
-            // tx.setSender(this.ownerAddress());
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/place-stop-orders", Object.assign({ stopOrders,
-                gasCoinArg,
-                isSponsoredTx, txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }, ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), undefined, {
-                txKind: true,
-            });
-        });
-    }
-    getPlaceSlTpOrdersTx(inputs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx: txFromInputs, isSponsoredTx, marketId } = inputs, slTpInputs = __rest(inputs, ["tx", "isSponsoredTx", "marketId"]);
-            const position = this.positionForMarketId({ marketId });
-            if (!position)
-                throw new Error("you have no position for this market");
-            const tx = txFromInputs !== null && txFromInputs !== void 0 ? txFromInputs : new transactions_1.Transaction();
-            // tx.setSender(this.ownerAddress());
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/place-sl-tp-orders", Object.assign(Object.assign(Object.assign(Object.assign({}, slTpInputs), { marketId, txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { positionSide: perpetuals_1.Perpetuals.positionSide({
-                    baseAssetAmount: position.baseAssetAmount,
-                }) }), undefined, {
-                txKind: true,
-            });
-        });
-    }
-    getEditStopOrdersTx(inputs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx: txFromInputs, stopOrders } = inputs;
-            const tx = txFromInputs !== null && txFromInputs !== void 0 ? txFromInputs : new transactions_1.Transaction();
-            // tx.setSender(this.ownerAddress());
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/edit-stop-orders", Object.assign({ stopOrders, txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }, ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/cancel-order", Object.assign(Object.assign({}, inputs), { collateralCoinType: this.accountCap.collateralCoinType, accountCapId: this.accountCap.objectId }));
         });
     }
-    getReduceOrderTx(inputs) {
+    getCancelOrdersTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { tx } = inputs, otherInputs = __rest(inputs, ["tx"]);
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/reduce-order", Object.assign(Object.assign(Object.assign({}, otherInputs), { txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), undefined, {
-                txKind: true,
-            });
+            return this.fetchApiTransaction("transactions/cancel-orders", Object.assign(Object.assign({}, inputs), { collateralCoinType: this.accountCap.collateralCoinType, accountCapId: this.accountCap.objectId }));
         });
     }
-    getSetLeverageTx(inputs) {
+    getReduceOrdersTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const { leverage, tx, collateralChange, marketId } = inputs;
-            return this.fetchApiTxObject(`${this.vaultId ? "vault" : "account"}/` +
-                "transactions/set-leverage", Object.assign({ leverage,
-                marketId,
-                collateralChange, txKind: yield ((_a = this.Provider) === null || _a === void 0 ? void 0 : _a.Transactions().fetchBase64TxKindFromTx({ tx })), walletAddress: this.ownerAddress() }, ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), undefined, {
-                txKind: true,
-            });
+            const { market, orderDatas } = inputs;
+            return this.fetchApiTransaction("transactions/reduce-orders", Object.assign(Object.assign({}, inputs), { orderIds: orderDatas.map((order) => order.orderId), sizesToSubtract: orderDatas.map((order) => order.sizeToSubtract), packageId: market.marketData.packageId, marketInitialSharedVersion: market.marketData.initialSharedVersion, marketId: market.marketId, basePriceFeedId: market.marketParams.basePriceFeedId, collateralPriceFeedId: market.marketParams.collateralPriceFeedId, collateralCoinType: this.accountCap.collateralCoinType, accountCapId: this.accountCap.objectId }));
         });
     }
     // =========================================================================
@@ -511,117 +319,77 @@ class PerpetualsAccount extends caller_1.Caller {
     // =========================================================================
     getClosePositionTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.getPlaceMarketOrderTx(Object.assign({}, this.closePositionTxInputs(inputs)));
+            return this.getPlaceMarketOrderTx(this.closePositionTxInputs(inputs));
         });
     }
     // =========================================================================
-    //  Interactions
+    //  Inspections
     // =========================================================================
-    getStopOrdersMessageToSign(inputs) {
-        var _a;
-        return {
-            action: "GET_STOP_ORDERS",
-            account_id: this.accountCap.accountId
-                .toString()
-                .replaceAll("n", ""),
-            clearing_house_ids: (_a = inputs === null || inputs === void 0 ? void 0 : inputs.marketIds) !== null && _a !== void 0 ? _a : [],
-        };
+    setPositionLeverage(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/set-position-leverage`, inputs);
+        });
     }
-    // public async getPlaceOrderPreview(
-    // 	inputs: SdkPerpetualsPlaceOrderPreviewInputs,
-    // 	abortSignal?: AbortSignal
-    // ): Promise<
-    // 	| {
-    // 			error: string;
-    // 	  }
-    // 	| {
-    // 			positionAfterOrder: PerpetualsPosition;
-    // 			priceSlippage: number;
-    // 			percentSlippage: Percentage;
-    // 			filledSize: number;
-    // 			filledSizeUsd: number;
-    // 			postedSize: number;
-    // 			postedSizeUsd: number;
-    // 			collateralChange: number;
-    // 			executionPrice: number;
-    // 	  }
+    // public async getAllPositionLeverages(): Promise<
+    // 	{
+    // 		marketId: PerpetualsMarketId;
+    // 		leverage: number;
+    // 	}[]
     // > {
-    // 	return this.fetchApi<
-    // 		ApiPerpetualsPreviewOrderResponse,
-    // 		ApiPerpetualsPreviewOrderBody
-    // 	>(
-    // 		`${this.vaultId ? "vault" : "account"}/` +"previews/place-order",
-    // 		{
-    // 			...inputs,
-    // 			accountId: this.accountCap.accountId,
-    // 			collateralCoinType: this.accountCap.collateralCoinType,
-    // 		},
-    // 		abortSignal
+    // 	return this.fetchApi(
+    // 		`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/position-leverages`
     // 	);
     // }
-    getPlaceMarketOrderPreview(inputs, abortSignal) {
+    getPositionLeverages(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` +
-                "previews/place-market-order", Object.assign(Object.assign(Object.assign({}, inputs), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/position-leverages/${JSON.stringify(inputs.marketIds)}`);
         });
     }
-    getPlaceLimitOrderPreview(inputs, abortSignal) {
+    setPositionLeverageMessageToSign(inputs) {
+        return {
+            account_id: Number(this.accountCap.accountId),
+            market_id: inputs.marketId,
+            leverage: inputs.leverage,
+        };
+    }
+    getOrderPreview(inputs, abortSignal) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` +
-                "previews/place-limit-order", Object.assign(Object.assign(Object.assign({}, inputs), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+            const response = yield this.fetchApi("preview-order", Object.assign(Object.assign({}, inputs), { accountId: this.accountCap.accountId, collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+            if ("error" in response)
+                return response;
+            const { collateralChange } = response, remainingResponse = __rest(response, ["collateralChange"]);
+            return Object.assign(Object.assign({}, remainingResponse), { collateralChange: __1.Coin.normalizeBalance(collateralChange, this.collateralDecimals()) });
         });
     }
-    getCancelOrdersPreview(inputs, abortSignal) {
+    getCancelOrdersPreview(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
             // NOTE: should this case return an error instead ?
             if (Object.keys(inputs.marketIdsToData).length <= 0)
                 return {
-                    collateralChange: 0,
+                    collateralChange: BigInt(0),
                     marketIdsToPositionAfterCancelOrders: {},
                 };
-            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` + "previews/cancel-orders", Object.assign(Object.assign(Object.assign({}, inputs), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
-        });
-    }
-    getReduceOrderPreview(inputs, abortSignal) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` + "previews/reduce-order", Object.assign(Object.assign(Object.assign({}, inputs), ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+            const response = yield this.fetchApi("preview-cancel-orders", Object.assign(Object.assign({}, inputs), { accountId: this.accountCap.accountId, collateralCoinType: this.accountCap.collateralCoinType }));
+            if ("error" in response)
+                return response;
+            return {
+                marketIdsToPositionAfterCancelOrders: response.marketIdsToPositionAfterCancelOrders,
+                collateralChange: __1.Coin.normalizeBalance(response.collateralChange, this.collateralDecimals()),
+            };
         });
     }
-    getSetLeveragePreview(inputs, abortSignal) {
+    getReduceOrdersPreview(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { marketId, leverage } = inputs;
-            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` + "previews/set-leverage", Object.assign(Object.assign({ marketId,
-                leverage }, ("vaultId" in this.accountCap
-                ? {
-                    vaultId: this.accountCap.vaultId,
-                }
-                : {
-                    accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+            // NOTE: should this case not throw an error instead ?
+            if (Object.keys(inputs.orderDatas).length <= 0)
+                throw new Error("no orderDatas provided");
+            const response = yield this.fetchApi("preview-reduce-orders", Object.assign(Object.assign({}, inputs), { orderIds: inputs.orderDatas.map((order) => order.orderId), sizesToSubtract: inputs.orderDatas.map((order) => order.sizeToSubtract), accountId: this.accountCap.accountId, collateralCoinType: this.accountCap.collateralCoinType }));
+            if ("error" in response)
+                return response;
+            return {
+                positionAfterReduceOrders: response.positionAfterReduceOrders,
+                collateralChange: __1.Coin.normalizeBalance(response.collateralChange, this.collateralDecimals()),
+            };
         });
     }
     getOrderDatas() {
@@ -635,40 +403,19 @@ class PerpetualsAccount extends caller_1.Caller {
             ], []);
             if (orderDatas.length <= 0)
                 return [];
-            return this.fetchApi("account/order-datas", {
-                accountId: this.accountCap.accountId,
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/order-datas`, {
                 orderDatas,
             });
         });
     }
-    getStopOrderDatas(inputs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { bytes, signature, marketIds } = inputs;
-            return this.fetchApi("account/stop-order-datas", {
-                bytes,
-                signature,
-                accountId: this.accountCap.accountId,
-                walletAddress: this.ownerAddress(),
-                marketIds: marketIds !== null && marketIds !== void 0 ? marketIds : [],
-            });
-        });
-    }
     getCollateralHistory(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi("account/collateral-history", Object.assign(Object.assign({}, inputs), { accountId: this.accountCap.accountId, collateralCoinType: this.accountCap.collateralCoinType }));
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/collateral-history`, inputs);
         });
     }
     getOrderHistory(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi("account/trade-history", Object.assign(Object.assign({}, inputs), { accountId: this.accountCap.accountId }));
-        });
-    }
-    getMarginHistory() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi("account/margin-history", {
-                accountId: this.accountCap.accountId,
-                collateralCoinType: this.accountCap.collateralCoinType,
-            });
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/order-history`, inputs);
         });
     }
     // =========================================================================
@@ -682,74 +429,8 @@ class PerpetualsAccount extends caller_1.Caller {
             return undefined;
         }
     }
-    nonSlTpStopOrderDatas(inputs) {
-        const { stopOrderDatas } = inputs;
-        const slTpOrders = this.slTpStopOrderDatas(inputs);
-        const stopOrders = stopOrderDatas.filter((stopOrder) => !(slTpOrders !== null && slTpOrders !== void 0 ? slTpOrders : [])
-            .map((slTpOrder) => JSON.stringify(slTpOrder))
-            .includes(JSON.stringify(stopOrder)));
-        return stopOrders.length <= 0 ? undefined : stopOrders;
-    }
-    slTpStopOrderDatas(inputs) {
-        const { stopOrderDatas } = inputs;
-        let slTpOrders = [];
-        for (const { marketId } of this.account.positions) {
-            const { fullSlTpOrder, partialSlTpOrders } = this.slTpStopOrderDatasForMarketId({
-                marketId,
-                stopOrderDatas,
-            });
-            slTpOrders = [
-                ...slTpOrders,
-                ...(fullSlTpOrder ? [fullSlTpOrder] : []),
-                ...(partialSlTpOrders !== null && partialSlTpOrders !== void 0 ? partialSlTpOrders : []),
-            ];
-        }
-        return slTpOrders.length <= 0 ? undefined : slTpOrders;
-    }
-    nonSlTpStopOrderDatasForMarketId(inputs) {
-        const { marketId, stopOrderDatas } = inputs;
-        const position = this.positionForMarketId({ marketId });
-        if (!position)
-            return undefined;
-        const { fullSlTpOrder, partialSlTpOrders } = this.slTpStopOrderDatasForMarketId(inputs);
-        const stopOrders = stopOrderDatas.filter((stopOrder) => ![
-            ...(fullSlTpOrder ? [fullSlTpOrder] : []),
-            ...(partialSlTpOrders !== null && partialSlTpOrders !== void 0 ? partialSlTpOrders : []),
-        ]
-            .map((slTpOrder) => JSON.stringify(slTpOrder))
-            .includes(JSON.stringify(stopOrder)));
-        return stopOrders.length <= 0 ? undefined : stopOrders;
-    }
-    slTpStopOrderDatasForMarketId(inputs) {
-        const { marketId, stopOrderDatas } = inputs;
-        const position = this.positionForMarketId({ marketId });
-        if (!position || position.baseAssetAmount === 0) {
-            return {
-                fullSlTpOrder: undefined,
-                partialSlTpOrders: undefined,
-            };
-        }
-        const side = !position ? undefined : perpetuals_1.Perpetuals.positionSide(position);
-        // TODO: clean this up
-        const fullSlTpOrder = stopOrderDatas.find((order) => order.marketId === marketId &&
-            order.slTp &&
-            order.side !== side &&
-            (order.slTp.stopLossIndexPrice ||
-                order.slTp.takeProfitIndexPrice) &&
-            order.size >= utils_1.Casting.i64MaxBigInt);
-        const partialSlTpOrders = stopOrderDatas.filter((order) => order.marketId === marketId &&
-            order.slTp &&
-            order.side !== side &&
-            (order.slTp.stopLossIndexPrice ||
-                order.slTp.takeProfitIndexPrice) &&
-            order.size < utils_1.Casting.i64MaxBigInt);
-        return {
-            fullSlTpOrder,
-            partialSlTpOrders: partialSlTpOrders.length <= 0 ? undefined : partialSlTpOrders,
-        };
-    }
     collateral() {
-        return this.account.availableCollateral;
+        return utils_1.Casting.IFixed.numberFromIFixed(this.accountCap.collateral);
     }
     collateralDecimals() {
         return this.accountCap.collateralDecimals;
@@ -757,27 +438,6 @@ class PerpetualsAccount extends caller_1.Caller {
     collateralBalance() {
         return __1.Coin.normalizeBalance(this.collateral(), this.collateralDecimals());
     }
-    isVault() {
-        return this.isVault !== undefined;
-    }
-    ownerAddress() {
-        return "walletAddress" in this.accountCap
-            ? // TODO: change to ownerAddress ?
-                this.accountCap.walletAddress
-            : this.accountCap.ownerAddress;
-    }
-    accountObjectId() {
-        return this.accountCap.accountObjectId;
-    }
-    accountId() {
-        return this.accountCap.accountId;
-    }
-    // TODO: make this work with vaults
-    accountCapId() {
-        if ("vaultId" in this.accountCap)
-            throw new Error("not account cap id present on vault owned account");
-        return this.accountCap.objectId;
-    }
 }
 exports.PerpetualsAccount = PerpetualsAccount;
 // =========================================================================