aftermath-ts-sdk 1.1.76 → 1.1.78

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

@@ -8,6 +8,7 @@ export declare class PerpetualsApiCasting {
         position: PerpetualsPositionIndexerResponse;
         collateralCoinType: CoinType;
         marketId: PerpetualsMarketId;
+        leverage: number;
     }) => PerpetualsPosition;
     static accountObjectFromIndexerResponse: (response: PerpetualsAccountPositionsIndexerResponse, collateralCoinType: CoinType) => PerpetualsAccountObject;
     static marketDataFromIndexerResponse(data: PerpetualsMarketDataIndexerResponse, collateralCoinType: CoinType, baseAssetSymbol: CoinSymbol): PerpetualsMarketData;

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;KAC7B,KAAG,kBAAkB,CAkDpB;IAEF,OAAc,gCAAgC,4EAEzB,QAAQ,KAC1B,uBAAuB,CAYxB;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":"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"}

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

@@ -58,9 +58,10 @@ _a = PerpetualsApiCasting;
 // 	};
 // };
 PerpetualsApiCasting.positionFromIndexerReponse = (inputs) => {
-    const { position, collateralCoinType, marketId } = 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),
@@ -88,9 +89,10 @@ PerpetualsApiCasting.positionFromIndexerReponse = (inputs) => {
 };
 PerpetualsApiCasting.accountObjectFromIndexerResponse = (response, collateralCoinType) => {
     return {
-        positions: response.map(([marketIdAsStringBytes, position]) => _a.positionFromIndexerReponse({
+        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),
         })),
     };
@@ -283,7 +285,7 @@ PerpetualsApiCasting.filledMakerOrderEventFromOnChain = (eventOnChain) => {
         orderId: BigInt(fields.order_id),
         side: __1.Perpetuals.orderIdToSide(BigInt(fields.order_id)),
         size: BigInt(fields.maker_size),
-        dropped: fields.dropped,
+        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),

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,EAC9B,UAAU,EAKV,kBAAkB,EAClB,yBAAyB,EAEzB,mBAAmB,EAEnB,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,SAAS,EAGT,yCAAyC,EACzC,oBAAoB,EAGpB,MAAM,EAEN,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;aAWT,OAAO,CAAC;IANpC,gBAAuB,UAAU,8BAAwB;gBAM7B,OAAO,CAAC,wBAAY;IAQnC,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":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EACN,8BAA8B,EAC9B,UAAU,EAKV,kBAAkB,EAClB,yBAAyB,EAEzB,mBAAmB,EAEnB,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,SAAS,EAET,yCAAyC,EACzC,oBAAoB,EAGpB,MAAM,EAEN,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;aAWT,OAAO,CAAC;IANpC,gBAAuB,UAAU,8BAAwB;gBAM7B,OAAO,CAAC,wBAAY;IAQnC,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"}

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

@@ -1,5 +1,5 @@
 import { Caller } from "../../general/utils/caller";
-import { ApiPerpetualsPreviewOrderBody, Balance, PerpetualsAccountCap, PerpetualsAccountObject, PerpetualsMarketId, PerpetualsOrderId, PerpetualsOrderSide, PerpetualsPosition, SdkPerpetualsLimitOrderInputs, SdkPerpetualsMarketOrderInputs, SdkPerpetualsSLTPOrderInputs, SuiNetwork, SuiAddress, ApiIndexerEventsBody, CollateralEvent, PerpetualsOrderEvent, ObjectId, PerpetualsOrderData, CoinDecimal, Percentage, ObjectVersion } from "../../types";
+import { ApiPerpetualsPreviewOrderBody, Balance, PerpetualsAccountCap, PerpetualsAccountObject, PerpetualsMarketId, PerpetualsOrderId, PerpetualsOrderSide, PerpetualsPosition, SdkPerpetualsLimitOrderInputs, SdkPerpetualsMarketOrderInputs, SdkPerpetualsSLTPOrderInputs, SuiNetwork, SuiAddress, ObjectId, PerpetualsOrderData, CoinDecimal, Percentage, ObjectVersion, ApiDataWithCursorBody, Timestamp, PerpetualsAccountCollateralChangesWithCursor, PerpetualsAccountTradesWithCursor, ApiPerpetualsSetPositionLeverageBody } from "../../types";
 import { PerpetualsMarket } from "./perpetualsMarket";
 import { Transaction } from "@mysten/sui/transactions";
 export declare class PerpetualsAccount extends Caller {
@@ -55,6 +55,18 @@ export declare class PerpetualsAccount extends Caller {
         indexPrice: number;
         collateralPrice: number;
     }): Promise<Transaction>;
