@bluefin-exchange/pro-sdk 0.1.12 → 0.1.13

package/dist/example.js

@@ -13,6 +13,8 @@ const index_1 = require("./index");
 const ed25519_1 = require("@mysten/sui/keypairs/ed25519");
 const index_2 = require("./index");
 const index_3 = require("./index");
+const utils_1 = require("@noble/hashes/utils");
+const library_sui_1 = require("@firefly-exchange/library-sui");
 // Configure logging
 const logger = {
     info: (message) => console.log(new Date().toISOString(), "-", message),
@@ -77,21 +79,27 @@ function handleAccountDataEvent(msg) {
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         // Create wallet from mnemonic
-        const suiWallet = ed25519_1.Ed25519Keypair.deriveKeypair(
-        // "dilemma salmon lake ceiling moral glide cute that ginger float area aunt vague remind cage mother concert inch dizzy present proud program time urge",
-        "know puzzle puzzle table miss member token image loop velvet skin legend clarify affair wisdom alert lucky unveil mean two question nice spatial grape");
+        // const suiWallet = Ed25519Keypair.deriveKeypair(
+        //   // "dilemma salmon lake ceiling moral glide cute that ginger float area aunt vague remind cage mother concert inch dizzy present proud program time urge",
+        //   "know puzzle puzzle table miss member token image loop velvet skin legend clarify affair wisdom alert lucky unveil mean two question nice spatial grape"
+        // );
+        const suiWallet = ed25519_1.Ed25519Keypair.fromSecretKey((0, utils_1.hexToBytes)("3427d19dcf5781f0874c36c78aec22c03acda435d69efcbf249e8821793567a1"));
         logger.info(`Sui Address: ${suiWallet.getPublicKey().toSuiAddress()}`);
         const bfSigner = new index_3.BluefinRequestSigner((0, index_3.makeAddressableKeyPair)(suiWallet));
-        const client = new index_2.BluefinProSdk(bfSigner, "devnet", undefined);
+        const client = new index_2.BluefinProSdk(bfSigner, "devnet", new library_sui_1.SuiClient({ url: "https://fullnode.testnet.sui.io:443" }));
         yield client.initialize();
         try {
+            yield client.deposit("1000");
             // Get Market Data from Exchange Data API
             const exchangeInfo = (yield client.exchangeDataApi.getExchangeInfo()).data;
             logger.info(`Exchange Info: ${JSON.stringify(exchangeInfo)}`);
-            // Get any arbitrary market from the exchange info
-            const arbitraryMarket = exchangeInfo.markets[0];
-            logger.info(`Selected market: ${JSON.stringify(arbitraryMarket)}`);
-            const symbol = arbitraryMarket.symbol;
+            // Find SUI-PERP market
+            const perpMarket = exchangeInfo.markets.find((m) => m.symbol === "SUI-PERP");
+            if (!perpMarket) {
+                throw new Error("SUI-PERP market not found");
+            }
+            logger.info(`Selected market: ${JSON.stringify(perpMarket)}`);
+            const symbol = perpMarket.symbol;
             // Get market data
             const candleStick = (yield client.exchangeDataApi.getCandlestickData(symbol, index_1.KlineInterval._1m, index_1.CandlePriceType.Oracle)).data;
             logger.info(`Candle stick: ${JSON.stringify(candleStick)}`);
@@ -154,7 +162,7 @@ function main() {
                 side: index_1.OrderSide.Long,
                 leverageE9: "1000000000",
                 isIsolated: false,
-                expiresAtUtcMillis: Date.now() + 60000,
+                expiresAtUtcMillis: Date.now() + 6 * 60 * 1000,
                 postOnly: false,
                 reduceOnly: false,
                 timeInForce: index_1.OrderTimeInForce.Gtt,

package/dist/src/request-signer.d.ts

@@ -1,84 +1,18 @@
 import { Keypair, Signer } from "@mysten/sui/cryptography";
-import { LoginRequest, WithdrawRequest, AccountPositionLeverageUpdateRequest, AccountPositionLeverageUpdateRequestSignedFields, CreateOrderRequestSignedFields, WithdrawRequestSignedFields } from "./api";
+import { LoginRequest, AccountPositionLeverageUpdateRequestSignedFields, CreateOrderRequestSignedFields, WithdrawRequestSignedFields } from "./api";
+import { DryRunTransactionBlockResponse, SuiClient, SuiTransactionBlockResponse, TransactionBlock } from "@firefly-exchange/library-sui";
 export interface IBluefinSigner {
     getAddress(): string;
-    signLeverageUpdateRequest: (fields: AccountPositionLeverageUpdateRequestSignedFields) => Promise<AccountPositionLeverageUpdateRequest>;
-    signOrderRequest: (fields: CreateOrderRequestSignedFields) => Promise<[string, string]>;
-    signWithdrawRequest: (fields: WithdrawRequestSignedFields) => Promise<WithdrawRequest>;
+    signLeverageUpdateRequest: (fields: AccountPositionLeverageUpdateRequestSignedFields) => Promise<string>;
+    signOrderRequest: (fields: CreateOrderRequestSignedFields) => Promise<string>;
+    signWithdrawRequest: (fields: WithdrawRequestSignedFields) => Promise<string>;
     signLoginRequest: (request: LoginRequest) => Promise<string>;
+    executeTx: (txb: TransactionBlock, suiClient: SuiClient) => Promise<DryRunTransactionBlockResponse | SuiTransactionBlockResponse>;
 }
 export interface IAddressable {
     getAddress(): string;
 }
 export declare function makeAddressableKeyPair<T extends Keypair>(keyPair: T): T & IAddressable;
-export declare const OrderRequestSignedFieldsBCS: import("@mysten/sui/bcs").BcsType<{
-    symbol: string;
-    accountAddress: string;
-    priceE9: string;
-    quantityE9: string;
-    leverageE9: string;
-    side: string;
-    isIsolated: boolean;
-    expiresAtUtcMillis: string;
-    salt: string;
-    idsId: string;
-    signedAtUtcMillis: string;
-}, {
-    symbol: string;
-    accountAddress: string | Uint8Array<ArrayBufferLike>;
-    priceE9: string | number | bigint;
-    quantityE9: string | number | bigint;
-    leverageE9: string | number | bigint;
-    side: string;
-    isIsolated: boolean;
-    expiresAtUtcMillis: string | number | bigint;
-    salt: string | number | bigint;
-    idsId: string | Uint8Array<ArrayBufferLike>;
-    signedAtUtcMillis: string | number | bigint;
-}>;
-export declare const LeverageUpdateRequestSignedFieldsBCS: import("@mysten/sui/bcs").BcsType<{
-    accountAddress: string;
-    symbol: string;
-    leverageE9: string;
-    salt: string;
-    idsId: string;
-    signedAtUtcMillis: string;
-}, {
-    accountAddress: string | Uint8Array<ArrayBufferLike>;
-    symbol: string;
-    leverageE9: string | number | bigint;
-    salt: string | number | bigint;
-    idsId: string | Uint8Array<ArrayBufferLike>;
-    signedAtUtcMillis: string | number | bigint;
-}>;
-export declare const WithdrawRequestSignedFieldsBCS: import("@mysten/sui/bcs").BcsType<{
-    assetSymbol: string;
-    accountAddress: string;
-    amountE9: string;
-    salt: string;
-    edsId: string;
-    signedAtUtcMillis: string;
-}, {
-    assetSymbol: string;
-    accountAddress: string | Uint8Array<ArrayBufferLike>;
-    amountE9: string | number | bigint;
-    salt: string | number | bigint;
-    edsId: string | Uint8Array<ArrayBufferLike>;
-    signedAtUtcMillis: string | number | bigint;
-}>;
-export declare const SerializedSignatureBCS: import("@mysten/sui/bcs").BcsType<{
-    signature: number[];
-    publicKey: number[];
-    scheme: number;
-}, {
-    signature: Iterable<number> & {
-        length: number;
-    };
-    publicKey: Iterable<number> & {
-        length: number;
-    };
-    scheme: number;
-}>;
 export declare class BluefinRequestSigner implements IBluefinSigner {
     private readonly wallet;
     constructor(wallet: Pick<Signer, "signPersonalMessage"> & IAddressable);
@@ -89,15 +23,16 @@ export declare class BluefinRequestSigner implements IBluefinSigner {
     /**
      * Sign an order request
      */
-    signOrderRequest(orderRequestSignedFields: CreateOrderRequestSignedFields): Promise<[string, string]>;
+    signOrderRequest(signedFields: CreateOrderRequestSignedFields): Promise<string>;
     /**
      * Sign a withdraw request
      */
-    signWithdrawRequest(withdrawRequestSignedFields: WithdrawRequestSignedFields): Promise<WithdrawRequest>;
+    signWithdrawRequest(withdrawRequestSignedFields: WithdrawRequestSignedFields): Promise<string>;
     /**
      * Sign a leverage update request
      */
-    signLeverageUpdateRequest(requestSignedFields: AccountPositionLeverageUpdateRequestSignedFields): Promise<AccountPositionLeverageUpdateRequest>;
+    signLeverageUpdateRequest(signedFields: AccountPositionLeverageUpdateRequestSignedFields): Promise<string>;
+    executeTx(txb: TransactionBlock, suiClient: SuiClient): Promise<DryRunTransactionBlockResponse | SuiTransactionBlockResponse>;
     /**
      * Get the wallet's address
      */

package/dist/src/request-signer.js

@@ -9,50 +9,72 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BluefinRequestSigner = exports.SerializedSignatureBCS = exports.WithdrawRequestSignedFieldsBCS = exports.LeverageUpdateRequestSignedFieldsBCS = exports.OrderRequestSignedFieldsBCS = void 0;
+exports.BluefinRequestSigner = void 0;
 exports.makeAddressableKeyPair = makeAddressableKeyPair;
-const crypto = require("crypto");
 const cryptography_1 = require("@mysten/sui/cryptography");
-const bcs_1 = require("@mysten/sui/bcs");
+const library_sui_1 = require("@firefly-exchange/library-sui");
 function makeAddressableKeyPair(keyPair) {
     return Object.assign(keyPair, {
         getAddress: () => keyPair.getPublicKey().toSuiAddress(),
     });
 }
-exports.OrderRequestSignedFieldsBCS = bcs_1.bcs.struct("OrderRequestSignedFields", {
-    symbol: bcs_1.bcs.string(),
-    accountAddress: bcs_1.bcs.Address,
-    priceE9: bcs_1.bcs.u64(),
-    quantityE9: bcs_1.bcs.u64(),
-    leverageE9: bcs_1.bcs.u64(),
-    side: bcs_1.bcs.string(),
-    isIsolated: bcs_1.bcs.bool(),
-    expiresAtUtcMillis: bcs_1.bcs.u64(),
-    salt: bcs_1.bcs.u64(),
-    idsId: bcs_1.bcs.Address,
-    signedAtUtcMillis: bcs_1.bcs.u64(),
-});
-exports.LeverageUpdateRequestSignedFieldsBCS = bcs_1.bcs.struct("LeverageUpdateRequestSignedFields", {
-    accountAddress: bcs_1.bcs.Address,
-    symbol: bcs_1.bcs.string(),
-    leverageE9: bcs_1.bcs.u64(),
-    salt: bcs_1.bcs.u64(),
-    idsId: bcs_1.bcs.Address,
-    signedAtUtcMillis: bcs_1.bcs.u64(),
-});
-exports.WithdrawRequestSignedFieldsBCS = bcs_1.bcs.struct("WithdrawRequestSignedFields", {
-    assetSymbol: bcs_1.bcs.string(),
-    accountAddress: bcs_1.bcs.Address,
-    amountE9: bcs_1.bcs.u64(),
-    salt: bcs_1.bcs.u64(),
-    edsId: bcs_1.bcs.Address,
-    signedAtUtcMillis: bcs_1.bcs.u64(),
-});
-exports.SerializedSignatureBCS = bcs_1.bcs.struct("SerializedSignature", {
-    signature: bcs_1.bcs.vector(bcs_1.bcs.u8()),
-    publicKey: bcs_1.bcs.vector(bcs_1.bcs.u8()),
-    scheme: bcs_1.bcs.u8(),
-});
+// ------- ISerializables ---------
+// Enums
+var ClientPayloadType;
+(function (ClientPayloadType) {
+    ClientPayloadType["WithdrawRequest"] = "Bluefin Pro Withdrawal";
+    ClientPayloadType["OrderRequest"] = "Bluefin Pro Order";
+    ClientPayloadType["LeverageAdjustment"] = "Bluefin Pro Leverage Adjustment";
+})(ClientPayloadType || (ClientPayloadType = {}));
+var PositionType;
+(function (PositionType) {
+    PositionType["Isolated"] = "ISOLATED";
+    PositionType["Cross"] = "CROSS";
+})(PositionType || (PositionType = {}));
+// Conversion functions
+function toUIWithdrawRequest(val) {
+    return {
+        type: ClientPayloadType.WithdrawRequest,
+        eds: val.edsId,
+        assetSymbol: val.assetSymbol,
+        account: val.accountAddress,
+        amount: val.amountE9,
+        salt: val.salt,
+        signedAt: val.signedAtUtcMillis.toString(),
+    };
+}
+function toUICreateOrderRequest(val) {
+    return {
+        type: ClientPayloadType.OrderRequest,
+        ids: val.idsId,
+        account: val.accountAddress,
+        market: val.symbol,
+        price: val.priceE9,
+        quantity: val.quantityE9,
+        leverage: val.leverageE9,
+        side: val.side.toString(),
+        positionType: val.isIsolated ? PositionType.Isolated : PositionType.Cross,
+        expiration: val.expiresAtUtcMillis.toString(),
+        salt: val.salt,
+        signedAt: val.signedAtUtcMillis.toString(),
+    };
+}
+function toUIUpdateAccountPositionLeverageRequest(val) {
+    return {
+        type: ClientPayloadType.LeverageAdjustment,
+        ids: val.idsId,
+        account: val.accountAddress,
+        market: val.symbol,
+        leverage: val.leverageE9,
+        salt: val.salt,
+        signedAt: val.signedAtUtcMillis.toString(),
+    };
+}
+// ---------- Utils ----------
+function toJson(val) {
+    return JSON.stringify(val, null, 2);
+}
+// --------------------------------
 class BluefinRequestSigner {
     constructor(wallet) {
         this.wallet = wallet;
@@ -70,36 +92,15 @@ class BluefinRequestSigner {
     /**
      * Sign an order request
      */
-    signOrderRequest(orderRequestSignedFields) {
+    signOrderRequest(signedFields) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signableFields = {
-                symbol: orderRequestSignedFields.symbol,
-                accountAddress: orderRequestSignedFields.accountAddress,
-                priceE9: orderRequestSignedFields.priceE9,
-                quantityE9: orderRequestSignedFields.quantityE9,
-                leverageE9: orderRequestSignedFields.leverageE9,
-                side: orderRequestSignedFields.side,
-                isIsolated: orderRequestSignedFields.isIsolated,
-                expiresAtUtcMillis: orderRequestSignedFields.expiresAtUtcMillis,
-                salt: orderRequestSignedFields.salt,
-                idsId: orderRequestSignedFields.idsId,
-                signedAtUtcMillis: orderRequestSignedFields.signedAtUtcMillis,
-            };
-            const orderBytes = exports.OrderRequestSignedFieldsBCS.serialize(signableFields).toBytes();
-            const digest = yield (global.crypto ? global.crypto : crypto).subtle.digest("SHA-256", orderBytes);
-            const walletHack = this.wallet;
-            const signedMessageSerialized = yield this.wallet.signPersonalMessage(orderBytes);
-            const signedMessage = yield walletHack.sign(Buffer.from(digest));
+            const orderJson = toJson(toUICreateOrderRequest(signedFields));
+            const signedMessageSerialized = yield this.wallet.signPersonalMessage(new TextEncoder().encode(orderJson));
             const parsedSignature = (0, cryptography_1.parseSerializedSignature)(signedMessageSerialized.signature);
             if (parsedSignature.signatureScheme == "MultiSig") {
                 throw new Error("MultiSig not supported");
             }
-            const signature = exports.SerializedSignatureBCS.serialize({
-                signature: signedMessage,
-                publicKey: parsedSignature.publicKey,
-                scheme: cryptography_1.SIGNATURE_SCHEME_TO_FLAG[parsedSignature.signatureScheme],
-            }).toHex();
-            return [signature, Buffer.from(digest).toString("hex")];
+            return signedMessageSerialized.signature;
         });
     }
     /**
@@ -107,67 +108,32 @@ class BluefinRequestSigner {
      */
     signWithdrawRequest(withdrawRequestSignedFields) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signableFields = {
-                assetSymbol: withdrawRequestSignedFields.assetSymbol,
-                accountAddress: withdrawRequestSignedFields.accountAddress,
-                amountE9: withdrawRequestSignedFields.amountE9,
-                salt: withdrawRequestSignedFields.salt,
-                edsId: withdrawRequestSignedFields.edsId,
-                signedAtUtcMillis: withdrawRequestSignedFields.signedAtUtcMillis,
-            };
-            const requestBytes = exports.WithdrawRequestSignedFieldsBCS.serialize(signableFields).toBytes();
-            const digest = yield (global.crypto ? global.crypto : crypto).subtle.digest("SHA-256", requestBytes);
-            const walletHack = this.wallet;
-            const signedMessageSerialized = yield this.wallet.signPersonalMessage(requestBytes);
-            const signedMessage = yield walletHack.sign(Buffer.from(digest));
+            const requestJson = toJson(toUIWithdrawRequest(withdrawRequestSignedFields));
+            const signedMessageSerialized = yield this.wallet.signPersonalMessage(new TextEncoder().encode(requestJson));
             const parsedSignature = (0, cryptography_1.parseSerializedSignature)(signedMessageSerialized.signature);
             if (parsedSignature.signatureScheme == "MultiSig") {
                 throw new Error("MultiSig not supported");
             }
-            const signature = exports.SerializedSignatureBCS.serialize({
-                signature: signedMessage,
-                publicKey: parsedSignature.publicKey,
-                scheme: cryptography_1.SIGNATURE_SCHEME_TO_FLAG[parsedSignature.signatureScheme],
-            }).toHex();
-            return {
-                signature,
-                requestHash: Buffer.from(digest).toString("hex"),
-                signedFields: withdrawRequestSignedFields,
-            };
+            return signedMessageSerialized.signature;
         });
     }
     /**
      * Sign a leverage update request
      */
-    signLeverageUpdateRequest(requestSignedFields) {
+    signLeverageUpdateRequest(signedFields) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signableFields = {
-                symbol: requestSignedFields.symbol,
-                accountAddress: requestSignedFields.accountAddress,
-                leverageE9: requestSignedFields.leverageE9,
-                salt: requestSignedFields.salt,
-                idsId: requestSignedFields.idsId,
-                signedAtUtcMillis: requestSignedFields.signedAtUtcMillis,
-            };
-            const requestBytes = exports.LeverageUpdateRequestSignedFieldsBCS.serialize(signableFields).toBytes();
-            const digest = yield (global.crypto ? global.crypto : crypto).subtle.digest("SHA-256", requestBytes);
-            const walletHack = this.wallet;
-            const signedMessageSerialized = yield this.wallet.signPersonalMessage(requestBytes);
-            const signedMessage = yield walletHack.sign(Buffer.from(digest));
+            const requestJson = toJson(toUIUpdateAccountPositionLeverageRequest(signedFields));
+            const signedMessageSerialized = yield this.wallet.signPersonalMessage(new TextEncoder().encode(requestJson));
             const parsedSignature = (0, cryptography_1.parseSerializedSignature)(signedMessageSerialized.signature);
             if (parsedSignature.signatureScheme == "MultiSig") {
                 throw new Error("MultiSig not supported");
             }
-            const signature = exports.SerializedSignatureBCS.serialize({
-                signature: signedMessage,
-                publicKey: parsedSignature.publicKey,
-                scheme: cryptography_1.SIGNATURE_SCHEME_TO_FLAG[parsedSignature.signatureScheme],
-            }).toHex();
-            return {
-                signature,
-                requestHash: Buffer.from(digest).toString("hex"),
-                signedFields: requestSignedFields,
-            };
+            return signedMessageSerialized.signature;
+        });
+    }
+    executeTx(txb, suiClient) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return library_sui_1.SuiBlocks.execCall(txb, suiClient, this.wallet, false);
         });
     }
     /**

package/dist/src/sdk.d.ts

@@ -1,6 +1,7 @@
 import { OrderType, OrderTimeInForce, SelfTradePreventionType, OrderSide, CancelOrdersRequest, AccountDataApi, ExchangeApi, MarketStreamMessage, AccountStreamMessage } from "./api";
 import { IBluefinSigner } from "./request-signer";
 import { WebSocket } from "ws";
+import { SuiClient } from "@firefly-exchange/library-sui";
 export interface OrderParams {
     clientOrderId: string;
     type: OrderType;
@@ -21,9 +22,13 @@ type BasePathConfig = {
     authHost: string | null;
     apiHost: string | null;
     tradeHost: string | null;
+    marketWsHost: string | null;
+    accountWsHost: string | null;
 };
 export declare class BluefinProSdk {
     private readonly bfSigner;
+    private environment;
+    private suiClient;
     private currentAccountAddress;
     private readonly configs;
     readonly exchangeDataApi: ExchangeApi;
@@ -35,18 +40,22 @@ export declare class BluefinProSdk {
     private isConnected;
     private updateTokenInterval;
     private contractsConfig;
-    constructor(bfSigner: IBluefinSigner, environment?: "mainnet" | "testnet" | "devnet", currentAccountAddress?: string | null, basePathConfig?: BasePathConfig | null);
+    private assets;
+    private txBuilder;
+    constructor(bfSigner: IBluefinSigner, environment: "mainnet" | "testnet" | "devnet" | undefined, suiClient: SuiClient, currentAccountAddress?: string | null, basePathConfig?: BasePathConfig | null);
     private generateSalt;
+    private initializeTxBuilder;
     initialize(): Promise<void>;
     private setContractsConfig;
     private loginAndUpdateToken;
     private login;
     getAccessToken(): Promise<string>;
-    getOpenOrders(symbol: string): Promise<import("axios").AxiosResponse<import("./api").OpenOrderResponse[], any>>;
+    getOpenOrders(symbol?: string): Promise<import("axios").AxiosResponse<import("./api").OpenOrderResponse[], any>>;
     updateLeverage(symbol: string, leverageE9: string): Promise<import("axios").AxiosResponse<void, any>>;
     createOrder(params: OrderParams): Promise<any>;
     cancelOrder(cancelOrdersRequest: CancelOrdersRequest): Promise<import("axios").AxiosResponse<void, any>>;
     withdraw(assetSymbol: string, amountE9: string): Promise<void>;
+    deposit(amountE9: string, accountAddress?: string): Promise<import("@firefly-exchange/library-sui").DryRunTransactionBlockResponse | import("@firefly-exchange/library-sui").SuiTransactionBlockResponse>;
     private setAccessToken;
     private refreshToken;
     createAccountDataStreamListener(handler: (data: AccountStreamMessage) => Promise<void>): Promise<WebSocket>;

package/dist/src/sdk.js

@@ -13,21 +13,29 @@ exports.BluefinProSdk = void 0;
 const api_1 = require("./api");
 const configuration_1 = require("./configuration");
 const ws_1 = require("ws");
+const v3_1 = require("@firefly-exchange/library-sui/dist/src/v3");
+const library_sui_1 = require("@firefly-exchange/library-sui");
 const environmentConfig = {
     mainnet: {
         authHost: "https://auth.api.sui-prod.bluefin.io",
         apiHost: "https://api.sui-prod.bluefin.io",
         tradeHost: "https://trade.api.sui-prod.bluefin.io",
+        marketWsHost: "wss://stream.api.sui-prod.bluefin.io/ws/market",
+        accountWsHost: "wss://stream.api.sui-prod.bluefin.io/ws/account",
     },
     testnet: {
         authHost: "https://auth.api.sui-staging.bluefin.io",
         apiHost: "https://api.sui-staging.bluefin.io",
         tradeHost: "https://trade.api.sui-staging.bluefin.io",
+        marketWsHost: "wss://stream.api.sui-staging.bluefin.io/ws/market",
+        accountWsHost: "wss://stream.api.sui-staging.bluefin.io/ws/account",
     },
     devnet: {
         authHost: "https://auth.api.sui-dev.bluefin.io",
         apiHost: "https://api.sui-dev.bluefin.io",
         tradeHost: "https://trade.api.sui-dev.bluefin.io",
+        marketWsHost: "wss://stream.api.sui-dev.bluefin.io/ws/market",
+        accountWsHost: "wss://stream.api.sui-dev.bluefin.io/ws/account",
     },
 };
 var Services;
@@ -36,10 +44,14 @@ var Services;
     Services[Services["Exchange"] = 1] = "Exchange";
     Services[Services["Trade"] = 2] = "Trade";
     Services[Services["Auth"] = 3] = "Auth";
+    Services[Services["MarketWebsocket"] = 4] = "MarketWebsocket";
+    Services[Services["AccountWebsocket"] = 5] = "AccountWebsocket";
 })(Services || (Services = {}));
 class BluefinProSdk {
-    constructor(bfSigner, environment = "mainnet", currentAccountAddress = null, basePathConfig = null) {
+    constructor(bfSigner, environment = "mainnet", suiClient, currentAccountAddress = null, basePathConfig = null) {
         this.bfSigner = bfSigner;
+        this.environment = environment;
+        this.suiClient = suiClient;
         this.currentAccountAddress = currentAccountAddress;
         this.configs = {};
         this.isConnected = false;
@@ -50,13 +62,19 @@ class BluefinProSdk {
         const basePaths = {
             authHost: basePathConfig && (basePathConfig === null || basePathConfig === void 0 ? void 0 : basePathConfig.authHost)
                 ? basePathConfig.authHost
-                : environmentConfig[environment].authHost,
+                : environmentConfig[this.environment].authHost,
             apiHost: basePathConfig && (basePathConfig === null || basePathConfig === void 0 ? void 0 : basePathConfig.apiHost)
                 ? basePathConfig.apiHost
-                : environmentConfig[environment].apiHost,
+                : environmentConfig[this.environment].apiHost,
             tradeHost: basePathConfig && (basePathConfig === null || basePathConfig === void 0 ? void 0 : basePathConfig.tradeHost)
                 ? basePathConfig.tradeHost
-                : environmentConfig[environment].tradeHost,
+                : environmentConfig[this.environment].tradeHost,
+            marketWsHost: basePathConfig && (basePathConfig === null || basePathConfig === void 0 ? void 0 : basePathConfig.marketWsHost)
+                ? basePathConfig.marketWsHost
+                : environmentConfig[this.environment].marketWsHost,
+            accountWsHost: basePathConfig && (basePathConfig === null || basePathConfig === void 0 ? void 0 : basePathConfig.accountWsHost)
+                ? basePathConfig.accountWsHost
+                : environmentConfig[this.environment].accountWsHost,
         };
         const authApiConfig = new configuration_1.Configuration({
             basePath: basePaths.authHost,
@@ -78,13 +96,47 @@ class BluefinProSdk {
         });
         this.configs[Services.Trade] = tradeApiConfig;
         this.tradeApi = new api_1.TradeApi(tradeApiConfig);
+        const marketWsConfig = new configuration_1.Configuration({
+            basePath: basePaths.marketWsHost,
+        });
+        this.configs[Services.MarketWebsocket] = marketWsConfig;
+        const accountWsConfig = new configuration_1.Configuration({
+            basePath: basePaths.accountWsHost,
+        });
+        this.configs[Services.AccountWebsocket] = accountWsConfig;
     }
     generateSalt() {
         return (Date.now() + Math.floor(Math.random() * 1000000)).toString();
     }
+    initializeTxBuilder() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            this.txBuilder = new v3_1.TxBuilder({
+                AdminCap: "",
+                ExternalDataStore: ((_a = this.contractsConfig) === null || _a === void 0 ? void 0 : _a.edsId) || "",
+                InternalDataStore: ((_b = this.contractsConfig) === null || _b === void 0 ? void 0 : _b.idsId) || "",
+                Operators: {
+                    admin: ((_c = this.contractsConfig) === null || _c === void 0 ? void 0 : _c.operators.admin) || "",
+                    fee: ((_d = this.contractsConfig) === null || _d === void 0 ? void 0 : _d.operators.fee) || "",
+                    funding: ((_e = this.contractsConfig) === null || _e === void 0 ? void 0 : _e.operators.funding) || "",
+                    pruning: "",
+                    sequencer: ((_f = this.contractsConfig) === null || _f === void 0 ? void 0 : _f.operators.sequencer) || "",
+                },
+                Package: ((_g = this.contractsConfig) === null || _g === void 0 ? void 0 : _g.currentContractAddress) || "",
+                Perpetuals: {},
+                SupportedAssets: ((_h = this.assets) === null || _h === void 0 ? void 0 : _h.reduce((agg, x) => {
+                    agg[x.symbol] = Object.assign(Object.assign({}, x), { coinType: x.assetType });
+                    return agg;
+                }, {})) || {},
+                TreasuryCap: "",
+                UpgradeCap: "",
+            });
+        });
+    }
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.setContractsConfig();
+            yield this.initializeTxBuilder();
             yield this.loginAndUpdateToken();
             this.updateTokenInterval = setInterval(() => this.refreshToken(), 10000);
             this.isConnected = true;
@@ -94,6 +146,7 @@ class BluefinProSdk {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.exchangeDataApi.getExchangeInfo();
             this.contractsConfig = response.data.contractsConfig;
+            this.assets = response.data.assets;
         });
     }
     loginAndUpdateToken() {
@@ -162,7 +215,11 @@ class BluefinProSdk {
                 signedAtUtcMillis: Date.now(),
             };
             const request = yield this.bfSigner.signLeverageUpdateRequest(signedFields);
-            return yield this.tradeApi.putLeverageUpdate(request);
+            return yield this.tradeApi.putLeverageUpdate({
+                signedFields,
+                signature: request,
+                requestHash: "",
+            });
         });
     }
     createOrder(params) {
@@ -184,11 +241,11 @@ class BluefinProSdk {
                 expiresAtUtcMillis: params.expiresAtUtcMillis,
                 signedAtUtcMillis: Date.now(),
             };
-            const [signature, orderHash] = yield this.bfSigner.signOrderRequest(signedFields);
+            const signature = yield this.bfSigner.signOrderRequest(signedFields);
             const createOrderRequest = {
                 signedFields,
                 signature,
-                orderHash,
+                orderHash: "",
                 clientOrderId: params.clientOrderId,
                 type: params.type,
                 reduceOnly: (_a = params.reduceOnly) !== null && _a !== void 0 ? _a : false,
@@ -224,9 +281,37 @@ class BluefinProSdk {
                 salt: this.generateSalt(),
                 signedAtUtcMillis: Date.now(),
             };
-            const request = yield this.bfSigner.signWithdrawRequest(signedFields);
-            yield this.tradeApi.postWithdraw(request);
-            console.log("Withdraw request sent:", request);
+            const signature = yield this.bfSigner.signWithdrawRequest(signedFields);
+            yield this.tradeApi.postWithdraw({
+                signedFields,
+                signature,
+                requestHash: "",
+            });
+            console.log("Withdraw request sent:", signedFields);
+        });
+    }
+    deposit(amountE9, accountAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            const assetSymbol = "USDC";
+            const txb = new library_sui_1.TransactionBlock();
+            const assetType = (_b = (_a = this.assets) === null || _a === void 0 ? void 0 : _a.find((x) => x.symbol === assetSymbol)) === null || _b === void 0 ? void 0 : _b.assetType;
+            if (!assetType) {
+                throw new Error("Missing USDC asset type");
+            }
+            const [splitCoin, mergedCoin] = yield library_sui_1.CoinUtils.createCoinWithBalance(this.suiClient, txb, amountE9, assetType, this.currentAccountAddress || this.bfSigner.getAddress());
+            (_c = this.txBuilder) === null || _c === void 0 ? void 0 : _c.depositToAssetBank(assetSymbol, accountAddress ||
+                this.currentAccountAddress ||
+                this.bfSigner.getAddress(), amountE9, splitCoin, {
+                txBlock: txb,
+            });
+            if (mergedCoin) {
+                txb.transferObjects([mergedCoin], this.currentAccountAddress || this.bfSigner.getAddress());
+            }
+            if (splitCoin) {
+                txb.transferObjects([splitCoin], this.currentAccountAddress || this.bfSigner.getAddress());
+            }
+            return this.bfSigner.executeTx(txb, this.suiClient);
         });
     }
     setAccessToken() {
@@ -261,7 +346,7 @@ class BluefinProSdk {
                 if (!this.tokenResponse) {
                     throw new Error("Missing tokenResponse");
                 }
-                const ws = new ws_1.WebSocket("wss://stream.api.sui-staging.bluefin.io/ws/account", {
+                const ws = new ws_1.WebSocket(this.configs[Services.AccountWebsocket].basePath, {
                     headers: {
                         Authorization: `Bearer ${this.tokenResponse.accessToken}`,
                     },
@@ -278,7 +363,7 @@ class BluefinProSdk {
     createMarketDataStreamListener(handler) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                const ws = new ws_1.WebSocket("wss://stream.api.sui-staging.bluefin.io/ws/market");
+                const ws = new ws_1.WebSocket(this.configs[Services.MarketWebsocket].basePath);
                 ws.onmessage = (event) => __awaiter(this, void 0, void 0, function* () {
                     yield handler(JSON.parse(event.data));
                 });