aftermath-ts-sdk 1.3.23-cleanup → 1.3.23-perps.2

package/dist/packages/perpetuals/api/perpetualsApiCasting.js

@@ -1,92 +1,19 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PerpetualsApiCasting = void 0;
 const perpetualsTypes_1 = require("../perpetualsTypes");
 const utils_1 = require("../../../general/utils");
 const __1 = require("../..");
-const fixedUtils_1 = require("../../../general/utils/fixedUtils");
-const bcs_1 = require("@mysten/sui/bcs");
 // TODO: handle 0xs and leading 0s everywhere
 class PerpetualsApiCasting {
-    // =========================================================================
-    //  Objects
-    // =========================================================================
-    // =========================================================================
-    //  Account
-    // =========================================================================
-    static rawAccountCapFromRaw(data, collateralCoinType, version, digest) {
-        return {
-            collateralCoinType,
-            objectId: utils_1.Helpers.addLeadingZeroesToType(data.id),
-            objectType: data.objectType, // use Helpers.addLeadingZeroesToType ?
-            objectVersion: version,
-            objectDigest: digest,
-            accountId: BigInt(data.accountId),
-            collateral: BigInt(data.collateral.value),
-        };
-    }
-    // =========================================================================
-    //  Clearing House
-    // =========================================================================
-    static marketDataFromIndexerResponse(data, collateralCoinType, baseAssetSymbol) {
-        return {
-            packageId: utils_1.Casting.addressFromStringBytes(data.pkg_id),
-            objectId: utils_1.Casting.addressFromStringBytes(data.object.id.id),
-            initialSharedVersion: Number(data.initial_shared_version),
-            collateralCoinType,
-            marketParams: this.marketParamsFromIndexerResponse(data.object.market_params, baseAssetSymbol),
-            marketState: this.marketStateFromIndexerResponse(data.object.market_state),
-        };
-    }
-    // =========================================================================
-    //  Orderbook
-    // =========================================================================
-    static orderbookFromIndexerResponse(data, lotSize, tickSize) {
-        const partialOrderbook = {
-            asks: Object.entries(data.asks).reduce((acc, [orderId, order]) => (Object.assign(Object.assign({}, acc), { [orderId]: {
-                    accountId: BigInt(order.account_id),
-                    size: Number(order.size) *
-                        __1.Perpetuals.lotOrTickSizeToNumber(lotSize),
-                    price: __1.Perpetuals.orderPriceToPrice({
-                        orderPrice: __1.Perpetuals.OrderUtils.price(BigInt(orderId)),
-                        lotSize,
-                        tickSize,
-                    }),
-                } })), {}),
-            bids: Object.entries(data.bids).reduce((acc, [orderId, order]) => (Object.assign(Object.assign({}, acc), { [orderId]: {
-                    accountId: BigInt(order.account_id),
-                    size: Number(order.size) *
-                        __1.Perpetuals.lotOrTickSizeToNumber(lotSize),
-                    price: __1.Perpetuals.orderPriceToPrice({
-                        orderPrice: __1.Perpetuals.OrderUtils.price(BigInt(orderId)),
-                        lotSize,
-                        tickSize,
-                    }),
-                } })), {}),
-            asksTotalSize: Number(data.asks_size) *
-                __1.Perpetuals.lotOrTickSizeToNumber(lotSize),
-            bidsTotalSize: Number(data.bids_size) *
-                __1.Perpetuals.lotOrTickSizeToNumber(lotSize),
-        };
-        const bids = Object.values(partialOrderbook.bids);
-        const asks = Object.values(partialOrderbook.asks);
-        const bestBidPrice = bids.length <= 0
-            ? undefined
-            : Math.max(...bids.map((order) => order.price));
-        const bestAskPrice = asks.length <= 0
-            ? undefined
-            : Math.min(...asks.map((order) => order.price));
-        const midPrice = bestBidPrice === undefined || bestAskPrice === undefined
-            ? undefined
-            : (bestBidPrice + bestAskPrice) / 2;
-        return Object.assign(Object.assign({}, partialOrderbook), { bestBidPrice,
-            bestAskPrice,
-            midPrice });
-    }
 }
 exports.PerpetualsApiCasting = PerpetualsApiCasting;
