From 30ab82ea3239c93f3ba8e78fe9e73cac773b2410 Mon Sep 17 00:00:00 2001 From: microwavedcola1 Date: Thu, 31 Mar 2022 13:30:05 +0200 Subject: [PATCH] --wip-- [skip ci] --- release.sh | 1 + ts/example.ts | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ ts/mango_v4.ts | 8 ++++---- 3 files changed, 59 insertions(+), 4 deletions(-) diff --git a/release.sh b/release.sh index 7f3807f53..cbbb989c2 100755 --- a/release.sh +++ b/release.sh @@ -4,6 +4,7 @@ set -euo pipefail # build program, TODO try removing --skip-lint anchor build --skip-lint +./idl-fixup.sh # update types in ts client package cp -v ./target/types/mango_v4.ts ./ts/mango_v4.ts diff --git a/ts/example.ts b/ts/example.ts index 1f77c2482..0092da09c 100644 --- a/ts/example.ts +++ b/ts/example.ts @@ -75,6 +75,7 @@ async function main() { } } console.log(`Group address: ${group.publicKey.toBase58()}`); + // console.log(group); // // check if token is already registered, iff not, then register @@ -137,6 +138,59 @@ async function main() { bank = gpa[0]; } console.log(`Bank address: ${bank.publicKey.toBase58()}`); + // console.log(bank); + + // + // mango account + // + + let mangoAccount; + gpa = await client.program.account.mangoAccount.all([ + { + memcmp: { + bytes: bs58.encode(group.publicKey.toBuffer()), + offset: 8, + }, + }, + { + memcmp: { + bytes: bs58.encode(admin.publicKey.toBuffer()), + offset: 40, + }, + }, + ]); + if (gpa.length > 0) { + mangoAccount = gpa[0]; + } else { + await client.program.methods + .createAccount(0) + .accounts({ + group: group.publicKey, + owner: admin.publicKey, + payer: payer.publicKey, + system_program: SystemProgram.programId, + }) + .signers([admin, payer]) + .rpc(); + + gpa = await client.program.account.mangoAccount.all([ + { + memcmp: { + bytes: bs58.encode(group.publicKey.toBuffer()), + offset: 8, + }, + }, + { + memcmp: { + bytes: bs58.encode(admin.publicKey.toBuffer()), + offset: 40, + }, + }, + ]); + mangoAccount = gpa[0]; + } + console.log(`Mango account address: ${mangoAccount.publicKey.toBase58()}`); + console.log(mangoAccount); } main(); diff --git a/ts/mango_v4.ts b/ts/mango_v4.ts index f8f71918d..2abf99b91 100644 --- a/ts/mango_v4.ts +++ b/ts/mango_v4.ts @@ -1443,11 +1443,11 @@ export type MangoV4 = { }, { name: 'beingLiquidated'; - type: 'bool'; + type: 'u8'; }, { name: 'isBankrupt'; - type: 'bool'; + type: 'u8'; }, { name: 'accountNum'; @@ -3605,11 +3605,11 @@ export const IDL: MangoV4 = { }, { name: 'beingLiquidated', - type: 'bool', + type: 'u8', }, { name: 'isBankrupt', - type: 'bool', + type: 'u8', }, { name: 'accountNum',