aftermath-ts-sdk 1.3.23-perps.22 → 1.3.23-perps.24

package/dist/packages/perpetuals/perpetualsAccount.js

@@ -22,7 +22,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PerpetualsAccount = void 0;
 const caller_1 = require("../../general/utils/caller");
-const types_1 = require("../../types");
 const utils_1 = require("../../general/utils");
 const perpetuals_1 = require("./perpetuals");
 const __1 = require("..");
@@ -38,203 +37,6 @@ class PerpetualsAccount extends caller_1.Caller {
         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 funding = this.calcUnrealizedFundingsForPosition(inputs);
-            const { pnl, minInitialMargin } = this.calcPnLAndMarginForPosition(inputs);
-            let collateralUsd = position.collateral * inputs.collateralPrice;
-            collateralUsd += funding;
-            let cappedMargin;
-            if (pnl < 0) {
-                cappedMargin = collateralUsd + pnl;
-            }
-            else {
-                cappedMargin = collateralUsd;
-            }
-            if (cappedMargin >= minInitialMargin) {
-                return (cappedMargin - minInitialMargin) / inputs.collateralPrice;
-            }
-            else
-                return 0;
-        };
-        this.calcMarginRatioAndLeverageForPosition = (inputs) => {
-            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 funding = this.calcUnrealizedFundingsForPosition({
-                market,
-                position,
-            });
-            const collateralUsd = (position === null || position === void 0 ? void 0 : position.collateral) * collateralPrice + funding;
-            const { pnl, netAbsBaseValue } = this.calcPnLAndMarginForPosition({
-                market,
-                indexPrice,
-                position,
-            });
-            const marginRatio = netAbsBaseValue === 0 ? 0 : (collateralUsd + pnl) / netAbsBaseValue;
-            const leverage = marginRatio === 0 ? 0 : 1 / marginRatio;
-            return {
-                marginRatio,
-                leverage,
-            };
-        };
-        this.calcUnrealizedFundings = (inputs) => {
-            let totalFunding = 0;
-            inputs.markets.forEach((market) => {
-                totalFunding += this.calcUnrealizedFundingsForPosition({
-                    market,
-                });
-            });
-            return totalFunding;
-        };
-        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 isLong = Math.sign(baseAmount);
-            if (isLong < 0) {
-                const fundingShort = position.cumFundingRateShort;
-                const marketFundingShort = inputs.market.marketState.cumFundingRateShort;
-                return -baseAmount * (marketFundingShort - fundingShort);
-            }
-            else {
-                const fundingLong = position.cumFundingRateLong;
-                const marketFundingLong = 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 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 pnl = baseAssetAmount * inputs.indexPrice - quoteAssetAmount;
-            const netAbs = Math.max(Math.abs(baseAssetAmount + bidsQuantity), Math.abs(baseAssetAmount - asksQuantity));
-            const netAbsBaseValue = netAbs * inputs.indexPrice;
-            const minInitialMargin = netAbsBaseValue * marginRatioInitial;
-            const minMaintenanceMargin = netAbsBaseValue * marginRatioMaintenance;
-            return { pnl, minInitialMargin, minMaintenanceMargin, netAbsBaseValue };
-        };
-        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 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;
-        };
-        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 totalFunding = this.calcUnrealizedFundingsForPosition(inputs);
-            const { pnl, minInitialMargin } = this.calcPnLAndMarginForPosition(inputs);
-            let collateralUsd = position.collateral * inputs.collateralPrice;
-            const margin = collateralUsd + totalFunding + pnl;
-            if (margin >= minInitialMargin) {
-                return margin - minInitialMargin;
-            }
-            else
-                return 0;
-        };
-        this.calcAccountState = (inputs) => {
-            const zipped = utils_1.Helpers.zip(inputs.markets, inputs.indexPrices);
-            let accountEquity = 0;
-            let totalPnL = 0;
-            let totalFunding = 0;
-            let totalCollateralAllocated = 0;
-            zipped.forEach(([market, indexPrice]) => {
-                var _a;
-                const marketId = market.marketId;
-                const position = (_a = this.positionForMarketId({ marketId })) !== null && _a !== void 0 ? _a : market.emptyPosition();
-                const funding = this.calcUnrealizedFundingsForPosition({
-                    market,
-                    position,
-                });
-                const { pnl } = this.calcPnLAndMarginForPosition({
-                    market,
-                    indexPrice,
-                    position,
-                });
-                let collateralUsd = position.collateral * inputs.collateralPrice;
-                totalPnL += pnl;
-                totalFunding += funding;
-                totalCollateralAllocated += collateralUsd;
-                accountEquity += collateralUsd + funding + pnl;
-            });
-            return {
-                accountEquity,
-                totalPnL,
-                totalFunding,
-                totalCollateralAllocated,
-            };
-        };
-        this.closePositionTxInputs = (inputs) => {
-            var _a;
-            const { size, market, orderDatas, collateralPrice } = inputs;
-            const marketId = market.marketId;
-            const position = (_a = this.positionForMarketId({ marketId })) !== null && _a !== void 0 ? _a : market.emptyPosition();
-            // TODO: move conversion to helper function, since used often
-            const ordersCollateral = utils_1.Helpers.sum(orderDatas
-                .filter((orderData) => orderData.marketId === market.marketId)
-                .map((orderData) => market.calcCollateralUsedForOrder(Object.assign(Object.assign({}, inputs), { orderData, leverage: position.leverage })).collateral));
-            const fullPositionCollateralChange = Math.max(this.calcFreeMarginUsdForPosition(inputs) / collateralPrice -
-                ordersCollateral *
-                    (1 -
-                        PerpetualsAccount.constants
-                            .closePositionMarginOfError), 0) * -1;
-            // NOTE: is this safe / correct ?
-            const collateralChange = Number(fullPositionCollateralChange) *
-                (Number(size) /
-                    utils_1.Casting.Fixed.fixedOneN9 /
-                    position.baseAssetAmount);
-            const positionSide = perpetuals_1.Perpetuals.positionSide(position);
-            return {
-                size,
-                marketId,
-                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,
-            };
-        };
         this.vaultId = vaultId;
     }
     // =========================================================================