-_a = PerpetualsApiCasting;
+// =========================================================================
+//  Objects
+// =========================================================================
+// =========================================================================
+//  Account
+// =========================================================================
 // public static partialPositionFromRaw = (
 // 	data: any
 // ): Omit<PerpetualsPosition, "collateralCoinType" | "marketId"> => {
@@ -103,95 +30,21 @@ _a = PerpetualsApiCasting;
 // 		takerFee: BigInt(data.takerFee),
 // 	};
 // };
-PerpetualsApiCasting.positionFromIndexerReponse = (inputs) => {
-    const { position, collateralCoinType, marketId, leverage } = inputs;
-    return {
-        collateralCoinType,
-        leverage,
-        collateral: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.collateral),
-        baseAssetAmount: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.base_asset_amount),
-        quoteAssetNotionalAmount: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.quote_asset_notional_amount),
-        cumFundingRateLong: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.cum_funding_rate_long),
-        cumFundingRateShort: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.cum_funding_rate_short),
-        asksQuantity: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.asks_quantity),
-        bidsQuantity: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.bids_quantity),
-        marketId: utils_1.Helpers.addLeadingZeroesToType(marketId),
-        // NOTE: do we want to store all pending order data here as well ?
-        pendingOrders: [
-            ...Object.entries(position.pending_orders.bids).map(([orderId, size]) => ({
-                size: BigInt(size),
-                orderId: BigInt(orderId),
-                side: perpetualsTypes_1.PerpetualsOrderSide.Bid,
-            })),
-            ...Object.entries(position.pending_orders.asks).map(([orderId, size]) => ({
-                size: BigInt(size),
-                orderId: BigInt(orderId),
-                side: perpetualsTypes_1.PerpetualsOrderSide.Ask,
-            })),
-        ],
-        makerFee: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.maker_fee),
-        takerFee: utils_1.Casting.IFixed.iFixedFromStringBytes(position.position.taker_fee),
-    };
-};
-PerpetualsApiCasting.accountObjectFromIndexerResponse = (response, collateralCoinType) => {
-    return {
-        positions: response.map(([marketIdAsStringBytes, position, leverageAsStringBytes]) => _a.positionFromIndexerReponse({
-            position,
-            collateralCoinType,
-            leverage: utils_1.Casting.IFixed.numberFromIFixed(utils_1.Casting.IFixed.iFixedFromStringBytes(leverageAsStringBytes)) || 1,
-            marketId: utils_1.Casting.addressFromStringBytes(marketIdAsStringBytes),
-        })),
-    };
-};
-PerpetualsApiCasting.marketParamsFromIndexerResponse = (data, baseAssetSymbol) => {
-    return {
-        baseAssetSymbol,
-        basePriceFeedId: utils_1.Casting.addressFromStringBytes(data.base_pfs_id),
-        collateralPriceFeedId: utils_1.Casting.addressFromStringBytes(data.collateral_pfs_id),
-        marginRatioInitial: utils_1.Casting.IFixed.iFixedFromStringBytes(data.margin_ratio_initial),
-        marginRatioMaintenance: utils_1.Casting.IFixed.iFixedFromStringBytes(data.margin_ratio_maintenance),
-        fundingFrequencyMs: BigInt(data.funding_frequency_ms),
-        fundingPeriodMs: BigInt(data.funding_period_ms),
-        premiumTwapFrequencyMs: BigInt(data.premium_twap_frequency_ms),
-        premiumTwapPeriodMs: BigInt(data.premium_twap_period_ms),
-        spreadTwapFrequencyMs: BigInt(data.spread_twap_frequency_ms),
-        spreadTwapPeriodMs: BigInt(data.spread_twap_period_ms),
-        makerFee: utils_1.Casting.IFixed.iFixedFromStringBytes(data.maker_fee),
-        takerFee: utils_1.Casting.IFixed.iFixedFromStringBytes(data.taker_fee),
-        liquidationFee: utils_1.Casting.IFixed.iFixedFromStringBytes(data.liquidation_fee),
-        forceCancelFee: utils_1.Casting.IFixed.iFixedFromStringBytes(data.force_cancel_fee),
-        insuranceFundFee: utils_1.Casting.IFixed.iFixedFromStringBytes(data.insurance_fund_fee),
-        lotSize: BigInt(data.lot_size),
-        tickSize: BigInt(data.tick_size),
-        liquidationTolerance: BigInt(data.liquidation_tolerance),
-        maxPendingOrders: BigInt(data.max_pending_orders),
-        minOrderUsdValue: utils_1.Casting.IFixed.iFixedFromStringBytes(data.min_order_usd_value),
-        oracleTolerance: BigInt(data.oracle_tolerance),
-    };
-};
-PerpetualsApiCasting.marketStateFromIndexerResponse = (data) => {
-    return {
-        cumFundingRateLong: utils_1.Casting.IFixed.iFixedFromStringBytes(data.cum_funding_rate_long),
-        cumFundingRateShort: utils_1.Casting.IFixed.iFixedFromStringBytes(data.cum_funding_rate_short),
-        fundingLastUpdateMs: Number(data.funding_last_upd_ms),
-        premiumTwap: utils_1.Casting.IFixed.iFixedFromStringBytes(data.premium_twap),
-        premiumTwapLastUpdateMs: Number(data.premium_twap_last_upd_ms),
-        spreadTwap: utils_1.Casting.IFixed.iFixedFromStringBytes(data.spread_twap),
-        spreadTwapLastUpdateMs: Number(data.spread_twap_last_upd_ms),
-        openInterest: utils_1.Casting.IFixed.iFixedFromStringBytes(data.open_interest),
-        feesAccrued: utils_1.Casting.IFixed.iFixedFromStringBytes(data.fees_accrued),
-    };
-};
-PerpetualsApiCasting.orderbookPriceFromBytes = (bytes) => {
-    const unwrapped = bcs_1.bcs.option(bcs_1.bcs.u256()).parse(new Uint8Array(bytes));
-    return fixedUtils_1.FixedUtils.directCast(unwrapped != null ? BigInt(unwrapped) : BigInt(0));
-};
-PerpetualsApiCasting.orderInfoFromRaw = (data) => {
-    return {
-        price: BigInt(data.price),
-        size: BigInt(data.size),
-    };
-};
+// =========================================================================
+//  Orderbook
+// =========================================================================
+// public static orderbookPriceFromBytes = (bytes: number[]): number => {
+// 	const unwrapped = bcs.option(bcs.u256()).parse(new Uint8Array(bytes));
+// 	return FixedUtils.directCast(
+// 		unwrapped != null ? BigInt(unwrapped) : BigInt(0)
+// 	);
+// };
+// public static orderInfoFromRaw = (data: any): PerpetualsOrderInfo => {
+// 	return {
+// 		price: BigInt(data.price),
+// 		size: BigInt(data.size),
+// 	};
+// };
 // =========================================================================
 //  Events
 // =========================================================================
