@bulletxyz/bullet-sdk 0.27.2-rc.3 → 0.27.2-rc.4

package/dist/node/index.js

@@ -3315,12 +3315,6 @@ var NETWORKS = {
     ws: "wss://ws.mainnet.bullet.xyz/ws"
   }
 };
-var CHAIN_IDS = {
-  Localnet: 4321,
-  Staging: 4323,
-  Testnet: 4322,
-  Mainnet: 4321
-};
 var GLOBAL_DEFAULT_MAX_LEVERAGE = 1e3;
 
 // src/utils.ts
@@ -7527,6 +7521,7 @@ var ORDER_TYPES = [
 ];
 var createBaseResponse = (schema) => schema;
 var StateResponseSchemas = {
+  RollupSchema: (valueSchema) => createBaseResponse(z.object({ schema: valueSchema })),
   StateValue: (valueSchema) => createBaseResponse(z.object({ value: valueSchema.nullable() })),
   CustomRouteValue: (valueSchema) => createBaseResponse(valueSchema),
   StateMapElement: (keySchema, valueSchema) => createBaseResponse(
@@ -7775,7 +7770,38 @@ var Schemas = {
         })
       )
     }),
-    last_trade_price: DecimalSchema
+    last_trade_price: DecimalSchema,
+    taker_fees_tenth_bps: z.array(z.number()),
+    maker_fees_tenth_bps: z.array(z.number())
+  }),
+  SpotMarket: z.object({
+    market_id: MarketId,
+    is_active: z.boolean(),
+    base_asset_id: AssetId,
+    quote_asset_id: AssetId,
+    base_min_lot_size: DecimalSchema,
+    quote_min_lot_size: DecimalSchema,
+    max_orders_per_side: U16Schema,
+    orderbook: z.object({
+      market_id: MarketId,
+      bids: createJsonMap(
+        z.string(),
+        z.object({
+          order_ids: z.array(OrderId),
+          total_size: DecimalSchema
+        })
+      ),
+      asks: createJsonMap(
+        z.string(),
+        z.object({
+          order_ids: z.array(OrderId),
+          total_size: DecimalSchema
+        })
+      )
+    }),
+    last_trade_price: DecimalSchema,
+    taker_fees_tenth_bps: z.array(z.number()),
+    maker_fees_tenth_bps: z.array(z.number())
   }),
   MarginConfig: z.object({
     perp_liquidation_config: PerpLiquidationConfig,
@@ -7875,8 +7901,28 @@ var ResponseSchemas = {
       not_found: z.array(MarketId)
     })
   ),
+  SpotMarket: createBaseResponse(
+    z.object({
+      market_id: MarketId,
+      market: Schemas.SpotMarket
+    })
+  ),
+  SpotMarketBulk: createBaseResponse(
+    z.object({
+      found: createJsonMap(MarketId, Schemas.SpotMarket),
+      not_found: z.array(MarketId)
+    })
+  ),
   MarginConfig: StateResponseSchemas.StateValue(Schemas.MarginConfig),
-  AccountAddresses: createBaseResponse(Schemas.AccountAddresses)
+  AccountAddresses: createBaseResponse(Schemas.AccountAddresses),
+  ChainData: StateResponseSchemas.RollupSchema(
+    z.object({
+      chain_data: z.object({
+        chain_id: z.number(),
+        chain_name: z.string()
+      })
+    })
+  )
 };
 
 // src/connection.ts