@@ -473,22 +275,41 @@ class PerpetualsAccount extends caller_1.Caller {
             });
         });
     }
-    getReduceOrderTx(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,
-            });
-        });
-    }
+    // public async getReduceOrderTx(inputs: {
+    // 	tx?: Transaction;
+    // 	collateralChange: number;
+    // 	marketId: PerpetualsMarketId;
+    // 	orderId: PerpetualsOrderId;
+    // 	sizeToSubtract: bigint;
+    // 	leverage?: number;
+    // }) {
+    // 	const { tx, ...otherInputs } = inputs;
+    // 	return this.fetchApiTxObject<
+    // 		ApiPerpetualsReduceOrderBody,
+    // 		ApiTransactionResponse
+    // 	>(
+    // 		`${this.vaultId ? "vault" : "account"}/` +
+    // 			"transactions/reduce-order",
+    // 		{
+    // 			...otherInputs,
+    // 			txKind: await this.Provider?.Transactions().fetchBase64TxKindFromTx(
+    // 				{ tx }
+    // 			),
+    // 			walletAddress: this.ownerAddress(),
+    // 			...("vaultId" in this.accountCap
+    // 				? {
+    // 						vaultId: this.accountCap.vaultId,
+    // 				  }
+    // 				: {
+    // 						accountId: this.accountCap.accountId,
+    // 				  }),
+    // 		},
+    // 		undefined,
+    // 		{
+    // 			txKind: true,
+    // 		}
+    // 	);
+    // }
     getSetLeverageTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -510,11 +331,18 @@ class PerpetualsAccount extends caller_1.Caller {
     // =========================================================================
     //  Position Txs
     // =========================================================================
-    getClosePositionTx(inputs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getPlaceMarketOrderTx(Object.assign({}, this.closePositionTxInputs(inputs)));
-        });
-    }
+    // public async getClosePositionTx(inputs: {
+    // 	size: bigint;
+    // 	market: PerpetualsMarket;
+    // 	orderDatas: PerpetualsOrderData[];
+    // 	indexPrice: number;
+    // 	collateralPrice: number;
+    // }) {
+    // 	throw new Error("TODO");
+    // 	// return this.getPlaceMarketOrderTx({
+    // 	// 	...this.closePositionTxInputs(inputs),
+    // 	// });
+    // }
     // =========================================================================
     //  Interactions
     // =========================================================================