@@ -203,7 +56,7 @@ PerpetualsApiCasting.UpdatedMarketVersionEventFromOnChain = (eventOnChain) => {
     return {
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
         version: BigInt(fields.version),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -216,7 +69,7 @@ PerpetualsApiCasting.withdrewCollateralEventFromOnChain = (eventOnChain) => {
     return {
         accountId: BigInt(fields.account_id),
         collateralDelta: BigInt(fields.collateral),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -226,7 +79,7 @@ PerpetualsApiCasting.depositedCollateralEventFromOnChain = (eventOnChain) => {
     return {
         accountId: BigInt(fields.account_id),
         collateralDelta: BigInt(fields.collateral),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -235,11 +88,11 @@ PerpetualsApiCasting.settledFundingEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         accountId: BigInt(fields.account_id),
-        collateralDeltaUsd: BigInt(fields.collateral_change_usd),
+        collateralDeltaUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.collateral_change_usd)),
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        marketFundingRateLong: BigInt(fields.mkt_funding_rate_long),
-        marketFundingRateShort: BigInt(fields.mkt_funding_rate_short),
-        timestamp: eventOnChain.timestampMs,
+        marketFundingRateLong: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.mkt_funding_rate_long)),
+        marketFundingRateShort: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.mkt_funding_rate_short)),
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -248,9 +101,9 @@ PerpetualsApiCasting.allocatedCollateralEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         accountId: BigInt(fields.account_id),
+        marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
         collateralDelta: BigInt(fields.collateral),