+    setPositionLeverage(inputs: ApiPerpetualsSetPositionLeverageBody): Promise<boolean>;
+    getPositionLeverages(inputs: {
+        marketIds: PerpetualsMarketId[];
+    }): Promise<number[]>;
+    setPositionLeverageMessageToSign(inputs: {
+        marketId: PerpetualsMarketId;
+        leverage: number;
+    }): {
+        account_id: number;
+        market_id: PerpetualsMarketId;
+        leverage: number;
+    };
     getOrderPreview(inputs: Omit<ApiPerpetualsPreviewOrderBody, "accountId" | "collateralCoinType" | "accountCapId">, abortSignal?: AbortSignal): Promise<{
         error: string;
     } | {
@@ -68,9 +80,9 @@ export declare class PerpetualsAccount extends Caller {
         collateralChange: Balance;
         executionPrice: number;
     }>;
-    getOrderDatas(): PerpetualsOrderData[] | Promise<PerpetualsOrderData[]>;
-    getCollateralEvents(inputs: ApiIndexerEventsBody): Promise<import("../../types").IndexerEventsWithCursor<CollateralEvent>>;
-    getOrderEvents(inputs: ApiIndexerEventsBody): Promise<import("../../types").IndexerEventsWithCursor<PerpetualsOrderEvent>>;
+    getOrderDatas(): Promise<PerpetualsOrderData[]>;
+    getCollateralHistory(inputs: ApiDataWithCursorBody<Timestamp>): Promise<PerpetualsAccountCollateralChangesWithCursor>;
+    getOrderHistory(inputs: ApiDataWithCursorBody<Timestamp>): Promise<PerpetualsAccountTradesWithCursor>;
     calcFreeCollateralForPosition: (inputs: {
         market: PerpetualsMarket;
         indexPrice: number;

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

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

package/dist/packages/perpetuals/perpetualsAccount.js

@@ -115,7 +115,8 @@ class PerpetualsAccount extends caller_1.Caller {
             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 : this.emptyPosition({ marketId });
-            const marginRatioInitial = iFixedUtils_1.IFixedUtils.numberFromIFixed(inputs.market.marketParams.marginRatioInitial);
+            const marginRatioInitial = 1 / position.leverage;
+            // const marginRatioInitial = inputs.market.initialMarginRatio();
             const marginRatioMaintenance = iFixedUtils_1.IFixedUtils.numberFromIFixed(inputs.market.marketParams.marginRatioMaintenance);
             const baseAssetAmount = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.baseAssetAmount);
             const quoteAssetAmount = iFixedUtils_1.IFixedUtils.numberFromIFixed(position.quoteAssetNotionalAmount);
@@ -206,7 +207,7 @@ class PerpetualsAccount extends caller_1.Caller {
             // TODO: move conversion to helper function, since used often
             const ordersCollateral = __1.Coin.normalizeBalance(utils_1.Helpers.sum(orderDatas
                 .filter((orderData) => orderData.marketId === market.marketId)
-                .map((orderData) => market.calcCollateralUsedForOrder(Object.assign(Object.assign({}, inputs), { orderData })).collateral)), this.collateralDecimals());
+                .map((orderData) => market.calcCollateralUsedForOrder(Object.assign(Object.assign({}, inputs), { orderData, leverage: position.leverage })).collateral)), this.collateralDecimals());
             const fullPositionCollateralChange = utils_1.Helpers.maxBigInt(BigInt(Math.floor(Number(__1.Coin.normalizeBalance(this.calcFreeMarginUsdForPosition(inputs) *
                 collateralPrice, this.collateralDecimals()) - ordersCollateral) *
                 (1 -
@@ -242,7 +243,8 @@ class PerpetualsAccount extends caller_1.Caller {
                 bidsQuantity: BigInt(0),
                 pendingOrders: [],
                 makerFee: BigInt(1000000000000000000),
-                takerFee: BigInt(1000000000000000000), // 100%
+                takerFee: BigInt(1000000000000000000),
+                leverage: 1,
             };
         };
     }
@@ -306,6 +308,33 @@ class PerpetualsAccount extends caller_1.Caller {
     // =========================================================================
     //  Inspections
     // =========================================================================
+    setPositionLeverage(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/set-position-leverage`, inputs);
+        });
+    }
+    // public async getAllPositionLeverages(): Promise<
+    // 	{
+    // 		marketId: PerpetualsMarketId;
+    // 		leverage: number;
+    // 	}[]
+    // > {
+    // 	return this.fetchApi(
+    // 		`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/position-leverages`
+    // 	);
+    // }
+    getPositionLeverages(inputs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/position-leverages/${JSON.stringify(inputs.marketIds)}`);
+        });
+    }
+    setPositionLeverageMessageToSign(inputs) {
+        return {
+            account_id: Number(this.accountCap.accountId),
+            market_id: inputs.marketId,
+            leverage: inputs.leverage,
+        };
+    }
     getOrderPreview(inputs, abortSignal) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.fetchApi("preview-order", Object.assign(Object.assign({}, inputs), { accountId: this.accountCap.accountId, collateralCoinType: this.accountCap.collateralCoinType }), abortSignal);
@@ -316,31 +345,30 @@ class PerpetualsAccount extends caller_1.Caller {
         });
     }
     getOrderDatas() {
-        const orderDatas = this.account.positions.reduce((acc, position) => [
-            ...acc,
-            ...position.pendingOrders.map((order) => ({
-                orderId: order.orderId,
-                marketId: position.marketId,
-                currentSize: order.size,
-            })),
-        ], []);
-        if (orderDatas.length <= 0)
-            return [];
-        return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/order-datas`, {
-            orderDatas,
+        return __awaiter(this, void 0, void 0, function* () {
+            const orderDatas = this.account.positions.reduce((acc, position) => [
+                ...acc,
+                ...position.pendingOrders.map((order) => ({
+                    orderId: order.orderId,
+                    currentSize: order.size,
+                })),
+            ], []);
+            if (orderDatas.length <= 0)
+                return [];
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/order-datas`, {
+                orderDatas,
+                accountCapId: this.accountCap.objectId,
+            });
         });
     }
