aftermath-ts-sdk 1.2.51 → 1.2.52-perps.3

package/dist/packages/perpetuals/api/perpetualsApiCasting.d.ts

@@ -1,9 +1,8 @@
-import { PerpetualsAccountObject, PerpetualsPosition, DepositedCollateralEvent, WithdrewCollateralEvent, CreatedAccountEvent, CanceledOrderEvent, PostedOrderEvent, FilledTakerOrderEvent, FilledMakerOrderEvent, PerpetualsOrderInfo, SettledFundingEvent, UpdatedSpreadTwapEvent, UpdatedPremiumTwapEvent, LiquidatedEvent, PerpetualsMarketData, PostedOrderReceiptEvent, PerpetualsRawAccountCap, AllocatedCollateralEvent, DeallocatedCollateralEvent, PerpetualsMarketId } from "../perpetualsTypes";
+import { PerpetualsAccountObject, PerpetualsPosition, DepositedCollateralEvent, WithdrewCollateralEvent, CreatedAccountEvent, CanceledOrderEvent, PostedOrderEvent, FilledTakerOrderEvent, FilledMakerOrdersEvent, PerpetualsOrderInfo, SettledFundingEvent, UpdatedSpreadTwapEvent, UpdatedPremiumTwapEvent, LiquidatedEvent, PerpetualsMarketData, PostedOrderReceiptEvent, AllocatedCollateralEvent, DeallocatedCollateralEvent, PerpetualsMarketId, UpdatedFundingEvent, UpdatedMarketVersionEvent, ReducedOrderEvent, CreatedStopOrderTicketEvent, DeletedStopOrderTicketEvent } from "../perpetualsTypes";
 import { CoinSymbol, CoinType } from "../../coin/coinTypes";