-        positionCollateralAfter: BigInt(fields.position_collateral_after),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -259,9 +112,9 @@ PerpetualsApiCasting.deallocatedCollateralEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         accountId: BigInt(fields.account_id),
+        marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
         collateralDelta: BigInt(fields.collateral),
-        positionCollateralAfter: BigInt(fields.position_collateral_after),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -273,15 +126,22 @@ PerpetualsApiCasting.liquidatedEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         accountId: BigInt(fields.liqee_account_id),
-        collateralDeltaUsd: BigInt(fields.liqee_collateral_change_usd),
+        collateralDeltaUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.liqee_pnl)) -
+            utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.liquidation_fees)) -
+            utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.force_cancel_fees)) -
+            utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.insurance_fund_fees)),
         liqorAccountId: BigInt(fields.liqor_account_id),
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        markPrice: BigInt(fields.mark_price),
-        size: BigInt(fields.size_liquidated),
+        baseLiquidated: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.base_liquidated)),
+        quoteLiquidated: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.quote_liquidated)),
+        liqeePnlUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.liqee_pnl)),
+        liquidationFeesUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.liquidation_fees)),
+        forceCancelFeesUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.force_cancel_fees)),
+        insuranceFundFeesUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.insurance_fund_fees)),
         side: fields.is_liqee_long
             ? perpetualsTypes_1.PerpetualsOrderSide.Bid
             : perpetualsTypes_1.PerpetualsOrderSide.Ask,
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -294,83 +154,111 @@ PerpetualsApiCasting.createdAccountEventFromOnChain = (eventOnChain) => {
     return {
         user: utils_1.Helpers.addLeadingZeroesToType(fields.user),
         accountId: BigInt(fields.account_id),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
 };
-// =========================================================================
-//  Order
-// =========================================================================
-PerpetualsApiCasting.canceledOrderEventFromOnChain = (eventOnChain) => {
+// public static createdSubAccountEventFromOnChain = (
+// 	eventOnChain: CreatedSubAccountEventOnChain
+// ): CreatedSubAccountEvent => {
+// 	const fields = eventOnChain.parsedJson;
+// 	return {
+// 		users: fields.users.map((user) =>
+// 			Helpers.addLeadingZeroesToType(user)
+// 		),
+// 		accountId: BigInt(fields.account_id),
+// 		subAccountId: Helpers.addLeadingZeroesToType(fields.subaccount_id),
+// 		timestamp: Number(eventOnChain.timestampMs),
+// 		txnDigest: eventOnChain.id.txDigest,
+// 		type: eventOnChain.type,
+// 	};
+// };
+// public static setSubAccountUsersEventFromOnChain = (
+// 	eventOnChain: SetSubAccountUsersEventOnChain
+// ): SetSubAccountUsersEvent => {
+// 	const fields = eventOnChain.parsedJson;
+// 	return {
+// 		users: fields.users.map((user) =>
+// 			Helpers.addLeadingZeroesToType(user)
+// 		),
+// 		accountId: BigInt(fields.account_id),
+// 		subAccountId: Helpers.addLeadingZeroesToType(fields.subaccount_id),
+// 		timestamp: Number(eventOnChain.timestampMs),
+// 		txnDigest: eventOnChain.id.txDigest,
+// 		type: eventOnChain.type,
+// 	};
+// };
+PerpetualsApiCasting.SetPositionInitialMarginRatioEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
-        accountId: BigInt(fields.account_id),
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        side: __1.Perpetuals.orderIdToSide(BigInt(fields.order_id)),
-        size: BigInt(fields.size),
-        orderId: BigInt(fields.order_id),
-        timestamp: eventOnChain.timestampMs,
+        accountId: BigInt(fields.account_id),
+        initialMarginRatio: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.initial_margin_ratio)),
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
 };
-PerpetualsApiCasting.postedOrderEventFromOnChain = (eventOnChain) => {
+// =========================================================================
+//  Order
+// =========================================================================
+PerpetualsApiCasting.canceledOrderEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         accountId: BigInt(fields.account_id),
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        side: BigInt(fields.posted_base_ask) > BigInt(fields.posted_base_bid)
-            ? perpetualsTypes_1.PerpetualsOrderSide.Ask
-            : perpetualsTypes_1.PerpetualsOrderSide.Bid,
-        size: BigInt(fields.posted_base_ask + fields.posted_base_bid),
-        asksQuantity: BigInt(fields.pending_asks),
-        bidsQuantity: BigInt(fields.pending_bids),
-        timestamp: eventOnChain.timestampMs,
+        side: __1.Perpetuals.orderIdToSide(BigInt(fields.order_id)),
+        size: BigInt(fields.size),
+        orderId: BigInt(fields.order_id),
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
 };
