Fix client and remove excessive logging in scripts
Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
parent
38e3ea672e
commit
149e0eb0c7
|
@ -168,7 +168,7 @@ export class Group {
|
|||
|
||||
public async reloadSerum3Markets(client: MangoClient, ids?: Id) {
|
||||
let serum3Markets: Serum3Market[];
|
||||
if (ids) {
|
||||
if (ids && ids.getSerum3Markets().length) {
|
||||
serum3Markets = (
|
||||
await client.program.account.serum3Market.fetchMultiple(
|
||||
ids.getSerum3Markets(),
|
||||
|
|
|
@ -993,10 +993,11 @@ export class MangoClient {
|
|||
public async serum3CreateOpenOrders(
|
||||
group: Group,
|
||||
mangoAccount: MangoAccount,
|
||||
marketName: string,
|
||||
externalMarketPk: PublicKey,
|
||||
): Promise<TransactionSignature> {
|
||||
const serum3Market: Serum3Market =
|
||||
group.serum3MarketsMapByExternal.get(marketName)!;
|
||||
const serum3Market: Serum3Market = group.serum3MarketsMapByExternal.get(
|
||||
externalMarketPk.toBase58(),
|
||||
)!;
|
||||
|
||||
return await this.program.methods
|
||||
.serum3CreateOpenOrders()
|
||||
|
@ -1056,8 +1057,12 @@ export class MangoClient {
|
|||
externalMarketPk.toBase58(),
|
||||
)!;
|
||||
if (!mangoAccount.findSerum3Account(serum3Market.marketIndex)) {
|
||||
await this.serum3CreateOpenOrders(group, mangoAccount, 'BTC/USDC');
|
||||
mangoAccount = await this.getMangoAccount(mangoAccount);
|
||||
await this.serum3CreateOpenOrders(
|
||||
group,
|
||||
mangoAccount,
|
||||
serum3Market.serumMarketExternal,
|
||||
);
|
||||
await mangoAccount.reload(this, group);
|
||||
}
|
||||
const serum3MarketExternal = group.serum3MarketExternalsMap.get(
|
||||
externalMarketPk.toBase58(),
|
||||
|
|
|
@ -85,9 +85,6 @@ async function buildUserClient(
|
|||
);
|
||||
console.log(`Admin ${admin.publicKey.toBase58()}`);
|
||||
const group = await client.getGroupForCreator(admin.publicKey, 2);
|
||||
console.log(group);
|
||||
console.log(`${group.toString()}`);
|
||||
|
||||
return [client, group, user];
|
||||
}
|
||||
|
||||
|
@ -349,7 +346,6 @@ async function createUser(userKeypair: string) {
|
|||
}
|
||||
|
||||
console.log(`...created MangoAccount ${mangoAccount.publicKey.toBase58()}`);
|
||||
console.log(mangoAccount.toString(group));
|
||||
|
||||
await client.tokenDeposit(
|
||||
group,
|
||||
|
@ -386,7 +382,6 @@ async function expandMangoAccount(userKeypair: string) {
|
|||
|
||||
for (const mangoAccount of mangoAccounts) {
|
||||
console.log(`...found MangoAccount ${mangoAccount.publicKey.toBase58()}`);
|
||||
console.log(mangoAccount.toString(group));
|
||||
await client.expandMangoAccount(group, mangoAccount, 8, 2, 0, 0);
|
||||
}
|
||||
}
|
||||
|
@ -407,7 +402,6 @@ async function placeSerum3TradeAndCancelIt(userKeypair: string) {
|
|||
|
||||
for (const mangoAccount of mangoAccounts) {
|
||||
console.log(`...found MangoAccount ${mangoAccount.publicKey.toBase58()}`);
|
||||
console.log(mangoAccount.toString(group));
|
||||
console.log(`...placing serum3 order`);
|
||||
await client.serum3PlaceOrder(
|
||||
group,
|
||||
|
@ -451,24 +445,24 @@ async function placeSerum3TradeAndCancelIt(userKeypair: string) {
|
|||
|
||||
async function main() {
|
||||
try {
|
||||
await createGroup();
|
||||
// await createGroup();
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
try {
|
||||
await registerTokens();
|
||||
// await registerTokens();
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
try {
|
||||
await registerSerum3Markets();
|
||||
// await registerSerum3Markets();
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
}
|
||||
try {
|
||||
// await createUser(process.env.MB_USER_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!);
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
|
|
Loading…
Reference in New Issue