@d8x/perpetuals-sdk 2.5.0 → 2.5.2

package/src/contracts/factories/index.ts

@@ -1,6 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+export { CompositeToken__factory } from "./CompositeToken__factory";
 export { ERC20__factory } from "./ERC20__factory";
 export { IPerpetualManager__factory } from "./IPerpetualManager__factory";
 export { IPyth__factory } from "./IPyth__factory";

package/src/contracts/index.ts

@@ -1,6 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+export type { CompositeToken } from "./CompositeToken";
 export type { ERC20 } from "./ERC20";
 export type { IPerpetualManager } from "./IPerpetualManager";
 export type { IPyth } from "./IPyth";
@@ -15,6 +16,7 @@ export type { PerpetualManagerProxy } from "./PerpetualManagerProxy";
 export type { ShareToken } from "./ShareToken";
 export type { RedStoneAbi } from "./RedStoneAbi";
 export * as factories from "./factories";
+export { CompositeToken__factory } from "./factories/CompositeToken__factory";
 export { ERC20__factory } from "./factories/ERC20__factory";
 export { IPerpetualManager__factory } from "./factories/IPerpetualManager__factory";
 export { IPyth__factory } from "./factories/IPyth__factory";

package/src/marketData.ts

@@ -4,7 +4,6 @@ import {
   CLOSED_SIDE,
   COLLATERAL_CURRENCY_BASE,
   COLLATERAL_CURRENCY_QUANTO,
-  CollaterlCCY,
   ERC20_ABI,
   MULTICALL_ADDRESS,
   OrderStatus,
@@ -15,9 +14,9 @@ import {
   ZERO_ORDER_ID,
 } from "./constants";
 import {
+  CompositeToken__factory,
   ERC20__factory,
   IPerpetualManager__factory,
-  LimitOrderBook__factory,
   Multicall3__factory,
   type LimitOrderBook,
   type Multicall3,
@@ -1316,6 +1315,7 @@ export default class MarketData extends PerpetualDataHandler {
     const poolInfo = this.poolStaticInfos[this.getPoolStaticInfoIndexFromSymbol(symbol)];
     const perpInfo = this.getPerpetualStaticInfo(symbol);
     const IERC20 = new Interface(ERC20_ABI) as ERC20Interface;
+    const compositeToken = CompositeToken__factory.createInterface();
     const isPredMkt = false;
     const indexPriceInfo = await this.priceFeedGetter.fetchPricesForPerpetual(symbol);
     let coll2SettlePromise = this.fetchCollateralToSettlementConversion(symbol);
@@ -1349,6 +1349,12 @@ export default class MarketData extends PerpetualDataHandler {
           ZERO_ADDRESS,
         ]),
       },
+      // 3: composite wallet balance if applicable
+      {
+        target: poolInfo.poolSettleTokenAddr,
+        allowFailure: true,
+        callData: compositeToken.encodeFunctionData("effectiveBalanceOf", [traderAddr]),
+      },
     ];
 
     // multicall
@@ -1378,7 +1384,9 @@ export default class MarketData extends PerpetualDataHandler {
 
     // Max based on margin requirements:
     const walletBalance = decNToFloat(
-      IERC20.decodeFunctionResult("balanceOf", encodedResults[1].returnData)[0],
+      encodedResults[3].success
+        ? compositeToken.decodeFunctionResult("effectiveBalanceOf", encodedResults[3].returnData)[0]
+        : IERC20.decodeFunctionResult("balanceOf", encodedResults[1].returnData)[0],
       poolInfo.poolSettleTokenDecimals
     );
 

package/src/version.ts

@@ -1 +1 @@
-export const D8X_SDK_VERSION = "2.5.0";
+export const D8X_SDK_VERSION = "2.5.2";