-PerpetualsApiCasting.filledMakerOrderEventFromOnChain = (eventOnChain) => {
-    const fields = eventOnChain.parsedJson;
+PerpetualsApiCasting.filledMakerOrdersEventFromOnChain = (eventOnChain) => {
     return {
-        baseAssetAmount: BigInt(fields.maker_base_amount),
-        accountId: BigInt(fields.maker_account_id),
-        collateralDeltaUsd: BigInt(fields.collateral_change_usd),
-        marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        orderId: BigInt(fields.order_id),
-        side: __1.Perpetuals.orderIdToSide(BigInt(fields.order_id)),
-        size: BigInt(fields.maker_size),
-        dropped: BigInt(fields.maker_final_size) === BigInt(0),
-        quoteAssetNotionalAmount: BigInt(fields.maker_quote_amount),
-        asksQuantity: BigInt(fields.maker_pending_asks_quantity),
-        bidsQuantity: BigInt(fields.maker_pending_bids_quantity),
-        timestamp: eventOnChain.timestampMs,
+        events: eventOnChain.parsedJson.events.map((fields) => ({
+            accountId: BigInt(fields.maker_account_id),
+            takerAccountId: BigInt(fields.taker_account_id),
+            collateralDeltaUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.pnl)) -
+                utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.fees)),
+            pnlUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.pnl)),
+            feesUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.fees)),
+            marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
+            orderId: BigInt(fields.order_id),
+            side: __1.Perpetuals.orderIdToSide(BigInt(fields.order_id)),
+            size: BigInt(fields.filled_size),
+            dropped: BigInt(fields.remaining_size) === BigInt(0),
+            sizeRemaining: BigInt(fields.remaining_size),
+            canceledSize: BigInt(fields.canceled_size),
+        })),
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
 };
 PerpetualsApiCasting.filledTakerOrderEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
-    const baseAssetDelta = utils_1.Casting.IFixed.iFixedFromNumber(utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.base_asset_delta_bid)) -
-        utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.base_asset_delta_ask)));
+    const baseAssetDelta = utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.base_asset_delta_bid)) -
+        utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.base_asset_delta_ask));
     return {
         baseAssetDelta,
         accountId: BigInt(fields.taker_account_id),
-        collateralDeltaUsd: BigInt(fields.collateral_change_usd),
+        collateralDeltaUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.taker_pnl)) -
+            utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.taker_fees)),
+        takerPnlUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.taker_pnl)),
+        takerFeesUsd: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.taker_fees)),
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        baseAssetAmount: BigInt(fields.taker_base_amount),
-        quoteAssetNotionalAmount: BigInt(fields.taker_quote_amount),
         side: __1.Perpetuals.positionSide({ baseAssetAmount: baseAssetDelta }),
-        quoteAssetDelta: utils_1.Casting.IFixed.iFixedFromNumber(utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.quote_asset_delta_bid)) -
-            utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.quote_asset_delta_ask))),
-        liquidatedVolume: BigInt(fields.liquidated_volume),
-        timestamp: eventOnChain.timestampMs,
+        quoteAssetDelta: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.quote_asset_delta_bid)) -
+            utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.quote_asset_delta_ask)),
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
 };
