From af6e10a1cd314811c906dcc14c46982af04f8f41 Mon Sep 17 00:00:00 2001
From: tjs <tjshipe@gmail.com>
Date: Thu, 8 Dec 2022 15:53:07 -0500
Subject: [PATCH] fix perp open order deserializing

---
 ts/client/src/accounts/mangoAccount.ts | 23 +++++++++--------------
 ts/client/src/client.ts                |  4 +++-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ts/client/src/accounts/mangoAccount.ts b/ts/client/src/accounts/mangoAccount.ts
index 9ff1e66af..43ea36092 100644
--- a/ts/client/src/accounts/mangoAccount.ts
+++ b/ts/client/src/accounts/mangoAccount.ts
@@ -1192,7 +1192,7 @@ export class PerpPosition {
   ) {}
 
   isActive(): boolean {
-    return this.marketIndex != PerpPosition.PerpMarketIndexUnset;
+    return this.marketIndex !== PerpPosition.PerpMarketIndexUnset;
   }
 
   public getBasePositionUi(
@@ -1312,27 +1312,22 @@ export class PerpPositionDto {
 export class PerpOo {
   static OrderMarketUnset = 65535;
   static from(dto: PerpOoDto): PerpOo {
-    return new PerpOo(
-      dto.orderSide,
-      dto.orderMarket,
-      dto.clientOrderId,
-      dto.orderId,
-    );
+    return new PerpOo(dto.sideAndTree, dto.market, dto.clientId, dto.id);
   }
 
   constructor(
-    public orderSide: any,
+    public sideAndTree: any,
     public orderMarket: 0,
-    public clientOrderId: BN,
-    public orderId: BN,
+    public clientId: BN,
+    public id: BN,
   ) {}
 }
 export class PerpOoDto {
   constructor(
-    public orderSide: any,
-    public orderMarket: 0,
-    public clientOrderId: BN,
-    public orderId: BN,
+    public sideAndTree: any,
+    public market: 0,
+    public clientId: BN,
+    public id: BN,
   ) {}
 }
 
diff --git a/ts/client/src/client.ts b/ts/client/src/client.ts
index cb443a618..7216a7578 100644
--- a/ts/client/src/client.ts
+++ b/ts/client/src/client.ts
@@ -650,7 +650,9 @@ export class MangoClient {
     );
   }
 
-  public async getMangoAccount(mangoAccount: MangoAccount | PublicKey) {
+  public async getMangoAccount(
+    mangoAccount: MangoAccount | PublicKey,
+  ): Promise<MangoAccount> {
     const mangoAccountPk =
       mangoAccount instanceof MangoAccount
         ? mangoAccount.publicKey