diff --git a/ts/client/scripts/archive/devnet-admin.ts b/ts/client/scripts/archive/devnet-admin.ts index c097fcc2e..109349de6 100644 --- a/ts/client/scripts/archive/devnet-admin.ts +++ b/ts/client/scripts/archive/devnet-admin.ts @@ -172,6 +172,7 @@ async function main() { group.getFirstBankByMint(usdcDevnetMint), 0, 'SOL/USDC', + 0.5, ); await group.reloadAll(client); const serum3Market = group.getSerum3MarketByExternalMarket( diff --git a/ts/client/scripts/archive/mb-add-spot-market.ts b/ts/client/scripts/archive/mb-add-spot-market.ts index 5fb541391..d94892306 100644 --- a/ts/client/scripts/archive/mb-add-spot-market.ts +++ b/ts/client/scripts/archive/mb-add-spot-market.ts @@ -44,6 +44,7 @@ async function addSpotMarket() { group.getFirstBankByMint(new PublicKey(usdc_mint)), 1, // market index 'ETH/USDC', + 0.5, ); console.log('Tx Successful:', signature); diff --git a/ts/client/scripts/archive/mb-admin.ts b/ts/client/scripts/archive/mb-admin.ts index e6d476a90..05abd193c 100644 --- a/ts/client/scripts/archive/mb-admin.ts +++ b/ts/client/scripts/archive/mb-admin.ts @@ -20,9 +20,9 @@ import { import { Builder } from '../../src/builder'; import { MangoClient } from '../../src/client'; import { + DefaultTokenRegisterParams, NullPerpEditParams, NullTokenEditParams, - DefaultTokenRegisterParams, } from '../../src/clientIxParamBuilder'; import { MANGO_V4_ID, OPENBOOK_PROGRAM_ID } from '../../src/constants'; import { buildVersionedTx, toNative } from '../../src/utils'; @@ -367,6 +367,7 @@ async function registerSerum3Markets() { group.getFirstBankByMint(new PublicKey(MAINNET_MINTS.get('USDC')!)), 0, 'SOL/USDC', + 0.5, ); } diff --git a/ts/client/scripts/create-gov-ix.ts b/ts/client/scripts/create-gov-ix.ts index a20f2db0b..93f1138e2 100644 --- a/ts/client/scripts/create-gov-ix.ts +++ b/ts/client/scripts/create-gov-ix.ts @@ -2,26 +2,22 @@ import { AnchorProvider, Wallet } from '@coral-xyz/anchor'; import { BN } from '@project-serum/anchor'; import { serializeInstructionToBase64 } from '@solana/spl-governance'; import { - AccountMeta, Connection, Keypair, PublicKey, - SYSVAR_RENT_PUBKEY, SystemProgram, TransactionInstruction, } from '@solana/web3.js'; import fs from 'fs'; -import { TokenIndex } from '../src/accounts/bank'; import { PerpMarketIndex } from '../src/accounts/perp'; import { Builder } from '../src/builder'; import { MangoClient } from '../src/client'; import { NullPerpEditParams, - NullTokenEditParams, TrueIxGateParams, buildIxGate, } from '../src/clientIxParamBuilder'; -import { MANGO_V4_ID, OPENBOOK_PROGRAM_ID } from '../src/constants'; +import { MANGO_V4_ID } from '../src/constants'; import { bpsToDecimal, percentageToDecimal, toNative } from '../src/utils'; const { MB_CLUSTER_URL, MB_PAYER_KEYPAIR } = process.env; @@ -197,32 +193,32 @@ async function groupEdit(): Promise { // console.log(serializeInstructionToBase64(ix)); // } -async function serum3Register(): Promise { - const client = await buildClient(); +// async function serum3Register(): Promise { +// const client = await buildClient(); - const group = await client.getGroup(new PublicKey(GROUP_PK)); +// const group = await client.getGroup(new PublicKey(GROUP_PK)); - const ix = await client.program.methods - .serum3RegisterMarket(3, 'ETH (Portal)/USDC') - .accounts({ - group: group.publicKey, - admin: group.admin, - serumProgram: OPENBOOK_PROGRAM_ID['mainnet-beta'], - serumMarketExternal: new PublicKey( - 'BbJgE7HZMaDp5NTYvRh5jZSkQPVDTU8ubPFtpogUkEj4', - ), - baseBank: group.getFirstBankByMint( - new PublicKey('7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs'), - ).publicKey, - quoteBank: group.getFirstBankByMint( - new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'), - ).publicKey, - payer: (client.program.provider as AnchorProvider).wallet.publicKey, - }) - .instruction(); +// const ix = await client.program.methods +// .serum3RegisterMarket(3, 'ETH (Portal)/USDC',) +// .accounts({ +// group: group.publicKey, +// admin: group.admin, +// serumProgram: OPENBOOK_PROGRAM_ID['mainnet-beta'], +// serumMarketExternal: new PublicKey( +// 'BbJgE7HZMaDp5NTYvRh5jZSkQPVDTU8ubPFtpogUkEj4', +// ), +// baseBank: group.getFirstBankByMint( +// new PublicKey('7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs'), +// ).publicKey, +// quoteBank: group.getFirstBankByMint( +// new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'), +// ).publicKey, +// payer: (client.program.provider as AnchorProvider).wallet.publicKey, +// }) +// .instruction(); - console.log(serializeInstructionToBase64(ix)); -} +// console.log(serializeInstructionToBase64(ix)); +// } async function perpCreate(): Promise { const client = await buildClient(); diff --git a/ts/client/scripts/liqtest/liqtest-create-group.ts b/ts/client/scripts/liqtest/liqtest-create-group.ts index 9371eb8d3..44b23a504 100644 --- a/ts/client/scripts/liqtest/liqtest-create-group.ts +++ b/ts/client/scripts/liqtest/liqtest-create-group.ts @@ -198,6 +198,7 @@ async function main(): Promise { group.getFirstBankByMint(new PublicKey(MAINNET_MINTS.get('USDC')!)), 1, 'SOL/USDC', + 0, ); } catch (error) { console.log(error); diff --git a/ts/client/scripts/mainnet-no-margin-group.ts b/ts/client/scripts/mainnet-no-margin-group.ts index a2876aea1..4f9cf1090 100644 --- a/ts/client/scripts/mainnet-no-margin-group.ts +++ b/ts/client/scripts/mainnet-no-margin-group.ts @@ -1,18 +1,20 @@ import { AnchorProvider, Wallet } from '@coral-xyz/anchor'; -import { Connection, Keypair, PublicKey } from '@solana/web3.js'; +import { + AddressLookupTableProgram, + ComputeBudgetProgram, + Connection, + Keypair, + PublicKey, + SYSVAR_INSTRUCTIONS_PUBKEY, + SYSVAR_RENT_PUBKEY, + SystemProgram, +} from '@solana/web3.js'; import fs from 'fs'; import { TokenIndex } from '../src/accounts/bank'; import { Group } from '../src/accounts/group'; import { MangoClient } from '../src/client'; import { DefaultTokenRegisterParams } from '../src/clientIxParamBuilder'; import { MANGO_V4_ID } from '../src/constants'; -import { - AddressLookupTableProgram, - ComputeBudgetProgram, - SYSVAR_INSTRUCTIONS_PUBKEY, - SYSVAR_RENT_PUBKEY, - SystemProgram, -} from '@solana/web3.js'; import { buildVersionedTx } from '../src/utils'; import { ASSOCIATED_TOKEN_PROGRAM_ID, @@ -172,6 +174,7 @@ async function registerSerum3Market(): Promise { group.getFirstBankByTokenIndex(0 as TokenIndex), 0, 'SOL/USDC', + 0.5, ); } diff --git a/ts/client/scripts/update-risk-params.ts b/ts/client/scripts/update-risk-params.ts index 5d2bc73d2..6e7570fb0 100644 --- a/ts/client/scripts/update-risk-params.ts +++ b/ts/client/scripts/update-risk-params.ts @@ -20,6 +20,7 @@ import { import fs from 'fs'; import { Bank } from '../src/accounts/bank'; import { Group } from '../src/accounts/group'; +import { MangoAccount } from '../src/accounts/mangoAccount'; import { Builder } from '../src/builder'; import { MangoClient } from '../src/client'; import { NullTokenEditParams } from '../src/clientIxParamBuilder'; @@ -37,7 +38,6 @@ import { DEFAULT_VSR_ID, VsrClient, } from './governanceInstructions/voteStakeRegistryClient'; -import { MangoAccount } from '../src/accounts/mangoAccount'; const { MB_CLUSTER_URL, @@ -223,6 +223,15 @@ async function updateTokenParams(): Promise { params.tokenConditionalSwapTakerFeeRate, params.tokenConditionalSwapMakerFeeRate, params.flashLoanSwapFeeRate, + params.interestCurveScaling, + params.interestTargetUtilization, + params.maintWeightShiftStart, + params.maintWeightShiftEnd, + params.maintWeightShiftAssetTarget, + params.maintWeightShiftLiabTarget, + params.maintWeightShiftAbort ?? false, + false, // setFallbackOracle, unused + params.depositLimit, ) .accounts({ group: group.publicKey,