-import { CanceledOrderEventOnChain, CreatedAccountEventOnChain, DepositedCollateralEventOnChain, PostedOrderEventOnChain, WithdrewCollateralEventOnChain, FilledMakerOrderEventOnChain, FilledTakerOrderEventOnChain, LiquidatedEventOnChain, SettledFundingEventOnChain, UpdatedPremiumTwapEventOnChain, UpdatedSpreadTwapEventOnChain, PostedOrderReceiptEventOnChain, AllocatedCollateralEventOnChain, DeallocatedCollateralEventOnChain, PerpetualsAccountPositionsIndexerResponse, PerpetualsPositionIndexerResponse, PerpetualsMarketDataIndexerResponse } from "../perpetualsCastingTypes";
-import { ObjectDigest, ObjectVersion } from "../../../types";
+import { CanceledOrderEventOnChain, CreatedAccountEventOnChain, DepositedCollateralEventOnChain, PostedOrderEventOnChain, WithdrewCollateralEventOnChain, FilledMakerOrdersEventOnChain, FilledTakerOrderEventOnChain, LiquidatedEventOnChain, SettledFundingEventOnChain, UpdatedPremiumTwapEventOnChain, UpdatedSpreadTwapEventOnChain, PostedOrderReceiptEventOnChain, AllocatedCollateralEventOnChain, DeallocatedCollateralEventOnChain, PerpetualsAccountPositionsIndexerResponse, PerpetualsPositionIndexerResponse, PerpetualsMarketDataIndexerResponse, UpdatedFundingEventOnChain, UpdatedMarketVersionEventOnChain, ReducedOrderEventOnChain, CreatedStopOrderTicketEventOnChain, DeletedStopOrderTicketEventOnChain } from "../perpetualsCastingTypes";
+import { IFixedAsStringBytes } from "../../../types";
 export declare class PerpetualsApiCasting {
-    static rawAccountCapFromRaw(data: any, collateralCoinType: CoinType, version: ObjectVersion, digest: ObjectDigest): PerpetualsRawAccountCap;
     static positionFromIndexerReponse: (inputs: {
         position: PerpetualsPositionIndexerResponse;
         collateralCoinType: CoinType;
@@ -11,11 +10,12 @@ export declare class PerpetualsApiCasting {
         leverage: number;
     }) => PerpetualsPosition;
     static accountObjectFromIndexerResponse: (response: PerpetualsAccountPositionsIndexerResponse, collateralCoinType: CoinType) => PerpetualsAccountObject;
-    static marketDataFromIndexerResponse(data: PerpetualsMarketDataIndexerResponse, collateralCoinType: CoinType, baseAssetSymbol: CoinSymbol): PerpetualsMarketData;
+    static marketDataFromIndexerResponse(data: PerpetualsMarketDataIndexerResponse, collateralCoinType: CoinType, baseAssetSymbol: CoinSymbol, indexPrice: IFixedAsStringBytes, collateralPrice: IFixedAsStringBytes): PerpetualsMarketData;
     private static marketParamsFromIndexerResponse;
     private static marketStateFromIndexerResponse;
     static orderbookPriceFromBytes: (bytes: number[]) => number;
     static orderInfoFromRaw: (data: any) => PerpetualsOrderInfo;
+    static UpdatedMarketVersionEventFromOnChain: (eventOnChain: UpdatedMarketVersionEventOnChain) => UpdatedMarketVersionEvent;
     static withdrewCollateralEventFromOnChain: (eventOnChain: WithdrewCollateralEventOnChain) => WithdrewCollateralEvent;
     static depositedCollateralEventFromOnChain: (eventOnChain: DepositedCollateralEventOnChain) => DepositedCollateralEvent;
     static settledFundingEventFromOnChain: (eventOnChain: SettledFundingEventOnChain) => SettledFundingEvent;
@@ -25,10 +25,14 @@ export declare class PerpetualsApiCasting {
     static createdAccountEventFromOnChain: (eventOnChain: CreatedAccountEventOnChain) => CreatedAccountEvent;
     static canceledOrderEventFromOnChain: (eventOnChain: CanceledOrderEventOnChain) => CanceledOrderEvent;
     static postedOrderEventFromOnChain: (eventOnChain: PostedOrderEventOnChain) => PostedOrderEvent;
-    static filledMakerOrderEventFromOnChain: (eventOnChain: FilledMakerOrderEventOnChain) => FilledMakerOrderEvent;
+    static filledMakerOrdersEventFromOnChain: (eventOnChain: FilledMakerOrdersEventOnChain) => FilledMakerOrdersEvent;
     static filledTakerOrderEventFromOnChain: (eventOnChain: FilledTakerOrderEventOnChain) => FilledTakerOrderEvent;
     static postedOrderReceiptEventFromOnChain: (eventOnChain: PostedOrderReceiptEventOnChain) => PostedOrderReceiptEvent;
+    static reducedOrderEventFromOnChain: (eventOnChain: ReducedOrderEventOnChain) => ReducedOrderEvent;
+    static createdStopOrderTicketEventFromOnChain: (eventOnChain: CreatedStopOrderTicketEventOnChain) => CreatedStopOrderTicketEvent;
+    static deletedStopOrderTicketEventFromOnChain: (eventOnChain: DeletedStopOrderTicketEventOnChain) => DeletedStopOrderTicketEvent;
     static updatedPremiumTwapEventFromOnChain: (eventOnChain: UpdatedPremiumTwapEventOnChain) => UpdatedPremiumTwapEvent;
     static updatedSpreadTwapEventFromOnChain: (eventOnChain: UpdatedSpreadTwapEventOnChain) => UpdatedSpreadTwapEvent;
+    static updatedFundingEventFromOnChain: (eventOnChain: UpdatedFundingEventOnChain) => UpdatedFundingEvent;
 }
 //# sourceMappingURL=perpetualsApiCasting.d.ts.map

package/dist/packages/perpetuals/api/perpetualsApiCasting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"perpetualsApiCasting.d.ts","sourceRoot":"","sources":["../../../../src/packages/perpetuals/api/perpetualsApiCasting.ts"],"names":[],"mappings":"AACA,OAAO,EAMN,uBAAuB,EACvB,kBAAkB,EAGlB,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAEhB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACpB,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACxB,0BAA0B,EAC1B,kBAAkB,EAClB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EACN,yBAAyB,EACzB,0BAA0B,EAC1B,+BAA+B,EAC/B,uBAAuB,EACvB,8BAA8B,EAC9B,4BAA4B,EAC5B,4BAA4B,EAC5B,sBAAsB,EACtB,0BAA0B,EAC1B,8BAA8B,EAC9B,6BAA6B,EAC7B,8BAA8B,EAC9B,+BAA+B,EAC/B,iCAAiC,EAGjC,yCAAyC,EACzC,iCAAiC,EACjC,mCAAmC,EACnC,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAkB,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG7E,qBAAa,oBAAoB;WASlB,oBAAoB,CACjC,IAAI,EAAE,GAAG,EACT,kBAAkB,EAAE,QAAQ,EAC5B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,YAAY,GAClB,uBAAuB;IA6B1B,OAAc,0BAA0B,WAAY;QACnD,QAAQ,EAAE,iCAAiC,CAAC;QAC5C,kBAAkB,EAAE,QAAQ,CAAC;QAC7B,QAAQ,EAAE,kBAAkB,CAAC;QAC7B,QAAQ,EAAE,MAAM,CAAC;KACjB,KAAG,kBAAkB,CAmDpB;IAEF,OAAc,gCAAgC,4EAEzB,QAAQ,KAC1B,uBAAuB,CAmBxB;WAMY,6BAA6B,CAC1C,IAAI,EAAE,mCAAmC,EACzC,kBAAkB,EAAE,QAAQ,EAC5B,eAAe,EAAE,UAAU,GACzB,oBAAoB;IAevB,OAAO,CAAC,MAAM,CAAC,+BAA+B,CA0C5C;IAEF,OAAO,CAAC,MAAM,CAAC,8BAA8B,CAwB3C;IAMF,OAAc,uBAAuB,UAAW,MAAM,EAAE,KAAG,MAAM,CAK/D;IAEF,OAAc,gBAAgB,SAAU,GAAG,KAAG,mBAAmB,CAK/D;IAUF,OAAc,kCAAkC,oDAE7C,uBAAuB,CASxB;IAEF,OAAc,mCAAmC,qDAE9C,wBAAwB,CASzB;IAEF,OAAc,8BAA8B,gDAEzC,mBAAmB,CAYpB;IAEF,OAAc,mCAAmC,qDAE9C,wBAAwB,CAUzB;IAEF,OAAc,qCAAqC,uDAEhD,0BAA0B,CAU3B;IAMF,OAAc,0BAA0B,4CAErC,eAAe,CAgBhB;IAMF,OAAc,8BAA8B,gDAEzC,mBAAmB,CASpB;IAMF,OAAc,6BAA6B,+CAExC,kBAAkB,CAYnB;IAEF,OAAc,2BAA2B,6CAEtC,gBAAgB,CAgBjB;IAEF,OAAc,gCAAgC,kDAE3C,qBAAqB,CAkBtB;IAEF,OAAc,gCAAgC,kDAE3C,qBAAqB,CA+BtB;IAEF,OAAc,kCAAkC,oDAE7C,uBAAuB,CAYxB;IAMF,OAAc,kCAAkC,oDAE7C,uBAAuB,CAYxB;IAEF,OAAc,iCAAiC,mDAE5C,sBAAsB,CAYvB;CACF"}
+{"version":3,"file":"perpetualsApiCasting.d.ts","sourceRoot":"","sources":["../../../../src/packages/perpetuals/api/perpetualsApiCasting.ts"],"names":[],"mappings":"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"}

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

@@ -9,38 +9,30 @@ 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,
-            objectVersion: version,
-            objectDigest: digest,
-            accountId: BigInt(data.accountId),
-            collateral: BigInt(data.collateral.value),
-        };
-    }
     // =========================================================================
     //  Clearing House
     // =========================================================================
