blockworks-foundation
/
mango-v4
mirror of https://github.com/blockworks-foundation/mango-v4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mc/feature gating (#129) 

* feature gating

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>

* Fixes from review

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
microwavedcola1 2022-08-01 12:56:29 +02:00 committed by GitHub
parent 16e1e83e26
commit e8e774a1a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 70 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/mango-v4/src/instructions/group_close.rs
View File

@ -6,7 +6,7 @@ use anchor_spl::token::{self, CloseAccount, Token, TokenAccount};
pub struct GroupClose<'info> {
#[account(
mut,
constraint = group.load()?.testing == 1,
constraint = group.load()?.is_testing(),
has_one = admin,
has_one = insurance_vault,
close = sol_destination

8
programs/mango-v4/src/instructions/group_create.rs
View File

@ -38,7 +38,12 @@ pub struct GroupCreate<'info> {
pub rent: Sysvar<'info, Rent>,
}
pub fn group_create(ctx: Context<GroupCreate>, group_num: u32, testing: u8) -> Result<()> {
pub fn group_create(
ctx: Context<GroupCreate>,
group_num: u32,
testing: u8,
version: u8,
) -> Result<()> {
let mut group = ctx.accounts.group.load_init()?;
group.creator = ctx.accounts.creator.key();
group.admin = ctx.accounts.creator.key();
@ -48,5 +53,6 @@ pub fn group_create(ctx: Context<GroupCreate>, group_num: u32, testing: u8) -> R
group.bump = *ctx.bumps.get("group").ok_or(MangoError::SomeError)?;
group.group_num = group_num;
group.testing = testing;
group.version = version;
Ok(())
}

2
programs/mango-v4/src/instructions/perp_close_market.rs
View File

@ -6,7 +6,7 @@ use crate::state::*;
#[derive(Accounts)]
pub struct PerpCloseMarket<'info> {
#[account(
constraint = group.load()?.testing == 1,
constraint = group.load()?.is_testing(),
has_one = admin,
)]
pub group: AccountLoader<'info, Group>,

1
programs/mango-v4/src/instructions/perp_create_market.rs
View File

@ -11,6 +11,7 @@ use crate::util::fill16_from_str;
pub struct PerpCreateMarket<'info> {
#[account(
has_one = admin,
constraint = group.load()?.perps_supported()
)]
pub group: AccountLoader<'info, Group>,
pub admin: Signer<'info>,

2
programs/mango-v4/src/instructions/serum3_deregister_market.rs
View File

@ -7,7 +7,7 @@ use crate::state::*;
pub struct Serum3DeregisterMarket<'info> {
#[account(
mut,
constraint = group.load()?.testing == 1,
constraint = group.load()?.is_testing(),
has_one = admin,
)]
pub group: AccountLoader<'info, Group>,

1
programs/mango-v4/src/instructions/serum3_register_market.rs
View File

@ -10,6 +10,7 @@ pub struct Serum3RegisterMarket<'info> {
#[account(
mut,
has_one = admin,
constraint = group.load()?.serum3_supported()
)]
pub group: AccountLoader<'info, Group>,
pub admin: Signer<'info>,

2
programs/mango-v4/src/instructions/stub_oracle_close.rs
View File

@ -6,7 +6,7 @@ use crate::state::*;
#[derive(Accounts)]
pub struct StubOracleClose<'info> {
#[account(
constraint = group.load()?.testing == 1,
constraint = group.load()?.is_testing(),
has_one = admin,
)]
pub group: AccountLoader<'info, Group>,

1
programs/mango-v4/src/instructions/token_add_bank.rs
View File

@ -11,6 +11,7 @@ use crate::state::*;
pub struct TokenAddBank<'info> {
#[account(
has_one = admin,
constraint = group.load()?.multiple_banks_supported()
)]
pub group: AccountLoader<'info, Group>,
pub admin: Signer<'info>,

2
programs/mango-v4/src/instructions/token_deregister.rs
View File

@ -8,7 +8,7 @@ use anchor_lang::AccountsClose;
#[instruction(token_index: TokenIndex)]
pub struct TokenDeregister<'info> {
#[account(
constraint = group.load()?.testing == 1,
constraint = group.load()?.is_testing(),
has_one = admin,
)]
pub group: AccountLoader<'info, Group>,

9
programs/mango-v4/src/lib.rs
View File

