lint & format

ts/client/src/accounts/openOrders.ts

@@ -149,10 +149,11 @@ export class OpenOrders {
     });
   }
 
-  public async cancelOrder(order: Order | { clientOrderId: number }): Promise<string> {
-
+  public async cancelOrder(
+    order: Order | { clientOrderId: number },
+  ): Promise<string> {
     const ixs: TransactionInstruction[] = [];
-    if ("clientOrderId" in order) {
+    if ('clientOrderId' in order) {
       const id = new BN(order.clientOrderId);
       const [ix] = await this.cancelOrderByClientIdIx(id);
       ixs.push(ix);
@@ -348,11 +349,23 @@ export class OpenOrders {
   }
 
   public async cancelOrderByIdIx(id: BN) {
-    return this.market.client.cancelOrderByIdIx(this.pubkey, this.account, this.market.account, id, this.delegate);
+    return this.market.client.cancelOrderByIdIx(
+      this.pubkey,
+      this.account,
+      this.market.account,
+      id,
+      this.delegate,
+    );
   }
 
   public async cancelOrderByClientIdIx(id: BN) {
-    return this.market.client.cancelOrderByClientIdIx(this.pubkey, this.account, this.market.account, id, this.delegate);
+    return this.market.client.cancelOrderByClientIdIx(
+      this.pubkey,
+      this.account,
+      this.market.account,
+      id,
+      this.delegate,
+    );
   }
 
   public async settleFundsIx(

ts/client/src/client.ts

@@ -734,7 +734,7 @@ export class OpenBookV2Client {
     orderType: PlaceOrderType,
     bids: PlaceMultipleOrdersArgs[],
     asks: PlaceMultipleOrdersArgs[],
-    limit: number = 12,
+    limit = 12,
     openOrdersDelegate?: Keypair,
   ): Promise<[TransactionInstruction, Signer[]]> {
     const ix = await this.program.methods
@@ -777,7 +777,7 @@ export class OpenBookV2Client {
     orderType: PlaceOrderType,
     bids: PlaceMultipleOrdersArgs[],
     asks: PlaceMultipleOrdersArgs[],
-    limit: number = 12,
+    limit = 12,
     openOrdersDelegate?: Keypair,
   ): Promise<[TransactionInstruction, Signer[]]> {
     const ix = await this.program.methods

ts/client/src/structs/order.ts

@@ -39,6 +39,10 @@ export class Order {
   }
 
   public toPrettyString(): string {
-    return `side:${this.side === SideUtils.Bid ? 'bid' : 'ask'} price:${this.price} size:${this.size} seqNum:${this.seqNum.toString()} expired:${this.isExpired}`;
+    return `side:${this.side === SideUtils.Bid ? 'bid' : 'ask'} price:${
+      this.price
+    } size:${this.size} seqNum:${this.seqNum.toString()} expired:${
+      this.isExpired
+    }`;
   }
 }

ts/client/src/test/market.ts

@@ -6,7 +6,7 @@ import {
   findAllMarkets,
   initReadOnlyOpenbookClient,
   Watcher,
-  sleep
+  sleep,
 } from '..';
 
 async function testFindAccountsByMints(): Promise<void> {
@@ -62,4 +62,4 @@ async function testWatchMarket(): Promise<void> {
 // void testFindAccountsByMints();
 // void testFindAllMarkets();
 // void testDecodeMarket();
-void testWatchMarket();
+void testWatchMarket();

ts/client/src/test/openOrders.ts

@@ -62,7 +62,6 @@ async function testPlaceAndCancelOrder(): Promise<void> {
   console.log('cancelled order', sigCancel);
 }
 
-
 async function testPlaceAndCancelOrderByClientId(): Promise<void> {
   const client = initOpenbookClient();
   const marketPk = new PublicKey(
@@ -85,7 +84,7 @@ async function testPlaceAndCancelOrderByClientId(): Promise<void> {
 
   console.log('placed order', sigPlace);
 
-  const sigCancel = await oo?.cancelOrder({clientOrderId: 9999});
+  const sigCancel = await oo?.cancelOrder({ clientOrderId: 9999 });
 
   console.log('cancelled order', sigCancel);
 }

ts/client/src/utils/rpc.ts

@@ -17,6 +17,7 @@ export async function sendTransaction(
   opts: any = {},
 ): Promise<string> {
   const connection = provider.connection;
+  const additionalSigners = opts?.additionalSigners || [];
 
   if ((connection as any).banksClient !== undefined) {
     const tx = new Transaction();
@@ -28,7 +29,7 @@ export async function sendTransaction(
       connection as any
     ).banksClient.getLatestBlockhash();
 
-    for (const signer of opts?.additionalSigners) {
+    for (const signer of additionalSigners) {
       tx.partialSign(signer);
     }
 
@@ -58,11 +59,8 @@ export async function sendTransaction(
   });
   let vtx = new VersionedTransaction(message);
 
-  if (
-    opts?.additionalSigners !== undefined &&
-    opts?.additionalSigners.length !== 0
-  ) {
-    vtx.sign([...opts?.additionalSigners]);
+  if (additionalSigners !== undefined && additionalSigners.length !== 0) {
+    vtx.sign([...additionalSigners]);
   }
 
   if (

ts/client/src/utils/utils.ts

@@ -132,7 +132,6 @@ export function initOpenbookClient(): OpenBookV2Client {
   });
 }
 
-
 export function sleep(ms: number) {
-  return new Promise(resolve => setTimeout(resolve, ms));
-}
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}

ts/client/src/utils/watcher.ts

@@ -1,18 +1,23 @@
-import { Connection } from "@solana/web3.js";
-import { BookSide, Market, OpenOrders } from "..";
+import { Connection } from '@solana/web3.js';
+import { BookSide, Market, OpenOrders } from '..';
 
 export class Watcher {
+  accountSubs: { [pk: string]: number } = {};
 
-  accountSubs: {[pk: string]: number} = {};
-
-  constructor(public connection: Connection) {};
+  constructor(public connection: Connection) {}
 
   addMarket(market: Market, includeBook = true): this {
     const { client, asks, bids, pubkey } = market;
 
-    this.accountSubs[pubkey.toBase58()] = this.connection.onAccountChange(pubkey, (ai) => {
-      market.account = client.program.coder.accounts.decode('market', ai.data);
-    });
+    this.accountSubs[pubkey.toBase58()] = this.connection.onAccountChange(
+      pubkey,
+      (ai) => {
+        market.account = client.program.coder.accounts.decode(
+          'market',
+          ai.data,
+        );
+      },
+    );
 
     if (includeBook && asks) {
       this.addBookSide(asks);
@@ -25,17 +30,29 @@ export class Watcher {
 
   addBookSide(bookSide: BookSide): this {
     const { market, pubkey } = bookSide;
-    this.accountSubs[pubkey.toBase58()] = this.connection.onAccountChange(pubkey, (ai) => {
-      bookSide.account = market.client.program.coder.accounts.decode('bookSide', ai.data);
-    });
+    this.accountSubs[pubkey.toBase58()] = this.connection.onAccountChange(
+      pubkey,
+      (ai) => {
+        bookSide.account = market.client.program.coder.accounts.decode(
+          'bookSide',
+          ai.data,
+        );
+      },
+    );
     return this;
   }
 
   addOpenOrders(openOrders: OpenOrders): this {
     const { market, pubkey } = openOrders;
-    this.accountSubs[pubkey.toBase58()] = this.connection.onAccountChange(pubkey, (ai) => {
-      openOrders.account = market.client.program.coder.accounts.decode('OpenOrders', ai.data);
-    });
+    this.accountSubs[pubkey.toBase58()] = this.connection.onAccountChange(
+      pubkey,
+      (ai) => {
+        openOrders.account = market.client.program.coder.accounts.decode(
+          'OpenOrders',
+          ai.data,
+        );
+      },
+    );
     return this;
   }