@@ -8276,6 +8322,7 @@ var ExchangeConnection = class _ExchangeConnection extends BaseConnection {
     __publicField(this, "assetRegistry");
     __publicField(this, "assetRegistryReverse");
     __publicField(this, "marketRegistry");
+    // ID and type
     __publicField(this, "marketRegistryReverse");
     if (endpoints.ws) {
       this.wsManager = new WebSocketManager(endpoints.ws);
@@ -8326,7 +8373,12 @@ var ExchangeConnection = class _ExchangeConnection extends BaseConnection {
     this.marketRegistryReverse = /* @__PURE__ */ new Map();
     for (const info of rawMarketRegistry.metas.values()) {
       if (info && typeof info.name === "string") {
-        this.marketRegistry.set(info.name, info.id);
+        this.marketRegistry.set(info.name, {
+          id: info.id,
+          kind: info.kind,
+          baseAssetId: info.base_asset_id,
+          name: info.name
+        });
         this.marketRegistryReverse.set(info.id, info.name);
       }
     }
@@ -8386,6 +8438,9 @@ var ExchangeConnection = class _ExchangeConnection extends BaseConnection {
     return assetName;
   }
   getMarketId(market) {
+    return this.getMarketMeta(market).id;
+  }
+  getMarketMeta(market) {
     const marketRegistry = this.getMarketMapping();
     const marketId = marketRegistry.get(market);
     if (marketId === void 0) {
@@ -8424,6 +8479,12 @@ var ExchangeConnection = class _ExchangeConnection extends BaseConnection {
     const parsed = ResponseSchemas.OrderbookL2Bulk.parse(response);
     return parsed.found;
   }
+  async getChainId() {
+    const path = "/rollup/schema/";
+    const response = await this.fetchApiResource(path);
+    const parsed = ResponseSchemas.ChainData.parse(response);
+    return parsed.schema.chain_data.chain_id;
+  }
   async getUserAccountAddresses(offset, limit) {
     const path = "/modules/exchange/api/v1/account/addresses";
     const response = await this.fetchApiResource(path, {
@@ -8495,6 +8556,24 @@ var ExchangeConnection = class _ExchangeConnection extends BaseConnection {
     const parsed = ResponseSchemas.PerpMarketBulk.parse(response);
     return parsed.found;
   }
+  async getSpotMarket(market) {
+    const marketId = this.getMarketId(market);
+    const path = `/modules/exchange/api/v1/spot-market/${marketId}`;
+    const response = await this.fetchApiResource(path);
+    const parsed = ResponseSchemas.SpotMarket.parse(response);
+    return parsed.market;
+  }
+  async getSpotMarkets(markets) {
+    const marketIds = markets.map((market) => {
+      return this.getMarketId(market);
+    });
+    const path = "/modules/exchange/api/v1/spot-market/bulk";
+    const response = await this.fetchBulkApiResource(path, {
+      market_ids: marketIds
+    });
+    const parsed = ResponseSchemas.SpotMarketBulk.parse(response);
+    return parsed.found;
+  }
   async getMarginConfig() {
     const path = "/modules/exchange/state/margin-config";
     const response = await this.fetchApiResource(path);
@@ -8821,14 +8900,12 @@ var BulletError = class _BulletError extends Error {
 
 // src/wallet/wallet.ts
 var Wallet = class {
-  constructor(publicKey, chainId = 4321) {
+  constructor(publicKey) {
     // For now this is same as pubkey but b58 encoded
     __publicField(this, "address");
     __publicField(this, "publicKey");
-    __publicField(this, "chainId");
     this.publicKey = publicKey;
     this.address = hexToBase58(this.publicKey);
-    this.chainId = chainId;
     console.info("Address:", this.address);
   }
 };
@@ -9366,7 +9443,12 @@ var Client = class _Client {
     this.address = wallet.address;
   }
   // Static convenience constructors
-  static async fromEndpoints(endpoints, wallet, txOpts = DEFAULT_TRANSACTION_OPTS, chainId = 4321) {
+  static async fromEndpoints(endpoints, wallet, txOpts = DEFAULT_TRANSACTION_OPTS) {
+    validateEndpoints(endpoints);
+    console.debug("Endpoints:", endpoints);
+    const exchange = await ExchangeConnection.fromEndpoints(endpoints);
+    const chainId = await exchange.getChainId();
+    console.debug("Chain ID:", chainId);
     const rollup = await createStandardRollup({
       url: endpoints.rest,
       getSerializer: (schema) => new WasmSerializer(schema),
@@ -9379,29 +9461,16 @@ var Client = class _Client {
         }
       }
     });
-    validateEndpoints(endpoints);
-    console.debug("Endpoints:", endpoints);
-    const exchange = await ExchangeConnection.fromEndpoints(endpoints);
     return new _Client(endpoints, exchange, wallet, rollup);
   }
   static async fromNetwork(network, wallet, txOpts = DEFAULT_TRANSACTION_OPTS) {
     if (!isNetwork(network)) {
       throw new Error(`Invalid network: ${network}`);
     }
-    return await _Client.fromEndpoints(
-      NETWORKS[network],
-      wallet,
-      txOpts,
-      CHAIN_IDS[network]
-    );
+    return await _Client.fromEndpoints(NETWORKS[network], wallet, txOpts);
   }
-  static async fromRestUrl(restUrl, wallet, network, txOpts = DEFAULT_TRANSACTION_OPTS) {
-    return await _Client.fromEndpoints(
-      { rest: restUrl },
-      wallet,
-      txOpts,
-      CHAIN_IDS[network]
-    );
+  static async fromRestUrl(restUrl, wallet, txOpts = DEFAULT_TRANSACTION_OPTS) {
+    return await _Client.fromEndpoints({ rest: restUrl }, wallet, txOpts);
   }
   setGenerationOverride(generation) {
     this.generationOverride = generation;
@@ -9508,51 +9577,58 @@ var Client = class _Client {
     });
   }
   async placeOrder(placeOrderArgs) {
-    const marketId = this.exchange.getMarketId(placeOrderArgs.market);
-    return await this.submitTransaction({
-      exchange: {
-        place_order: {
-          args: {
-            market_id: marketId,
-            price: BulletWasm.convert_rust_decimal_to_json(
-              placeOrderArgs.price.toFixed()
+    const marketMeta = this.exchange.getMarketMeta(placeOrderArgs.market);
+    const marketId = marketMeta.id;
+    const innerArgsObject = {
+      args: {
+        market_id: marketId,
+        price: BulletWasm.convert_rust_decimal_to_json(
+          placeOrderArgs.price.toFixed()
+        ),
+        size: BulletWasm.convert_rust_decimal_to_json(
+          placeOrderArgs.size.toFixed()
+        ),
+        side: placeOrderArgs.side,
+        order_type: placeOrderArgs.orderType,
+        reduce_only: placeOrderArgs.reduceOnly,
+        client_order_id: placeOrderArgs.clientOrderId ? placeOrderArgs.clientOrderId.toString() : null,
+        tpsl: placeOrderArgs.tpsl ? {
+          pending_tp: placeOrderArgs.tpsl.pendingTp ? {
+            order_price: BulletWasm.convert_rust_decimal_to_json(
+              placeOrderArgs.tpsl.pendingTp.orderPrice.toFixed()
             ),
-            size: BulletWasm.convert_rust_decimal_to_json(
-              placeOrderArgs.size.toFixed()
+            trigger_price: BulletWasm.convert_rust_decimal_to_json(
+              placeOrderArgs.tpsl.pendingTp.triggerPrice.toFixed()
             ),
-            side: placeOrderArgs.side,
-            order_type: placeOrderArgs.orderType,
-            reduce_only: placeOrderArgs.reduceOnly,
-            client_order_id: placeOrderArgs.clientOrderId ? placeOrderArgs.clientOrderId.toString() : null,
-            tpsl: placeOrderArgs.tpsl ? {
-              pending_tp: placeOrderArgs.tpsl.pendingTp ? {
-                order_price: BulletWasm.convert_rust_decimal_to_json(
-                  placeOrderArgs.tpsl.pendingTp.orderPrice.toFixed()
-                ),
-                trigger_price: BulletWasm.convert_rust_decimal_to_json(
-                  placeOrderArgs.tpsl.pendingTp.triggerPrice.toFixed()
-                ),
-                trigger_direction: placeOrderArgs.tpsl.pendingTp.triggerDirection,
-                price_condition: placeOrderArgs.tpsl.pendingTp.priceCondition,
-                order_type: placeOrderArgs.tpsl.pendingTp.orderType
-              } : null,
-              pending_sl: placeOrderArgs.tpsl.pendingSl ? {
-                order_price: BulletWasm.convert_rust_decimal_to_json(
-                  placeOrderArgs.tpsl.pendingSl.orderPrice.toFixed()
-                ),
-                trigger_price: BulletWasm.convert_rust_decimal_to_json(
-                  placeOrderArgs.tpsl.pendingSl.triggerPrice.toFixed()
-                ),
-                trigger_direction: placeOrderArgs.tpsl.pendingSl.triggerDirection,
-                price_condition: placeOrderArgs.tpsl.pendingSl.priceCondition,
-                order_type: placeOrderArgs.tpsl.pendingSl.orderType
-              } : null,
-              dynamic_size: placeOrderArgs.tpsl.dynamicSize
-            } : null
-          }
-        }
+            trigger_direction: placeOrderArgs.tpsl.pendingTp.triggerDirection,
+            price_condition: placeOrderArgs.tpsl.pendingTp.priceCondition,
+            order_type: placeOrderArgs.tpsl.pendingTp.orderType
+          } : null,
+          pending_sl: placeOrderArgs.tpsl.pendingSl ? {
+            order_price: BulletWasm.convert_rust_decimal_to_json(
+              placeOrderArgs.tpsl.pendingSl.orderPrice.toFixed()
+            ),
+            trigger_price: BulletWasm.convert_rust_decimal_to_json(
+              placeOrderArgs.tpsl.pendingSl.triggerPrice.toFixed()
+            ),
+            trigger_direction: placeOrderArgs.tpsl.pendingSl.triggerDirection,
+            price_condition: placeOrderArgs.tpsl.pendingSl.priceCondition,
+            order_type: placeOrderArgs.tpsl.pendingSl.orderType
+          } : null,
+          dynamic_size: placeOrderArgs.tpsl.dynamicSize
+        } : null
       }
-    });
+    };
+    const outerArgsObject = marketMeta.kind === "Spot" ? {
+      exchange: {
+        place_spot_order: innerArgsObject
+      }
+    } : {
+      exchange: {
+        place_order: innerArgsObject
+      }
+    };
+    return await this.submitTransaction(outerArgsObject);
   }
   async createPositionTpsl(market, tpslOrders) {
     const marketId = this.exchange.getMarketId(market);
@@ -10047,16 +10123,14 @@ import { readFileSync } from "node:fs";
 import * as ed from "@noble/ed25519";
 import { Ed25519Signer } from "@sovereign-sdk/signers";
 var NodeWallet = class _NodeWallet extends Wallet {
-  constructor(privateKey, publicKey, chainId = 4321) {
+  constructor(privateKey, publicKey) {
     if (typeof window !== "undefined") {
       throw new Error("NodeWallet is not supported in browser environments");
     }
-    super(publicKey, chainId);
+    super(publicKey);
     // All hex strings - may eventually add a class
     __publicField(this, "privateKey");
-    __publicField(this, "chainId");
     this.privateKey = privateKey;
-    this.chainId = chainId;
   }
   static async fromPrivateKeyBytes(privateKeyBytes) {
     const privateKey = bytesToHex(privateKeyBytes.slice(0, 32)).replace(
@@ -10105,7 +10179,6 @@ export {
   ApiError,
   BaseResponseSchemas,
   BulletError,
-  CHAIN_IDS,
   Client,
   Connection,
   ExchangeConnection,