From 3939d48dc67841fff5e95479f6481f94e1c25a00 Mon Sep 17 00:00:00 2001 From: microwavedcola1 Date: Sat, 8 Oct 2022 14:32:50 +0200 Subject: [PATCH 1/2] ts: fix script Signed-off-by: microwavedcola1 --- ts/client/src/scripts/mb-example1-user.ts | 96 +++++++++++++---------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/ts/client/src/scripts/mb-example1-user.ts b/ts/client/src/scripts/mb-example1-user.ts index 8cb46c95f..59277484c 100644 --- a/ts/client/src/scripts/mb-example1-user.ts +++ b/ts/client/src/scripts/mb-example1-user.ts @@ -2,7 +2,7 @@ import { AnchorProvider, Wallet } from '@project-serum/anchor'; import { Connection, Keypair } from '@solana/web3.js'; import fs from 'fs'; import { HealthType } from '../accounts/mangoAccount'; -import { MangoClient, MANGO_V4_ID } from '../index'; +import { MangoClient, MANGO_V4_ID, toUiDecimalsForQuote } from '../index'; async function main() { const options = AnchorProvider.defaultOptions(); @@ -39,82 +39,94 @@ async function main() { console.log(mangoAccount.toString(group)); if (true) { - console.log(`...depositing 10 USDC`); - await client.tokenDeposit(group, mangoAccount, 'USDC', 10); - await mangoAccount.reload(client, group); + console.log(`...depositing 0.0001 USDC`); + await client.tokenDeposit( + group, + mangoAccount, + group.banksMapByName.get('USDC')![0].mint, + 10, + ); + await mangoAccount.reload(client); - console.log(`...depositing 1 SOL`); - await client.tokenDeposit(group, mangoAccount, 'SOL', 1); - await mangoAccount.reload(client, group); + console.log(`...depositing 0.001 SOL`); + await client.tokenDeposit( + group, + mangoAccount, + group.banksMapByName.get('SOL')![0].mint, + 1, + ); + await mangoAccount.reload(client); } - await mangoAccount.reload(client, group); + await mangoAccount.reload(client); console.log( 'mangoAccount.getEquity() ' + - toUiDecimalsForQuote(mangoAccount.getEquity().toNumber()), + toUiDecimalsForQuote(mangoAccount.getEquity(group).toNumber()), ); console.log( 'mangoAccount.getHealth(HealthType.init) ' + - toUiDecimalsForQuote(mangoAccount.getHealth(HealthType.init).toNumber()), + toUiDecimalsForQuote( + mangoAccount.getHealth(group, HealthType.init).toNumber(), + ), ); console.log( 'mangoAccount.getHealthRatio(HealthType.init) ' + - mangoAccount.getHealthRatio(HealthType.init).toNumber(), + mangoAccount.getHealthRatio(group, HealthType.init).toNumber(), ); console.log( 'mangoAccount.getCollateralValue() ' + - toUiDecimalsForQuote(mangoAccount.getCollateralValue().toNumber()), + toUiDecimalsForQuote(mangoAccount.getCollateralValue(group).toNumber()), ); console.log( 'mangoAccount.getAssetsVal() ' + - toUiDecimalsForQuote(mangoAccount.getAssetsVal().toNumber()), + toUiDecimalsForQuote( + mangoAccount.getAssetsValue(group, HealthType.init).toNumber(), + ), ); console.log( 'mangoAccount.getLiabsVal() ' + - toUiDecimalsForQuote(mangoAccount.getLiabsVal().toNumber()), + toUiDecimalsForQuote( + mangoAccount.getLiabsValue(group, HealthType.init).toNumber(), + ), ); console.log( "mangoAccount.getMaxWithdrawWithBorrowForToken(group, 'SOL') " + toUiDecimalsForQuote( ( - await mangoAccount.getMaxWithdrawWithBorrowForToken(group, 'SOL') - ).toNumber(), - ), - ); - - console.log( - "mangoAccount.getMaxSourceForTokenSwap(group, 'USDC', 'BTC') " + - toUiDecimalsForQuote( - ( - await mangoAccount.getMaxSourceForTokenSwap( + await mangoAccount.getMaxWithdrawWithBorrowForToken( group, - 'USDC', - 'BTC', - 0.94, + group.banksMapByName.get('SOL')![0].mint, ) ).toNumber(), ), ); + console.log( + "mangoAccount.getMaxSourceForTokenSwap(group, 'USDC', 'BTC') " + + (await mangoAccount.getMaxSourceUiForTokenSwap( + group, + group.banksMapByName.get('USDC')![0].mint, + group.banksMapByName.get('BTC')![0].mint, + 0.94, + )), + ); + console.log( 'mangoAccount.simHealthWithTokenPositionChanges ' + toUiDecimalsForQuote( - ( - await mangoAccount.simHealthWithTokenPositionChanges(group, [ - { - tokenName: 'USDC', - tokenAmount: - -20_000 * - Math.pow(10, group.banksMap.get('BTC')?.mintDecimals!), - }, - { - tokenName: 'BTC', - tokenAmount: - 1 * Math.pow(10, group.banksMap.get('BTC')?.mintDecimals!), - }, - ]) - ).toNumber(), + await mangoAccount.simHealthRatioWithTokenPositionUiChanges(group, [ + { + mintPk: group.banksMapByName.get('USDC')![0].mint, + uiTokenAmount: + -20_000 * Math.pow(10, group.banksMap.get('BTC')?.mintDecimals!), + }, + { + mintPk: group.banksMapByName.get('BTC')![0].mint, + uiTokenAmount: + 1 * Math.pow(10, group.banksMap.get('BTC')?.mintDecimals!), + }, + ]), ), ); From cc923896660d79e99905a3e9437deb0b540033bf Mon Sep 17 00:00:00 2001 From: microwavedcola1 Date: Sat, 8 Oct 2022 14:42:32 +0200 Subject: [PATCH 2/2] Changelog Signed-off-by: microwavedcola1 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3081afcc0..83f33c57d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ Update this for each mainnet deployment. ## mainnet +Oct 8, 2022 at 14:38:31 Central European Summer Time +https://explorer.solana.com/tx/3m8EDohkgwJZyiwpGXztBWARWQVxyhnSNDVuH467D7FPS2wxJerr79HhdhDEed5hpConHgGsKHvxtW1HJP6GixX9 + +- New ix `TokenDepositIntoExisting` + Sep 1, 2022 at 10:24:35 Central European Summer Time https://explorer.solana.com/tx/3NnX13A3QwsREKKKo3iYR4jqgoongpCjdhhXuJ3y5iP6FwfPcNieVop623tpgPbyreC7m7KtphwdWdoHYE5YC394