fix perp open order deserializing

This commit is contained in:
tjs 2022-12-08 15:53:07 -05:00
parent fb8eb59355
commit af6e10a1cd
2 changed files with 12 additions and 15 deletions

View File

@ -1192,7 +1192,7 @@ export class PerpPosition {
) {} ) {}
isActive(): boolean { isActive(): boolean {
return this.marketIndex != PerpPosition.PerpMarketIndexUnset; return this.marketIndex !== PerpPosition.PerpMarketIndexUnset;
} }
public getBasePositionUi( public getBasePositionUi(
@ -1312,27 +1312,22 @@ export class PerpPositionDto {
export class PerpOo { export class PerpOo {
static OrderMarketUnset = 65535; static OrderMarketUnset = 65535;
static from(dto: PerpOoDto): PerpOo { static from(dto: PerpOoDto): PerpOo {
return new PerpOo( return new PerpOo(dto.sideAndTree, dto.market, dto.clientId, dto.id);
dto.orderSide,
dto.orderMarket,
dto.clientOrderId,
dto.orderId,
);
} }
constructor( constructor(
public orderSide: any, public sideAndTree: any,
public orderMarket: 0, public orderMarket: 0,
public clientOrderId: BN, public clientId: BN,
public orderId: BN, public id: BN,
) {} ) {}
} }
export class PerpOoDto { export class PerpOoDto {
constructor( constructor(
public orderSide: any, public sideAndTree: any,
public orderMarket: 0, public market: 0,
public clientOrderId: BN, public clientId: BN,
public orderId: BN, public id: BN,
) {} ) {}
} }

View File

@ -650,7 +650,9 @@ export class MangoClient {
); );
} }
public async getMangoAccount(mangoAccount: MangoAccount | PublicKey) { public async getMangoAccount(
mangoAccount: MangoAccount | PublicKey,
): Promise<MangoAccount> {
const mangoAccountPk = const mangoAccountPk =
mangoAccount instanceof MangoAccount mangoAccount instanceof MangoAccount
? mangoAccount.publicKey ? mangoAccount.publicKey