From fbedea94249d2ea18ba0669170e60c3ce39fff92 Mon Sep 17 00:00:00 2001 From: microwavedcola1 Date: Sun, 20 Mar 2022 10:11:36 +0100 Subject: [PATCH] reorg, placeholder for place perp order Signed-off-by: microwavedcola1 --- programs/mango-v4/src/instructions/mod.rs | 2 ++ .../mango-v4/src/instructions/place_perp_order.rs | 8 ++++++++ programs/mango-v4/src/lib.rs | 12 ++++++++++++ programs/mango-v4/src/state/mod.rs | 4 ++-- programs/mango-v4/src/state/perp/book.rs | 4 ---- programs/mango-v4/src/state/perp/event_queue.rs | 4 ---- programs/mango-v4/src/state/perp/mod.rs | 7 ------- .../mango-v4/src/state/{perp => }/perp_market.rs | 6 ++++++ 8 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 programs/mango-v4/src/instructions/place_perp_order.rs delete mode 100644 programs/mango-v4/src/state/perp/book.rs delete mode 100644 programs/mango-v4/src/state/perp/event_queue.rs delete mode 100644 programs/mango-v4/src/state/perp/mod.rs rename programs/mango-v4/src/state/{perp => }/perp_market.rs (96%) diff --git a/programs/mango-v4/src/instructions/mod.rs b/programs/mango-v4/src/instructions/mod.rs index 2f89bdce2..6f29bfeb4 100644 --- a/programs/mango-v4/src/instructions/mod.rs +++ b/programs/mango-v4/src/instructions/mod.rs @@ -4,6 +4,7 @@ pub use create_group::*; pub use create_perp_market::*; pub use create_stub_oracle::*; pub use deposit::*; +pub use place_perp_order::*; pub use register_token::*; pub use serum3_cancel_order::*; pub use serum3_create_open_orders::*; @@ -19,6 +20,7 @@ mod create_perp_market; mod create_stub_oracle; mod deposit; mod margin_trade; +mod place_perp_order; mod register_token; mod serum3_cancel_order; mod serum3_create_open_orders; diff --git a/programs/mango-v4/src/instructions/place_perp_order.rs b/programs/mango-v4/src/instructions/place_perp_order.rs new file mode 100644 index 000000000..fd5eba023 --- /dev/null +++ b/programs/mango-v4/src/instructions/place_perp_order.rs @@ -0,0 +1,8 @@ +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PlacePerpOrder {} + +pub fn place_perp_order(ctx: Context) -> Result<()> { + Ok(()) +} diff --git a/programs/mango-v4/src/lib.rs b/programs/mango-v4/src/lib.rs index 66b4699e0..d6fa4fdad 100644 --- a/programs/mango-v4/src/lib.rs +++ b/programs/mango-v4/src/lib.rs @@ -79,6 +79,10 @@ pub mod mango_v4 { instructions::margin_trade(ctx, banks_len, cpi_data) } + /// + /// Serum + /// + pub fn serum3_register_market( ctx: Context, market_index: Serum3MarketIndex, @@ -110,6 +114,10 @@ pub mod mango_v4 { instructions::serum3_settle_funds(ctx) } + /// + /// Perps + /// + pub fn create_perp_market( ctx: Context, perp_market_index: PerpMarketIndex, @@ -127,6 +135,10 @@ pub mod mango_v4 { base_lot_size, ) } + + pub fn place_perp_order(ctx: Context) -> Result<()> { + instructions::place_perp_order(ctx) + } } #[derive(Clone)] diff --git a/programs/mango-v4/src/state/mod.rs b/programs/mango-v4/src/state/mod.rs index 419b64882..dc57a2554 100644 --- a/programs/mango-v4/src/state/mod.rs +++ b/programs/mango-v4/src/state/mod.rs @@ -4,7 +4,7 @@ pub use health::*; pub use mango_account::*; pub use mint_info::*; pub use oracle::*; -pub use perp::*; +pub use perp_market::*; pub use serum3_market::*; mod bank; @@ -13,5 +13,5 @@ mod health; mod mango_account; mod mint_info; mod oracle; -mod perp; +mod perp_market; mod serum3_market; diff --git a/programs/mango-v4/src/state/perp/book.rs b/programs/mango-v4/src/state/perp/book.rs deleted file mode 100644 index 0eb177988..000000000 --- a/programs/mango-v4/src/state/perp/book.rs +++ /dev/null @@ -1,4 +0,0 @@ -use anchor_lang::prelude::*; - -#[account(zero_copy)] -pub struct Book {} diff --git a/programs/mango-v4/src/state/perp/event_queue.rs b/programs/mango-v4/src/state/perp/event_queue.rs deleted file mode 100644 index 4df70a2ec..000000000 --- a/programs/mango-v4/src/state/perp/event_queue.rs +++ /dev/null @@ -1,4 +0,0 @@ -use anchor_lang::prelude::*; - -#[account(zero_copy)] -pub struct EventQueue {} diff --git a/programs/mango-v4/src/state/perp/mod.rs b/programs/mango-v4/src/state/perp/mod.rs deleted file mode 100644 index 3dd90b699..000000000 --- a/programs/mango-v4/src/state/perp/mod.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub use book::*; -pub use event_queue::*; -pub use perp_market::*; - -mod book; -mod event_queue; -mod perp_market; diff --git a/programs/mango-v4/src/state/perp/perp_market.rs b/programs/mango-v4/src/state/perp_market.rs similarity index 96% rename from programs/mango-v4/src/state/perp/perp_market.rs rename to programs/mango-v4/src/state/perp_market.rs index e5e49a05d..91cef156a 100644 --- a/programs/mango-v4/src/state/perp/perp_market.rs +++ b/programs/mango-v4/src/state/perp_market.rs @@ -4,6 +4,12 @@ use crate::state::TokenIndex; pub type PerpMarketIndex = u16; +#[account(zero_copy)] +pub struct EventQueue {} + +#[account(zero_copy)] +pub struct Book {} + #[account(zero_copy)] pub struct PerpMarket { // todo