@@ -563,25 +391,25 @@ class PerpetualsAccount extends caller_1.Caller {
     getPlaceMarketOrderPreview(inputs, abortSignal) {
         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
+                "previews/place-market-order", Object.assign(Object.assign({}, inputs), ("vaultId" in this.accountCap
                 ? {
                     vaultId: this.accountCap.vaultId,
                 }
                 : {
                     accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+                })), abortSignal);
         });
     }
     getPlaceLimitOrderPreview(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
+                "previews/place-limit-order", Object.assign(Object.assign({}, inputs), ("vaultId" in this.accountCap
                 ? {
                     vaultId: this.accountCap.vaultId,
                 }
                 : {
                     accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+                })), abortSignal);
         });
     }
     getCancelOrdersPreview(inputs, abortSignal) {
@@ -592,39 +420,99 @@ class PerpetualsAccount extends caller_1.Caller {
                     collateralChange: 0,
                     marketIdsToPositionAfterCancelOrders: {},
                 };
-            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` + "previews/cancel-orders", Object.assign(Object.assign(Object.assign({}, inputs), ("vaultId" in this.accountCap
+            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` + "previews/cancel-orders", 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);
+                })), abortSignal);
         });
     }
+    // public async getReduceOrderPreview(
+    // 	inputs: {
+    // 		marketId: PerpetualsMarketId;
+    // 		orderId: PerpetualsOrderId;
+    // 		sizeToSubtract: bigint;
+    // 		leverage?: number;
+    // 	},
+    // 	abortSignal?: AbortSignal
+    // ): Promise<
+    // 	| {
+    // 			positionAfterReduceOrder: PerpetualsPosition;
+    // 			collateralChange: number;
+    // 	  }
+    // 	| {
+    // 			error: string;
+    // 	  }
+    // > {
+    // 	return this.fetchApi<
+    // 		ApiPerpetualsPreviewReduceOrderResponse,
+    // 		ApiPerpetualsPreviewReduceOrderBody
+    // 	>(
+    // 		`${this.vaultId ? "vault" : "account"}/` + "previews/reduce-order",
+    // 		{
+    // 			...inputs,
+    // 			...("vaultId" in this.accountCap
+    // 				? {
+    // 						vaultId: this.accountCap.vaultId,
+    // 				  }
+    // 				: {
+    // 						accountId: this.accountCap.accountId,
+    // 				  }),
+    // 		},
+    // 		abortSignal
+    // 	);
+    // }
     getSetLeveragePreview(inputs, abortSignal) {
         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,
+            return this.fetchApi(`${this.vaultId ? "vault" : "account"}/` + "previews/set-leverage", Object.assign({ marketId,
                 leverage }, ("vaultId" in this.accountCap
                 ? {
                     vaultId: this.accountCap.vaultId,
                 }
                 : {
                     accountId: this.accountCap.accountId,
-                })), { collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
+                })), abortSignal);
         });
     }