-    static marketDataFromIndexerResponse(data, collateralCoinType, baseAssetSymbol) {
+    static marketDataFromIndexerResponse(data, collateralCoinType, baseAssetSymbol, indexPrice, collateralPrice) {
         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),
+            indexPrice: utils_1.Casting.IFixed.numberFromIFixed(utils_1.Casting.IFixed.iFixedFromStringBytes(indexPrice)),
+            collateralPrice: utils_1.Casting.IFixed.numberFromIFixed(utils_1.Casting.IFixed.iFixedFromStringBytes(collateralPrice)),
         };
     }
 }
 exports.PerpetualsApiCasting = PerpetualsApiCasting;
 _a = PerpetualsApiCasting;
+// =========================================================================
+//  Objects
+// =========================================================================
+// =========================================================================
+//  Account
+// =========================================================================
 // public static partialPositionFromRaw = (
 // 	data: any
 // ): Omit<PerpetualsPosition, "collateralCoinType" | "marketId"> => {
@@ -120,18 +112,19 @@ PerpetualsApiCasting.marketParamsFromIndexerResponse = (data, baseAssetSymbol) =
         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),
+        baseOracleTolerance: BigInt(data.base_oracle_tolerance),
+        collateralOracleTolerance: BigInt(data.collateral_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),
-        fundingLastUpdMs: Number(data.funding_last_upd_ms),
+        fundingLastUpdateMs: Number(data.funding_last_upd_ms),
         premiumTwap: utils_1.Casting.IFixed.iFixedFromStringBytes(data.premium_twap),
