blockworks-foundation
/
mango-v4
mirror of https://github.com/blockworks-foundation/mango-v4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ts: tcs hasData was renamed to isConfigured (#796)

This commit is contained in:
Christian Kamm 2023-11-24 11:06:44 +01:00 committed by GitHub
parent 0483faef1e
commit feeb63dab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/client/scripts/archive/conditional-swaps.ts
View File

@ -44,7 +44,7 @@ async function main(): Promise<void> {
await Promise.all( await Promise.all(
account.tokenConditionalSwaps.map((tcs, i) => { account.tokenConditionalSwaps.map((tcs, i) => {
if (!tcs.hasData) { if (!tcs.isConfigured) {
return Promise.resolve(); return Promise.resolve();
} }
client.tokenConditionalSwapCancel(group, account, tcs.id); client.tokenConditionalSwapCancel(group, account, tcs.id);

8
ts/client/src/accounts/mangoAccount.ts
View File

@ -202,7 +202,7 @@ export class MangoAccount {
} }
public tokenConditionalSwapsActive(): TokenConditionalSwap[] { public tokenConditionalSwapsActive(): TokenConditionalSwap[] {
return this.tokenConditionalSwaps.filter((tcs) => tcs.hasData); return this.tokenConditionalSwaps.filter((tcs) => tcs.isConfigured);
} }
public perpPositionExistsForMarket(perpMarket: PerpMarket): boolean { public perpPositionExistsForMarket(perpMarket: PerpMarket): boolean {
@ -1894,7 +1894,7 @@ export class TokenConditionalSwap {
dto.makerFeeRate, dto.makerFeeRate,
dto.buyTokenIndex as TokenIndex, dto.buyTokenIndex as TokenIndex,
dto.sellTokenIndex as TokenIndex, dto.sellTokenIndex as TokenIndex,
dto.hasData == 1, dto.isConfigured == 1,
dto.allowCreatingDeposits == 1, dto.allowCreatingDeposits == 1,
dto.allowCreatingBorrows == 1, dto.allowCreatingBorrows == 1,
dto.displayPriceStyle == 0 dto.displayPriceStyle == 0
@ -1918,7 +1918,7 @@ export class TokenConditionalSwap {
public makerFeeRate: number, public makerFeeRate: number,
public buyTokenIndex: TokenIndex, public buyTokenIndex: TokenIndex,
public sellTokenIndex: TokenIndex, public sellTokenIndex: TokenIndex,
public hasData: boolean, public isConfigured: boolean,
public allowCreatingDeposits: boolean, public allowCreatingDeposits: boolean,
public allowCreatingBorrows: boolean, public allowCreatingBorrows: boolean,
public priceDisplayStyle: TokenConditionalSwapDisplayPriceStyle, public priceDisplayStyle: TokenConditionalSwapDisplayPriceStyle,
@ -2141,7 +2141,7 @@ export class TokenConditionalSwapDto {
public makerFeeRate: number, public makerFeeRate: number,
public buyTokenIndex: number, public buyTokenIndex: number,
public sellTokenIndex: number, public sellTokenIndex: number,
public hasData: number, public isConfigured: number,
public allowCreatingDeposits: number, public allowCreatingDeposits: number,
public allowCreatingBorrows: number, public allowCreatingBorrows: number,
public displayPriceStyle: number, public displayPriceStyle: number,

2
ts/client/src/client.ts
View File

@ -4101,7 +4101,7 @@ export class MangoClient {
): Promise<MangoSignatureStatus> { ): Promise<MangoSignatureStatus> {
const ixs = await Promise.all( const ixs = await Promise.all(
account.tokenConditionalSwaps account.tokenConditionalSwaps
.filter((tcs) => tcs.hasData) .filter((tcs) => tcs.isConfigured)
.map(async (tcs, i) => { .map(async (tcs, i) => {
const buyBank = group.banksMapByTokenIndex.get(tcs.buyTokenIndex)![0]; const buyBank = group.banksMapByTokenIndex.get(tcs.buyTokenIndex)![0];
const sellBank = group.banksMapByTokenIndex.get( const sellBank = group.banksMapByTokenIndex.get(