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

Fix client and remove excessive logging in scripts 

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
microwavedcola1 2022-09-01 10:48:50 +02:00
parent 38e3ea672e
commit 149e0eb0c7
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ export class Group {
public async reloadSerum3Markets(client: MangoClient, ids?: Id) { public async reloadSerum3Markets(client: MangoClient, ids?: Id) {
let serum3Markets: Serum3Market[]; let serum3Markets: Serum3Market[];
if (ids) { if (ids && ids.getSerum3Markets().length) {
serum3Markets = ( serum3Markets = (
await client.program.account.serum3Market.fetchMultiple( await client.program.account.serum3Market.fetchMultiple(
ids.getSerum3Markets(), ids.getSerum3Markets(),

15
ts/client/src/client.ts
View File

@ -993,10 +993,11 @@ export class MangoClient {
public async serum3CreateOpenOrders( public async serum3CreateOpenOrders(
group: Group, group: Group,
mangoAccount: MangoAccount, mangoAccount: MangoAccount,
marketName: string, externalMarketPk: PublicKey,
): Promise<TransactionSignature> { ): Promise<TransactionSignature> {
const serum3Market: Serum3Market = const serum3Market: Serum3Market = group.serum3MarketsMapByExternal.get(
group.serum3MarketsMapByExternal.get(marketName)!; externalMarketPk.toBase58(),
)!;
return await this.program.methods return await this.program.methods
.serum3CreateOpenOrders() .serum3CreateOpenOrders()
@ -1056,8 +1057,12 @@ export class MangoClient {
externalMarketPk.toBase58(), externalMarketPk.toBase58(),
)!; )!;
if (!mangoAccount.findSerum3Account(serum3Market.marketIndex)) { if (!mangoAccount.findSerum3Account(serum3Market.marketIndex)) {
await this.serum3CreateOpenOrders(group, mangoAccount, 'BTC/USDC'); await this.serum3CreateOpenOrders(
mangoAccount = await this.getMangoAccount(mangoAccount); group,
mangoAccount,
serum3Market.serumMarketExternal,
);
await mangoAccount.reload(this, group);
} }
const serum3MarketExternal = group.serum3MarketExternalsMap.get( const serum3MarketExternal = group.serum3MarketExternalsMap.get(
externalMarketPk.toBase58(), externalMarketPk.toBase58(),

14
ts/client/src/scripts/mb-example1-admin.ts
View File

@ -85,9 +85,6 @@ async function buildUserClient(
); );
console.log(`Admin ${admin.publicKey.toBase58()}`); console.log(`Admin ${admin.publicKey.toBase58()}`);
const group = await client.getGroupForCreator(admin.publicKey, 2); const group = await client.getGroupForCreator(admin.publicKey, 2);
console.log(group);
console.log(`${group.toString()}`);
return [client, group, user]; return [client, group, user];
} }
@ -349,7 +346,6 @@ async function createUser(userKeypair: string) {
} }
console.log(`...created MangoAccount ${mangoAccount.publicKey.toBase58()}`); console.log(`...created MangoAccount ${mangoAccount.publicKey.toBase58()}`);
console.log(mangoAccount.toString(group));
await client.tokenDeposit( await client.tokenDeposit(
group, group,
@ -386,7 +382,6 @@ async function expandMangoAccount(userKeypair: string) {
for (const mangoAccount of mangoAccounts) { for (const mangoAccount of mangoAccounts) {
console.log(`...found MangoAccount ${mangoAccount.publicKey.toBase58()}`); console.log(`...found MangoAccount ${mangoAccount.publicKey.toBase58()}`);
console.log(mangoAccount.toString(group));
await client.expandMangoAccount(group, mangoAccount, 8, 2, 0, 0); await client.expandMangoAccount(group, mangoAccount, 8, 2, 0, 0);
} }
} }
@ -407,7 +402,6 @@ async function placeSerum3TradeAndCancelIt(userKeypair: string) {
for (const mangoAccount of mangoAccounts) { for (const mangoAccount of mangoAccounts) {
console.log(`...found MangoAccount ${mangoAccount.publicKey.toBase58()}`); console.log(`...found MangoAccount ${mangoAccount.publicKey.toBase58()}`);
console.log(mangoAccount.toString(group));
console.log(`...placing serum3 order`); console.log(`...placing serum3 order`);
await client.serum3PlaceOrder( await client.serum3PlaceOrder(
group, group,
@ -451,24 +445,24 @@ async function placeSerum3TradeAndCancelIt(userKeypair: string) {
async function main() { async function main() {
try { try {
await createGroup(); // await createGroup();
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
try { try {
await registerTokens(); // await registerTokens();
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
try { try {
await registerSerum3Markets(); // await registerSerum3Markets();
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
try { try {
// await createUser(process.env.MB_USER_KEYPAIR!); // await createUser(process.env.MB_USER_KEYPAIR!);
// await createUser(process.env.MB_USER2_KEYPAIR!); // await createUser(process.env.MB_USER2_KEYPAIR!);
await expandMangoAccount(process.env.MB_USER_KEYPAIR!); // await expandMangoAccount(process.env.MB_USER_KEYPAIR!);
await placeSerum3TradeAndCancelIt(process.env.MB_USER_KEYPAIR!); await placeSerum3TradeAndCancelIt(process.env.MB_USER_KEYPAIR!);
} catch (error) { } catch (error) {
console.log(error); console.log(error);