-        premiumTwapLastUpdMs: Number(data.premium_twap_last_upd_ms),
+        premiumTwapLastUpdateMs: Number(data.premium_twap_last_upd_ms),
         spreadTwap: utils_1.Casting.IFixed.iFixedFromStringBytes(data.spread_twap),
-        spreadTwapLastUpdMs: Number(data.spread_twap_last_upd_ms),
+        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),
     };
@@ -153,6 +146,19 @@ PerpetualsApiCasting.orderInfoFromRaw = (data) => {
 //  Events
 // =========================================================================
 // =========================================================================
+//  Updated Version
+// =========================================================================
+PerpetualsApiCasting.UpdatedMarketVersionEventFromOnChain = (eventOnChain) => {
+    const fields = eventOnChain.parsedJson;
+    return {
+        marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
+        version: BigInt(fields.version),
+        timestamp: eventOnChain.timestampMs,
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
+// =========================================================================
 //  Collateral
 // =========================================================================
 PerpetualsApiCasting.withdrewCollateralEventFromOnChain = (eventOnChain) => {
@@ -192,6 +198,7 @@ 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,
@@ -203,6 +210,7 @@ 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,
@@ -217,11 +225,18 @@ 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.iFixedFromNumber(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: BigInt(fields.base_liquidated),
+        quoteLiquidated: BigInt(fields.quote_liquidated),
+        liqeePnlUsd: BigInt(fields.liqee_pnl),
+        liquidationFeesUsd: BigInt(fields.liquidation_fees),
+        forceCancelFeesUsd: BigInt(fields.force_cancel_fees),
+        insuranceFundFeesUsd: BigInt(fields.insurance_fund_fees),
         side: fields.is_liqee_long
             ? perpetualsTypes_1.PerpetualsOrderSide.Bid
             : perpetualsTypes_1.PerpetualsOrderSide.Ask,
@@ -275,20 +290,22 @@ PerpetualsApiCasting.postedOrderEventFromOnChain = (eventOnChain) => {
         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),
+        events: eventOnChain.parsedJson.events.map((fields) => ({
+            accountId: BigInt(fields.maker_account_id),
+            takerAccountId: BigInt(fields.taker_account_id),
+            collateralDeltaUsd: utils_1.Casting.IFixed.iFixedFromNumber(utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.pnl)) -
+                utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.fees))),
+            pnlUsd: BigInt(fields.pnl),
+            feesUsd: 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),
+        })),
         timestamp: eventOnChain.timestampMs,
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
@@ -301,14 +318,14 @@ PerpetualsApiCasting.filledTakerOrderEventFromOnChain = (eventOnChain) => {
     return {
         baseAssetDelta,
         accountId: BigInt(fields.taker_account_id),
-        collateralDeltaUsd: BigInt(fields.collateral_change_usd),
+        collateralDeltaUsd: utils_1.Casting.IFixed.iFixedFromNumber(utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.taker_pnl)) -
+            utils_1.Casting.IFixed.numberFromIFixed(BigInt(fields.taker_fees))),
+        takerPnlUsd: BigInt(fields.taker_pnl),
+        takerFeesUsd: 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,
         txnDigest: eventOnChain.id.txDigest,
         type: eventOnChain.type,
