From 7953e123cc9089eab4d46ff67d5e1cafabfe75b8 Mon Sep 17 00:00:00 2001 From: microwavedcola1 Date: Thu, 4 Aug 2022 09:25:19 +0200 Subject: [PATCH] add simple logging Signed-off-by: microwavedcola1 --- programs/mango-v4/src/instructions/account_create.rs | 5 +++++ programs/mango-v4/src/state/mango_account.rs | 6 ++++++ ts/client/src/scripts/mb-example1-close-account.ts | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/programs/mango-v4/src/instructions/account_create.rs b/programs/mango-v4/src/instructions/account_create.rs index d55741bca..1e872f496 100644 --- a/programs/mango-v4/src/instructions/account_create.rs +++ b/programs/mango-v4/src/instructions/account_create.rs @@ -34,6 +34,11 @@ pub fn account_create( ) -> Result<()> { let mut account = ctx.accounts.account.load_init()?; + msg!( + "Initialized account with header version {}", + account.header_version() + ); + account.fixed.name = fill32_from_str(name)?; account.fixed.group = ctx.accounts.group.key(); account.fixed.owner = ctx.accounts.owner.key(); diff --git a/programs/mango-v4/src/state/mango_account.rs b/programs/mango-v4/src/state/mango_account.rs index 633488c76..55d4832be 100644 --- a/programs/mango-v4/src/state/mango_account.rs +++ b/programs/mango-v4/src/state/mango_account.rs @@ -422,9 +422,15 @@ impl< fn header(&self) -> &MangoAccountDynamicHeader { self.header.deref_or_borrow() } + + pub fn header_version(&self) -> &u8 { + get_helper(self.dynamic(), 0) + } + fn fixed(&self) -> &MangoAccountFixed { self.fixed.deref_or_borrow() } + fn dynamic(&self) -> &[u8] { self.dynamic.deref_or_borrow() } diff --git a/ts/client/src/scripts/mb-example1-close-account.ts b/ts/client/src/scripts/mb-example1-close-account.ts index 6c5da1bd7..d0b80de6e 100644 --- a/ts/client/src/scripts/mb-example1-close-account.ts +++ b/ts/client/src/scripts/mb-example1-close-account.ts @@ -43,7 +43,7 @@ async function main() { // account const mangoAccount = ( - await client.getMangoAccountForOwner(group, user.publicKey) + await client.getMangoAccountsForOwner(group, user.publicKey) )[0]; console.log(`...found mangoAccount ${mangoAccount.publicKey}`); console.log(mangoAccount.toString(group)); @@ -101,7 +101,7 @@ async function main() { group.findBank(token.tokenIndex)!.name, token.native(group.findBank(token.tokenIndex)!).toNumber(), false, - user + user, ); } } catch (error) {