-    // =========================================================================
-    //  Events
-    // =========================================================================
-    getCollateralEvents(inputs) {
+    getCollateralHistory(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApiIndexerEvents(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/events/collateral`, inputs);
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/collateral-history`, Object.assign(Object.assign({}, inputs), { accountCapId: this.accountCap.objectId }));
         });
     }
-    getOrderEvents(inputs) {
+    getOrderHistory(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApiIndexerEvents(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/events/order`, inputs);
+            return this.fetchApi(`${this.accountCap.collateralCoinType}/accounts/${this.accountCap.accountId}/order-history`, Object.assign(Object.assign({}, inputs), { accountCapId: this.accountCap.objectId }));
         });
     }
     // =========================================================================

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

@@ -67,7 +67,8 @@ export interface PerpetualsPositionIndexerResponse {
 }
 export type PerpetualsAccountPositionsIndexerResponse = [
     IdAsStringBytes,
-    PerpetualsPositionIndexerResponse
+    PerpetualsPositionIndexerResponse,
+    IFixedAsStringBytes
 ][];
 export type PerpetualsPreviewOrderIndexerResponse = {
     position: PerpetualsPositionIndexerResponse;
@@ -140,15 +141,15 @@ export type PostedOrderEventOnChain = EventOnChain<{
 export type FilledMakerOrderEventOnChain = EventOnChain<{
     ch_id: ObjectId;
     maker_account_id: BigIntAsString;
-    maker_collateral: IFixedAsString;
     collateral_change_usd: IFixedAsString;
-    order_id: BigIntAsString;
-    maker_size: BigIntAsString;
-    dropped: boolean;
     maker_base_amount: IFixedAsString;
-    maker_quote_amount: IFixedAsString;
+    maker_collateral: IFixedAsString;
+    maker_final_size: BigIntAsString;
     maker_pending_asks_quantity: IFixedAsString;
     maker_pending_bids_quantity: IFixedAsString;
+    maker_quote_amount: IFixedAsString;
+    maker_size: BigIntAsString;
+    order_id: BigIntAsString;
 }>;
 export type FilledTakerOrderEventOnChain = EventOnChain<{
     ch_id: ObjectId;

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

@@ -1 +1 @@
-{"version":3,"file":"perpetualsCastingTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/perpetuals/perpetualsCastingTypes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"perpetualsCastingTypes.d.ts","sourceRoot":"","sources":["../../../src/packages/perpetuals/perpetualsCastingTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAEN,cAAc,EAEd,eAAe,EAEf,cAAc,EACd,mBAAmB,EACnB,QAAQ,EACR,kBAAkB,EAClB,UAAU,EACV,MAAM,aAAa,CAAC;AAQrB,MAAM,WAAW,mCAAmC;IACnD,sBAAsB,EAAE,cAAc,CAAC;IACvC,MAAM,EAAE;QACP,EAAE,EAAE;YACH,EAAE,EAAE,eAAe,CAAC;SACpB,CAAC;QACF,OAAO,EAAE,cAAc,CAAC;QACxB,aAAa,EAAE,0CAA0C,CAAC;QAC1D,YAAY,EAAE,yCAAyC,CAAC;KACxD,CAAC;CACF;AAGD,MAAM,WAAW,0CAA0C;IAE1D,oBAAoB,EAAE,mBAAmB,CAAC;IAE1C,wBAAwB,EAAE,mBAAmB,CAAC;IAE9C,WAAW,EAAE,eAAe,CAAC;IAC7B,iBAAiB,EAAE,eAAe,CAAC;IAEnC,oBAAoB,EAAE,cAAc,CAAC;IAarC,iBAAiB,EAAE,cAAc,CAAC;IAElC,yBAAyB,EAAE,cAAc,CAAC;IAG1C,sBAAsB,EAAE,cAAc,CAAC;IAEvC,wBAAwB,EAAE,cAAc,CAAC;IAEzC,qBAAqB,EAAE,cAAc,CAAC;IAGtC,SAAS,EAAE,mBAAmB,CAAC;IAG/B,SAAS,EAAE,mBAAmB,CAAC;IAE/B,eAAe,EAAE,mBAAmB,CAAC;IAGrC,gBAAgB,EAAE,mBAAmB,CAAC;IAEtC,kBAAkB,EAAE,mBAAmB,CAAC;IAExC,mBAAmB,EAAE,mBAAmB,CAAC;IAEzC,QAAQ,EAAE,cAAc,CAAC;IAEzB,SAAS,EAAE,cAAc,CAAC;IAG1B,qBAAqB,EAAE,cAAc,CAAC;IAEtC,kBAAkB,EAAE,cAAc,CAAC;IAEnC,gBAAgB,EAAE,cAAc,CAAC;CACjC;AAGD,MAAM,WAAW,yCAAyC;IAGzD,qBAAqB,EAAE,mBAAmB,CAAC;IAG3C,sBAAsB,EAAE,mBAAmB,CAAC;IAG5C,mBAAmB,EAAE,cAAc,CAAC;IAEpC,YAAY,EAAE,mBAAmB,CAAC;IAElC,wBAAwB,EAAE,cAAc,CAAC;IAGzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,uBAAuB,EAAE,cAAc,CAAC;IAGxC,aAAa,EAAE,mBAAmB,CAAC;IAGnC,YAAY,EAAE,mBAAmB,CAAC;CAClC;AAED,MAAM,WAAW,iCAAiC;IACjD,QAAQ,EAAE;QAET,UAAU,EAAE,mBAAmB,CAAC;QAIhC,iBAAiB,EAAE,mBAAmB,CAAC;QAGvC,2BAA2B,EAAE,mBAAmB,CAAC;QAQjD,qBAAqB,EAAE,mBAAmB,CAAC;QAQ3C,sBAAsB,EAAE,mBAAmB,CAAC;QAG5C,aAAa,EAAE,mBAAmB,CAAC;QAGnC,aAAa,EAAE,mBAAmB,CAAC;QAEnC,cAAc,EAAE,cAAc,CAAC;QAE/B,SAAS,EAAE,mBAAmB,CAAC;QAE/B,SAAS,EAAE,mBAAmB,CAAC;KAC/B,CAAC;IACF,cAAc,EAAE;QACf,IAAI,EAAE,MAAM,CACX,MAAM,EAAE,oBAAoB;QAC5B,cAAc,CACd,CAAC;QACF,IAAI,EAAE,MAAM,CACX,MAAM,EAAE,oBAAoB;QAC5B,cAAc,CACd,CAAC;KACF,CAAC;CACF;AAED,MAAM,MAAM,yCAAyC,GAAG;IACvD,eAAe;IACf,iCAAiC;IACjC,mBAAmB;CACnB,EAAE,CAAC;AAEJ,MAAM,MAAM,qCAAqC,GAAG;IACnD,QAAQ,EAAE,iCAAiC,CAAC;IAC5C,cAAc,EAAE,mBAAmB,CAAC;IACpC,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,eAAe,EAAE,mBAAmB,CAAC;IACrC,WAAW,EAAE,mBAAmB,CAAC;IACjC,iBAAiB,EAAE,mBAAmB,CAAC;IACvC,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,mBAAmB,CAAC;CAClC,CAAC;AAKF,MAAM,MAAM,gCAAgC,GAAG,MAAM,CACpD,kBAAkB,EAClB,mCAAmC,CACnC,CAAC;AAUF,MAAM,MAAM,8BAA8B,GAAG,YAAY,CAAC;IACzD,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,cAAc,CAAC;CAC3B,CAAC,CAAC;AAEH,MAAM,MAAM,+BAA+B,GAAG,YAAY,CAAC;IAC1D,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,cAAc,CAAC;CAC3B,CAAC,CAAC;AAEH,MAAM,MAAM,+BAA+B,GAAG,YAAY,CAAC;IAC1D,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,cAAc,CAAC;IAC3B,yBAAyB,EAAE,cAAc,CAAC;CAC1C,CAAC,CAAC;AAEH,MAAM,MAAM,iCAAiC,GAAG,YAAY,CAAC;IAC5D,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,EAAE,cAAc,CAAC;IAC3B,yBAAyB,EAAE,cAAc,CAAC;CAC1C,CAAC,CAAC;AAEH,MAAM,MAAM,0BAA0B,GAAG,YAAY,CAAC;IACrD,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,qBAAqB,EAAE,cAAc,CAAC;IACtC,qBAAqB,EAAE,cAAc,CAAC;IACtC,sBAAsB,EAAE,cAAc,CAAC;CACvC,CAAC,CAAC;AAMH,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC;IACjD,KAAK,EAAE,QAAQ,CAAC;IAChB,gBAAgB,EAAE,cAAc,CAAC;IACjC,gBAAgB,EAAE,cAAc,CAAC;IACjC,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,cAAc,CAAC;IAChC,UAAU,EAAE,cAAc,CAAC;IAC3B,2BAA2B,EAAE,cAAc,CAAC;IAC5C,iBAAiB,EAAE,cAAc,CAAC;IAClC,kBAAkB,EAAE,cAAc,CAAC;IACnC,QAAQ,EAAE,cAAc,CAAC;CACzB,CAAC,CAAC;AAMH,MAAM,MAAM,0BAA0B,GAAG,YAAY,CAAC;IACrD,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,cAAc,CAAC;CAC3B,CAAC,CAAC;AAMH,MAAM,MAAM,yBAAyB,GAAG,YAAY,CAAC;IACpD,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,cAAc,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,MAAM,uBAAuB,GAAG,YAAY,CAAC;IAClD,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,eAAe,EAAE,cAAc,CAAC;IAChC,eAAe,EAAE,cAAc,CAAC;IAChC,YAAY,EAAE,cAAc,CAAC;IAC7B,YAAY,EAAE,cAAc,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,4BAA4B,GAAG,YAAY,CAAC;IACvD,KAAK,EAAE,QAAQ,CAAC;IAChB,gBAAgB,EAAE,cAAc,CAAC;IACjC,qBAAqB,EAAE,cAAc,CAAC;IACtC,iBAAiB,EAAE,cAAc,CAAC;IAClC,gBAAgB,EAAE,cAAc,CAAC;IACjC,gBAAgB,EAAE,cAAc,CAAC;IACjC,2BAA2B,EAAE,cAAc,CAAC;IAC5C,2BAA2B,EAAE,cAAc,CAAC;IAC5C,kBAAkB,EAAE,cAAc,CAAC;IACnC,UAAU,EAAE,cAAc,CAAC;IAC3B,QAAQ,EAAE,cAAc,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,MAAM,4BAA4B,GAAG,YAAY,CAAC;IACvD,KAAK,EAAE,QAAQ,CAAC;IAChB,gBAAgB,EAAE,cAAc,CAAC;IACjC,gBAAgB,EAAE,cAAc,CAAC;IACjC,qBAAqB,EAAE,cAAc,CAAC;IACtC,oBAAoB,EAAE,cAAc,CAAC;IACrC,qBAAqB,EAAE,cAAc,CAAC;IACtC,oBAAoB,EAAE,cAAc,CAAC;IACrC,qBAAqB,EAAE,cAAc,CAAC;IACtC,iBAAiB,EAAE,cAAc,CAAC;IAClC,kBAAkB,EAAE,cAAc,CAAC;IACnC,iBAAiB,EAAE,cAAc,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,MAAM,8BAA8B,GAAG,YAAY,CAAC;IACzD,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,cAAc,CAAC;CAC3B,CAAC,CAAC;AAMH,MAAM,MAAM,8BAA8B,GAAG,YAAY,CAAC;IACzD,KAAK,EAAE,QAAQ,CAAC;IAChB,WAAW,EAAE,cAAc,CAAC;IAC5B,UAAU,EAAE,cAAc,CAAC;IAC3B,YAAY,EAAE,cAAc,CAAC;IAC7B,wBAAwB,EAAE,cAAc,CAAC;CACzC,CAAC,CAAC;AAEH,MAAM,MAAM,6BAA6B,GAAG,YAAY,CAAC;IACxD,KAAK,EAAE,QAAQ,CAAC;IAChB,UAAU,EAAE,cAAc,CAAC;IAC3B,WAAW,EAAE,cAAc,CAAC;IAC5B,WAAW,EAAE,cAAc,CAAC;IAC5B,uBAAuB,EAAE,cAAc,CAAC;CACxC,CAAC,CAAC"}

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

@@ -1,6 +1,6 @@
 import { PerpetualsAccount } from "../..";
 import { Caller } from "../../general/utils/caller";
-import { ApiIndexerEventsBody, CoinType, FilledTakerOrderEvent, PerpetualsMarketId, PerpetualsMarketParams, PerpetualsMarketState, PerpetualsOrderData, PerpetualsOrderId, PerpetualsOrderPrice, PerpetualsOrderSide, PerpetualsOrderbookState, PerpetualsPosition, SuiNetwork, Timestamp, PerpetualsMarketData, Balance, PerpetualsFilledOrderData, ApiPerpetualsMarket24hrVolumeResponse } from "../../types";
+import { CoinType, PerpetualsMarketId, PerpetualsMarketParams, PerpetualsMarketState, PerpetualsOrderData, PerpetualsOrderId, PerpetualsOrderPrice, PerpetualsOrderSide, PerpetualsOrderbookState, SuiNetwork, Timestamp, PerpetualsMarketData, ApiPerpetualsMarket24hrVolumeResponse, ApiDataWithCursorBody, PerpetualsTradeHistoryWithCursor } from "../../types";
 export declare class PerpetualsMarket extends Caller {
     marketData: PerpetualsMarketData;
     readonly network?: SuiNetwork | undefined;
@@ -23,7 +23,7 @@ export declare class PerpetualsMarket extends Caller {
         leverage: number;
         price?: PerpetualsOrderPrice;
     }) => Promise<number>;
-    getFilledOrderEvents(inputs: ApiIndexerEventsBody): Promise<import("../..").IndexerEventsWithCursor<FilledTakerOrderEvent>>;
+    getTradeHistory(inputs: ApiDataWithCursorBody<Timestamp>): Promise<PerpetualsTradeHistoryWithCursor>;
     timeUntilNextFundingMs: () => Timestamp;
     nextFundingTimeMs: () => Timestamp;
     estimatedFundingRate: (inputs: {
@@ -35,38 +35,8 @@ export declare class PerpetualsMarket extends Caller {
     orderPriceToPrice: (inputs: {
         orderPrice: PerpetualsOrderPrice;
     }) => number;
-    calcOrderCollateral(inputs: {
-        indexPrice: number;
-        size: bigint;
-    }): Balance;
-    calcOptimisticMaxOrderSize: (inputs: {
-        position: PerpetualsPosition | undefined;
-        account: PerpetualsAccount;
-        indexPrice: number;
-        collateralPrice: number;
-        side: PerpetualsOrderSide;
-    }) => number;
-    calcPessimisticMaxOrderSizeUsd: (inputs: {
-        position: PerpetualsPosition | undefined;
-        freeMarginUsd: number;
-        minInitialMargin: number;
-        indexPrice: number;
-        side: PerpetualsOrderSide;
-        executionPrice: number;
-        sizeFilled: number;
-        sizePosted: number;
-        optimisticSize: number;
-    }) => Promise<number>;
-    calcCollateralRequiredForOrder: (inputs: {
-        fills: PerpetualsFilledOrderData[];
-        account: PerpetualsAccount;
-        side: PerpetualsOrderSide;
-        size: number;
-        indexPrice: number;
-        collateralPrice: number;
-        price: number | undefined;
-    }) => number;
     calcCollateralUsedForOrder: (inputs: {
+        leverage: number;
         orderData: PerpetualsOrderData;
         indexPrice: number;
         collateralPrice: number;

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":"AAAA,OAAO,EAA0B,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAGpD,OAAO,EAKN,QAAQ,EAKR,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,EAEnB,wBAAwB,EAExB,UAAU,EACV,SAAS,EAET,oBAAoB,EAIpB,qCAAqC,EACrC,qBAAqB,EACrB,gCAAgC,EAChC,MAAM,aAAa,CAAC;AAIrB,qBAAa,gBAAiB,SAAQ,MAAM;IAenC,UAAU,EAAE,oBAAoB;aACvB,OAAO,CAAC;IAXzB,SAAgB,QAAQ,EAAE,kBAAkB,CAAC;IAC7C,SAAgB,kBAAkB,EAAE,QAAQ,CAAC;IAC7C,SAAgB,YAAY,EAAE,sBAAsB,CAAC;IACrD,SAAgB,WAAW,EAAE,qBAAqB,CAAC;gBAO3C,UAAU,EAAE,oBAAoB,EACvB,OAAO,CAAC,wBAAY;IAgB9B,iBAAiB;IAIjB,aAAa,IAAI,OAAO,CAAC,qCAAqC,CAAC;IAM/D,gBAAgB;IAIhB,iBAAiB,CAAC,MAAM,EAAE;QAChC,cAAc,EAAE,MAAM,CAAC;QACvB,eAAe,EAAE,MAAM,CAAC;KACxB;IAWM,kBAAkB,WAAkB;QAC1C,OAAO,EAAE,iBAAiB,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,oBAAoB,CAAC;KAC7B,KAAG,QAAQ,MAAM,CAAC,CAajB;IAMW,eAAe,CAAC,MAAM,EAAE,qBAAqB,CAAC,SAAS,CAAC;IAW9D,sBAAsB,QAAO,SAAS,CAE3C;IAEK,iBAAiB,QAAO,SAAS,CAMtC;IAOK,oBAAoB,WAAY;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,KAAG,MAAM,CAWpE;IAEK,iBAAiB,WAAY;QACnC,KAAK,EAAE,MAAM,CAAC;KACd,KAAG,oBAAoB,CAStB;IAEK,iBAAiB,WAAY;QACnC,UAAU,EAAE,oBAAoB,CAAC;KACjC,KAAG,MAAM,CASR;IAEK,0BAA0B,WAAY;QAC5C,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,mBAAmB,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;QACnB,eAAe,EAAE,MAAM,CAAC;KACxB;oBACY,MAAM;uBACH,MAAM;MAkBpB;IAMK,OAAO;IAIP,QAAQ;IAIR,WAAW;IASX,kBAAkB;IAUlB,UAAU,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,iBAAiB,CAAA;KAAE,GAAG,MAAM;IAM1D,iBAAiB,WAAY;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,YAEnD;IAEK,gBAAgB,WAAY;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,YAMlE;IAuBF,OAAO,CAAC,qBAAqB;CA8E7B"}

package/dist/packages/perpetuals/perpetualsMarket.js

@@ -13,7 +13,6 @@ exports.PerpetualsMarket = void 0;
 const __1 = require("../..");
 const caller_1 = require("../../general/utils/caller");
 const iFixedUtils_1 = require("../../general/utils/iFixedUtils");
-const types_1 = require("../../types");
 const perpetuals_1 = require("./perpetuals");
 const utils_1 = require("./utils");
 class PerpetualsMarket extends caller_1.Caller {
@@ -79,181 +78,10 @@ class PerpetualsMarket extends caller_1.Caller {
                 tickSize,
             });
         };
-        this.calcOptimisticMaxOrderSize = (inputs) => {
-            const { position, indexPrice, side, account, collateralPrice } = inputs;
-            const imr = this.initialMarginRatio();
-            const isReversing = position
-                ? Boolean(side ^ perpetuals_1.Perpetuals.positionSide(position))
-                : false;
-            const freeMarginUsd = account.calcFreeMarginUsdForPosition(Object.assign(Object.assign({}, inputs), { market: this })) +
-                account.collateral() * collateralPrice;
-            let maxSize = freeMarginUsd / (indexPrice * imr);
-            if (isReversing && position && position.baseAssetAmount > BigInt(0)) {
-                const currentSizeNum = __1.Casting.IFixed.numberFromIFixed(position.baseAssetAmount) * 2;
-                const bidsQuantityNum = __1.Casting.IFixed.numberFromIFixed(position.bidsQuantity);
-                const asksQuantityNum = __1.Casting.IFixed.numberFromIFixed(position.asksQuantity);
-                maxSize += Math.max(Math.abs(currentSizeNum + bidsQuantityNum), Math.abs(currentSizeNum - asksQuantityNum));
-            }
-            return maxSize;
-        };
-        this.calcPessimisticMaxOrderSizeUsd = (inputs) => __awaiter(this, void 0, void 0, function* () {
-            const { indexPrice, side, position, executionPrice, freeMarginUsd, minInitialMargin, sizeFilled, sizePosted, optimisticSize, } = inputs;
-            const percentFilled = Math.min(sizeFilled / (sizeFilled + sizePosted), 1);
-            const marginRatioInitial = this.initialMarginRatio();
-            const takerFee = __1.Casting.IFixed.numberFromIFixed(this.marketParams.takerFee);
-            const isReversing = position
-                ? Boolean(side ^ perpetuals_1.Perpetuals.positionSide(position))
-                : false;
-            const slippage = percentFilled === 0
-                ? 0
-                : Math.max((side === types_1.PerpetualsOrderSide.Bid
-                    ? executionPrice - indexPrice
-                    : indexPrice - executionPrice) / indexPrice, 0);
-            const marginOfError = 0.005;
-            const safetyScalar = Math.min(1 - slippage, 1 - marginOfError);
-            let maxSize = 0;
-            if (isReversing && position && position.baseAssetAmount !== BigInt(0)) {
-                maxSize += Math.abs(__1.Casting.IFixed.numberFromIFixed(position.baseAssetAmount));
-                // Size that can be placed to close the position
-                const { marginDelta, reqDelta, sizeFilled, sizePosted } = this.simulateClosePosition({
-                    position,
-                    indexPrice,
-                    executionPrice,
-                    size: optimisticSize,
-                    percentFilled,
-                });
-                const newPercentFilled = sizeFilled / (sizeFilled + sizePosted);
-                const margin = freeMarginUsd + minInitialMargin + marginDelta;
-                const imr = minInitialMargin + reqDelta;
-                // Size that adds margin requirement
-                maxSize +=
-                    ((margin - imr) * safetyScalar) /
-                        (indexPrice * marginRatioInitial +
-                            (executionPrice * takerFee + slippage * indexPrice) *
-                                newPercentFilled);
-            }
-            else {
-                maxSize =
-                    (freeMarginUsd * safetyScalar) /
-                        (indexPrice * marginRatioInitial +
-                            (executionPrice * takerFee + slippage * indexPrice) *
-                                percentFilled);
-            }
-            // accounts for any minor price fluctatuations or possible rounding errors
-            return (this.roundToValidSize({ size: maxSize, floor: true }) * indexPrice);
-        });
-        this.calcCollateralRequiredForOrder = (inputs) => {
-            const { account, size, fills, side, price, indexPrice, collateralPrice, } = inputs;
-            const position = account.positionForMarketId({
-                marketId: this.marketId,
-            });
-            const positionSize = position
-                ? Math.abs(__1.Casting.IFixed.numberFromIFixed(position.baseAssetAmount))
-                : 0;
-            const isOpeningOrIncreasingPosition = !position ||
-                !positionSize ||
-                perpetuals_1.Perpetuals.positionSide(position) === side;
-            let sizeRemaining = Math.abs(size);
-            let fillsRemaining = __1.Helpers.deepCopy(fills.map((fill) => (Object.assign(Object.assign({}, fill), { size: Math.abs(fill.size) }))));
-            let sizeFilled = 0;
-            let sizeFilledUsd = 0;
-            let sizeFilledForReversing = 0;
-            let sizeFilledForReversingUsd = 0;
-            while (sizeRemaining > 0 && fillsRemaining.length > 0) {
-                const fill = fillsRemaining[0];
-                if (price !== undefined &&
-                    (side === types_1.PerpetualsOrderSide.Bid
-                        ? price < fill.price
-                        : price > fill.price))
-                    break;
-                let sizeToFill;
-                if (!isOpeningOrIncreasingPosition && sizeFilled >= positionSize) {
-                    sizeToFill = Math.min(sizeRemaining, fill.size);
-                    sizeFilledForReversing += sizeToFill;
-                    sizeFilledForReversingUsd += sizeToFill * fill.price;
-                }
-                else {
-                    sizeToFill = Math.min(sizeRemaining, fill.size, isOpeningOrIncreasingPosition
-                        ? Number.MAX_VALUE
-                        : positionSize - sizeFilled);
-                    sizeFilled += sizeToFill;
-                    sizeFilledUsd += sizeToFill * fill.price;
-                }
-                sizeRemaining -= sizeToFill;
-                fillsRemaining[0].size -= sizeToFill;
-                if (fillsRemaining[0].size <= 0) {
-                    fillsRemaining = [...fillsRemaining.slice(1)];
-                }
-            }
-            const imr = this.initialMarginRatio();
-            const sizePosted = sizeRemaining;
-            const executionPrice = sizeFilled ? sizeFilledUsd / sizeFilled : 0;
-            const collateralForUnrealizedPnl = (sizeFilled *
-                Math.max(0, side === types_1.PerpetualsOrderSide.Bid
-                    ? executionPrice - indexPrice
-                    : indexPrice - executionPrice)) /
-                collateralPrice;
-            const collateralForFilled = (sizeFilled * executionPrice * imr) / collateralPrice;
-            const collateralForPosted = (sizePosted * indexPrice * imr) / collateralPrice;
-            const marginOfError = 0.1;
-            let collateralRequired;
-            if (isOpeningOrIncreasingPosition) {
-                // opening/increasing position
-                collateralRequired =
-                    (1 + marginOfError) *
-                        (collateralForFilled +
-                            collateralForPosted +
-                            collateralForUnrealizedPnl);
-            }
-            else if (sizeFilled === positionSize &&
-                sizeFilledForReversing === 0) {
-                // closing position
-                // TODO: make this match account close position tx inputs calc
-                return 0;
-            }
-            else if (sizeFilledForReversing > 0) {
-                // reversing position
-                // TODO: use correct calculations
-                // const executionPriceForReversing = sizeFilledForReversing
-                // 	? sizeFilledForReversingUsd / sizeFilledForReversing
-                // 	: 0;
-                // const collateralForFilledForReversing =
-                // 	(sizeFilledForReversing * executionPriceForReversing * imr) /
-                // 	collateralPrice;
-                // collateralRequired =
-                // 	(1 + marginOfError) *
-                // 	(collateralForFilledForReversing + collateralForPosted);
-                const executionPriceForReversing = sizeFilledForReversing
-                    ? sizeFilledForReversingUsd / sizeFilledForReversing
-                    : 0;
-                const collateralForFilledForReversing = (sizeFilledForReversing * executionPriceForReversing * imr) /
-                    collateralPrice;
-                const collateralForUnrealizedPnlForReversing = (sizeFilledForReversing *
-                    Math.max(0, side === types_1.PerpetualsOrderSide.Bid
-                        ? executionPriceForReversing - indexPrice
-                        : indexPrice - executionPriceForReversing)) /
-                    collateralPrice;
-                // const positionFreeMargin =
-                // 	account.calcFreeMarginUsdForPosition({
-                // 		...inputs,
-                // 		market: this,
-                // 	}) * collateralPrice;
-                const collateralChange = collateralForPosted +
-                    (collateralForFilledForReversing +
-                        // - positionFreeMargin
-                        collateralForUnrealizedPnlForReversing);
-                return ((1 + marginOfError * (collateralChange > 0 ? 1 : -1)) *
-                    collateralChange);
-            }
-            else {
-                // reducing position
-                return 0;
-            }
-            return Math.min(collateralRequired, account.collateral());
-        };
         this.calcCollateralUsedForOrder = (inputs) => {
-            const { orderData, indexPrice, collateralPrice } = inputs;
-            const imr = this.initialMarginRatio();
+            const { leverage, orderData, indexPrice, collateralPrice } = inputs;
+            const imr = 1 / leverage;
+            // const imr = this.initialMarginRatio();
             const collateralUsd = Number(orderData.initialSize - orderData.filledSize) *
                 this.lotSize() *
                 indexPrice *
@@ -293,18 +121,13 @@ class PerpetualsMarket extends caller_1.Caller {
         return this.fetchApi("orderbook-state", Object.assign(Object.assign({}, inputs), { lotSize: this.lotSize(), tickSize: this.tickSize() }));
     }
     // =========================================================================
-    //  Events
+    //  Trade History
     // =========================================================================
-    getFilledOrderEvents(inputs) {
+    getTradeHistory(inputs) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.fetchApiIndexerEvents(`events/filled-order`, inputs);
+            return this.fetchApi(`trade-history`, inputs);
         });
     }
-    calcOrderCollateral(inputs) {
-        const { indexPrice, size } = inputs;
-        const imr = this.initialMarginRatio();
-        return BigInt(Math.floor(Number(size) * this.lotSize() * indexPrice * imr));
-    }
     // =========================================================================
     //  Value Conversions
     // =========================================================================
@@ -350,7 +173,8 @@ class PerpetualsMarket extends caller_1.Caller {
     // }
     simulateClosePosition(inputs) {
         const { position, indexPrice, executionPrice, size, percentFilled } = inputs;
-        const imr = this.initialMarginRatio();
+        const imr = 1 / position.leverage;
+        // const imr = this.initialMarginRatio();
         const takerFee = __1.Casting.IFixed.numberFromIFixed(this.marketParams.takerFee);
         const positionSizeNum = __1.Casting.IFixed.numberFromIFixed(position.baseAssetAmount);
         const positionBidsNum = __1.Casting.IFixed.numberFromIFixed(position.bidsQuantity);