@@ -327,6 +344,44 @@ PerpetualsApiCasting.postedOrderReceiptEventFromOnChain = (eventOnChain) => {
         type: eventOnChain.type,
     };
 };
+PerpetualsApiCasting.reducedOrderEventFromOnChain = (eventOnChain) => {
+    const fields = eventOnChain.parsedJson;
+    return {
+        accountId: BigInt(fields.account_id),
+        marketId: utils_1.Helpers.addLeadingZeroesToType(fields.ch_id),
+        sizeChange: BigInt(fields.size_change),
+        orderId: BigInt(fields.order_id),
+        timestamp: 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),
+        recipient: utils_1.Helpers.addLeadingZeroesToType(fields.recipient),
+        encryptedDetails: fields.encrypted_details,
+        timestamp: eventOnChain.timestampMs,
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
+PerpetualsApiCasting.deletedStopOrderTicketEventFromOnChain = (eventOnChain) => {
+    const fields = eventOnChain.parsedJson;
+    return {
+        ticketId: utils_1.Helpers.addLeadingZeroesToType(fields.ticket_id),
+        accountId: BigInt(fields.account_id),
+        executed: fields.executed,
+        timestamp: eventOnChain.timestampMs,
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};
 // =========================================================================
 //  Twap
 // =========================================================================
@@ -356,3 +411,18 @@ PerpetualsApiCasting.updatedSpreadTwapEventFromOnChain = (eventOnChain) => {
         type: eventOnChain.type,
     };
 };
+// =========================================================================
+//  Funding
+// =========================================================================
+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),
+        fundingLastUpdateMs: Number(fields.funding_last_upd_ms),
+        timestamp: eventOnChain.timestampMs,
+        txnDigest: eventOnChain.id.txDigest,
+        type: eventOnChain.type,
+    };
+};

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

@@ -1,11 +1,16 @@
 import { Caller } from "../../general/utils/caller";
-import { ApiPerpetualsCreateAccountBody, PerpetualsMarketId, ApiPerpetualsAccountsBody, PerpetualsOrderSide, CoinType, PerpetualsOrderId, FilledTakerOrderEvent, PerpetualsOrderPrice, Timestamp, ApiPerpetualsHistoricalMarketDataResponse, PerpetualsAccountCap, IFixed, CallerConfig } from "../../types";
+import { ApiPerpetualsCreateAccountBody, PerpetualsMarketId, ApiPerpetualsOwnedAccountCapsBody, PerpetualsOrderSide, CoinType, PerpetualsOrderId, FilledTakerOrderEvent, PerpetualsOrderPrice, Timestamp, ApiPerpetualsHistoricalMarketDataResponse, PerpetualsAccountCap, PerpetualsAccountId, PerpetualsAccountObject, IFixed, CallerConfig, ObjectId, ApiPerpetualsMarkets24hrStatsResponse, ApiPerpetualsAccountCapsBody } from "../../types";
 import { PerpetualsMarket } from "./perpetualsMarket";
 import { PerpetualsAccount } from "./perpetualsAccount";
 import { PerpetualsOrderUtils } from "./utils";
+import { AftermathApi } from "../../general/providers";
 export declare class Perpetuals extends Caller {
+    readonly Provider?: AftermathApi | undefined;
     static readonly OrderUtils: typeof PerpetualsOrderUtils;
-    constructor(config?: CallerConfig);
+    static readonly constants: {
+        stopOrderGasCostSUI: bigint;
+    };
+    constructor(config?: CallerConfig, Provider?: AftermathApi | undefined);
     getAllMarkets(inputs: {
         collateralCoinType: CoinType;
     }): Promise<PerpetualsMarket[]>;
@@ -19,17 +24,36 @@ export declare class Perpetuals extends Caller {
     }): Promise<PerpetualsMarket[]>;
     getAccount(inputs: {
         accountCap: PerpetualsAccountCap;
+        marketIds?: PerpetualsMarketId[];
     }): Promise<PerpetualsAccount>;