-PerpetualsApiCasting.postedOrderReceiptEventFromOnChain = (eventOnChain) => {
+PerpetualsApiCasting.postedOrderEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         accountId: BigInt(fields.account_id),
@@ -378,7 +266,11 @@ PerpetualsApiCasting.postedOrderReceiptEventFromOnChain = (eventOnChain) => {
         size: BigInt(fields.order_size),
         orderId: BigInt(fields.order_id),
         side: __1.Perpetuals.orderIdToSide(BigInt(fields.order_id)),
-        timestamp: eventOnChain.timestampMs,
+        reduceOnly: fields.reduce_only,
+        expiryTimestamp: !fields.expiration_timestamp_ms
+            ? undefined
+            : BigInt(fields.expiration_timestamp_ms),
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -390,11 +282,141 @@ PerpetualsApiCasting.reducedOrderEventFromOnChain = (eventOnChain) => {
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
         sizeChange: BigInt(fields.size_change),
         orderId: BigInt(fields.order_id),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
+// =========================================================================
+//  Stop Orders
+// =========================================================================
+PerpetualsApiCasting.createdStopOrderTicketEventFromOnChain = (eventOnChain) => {
+    const fields = eventOnChain.parsedJson;
+    return {
+        ticketId: utils_1.Helpers.addLeadingZeroesToType(fields.ticket_id),
+        accountId: BigInt(fields.account_id),
+        executors: fields.executors.map((executor) => utils_1.Helpers.addLeadingZeroesToType(executor)),
+        gas: BigInt(fields.gas),
+        stopOrderType: Number(fields.stop_order_type),
+        encryptedDetails: fields.encrypted_details,
+        timestamp: Number(eventOnChain.timestampMs),
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
+PerpetualsApiCasting.executedStopOrderTicketEventFromOnChain = (eventOnChain) => {
+    const f = eventOnChain.parsedJson;
+    return {
+        ticketId: utils_1.Helpers.addLeadingZeroesToType(f.ticket_id),
+        executor: utils_1.Helpers.addLeadingZeroesToType(f.executor),
+        accountId: BigInt(f.account_id),
+        timestamp: Number(eventOnChain.timestampMs),
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
+PerpetualsApiCasting.deletedStopOrderTicketEventFromOnChain = (eventOnChain) => {
+    const f = eventOnChain.parsedJson;
+    return {
+        ticketId: utils_1.Helpers.addLeadingZeroesToType(f.ticket_id),
+        executor: utils_1.Helpers.addLeadingZeroesToType(f.executor),
+        accountId: BigInt(f.account_id),
+        subAccountId: f.subaccount_id
+            ? utils_1.Helpers.addLeadingZeroesToType(f.subaccount_id)
+            : undefined,
+        timestamp: Number(eventOnChain.timestampMs),
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
+PerpetualsApiCasting.editedStopOrderTicketDetailsEventFromOnChain = (eventOnChain) => {
+    const f = eventOnChain.parsedJson;
+    return {
+        ticketId: utils_1.Helpers.addLeadingZeroesToType(f.ticket_id),
+        stopOrderType: Number(f.stop_order_type),
+        accountId: BigInt(f.account_id),
+        subAccountId: f.subaccount_id
+            ? utils_1.Helpers.addLeadingZeroesToType(f.subaccount_id)
+            : undefined,
+        encryptedDetails: f.encrypted_details,
+        timestamp: Number(eventOnChain.timestampMs),
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
+PerpetualsApiCasting.editedStopOrderTicketExecutorEventFromOnChain = (eventOnChain) => {
+    const f = eventOnChain.parsedJson;
+    return {
+        ticketId: utils_1.Helpers.addLeadingZeroesToType(f.ticket_id),
+        accountId: BigInt(f.account_id),
+        subAccountId: f.subaccount_id
+            ? utils_1.Helpers.addLeadingZeroesToType(f.subaccount_id)
+            : undefined,
+        executors: f.executors.map((executor) => utils_1.Helpers.addLeadingZeroesToType(executor)),
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
 };
+// public static addedStopOrderTicketCollateralEventFromOnChain = (
+// 	eventOnChain: AddedStopOrderTicketCollateralEventOnChain
+// ): AddedStopOrderTicketCollateralEvent => {
+// 	const f = eventOnChain.parsedJson;
+// 	return {
+// 		ticketId: Helpers.addLeadingZeroesToType(f.ticket_id),
+// 		accountId: BigInt(f.account_id),
+// 		subAccountId: f.subaccount_id
+// 			? Helpers.addLeadingZeroesToType(f.subaccount_id)
+// 			: undefined,
+// 		collateralToAllocate: BigInt(f.collateral_to_allocate),
+// 		timestamp: Number(eventOnChain.timestampMs),
+// 		txnDigest: eventOnChain.id.txDigest,
+// 		type: eventOnChain.type,
+// 	};
+// };
+// public static removedStopOrderTicketCollateralEventFromOnChain = (
+// 	eventOnChain: RemovedStopOrderTicketCollateralEventOnChain
+// ): RemovedStopOrderTicketCollateralEvent => {
+// 	const f = eventOnChain.parsedJson;
+// 	return {
+// 		ticketId: Helpers.addLeadingZeroesToType(f.ticket_id),
+// 		accountId: BigInt(f.account_id),
+// 		subAccountId: f.subaccount_id
+// 			? Helpers.addLeadingZeroesToType(f.subaccount_id)
+// 			: undefined,
+// 		collateralToRemove: BigInt(f.collateral_to_remove),
+// 		timestamp: Number(eventOnChain.timestampMs),
+// 		txnDigest: eventOnChain.id.txDigest,
+// 		type: eventOnChain.type,
+// 	};
+// };
+// public static transferredDeallocatedCollateralEventFromOnChain = (
+// 	eventOnChain: TransferredDeallocatedCollateralEventOnChain
+// ): TransferredDeallocatedCollateralEvent => {
+// 	const f = eventOnChain.parsedJson;
+// 	return {
+// 		chId: Helpers.addLeadingZeroesToType(f.ch_id),
+// 		objectId: Helpers.addLeadingZeroesToType(f.obj_id),
+// 		accountId: BigInt(f.account_id),
+// 		collateral: BigInt(f.collateral),
+// 		timestamp: Number(eventOnChain.timestampMs),
+// 		txnDigest: eventOnChain.id.txDigest,
+// 		type: eventOnChain.type,
+// 	};
+// };
+// public static receivedCollateralEventFromOnChain = (
+// 	eventOnChain: ReceivedCollateralEventOnChain
+// ): ReceivedCollateralEvent => {
+// 	const f = eventOnChain.parsedJson;
+// 	return {
+// 		objectId: Helpers.addLeadingZeroesToType(f.obj_id),
+// 		accountId: BigInt(f.account_id),
+// 		collateral: BigInt(f.collateral),
+// 		timestamp: Number(eventOnChain.timestampMs),
+// 		txnDigest: eventOnChain.id.txDigest,
+// 		type: eventOnChain.type,
+// 	};
+// };
 // =========================================================================
 //  Twap
 // =========================================================================
@@ -402,11 +424,11 @@ PerpetualsApiCasting.updatedPremiumTwapEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        indexPrice: BigInt(fields.index_price),
-        bookPrice: BigInt(fields.book_price),
-        premiumTwap: BigInt(fields.premium_twap),
+        indexPrice: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.index_price)),
+        bookPrice: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.book_price)),
+        premiumTwap: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.premium_twap)),
         premiumTwapLastUpdateMs: Number(fields.premium_twap_last_upd_ms),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -415,11 +437,11 @@ PerpetualsApiCasting.updatedSpreadTwapEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        bookPrice: BigInt(fields.book_price),
-        indexPrice: BigInt(fields.index_price),
-        spreadTwap: BigInt(fields.spread_twap),
+        bookPrice: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.book_price)),
+        indexPrice: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.index_price)),
+        spreadTwap: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.spread_twap)),
         spreadTwapLastUpdateMs: Number(fields.spread_twap_last_upd_ms),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };
@@ -431,10 +453,10 @@ PerpetualsApiCasting.updatedFundingEventFromOnChain = (eventOnChain) => {
     const fields = eventOnChain.parsedJson;
     return {
         marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
-        cumFundingRateLong: BigInt(fields.cum_funding_rate_long),
-        cumFundingRateShort: BigInt(fields.cum_funding_rate_short),
+        cumFundingRateLong: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.cum_funding_rate_long)),
+        cumFundingRateShort: utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.cum_funding_rate_short)),
         fundingLastUpdateMs: Number(fields.funding_last_upd_ms),
-        timestamp: eventOnChain.timestampMs,
+        timestamp: Number(eventOnChain.timestampMs),
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
     };

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

@@ -1,4 +1,5 @@
 export * from "./perpetuals";
 export * from "./perpetualsAccount";
 export * from "./perpetualsMarket";
+export * from "./perpetualsVault";
 //# sourceMappingURL=index.d.ts.map