@ -32,8 +32,13 @@ pub mod mango_v4 {
use super::*;
pub fn group_create(ctx: Context<GroupCreate>, group_num: u32, testing: u8) -> Result<()> {
instructions::group_create(ctx, group_num, testing)
pub fn group_create(
ctx: Context<GroupCreate>,
group_num: u32,
testing: u8,
version: u8,
) -> Result<()> {
instructions::group_create(ctx, group_num, testing, version)
}
pub fn group_edit(

26
programs/mango-v4/src/state/group.rs
View File

@ -26,15 +26,35 @@ pub struct Group {
pub insurance_mint: Pubkey,
pub bump: u8,
// Only support closing/deregistering groups, stub oracles, tokens, and markets
// if testing == 1
pub testing: u8,
pub padding2: [u8; 6],
pub version: u8,
pub padding2: [u8; 5],
pub reserved: [u8; 8],
}
const_assert_eq!(size_of::<Group>(), 32 * 5 + 4 + 4 + 1 * 2 + 6 + 8);
const_assert_eq!(size_of::<Group>() % 8, 0);
impl Group {
pub fn is_testing(&self) -> bool {
self.testing == 1
}
pub fn multiple_banks_supported(&self) -> bool {
self.is_testing() || self.version > 0
}
pub fn serum3_supported(&self) -> bool {
self.is_testing() || self.version > 0
}
pub fn perps_supported(&self) -> bool {
self.is_testing() || self.version > 0
}
}
// note: using creator instead of admin, since admin can be changed
#[macro_export]
macro_rules! group_seeds {

1
programs/mango-v4/tests/program_test/mango_client.rs
View File

@ -1230,6 +1230,7 @@ impl<'keypair> ClientInstruction for GroupCreateInstruction<'keypair> {
let instruction = Self::Instruction {
group_num: 0,
testing: 1,
version: 0,
};
let group = Pubkey::find_program_address(

3
ts/client/src/client.ts
View File

@ -76,11 +76,12 @@ export class MangoClient {
public async groupCreate(
groupNum: number,
testing: boolean,
version: number,
insuranceMintPk: PublicKey,
): Promise<TransactionSignature> {
const adminPk = (this.program.provider as AnchorProvider).wallet.publicKey;
return await this.program.methods
.groupCreate(groupNum, testing ? 1 : 0)
.groupCreate(groupNum, testing ? 1 : 0, version)
.accounts({
creator: adminPk,
payer: adminPk,

24
ts/client/src/mango_v4.ts
View File

@ -41,7 +41,7 @@ export type MangoV4 = {
},
{
"name": "insuranceVault",
"isMut": false,
"isMut": true,
"isSigner": false,
"pda": {
"seeds": [
@ -87,6 +87,10 @@ export type MangoV4 = {
{
"name": "testing",
"type": "u8"
},
{
"name": "version",
"type": "u8"
}
]
},
@ -2865,12 +2869,16 @@ export type MangoV4 = {
"name": "testing",
"type": "u8"
},
{
"name": "version",
"type": "u8"
},
{
"name": "padding2",
"type": {
"array": [
"u8",
6
5
]
}
},
@ -4950,7 +4958,7 @@ export const IDL: MangoV4 = {
},
{
"name": "insuranceVault",
"isMut": false,
"isMut": true,
"isSigner": false,
"pda": {
"seeds": [
@ -4996,6 +5004,10 @@ export const IDL: MangoV4 = {
{
"name": "testing",
"type": "u8"
},
{
"name": "version",
"type": "u8"
}
]
},
@ -7774,12 +7786,16 @@ export const IDL: MangoV4 = {
"name": "testing",
"type": "u8"
},
{
"name": "version",
"type": "u8"
},
{
"name": "padding2",
"type": {
"array": [
"u8",
6
5
]
}
},

2
ts/client/src/scripts/example1-admin.ts
View File

@ -57,7 +57,7 @@ async function main() {
console.log(`Creating Group...`);
const insuranceMint = new PublicKey(DEVNET_MINTS.get('USDC')!);
try {
await client.groupCreate(GROUP_NUM, true, insuranceMint);
await client.groupCreate(GROUP_NUM, true, insuranceMint, 0);
} catch (error) {
console.log(error);
}

2
ts/client/src/scripts/mb-example1-admin.ts
View File

@ -42,7 +42,7 @@ async function main() {
console.log(`Creating Group...`);
try {
const insuranceMint = new PublicKey(MAINNET_MINTS.get('USDC')!);
await client.groupCreate(0, true, insuranceMint);
await client.groupCreate(0, true, insuranceMint, 0);
} catch (error) {
console.log(error);
}