-    getUserAccountCaps(inputs: ApiPerpetualsAccountsBody & {
+    getAccounts(inputs: {
+        accountCaps: PerpetualsAccountCap[];
+        marketIds?: PerpetualsMarketId[];
+    }): Promise<PerpetualsAccount[]>;
+    getAccountObjects(inputs: {
+        accountIds: PerpetualsAccountId[];
         collateralCoinType: CoinType;
+        marketIds?: PerpetualsMarketId[];
+    }): Promise<PerpetualsAccountObject[]>;
+    getUserAccountCaps(inputs: ApiPerpetualsOwnedAccountCapsBody & {
+        collateralCoinTypes?: CoinType[];
     }): Promise<PerpetualsAccountCap[]>;
+    getAccountCaps(inputs: ApiPerpetualsAccountCapsBody): Promise<PerpetualsAccountCap[]>;
     getMarketHistoricalData(inputs: {
-        collateralCoinType: CoinType;
         marketId: PerpetualsMarketId;
         fromTimestamp: Timestamp;
         toTimestamp: Timestamp;
         intervalMs: number;
     }): Promise<ApiPerpetualsHistoricalMarketDataResponse>;
+    getMarkets24hrStats(inputs: {
+        marketIds: PerpetualsMarketId[];
+    }): Promise<ApiPerpetualsMarkets24hrStatsResponse>;
+    getPrices(inputs: {
+        marketIds: ObjectId[];
+    }): Promise<{
+        basePrice: number;
+        collateralPrice: number;
+    }[]>;
     getCreateAccountTx(inputs: ApiPerpetualsCreateAccountBody): Promise<import("@mysten/sui/transactions").Transaction>;
     static positionSide(inputs: {
         baseAssetAmount: IFixed;
@@ -50,9 +74,14 @@ export declare class Perpetuals extends Caller {
     static lotOrTickSizeToNumber(lotOrTickSize: bigint): number;
     static lotOrTickSizeToBigInt(lotOrTickSize: number): bigint;
     static orderIdToSide: (orderId: PerpetualsOrderId) => PerpetualsOrderSide;
+    static eventTypeForCollateral: (inputs: {
+        eventType: string;
+        collateralCoinType: CoinType;
+    }) => string;
     static calcEntryPrice(inputs: {
         baseAssetAmount: IFixed;
         quoteAssetNotionalAmount: IFixed;
     }): number;
+    private useProvider;
 }
 //# sourceMappingURL=perpetuals.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"perpetuals.d.ts","sourceRoot":"","sources":["../../../src/packages/perpetuals/perpetuals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EACN,8BAA8B,EAM9B,kBAAkB,EAClB,yBAAyB,EAEzB,mBAAmB,EAEnB,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,SAAS,EAET,yCAAyC,EACzC,oBAAoB,EAGpB,MAAM,EAEN,YAAY,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,qBAAa,UAAW,SAAQ,MAAM;IAKrC,gBAAuB,UAAU,8BAAwB;gBAM7C,MAAM,CAAC,EAAE,YAAY;IAQpB,aAAa,CAAC,MAAM,EAAE;QAClC,kBAAkB,EAAE,QAAQ,CAAC;KAC7B,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAUlB,SAAS,CAAC,MAAM,EAAE;QAC9B,QAAQ,EAAE,kBAAkB,CAAC;QAC7B,kBAAkB,EAAE,QAAQ,CAAC;KAC7B,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAOhB,UAAU,CAAC,MAAM,EAAE;QAC/B,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAChC,kBAAkB,EAAE,QAAQ,CAAC;KAC7B,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAYlB,UAAU,CAAC,MAAM,EAAE;QAC/B,UAAU,EAAE,oBAAoB,CAAC;KACjC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAQjB,kBAAkB,CAC9B,MAAM,EAAE,yBAAyB,GAAG;QACnC,kBAAkB,EAAE,QAAQ,CAAC;KAC7B,GACC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAc3B,uBAAuB,CAAC,MAAM,EAAE;QACtC,kBAAkB,EAAE,QAAQ,CAAC;QAC7B,QAAQ,EAAE,kBAAkB,CAAC;QAC7B,aAAa,EAAE,SAAS,CAAC;QACzB,WAAW,EAAE,SAAS,CAAC;QACvB,UAAU,EAAE,MAAM,CAAC;KACnB;IAiBY,kBAAkB,CAAC,MAAM,EAAE,8BAA8B;WAexD,YAAY,CAAC,MAAM,EAAE;QAClC,eAAe,EAAE,MAAM,CAAC;KACxB,GAAG,mBAAmB;WAQT,UAAU,CAAC,MAAM,EAAE;QAChC,UAAU,EAAE,qBAAqB,CAAC;KAClC,GAAG,MAAM;IAQV,OAAc,iBAAiB,WAAY;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;KAC1B,KAAG,oBAAoB,CAqBtB;IAEF,OAAc,iBAAiB,WAAY;QAC1C,UAAU,EAAE,oBAAoB,CAAC;QACjC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;QACzB,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;KAC1B,KAAG,MAAM,CAgBR;WAEY,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;WAIpD,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAIlE,OAAc,aAAa,YACjB,iBAAiB,KACxB,mBAAmB,CAIpB;WAMY,cAAc,CAAC,MAAM,EAAE;QACpC,eAAe,EAAE,MAAM,CAAC;QACxB,wBAAwB,EAAE,MAAM,CAAC;KACjC,GAAG,MAAM;CAWV"}
+{"version":3,"file":"perpetuals.d.ts","sourceRoot":"","sources":["../../../src/packages/perpetuals/perpetuals.ts"],"names":[],"mappings":"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"}

package/dist/packages/perpetuals/perpetuals.js

@@ -23,62 +23,143 @@ class Perpetuals extends caller_1.Caller {
     // =========================================================================
     //  Constructor
     // =========================================================================
-    constructor(config) {
+    constructor(config, Provider) {
         super(config, "perpetuals");
+        this.Provider = Provider;
+        // =========================================================================
+        //  Private Helpers
+        // =========================================================================
+        this.useProvider = () => {
+            var _b;
+            const provider = (_b = this.Provider) === null || _b === void 0 ? void 0 : _b.Perpetuals();
+            if (!provider)
+                throw new Error("missing AftermathApi Provider");
+            return provider;
+        };
     }
     // =========================================================================
     //  Class Objects
     // =========================================================================
     getAllMarkets(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { collateralCoinType } = inputs;
-            const marketDatas = yield this.fetchApi(`${collateralCoinType}/markets`);
+            const marketDatas = yield this.fetchApi("all-markets", inputs);
             return marketDatas.map((marketData) => new perpetualsMarket_1.PerpetualsMarket(marketData, this.config));
         });
     }
     getMarket(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketData = yield this.fetchApi(`${inputs.collateralCoinType}/markets/${inputs.marketId}`);
-            return new perpetualsMarket_1.PerpetualsMarket(marketData, this.config);
+            const markets = yield this.getMarkets({
+                marketIds: [inputs.marketId],
+                collateralCoinType: inputs.collateralCoinType,
+            });
+            return markets[0];
         });
     }
     getMarkets(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { collateralCoinType } = inputs;
-            return Promise.all(inputs.marketIds.map((marketId) => this.getMarket({
-                marketId,
-                collateralCoinType,
-            })));
+            const marketDatas = yield this.fetchApi("markets", Object.assign(Object.assign({}, inputs), { withOrderbook: false }));
+            return marketDatas.map((marketData) => 
+            // TODO: make orderbook as input
+            new perpetualsMarket_1.PerpetualsMarket(marketData.market, this.config));
         });
     }