+    // public getPlaceClosePositionOrderPreview = async (
+    // 	inputs: {
+    // 		size: bigint;
+    // 		marketId: PerpetualsMarketId;
+    // 		leverage?: number;
+    // 	} & (
+    // 		| {
+    // 				accountId: PerpetualsAccountId;
+    // 		  }
+    // 		| {
+    // 				vaultId: ObjectId;
+    // 		  }
+    // 	),
+    // 	abortSignal?: AbortSignal
+    // ): Promise<ReturnType<PerpetualsAccount["getPlaceMarketOrderPreview"]>> => {
+    // 	// TODO: make this fetch instead ?
+    // 	const position = this.positionForMarketId({
+    // 		marketId: inputs.marketId,
+    // 	});
+    // 	if (!position)
+    // 		throw new Error(
+    // 			`Account has no position for market id: ${inputs.marketId}`
+    // 		);
+    // 	return this.getPlaceMarketOrderPreview(
+    // 		{
+    // 			...inputs,
+    // 			reduceOnly: true,
+    // 			side:
+    // 				Perpetuals.positionSide(position) ===
+    // 				PerpetualsOrderSide.Ask
+    // 					? PerpetualsOrderSide.Bid
+    // 					: PerpetualsOrderSide.Ask,
+    // 		},
+    // 		abortSignal
+    // 	);
+    // };
     getOrderDatas() {
         return __awaiter(this, void 0, void 0, function* () {
             const orderDatas = this.account.positions.reduce((acc, position) => [
@@ -672,6 +560,14 @@ class PerpetualsAccount extends caller_1.Caller {
             });
         });
     }
+    // public async getOwnedWithdrawRequests() {
+    // 	return new Perpetuals(
+    // 		this.config,
+    // 		this.Provider
+    // 	).getOwnedWithdrawRequests({
+    // 		walletAddress: this.ownerAddress(),
+    // 	});
+    // }
     // =========================================================================
     //  Helpers
     // =========================================================================

package/dist/packages/perpetuals/perpetualsMarket.d.ts

@@ -53,9 +53,7 @@ export declare class PerpetualsMarket extends Caller {
     }>;
     timeUntilNextFundingMs: () => Timestamp;
     nextFundingTimeMs: () => Timestamp;
-    estimatedFundingRate: (inputs: {
-        indexPrice: number;
-    }) => number;
+    estimatedFundingRate: () => Percentage;
     calcCollateralUsedForOrder: (inputs: {
         leverage: number;
         orderData: PerpetualsOrderData;

package/dist/packages/perpetuals/perpetualsMarket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"perpetualsMarket.d.ts","sourceRoot":"","sources":["../../../src/packages/perpetuals/perpetualsMarket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"perpetualsMarket.d.ts","sourceRoot":"","sources":["../../../src/packages/perpetuals/perpetualsMarket.ts"],"names":[],"mappings":"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"}

package/dist/packages/perpetuals/perpetualsMarket.js

@@ -40,22 +40,16 @@ class PerpetualsMarket extends caller_1.Caller {
             return this.nextFundingTimeMs() - Date.now();
         };
         this.nextFundingTimeMs = () => {
-            const fundingFrequencyMs = Number(this.marketParams.fundingFrequencyMs);
-            const lastFundingIntervalNumber = Math.floor(this.marketState.fundingLastUpdateTimestamp / fundingFrequencyMs);
-            return (lastFundingIntervalNumber + 1) * fundingFrequencyMs;
+            return this.marketData.nextFundingTimestampMs >
+                BigInt(Number.MAX_SAFE_INTEGER)
+                ? Number.MAX_SAFE_INTEGER
+                : Number(this.marketData.nextFundingTimestampMs);
         };
         // The funding rate as the difference between book and index TWAPs relative to the index price,
         // scaled by the funding period adjustment:
         // (bookTwap - indexTwap) / indexPrice * (fundingFrequency / fundingPeriod)
-        //
-        // To get the rate as a percentage, multiply the output by 100.
-        this.estimatedFundingRate = (inputs) => {
-            const { indexPrice } = inputs;
-            const premiumTwap = this.marketState.premiumTwap;
-            const relativePremium = premiumTwap / indexPrice;
-            const periodAdjustment = Number(this.marketParams.fundingFrequencyMs) /
-                Number(this.marketParams.fundingPeriodMs);
-            return relativePremium * periodAdjustment;
+        this.estimatedFundingRate = () => {
+            return this.marketData.estimatedFundingRate;
         };
         this.calcCollateralUsedForOrder = (inputs) => {
             const { leverage, orderData, indexPrice, collateralPrice } = inputs;
@@ -117,8 +111,9 @@ class PerpetualsMarket extends caller_1.Caller {
         this.emptyPosition = () => {
             return {
                 marketId: this.marketId,
-                collateralCoinType: this.marketData.collateralCoinType,
+                // collateralCoinType: this.marketData.collateralCoinType,
                 collateral: 0,
+                collateralUsd: 0,
                 baseAssetAmount: 0,
                 quoteAssetNotionalAmount: 0,
                 cumFundingRateLong: this.marketData.marketState.cumFundingRateLong,
@@ -129,6 +124,13 @@ class PerpetualsMarket extends caller_1.Caller {
                 makerFee: 1, // 100%
                 takerFee: 1, // 100%
                 leverage: 1,
+                entryPrice: 0,
+                freeCollateral: 0,
+                freeMarginUsd: 0,
+                liquidationPrice: 0,
+                marginRatio: 1,
+                unrealizedFundingsUsd: 0,
+                unrealizedPnlUsd: 0,
             };
         };
         this.marketId = marketData.objectId;
@@ -169,12 +171,12 @@ class PerpetualsMarket extends caller_1.Caller {
     }
     getPlaceMarketOrderPreview(inputs, abortSignal) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi("account/previews/place-market-order", Object.assign(Object.assign({}, inputs), { collateralCoinType: this.collateralCoinType, accountId: undefined }), abortSignal);
+            return this.fetchApi("account/previews/place-market-order", Object.assign(Object.assign({}, inputs), { accountId: undefined }), abortSignal);
         });
     }
     getPlaceLimitOrderPreview(inputs, abortSignal) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApi("account/previews/place-limit-order", Object.assign(Object.assign({}, inputs), { collateralCoinType: this.collateralCoinType, accountId: undefined }), abortSignal);
+            return this.fetchApi("account/previews/place-limit-order", Object.assign(Object.assign({}, inputs), { accountId: undefined }), abortSignal);
         });
     }
     // =========================================================================