@bulletxyz/bullet-sdk 0.19.0-rc.0 → 0.20.0-rc.0

package/dist/node/index.js

@@ -6797,16 +6797,14 @@ var Schemas = {
 var ResponseSchemas = {
   DummyValue: StateResponseSchemas.StateValue(Schemas.DummyValue),
   Order: StateResponseSchemas.StateMapElement(OrderId, Schemas.Order),
-  UserAccount: createBaseResponse(
-    z.object({ user_accounts: z.array(Schemas.UserAccount) })
+  UserAccounts: createBaseResponse(
+    z.object({
+      user_accounts: createJsonMap(Base58Address, Schemas.UserAccount)
+    })
   ),
   Pricing: StateResponseSchemas.StateValue(Schemas.Pricing),
   UsdcPnlPool: StateResponseSchemas.StateValue(Schemas.UsdcPnlPool),
   UsdcInsuranceFund: StateResponseSchemas.StateValue(Schemas.UsdcInsuranceFund),
-  // BorrowLendMarket: StateResponseSchemas.StateMapElement(
-  //   AssetId,
-  //   Schemas.BorrowLendMarket,
-  // ),
   PerpMarket: StateResponseSchemas.StateMapElement(AssetId, Schemas.PerpMarket),
   OrderbookL2: createBaseResponse(
     z.object({
@@ -6814,10 +6812,12 @@ var ResponseSchemas = {
     })
   ),
   BorrowLendMarkets: createBaseResponse(
-    z.object({ markets: z.array(Schemas.BorrowLendMarket) })
+    z.object({
+      markets: createJsonMap(AssetId, Schemas.BorrowLendMarket)
+    })
   ),
   PerpMarkets: createBaseResponse(
-    z.object({ markets: z.array(Schemas.PerpMarket) })
+    z.object({ markets: createJsonMap(AssetId, Schemas.PerpMarket) })
   ),
   MarginConfig: StateResponseSchemas.StateValue(Schemas.MarginConfig),
   AccountAddresses: createBaseResponse(
@@ -7063,8 +7063,12 @@ var WebSocketManager = class {
   }
   async connect() {
     if (this.socket?.readyState === WebSocket.OPEN) return;
-    this.socket = new WebSocket(this.url);
+    if (this.socket) {
+      this.socket.close();
+      this.socket = null;
+    }
     return new Promise((resolve, reject) => {
+      this.socket = new WebSocket(this.url);
       const timeout = setTimeout(() => {
         reject(new Error("Connection timeout"));
         this.socket?.close();
@@ -7241,7 +7245,7 @@ var ExchangeConnection = class extends BaseConnection {
     const response = await this.fetchApiResource(path, {
       addresses: addresses.join(",")
     });
-    const parsed = ResponseSchemas.UserAccount.parse(response);
+    const parsed = ResponseSchemas.UserAccounts.parse(response);
     return parsed.data.user_accounts;
   }
   async getPricing() {
@@ -7268,7 +7272,7 @@ var ExchangeConnection = class extends BaseConnection {
     )}`;
     const response = await this.fetchApiResource(path);
     const parsed = ResponseSchemas.BorrowLendMarkets.parse(response);
-    return new Map(asset_ids.map((id, i) => [id, parsed.data.markets[i]]));
+    return parsed.data.markets;
   }
   async getPerpMarkets(asset_ids) {
     const path = `/modules/exchange/perp-markets?asset_ids=${asset_ids.join(
@@ -7276,7 +7280,7 @@ var ExchangeConnection = class extends BaseConnection {
     )}`;
     const response = await this.fetchApiResource(path);
     const parsed = ResponseSchemas.PerpMarkets.parse(response);
-    return new Map(asset_ids.map((id, i) => [id, parsed.data.markets[i]]));
+    return parsed.data.markets;
   }
   async getMarginConfig() {
     const path = "/modules/exchange/state/margin";
@@ -8949,8 +8953,8 @@ var Client = class _Client {
     return await this.connection.getTokenBalance(this.wallet.address, tokenId);
   }
   async getUserAccount() {
-    const ua = await this.exchange.getUserAccounts([this.wallet.address]);
-    return ua[0];
+    const userAccounts = await this.exchange.getUserAccounts([this.wallet.address]);
+    return userAccounts.get(this.wallet.address);
   }
   async submitTransaction(runtimeCall) {
     const result = await this.queue.add(async () => {