+    // TODO: merge this with `getAccountObjects` as an option ?
     getAccount(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { accountCap } = inputs;
-            const account = yield this.fetchApi(`${accountCap.collateralCoinType}/accounts/${accountCap.accountId}`);
-            return new perpetualsAccount_1.PerpetualsAccount(account, accountCap, this.config);
+            const { accountCap, marketIds,
+            // withLeverage
+             } = inputs;
+            return (yield this.getAccounts({
+                accountCaps: [accountCap],
+                marketIds,
+                // withLeverage,
+            }))[0];
+        });
+    }
+    // TODO: make account fetching get positions and account cap data all at once ?
+    getAccounts(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { accountCaps, marketIds,
+            // withLeverage
+             } = inputs;
+            if (accountCaps.length <= 0)
+                return [];
+            // TODO: handle different collateral coin types
+            const accountObjects = yield this.getAccountObjects({
+                accountIds: accountCaps.map((accountCap) => accountCap.accountId),
+                collateralCoinType: accountCaps[0].collateralCoinType,
+                marketIds,
+                // withLeverage,
+            });
+            return accountObjects.map((account, index) => new perpetualsAccount_1.PerpetualsAccount(account, accountCaps[index], this.config, this.Provider));
+        });
+    }
+    // TODO: handle different collateral coin types ?
+    getAccountObjects(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { accountIds, collateralCoinType, marketIds,
+            // withLeverage
+             } = inputs;
+            if (accountIds.length <= 0)
+                return [];
+            return this.fetchApi("accounts/positions", {
+                accountIds,
+                collateralCoinType,
+                marketIds,
+                // withLeverage: withLeverage ?? true,
+                withLeverage: true,
+            });
         });
     }
     getUserAccountCaps(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { collateralCoinType, walletAddress } = inputs;
-            return this.fetchApi(`${collateralCoinType}/accounts`, {
+            const { walletAddress, collateralCoinTypes } = inputs;
+            return this.fetchApi("accounts/owned", {
                 walletAddress,
+                collateralCoinTypes,
             });
         });
     }
+    getAccountCaps(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.fetchApi("accounts", inputs);
+        });
+    }
     // =========================================================================
     //  Data
     // =========================================================================
     getMarketHistoricalData(inputs) {
-        const { collateralCoinType, marketId, fromTimestamp, toTimestamp, intervalMs, } = inputs;
-        return this.fetchApi(`${collateralCoinType}/markets/${marketId}/historical-data/${fromTimestamp}/${toTimestamp}/${intervalMs}`);
+        const { marketId, fromTimestamp, toTimestamp, intervalMs } = inputs;
+        return this.fetchApi("market/candle-history", {
+            marketId,
+            fromTimestamp,
+            toTimestamp,
+            intervalMs,
+        });
+    }
+    getMarkets24hrStats(inputs) {
+        return this.fetchApi("markets/24hr-stats", inputs);
+    }
+    // =========================================================================
+    //  Prices
+    // =========================================================================
+    getPrices(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (inputs.marketIds.length <= 0)
+                return [];
+            return this.fetchApi("markets/prices", inputs);
+        });
     }
     // =========================================================================
     //  Transactions
     // =========================================================================
     getCreateAccountTx(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApiTransaction("transactions/create-account", inputs);
+            // return this.fetchApiTransaction<ApiPerpetualsCreateAccountBody>(
+            // 	"transactions/create-account",
+            // 	inputs
+            // );
+            return this.useProvider().buildCreateAccountTx(inputs);
         });
     }
     // =========================================================================
@@ -122,6 +203,9 @@ _a = Perpetuals;
 //  Constants
 // =========================================================================
 Perpetuals.OrderUtils = utils_2.PerpetualsOrderUtils;
+Perpetuals.constants = {
+    stopOrderGasCostSUI: BigInt(150000000), // 0.15 SUI
+};
 Perpetuals.priceToOrderPrice = (inputs) => {
     const { price, lotSize, tickSize } = inputs;
     const priceFixed = fixedUtils_1.FixedUtils.directUncast(price);
@@ -157,3 +241,6 @@ Perpetuals.orderIdToSide = (orderId) => {
         ? types_1.PerpetualsOrderSide.Ask
         : types_1.PerpetualsOrderSide.Bid;
 };
+Perpetuals.eventTypeForCollateral = (inputs) => {
+    return `${inputs.eventType}<${inputs.collateralCoinType}>`;
+};