From 8916c28b99c917806900483510599a8f401da616 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 15 Feb 2023 08:42:07 +0100 Subject: [PATCH] License: Mark instructions GPLv3 and everything else MIT (#454) To do that, split up the Accounts objects and the instruction implementations. GPL code is only used when the "enable-gpl" feature is enabled. That means compiling the program or running tests need explicit feature activation now. --- .github/workflows/ci-code-review-rust.yml | 6 +- .gitmodules | 4 +- anchor => 3rdparty/anchor | 0 switchboard-v2 => 3rdparty/switchboard-v2 | 0 Cargo.toml | 8 +- LICENSE | 32 + cli/Cargo.toml | 8 +- client/Cargo.toml | 8 +- client/src/client.rs | 4 +- keeper/Cargo.toml | 8 +- keeper/src/taker.rs | 2 +- liquidator/Cargo.toml | 6 +- programs/mango-v4/Cargo.toml | 8 +- .../mango-v4/src/accounts_ix/account_close.rs | 29 + .../src/accounts_ix/account_create.rs | 27 + .../mango-v4/src/accounts_ix/account_edit.rs | 20 + .../src/accounts_ix/account_expand.rs | 25 + .../src/accounts_ix/account_toggle_freeze.rs | 20 + .../mango-v4/src/accounts_ix/alt_extend.rs | 22 + programs/mango-v4/src/accounts_ix/alt_set.rs | 22 + .../mango-v4/src/accounts_ix/benchmark.rs | 4 + .../src/accounts_ix/compute_account_data.rs | 10 + .../mango-v4/src/accounts_ix/flash_loan.rs | 67 ++ .../mango-v4/src/accounts_ix/group_close.rs | 28 + .../mango-v4/src/accounts_ix/group_create.rs | 37 + .../mango-v4/src/accounts_ix/group_edit.rs | 13 + .../mango-v4/src/accounts_ix/health_region.rs | 41 ++ .../mango-v4/src/accounts_ix/ix_gate_set.rs | 12 + programs/mango-v4/src/accounts_ix/mod.rs | 109 +++ .../src/accounts_ix/perp_cancel_all_orders.rs | 31 + .../perp_cancel_all_orders_by_side.rs | 32 + .../src/accounts_ix/perp_cancel_order.rs | 32 + .../perp_cancel_order_by_client_order_id.rs | 31 + .../src/accounts_ix/perp_close_market.rs | 49 ++ .../src/accounts_ix/perp_consume_events.rs | 21 + .../src/accounts_ix/perp_create_market.rs | 41 ++ .../accounts_ix/perp_deactivate_position.rs | 24 + .../src/accounts_ix/perp_edit_market.rs | 20 + .../perp_liq_base_or_positive_pnl.rs | 48 ++ .../perp_liq_force_cancel_orders.rs | 30 + .../perp_liq_negative_pnl_or_bankruptcy.rs | 69 ++ .../src/accounts_ix/perp_place_order.rs | 39 + .../src/accounts_ix/perp_settle_fees.rs | 33 + .../src/accounts_ix/perp_settle_pnl.rs | 48 ++ .../src/accounts_ix/perp_update_funding.rs | 27 + .../accounts_ix/serum3_cancel_all_orders.rs | 48 ++ .../src/accounts_ix/serum3_cancel_order.rs | 49 ++ .../accounts_ix/serum3_close_open_orders.rs | 40 ++ .../accounts_ix/serum3_create_open_orders.rs | 51 ++ .../accounts_ix/serum3_deregister_market.rs | 37 + .../src/accounts_ix/serum3_edit_market.rs | 20 + .../serum3_liq_force_cancel_orders.rs | 68 ++ .../src/accounts_ix/serum3_place_order.rs | 102 +++ .../src/accounts_ix/serum3_register_market.rs | 51 ++ .../src/accounts_ix/serum3_settle_funds.rs | 62 ++ .../src/accounts_ix/stub_oracle_close.rs | 29 + .../src/accounts_ix/stub_oracle_create.rs | 30 + .../src/accounts_ix/stub_oracle_set.rs | 19 + .../src/accounts_ix/token_add_bank.rs | 61 ++ .../mango-v4/src/accounts_ix/token_deposit.rs | 83 +++ .../src/accounts_ix/token_deregister.rs | 33 + .../mango-v4/src/accounts_ix/token_edit.rs | 24 + .../src/accounts_ix/token_liq_bankruptcy.rs | 63 ++ .../src/accounts_ix/token_liq_with_token.rs | 27 + .../src/accounts_ix/token_register.rs | 74 ++ .../accounts_ix/token_register_trustless.rs | 59 ++ .../token_update_index_and_rate.rs | 38 + .../src/accounts_ix/token_withdraw.rs | 57 ++ programs/mango-v4/src/instructions/LICENSE | 675 ++++++++++++++++++ .../src/instructions/account_close.rs | 26 +- .../src/instructions/account_create.rs | 25 +- .../mango-v4/src/instructions/account_edit.rs | 18 +- .../src/instructions/account_expand.rs | 24 +- .../src/instructions/account_toggle_freeze.rs | 19 +- .../mango-v4/src/instructions/alt_extend.rs | 21 +- programs/mango-v4/src/instructions/alt_set.rs | 20 +- .../mango-v4/src/instructions/benchmark.rs | 4 +- .../src/instructions/compute_account_data.rs | 9 +- .../mango-v4/src/instructions/flash_loan.rs | 65 +- .../mango-v4/src/instructions/group_close.rs | 29 +- .../mango-v4/src/instructions/group_create.rs | 37 +- .../mango-v4/src/instructions/group_edit.rs | 12 +- .../src/instructions/health_region.rs | 38 +- .../mango-v4/src/instructions/ix_gate_set.rs | 11 +- .../instructions/perp_cancel_all_orders.rs | 33 +- .../perp_cancel_all_orders_by_side.rs | 34 +- .../src/instructions/perp_cancel_order.rs | 34 +- .../perp_cancel_order_by_client_order_id.rs | 33 +- .../src/instructions/perp_close_market.rs | 49 +- .../src/instructions/perp_consume_events.rs | 22 +- .../src/instructions/perp_create_market.rs | 39 +- .../instructions/perp_deactivate_position.rs | 21 +- .../src/instructions/perp_edit_market.rs | 19 +- .../perp_liq_base_or_positive_pnl.rs | 46 +- .../perp_liq_force_cancel_orders.rs | 28 +- .../perp_liq_negative_pnl_or_bankruptcy.rs | 68 +- .../src/instructions/perp_place_order.rs | 44 +- .../src/instructions/perp_settle_fees.rs | 35 +- .../src/instructions/perp_settle_pnl.rs | 50 +- .../src/instructions/perp_update_funding.rs | 27 +- .../instructions/serum3_cancel_all_orders.rs | 45 +- .../src/instructions/serum3_cancel_order.rs | 48 +- .../instructions/serum3_close_open_orders.rs | 37 +- .../instructions/serum3_create_open_orders.rs | 48 +- .../instructions/serum3_deregister_market.rs | 37 +- .../src/instructions/serum3_edit_market.rs | 20 +- .../serum3_liq_force_cancel_orders.rs | 65 +- .../src/instructions/serum3_place_order.rs | 100 +-- .../instructions/serum3_register_market.rs | 49 +- .../src/instructions/serum3_settle_funds.rs | 59 +- .../src/instructions/stub_oracle_close.rs | 29 +- .../src/instructions/stub_oracle_create.rs | 30 +- .../src/instructions/stub_oracle_set.rs | 20 +- .../src/instructions/token_add_bank.rs | 61 +- .../src/instructions/token_deposit.rs | 78 +- .../src/instructions/token_deregister.rs | 35 +- .../mango-v4/src/instructions/token_edit.rs | 26 +- .../src/instructions/token_liq_bankruptcy.rs | 59 +- .../src/instructions/token_liq_with_token.rs | 25 +- .../src/instructions/token_register.rs | 66 +- .../instructions/token_register_trustless.rs | 56 +- .../token_update_index_and_rate.rs | 33 +- .../src/instructions/token_withdraw.rs | 53 +- programs/mango-v4/src/lib.rs | 256 +++++-- programs/mango-v4/src/logs.rs | 2 +- .../mango-v4/tests/cases/test_liq_tokens.rs | 2 +- .../mango-v4/tests/cases/test_margin_trade.rs | 2 +- programs/mango-v4/tests/cases/test_serum.rs | 2 +- .../tests/program_test/mango_client.rs | 4 +- programs/margin-trade/Cargo.toml | 4 +- release-to-devnet.sh | 2 +- release-to-mainnet.sh | 2 +- run-anchor-tests.sh | 4 +- ts/client/src/mango_v4.ts | 260 +++---- update-local-idl.sh | 2 +- 135 files changed, 3335 insertions(+), 2181 deletions(-) rename anchor => 3rdparty/anchor (100%) rename switchboard-v2 => 3rdparty/switchboard-v2 (100%) create mode 100644 LICENSE create mode 100644 programs/mango-v4/src/accounts_ix/account_close.rs create mode 100644 programs/mango-v4/src/accounts_ix/account_create.rs create mode 100644 programs/mango-v4/src/accounts_ix/account_edit.rs create mode 100644 programs/mango-v4/src/accounts_ix/account_expand.rs create mode 100644 programs/mango-v4/src/accounts_ix/account_toggle_freeze.rs create mode 100644 programs/mango-v4/src/accounts_ix/alt_extend.rs create mode 100644 programs/mango-v4/src/accounts_ix/alt_set.rs create mode 100644 programs/mango-v4/src/accounts_ix/benchmark.rs create mode 100644 programs/mango-v4/src/accounts_ix/compute_account_data.rs create mode 100644 programs/mango-v4/src/accounts_ix/flash_loan.rs create mode 100644 programs/mango-v4/src/accounts_ix/group_close.rs create mode 100644 programs/mango-v4/src/accounts_ix/group_create.rs create mode 100644 programs/mango-v4/src/accounts_ix/group_edit.rs create mode 100644 programs/mango-v4/src/accounts_ix/health_region.rs create mode 100644 programs/mango-v4/src/accounts_ix/ix_gate_set.rs create mode 100644 programs/mango-v4/src/accounts_ix/mod.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_cancel_all_orders.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_cancel_all_orders_by_side.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_cancel_order.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_cancel_order_by_client_order_id.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_close_market.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_consume_events.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_create_market.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_deactivate_position.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_edit_market.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_liq_base_or_positive_pnl.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_liq_force_cancel_orders.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_liq_negative_pnl_or_bankruptcy.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_place_order.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_settle_fees.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_settle_pnl.rs create mode 100644 programs/mango-v4/src/accounts_ix/perp_update_funding.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_cancel_all_orders.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_cancel_order.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_close_open_orders.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_create_open_orders.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_deregister_market.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_edit_market.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_liq_force_cancel_orders.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_place_order.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_register_market.rs create mode 100644 programs/mango-v4/src/accounts_ix/serum3_settle_funds.rs create mode 100644 programs/mango-v4/src/accounts_ix/stub_oracle_close.rs create mode 100644 programs/mango-v4/src/accounts_ix/stub_oracle_create.rs create mode 100644 programs/mango-v4/src/accounts_ix/stub_oracle_set.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_add_bank.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_deposit.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_deregister.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_edit.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_liq_bankruptcy.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_liq_with_token.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_register.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_register_trustless.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_update_index_and_rate.rs create mode 100644 programs/mango-v4/src/accounts_ix/token_withdraw.rs create mode 100644 programs/mango-v4/src/instructions/LICENSE diff --git a/.github/workflows/ci-code-review-rust.yml b/.github/workflows/ci-code-review-rust.yml index c33e17e6a..1a40a0973 100644 --- a/.github/workflows/ci-code-review-rust.yml +++ b/.github/workflows/ci-code-review-rust.yml @@ -91,12 +91,12 @@ jobs: - name: Build all deps run: | - cargo build-bpf || true - cargo +bpf build-bpf + cargo build-bpf --features enable-gpl || true + cargo +bpf build-bpf --features enable-gpl # Run bpf tests and output to runner and log - name: Run bpf tests - run: cargo +bpf test-bpf 2> >(tee raw-test-bpf.log >&2) + run: cargo +bpf test-bpf --features enable-gpl 2> >(tee raw-test-bpf.log >&2) - name: Save raw log uses: actions/upload-artifact@v3 diff --git a/.gitmodules b/.gitmodules index cbe50ef2a..914f427f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "anchor"] - path = anchor + path = 3rdparty/anchor url = https://github.com/blockworks-foundation/anchor.git branch = v0.25.0-mangov4 [submodule "switchboard-v2"] - path = switchboard-v2 + path = 3rdparty/switchboard-v2 url = https://github.com/blockworks-foundation/sbv2-solana.git diff --git a/anchor b/3rdparty/anchor similarity index 100% rename from anchor rename to 3rdparty/anchor diff --git a/switchboard-v2 b/3rdparty/switchboard-v2 similarity index 100% rename from switchboard-v2 rename to 3rdparty/switchboard-v2 diff --git a/Cargo.toml b/Cargo.toml index 062ed8574..ceec5ef2b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ "keeper", "lib/*", "liquidator", - "anchor/cli", + "3rdparty/anchor/cli", ] [profile.release] @@ -17,6 +17,6 @@ overflow-checks = true jsonrpc-core-client = { git = "https://github.com/ckamm/jsonrpc.git", branch = "ckamm/http-with-gzip" } # these patch anchor to use solana 1.14.9 in order to fix dependency conflicts in switchboard-v2 # downstream applications may need to copy these patches to their own workspace -anchor-spl = { path = "./anchor/spl/" } -anchor-lang = { path = "./anchor/lang/" } -switchboard-v2 = { path = "./switchboard-v2/rust/switchboard-v2/" } +anchor-spl = { path = "./3rdparty/anchor/spl/" } +anchor-lang = { path = "./3rdparty/anchor/lang/" } +switchboard-v2 = { path = "./3rdparty/switchboard-v2/rust/switchboard-v2/" } diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..7a9381f39 --- /dev/null +++ b/LICENSE @@ -0,0 +1,32 @@ +The following licenses apply to the contents of this repository: + +All files in the programs/mango-v4/src/instructions directory and below +are licensed under the GNU General Public License v3.0. See +programs/mango-v4/src/instructions/LICENSE. + +The contents of the 3rdparty/ directory and below are covered by the +licenses specified in the subfolders. + +All other files are licensed under the MIT License reproduced below. + +MIT License + +Copyright (c) 2022 Blockworks Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 44d36dfe5..10c8a57e9 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anchor-client = { path = "../anchor/client" } -anchor-lang = { path = "../anchor/lang" } -anchor-spl = { path = "../anchor/spl" } +anchor-client = { path = "../3rdparty/anchor/client" } +anchor-lang = { path = "../3rdparty/anchor/lang" } +anchor-spl = { path = "../3rdparty/anchor/spl" } anyhow = "1.0" clap = { version = "3.1.8", features = ["derive", "env"] } client = { path = "../client" } @@ -18,7 +18,7 @@ fixed = { version = "=1.11.0", features = ["serde", "borsh"] } fixed-macro = "^1.1.1" futures = "0.3.21" log = "0.4.0" -mango-v4 = { path = "../programs/mango-v4", features = ["no-entrypoint", "client"] } +mango-v4 = { path = "../programs/mango-v4", features = ["client"] } pyth-sdk-solana = "0.1.0" serum_dex = { git = "https://github.com/openbook-dex/program.git", default-features=false,features = ["no-entrypoint", "program"] } solana-client = "~1.14.9" diff --git a/client/Cargo.toml b/client/Cargo.toml index 8a2fd9bd8..92487d97e 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" doctest = false [dependencies] -anchor-client = { path = "../anchor/client" } -anchor-lang = { path = "../anchor/lang" } -anchor-spl = { path = "../anchor/spl" } +anchor-client = { path = "../3rdparty/anchor/client" } +anchor-lang = { path = "../3rdparty/anchor/lang" } +anchor-spl = { path = "../3rdparty/anchor/spl" } anyhow = "1.0" async-once-cell = { version = "0.4.2", features = ["unpin"] } async-trait = "0.1.52" @@ -17,7 +17,7 @@ fixed = { version = "=1.11.0", features = ["serde", "borsh"] } fixed-macro = "^1.1.1" futures = "0.3.25" itertools = "0.10.3" -mango-v4 = { path = "../programs/mango-v4", features = ["no-entrypoint", "client"] } +mango-v4 = { path = "../programs/mango-v4", features = ["client"] } pyth-sdk-solana = "0.1.0" serum_dex = { git = "https://github.com/openbook-dex/program.git", default-features=false,features = ["no-entrypoint", "program"] } shellexpand = "2.1.0" diff --git a/client/src/client.rs b/client/src/client.rs index f5bea5c90..7ea513081 100644 --- a/client/src/client.rs +++ b/client/src/client.rs @@ -15,7 +15,7 @@ use fixed::types::I80F48; use futures::{stream, StreamExt, TryStreamExt}; use itertools::Itertools; -use mango_v4::instructions::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; +use mango_v4::accounts_ix::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; use mango_v4::state::{ Bank, Group, MangoAccountValue, PerpMarketIndex, PlaceOrderType, Serum3MarketIndex, Side, TokenIndex, @@ -1348,7 +1348,7 @@ impl MangoClient { ams }, data: anchor_lang::InstructionData::data(&mango_v4::instruction::FlashLoanEnd { - flash_loan_type: mango_v4::instructions::FlashLoanType::Swap, + flash_loan_type: mango_v4::accounts_ix::FlashLoanType::Swap, }), }); diff --git a/keeper/Cargo.toml b/keeper/Cargo.toml index ecec90b02..57d698088 100644 --- a/keeper/Cargo.toml +++ b/keeper/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anchor-client = { path = "../anchor/client" } -anchor-lang = { path = "../anchor/lang" } -anchor-spl = { path = "../anchor/spl" } +anchor-client = { path = "../3rdparty/anchor/client" } +anchor-lang = { path = "../3rdparty/anchor/lang" } +anchor-spl = { path = "../3rdparty/anchor/spl" } anyhow = "1.0" clap = { version = "3.1.8", features = ["derive", "env"] } client = { path = "../client" } @@ -19,7 +19,7 @@ fixed-macro = "^1.1.1" futures = "0.3.21" itertools = "0.10.3" log = "0.4.0" -mango-v4 = { path = "../programs/mango-v4", features = ["no-entrypoint", "client"] } +mango-v4 = { path = "../programs/mango-v4", features = ["client"] } pyth-sdk-solana = "0.1.0" serum_dex = { git = "https://github.com/openbook-dex/program.git", default-features=false,features = ["no-entrypoint", "program"] } solana-client = "~1.14.9" diff --git a/keeper/src/taker.rs b/keeper/src/taker.rs index eaf24bf6d..02f48a7b3 100644 --- a/keeper/src/taker.rs +++ b/keeper/src/taker.rs @@ -6,7 +6,7 @@ use std::{ use fixed::types::I80F48; use futures::Future; -use mango_v4::instructions::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; +use mango_v4::accounts_ix::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; use tokio::time; diff --git a/liquidator/Cargo.toml b/liquidator/Cargo.toml index e45bc60d1..873507f63 100644 --- a/liquidator/Cargo.toml +++ b/liquidator/Cargo.toml @@ -4,8 +4,8 @@ version = "0.0.1" edition = "2021" [dependencies] -anchor-lang = { path = "../anchor/lang" } -anchor-client = { path = "../anchor/client" } +anchor-lang = { path = "../3rdparty/anchor/lang" } +anchor-client = { path = "../3rdparty/anchor/client" } anyhow = "1.0" arrayref = "0.3.6" async-channel = "1.6" @@ -27,7 +27,7 @@ jemallocator = "0.3.2" jsonrpc-core = "18.0.0" jsonrpc-core-client = { version = "18.0.0", features = ["ws", "http", "tls"] } log = "0.4" -mango-v4 = { path = "../programs/mango-v4", features = ["no-entrypoint", "client"] } +mango-v4 = { path = "../programs/mango-v4", features = ["client"] } once_cell = "1.12.0" pyth-sdk-solana = "0.1.0" rand = "0.7" diff --git a/programs/mango-v4/Cargo.toml b/programs/mango-v4/Cargo.toml index b6d5f873a..270a9c899 100644 --- a/programs/mango-v4/Cargo.toml +++ b/programs/mango-v4/Cargo.toml @@ -16,13 +16,15 @@ no-log-ix-name = [] cpi = ["no-entrypoint"] default = [] test-bpf = ["client"] -client = ["solana-sdk"] +client = ["solana-sdk", "no-entrypoint"] +# Enables GPL-licensed parts of the code. See LICENSE file. +enable-gpl = [] [dependencies] # todo: when to fix, when to use caret? need a regular chore to bump dependencies # note: possibly need init-if-needed feature -anchor-lang = { path = "../../anchor/lang" } -anchor-spl = { path = "../../anchor/spl" } +anchor-lang = { path = "../../3rdparty/anchor/lang" } +anchor-spl = { path = "../../3rdparty/anchor/spl" } arrayref = "0.3.6" bincode = "1.3.3" borsh = { version = "0.9.3", features = ["const-generics"] } diff --git a/programs/mango-v4/src/accounts_ix/account_close.rs b/programs/mango-v4/src/accounts_ix/account_close.rs new file mode 100644 index 000000000..e63c2b813 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/account_close.rs @@ -0,0 +1,29 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::Token; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct AccountClose<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::AccountClose) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + has_one = owner, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen, + close = sol_destination + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(mut)] + /// CHECK: target for account rent needs no checks + pub sol_destination: UncheckedAccount<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/account_create.rs b/programs/mango-v4/src/accounts_ix/account_create.rs new file mode 100644 index 000000000..683ea3502 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/account_create.rs @@ -0,0 +1,27 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +#[instruction(account_num: u32, token_count: u8, serum3_count: u8, perp_count: u8, perp_oo_count: u8)] +pub struct AccountCreate<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::AccountCreate) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + init, + seeds = [b"MangoAccount".as_ref(), group.key().as_ref(), owner.key().as_ref(), &account_num.to_le_bytes()], + bump, + payer = payer, + space = MangoAccount::space(token_count, serum3_count, perp_count, perp_oo_count)?, + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub system_program: Program<'info, System>, +} diff --git a/programs/mango-v4/src/accounts_ix/account_edit.rs b/programs/mango-v4/src/accounts_ix/account_edit.rs new file mode 100644 index 000000000..2ad49c55a --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/account_edit.rs @@ -0,0 +1,20 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct AccountEdit<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::AccountEdit) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + has_one = owner, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/account_expand.rs b/programs/mango-v4/src/accounts_ix/account_expand.rs new file mode 100644 index 000000000..37d1d8697 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/account_expand.rs @@ -0,0 +1,25 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct AccountExpand<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::AccountExpand) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + has_one = owner, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub system_program: Program<'info, System>, +} diff --git a/programs/mango-v4/src/accounts_ix/account_toggle_freeze.rs b/programs/mango-v4/src/accounts_ix/account_toggle_freeze.rs new file mode 100644 index 000000000..18ea2b40f --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/account_toggle_freeze.rs @@ -0,0 +1,20 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct AccountToggleFreeze<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::AccountToggleFreeze) @ MangoError::IxIsDisabled, + constraint = group.load()?.admin == admin.key() + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + + pub admin: Signer<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/alt_extend.rs b/programs/mango-v4/src/accounts_ix/alt_extend.rs new file mode 100644 index 000000000..b1a97c475 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/alt_extend.rs @@ -0,0 +1,22 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use solana_address_lookup_table_program as solana_alt; + +#[derive(Accounts)] +pub struct AltExtend<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::AltExtend) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + pub payer: Signer<'info>, + + /// CHECK: ALT address is checked inline + #[account( + mut, + owner = solana_alt::ID, + )] + pub address_lookup_table: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/alt_set.rs b/programs/mango-v4/src/accounts_ix/alt_set.rs new file mode 100644 index 000000000..8ef9906ff --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/alt_set.rs @@ -0,0 +1,22 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use solana_address_lookup_table_program as solana_alt; + +#[derive(Accounts)] +pub struct AltSet<'info> { + #[account( + mut, + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::AltSet) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + /// CHECK: ALT authority is checked inline + #[account( + mut, + owner = solana_alt::ID, + )] + pub address_lookup_table: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/benchmark.rs b/programs/mango-v4/src/accounts_ix/benchmark.rs new file mode 100644 index 000000000..a31e101ef --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/benchmark.rs @@ -0,0 +1,4 @@ +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct Benchmark {} diff --git a/programs/mango-v4/src/accounts_ix/compute_account_data.rs b/programs/mango-v4/src/accounts_ix/compute_account_data.rs new file mode 100644 index 000000000..4bd328eb2 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/compute_account_data.rs @@ -0,0 +1,10 @@ +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct ComputeAccountData<'info> { + pub group: AccountLoader<'info, Group>, + + #[account(has_one = group)] + pub account: AccountLoader<'info, MangoAccountFixed>, +} diff --git a/programs/mango-v4/src/accounts_ix/flash_loan.rs b/programs/mango-v4/src/accounts_ix/flash_loan.rs new file mode 100644 index 000000000..0acd882d5 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/flash_loan.rs @@ -0,0 +1,67 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_lang::solana_program::sysvar::instructions as tx_instructions; +use anchor_spl::token::Token; + +pub mod jupiter_mainnet_4 { + use solana_program::declare_id; + declare_id!("JUP4Fb2cqiRUcaTHdrPC8h2gNsA2ETXiPDD33WcGuJB"); +} +pub mod jupiter_mainnet_3 { + use solana_program::declare_id; + declare_id!("JUP3c2Uh3WA4Ng34tw6kPd2G4C5BB21Xo36Je1s32Ph"); +} + +/// Sets up mango vaults for flash loan +/// +/// In addition to these accounts, there must be remaining_accounts: +/// 1. N banks (writable) +/// 2. N vaults (writable), matching the banks +/// 3. N token accounts (writable), in the same order as the vaults, +/// the loaned funds are transfered into these +/// 4. the mango group +#[derive(Accounts)] +pub struct FlashLoanBegin<'info> { + #[account( + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + // owner is checked at #1 + pub owner: Signer<'info>, + + pub token_program: Program<'info, Token>, + + /// Instructions Sysvar for instruction introspection + /// CHECK: fixed instructions sysvar account + #[account(address = tx_instructions::ID)] + pub instructions: UncheckedAccount<'info>, +} + +/// Finalizes a flash loan +/// +/// In addition to these accounts, there must be remaining_accounts: +/// 1. health accounts, and every bank that also appeared in FlashLoanBegin must be writable +/// 2. N vaults (writable), matching what was in FlashLoanBegin +/// 3. N token accounts (writable), matching what was in FlashLoanBegin; +/// the `owner` must have authority to transfer tokens out of them +/// 4. the mango group +#[derive(Accounts)] +pub struct FlashLoanEnd<'info> { + #[account( + mut, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + // owner is checked at #1 + pub owner: Signer<'info>, + + pub token_program: Program<'info, Token>, +} + +#[derive(PartialEq, Copy, Clone, Debug, AnchorSerialize, AnchorDeserialize)] +#[repr(u8)] +pub enum FlashLoanType { + Unknown, + Swap, +} diff --git a/programs/mango-v4/src/accounts_ix/group_close.rs b/programs/mango-v4/src/accounts_ix/group_close.rs new file mode 100644 index 000000000..1b81ec581 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/group_close.rs @@ -0,0 +1,28 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_spl::token::{Token, TokenAccount}; + +#[derive(Accounts)] +pub struct GroupClose<'info> { + #[account( + mut, + has_one = admin, + has_one = insurance_vault, + constraint = group.load()?.is_testing(), + constraint = group.load()?.is_ix_enabled(IxGate::GroupClose) @ MangoError::IxIsDisabled, + close = sol_destination + )] + pub group: AccountLoader<'info, Group>, + + pub admin: Signer<'info>, + + #[account(mut)] + pub insurance_vault: Account<'info, TokenAccount>, + + #[account(mut)] + /// CHECK: target for account rent needs no checks + pub sol_destination: UncheckedAccount<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/group_create.rs b/programs/mango-v4/src/accounts_ix/group_create.rs new file mode 100644 index 000000000..22935f658 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/group_create.rs @@ -0,0 +1,37 @@ +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_spl::token::{Mint, Token, TokenAccount}; + +#[derive(Accounts)] +#[instruction(group_num: u32)] +pub struct GroupCreate<'info> { + #[account( + init, + seeds = [b"Group".as_ref(), creator.key().as_ref(), &group_num.to_le_bytes()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub group: AccountLoader<'info, Group>, + + pub creator: Signer<'info>, + + pub insurance_mint: Account<'info, Mint>, + + #[account( + init, + seeds = [b"InsuranceVault".as_ref(), group.key().as_ref()], + bump, + token::authority = group, + token::mint = insurance_mint, + payer = payer + )] + pub insurance_vault: Account<'info, TokenAccount>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub token_program: Program<'info, Token>, + pub system_program: Program<'info, System>, + pub rent: Sysvar<'info, Rent>, +} diff --git a/programs/mango-v4/src/accounts_ix/group_edit.rs b/programs/mango-v4/src/accounts_ix/group_edit.rs new file mode 100644 index 000000000..6a30b3526 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/group_edit.rs @@ -0,0 +1,13 @@ +use anchor_lang::prelude::*; + +use crate::state::*; + +#[derive(Accounts)] +pub struct GroupEdit<'info> { + #[account( + mut, + has_one = admin, + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/health_region.rs b/programs/mango-v4/src/accounts_ix/health_region.rs new file mode 100644 index 000000000..2b7a0609e --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/health_region.rs @@ -0,0 +1,41 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_lang::solana_program::sysvar::instructions as tx_instructions; + +/// Sets up for a health region +/// +/// The same transaction must have the corresponding HealthRegionEnd call. +/// +/// remaining_accounts: health accounts for account +#[derive(Accounts)] +pub struct HealthRegionBegin<'info> { + /// Instructions Sysvar for instruction introspection + /// CHECK: fixed instructions sysvar account + #[account(address = tx_instructions::ID)] + pub instructions: UncheckedAccount<'info>, + + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::HealthRegion) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, +} + +/// Ends a health region. +/// +/// remaining_accounts: health accounts for account +#[derive(Accounts)] +pub struct HealthRegionEnd<'info> { + #[account( + mut, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, +} diff --git a/programs/mango-v4/src/accounts_ix/ix_gate_set.rs b/programs/mango-v4/src/accounts_ix/ix_gate_set.rs new file mode 100644 index 000000000..cb6b7adf4 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/ix_gate_set.rs @@ -0,0 +1,12 @@ +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct IxGateSet<'info> { + #[account( + mut, + // group <-> admin relation is checked at #1 + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/mod.rs b/programs/mango-v4/src/accounts_ix/mod.rs new file mode 100644 index 000000000..791b6f396 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/mod.rs @@ -0,0 +1,109 @@ +pub use account_close::*; +pub use account_create::*; +pub use account_edit::*; +pub use account_expand::*; +pub use account_toggle_freeze::*; +pub use alt_extend::*; +pub use alt_set::*; +pub use benchmark::*; +pub use compute_account_data::*; +pub use flash_loan::*; +pub use group_close::*; +pub use group_create::*; +pub use group_edit::*; +pub use health_region::*; +pub use ix_gate_set::*; +pub use perp_cancel_all_orders::*; +pub use perp_cancel_all_orders_by_side::*; +pub use perp_cancel_order::*; +pub use perp_cancel_order_by_client_order_id::*; +pub use perp_close_market::*; +pub use perp_consume_events::*; +pub use perp_create_market::*; +pub use perp_deactivate_position::*; +pub use perp_edit_market::*; +pub use perp_liq_base_or_positive_pnl::*; +pub use perp_liq_force_cancel_orders::*; +pub use perp_liq_negative_pnl_or_bankruptcy::*; +pub use perp_place_order::*; +pub use perp_settle_fees::*; +pub use perp_settle_pnl::*; +pub use perp_update_funding::*; +pub use serum3_cancel_all_orders::*; +pub use serum3_cancel_order::*; +pub use serum3_close_open_orders::*; +pub use serum3_create_open_orders::*; +pub use serum3_deregister_market::*; +pub use serum3_edit_market::*; +pub use serum3_liq_force_cancel_orders::*; +pub use serum3_place_order::*; +pub use serum3_register_market::*; +pub use serum3_settle_funds::*; +pub use stub_oracle_close::*; +pub use stub_oracle_create::*; +pub use stub_oracle_set::*; +pub use token_add_bank::*; +pub use token_deposit::*; +pub use token_deregister::*; +pub use token_edit::*; +pub use token_liq_bankruptcy::*; +pub use token_liq_with_token::*; +pub use token_register::*; +pub use token_register_trustless::*; +pub use token_update_index_and_rate::*; +pub use token_withdraw::*; + +mod account_close; +mod account_create; +mod account_edit; +mod account_expand; +mod account_toggle_freeze; +mod alt_extend; +mod alt_set; +mod benchmark; +mod compute_account_data; +mod flash_loan; +mod group_close; +mod group_create; +mod group_edit; +mod health_region; +mod ix_gate_set; +mod perp_cancel_all_orders; +mod perp_cancel_all_orders_by_side; +mod perp_cancel_order; +mod perp_cancel_order_by_client_order_id; +mod perp_close_market; +mod perp_consume_events; +mod perp_create_market; +mod perp_deactivate_position; +mod perp_edit_market; +mod perp_liq_base_or_positive_pnl; +mod perp_liq_force_cancel_orders; +mod perp_liq_negative_pnl_or_bankruptcy; +mod perp_place_order; +mod perp_settle_fees; +mod perp_settle_pnl; +mod perp_update_funding; +mod serum3_cancel_all_orders; +mod serum3_cancel_order; +mod serum3_close_open_orders; +mod serum3_create_open_orders; +mod serum3_deregister_market; +mod serum3_edit_market; +mod serum3_liq_force_cancel_orders; +mod serum3_place_order; +mod serum3_register_market; +mod serum3_settle_funds; +mod stub_oracle_close; +mod stub_oracle_create; +mod stub_oracle_set; +mod token_add_bank; +mod token_deposit; +mod token_deregister; +mod token_edit; +mod token_liq_bankruptcy; +mod token_liq_with_token; +mod token_register; +mod token_register_trustless; +mod token_update_index_and_rate; +mod token_withdraw; diff --git a/programs/mango-v4/src/accounts_ix/perp_cancel_all_orders.rs b/programs/mango-v4/src/accounts_ix/perp_cancel_all_orders.rs new file mode 100644 index 000000000..5ceef457b --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_cancel_all_orders.rs @@ -0,0 +1,31 @@ +use crate::error::MangoError; +use crate::state::{BookSide, Group, IxGate, MangoAccountFixed, PerpMarket}; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpCancelAllOrders<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelAllOrders) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + #[account(mut)] + pub bids: AccountLoader<'info, BookSide>, + #[account(mut)] + pub asks: AccountLoader<'info, BookSide>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_cancel_all_orders_by_side.rs b/programs/mango-v4/src/accounts_ix/perp_cancel_all_orders_by_side.rs new file mode 100644 index 000000000..a2998b09b --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_cancel_all_orders_by_side.rs @@ -0,0 +1,32 @@ +use crate::error::MangoError; +use crate::state::{BookSide, Group, IxGate, MangoAccountFixed, PerpMarket}; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpCancelAllOrdersBySide<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelAllOrdersBySide) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + #[account(mut)] + pub bids: AccountLoader<'info, BookSide>, + #[account(mut)] + pub asks: AccountLoader<'info, BookSide>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_cancel_order.rs b/programs/mango-v4/src/accounts_ix/perp_cancel_order.rs new file mode 100644 index 000000000..259c4be09 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_cancel_order.rs @@ -0,0 +1,32 @@ +use crate::error::*; +use crate::state::{BookSide, Group, IxGate, MangoAccountFixed, PerpMarket}; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpCancelOrder<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelOrder) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + #[account(mut)] + pub bids: AccountLoader<'info, BookSide>, + #[account(mut)] + pub asks: AccountLoader<'info, BookSide>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_cancel_order_by_client_order_id.rs b/programs/mango-v4/src/accounts_ix/perp_cancel_order_by_client_order_id.rs new file mode 100644 index 000000000..97af19d63 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_cancel_order_by_client_order_id.rs @@ -0,0 +1,31 @@ +use crate::error::*; +use crate::state::{BookSide, Group, IxGate, MangoAccountFixed, PerpMarket}; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpCancelOrderByClientOrderId<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelOrderByClientOrderId) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + #[account(mut)] + pub bids: AccountLoader<'info, BookSide>, + #[account(mut)] + pub asks: AccountLoader<'info, BookSide>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_close_market.rs b/programs/mango-v4/src/accounts_ix/perp_close_market.rs new file mode 100644 index 000000000..209a2aeb9 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_close_market.rs @@ -0,0 +1,49 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::Token; + +use crate::{error::MangoError, state::*}; + +#[derive(Accounts)] +pub struct PerpCloseMarket<'info> { + #[account( + constraint = group.load()?.is_testing(), + constraint = group.load()?.is_ix_enabled(IxGate::PerpCloseMarket) @ MangoError::IxIsDisabled, + has_one = admin, + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + has_one = event_queue, + close = sol_destination + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + + #[account( + mut, + close = sol_destination + )] + pub bids: AccountLoader<'info, BookSide>, + + #[account( + mut, + close = sol_destination + )] + pub asks: AccountLoader<'info, BookSide>, + + #[account( + mut, + close = sol_destination + )] + pub event_queue: AccountLoader<'info, EventQueue>, + + #[account(mut)] + /// CHECK: target for account rent needs no checks + pub sol_destination: UncheckedAccount<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_consume_events.rs b/programs/mango-v4/src/accounts_ix/perp_consume_events.rs new file mode 100644 index 000000000..f313394f9 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_consume_events.rs @@ -0,0 +1,21 @@ +use crate::error::MangoError; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpConsumeEvents<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpConsumeEvents) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + has_one = event_queue, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + + #[account(mut)] + pub event_queue: AccountLoader<'info, EventQueue>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_create_market.rs b/programs/mango-v4/src/accounts_ix/perp_create_market.rs new file mode 100644 index 000000000..bfe25632a --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_create_market.rs @@ -0,0 +1,41 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +#[instruction(perp_market_index: PerpMarketIndex)] +pub struct PerpCreateMarket<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::PerpCreateMarket) @ MangoError::IxIsDisabled, + constraint = group.load()?.perps_supported(), + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, + + #[account( + init, + seeds = [b"PerpMarket".as_ref(), group.key().as_ref(), perp_market_index.to_le_bytes().as_ref()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + + /// Accounts are initialised by client, + /// anchor discriminator is set first when ix exits, + #[account(zero)] + pub bids: AccountLoader<'info, BookSide>, + #[account(zero)] + pub asks: AccountLoader<'info, BookSide>, + #[account(zero)] + pub event_queue: AccountLoader<'info, EventQueue>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub system_program: Program<'info, System>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_deactivate_position.rs b/programs/mango-v4/src/accounts_ix/perp_deactivate_position.rs new file mode 100644 index 000000000..aff9d8ebf --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_deactivate_position.rs @@ -0,0 +1,24 @@ +use anchor_lang::prelude::*; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct PerpDeactivatePosition<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpDeactivatePosition) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(has_one = group)] + pub perp_market: AccountLoader<'info, PerpMarket>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_edit_market.rs b/programs/mango-v4/src/accounts_ix/perp_edit_market.rs new file mode 100644 index 000000000..f1d1937ca --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_edit_market.rs @@ -0,0 +1,20 @@ +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpEditMarket<'info> { + pub group: AccountLoader<'info, Group>, + // group <-> admin relation is checked at #1 + pub admin: Signer<'info>, + + #[account( + mut, + has_one = group + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + + /// The oracle account is optional and only used when reset_stable_price is set. + /// + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_liq_base_or_positive_pnl.rs b/programs/mango-v4/src/accounts_ix/perp_liq_base_or_positive_pnl.rs new file mode 100644 index 000000000..6dc3e12b0 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_liq_base_or_positive_pnl.rs @@ -0,0 +1,48 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_spl::token::TokenAccount; + +#[derive(Accounts)] +pub struct PerpLiqBaseOrPositivePnl<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpLiqBaseOrPositivePnl) @ MangoError::IxIsDisabled + )] + pub group: AccountLoader<'info, Group>, + + #[account(mut, has_one = group, has_one = oracle)] + pub perp_market: AccountLoader<'info, PerpMarket>, + + /// CHECK: Oracle can have different account types, constrained by address in perp_market + pub oracle: UncheckedAccount<'info>, + + #[account( + mut, + has_one = group, + constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen + // liqor_owner is checked at #1 + )] + pub liqor: AccountLoader<'info, MangoAccountFixed>, + pub liqor_owner: Signer<'info>, + + #[account( + mut, + has_one = group, + constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub liqee: AccountLoader<'info, MangoAccountFixed>, + + // bank correctness is checked at #2 + #[account(mut, has_one = group)] + pub settle_bank: AccountLoader<'info, Bank>, + + #[account( + mut, + address = settle_bank.load()?.vault + )] + pub settle_vault: Account<'info, TokenAccount>, + + /// CHECK: Oracle can have different account types + #[account(address = settle_bank.load()?.oracle)] + pub settle_oracle: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_liq_force_cancel_orders.rs b/programs/mango-v4/src/accounts_ix/perp_liq_force_cancel_orders.rs new file mode 100644 index 000000000..f98d981a2 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_liq_force_cancel_orders.rs @@ -0,0 +1,30 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpLiqForceCancelOrders<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpLiqForceCancelOrders) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + // Allow force cancel even if account is frozen + #[account( + mut, + has_one = group + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + #[account(mut)] + pub bids: AccountLoader<'info, BookSide>, + #[account(mut)] + pub asks: AccountLoader<'info, BookSide>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_liq_negative_pnl_or_bankruptcy.rs b/programs/mango-v4/src/accounts_ix/perp_liq_negative_pnl_or_bankruptcy.rs new file mode 100644 index 000000000..6d6af2147 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_liq_negative_pnl_or_bankruptcy.rs @@ -0,0 +1,69 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_spl::token::{self, Token, TokenAccount}; + +#[derive(Accounts)] +pub struct PerpLiqNegativePnlOrBankruptcy<'info> { + #[account( + has_one = insurance_vault, + constraint = group.load()?.is_ix_enabled(IxGate::PerpLiqNegativePnlOrBankruptcy) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen, + // liqor_owner is checked at #1 + )] + pub liqor: AccountLoader<'info, MangoAccountFixed>, + pub liqor_owner: Signer<'info>, + + // This account MUST have a loss + #[account( + mut, + has_one = group, + constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub liqee: AccountLoader<'info, MangoAccountFixed>, + + #[account(mut, has_one = group, has_one = oracle)] + pub perp_market: AccountLoader<'info, PerpMarket>, + + /// CHECK: Oracle can have different account types, constrained by address in perp_market + pub oracle: UncheckedAccount<'info>, + + // bank correctness is checked at #2 + #[account(mut, has_one = group)] + pub settle_bank: AccountLoader<'info, Bank>, + + #[account( + mut, + address = settle_bank.load()?.vault + )] + pub settle_vault: Account<'info, TokenAccount>, + + /// CHECK: Oracle can have different account types + #[account(address = settle_bank.load()?.oracle)] + pub settle_oracle: UncheckedAccount<'info>, + + // future: this would be an insurance fund vault specific to a + // trustless token, separate from the shared one on the group + #[account(mut)] + pub insurance_vault: Account<'info, TokenAccount>, + + pub token_program: Program<'info, Token>, +} + +impl<'info> PerpLiqNegativePnlOrBankruptcy<'info> { + pub fn transfer_ctx(&self) -> CpiContext<'_, '_, '_, 'info, token::Transfer<'info>> { + let program = self.token_program.to_account_info(); + let accounts = token::Transfer { + from: self.insurance_vault.to_account_info(), + to: self.settle_vault.to_account_info(), + authority: self.group.to_account_info(), + }; + CpiContext::new(program, accounts) + } +} diff --git a/programs/mango-v4/src/accounts_ix/perp_place_order.rs b/programs/mango-v4/src/accounts_ix/perp_place_order.rs new file mode 100644 index 000000000..0cdc4f3e3 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_place_order.rs @@ -0,0 +1,39 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpPlaceOrder<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpPlaceOrder) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + has_one = event_queue, + has_one = oracle, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + #[account(mut)] + pub bids: AccountLoader<'info, BookSide>, + #[account(mut)] + pub asks: AccountLoader<'info, BookSide>, + #[account(mut)] + pub event_queue: AccountLoader<'info, EventQueue>, + + /// CHECK: The oracle can be one of several different account types and the pubkey is checked above + pub oracle: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_settle_fees.rs b/programs/mango-v4/src/accounts_ix/perp_settle_fees.rs new file mode 100644 index 000000000..f44bba0c1 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_settle_fees.rs @@ -0,0 +1,33 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpSettleFees<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpSettleFees) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account(mut, has_one = group, has_one = oracle)] + pub perp_market: AccountLoader<'info, PerpMarket>, + + // This account MUST have a loss + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + + /// CHECK: Oracle can have different account types, constrained by address in perp_market + pub oracle: UncheckedAccount<'info>, + + // bank correctness is checked at #2 + #[account(mut, has_one = group)] + pub settle_bank: AccountLoader<'info, Bank>, + + /// CHECK: Oracle can have different account types + #[account(address = settle_bank.load()?.oracle)] + pub settle_oracle: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_settle_pnl.rs b/programs/mango-v4/src/accounts_ix/perp_settle_pnl.rs new file mode 100644 index 000000000..222dab985 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_settle_pnl.rs @@ -0,0 +1,48 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpSettlePnl<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpSettlePnl) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = settler.load()?.is_operational() @ MangoError::AccountIsFrozen + // settler_owner is checked at #1 + )] + pub settler: AccountLoader<'info, MangoAccountFixed>, + pub settler_owner: Signer<'info>, + + #[account(has_one = group, has_one = oracle)] + pub perp_market: AccountLoader<'info, PerpMarket>, + + // This account MUST be profitable + #[account(mut, + has_one = group, + constraint = account_a.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account_a: AccountLoader<'info, MangoAccountFixed>, + // This account MUST have a loss + #[account( + mut, + has_one = group, + constraint = account_b.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account_b: AccountLoader<'info, MangoAccountFixed>, + + /// CHECK: Oracle can have different account types, constrained by address in perp_market + pub oracle: UncheckedAccount<'info>, + + // bank correctness is checked at #2 + #[account(mut, has_one = group)] + pub settle_bank: AccountLoader<'info, Bank>, + + /// CHECK: Oracle can have different account types + #[account(address = settle_bank.load()?.oracle)] + pub settle_oracle: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/perp_update_funding.rs b/programs/mango-v4/src/accounts_ix/perp_update_funding.rs new file mode 100644 index 000000000..d2bf46ec8 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/perp_update_funding.rs @@ -0,0 +1,27 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct PerpUpdateFunding<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::PerpUpdateFunding) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, // Required for group metadata parsing + + #[account( + mut, + has_one = group, + has_one = bids, + has_one = asks, + has_one = oracle, + )] + pub perp_market: AccountLoader<'info, PerpMarket>, + #[account(mut)] + pub bids: AccountLoader<'info, BookSide>, + #[account(mut)] + pub asks: AccountLoader<'info, BookSide>, + + /// CHECK: The oracle can be one of several different account types and the pubkey is checked above + pub oracle: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_cancel_all_orders.rs b/programs/mango-v4/src/accounts_ix/serum3_cancel_all_orders.rs new file mode 100644 index 000000000..8fb7e9dcc --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_cancel_all_orders.rs @@ -0,0 +1,48 @@ +use anchor_lang::prelude::*; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct Serum3CancelAllOrders<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::Serum3CancelAllOrders) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(mut)] + /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 + pub open_orders: UncheckedAccount<'info>, + + #[account( + has_one = group, + has_one = serum_program, + has_one = serum_market_external, + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_program: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_market_external: UncheckedAccount<'info>, + + // These accounts are forwarded directly to the serum cpi call + // and are validated there. + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_bids: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_asks: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_event_queue: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_cancel_order.rs b/programs/mango-v4/src/accounts_ix/serum3_cancel_order.rs new file mode 100644 index 000000000..f432de24d --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_cancel_order.rs @@ -0,0 +1,49 @@ +use anchor_lang::prelude::*; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct Serum3CancelOrder<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::Serum3CancelOrder) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(mut)] + /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 + pub open_orders: UncheckedAccount<'info>, + + #[account( + has_one = group, + has_one = serum_program, + has_one = serum_market_external, + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_program: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_market_external: UncheckedAccount<'info>, + + // These accounts are forwarded directly to the serum cpi call + // and are validated there. + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_bids: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_asks: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_event_queue: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_close_open_orders.rs b/programs/mango-v4/src/accounts_ix/serum3_close_open_orders.rs new file mode 100644 index 000000000..a91d3a1a9 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_close_open_orders.rs @@ -0,0 +1,40 @@ +use anchor_lang::prelude::*; + +use crate::error::MangoError; +use crate::state::*; + +#[derive(Accounts)] +pub struct Serum3CloseOpenOrders<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::Serum3CloseOpenOrders) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + has_one = group, + has_one = serum_program, + has_one = serum_market_external, + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_program: UncheckedAccount<'info>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_market_external: UncheckedAccount<'info>, + + #[account(mut)] + /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 + pub open_orders: UncheckedAccount<'info>, + + #[account(mut)] + /// CHECK: target for account rent needs no checks + pub sol_destination: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_create_open_orders.rs b/programs/mango-v4/src/accounts_ix/serum3_create_open_orders.rs new file mode 100644 index 000000000..57b8df1aa --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_create_open_orders.rs @@ -0,0 +1,51 @@ +use anchor_lang::prelude::*; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct Serum3CreateOpenOrders<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::Serum3CreateOpenOrders) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + has_one = group, + has_one = serum_program, + has_one = serum_market_external, + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_program: UncheckedAccount<'info>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_market_external: UncheckedAccount<'info>, + + // initialized by this instruction via cpi to serum + #[account( + init, + seeds = [b"Serum3OO".as_ref(), account.key().as_ref(), serum_market.key().as_ref()], + bump, + payer = payer, + owner = serum_program.key(), + // 12 is the padding serum uses for accounts ("serum" prefix, "padding" postfix) + space = 12 + std::mem::size_of::(), + )] + /// CHECK: Newly created by serum cpi call + pub open_orders: UncheckedAccount<'info>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub system_program: Program<'info, System>, + pub rent: Sysvar<'info, Rent>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_deregister_market.rs b/programs/mango-v4/src/accounts_ix/serum3_deregister_market.rs new file mode 100644 index 000000000..fbcb91633 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_deregister_market.rs @@ -0,0 +1,37 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::Token; + +use crate::{error::MangoError, state::*}; + +#[derive(Accounts)] +pub struct Serum3DeregisterMarket<'info> { + #[account( + mut, + has_one = admin, + constraint = group.load()?.is_testing(), + constraint = group.load()?.is_ix_enabled(IxGate::Serum3DeregisterMarket) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + #[account( + mut, + has_one = group, + close = sol_destination + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + + #[account( + mut, + has_one = group, + constraint = serum_market.load()?.market_index == index_reservation.load()?.market_index, + close = sol_destination + )] + pub index_reservation: AccountLoader<'info, Serum3MarketIndexReservation>, + + #[account(mut)] + /// CHECK: target for account rent needs no checks + pub sol_destination: UncheckedAccount<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_edit_market.rs b/programs/mango-v4/src/accounts_ix/serum3_edit_market.rs new file mode 100644 index 000000000..1412713af --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_edit_market.rs @@ -0,0 +1,20 @@ +use anchor_lang::prelude::*; + +use crate::state::*; + +#[derive(Accounts)] +#[instruction(market_index: Serum3MarketIndex)] +pub struct Serum3EditMarket<'info> { + #[account( + has_one = admin, + constraint = group.load()?.serum3_supported() + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + #[account( + mut, + has_one = group + )] + pub market: AccountLoader<'info, Serum3Market>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_liq_force_cancel_orders.rs b/programs/mango-v4/src/accounts_ix/serum3_liq_force_cancel_orders.rs new file mode 100644 index 000000000..b7a4a543a --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_liq_force_cancel_orders.rs @@ -0,0 +1,68 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::{Token, TokenAccount}; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct Serum3LiqForceCancelOrders<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::Serum3LiqForceCancelOrders) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + // Allow force cancel even if account is frozen + #[account( + mut, + has_one = group + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + + #[account(mut)] + /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 + pub open_orders: UncheckedAccount<'info>, + + #[account( + has_one = group, + has_one = serum_program, + has_one = serum_market_external, + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_program: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_market_external: UncheckedAccount<'info>, + + // These accounts are forwarded directly to the serum cpi call + // and are validated there. + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_bids: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_asks: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_event_queue: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_base_vault: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_quote_vault: UncheckedAccount<'info>, + /// CHECK: Validated by the serum cpi call + pub market_vault_signer: UncheckedAccount<'info>, + + // token_index and bank.vault == vault is validated inline at #3 + #[account(mut, has_one = group)] + pub quote_bank: AccountLoader<'info, Bank>, + #[account(mut)] + pub quote_vault: Box>, + #[account(mut, has_one = group)] + pub base_bank: AccountLoader<'info, Bank>, + #[account(mut)] + pub base_vault: Box>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_place_order.rs b/programs/mango-v4/src/accounts_ix/serum3_place_order.rs new file mode 100644 index 000000000..975d937d4 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_place_order.rs @@ -0,0 +1,102 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_spl::token::{Token, TokenAccount}; +use num_enum::IntoPrimitive; +use num_enum::TryFromPrimitive; + +/// Copy paste a bunch of enums so that we could AnchorSerialize & AnchorDeserialize them + +#[derive(Clone, Copy, TryFromPrimitive, IntoPrimitive, AnchorSerialize, AnchorDeserialize)] +#[repr(u8)] +pub enum Serum3SelfTradeBehavior { + DecrementTake = 0, + CancelProvide = 1, + AbortTransaction = 2, +} + +#[derive(Clone, Copy, TryFromPrimitive, IntoPrimitive, AnchorSerialize, AnchorDeserialize)] +#[repr(u8)] + +pub enum Serum3OrderType { + Limit = 0, + ImmediateOrCancel = 1, + PostOnly = 2, +} +#[derive(Clone, Copy, TryFromPrimitive, IntoPrimitive, AnchorSerialize, AnchorDeserialize)] +#[repr(u8)] + +pub enum Serum3Side { + Bid = 0, + Ask = 1, +} + +#[derive(Accounts)] +pub struct Serum3PlaceOrder<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::Serum3PlaceOrder) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(mut)] + /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 + pub open_orders: UncheckedAccount<'info>, + + #[account( + has_one = group, + has_one = serum_program, + has_one = serum_market_external, + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_program: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_market_external: UncheckedAccount<'info>, + + // These accounts are forwarded directly to the serum cpi call + // and are validated there. + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_bids: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_asks: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_event_queue: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_request_queue: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_base_vault: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_quote_vault: UncheckedAccount<'info>, + /// needed for the automatic settle_funds call + /// CHECK: Validated by the serum cpi call + pub market_vault_signer: UncheckedAccount<'info>, + + /// The bank that pays for the order, if necessary + // token_index and payer_bank.vault == payer_vault is validated inline at #3 + #[account(mut, has_one = group)] + pub payer_bank: AccountLoader<'info, Bank>, + /// The bank vault that pays for the order, if necessary + #[account(mut)] + pub payer_vault: Box>, + /// CHECK: The oracle can be one of several different account types + #[account(address = payer_bank.load()?.oracle)] + pub payer_oracle: UncheckedAccount<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_register_market.rs b/programs/mango-v4/src/accounts_ix/serum3_register_market.rs new file mode 100644 index 000000000..fb1f08ae2 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_register_market.rs @@ -0,0 +1,51 @@ +use crate::error::MangoError; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +#[instruction(market_index: Serum3MarketIndex)] +pub struct Serum3RegisterMarket<'info> { + #[account( + mut, + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::Serum3RegisterMarket) @ MangoError::IxIsDisabled, + constraint = group.load()?.serum3_supported() + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + /// CHECK: Can register a market for any serum program + pub serum_program: UncheckedAccount<'info>, + /// CHECK: Can register any serum market + pub serum_market_external: UncheckedAccount<'info>, + + #[account( + init, + // using the serum_market_external in the seed guards against registering the same market twice + seeds = [b"Serum3Market".as_ref(), group.key().as_ref(), serum_market_external.key().as_ref()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + + #[account( + init, + // block using the same market index twice + seeds = [b"Serum3Index".as_ref(), group.key().as_ref(), &market_index.to_le_bytes()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub index_reservation: AccountLoader<'info, Serum3MarketIndexReservation>, + + #[account(has_one = group)] + pub quote_bank: AccountLoader<'info, Bank>, + #[account(has_one = group)] + pub base_bank: AccountLoader<'info, Bank>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub system_program: Program<'info, System>, +} diff --git a/programs/mango-v4/src/accounts_ix/serum3_settle_funds.rs b/programs/mango-v4/src/accounts_ix/serum3_settle_funds.rs new file mode 100644 index 000000000..6d15d3099 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/serum3_settle_funds.rs @@ -0,0 +1,62 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::{Token, TokenAccount}; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct Serum3SettleFunds<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::Serum3SettleFunds) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + // owner is checked at #1 + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account(mut)] + /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 + pub open_orders: UncheckedAccount<'info>, + + #[account( + has_one = group, + has_one = serum_program, + has_one = serum_market_external, + )] + pub serum_market: AccountLoader<'info, Serum3Market>, + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_program: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: The pubkey is checked and then it's passed to the serum cpi + pub serum_market_external: UncheckedAccount<'info>, + + // These accounts are forwarded directly to the serum cpi call + // and are validated there. + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_base_vault: UncheckedAccount<'info>, + #[account(mut)] + /// CHECK: Validated by the serum cpi call + pub market_quote_vault: UncheckedAccount<'info>, + /// needed for the automatic settle_funds call + /// CHECK: Validated by the serum cpi call + pub market_vault_signer: UncheckedAccount<'info>, + + // token_index and bank.vault == vault is validated inline at #3 + #[account(mut, has_one = group)] + pub quote_bank: AccountLoader<'info, Bank>, + #[account(mut)] + pub quote_vault: Box>, + #[account(mut, has_one = group)] + pub base_bank: AccountLoader<'info, Bank>, + #[account(mut)] + pub base_vault: Box>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/stub_oracle_close.rs b/programs/mango-v4/src/accounts_ix/stub_oracle_close.rs new file mode 100644 index 000000000..c1005998b --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/stub_oracle_close.rs @@ -0,0 +1,29 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::Token; + +use crate::{error::MangoError, state::*}; + +#[derive(Accounts)] +pub struct StubOracleClose<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::StubOracleClose) @ MangoError::IxIsDisabled, + constraint = group.load()?.is_testing(), + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + // match stub oracle to group + #[account( + mut, + has_one = group, + close = sol_destination + )] + pub oracle: AccountLoader<'info, StubOracle>, + + #[account(mut)] + /// CHECK: target for account rent needs no checks + pub sol_destination: UncheckedAccount<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/stub_oracle_create.rs b/programs/mango-v4/src/accounts_ix/stub_oracle_create.rs new file mode 100644 index 000000000..8787c74d7 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/stub_oracle_create.rs @@ -0,0 +1,30 @@ +use crate::{error::MangoError, state::*}; +use anchor_lang::prelude::*; +use anchor_spl::token::Mint; + +#[derive(Accounts)] +pub struct StubOracleCreate<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::StubOracleCreate) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + init, + seeds = [b"StubOracle".as_ref(), group.key().as_ref(), mint.key().as_ref()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub oracle: AccountLoader<'info, StubOracle>, + + pub admin: Signer<'info>, + + pub mint: Account<'info, Mint>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub system_program: Program<'info, System>, +} diff --git a/programs/mango-v4/src/accounts_ix/stub_oracle_set.rs b/programs/mango-v4/src/accounts_ix/stub_oracle_set.rs new file mode 100644 index 000000000..34941b824 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/stub_oracle_set.rs @@ -0,0 +1,19 @@ +use crate::{error::MangoError, state::*}; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct StubOracleSet<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::StubOracleSet) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + pub admin: Signer<'info>, + + #[account( + mut, + has_one = group + )] + pub oracle: AccountLoader<'info, StubOracle>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_add_bank.rs b/programs/mango-v4/src/accounts_ix/token_add_bank.rs new file mode 100644 index 000000000..bf1bcb682 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_add_bank.rs @@ -0,0 +1,61 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::{Mint, Token, TokenAccount}; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +#[instruction(token_index: TokenIndex, bank_num: u32)] +pub struct TokenAddBank<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::TokenAddBank) @ MangoError::IxIsDisabled, + constraint = group.load()?.multiple_banks_supported() + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + pub mint: Account<'info, Mint>, + + #[account( + constraint = existing_bank.load()?.token_index == token_index, + has_one = group, + has_one = mint, + )] + pub existing_bank: AccountLoader<'info, Bank>, + + #[account( + init, + // using the token_index in this seed guards against reusing it + seeds = [b"Bank".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &bank_num.to_le_bytes()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub bank: AccountLoader<'info, Bank>, + + #[account( + init, + seeds = [b"Vault".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &bank_num.to_le_bytes()], + bump, + token::authority = group, + token::mint = mint, + payer = payer + )] + pub vault: Account<'info, TokenAccount>, + + #[account( + mut, + constraint = mint_info.load()?.token_index == token_index, + has_one = group, + has_one = mint, + )] + pub mint_info: AccountLoader<'info, MintInfo>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub token_program: Program<'info, Token>, + pub system_program: Program<'info, System>, + pub rent: Sysvar<'info, Rent>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_deposit.rs b/programs/mango-v4/src/accounts_ix/token_deposit.rs new file mode 100644 index 000000000..4fdee3f8f --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_deposit.rs @@ -0,0 +1,83 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::Token; +use anchor_spl::token::TokenAccount; + +use crate::error::*; +use crate::state::*; + +// Same as TokenDeposit, but without the owner signing +#[derive(Accounts)] +pub struct TokenDepositIntoExisting<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::TokenDeposit) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + + #[account( + mut, + has_one = group, + has_one = vault, + has_one = oracle, + // the mints of bank/vault/token_account are implicitly the same because + // spl::token::transfer succeeds between token_account and vault + )] + pub bank: AccountLoader<'info, Bank>, + + #[account(mut)] + pub vault: Account<'info, TokenAccount>, + + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, + + #[account(mut)] + pub token_account: Box>, + pub token_authority: Signer<'info>, + + pub token_program: Program<'info, Token>, +} + +#[derive(Accounts)] +pub struct TokenDeposit<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::TokenDeposit) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + has_one = owner, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = vault, + has_one = oracle, + // the mints of bank/vault/token_account are implicitly the same because + // spl::token::transfer succeeds between token_account and vault + )] + pub bank: AccountLoader<'info, Bank>, + + #[account(mut)] + pub vault: Account<'info, TokenAccount>, + + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, + + #[account(mut)] + pub token_account: Box>, + pub token_authority: Signer<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_deregister.rs b/programs/mango-v4/src/accounts_ix/token_deregister.rs new file mode 100644 index 000000000..b210eaa26 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_deregister.rs @@ -0,0 +1,33 @@ +use crate::{error::MangoError, state::*}; +use anchor_lang::prelude::*; +use anchor_spl::token::{Token, TokenAccount}; + +/// In addition to these accounts, there must be remaining_accounts: +/// all n pairs of bank and its corresponding vault account for a token +#[derive(Accounts)] +pub struct TokenDeregister<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::TokenDeregister) @ MangoError::IxIsDisabled, + constraint = group.load()?.is_testing(), + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + // match mint info to bank + #[account( + mut, + has_one = group, + close = sol_destination + )] + pub mint_info: AccountLoader<'info, MintInfo>, + + #[account(mut)] + pub dust_vault: Account<'info, TokenAccount>, + + #[account(mut)] + /// CHECK: target for account rent needs no checks + pub sol_destination: UncheckedAccount<'info>, + + pub token_program: Program<'info, Token>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_edit.rs b/programs/mango-v4/src/accounts_ix/token_edit.rs new file mode 100644 index 000000000..5d20d59ca --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_edit.rs @@ -0,0 +1,24 @@ +use crate::state::*; +use anchor_lang::prelude::*; + +/// Changes a token's parameters. +/// +/// In addition to these accounts, all banks must be passed as remaining_accounts +/// in MintInfo order. +#[derive(Accounts)] +pub struct TokenEdit<'info> { + pub group: AccountLoader<'info, Group>, + // group <-> admin relation is checked at #1 + pub admin: Signer<'info>, + + #[account( + mut, + has_one = group + )] + pub mint_info: AccountLoader<'info, MintInfo>, + + /// The oracle account is optional and only used when reset_stable_price is set. + /// + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_liq_bankruptcy.rs b/programs/mango-v4/src/accounts_ix/token_liq_bankruptcy.rs new file mode 100644 index 000000000..7e4492916 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_liq_bankruptcy.rs @@ -0,0 +1,63 @@ +use anchor_lang::prelude::*; +use anchor_spl::token; +use anchor_spl::token::Token; +use anchor_spl::token::TokenAccount; + +use crate::error::*; +use crate::state::*; + +// Remaining accounts: +// - all banks for liab_mint_info (writable) +// - merged health accounts for liqor+liqee +#[derive(Accounts)] +pub struct TokenLiqBankruptcy<'info> { + #[account( + has_one = insurance_vault, + constraint = group.load()?.is_ix_enabled(IxGate::TokenLiqBankruptcy) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen + // liqor_owner is checked at #1 + )] + pub liqor: AccountLoader<'info, MangoAccountFixed>, + pub liqor_owner: Signer<'info>, + + #[account( + mut, + has_one = group, + constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub liqee: AccountLoader<'info, MangoAccountFixed>, + + #[account( + has_one = group, + )] + pub liab_mint_info: AccountLoader<'info, MintInfo>, + + #[account(mut)] + // address is checked at #2 a) and b) + pub quote_vault: Account<'info, TokenAccount>, + + // future: this would be an insurance fund vault specific to a + // trustless token, separate from the shared one on the group + #[account(mut)] + pub insurance_vault: Account<'info, TokenAccount>, + + pub token_program: Program<'info, Token>, +} + +impl<'info> TokenLiqBankruptcy<'info> { + pub fn transfer_ctx(&self) -> CpiContext<'_, '_, '_, 'info, token::Transfer<'info>> { + let program = self.token_program.to_account_info(); + let accounts = token::Transfer { + from: self.insurance_vault.to_account_info(), + to: self.quote_vault.to_account_info(), + authority: self.group.to_account_info(), + }; + CpiContext::new(program, accounts) + } +} diff --git a/programs/mango-v4/src/accounts_ix/token_liq_with_token.rs b/programs/mango-v4/src/accounts_ix/token_liq_with_token.rs new file mode 100644 index 000000000..f115e0a70 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_liq_with_token.rs @@ -0,0 +1,27 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; + +#[derive(Accounts)] +pub struct TokenLiqWithToken<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::TokenLiqWithToken) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen + // liqor_owner is checked at #1 + )] + pub liqor: AccountLoader<'info, MangoAccountFixed>, + pub liqor_owner: Signer<'info>, + + #[account( + mut, + has_one = group, + constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub liqee: AccountLoader<'info, MangoAccountFixed>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_register.rs b/programs/mango-v4/src/accounts_ix/token_register.rs new file mode 100644 index 000000000..339b4edb5 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_register.rs @@ -0,0 +1,74 @@ +use anchor_lang::prelude::*; +use anchor_spl::token::{Mint, Token, TokenAccount}; +use fixed::types::I80F48; +use fixed_macro::types::I80F48; + +use crate::error::*; +use crate::state::*; + +pub const INDEX_START: I80F48 = I80F48!(1_000_000); + +const FIRST_BANK_NUM: u32 = 0; + +#[derive(Accounts)] +#[instruction(token_index: TokenIndex)] +pub struct TokenRegister<'info> { + #[account( + has_one = admin, + constraint = group.load()?.is_ix_enabled(IxGate::TokenRegister) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + pub admin: Signer<'info>, + + pub mint: Account<'info, Mint>, + + #[account( + init, + // using the token_index in this seed guards against reusing it + seeds = [b"Bank".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub bank: AccountLoader<'info, Bank>, + + #[account( + init, + seeds = [b"Vault".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], + bump, + token::authority = group, + token::mint = mint, + payer = payer + )] + pub vault: Account<'info, TokenAccount>, + + #[account( + init, + // using the mint in this seed guards against registering the same mint twice + seeds = [b"MintInfo".as_ref(), group.key().as_ref(), mint.key().as_ref()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub mint_info: AccountLoader<'info, MintInfo>, + + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub token_program: Program<'info, Token>, + pub system_program: Program<'info, System>, + pub rent: Sysvar<'info, Rent>, +} + +#[derive(AnchorSerialize, AnchorDeserialize)] +pub struct InterestRateParams { + pub util0: f32, + pub rate0: f32, + pub util1: f32, + pub rate1: f32, + pub max_rate: f32, + pub adjustment_factor: f32, +} diff --git a/programs/mango-v4/src/accounts_ix/token_register_trustless.rs b/programs/mango-v4/src/accounts_ix/token_register_trustless.rs new file mode 100644 index 000000000..7c0eec7e7 --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_register_trustless.rs @@ -0,0 +1,59 @@ +use crate::error::*; +use crate::state::*; +use anchor_lang::prelude::*; +use anchor_spl::token::{Mint, Token, TokenAccount}; + +const FIRST_BANK_NUM: u32 = 0; + +#[derive(Accounts)] +#[instruction(token_index: TokenIndex)] +pub struct TokenRegisterTrustless<'info> { + #[account( + has_one = fast_listing_admin, + constraint = group.load()?.is_ix_enabled(IxGate::TokenRegisterTrustless) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + pub fast_listing_admin: Signer<'info>, + + pub mint: Account<'info, Mint>, + + #[account( + init, + // using the token_index in this seed guards against reusing it + seeds = [b"Bank".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub bank: AccountLoader<'info, Bank>, + + #[account( + init, + seeds = [b"Vault".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], + bump, + token::authority = group, + token::mint = mint, + payer = payer + )] + pub vault: Account<'info, TokenAccount>, + + #[account( + init, + // using the mint in this seed guards against registering the same mint twice + seeds = [b"MintInfo".as_ref(), group.key().as_ref(), mint.key().as_ref()], + bump, + payer = payer, + space = 8 + std::mem::size_of::(), + )] + pub mint_info: AccountLoader<'info, MintInfo>, + + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, + + #[account(mut)] + pub payer: Signer<'info>, + + pub token_program: Program<'info, Token>, + pub system_program: Program<'info, System>, + pub rent: Sysvar<'info, Rent>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_update_index_and_rate.rs b/programs/mango-v4/src/accounts_ix/token_update_index_and_rate.rs new file mode 100644 index 000000000..ab79915ea --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_update_index_and_rate.rs @@ -0,0 +1,38 @@ +use anchor_lang::prelude::*; +use anchor_lang::solana_program::sysvar::instructions as tx_instructions; + +use crate::error::MangoError; +use crate::state::*; + +pub mod compute_budget { + use solana_program::declare_id; + declare_id!("ComputeBudget111111111111111111111111111111"); +} + +/// Updates token interest and interest rates. +/// +/// In addition to these accounts, all banks must be passed as remaining_accounts +/// in MintInfo order. +/// +/// This instruction may only be used alongside other instructions of the same kind +/// or ComputeBudget instructions. +#[derive(Accounts)] +pub struct TokenUpdateIndexAndRate<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::TokenUpdateIndexAndRate) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, // Required for group metadata parsing + + #[account( + has_one = oracle, + has_one = group, + )] + pub mint_info: AccountLoader<'info, MintInfo>, + + /// CHECK: oracle can be one of multiple account types + pub oracle: UncheckedAccount<'info>, + + /// CHECK: fixed instructions sysvar account + #[account(address = tx_instructions::ID)] + pub instructions: UncheckedAccount<'info>, +} diff --git a/programs/mango-v4/src/accounts_ix/token_withdraw.rs b/programs/mango-v4/src/accounts_ix/token_withdraw.rs new file mode 100644 index 000000000..004a1708d --- /dev/null +++ b/programs/mango-v4/src/accounts_ix/token_withdraw.rs @@ -0,0 +1,57 @@ +use anchor_lang::prelude::*; +use anchor_spl::token; +use anchor_spl::token::Token; +use anchor_spl::token::TokenAccount; + +use crate::error::*; +use crate::state::*; + +#[derive(Accounts)] +pub struct TokenWithdraw<'info> { + #[account( + constraint = group.load()?.is_ix_enabled(IxGate::TokenWithdraw) @ MangoError::IxIsDisabled, + )] + pub group: AccountLoader<'info, Group>, + + #[account( + mut, + has_one = group, + has_one = owner, + constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen + )] + pub account: AccountLoader<'info, MangoAccountFixed>, + pub owner: Signer<'info>, + + #[account( + mut, + has_one = group, + has_one = vault, + has_one = oracle, + // the mints of bank/vault/token_account are implicitly the same because + // spl::token::transfer succeeds between token_account and vault + )] + pub bank: AccountLoader<'info, Bank>, + + #[account(mut)] + pub vault: Account<'info, TokenAccount>, + + /// CHECK: The oracle can be one of several different account types + pub oracle: UncheckedAccount<'info>, + + #[account(mut)] + pub token_account: Box>, + + pub token_program: Program<'info, Token>, +} + +impl<'info> TokenWithdraw<'info> { + pub fn transfer_ctx(&self) -> CpiContext<'_, '_, '_, 'info, token::Transfer<'info>> { + let program = self.token_program.to_account_info(); + let accounts = token::Transfer { + from: self.vault.to_account_info(), + to: self.token_account.to_account_info(), + authority: self.group.to_account_info(), + }; + CpiContext::new(program, accounts) + } +} diff --git a/programs/mango-v4/src/instructions/LICENSE b/programs/mango-v4/src/instructions/LICENSE new file mode 100644 index 000000000..53d1f3d01 --- /dev/null +++ b/programs/mango-v4/src/instructions/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/programs/mango-v4/src/instructions/account_close.rs b/programs/mango-v4/src/instructions/account_close.rs index f422036ea..f57f3d3e9 100644 --- a/programs/mango-v4/src/instructions/account_close.rs +++ b/programs/mango-v4/src/instructions/account_close.rs @@ -1,33 +1,9 @@ use anchor_lang::prelude::*; -use anchor_spl::token::Token; +use crate::accounts_ix::*; use crate::error::*; use crate::state::*; -#[derive(Accounts)] -pub struct AccountClose<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::AccountClose) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - has_one = owner, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen, - close = sol_destination - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(mut)] - /// CHECK: target for account rent needs no checks - pub sol_destination: UncheckedAccount<'info>, - - pub token_program: Program<'info, Token>, -} - pub fn account_close(ctx: Context, force_close: bool) -> Result<()> { let account = ctx.accounts.account.load_full_mut()?; diff --git a/programs/mango-v4/src/instructions/account_create.rs b/programs/mango-v4/src/instructions/account_create.rs index 100897bf6..d07c32185 100644 --- a/programs/mango-v4/src/instructions/account_create.rs +++ b/programs/mango-v4/src/instructions/account_create.rs @@ -1,33 +1,10 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::*; use crate::state::*; use crate::util::fill_from_str; -#[derive(Accounts)] -#[instruction(account_num: u32, token_count: u8, serum3_count: u8, perp_count: u8, perp_oo_count: u8)] -pub struct AccountCreate<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::AccountCreate) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - init, - seeds = [b"MangoAccount".as_ref(), group.key().as_ref(), owner.key().as_ref(), &account_num.to_le_bytes()], - bump, - payer = payer, - space = MangoAccount::space(token_count, serum3_count, perp_count, perp_oo_count)?, - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub system_program: Program<'info, System>, -} - pub fn account_create( ctx: Context, account_num: u32, diff --git a/programs/mango-v4/src/instructions/account_edit.rs b/programs/mango-v4/src/instructions/account_edit.rs index 0a90e64ed..a408cd761 100644 --- a/programs/mango-v4/src/instructions/account_edit.rs +++ b/programs/mango-v4/src/instructions/account_edit.rs @@ -1,26 +1,10 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::MangoError; use crate::state::*; use crate::util::fill_from_str; -#[derive(Accounts)] -pub struct AccountEdit<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::AccountEdit) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - has_one = owner, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, -} - pub fn account_edit( ctx: Context, name_opt: Option, diff --git a/programs/mango-v4/src/instructions/account_expand.rs b/programs/mango-v4/src/instructions/account_expand.rs index a41b68d61..0a0a14d48 100644 --- a/programs/mango-v4/src/instructions/account_expand.rs +++ b/programs/mango-v4/src/instructions/account_expand.rs @@ -1,31 +1,9 @@ use anchor_lang::prelude::*; -use crate::error::MangoError; +use crate::accounts_ix::*; use crate::state::*; use crate::util::checked_math as cm; -#[derive(Accounts)] -pub struct AccountExpand<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::AccountExpand) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - has_one = owner, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub system_program: Program<'info, System>, -} - pub fn account_expand( ctx: Context, token_count: u8, diff --git a/programs/mango-v4/src/instructions/account_toggle_freeze.rs b/programs/mango-v4/src/instructions/account_toggle_freeze.rs index 9055b828d..b48a003bc 100644 --- a/programs/mango-v4/src/instructions/account_toggle_freeze.rs +++ b/programs/mango-v4/src/instructions/account_toggle_freeze.rs @@ -1,25 +1,8 @@ use anchor_lang::prelude::*; -use crate::error::MangoError; +use crate::accounts_ix::*; use crate::state::*; -#[derive(Accounts)] -pub struct AccountToggleFreeze<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::AccountToggleFreeze) @ MangoError::IxIsDisabled, - constraint = group.load()?.admin == admin.key() - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - - pub admin: Signer<'info>, -} - // Freezing an account, prevents all instructions involving account (also settling and liquidation), except // perp consume events and force cancellation of orders pub fn account_toggle_freeze(ctx: Context, freeze: bool) -> Result<()> { diff --git a/programs/mango-v4/src/instructions/alt_extend.rs b/programs/mango-v4/src/instructions/alt_extend.rs index a0eb0abf7..711f28d4f 100644 --- a/programs/mango-v4/src/instructions/alt_extend.rs +++ b/programs/mango-v4/src/instructions/alt_extend.rs @@ -1,28 +1,9 @@ use anchor_lang::prelude::*; -use solana_address_lookup_table_program as solana_alt; +use crate::accounts_ix::*; use crate::address_lookup_table_program; -use crate::error::MangoError; use crate::state::*; -#[derive(Accounts)] -pub struct AltExtend<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::AltExtend) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - pub payer: Signer<'info>, - - /// CHECK: ALT address is checked inline - #[account( - mut, - owner = solana_alt::ID, - )] - pub address_lookup_table: UncheckedAccount<'info>, -} - /// Add addresses to a registered lookup table /// /// NOTE: This only works for ALTs that have the group as owner, see alt_set. diff --git a/programs/mango-v4/src/instructions/alt_set.rs b/programs/mango-v4/src/instructions/alt_set.rs index 5f340a3df..19b2d99a5 100644 --- a/programs/mango-v4/src/instructions/alt_set.rs +++ b/programs/mango-v4/src/instructions/alt_set.rs @@ -1,26 +1,8 @@ use anchor_lang::prelude::*; use solana_address_lookup_table_program as solana_alt; +use crate::accounts_ix::*; use crate::error::*; -use crate::state::*; - -#[derive(Accounts)] -pub struct AltSet<'info> { - #[account( - mut, - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::AltSet) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - /// CHECK: ALT authority is checked inline - #[account( - mut, - owner = solana_alt::ID, - )] - pub address_lookup_table: UncheckedAccount<'info>, -} /// Register or replace an address lookup table pub fn alt_set(ctx: Context, index: u8) -> Result<()> { diff --git a/programs/mango-v4/src/instructions/benchmark.rs b/programs/mango-v4/src/instructions/benchmark.rs index 0a9b60dbc..e3f799913 100644 --- a/programs/mango-v4/src/instructions/benchmark.rs +++ b/programs/mango-v4/src/instructions/benchmark.rs @@ -4,11 +4,9 @@ use anchor_lang::prelude::*; use fixed::types::{I80F48, U80F48}; use solana_program::{log::sol_log_compute_units, program_memory::sol_memcmp}; +use crate::accounts_ix::*; use crate::i80f48::LowPrecisionDivision; -#[derive(Accounts)] -pub struct Benchmark {} - #[inline(never)] pub fn division_i80f48(a: I80F48, b: I80F48) -> I80F48 { msg!("division_i80f48"); diff --git a/programs/mango-v4/src/instructions/compute_account_data.rs b/programs/mango-v4/src/instructions/compute_account_data.rs index 6a7732991..840145e9e 100644 --- a/programs/mango-v4/src/instructions/compute_account_data.rs +++ b/programs/mango-v4/src/instructions/compute_account_data.rs @@ -1,14 +1,7 @@ +use crate::accounts_ix::*; use crate::{events::MangoAccountData, health::*, state::*}; use anchor_lang::prelude::*; -#[derive(Accounts)] -pub struct ComputeAccountData<'info> { - pub group: AccountLoader<'info, Group>, - - #[account(has_one = group)] - pub account: AccountLoader<'info, MangoAccountFixed>, -} - pub fn compute_account_data(ctx: Context) -> Result<()> { let group_pk = ctx.accounts.group.key(); diff --git a/programs/mango-v4/src/instructions/flash_loan.rs b/programs/mango-v4/src/instructions/flash_loan.rs index b7fef83a9..9795e1a66 100644 --- a/programs/mango-v4/src/instructions/flash_loan.rs +++ b/programs/mango-v4/src/instructions/flash_loan.rs @@ -1,3 +1,4 @@ +use crate::accounts_ix::*; use crate::accounts_zerocopy::*; use crate::error::*; use crate::group_seeds; @@ -9,71 +10,9 @@ use anchor_lang::prelude::*; use anchor_lang::solana_program::sysvar::instructions as tx_instructions; use anchor_lang::Discriminator; use anchor_spl::associated_token::AssociatedToken; -use anchor_spl::token::{self, Token, TokenAccount}; +use anchor_spl::token::{self, TokenAccount}; use fixed::types::I80F48; -pub mod jupiter_mainnet_4 { - use solana_program::declare_id; - declare_id!("JUP4Fb2cqiRUcaTHdrPC8h2gNsA2ETXiPDD33WcGuJB"); -} -pub mod jupiter_mainnet_3 { - use solana_program::declare_id; - declare_id!("JUP3c2Uh3WA4Ng34tw6kPd2G4C5BB21Xo36Je1s32Ph"); -} - -/// Sets up mango vaults for flash loan -/// -/// In addition to these accounts, there must be remaining_accounts: -/// 1. N banks (writable) -/// 2. N vaults (writable), matching the banks -/// 3. N token accounts (writable), in the same order as the vaults, -/// the loaned funds are transfered into these -/// 4. the mango group -#[derive(Accounts)] -pub struct FlashLoanBegin<'info> { - #[account( - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - // owner is checked at #1 - pub owner: Signer<'info>, - - pub token_program: Program<'info, Token>, - - /// Instructions Sysvar for instruction introspection - /// CHECK: fixed instructions sysvar account - #[account(address = tx_instructions::ID)] - pub instructions: UncheckedAccount<'info>, -} - -/// Finalizes a flash loan -/// -/// In addition to these accounts, there must be remaining_accounts: -/// 1. health accounts, and every bank that also appeared in FlashLoanBegin must be writable -/// 2. N vaults (writable), matching what was in FlashLoanBegin -/// 3. N token accounts (writable), matching what was in FlashLoanBegin; -/// the `owner` must have authority to transfer tokens out of them -/// 4. the mango group -#[derive(Accounts)] -pub struct FlashLoanEnd<'info> { - #[account( - mut, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - // owner is checked at #1 - pub owner: Signer<'info>, - - pub token_program: Program<'info, Token>, -} - -#[derive(PartialEq, Copy, Clone, Debug, AnchorSerialize, AnchorDeserialize)] -#[repr(u8)] -pub enum FlashLoanType { - Unknown, - Swap, -} - /// The `loan_amounts` argument lists the amount to be loaned from each bank/vault and /// the order matches the order of bank accounts. pub fn flash_loan_begin<'key, 'accounts, 'remaining, 'info>( diff --git a/programs/mango-v4/src/instructions/group_close.rs b/programs/mango-v4/src/instructions/group_close.rs index e84a9c8d8..87ce3c429 100644 --- a/programs/mango-v4/src/instructions/group_close.rs +++ b/programs/mango-v4/src/instructions/group_close.rs @@ -1,30 +1,7 @@ -use crate::{error::MangoError, state::*}; +use crate::accounts_ix::*; +use crate::state::*; use anchor_lang::prelude::*; -use anchor_spl::token::{self, CloseAccount, Token, TokenAccount}; - -#[derive(Accounts)] -pub struct GroupClose<'info> { - #[account( - mut, - has_one = admin, - has_one = insurance_vault, - constraint = group.load()?.is_testing(), - constraint = group.load()?.is_ix_enabled(IxGate::GroupClose) @ MangoError::IxIsDisabled, - close = sol_destination - )] - pub group: AccountLoader<'info, Group>, - - pub admin: Signer<'info>, - - #[account(mut)] - pub insurance_vault: Account<'info, TokenAccount>, - - #[account(mut)] - /// CHECK: target for account rent needs no checks - pub sol_destination: UncheckedAccount<'info>, - - pub token_program: Program<'info, Token>, -} +use anchor_spl::token::{self, CloseAccount}; pub fn group_close(ctx: Context) -> Result<()> { // close insurance vault (must be empty) diff --git a/programs/mango-v4/src/instructions/group_create.rs b/programs/mango-v4/src/instructions/group_create.rs index 40f37a3ce..28b6c4cba 100644 --- a/programs/mango-v4/src/instructions/group_create.rs +++ b/programs/mango-v4/src/instructions/group_create.rs @@ -1,42 +1,7 @@ use anchor_lang::prelude::*; -use anchor_spl::token::{Mint, Token, TokenAccount}; +use crate::accounts_ix::*; use crate::error::*; -use crate::state::*; - -#[derive(Accounts)] -#[instruction(group_num: u32)] -pub struct GroupCreate<'info> { - #[account( - init, - seeds = [b"Group".as_ref(), creator.key().as_ref(), &group_num.to_le_bytes()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub group: AccountLoader<'info, Group>, - - pub creator: Signer<'info>, - - pub insurance_mint: Account<'info, Mint>, - - #[account( - init, - seeds = [b"InsuranceVault".as_ref(), group.key().as_ref()], - bump, - token::authority = group, - token::mint = insurance_mint, - payer = payer - )] - pub insurance_vault: Account<'info, TokenAccount>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub token_program: Program<'info, Token>, - pub system_program: Program<'info, System>, - pub rent: Sysvar<'info, Rent>, -} pub fn group_create( ctx: Context, diff --git a/programs/mango-v4/src/instructions/group_edit.rs b/programs/mango-v4/src/instructions/group_edit.rs index 45a91f851..06a4072e1 100644 --- a/programs/mango-v4/src/instructions/group_edit.rs +++ b/programs/mango-v4/src/instructions/group_edit.rs @@ -1,16 +1,6 @@ use anchor_lang::prelude::*; -use crate::state::*; - -#[derive(Accounts)] -pub struct GroupEdit<'info> { - #[account( - mut, - has_one = admin, - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, -} +use crate::accounts_ix::*; // use case - transfer group ownership to governance, where // admin and fast_listing_admin are PDAs diff --git a/programs/mango-v4/src/instructions/health_region.rs b/programs/mango-v4/src/instructions/health_region.rs index 6a5b9dde2..5c284405e 100644 --- a/programs/mango-v4/src/instructions/health_region.rs +++ b/programs/mango-v4/src/instructions/health_region.rs @@ -1,3 +1,4 @@ +use crate::accounts_ix::*; use crate::error::*; use crate::health::*; use crate::state::*; @@ -6,43 +7,6 @@ use anchor_lang::solana_program::sysvar::instructions as tx_instructions; use anchor_lang::Discriminator; use fixed::types::I80F48; -/// Sets up for a health region -/// -/// The same transaction must have the corresponding HealthRegionEnd call. -/// -/// remaining_accounts: health accounts for account -#[derive(Accounts)] -pub struct HealthRegionBegin<'info> { - /// Instructions Sysvar for instruction introspection - /// CHECK: fixed instructions sysvar account - #[account(address = tx_instructions::ID)] - pub instructions: UncheckedAccount<'info>, - - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::HealthRegion) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, -} - -/// Ends a health region. -/// -/// remaining_accounts: health accounts for account -#[derive(Accounts)] -pub struct HealthRegionEnd<'info> { - #[account( - mut, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, -} - pub fn health_region_begin<'key, 'accounts, 'remaining, 'info>( ctx: Context<'key, 'accounts, 'remaining, 'info, HealthRegionBegin<'info>>, ) -> Result<()> { diff --git a/programs/mango-v4/src/instructions/ix_gate_set.rs b/programs/mango-v4/src/instructions/ix_gate_set.rs index 122729b8a..489e48f4d 100644 --- a/programs/mango-v4/src/instructions/ix_gate_set.rs +++ b/programs/mango-v4/src/instructions/ix_gate_set.rs @@ -1,17 +1,8 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::{error::MangoError, state::*}; -#[derive(Accounts)] -pub struct IxGateSet<'info> { - #[account( - mut, - // group <-> admin relation is checked at #1 - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, -} - pub fn ix_gate_set(ctx: Context, ix_gate: u128) -> Result<()> { let mut group = ctx.accounts.group.load_mut()?; diff --git a/programs/mango-v4/src/instructions/perp_cancel_all_orders.rs b/programs/mango-v4/src/instructions/perp_cancel_all_orders.rs index 31deaa79a..a9f1a945e 100644 --- a/programs/mango-v4/src/instructions/perp_cancel_all_orders.rs +++ b/programs/mango-v4/src/instructions/perp_cancel_all_orders.rs @@ -1,37 +1,8 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::MangoError; -use crate::state::{ - BookSide, Group, IxGate, MangoAccountFixed, MangoAccountLoader, Orderbook, PerpMarket, -}; - -#[derive(Accounts)] -pub struct PerpCancelAllOrders<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelAllOrders) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - #[account(mut)] - pub bids: AccountLoader<'info, BookSide>, - #[account(mut)] - pub asks: AccountLoader<'info, BookSide>, -} +use crate::state::*; pub fn perp_cancel_all_orders(ctx: Context, limit: u8) -> Result<()> { let mut account = ctx.accounts.account.load_full_mut()?; diff --git a/programs/mango-v4/src/instructions/perp_cancel_all_orders_by_side.rs b/programs/mango-v4/src/instructions/perp_cancel_all_orders_by_side.rs index 8f255883e..e1c402f80 100644 --- a/programs/mango-v4/src/instructions/perp_cancel_all_orders_by_side.rs +++ b/programs/mango-v4/src/instructions/perp_cancel_all_orders_by_side.rs @@ -1,38 +1,8 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::MangoError; -use crate::state::{ - BookSide, Group, IxGate, MangoAccountFixed, MangoAccountLoader, Orderbook, PerpMarket, Side, -}; - -#[derive(Accounts)] -pub struct PerpCancelAllOrdersBySide<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelAllOrdersBySide) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - #[account(mut)] - pub bids: AccountLoader<'info, BookSide>, - #[account(mut)] - pub asks: AccountLoader<'info, BookSide>, -} +use crate::state::*; pub fn perp_cancel_all_orders_by_side( ctx: Context, diff --git a/programs/mango-v4/src/instructions/perp_cancel_order.rs b/programs/mango-v4/src/instructions/perp_cancel_order.rs index fb583dfd0..7e19dcaf5 100644 --- a/programs/mango-v4/src/instructions/perp_cancel_order.rs +++ b/programs/mango-v4/src/instructions/perp_cancel_order.rs @@ -1,38 +1,8 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::*; -use crate::state::{ - BookSide, Group, IxGate, MangoAccountFixed, MangoAccountLoader, Orderbook, PerpMarket, -}; - -#[derive(Accounts)] -pub struct PerpCancelOrder<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelOrder) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - #[account(mut)] - pub bids: AccountLoader<'info, BookSide>, - #[account(mut)] - pub asks: AccountLoader<'info, BookSide>, -} +use crate::state::*; pub fn perp_cancel_order(ctx: Context, order_id: u128) -> Result<()> { let mut account = ctx.accounts.account.load_full_mut()?; diff --git a/programs/mango-v4/src/instructions/perp_cancel_order_by_client_order_id.rs b/programs/mango-v4/src/instructions/perp_cancel_order_by_client_order_id.rs index f3840044f..d47793d24 100644 --- a/programs/mango-v4/src/instructions/perp_cancel_order_by_client_order_id.rs +++ b/programs/mango-v4/src/instructions/perp_cancel_order_by_client_order_id.rs @@ -1,37 +1,8 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::*; -use crate::state::{ - BookSide, Group, IxGate, MangoAccountFixed, MangoAccountLoader, Orderbook, PerpMarket, -}; - -#[derive(Accounts)] -pub struct PerpCancelOrderByClientOrderId<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpCancelOrderByClientOrderId) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - #[account(mut)] - pub bids: AccountLoader<'info, BookSide>, - #[account(mut)] - pub asks: AccountLoader<'info, BookSide>, -} +use crate::state::*; pub fn perp_cancel_order_by_client_order_id( ctx: Context, diff --git a/programs/mango-v4/src/instructions/perp_close_market.rs b/programs/mango-v4/src/instructions/perp_close_market.rs index 1131e3613..2efe682b0 100644 --- a/programs/mango-v4/src/instructions/perp_close_market.rs +++ b/programs/mango-v4/src/instructions/perp_close_market.rs @@ -1,52 +1,5 @@ +use crate::accounts_ix::*; use anchor_lang::prelude::*; -use anchor_spl::token::Token; - -use crate::{error::MangoError, state::*}; - -#[derive(Accounts)] -pub struct PerpCloseMarket<'info> { - #[account( - constraint = group.load()?.is_testing(), - constraint = group.load()?.is_ix_enabled(IxGate::PerpCloseMarket) @ MangoError::IxIsDisabled, - has_one = admin, - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - has_one = event_queue, - close = sol_destination - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - - #[account( - mut, - close = sol_destination - )] - pub bids: AccountLoader<'info, BookSide>, - - #[account( - mut, - close = sol_destination - )] - pub asks: AccountLoader<'info, BookSide>, - - #[account( - mut, - close = sol_destination - )] - pub event_queue: AccountLoader<'info, EventQueue>, - - #[account(mut)] - /// CHECK: target for account rent needs no checks - pub sol_destination: UncheckedAccount<'info>, - - pub token_program: Program<'info, Token>, -} #[allow(clippy::too_many_arguments)] pub fn perp_close_market(_ctx: Context) -> Result<()> { diff --git a/programs/mango-v4/src/instructions/perp_consume_events.rs b/programs/mango-v4/src/instructions/perp_consume_events.rs index 51f8d4dc8..e4dcc2f0f 100644 --- a/programs/mango-v4/src/instructions/perp_consume_events.rs +++ b/programs/mango-v4/src/instructions/perp_consume_events.rs @@ -2,29 +2,11 @@ use anchor_lang::prelude::*; use bytemuck::cast_ref; use crate::error::MangoError; -use crate::state::{EventQueue, IxGate, MangoAccountFixed, MangoAccountLoader}; -use crate::state::{EventType, FillEvent, Group, OutEvent, PerpMarket}; +use crate::state::*; +use crate::accounts_ix::*; use crate::logs::{emit_perp_balances, FillLogV2}; -#[derive(Accounts)] -pub struct PerpConsumeEvents<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpConsumeEvents) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - has_one = event_queue, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - - #[account(mut)] - pub event_queue: AccountLoader<'info, EventQueue>, -} - /// Load a mango account by key from the list of account infos. /// /// Message and return Ok() if it's missing, to lock in successful processing diff --git a/programs/mango-v4/src/instructions/perp_create_market.rs b/programs/mango-v4/src/instructions/perp_create_market.rs index b0bf56151..1165e4e57 100644 --- a/programs/mango-v4/src/instructions/perp_create_market.rs +++ b/programs/mango-v4/src/instructions/perp_create_market.rs @@ -6,46 +6,9 @@ use crate::error::*; use crate::state::*; use crate::util::fill_from_str; +use crate::accounts_ix::*; use crate::logs::PerpMarketMetaDataLog; -#[derive(Accounts)] -#[instruction(perp_market_index: PerpMarketIndex)] -pub struct PerpCreateMarket<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::PerpCreateMarket) @ MangoError::IxIsDisabled, - constraint = group.load()?.perps_supported(), - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, - - #[account( - init, - seeds = [b"PerpMarket".as_ref(), group.key().as_ref(), perp_market_index.to_le_bytes().as_ref()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - - /// Accounts are initialised by client, - /// anchor discriminator is set first when ix exits, - #[account(zero)] - pub bids: AccountLoader<'info, BookSide>, - #[account(zero)] - pub asks: AccountLoader<'info, BookSide>, - #[account(zero)] - pub event_queue: AccountLoader<'info, EventQueue>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub system_program: Program<'info, System>, -} - #[allow(clippy::too_many_arguments)] pub fn perp_create_market( ctx: Context, diff --git a/programs/mango-v4/src/instructions/perp_deactivate_position.rs b/programs/mango-v4/src/instructions/perp_deactivate_position.rs index bd20d2e2d..01db4108c 100644 --- a/programs/mango-v4/src/instructions/perp_deactivate_position.rs +++ b/programs/mango-v4/src/instructions/perp_deactivate_position.rs @@ -1,28 +1,9 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::*; use crate::state::*; -#[derive(Accounts)] -pub struct PerpDeactivatePosition<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpDeactivatePosition) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(has_one = group)] - pub perp_market: AccountLoader<'info, PerpMarket>, -} - pub fn perp_deactivate_position(ctx: Context) -> Result<()> { let mut account = ctx.accounts.account.load_full_mut()?; // account constraint #1 diff --git a/programs/mango-v4/src/instructions/perp_edit_market.rs b/programs/mango-v4/src/instructions/perp_edit_market.rs index 2c2487efa..a25e210df 100644 --- a/programs/mango-v4/src/instructions/perp_edit_market.rs +++ b/programs/mango-v4/src/instructions/perp_edit_market.rs @@ -2,26 +2,9 @@ use crate::{accounts_zerocopy::AccountInfoRef, error::MangoError, state::*}; use anchor_lang::prelude::*; use fixed::types::I80F48; +use crate::accounts_ix::*; use crate::logs::PerpMarketMetaDataLog; -#[derive(Accounts)] -pub struct PerpEditMarket<'info> { - pub group: AccountLoader<'info, Group>, - // group <-> admin relation is checked at #1 - pub admin: Signer<'info>, - - #[account( - mut, - has_one = group - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - - /// The oracle account is optional and only used when reset_stable_price is set. - /// - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, -} - #[allow(clippy::too_many_arguments)] pub fn perp_edit_market( ctx: Context, diff --git a/programs/mango-v4/src/instructions/perp_liq_base_or_positive_pnl.rs b/programs/mango-v4/src/instructions/perp_liq_base_or_positive_pnl.rs index 3b20df484..f3c931276 100644 --- a/programs/mango-v4/src/instructions/perp_liq_base_or_positive_pnl.rs +++ b/programs/mango-v4/src/instructions/perp_liq_base_or_positive_pnl.rs @@ -1,5 +1,4 @@ use anchor_lang::prelude::*; -use anchor_spl::token::TokenAccount; use checked_math as cm; use fixed::types::I80F48; @@ -8,52 +7,9 @@ use crate::error::*; use crate::health::*; use crate::state::*; +use crate::accounts_ix::*; use crate::logs::{emit_perp_balances, PerpLiqBaseOrPositivePnlLog, TokenBalanceLog}; -#[derive(Accounts)] -pub struct PerpLiqBaseOrPositivePnl<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpLiqBaseOrPositivePnl) @ MangoError::IxIsDisabled - )] - pub group: AccountLoader<'info, Group>, - - #[account(mut, has_one = group, has_one = oracle)] - pub perp_market: AccountLoader<'info, PerpMarket>, - - /// CHECK: Oracle can have different account types, constrained by address in perp_market - pub oracle: UncheckedAccount<'info>, - - #[account( - mut, - has_one = group, - constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen - // liqor_owner is checked at #1 - )] - pub liqor: AccountLoader<'info, MangoAccountFixed>, - pub liqor_owner: Signer<'info>, - - #[account( - mut, - has_one = group, - constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub liqee: AccountLoader<'info, MangoAccountFixed>, - - // bank correctness is checked at #2 - #[account(mut, has_one = group)] - pub settle_bank: AccountLoader<'info, Bank>, - - #[account( - mut, - address = settle_bank.load()?.vault - )] - pub settle_vault: Account<'info, TokenAccount>, - - /// CHECK: Oracle can have different account types - #[account(address = settle_bank.load()?.oracle)] - pub settle_oracle: UncheckedAccount<'info>, -} - /// This instruction deals with increasing health by: /// - reducing the liqee's base position /// - taking over the liqee's positive pnl diff --git a/programs/mango-v4/src/instructions/perp_liq_force_cancel_orders.rs b/programs/mango-v4/src/instructions/perp_liq_force_cancel_orders.rs index 577a13c26..34fd8976d 100644 --- a/programs/mango-v4/src/instructions/perp_liq_force_cancel_orders.rs +++ b/programs/mango-v4/src/instructions/perp_liq_force_cancel_orders.rs @@ -1,36 +1,10 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::*; use crate::health::*; use crate::state::*; -#[derive(Accounts)] -pub struct PerpLiqForceCancelOrders<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpLiqForceCancelOrders) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - // Allow force cancel even if account is frozen - #[account( - mut, - has_one = group - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - #[account(mut)] - pub bids: AccountLoader<'info, BookSide>, - #[account(mut)] - pub asks: AccountLoader<'info, BookSide>, -} - pub fn perp_liq_force_cancel_orders( ctx: Context, limit: u8, diff --git a/programs/mango-v4/src/instructions/perp_liq_negative_pnl_or_bankruptcy.rs b/programs/mango-v4/src/instructions/perp_liq_negative_pnl_or_bankruptcy.rs index 3c330063c..451ce13ef 100644 --- a/programs/mango-v4/src/instructions/perp_liq_negative_pnl_or_bankruptcy.rs +++ b/programs/mango-v4/src/instructions/perp_liq_negative_pnl_or_bankruptcy.rs @@ -1,8 +1,9 @@ use anchor_lang::prelude::*; -use anchor_spl::token::{self, Token, TokenAccount}; +use anchor_spl::token; use checked_math as cm; use fixed::types::I80F48; +use crate::accounts_ix::*; use crate::accounts_zerocopy::*; use crate::error::*; use crate::health::{compute_health, new_health_cache, HealthType, ScanningAccountRetriever}; @@ -11,71 +12,6 @@ use crate::logs::{ }; use crate::state::*; -#[derive(Accounts)] -pub struct PerpLiqNegativePnlOrBankruptcy<'info> { - #[account( - has_one = insurance_vault, - constraint = group.load()?.is_ix_enabled(IxGate::PerpLiqNegativePnlOrBankruptcy) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen, - // liqor_owner is checked at #1 - )] - pub liqor: AccountLoader<'info, MangoAccountFixed>, - pub liqor_owner: Signer<'info>, - - // This account MUST have a loss - #[account( - mut, - has_one = group, - constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub liqee: AccountLoader<'info, MangoAccountFixed>, - - #[account(mut, has_one = group, has_one = oracle)] - pub perp_market: AccountLoader<'info, PerpMarket>, - - /// CHECK: Oracle can have different account types, constrained by address in perp_market - pub oracle: UncheckedAccount<'info>, - - // bank correctness is checked at #2 - #[account(mut, has_one = group)] - pub settle_bank: AccountLoader<'info, Bank>, - - #[account( - mut, - address = settle_bank.load()?.vault - )] - pub settle_vault: Account<'info, TokenAccount>, - - /// CHECK: Oracle can have different account types - #[account(address = settle_bank.load()?.oracle)] - pub settle_oracle: UncheckedAccount<'info>, - - // future: this would be an insurance fund vault specific to a - // trustless token, separate from the shared one on the group - #[account(mut)] - pub insurance_vault: Account<'info, TokenAccount>, - - pub token_program: Program<'info, Token>, -} - -impl<'info> PerpLiqNegativePnlOrBankruptcy<'info> { - pub fn transfer_ctx(&self) -> CpiContext<'_, '_, '_, 'info, token::Transfer<'info>> { - let program = self.token_program.to_account_info(); - let accounts = token::Transfer { - from: self.insurance_vault.to_account_info(), - to: self.settle_vault.to_account_info(), - authority: self.group.to_account_info(), - }; - CpiContext::new(program, accounts) - } -} - pub fn perp_liq_negative_pnl_or_bankruptcy( ctx: Context, max_liab_transfer: u64, diff --git a/programs/mango-v4/src/instructions/perp_place_order.rs b/programs/mango-v4/src/instructions/perp_place_order.rs index 75296aabe..596e781bd 100644 --- a/programs/mango-v4/src/instructions/perp_place_order.rs +++ b/programs/mango-v4/src/instructions/perp_place_order.rs @@ -1,50 +1,10 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::accounts_zerocopy::*; use crate::error::*; use crate::health::{new_fixed_order_account_retriever, new_health_cache}; -use crate::state::IxGate; -use crate::state::Side; -use crate::state::{ - BookSide, EventQueue, Group, MangoAccountFixed, MangoAccountLoader, Order, Orderbook, - PerpMarket, -}; - -#[derive(Accounts)] -pub struct PerpPlaceOrder<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpPlaceOrder) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - has_one = event_queue, - has_one = oracle, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - #[account(mut)] - pub bids: AccountLoader<'info, BookSide>, - #[account(mut)] - pub asks: AccountLoader<'info, BookSide>, - #[account(mut)] - pub event_queue: AccountLoader<'info, EventQueue>, - - /// CHECK: The oracle can be one of several different account types and the pubkey is checked above - pub oracle: UncheckedAccount<'info>, -} +use crate::state::*; // TODO #[allow(clippy::too_many_arguments)] diff --git a/programs/mango-v4/src/instructions/perp_settle_fees.rs b/programs/mango-v4/src/instructions/perp_settle_fees.rs index 54cb7542f..0935e6e67 100644 --- a/programs/mango-v4/src/instructions/perp_settle_fees.rs +++ b/programs/mango-v4/src/instructions/perp_settle_fees.rs @@ -5,42 +5,11 @@ use fixed::types::I80F48; use crate::accounts_zerocopy::*; use crate::error::*; use crate::health::{compute_health, new_fixed_order_account_retriever, HealthType}; -use crate::state::Bank; -use crate::state::IxGate; -use crate::state::{Group, MangoAccountFixed, MangoAccountLoader, PerpMarket}; +use crate::state::*; +use crate::accounts_ix::*; use crate::logs::{emit_perp_balances, PerpSettleFeesLog, TokenBalanceLog}; -#[derive(Accounts)] -pub struct PerpSettleFees<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpSettleFees) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account(mut, has_one = group, has_one = oracle)] - pub perp_market: AccountLoader<'info, PerpMarket>, - - // This account MUST have a loss - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - - /// CHECK: Oracle can have different account types, constrained by address in perp_market - pub oracle: UncheckedAccount<'info>, - - // bank correctness is checked at #2 - #[account(mut, has_one = group)] - pub settle_bank: AccountLoader<'info, Bank>, - - /// CHECK: Oracle can have different account types - #[account(address = settle_bank.load()?.oracle)] - pub settle_oracle: UncheckedAccount<'info>, -} - pub fn perp_settle_fees(ctx: Context, max_settle_amount: u64) -> Result<()> { // max_settle_amount must greater than zero require!( diff --git a/programs/mango-v4/src/instructions/perp_settle_pnl.rs b/programs/mango-v4/src/instructions/perp_settle_pnl.rs index 96a7d9bf4..5d089b012 100644 --- a/programs/mango-v4/src/instructions/perp_settle_pnl.rs +++ b/programs/mango-v4/src/instructions/perp_settle_pnl.rs @@ -2,58 +2,12 @@ use anchor_lang::prelude::*; use checked_math as cm; use fixed::types::I80F48; +use crate::accounts_ix::*; use crate::accounts_zerocopy::*; use crate::error::*; use crate::health::{new_health_cache, HealthType, ScanningAccountRetriever}; use crate::logs::{emit_perp_balances, PerpSettlePnlLog, TokenBalanceLog}; -use crate::state::Bank; -use crate::state::IxGate; -use crate::state::{Group, MangoAccountFixed, MangoAccountLoader, PerpMarket}; - -#[derive(Accounts)] -pub struct PerpSettlePnl<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpSettlePnl) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = settler.load()?.is_operational() @ MangoError::AccountIsFrozen - // settler_owner is checked at #1 - )] - pub settler: AccountLoader<'info, MangoAccountFixed>, - pub settler_owner: Signer<'info>, - - #[account(has_one = group, has_one = oracle)] - pub perp_market: AccountLoader<'info, PerpMarket>, - - // This account MUST be profitable - #[account(mut, - has_one = group, - constraint = account_a.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account_a: AccountLoader<'info, MangoAccountFixed>, - // This account MUST have a loss - #[account( - mut, - has_one = group, - constraint = account_b.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account_b: AccountLoader<'info, MangoAccountFixed>, - - /// CHECK: Oracle can have different account types, constrained by address in perp_market - pub oracle: UncheckedAccount<'info>, - - // bank correctness is checked at #2 - #[account(mut, has_one = group)] - pub settle_bank: AccountLoader<'info, Bank>, - - /// CHECK: Oracle can have different account types - #[account(address = settle_bank.load()?.oracle)] - pub settle_oracle: UncheckedAccount<'info>, -} +use crate::state::*; pub fn perp_settle_pnl(ctx: Context) -> Result<()> { // Cannot settle with yourself diff --git a/programs/mango-v4/src/instructions/perp_update_funding.rs b/programs/mango-v4/src/instructions/perp_update_funding.rs index 04936483b..6e240f97a 100644 --- a/programs/mango-v4/src/instructions/perp_update_funding.rs +++ b/programs/mango-v4/src/instructions/perp_update_funding.rs @@ -1,32 +1,9 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::accounts_zerocopy::*; -use crate::error::MangoError; -use crate::state::{BookSide, Group, IxGate, Orderbook, PerpMarket}; +use crate::state::*; -#[derive(Accounts)] -pub struct PerpUpdateFunding<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::PerpUpdateFunding) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, // Required for group metadata parsing - - #[account( - mut, - has_one = group, - has_one = bids, - has_one = asks, - has_one = oracle, - )] - pub perp_market: AccountLoader<'info, PerpMarket>, - #[account(mut)] - pub bids: AccountLoader<'info, BookSide>, - #[account(mut)] - pub asks: AccountLoader<'info, BookSide>, - - /// CHECK: The oracle can be one of several different account types and the pubkey is checked above - pub oracle: UncheckedAccount<'info>, -} pub fn perp_update_funding(ctx: Context) -> Result<()> { let now_ts: u64 = Clock::get()?.unix_timestamp.try_into().unwrap(); diff --git a/programs/mango-v4/src/instructions/serum3_cancel_all_orders.rs b/programs/mango-v4/src/instructions/serum3_cancel_all_orders.rs index ae610eda6..1f2152a01 100644 --- a/programs/mango-v4/src/instructions/serum3_cancel_all_orders.rs +++ b/programs/mango-v4/src/instructions/serum3_cancel_all_orders.rs @@ -1,55 +1,12 @@ use anchor_lang::prelude::*; use super::{OpenOrdersAmounts, OpenOrdersSlim}; +use crate::accounts_ix::*; use crate::error::*; use crate::logs::Serum3OpenOrdersBalanceLogV2; use crate::serum3_cpi::load_open_orders_ref; use crate::state::*; -#[derive(Accounts)] -pub struct Serum3CancelAllOrders<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::Serum3CancelAllOrders) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(mut)] - /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 - pub open_orders: UncheckedAccount<'info>, - - #[account( - has_one = group, - has_one = serum_program, - has_one = serum_market_external, - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_program: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_market_external: UncheckedAccount<'info>, - - // These accounts are forwarded directly to the serum cpi call - // and are validated there. - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_bids: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_asks: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_event_queue: UncheckedAccount<'info>, -} - pub fn serum3_cancel_all_orders(ctx: Context, limit: u8) -> Result<()> { // // Validation diff --git a/programs/mango-v4/src/instructions/serum3_cancel_order.rs b/programs/mango-v4/src/instructions/serum3_cancel_order.rs index 08f93c947..162f19b4a 100644 --- a/programs/mango-v4/src/instructions/serum3_cancel_order.rs +++ b/programs/mango-v4/src/instructions/serum3_cancel_order.rs @@ -5,57 +5,11 @@ use serum_dex::instruction::CancelOrderInstructionV2; use crate::error::*; use crate::state::*; -use super::Serum3Side; - use super::{OpenOrdersAmounts, OpenOrdersSlim}; +use crate::accounts_ix::*; use crate::logs::Serum3OpenOrdersBalanceLogV2; use crate::serum3_cpi::load_open_orders_ref; -#[derive(Accounts)] -pub struct Serum3CancelOrder<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::Serum3CancelOrder) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(mut)] - /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 - pub open_orders: UncheckedAccount<'info>, - - #[account( - has_one = group, - has_one = serum_program, - has_one = serum_market_external, - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_program: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_market_external: UncheckedAccount<'info>, - - // These accounts are forwarded directly to the serum cpi call - // and are validated there. - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_bids: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_asks: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_event_queue: UncheckedAccount<'info>, -} - pub fn serum3_cancel_order( ctx: Context, side: Serum3Side, diff --git a/programs/mango-v4/src/instructions/serum3_close_open_orders.rs b/programs/mango-v4/src/instructions/serum3_close_open_orders.rs index d03bfd67d..96679b98c 100644 --- a/programs/mango-v4/src/instructions/serum3_close_open_orders.rs +++ b/programs/mango-v4/src/instructions/serum3_close_open_orders.rs @@ -1,44 +1,9 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::MangoError; use crate::state::*; -#[derive(Accounts)] -pub struct Serum3CloseOpenOrders<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::Serum3CloseOpenOrders) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - has_one = group, - has_one = serum_program, - has_one = serum_market_external, - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_program: UncheckedAccount<'info>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_market_external: UncheckedAccount<'info>, - - #[account(mut)] - /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 - pub open_orders: UncheckedAccount<'info>, - - #[account(mut)] - /// CHECK: target for account rent needs no checks - pub sol_destination: UncheckedAccount<'info>, -} - pub fn serum3_close_open_orders(ctx: Context) -> Result<()> { // // Validation diff --git a/programs/mango-v4/src/instructions/serum3_create_open_orders.rs b/programs/mango-v4/src/instructions/serum3_create_open_orders.rs index 26a7c074e..aaced94f3 100644 --- a/programs/mango-v4/src/instructions/serum3_create_open_orders.rs +++ b/programs/mango-v4/src/instructions/serum3_create_open_orders.rs @@ -1,55 +1,9 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::*; use crate::state::*; -#[derive(Accounts)] -pub struct Serum3CreateOpenOrders<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::Serum3CreateOpenOrders) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - has_one = group, - has_one = serum_program, - has_one = serum_market_external, - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_program: UncheckedAccount<'info>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_market_external: UncheckedAccount<'info>, - - // initialized by this instruction via cpi to serum - #[account( - init, - seeds = [b"Serum3OO".as_ref(), account.key().as_ref(), serum_market.key().as_ref()], - bump, - payer = payer, - owner = serum_program.key(), - // 12 is the padding serum uses for accounts ("serum" prefix, "padding" postfix) - space = 12 + std::mem::size_of::(), - )] - /// CHECK: Newly created by serum cpi call - pub open_orders: UncheckedAccount<'info>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub system_program: Program<'info, System>, - pub rent: Sysvar<'info, Rent>, -} - pub fn serum3_create_open_orders(ctx: Context) -> Result<()> { cpi_init_open_orders(ctx.accounts)?; diff --git a/programs/mango-v4/src/instructions/serum3_deregister_market.rs b/programs/mango-v4/src/instructions/serum3_deregister_market.rs index 0cfe85ab7..02dd35902 100644 --- a/programs/mango-v4/src/instructions/serum3_deregister_market.rs +++ b/programs/mango-v4/src/instructions/serum3_deregister_market.rs @@ -1,40 +1,5 @@ +use crate::accounts_ix::*; use anchor_lang::prelude::*; -use anchor_spl::token::Token; - -use crate::{error::MangoError, state::*}; - -#[derive(Accounts)] -pub struct Serum3DeregisterMarket<'info> { - #[account( - mut, - has_one = admin, - constraint = group.load()?.is_testing(), - constraint = group.load()?.is_ix_enabled(IxGate::Serum3DeregisterMarket) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - #[account( - mut, - has_one = group, - close = sol_destination - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - - #[account( - mut, - has_one = group, - constraint = serum_market.load()?.market_index == index_reservation.load()?.market_index, - close = sol_destination - )] - pub index_reservation: AccountLoader<'info, Serum3MarketIndexReservation>, - - #[account(mut)] - /// CHECK: target for account rent needs no checks - pub sol_destination: UncheckedAccount<'info>, - - pub token_program: Program<'info, Token>, -} pub fn serum3_deregister_market(_ctx: Context) -> Result<()> { Ok(()) diff --git a/programs/mango-v4/src/instructions/serum3_edit_market.rs b/programs/mango-v4/src/instructions/serum3_edit_market.rs index 3fd8d2075..aa39b3cf2 100644 --- a/programs/mango-v4/src/instructions/serum3_edit_market.rs +++ b/programs/mango-v4/src/instructions/serum3_edit_market.rs @@ -1,24 +1,6 @@ +use crate::accounts_ix::*; use anchor_lang::prelude::*; -use crate::state::*; - -#[derive(Accounts)] -#[instruction(market_index: Serum3MarketIndex)] -pub struct Serum3EditMarket<'info> { - #[account( - has_one = admin, - constraint = group.load()?.serum3_supported() - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - #[account( - mut, - has_one = group - )] - pub market: AccountLoader<'info, Serum3Market>, -} - pub fn serum3_edit_market( ctx: Context, reduce_only_opt: Option, diff --git a/programs/mango-v4/src/instructions/serum3_liq_force_cancel_orders.rs b/programs/mango-v4/src/instructions/serum3_liq_force_cancel_orders.rs index e79a6131f..4d671cfd8 100644 --- a/programs/mango-v4/src/instructions/serum3_liq_force_cancel_orders.rs +++ b/programs/mango-v4/src/instructions/serum3_liq_force_cancel_orders.rs @@ -1,6 +1,6 @@ use anchor_lang::prelude::*; -use anchor_spl::token::{Token, TokenAccount}; +use crate::accounts_ix::*; use crate::error::*; use crate::health::*; use crate::instructions::{ @@ -11,69 +11,6 @@ use crate::logs::Serum3OpenOrdersBalanceLogV2; use crate::serum3_cpi::load_open_orders_ref; use crate::state::*; -#[derive(Accounts)] -pub struct Serum3LiqForceCancelOrders<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::Serum3LiqForceCancelOrders) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - // Allow force cancel even if account is frozen - #[account( - mut, - has_one = group - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - - #[account(mut)] - /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 - pub open_orders: UncheckedAccount<'info>, - - #[account( - has_one = group, - has_one = serum_program, - has_one = serum_market_external, - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_program: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_market_external: UncheckedAccount<'info>, - - // These accounts are forwarded directly to the serum cpi call - // and are validated there. - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_bids: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_asks: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_event_queue: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_base_vault: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_quote_vault: UncheckedAccount<'info>, - /// CHECK: Validated by the serum cpi call - pub market_vault_signer: UncheckedAccount<'info>, - - // token_index and bank.vault == vault is validated inline at #3 - #[account(mut, has_one = group)] - pub quote_bank: AccountLoader<'info, Bank>, - #[account(mut)] - pub quote_vault: Box>, - #[account(mut, has_one = group)] - pub base_bank: AccountLoader<'info, Bank>, - #[account(mut)] - pub base_vault: Box>, - - pub token_program: Program<'info, Token>, -} - pub fn serum3_liq_force_cancel_orders( ctx: Context, limit: u8, diff --git a/programs/mango-v4/src/instructions/serum3_place_order.rs b/programs/mango-v4/src/instructions/serum3_place_order.rs index 26e6354f4..3d4d54189 100644 --- a/programs/mango-v4/src/instructions/serum3_place_order.rs +++ b/programs/mango-v4/src/instructions/serum3_place_order.rs @@ -3,14 +3,12 @@ use crate::error::*; use crate::health::*; use crate::state::*; +use crate::accounts_ix::*; use crate::logs::{Serum3OpenOrdersBalanceLogV2, TokenBalanceLog}; use crate::serum3_cpi::{load_market_state, load_open_orders_ref}; use anchor_lang::prelude::*; -use anchor_spl::token::{Token, TokenAccount}; use checked_math as cm; use fixed::types::I80F48; -use num_enum::IntoPrimitive; -use num_enum::TryFromPrimitive; use serum_dex::instruction::NewOrderInstructionV3; use serum_dex::state::OpenOrders; @@ -107,102 +105,6 @@ impl OpenOrdersAmounts for OpenOrders { } } -/// Copy paste a bunch of enums so that we could AnchorSerialize & AnchorDeserialize them - -#[derive(Clone, Copy, TryFromPrimitive, IntoPrimitive, AnchorSerialize, AnchorDeserialize)] -#[repr(u8)] -pub enum Serum3SelfTradeBehavior { - DecrementTake = 0, - CancelProvide = 1, - AbortTransaction = 2, -} - -#[derive(Clone, Copy, TryFromPrimitive, IntoPrimitive, AnchorSerialize, AnchorDeserialize)] -#[repr(u8)] - -pub enum Serum3OrderType { - Limit = 0, - ImmediateOrCancel = 1, - PostOnly = 2, -} -#[derive(Clone, Copy, TryFromPrimitive, IntoPrimitive, AnchorSerialize, AnchorDeserialize)] -#[repr(u8)] - -pub enum Serum3Side { - Bid = 0, - Ask = 1, -} - -#[derive(Accounts)] -pub struct Serum3PlaceOrder<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::Serum3PlaceOrder) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(mut)] - /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 - pub open_orders: UncheckedAccount<'info>, - - #[account( - has_one = group, - has_one = serum_program, - has_one = serum_market_external, - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_program: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_market_external: UncheckedAccount<'info>, - - // These accounts are forwarded directly to the serum cpi call - // and are validated there. - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_bids: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_asks: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_event_queue: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_request_queue: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_base_vault: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_quote_vault: UncheckedAccount<'info>, - /// needed for the automatic settle_funds call - /// CHECK: Validated by the serum cpi call - pub market_vault_signer: UncheckedAccount<'info>, - - /// The bank that pays for the order, if necessary - // token_index and payer_bank.vault == payer_vault is validated inline at #3 - #[account(mut, has_one = group)] - pub payer_bank: AccountLoader<'info, Bank>, - /// The bank vault that pays for the order, if necessary - #[account(mut)] - pub payer_vault: Box>, - /// CHECK: The oracle can be one of several different account types - #[account(address = payer_bank.load()?.oracle)] - pub payer_oracle: UncheckedAccount<'info>, - - pub token_program: Program<'info, Token>, -} - #[allow(clippy::too_many_arguments)] pub fn serum3_place_order( ctx: Context, diff --git a/programs/mango-v4/src/instructions/serum3_register_market.rs b/programs/mango-v4/src/instructions/serum3_register_market.rs index 339c3a191..0760c34f7 100644 --- a/programs/mango-v4/src/instructions/serum3_register_market.rs +++ b/programs/mango-v4/src/instructions/serum3_register_market.rs @@ -5,56 +5,9 @@ use crate::serum3_cpi::{load_market_state, pubkey_from_u64_array}; use crate::state::*; use crate::util::fill_from_str; +use crate::accounts_ix::*; use crate::logs::Serum3RegisterMarketLog; -#[derive(Accounts)] -#[instruction(market_index: Serum3MarketIndex)] -pub struct Serum3RegisterMarket<'info> { - #[account( - mut, - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::Serum3RegisterMarket) @ MangoError::IxIsDisabled, - constraint = group.load()?.serum3_supported() - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - /// CHECK: Can register a market for any serum program - pub serum_program: UncheckedAccount<'info>, - /// CHECK: Can register any serum market - pub serum_market_external: UncheckedAccount<'info>, - - #[account( - init, - // using the serum_market_external in the seed guards against registering the same market twice - seeds = [b"Serum3Market".as_ref(), group.key().as_ref(), serum_market_external.key().as_ref()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - - #[account( - init, - // block using the same market index twice - seeds = [b"Serum3Index".as_ref(), group.key().as_ref(), &market_index.to_le_bytes()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub index_reservation: AccountLoader<'info, Serum3MarketIndexReservation>, - - #[account(has_one = group)] - pub quote_bank: AccountLoader<'info, Bank>, - #[account(has_one = group)] - pub base_bank: AccountLoader<'info, Bank>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub system_program: Program<'info, System>, -} - pub fn serum3_register_market( ctx: Context, market_index: Serum3MarketIndex, diff --git a/programs/mango-v4/src/instructions/serum3_settle_funds.rs b/programs/mango-v4/src/instructions/serum3_settle_funds.rs index 75e1b2e0f..22d3f06a5 100644 --- a/programs/mango-v4/src/instructions/serum3_settle_funds.rs +++ b/programs/mango-v4/src/instructions/serum3_settle_funds.rs @@ -1,5 +1,4 @@ use anchor_lang::prelude::*; -use anchor_spl::token::{Token, TokenAccount}; use fixed::types::I80F48; @@ -8,66 +7,10 @@ use crate::serum3_cpi::load_open_orders_ref; use crate::state::*; use super::{apply_vault_difference, OpenOrdersAmounts, OpenOrdersSlim}; +use crate::accounts_ix::*; use crate::logs::Serum3OpenOrdersBalanceLogV2; use crate::logs::{LoanOriginationFeeInstruction, WithdrawLoanOriginationFeeLog}; -#[derive(Accounts)] -pub struct Serum3SettleFunds<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::Serum3SettleFunds) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - // owner is checked at #1 - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account(mut)] - /// CHECK: Validated inline by checking against the pubkey stored in the account at #2 - pub open_orders: UncheckedAccount<'info>, - - #[account( - has_one = group, - has_one = serum_program, - has_one = serum_market_external, - )] - pub serum_market: AccountLoader<'info, Serum3Market>, - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_program: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: The pubkey is checked and then it's passed to the serum cpi - pub serum_market_external: UncheckedAccount<'info>, - - // These accounts are forwarded directly to the serum cpi call - // and are validated there. - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_base_vault: UncheckedAccount<'info>, - #[account(mut)] - /// CHECK: Validated by the serum cpi call - pub market_quote_vault: UncheckedAccount<'info>, - /// needed for the automatic settle_funds call - /// CHECK: Validated by the serum cpi call - pub market_vault_signer: UncheckedAccount<'info>, - - // token_index and bank.vault == vault is validated inline at #3 - #[account(mut, has_one = group)] - pub quote_bank: AccountLoader<'info, Bank>, - #[account(mut)] - pub quote_vault: Box>, - #[account(mut, has_one = group)] - pub base_bank: AccountLoader<'info, Bank>, - #[account(mut)] - pub base_vault: Box>, - - pub token_program: Program<'info, Token>, -} - /// Settling means moving free funds from the serum3 open orders account /// back into the mango account wallet. /// diff --git a/programs/mango-v4/src/instructions/stub_oracle_close.rs b/programs/mango-v4/src/instructions/stub_oracle_close.rs index 198c7bc01..48c4b05de 100644 --- a/programs/mango-v4/src/instructions/stub_oracle_close.rs +++ b/programs/mango-v4/src/instructions/stub_oracle_close.rs @@ -1,32 +1,5 @@ +use crate::accounts_ix::*; use anchor_lang::prelude::*; -use anchor_spl::token::Token; - -use crate::{error::MangoError, state::*}; - -#[derive(Accounts)] -pub struct StubOracleClose<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::StubOracleClose) @ MangoError::IxIsDisabled, - constraint = group.load()?.is_testing(), - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - // match stub oracle to group - #[account( - mut, - has_one = group, - close = sol_destination - )] - pub oracle: AccountLoader<'info, StubOracle>, - - #[account(mut)] - /// CHECK: target for account rent needs no checks - pub sol_destination: UncheckedAccount<'info>, - - pub token_program: Program<'info, Token>, -} pub fn stub_oracle_close(_ctx: Context) -> Result<()> { Ok(()) diff --git a/programs/mango-v4/src/instructions/stub_oracle_create.rs b/programs/mango-v4/src/instructions/stub_oracle_create.rs index 3be2ad8fd..cf3b75baf 100644 --- a/programs/mango-v4/src/instructions/stub_oracle_create.rs +++ b/programs/mango-v4/src/instructions/stub_oracle_create.rs @@ -1,35 +1,7 @@ use anchor_lang::prelude::*; -use anchor_spl::token::Mint; use fixed::types::I80F48; -use crate::{error::MangoError, state::*}; - -#[derive(Accounts)] -pub struct StubOracleCreate<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::StubOracleCreate) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - init, - seeds = [b"StubOracle".as_ref(), group.key().as_ref(), mint.key().as_ref()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub oracle: AccountLoader<'info, StubOracle>, - - pub admin: Signer<'info>, - - pub mint: Account<'info, Mint>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub system_program: Program<'info, System>, -} +use crate::accounts_ix::*; pub fn stub_oracle_create(ctx: Context, price: I80F48) -> Result<()> { let mut oracle = ctx.accounts.oracle.load_init()?; diff --git a/programs/mango-v4/src/instructions/stub_oracle_set.rs b/programs/mango-v4/src/instructions/stub_oracle_set.rs index 3caec136b..2f538d13b 100644 --- a/programs/mango-v4/src/instructions/stub_oracle_set.rs +++ b/programs/mango-v4/src/instructions/stub_oracle_set.rs @@ -1,25 +1,7 @@ +use crate::accounts_ix::*; use anchor_lang::prelude::*; use fixed::types::I80F48; -use crate::{error::MangoError, state::*}; - -#[derive(Accounts)] -pub struct StubOracleSet<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::StubOracleSet) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - pub admin: Signer<'info>, - - #[account( - mut, - has_one = group - )] - pub oracle: AccountLoader<'info, StubOracle>, -} - pub fn stub_oracle_set(ctx: Context, price: I80F48) -> Result<()> { let mut oracle = ctx.accounts.oracle.load_mut()?; oracle.price = price; diff --git a/programs/mango-v4/src/instructions/token_add_bank.rs b/programs/mango-v4/src/instructions/token_add_bank.rs index e0641eb37..cb5efe25f 100644 --- a/programs/mango-v4/src/instructions/token_add_bank.rs +++ b/programs/mango-v4/src/instructions/token_add_bank.rs @@ -1,64 +1,7 @@ -use anchor_lang::prelude::*; -use anchor_spl::token::{Mint, Token, TokenAccount}; - +use crate::accounts_ix::*; use crate::error::*; use crate::state::*; - -#[derive(Accounts)] -#[instruction(token_index: TokenIndex, bank_num: u32)] -pub struct TokenAddBank<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::TokenAddBank) @ MangoError::IxIsDisabled, - constraint = group.load()?.multiple_banks_supported() - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - pub mint: Account<'info, Mint>, - - #[account( - constraint = existing_bank.load()?.token_index == token_index, - has_one = group, - has_one = mint, - )] - pub existing_bank: AccountLoader<'info, Bank>, - - #[account( - init, - // using the token_index in this seed guards against reusing it - seeds = [b"Bank".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &bank_num.to_le_bytes()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub bank: AccountLoader<'info, Bank>, - - #[account( - init, - seeds = [b"Vault".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &bank_num.to_le_bytes()], - bump, - token::authority = group, - token::mint = mint, - payer = payer - )] - pub vault: Account<'info, TokenAccount>, - - #[account( - mut, - constraint = mint_info.load()?.token_index == token_index, - has_one = group, - has_one = mint, - )] - pub mint_info: AccountLoader<'info, MintInfo>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub token_program: Program<'info, Token>, - pub system_program: Program<'info, System>, - pub rent: Sysvar<'info, Rent>, -} +use anchor_lang::prelude::*; #[allow(clippy::too_many_arguments)] #[allow(unused_variables)] diff --git a/programs/mango-v4/src/instructions/token_deposit.rs b/programs/mango-v4/src/instructions/token_deposit.rs index 321d7f86b..75b0a9060 100644 --- a/programs/mango-v4/src/instructions/token_deposit.rs +++ b/programs/mango-v4/src/instructions/token_deposit.rs @@ -10,85 +10,9 @@ use crate::health::*; use crate::state::*; use crate::util::checked_math as cm; +use crate::accounts_ix::*; use crate::logs::{DepositLog, TokenBalanceLog}; -// Same as TokenDeposit, but without the owner signing -#[derive(Accounts)] -pub struct TokenDepositIntoExisting<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::TokenDeposit) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - - #[account( - mut, - has_one = group, - has_one = vault, - has_one = oracle, - // the mints of bank/vault/token_account are implicitly the same because - // spl::token::transfer succeeds between token_account and vault - )] - pub bank: AccountLoader<'info, Bank>, - - #[account(mut)] - pub vault: Account<'info, TokenAccount>, - - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, - - #[account(mut)] - pub token_account: Box>, - pub token_authority: Signer<'info>, - - pub token_program: Program<'info, Token>, -} - -#[derive(Accounts)] -pub struct TokenDeposit<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::TokenDeposit) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - has_one = owner, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = vault, - has_one = oracle, - // the mints of bank/vault/token_account are implicitly the same because - // spl::token::transfer succeeds between token_account and vault - )] - pub bank: AccountLoader<'info, Bank>, - - #[account(mut)] - pub vault: Account<'info, TokenAccount>, - - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, - - #[account(mut)] - pub token_account: Box>, - pub token_authority: Signer<'info>, - - pub token_program: Program<'info, Token>, -} - struct DepositCommon<'a, 'info> { pub group: &'a AccountLoader<'info, Group>, pub account: &'a AccountLoader<'info, MangoAccountFixed>, diff --git a/programs/mango-v4/src/instructions/token_deregister.rs b/programs/mango-v4/src/instructions/token_deregister.rs index 390658cf9..3f89a7d28 100644 --- a/programs/mango-v4/src/instructions/token_deregister.rs +++ b/programs/mango-v4/src/instructions/token_deregister.rs @@ -1,39 +1,10 @@ use anchor_lang::prelude::*; -use anchor_spl::token::{self, CloseAccount, Token, TokenAccount}; +use anchor_spl::token::{self, CloseAccount, TokenAccount}; -use crate::{accounts_zerocopy::LoadZeroCopyRef, error::MangoError, state::*}; +use crate::accounts_ix::*; +use crate::{accounts_zerocopy::LoadZeroCopyRef, state::*}; use anchor_lang::AccountsClose; -/// In addition to these accounts, there must be remaining_accounts: -/// all n pairs of bank and its corresponding vault account for a token -#[derive(Accounts)] -pub struct TokenDeregister<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::TokenDeregister) @ MangoError::IxIsDisabled, - constraint = group.load()?.is_testing(), - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - // match mint info to bank - #[account( - mut, - has_one = group, - close = sol_destination - )] - pub mint_info: AccountLoader<'info, MintInfo>, - - #[account(mut)] - pub dust_vault: Account<'info, TokenAccount>, - - #[account(mut)] - /// CHECK: target for account rent needs no checks - pub sol_destination: UncheckedAccount<'info>, - - pub token_program: Program<'info, Token>, -} - #[allow(clippy::too_many_arguments)] pub fn token_deregister<'key, 'accounts, 'remaining, 'info>( ctx: Context<'key, 'accounts, 'remaining, 'info, TokenDeregister<'info>>, diff --git a/programs/mango-v4/src/instructions/token_edit.rs b/programs/mango-v4/src/instructions/token_edit.rs index 517dbbc7c..caaf7db97 100644 --- a/programs/mango-v4/src/instructions/token_edit.rs +++ b/programs/mango-v4/src/instructions/token_edit.rs @@ -2,36 +2,14 @@ use anchor_lang::prelude::*; use fixed::types::I80F48; -use super::InterestRateParams; use crate::accounts_zerocopy::{AccountInfoRef, LoadMutZeroCopyRef}; use crate::error::MangoError; use crate::state::*; +use crate::accounts_ix::*; use crate::logs::TokenMetaDataLog; -/// Changes a token's parameters. -/// -/// In addition to these accounts, all banks must be passed as remaining_accounts -/// in MintInfo order. -#[derive(Accounts)] -pub struct TokenEdit<'info> { - pub group: AccountLoader<'info, Group>, - // group <-> admin relation is checked at #1 - pub admin: Signer<'info>, - - #[account( - mut, - has_one = group - )] - pub mint_info: AccountLoader<'info, MintInfo>, - - /// The oracle account is optional and only used when reset_stable_price is set. - /// - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, -} - #[allow(unused_variables)] #[allow(clippy::too_many_arguments)] pub fn token_edit( @@ -109,7 +87,7 @@ pub fn token_edit( if let Some(ref interest_rate_params) = interest_rate_params_opt { // TODO: add a require! verifying relation between the parameters - msg!("Interest rate params: old - adjustment_factor {:?}, util0 {:?}, rate0 {:?}, util1 {:?}, rate1 {:?}, max_rate {:?}, new - adjustment_factor {:?}, util0 {:?}, rate0 {:?}, util1 {:?}, rate1 {:?}, max_rate {:?}", + msg!("Interest rate params: old - adjustment_factor {:?}, util0 {:?}, rate0 {:?}, util1 {:?}, rate1 {:?}, max_rate {:?}, new - adjustment_factor {:?}, util0 {:?}, rate0 {:?}, util1 {:?}, rate1 {:?}, max_rate {:?}", bank.adjustment_factor, bank.util0, bank.rate0, diff --git a/programs/mango-v4/src/instructions/token_liq_bankruptcy.rs b/programs/mango-v4/src/instructions/token_liq_bankruptcy.rs index 3666aff5d..2e3451a3e 100644 --- a/programs/mango-v4/src/instructions/token_liq_bankruptcy.rs +++ b/programs/mango-v4/src/instructions/token_liq_bankruptcy.rs @@ -1,7 +1,5 @@ use anchor_lang::prelude::*; use anchor_spl::token; -use anchor_spl::token::Token; -use anchor_spl::token::TokenAccount; use fixed::types::I80F48; use crate::accounts_zerocopy::*; @@ -10,67 +8,12 @@ use crate::health::*; use crate::state::*; use crate::util::checked_math as cm; +use crate::accounts_ix::*; use crate::logs::{ LoanOriginationFeeInstruction, TokenBalanceLog, TokenLiqBankruptcyLog, WithdrawLoanOriginationFeeLog, }; -// Remaining accounts: -// - all banks for liab_mint_info (writable) -// - merged health accounts for liqor+liqee -#[derive(Accounts)] -pub struct TokenLiqBankruptcy<'info> { - #[account( - has_one = insurance_vault, - constraint = group.load()?.is_ix_enabled(IxGate::TokenLiqBankruptcy) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen - // liqor_owner is checked at #1 - )] - pub liqor: AccountLoader<'info, MangoAccountFixed>, - pub liqor_owner: Signer<'info>, - - #[account( - mut, - has_one = group, - constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub liqee: AccountLoader<'info, MangoAccountFixed>, - - #[account( - has_one = group, - )] - pub liab_mint_info: AccountLoader<'info, MintInfo>, - - #[account(mut)] - // address is checked at #2 a) and b) - pub quote_vault: Account<'info, TokenAccount>, - - // future: this would be an insurance fund vault specific to a - // trustless token, separate from the shared one on the group - #[account(mut)] - pub insurance_vault: Account<'info, TokenAccount>, - - pub token_program: Program<'info, Token>, -} - -impl<'info> TokenLiqBankruptcy<'info> { - pub fn transfer_ctx(&self) -> CpiContext<'_, '_, '_, 'info, token::Transfer<'info>> { - let program = self.token_program.to_account_info(); - let accounts = token::Transfer { - from: self.insurance_vault.to_account_info(), - to: self.quote_vault.to_account_info(), - authority: self.group.to_account_info(), - }; - CpiContext::new(program, accounts) - } -} - pub fn token_liq_bankruptcy( ctx: Context, max_liab_transfer: I80F48, diff --git a/programs/mango-v4/src/instructions/token_liq_with_token.rs b/programs/mango-v4/src/instructions/token_liq_with_token.rs index f3923463d..b2fd7ee33 100644 --- a/programs/mango-v4/src/instructions/token_liq_with_token.rs +++ b/programs/mango-v4/src/instructions/token_liq_with_token.rs @@ -2,6 +2,7 @@ use anchor_lang::prelude::*; use fixed::types::I80F48; use std::cmp::min; +use crate::accounts_ix::*; use crate::error::*; use crate::health::*; use crate::logs::{ @@ -11,30 +12,6 @@ use crate::logs::{ use crate::state::*; use crate::util::checked_math as cm; -#[derive(Accounts)] -pub struct TokenLiqWithToken<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::TokenLiqWithToken) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - constraint = liqor.load()?.is_operational() @ MangoError::AccountIsFrozen - // liqor_owner is checked at #1 - )] - pub liqor: AccountLoader<'info, MangoAccountFixed>, - pub liqor_owner: Signer<'info>, - - #[account( - mut, - has_one = group, - constraint = liqee.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub liqee: AccountLoader<'info, MangoAccountFixed>, -} - pub fn token_liq_with_token( ctx: Context, asset_token_index: TokenIndex, diff --git a/programs/mango-v4/src/instructions/token_register.rs b/programs/mango-v4/src/instructions/token_register.rs index 743e33705..eff764531 100644 --- a/programs/mango-v4/src/instructions/token_register.rs +++ b/programs/mango-v4/src/instructions/token_register.rs @@ -1,5 +1,4 @@ use anchor_lang::prelude::*; -use anchor_spl::token::{Mint, Token, TokenAccount}; use fixed::types::I80F48; use fixed_macro::types::I80F48; @@ -12,70 +11,7 @@ use crate::logs::TokenMetaDataLog; pub const INDEX_START: I80F48 = I80F48!(1_000_000); -const FIRST_BANK_NUM: u32 = 0; - -#[derive(Accounts)] -#[instruction(token_index: TokenIndex)] -pub struct TokenRegister<'info> { - #[account( - has_one = admin, - constraint = group.load()?.is_ix_enabled(IxGate::TokenRegister) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - pub admin: Signer<'info>, - - pub mint: Account<'info, Mint>, - - #[account( - init, - // using the token_index in this seed guards against reusing it - seeds = [b"Bank".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub bank: AccountLoader<'info, Bank>, - - #[account( - init, - seeds = [b"Vault".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], - bump, - token::authority = group, - token::mint = mint, - payer = payer - )] - pub vault: Account<'info, TokenAccount>, - - #[account( - init, - // using the mint in this seed guards against registering the same mint twice - seeds = [b"MintInfo".as_ref(), group.key().as_ref(), mint.key().as_ref()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub mint_info: AccountLoader<'info, MintInfo>, - - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub token_program: Program<'info, Token>, - pub system_program: Program<'info, System>, - pub rent: Sysvar<'info, Rent>, -} - -#[derive(AnchorSerialize, AnchorDeserialize)] -pub struct InterestRateParams { - pub util0: f32, - pub rate0: f32, - pub util1: f32, - pub rate1: f32, - pub max_rate: f32, - pub adjustment_factor: f32, -} +use crate::accounts_ix::*; #[allow(clippy::too_many_arguments)] pub fn token_register( diff --git a/programs/mango-v4/src/instructions/token_register_trustless.rs b/programs/mango-v4/src/instructions/token_register_trustless.rs index 9c40868f5..3e4b8222f 100644 --- a/programs/mango-v4/src/instructions/token_register_trustless.rs +++ b/programs/mango-v4/src/instructions/token_register_trustless.rs @@ -1,5 +1,4 @@ use anchor_lang::prelude::*; -use anchor_spl::token::{Mint, Token, TokenAccount}; use fixed::types::I80F48; use crate::accounts_zerocopy::AccountInfoRef; @@ -10,60 +9,7 @@ use crate::util::fill_from_str; use crate::logs::TokenMetaDataLog; -const FIRST_BANK_NUM: u32 = 0; - -#[derive(Accounts)] -#[instruction(token_index: TokenIndex)] -pub struct TokenRegisterTrustless<'info> { - #[account( - has_one = fast_listing_admin, - constraint = group.load()?.is_ix_enabled(IxGate::TokenRegisterTrustless) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - pub fast_listing_admin: Signer<'info>, - - pub mint: Account<'info, Mint>, - - #[account( - init, - // using the token_index in this seed guards against reusing it - seeds = [b"Bank".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub bank: AccountLoader<'info, Bank>, - - #[account( - init, - seeds = [b"Vault".as_ref(), group.key().as_ref(), &token_index.to_le_bytes(), &FIRST_BANK_NUM.to_le_bytes()], - bump, - token::authority = group, - token::mint = mint, - payer = payer - )] - pub vault: Account<'info, TokenAccount>, - - #[account( - init, - // using the mint in this seed guards against registering the same mint twice - seeds = [b"MintInfo".as_ref(), group.key().as_ref(), mint.key().as_ref()], - bump, - payer = payer, - space = 8 + std::mem::size_of::(), - )] - pub mint_info: AccountLoader<'info, MintInfo>, - - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, - - #[account(mut)] - pub payer: Signer<'info>, - - pub token_program: Program<'info, Token>, - pub system_program: Program<'info, System>, - pub rent: Sysvar<'info, Rent>, -} +use crate::accounts_ix::*; #[allow(clippy::too_many_arguments)] pub fn token_register_trustless( diff --git a/programs/mango-v4/src/instructions/token_update_index_and_rate.rs b/programs/mango-v4/src/instructions/token_update_index_and_rate.rs index 478dc9d54..60ce36790 100644 --- a/programs/mango-v4/src/instructions/token_update_index_and_rate.rs +++ b/programs/mango-v4/src/instructions/token_update_index_and_rate.rs @@ -1,11 +1,12 @@ use anchor_lang::prelude::*; +use crate::accounts_ix::*; use crate::error::MangoError; use crate::logs::{UpdateIndexLog, UpdateRateLog}; -use crate::state::{IxGate, HOUR}; +use crate::state::HOUR; use crate::{ accounts_zerocopy::{AccountInfoRef, LoadMutZeroCopyRef, LoadZeroCopyRef}, - state::{Bank, Group, MintInfo}, + state::Bank, }; use anchor_lang::solana_program::sysvar::instructions as tx_instructions; use anchor_lang::Discriminator; @@ -17,34 +18,6 @@ pub mod compute_budget { declare_id!("ComputeBudget111111111111111111111111111111"); } -/// Updates token interest and interest rates. -/// -/// In addition to these accounts, all banks must be passed as remaining_accounts -/// in MintInfo order. -/// -/// This instruction may only be used alongside other instructions of the same kind -/// or ComputeBudget instructions. -#[derive(Accounts)] -pub struct TokenUpdateIndexAndRate<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::TokenUpdateIndexAndRate) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, // Required for group metadata parsing - - #[account( - has_one = oracle, - has_one = group, - )] - pub mint_info: AccountLoader<'info, MintInfo>, - - /// CHECK: oracle can be one of multiple account types - pub oracle: UncheckedAccount<'info>, - - /// CHECK: fixed instructions sysvar account - #[account(address = tx_instructions::ID)] - pub instructions: UncheckedAccount<'info>, -} - pub fn token_update_index_and_rate(ctx: Context) -> Result<()> { { let ixs = ctx.accounts.instructions.as_ref(); diff --git a/programs/mango-v4/src/instructions/token_withdraw.rs b/programs/mango-v4/src/instructions/token_withdraw.rs index f18b1cba0..2bc408226 100644 --- a/programs/mango-v4/src/instructions/token_withdraw.rs +++ b/programs/mango-v4/src/instructions/token_withdraw.rs @@ -4,65 +4,14 @@ use crate::health::*; use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::token; -use anchor_spl::token::Token; -use anchor_spl::token::TokenAccount; use fixed::types::I80F48; +use crate::accounts_ix::*; use crate::logs::{ LoanOriginationFeeInstruction, TokenBalanceLog, WithdrawLoanOriginationFeeLog, WithdrawLog, }; use crate::util::checked_math as cm; -#[derive(Accounts)] -pub struct TokenWithdraw<'info> { - #[account( - constraint = group.load()?.is_ix_enabled(IxGate::TokenWithdraw) @ MangoError::IxIsDisabled, - )] - pub group: AccountLoader<'info, Group>, - - #[account( - mut, - has_one = group, - has_one = owner, - constraint = account.load()?.is_operational() @ MangoError::AccountIsFrozen - )] - pub account: AccountLoader<'info, MangoAccountFixed>, - pub owner: Signer<'info>, - - #[account( - mut, - has_one = group, - has_one = vault, - has_one = oracle, - // the mints of bank/vault/token_account are implicitly the same because - // spl::token::transfer succeeds between token_account and vault - )] - pub bank: AccountLoader<'info, Bank>, - - #[account(mut)] - pub vault: Account<'info, TokenAccount>, - - /// CHECK: The oracle can be one of several different account types - pub oracle: UncheckedAccount<'info>, - - #[account(mut)] - pub token_account: Box>, - - pub token_program: Program<'info, Token>, -} - -impl<'info> TokenWithdraw<'info> { - pub fn transfer_ctx(&self) -> CpiContext<'_, '_, '_, 'info, token::Transfer<'info>> { - let program = self.token_program.to_account_info(); - let accounts = token::Transfer { - from: self.vault.to_account_info(), - to: self.token_account.to_account_info(), - authority: self.group.to_account_info(), - }; - CpiContext::new(program, accounts) - } -} - pub fn token_withdraw(ctx: Context, amount: u64, allow_borrow: bool) -> Result<()> { require_msg!(amount > 0, "withdraw amount must be positive"); diff --git a/programs/mango-v4/src/lib.rs b/programs/mango-v4/src/lib.rs index b468a9a52..d96f7dc9d 100644 --- a/programs/mango-v4/src/lib.rs +++ b/programs/mango-v4/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(unused_variables)] + use fixed::types::I80F48; #[macro_use] @@ -8,20 +10,26 @@ extern crate static_assertions; use anchor_lang::prelude::*; -use instructions::*; +use accounts_ix::*; +pub mod accounts_ix; pub mod accounts_zerocopy; pub mod address_lookup_table_program; pub mod error; pub mod events; pub mod health; pub mod i80f48; -pub mod instructions; pub mod logs; pub mod serum3_cpi; pub mod state; pub mod types; +#[cfg(feature = "enable-gpl")] +pub mod instructions; + +#[cfg(all(not(feature = "no-entrypoint"), not(feature = "enable-gpl")))] +compile_error!("compiling the program entrypoint without 'enable-gpl' makes no sense, enable it or use the 'cpi' or 'client' features"); + use state::{ OracleConfigParams, PerpMarketIndex, PlaceOrderType, Serum3MarketIndex, Side, TokenIndex, }; @@ -38,7 +46,9 @@ pub mod mango_v4 { testing: u8, version: u8, ) -> Result<()> { - instructions::group_create(ctx, group_num, testing, version) + #[cfg(feature = "enable-gpl")] + instructions::group_create(ctx, group_num, testing, version)?; + Ok(()) } pub fn group_edit( @@ -50,6 +60,7 @@ pub mod mango_v4 { version_opt: Option, deposit_limit_quote_opt: Option, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::group_edit( ctx, admin_opt, @@ -58,15 +69,20 @@ pub mod mango_v4 { testing_opt, version_opt, deposit_limit_quote_opt, - ) + )?; + Ok(()) } pub fn ix_gate_set(ctx: Context, ix_gate: u128) -> Result<()> { - instructions::ix_gate_set(ctx, ix_gate) + #[cfg(feature = "enable-gpl")] + instructions::ix_gate_set(ctx, ix_gate)?; + Ok(()) } pub fn group_close(ctx: Context) -> Result<()> { - instructions::group_close(ctx) + #[cfg(feature = "enable-gpl")] + instructions::group_close(ctx)?; + Ok(()) } #[allow(clippy::too_many_arguments)] @@ -87,6 +103,7 @@ pub mod mango_v4 { net_borrow_limit_window_size_ts: u64, net_borrow_limit_per_window_quote: i64, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::token_register( ctx, token_index, @@ -103,7 +120,8 @@ pub mod mango_v4 { min_vault_to_deposits_ratio, net_borrow_limit_window_size_ts, net_borrow_limit_per_window_quote, - ) + )?; + Ok(()) } pub fn token_register_trustless( @@ -111,7 +129,9 @@ pub mod mango_v4 { token_index: TokenIndex, name: String, ) -> Result<()> { - instructions::token_register_trustless(ctx, token_index, name) + #[cfg(feature = "enable-gpl")] + instructions::token_register_trustless(ctx, token_index, name)?; + Ok(()) } #[allow(clippy::too_many_arguments)] @@ -140,6 +160,7 @@ pub mod mango_v4 { reset_net_borrow_limit: bool, reduce_only_opt: Option, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::token_edit( ctx, oracle_opt, @@ -164,7 +185,8 @@ pub mod mango_v4 { reset_stable_price, reset_net_borrow_limit, reduce_only_opt, - ) + )?; + Ok(()) } #[allow(clippy::too_many_arguments)] @@ -173,17 +195,23 @@ pub mod mango_v4 { token_index: TokenIndex, bank_num: u32, ) -> Result<()> { - instructions::token_add_bank(ctx, token_index, bank_num) + #[cfg(feature = "enable-gpl")] + instructions::token_add_bank(ctx, token_index, bank_num)?; + Ok(()) } pub fn token_deregister<'key, 'accounts, 'remaining, 'info>( ctx: Context<'key, 'accounts, 'remaining, 'info, TokenDeregister<'info>>, ) -> Result<()> { - instructions::token_deregister(ctx) + #[cfg(feature = "enable-gpl")] + instructions::token_deregister(ctx)?; + Ok(()) } pub fn token_update_index_and_rate(ctx: Context) -> Result<()> { - instructions::token_update_index_and_rate(ctx) + #[cfg(feature = "enable-gpl")] + instructions::token_update_index_and_rate(ctx)?; + Ok(()) } pub fn account_create( @@ -195,6 +223,7 @@ pub mod mango_v4 { perp_oo_count: u8, name: String, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::account_create( ctx, account_num, @@ -203,7 +232,8 @@ pub mod mango_v4 { perp_count, perp_oo_count, name, - ) + )?; + Ok(()) } pub fn account_expand( @@ -213,7 +243,9 @@ pub mod mango_v4 { perp_count: u8, perp_oo_count: u8, ) -> Result<()> { - instructions::account_expand(ctx, token_count, serum3_count, perp_count, perp_oo_count) + #[cfg(feature = "enable-gpl")] + instructions::account_expand(ctx, token_count, serum3_count, perp_count, perp_oo_count)?; + Ok(()) } pub fn account_edit( @@ -221,15 +253,21 @@ pub mod mango_v4 { name_opt: Option, delegate_opt: Option, ) -> Result<()> { - instructions::account_edit(ctx, name_opt, delegate_opt) + #[cfg(feature = "enable-gpl")] + instructions::account_edit(ctx, name_opt, delegate_opt)?; + Ok(()) } pub fn account_toggle_freeze(ctx: Context, freeze: bool) -> Result<()> { - instructions::account_toggle_freeze(ctx, freeze) + #[cfg(feature = "enable-gpl")] + instructions::account_toggle_freeze(ctx, freeze)?; + Ok(()) } pub fn account_close(ctx: Context, force_close: bool) -> Result<()> { - instructions::account_close(ctx, force_close) + #[cfg(feature = "enable-gpl")] + instructions::account_close(ctx, force_close)?; + Ok(()) } // todo: @@ -238,19 +276,27 @@ pub mod mango_v4 { // and it's tricky to use in typescript generally // lets do an interface pass later pub fn stub_oracle_create(ctx: Context, price: I80F48) -> Result<()> { - instructions::stub_oracle_create(ctx, price) + #[cfg(feature = "enable-gpl")] + instructions::stub_oracle_create(ctx, price)?; + Ok(()) } pub fn stub_oracle_close(ctx: Context) -> Result<()> { - instructions::stub_oracle_close(ctx) + #[cfg(feature = "enable-gpl")] + instructions::stub_oracle_close(ctx)?; + Ok(()) } pub fn stub_oracle_set(ctx: Context, price: I80F48) -> Result<()> { - instructions::stub_oracle_set(ctx, price) + #[cfg(feature = "enable-gpl")] + instructions::stub_oracle_set(ctx, price)?; + Ok(()) } pub fn token_deposit(ctx: Context, amount: u64, reduce_only: bool) -> Result<()> { - instructions::token_deposit(ctx, amount, reduce_only) + #[cfg(feature = "enable-gpl")] + instructions::token_deposit(ctx, amount, reduce_only)?; + Ok(()) } pub fn token_deposit_into_existing( @@ -258,7 +304,9 @@ pub mod mango_v4 { amount: u64, reduce_only: bool, ) -> Result<()> { - instructions::token_deposit_into_existing(ctx, amount, reduce_only) + #[cfg(feature = "enable-gpl")] + instructions::token_deposit_into_existing(ctx, amount, reduce_only)?; + Ok(()) } pub fn token_withdraw( @@ -266,33 +314,43 @@ pub mod mango_v4 { amount: u64, allow_borrow: bool, ) -> Result<()> { - instructions::token_withdraw(ctx, amount, allow_borrow) + #[cfg(feature = "enable-gpl")] + instructions::token_withdraw(ctx, amount, allow_borrow)?; + Ok(()) } pub fn flash_loan_begin<'key, 'accounts, 'remaining, 'info>( ctx: Context<'key, 'accounts, 'remaining, 'info, FlashLoanBegin<'info>>, loan_amounts: Vec, ) -> Result<()> { - instructions::flash_loan_begin(ctx, loan_amounts) + #[cfg(feature = "enable-gpl")] + instructions::flash_loan_begin(ctx, loan_amounts)?; + Ok(()) } pub fn flash_loan_end<'key, 'accounts, 'remaining, 'info>( ctx: Context<'key, 'accounts, 'remaining, 'info, FlashLoanEnd<'info>>, flash_loan_type: FlashLoanType, ) -> Result<()> { - instructions::flash_loan_end(ctx, flash_loan_type) + #[cfg(feature = "enable-gpl")] + instructions::flash_loan_end(ctx, flash_loan_type)?; + Ok(()) } pub fn health_region_begin<'key, 'accounts, 'remaining, 'info>( ctx: Context<'key, 'accounts, 'remaining, 'info, HealthRegionBegin<'info>>, ) -> Result<()> { - instructions::health_region_begin(ctx) + #[cfg(feature = "enable-gpl")] + instructions::health_region_begin(ctx)?; + Ok(()) } pub fn health_region_end<'key, 'accounts, 'remaining, 'info>( ctx: Context<'key, 'accounts, 'remaining, 'info, HealthRegionEnd<'info>>, ) -> Result<()> { - instructions::health_region_end(ctx) + #[cfg(feature = "enable-gpl")] + instructions::health_region_end(ctx)?; + Ok(()) } /// @@ -304,14 +362,18 @@ pub mod mango_v4 { market_index: Serum3MarketIndex, name: String, ) -> Result<()> { - instructions::serum3_register_market(ctx, market_index, name) + #[cfg(feature = "enable-gpl")] + instructions::serum3_register_market(ctx, market_index, name)?; + Ok(()) } pub fn serum3_edit_market( ctx: Context, reduce_only_opt: Option, ) -> Result<()> { - instructions::serum3_edit_market(ctx, reduce_only_opt) + #[cfg(feature = "enable-gpl")] + instructions::serum3_edit_market(ctx, reduce_only_opt)?; + Ok(()) } // note: @@ -320,15 +382,21 @@ pub mod mango_v4 { // should be edited once set on creation pub fn serum3_deregister_market(ctx: Context) -> Result<()> { - instructions::serum3_deregister_market(ctx) + #[cfg(feature = "enable-gpl")] + instructions::serum3_deregister_market(ctx)?; + Ok(()) } pub fn serum3_create_open_orders(ctx: Context) -> Result<()> { - instructions::serum3_create_open_orders(ctx) + #[cfg(feature = "enable-gpl")] + instructions::serum3_create_open_orders(ctx)?; + Ok(()) } pub fn serum3_close_open_orders(ctx: Context) -> Result<()> { - instructions::serum3_close_open_orders(ctx) + #[cfg(feature = "enable-gpl")] + instructions::serum3_close_open_orders(ctx)?; + Ok(()) } #[allow(clippy::too_many_arguments)] @@ -343,6 +411,7 @@ pub mod mango_v4 { client_order_id: u64, limit: u16, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::serum3_place_order( ctx, side, @@ -353,7 +422,8 @@ pub mod mango_v4 { order_type, client_order_id, limit, - ) + )?; + Ok(()) } pub fn serum3_cancel_order( @@ -361,22 +431,30 @@ pub mod mango_v4 { side: Serum3Side, order_id: u128, ) -> Result<()> { - instructions::serum3_cancel_order(ctx, side, order_id) + #[cfg(feature = "enable-gpl")] + instructions::serum3_cancel_order(ctx, side, order_id)?; + Ok(()) } pub fn serum3_cancel_all_orders(ctx: Context, limit: u8) -> Result<()> { - instructions::serum3_cancel_all_orders(ctx, limit) + #[cfg(feature = "enable-gpl")] + instructions::serum3_cancel_all_orders(ctx, limit)?; + Ok(()) } pub fn serum3_settle_funds(ctx: Context) -> Result<()> { - instructions::serum3_settle_funds(ctx) + #[cfg(feature = "enable-gpl")] + instructions::serum3_settle_funds(ctx)?; + Ok(()) } pub fn serum3_liq_force_cancel_orders( ctx: Context, limit: u8, ) -> Result<()> { - instructions::serum3_liq_force_cancel_orders(ctx, limit) + #[cfg(feature = "enable-gpl")] + instructions::serum3_liq_force_cancel_orders(ctx, limit)?; + Ok(()) } // DEPRECATED: use token_liq_with_token @@ -386,12 +464,14 @@ pub mod mango_v4 { liab_token_index: TokenIndex, max_liab_transfer: I80F48, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::token_liq_with_token( ctx, asset_token_index, liab_token_index, max_liab_transfer, - ) + )?; + Ok(()) } // DEPRECATED: use token_liq_bankruptcy @@ -399,7 +479,9 @@ pub mod mango_v4 { ctx: Context, max_liab_transfer: I80F48, ) -> Result<()> { - instructions::token_liq_bankruptcy(ctx, max_liab_transfer) + #[cfg(feature = "enable-gpl")] + instructions::token_liq_bankruptcy(ctx, max_liab_transfer)?; + Ok(()) } pub fn token_liq_with_token( @@ -408,19 +490,23 @@ pub mod mango_v4 { liab_token_index: TokenIndex, max_liab_transfer: I80F48, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::token_liq_with_token( ctx, asset_token_index, liab_token_index, max_liab_transfer, - ) + )?; + Ok(()) } pub fn token_liq_bankruptcy( ctx: Context, max_liab_transfer: I80F48, ) -> Result<()> { - instructions::token_liq_bankruptcy(ctx, max_liab_transfer) + #[cfg(feature = "enable-gpl")] + instructions::token_liq_bankruptcy(ctx, max_liab_transfer)?; + Ok(()) } /// @@ -458,6 +544,7 @@ pub mod mango_v4 { settle_pnl_limit_window_size_ts: u64, positive_pnl_liquidation_fee: f32, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::perp_create_market( ctx, perp_market_index, @@ -487,7 +574,8 @@ pub mod mango_v4 { settle_pnl_limit_factor, settle_pnl_limit_window_size_ts, positive_pnl_liquidation_fee, - ) + )?; + Ok(()) } #[allow(clippy::too_many_arguments)] @@ -522,6 +610,7 @@ pub mod mango_v4 { reset_stable_price: bool, positive_pnl_liquidation_fee_opt: Option, ) -> Result<()> { + #[cfg(feature = "enable-gpl")] instructions::perp_edit_market( ctx, oracle_opt, @@ -552,15 +641,20 @@ pub mod mango_v4 { reduce_only_opt, reset_stable_price, positive_pnl_liquidation_fee_opt, - ) + )?; + Ok(()) } pub fn perp_close_market(ctx: Context) -> Result<()> { - instructions::perp_close_market(ctx) + #[cfg(feature = "enable-gpl")] + instructions::perp_close_market(ctx)?; + Ok(()) } pub fn perp_deactivate_position(ctx: Context) -> Result<()> { - instructions::perp_deactivate_position(ctx) + #[cfg(feature = "enable-gpl")] + instructions::perp_deactivate_position(ctx)?; + Ok(()) } #[allow(clippy::too_many_arguments)] @@ -619,7 +713,11 @@ pub mod mango_v4 { }, }, }; - instructions::perp_place_order(ctx, order, limit) + #[cfg(feature = "enable-gpl")] + return instructions::perp_place_order(ctx, order, limit); + + #[cfg(not(feature = "enable-gpl"))] + Ok(None) } #[allow(clippy::too_many_arguments)] @@ -686,22 +784,32 @@ pub mod mango_v4 { max_oracle_staleness_slots, }, }; - instructions::perp_place_order(ctx, order, limit) + #[cfg(feature = "enable-gpl")] + return instructions::perp_place_order(ctx, order, limit); + + #[cfg(not(feature = "enable-gpl"))] + Ok(None) } pub fn perp_cancel_order(ctx: Context, order_id: u128) -> Result<()> { - instructions::perp_cancel_order(ctx, order_id) + #[cfg(feature = "enable-gpl")] + instructions::perp_cancel_order(ctx, order_id)?; + Ok(()) } pub fn perp_cancel_order_by_client_order_id( ctx: Context, client_order_id: u64, ) -> Result<()> { - instructions::perp_cancel_order_by_client_order_id(ctx, client_order_id) + #[cfg(feature = "enable-gpl")] + instructions::perp_cancel_order_by_client_order_id(ctx, client_order_id)?; + Ok(()) } pub fn perp_cancel_all_orders(ctx: Context, limit: u8) -> Result<()> { - instructions::perp_cancel_all_orders(ctx, limit) + #[cfg(feature = "enable-gpl")] + instructions::perp_cancel_all_orders(ctx, limit)?; + Ok(()) } pub fn perp_cancel_all_orders_by_side( @@ -709,23 +817,33 @@ pub mod mango_v4 { side_option: Option, limit: u8, ) -> Result<()> { - instructions::perp_cancel_all_orders_by_side(ctx, side_option, limit) + #[cfg(feature = "enable-gpl")] + instructions::perp_cancel_all_orders_by_side(ctx, side_option, limit)?; + Ok(()) } pub fn perp_consume_events(ctx: Context, limit: usize) -> Result<()> { - instructions::perp_consume_events(ctx, limit) + #[cfg(feature = "enable-gpl")] + instructions::perp_consume_events(ctx, limit)?; + Ok(()) } pub fn perp_update_funding(ctx: Context) -> Result<()> { - instructions::perp_update_funding(ctx) + #[cfg(feature = "enable-gpl")] + instructions::perp_update_funding(ctx)?; + Ok(()) } pub fn perp_settle_pnl(ctx: Context) -> Result<()> { - instructions::perp_settle_pnl(ctx) + #[cfg(feature = "enable-gpl")] + instructions::perp_settle_pnl(ctx)?; + Ok(()) } pub fn perp_settle_fees(ctx: Context, max_settle_amount: u64) -> Result<()> { - instructions::perp_settle_fees(ctx, max_settle_amount) + #[cfg(feature = "enable-gpl")] + instructions::perp_settle_fees(ctx, max_settle_amount)?; + Ok(()) } pub fn perp_liq_base_or_positive_pnl( @@ -733,25 +851,33 @@ pub mod mango_v4 { max_base_transfer: i64, max_pnl_transfer: u64, ) -> Result<()> { - instructions::perp_liq_base_or_positive_pnl(ctx, max_base_transfer, max_pnl_transfer) + #[cfg(feature = "enable-gpl")] + instructions::perp_liq_base_or_positive_pnl(ctx, max_base_transfer, max_pnl_transfer)?; + Ok(()) } pub fn perp_liq_force_cancel_orders( ctx: Context, limit: u8, ) -> Result<()> { - instructions::perp_liq_force_cancel_orders(ctx, limit) + #[cfg(feature = "enable-gpl")] + instructions::perp_liq_force_cancel_orders(ctx, limit)?; + Ok(()) } pub fn perp_liq_negative_pnl_or_bankruptcy( ctx: Context, max_liab_transfer: u64, ) -> Result<()> { - instructions::perp_liq_negative_pnl_or_bankruptcy(ctx, max_liab_transfer) + #[cfg(feature = "enable-gpl")] + instructions::perp_liq_negative_pnl_or_bankruptcy(ctx, max_liab_transfer)?; + Ok(()) } pub fn alt_set(ctx: Context, index: u8) -> Result<()> { - instructions::alt_set(ctx, index) + #[cfg(feature = "enable-gpl")] + instructions::alt_set(ctx, index)?; + Ok(()) } pub fn alt_extend( @@ -759,11 +885,15 @@ pub mod mango_v4 { index: u8, new_addresses: Vec, ) -> Result<()> { - instructions::alt_extend(ctx, index, new_addresses) + #[cfg(feature = "enable-gpl")] + instructions::alt_extend(ctx, index, new_addresses)?; + Ok(()) } pub fn compute_account_data(ctx: Context) -> Result<()> { - instructions::compute_account_data(ctx) + #[cfg(feature = "enable-gpl")] + instructions::compute_account_data(ctx)?; + Ok(()) } /// @@ -771,7 +901,9 @@ pub mod mango_v4 { /// pub fn benchmark(ctx: Context) -> Result<()> { - instructions::benchmark(ctx) + #[cfg(feature = "enable-gpl")] + instructions::benchmark(ctx)?; + Ok(()) } } diff --git a/programs/mango-v4/src/logs.rs b/programs/mango-v4/src/logs.rs index e13ef5f61..5527cf059 100644 --- a/programs/mango-v4/src/logs.rs +++ b/programs/mango-v4/src/logs.rs @@ -1,5 +1,5 @@ use crate::{ - instructions::FlashLoanType, + accounts_ix::FlashLoanType, state::{PerpMarket, PerpPosition}, }; use anchor_lang::prelude::*; diff --git a/programs/mango-v4/tests/cases/test_liq_tokens.rs b/programs/mango-v4/tests/cases/test_liq_tokens.rs index 82cbcfc09..f1916a49b 100644 --- a/programs/mango-v4/tests/cases/test_liq_tokens.rs +++ b/programs/mango-v4/tests/cases/test_liq_tokens.rs @@ -1,6 +1,6 @@ use super::*; -use mango_v4::instructions::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; +use mango_v4::accounts_ix::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; #[tokio::test] async fn test_liq_tokens_force_cancel() -> Result<(), TransportError> { diff --git a/programs/mango-v4/tests/cases/test_margin_trade.rs b/programs/mango-v4/tests/cases/test_margin_trade.rs index b52e036b8..e89b88229 100644 --- a/programs/mango-v4/tests/cases/test_margin_trade.rs +++ b/programs/mango-v4/tests/cases/test_margin_trade.rs @@ -161,7 +161,7 @@ async fn test_margin_trade() -> Result<(), BanksClientError> { mango_token_vault: vault, target_token_account, // the test only accesses a single token: not a swap - flash_loan_type: mango_v4::instructions::FlashLoanType::Unknown, + flash_loan_type: mango_v4::accounts_ix::FlashLoanType::Unknown, }) .await; tx.send().await.unwrap(); diff --git a/programs/mango-v4/tests/cases/test_serum.rs b/programs/mango-v4/tests/cases/test_serum.rs index 8e1579220..08a4d9209 100644 --- a/programs/mango-v4/tests/cases/test_serum.rs +++ b/programs/mango-v4/tests/cases/test_serum.rs @@ -1,6 +1,6 @@ use super::*; -use mango_v4::instructions::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; +use mango_v4::accounts_ix::{Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side}; use std::sync::Arc; struct SerumOrderPlacer { diff --git a/programs/mango-v4/tests/program_test/mango_client.rs b/programs/mango-v4/tests/program_test/mango_client.rs index c1c13793f..28e40e962 100644 --- a/programs/mango-v4/tests/program_test/mango_client.rs +++ b/programs/mango-v4/tests/program_test/mango_client.rs @@ -5,7 +5,7 @@ use anchor_lang::solana_program::sysvar::{self, SysvarId}; use anchor_spl::token::{Token, TokenAccount}; use fixed::types::I80F48; use itertools::Itertools; -use mango_v4::instructions::{ +use mango_v4::accounts_ix::{ InterestRateParams, Serum3OrderType, Serum3SelfTradeBehavior, Serum3Side, }; use mango_v4::state::{MangoAccount, MangoAccountValue}; @@ -494,7 +494,7 @@ pub struct FlashLoanEndInstruction { pub mango_token_bank: Pubkey, pub mango_token_vault: Pubkey, pub target_token_account: Pubkey, - pub flash_loan_type: mango_v4::instructions::FlashLoanType, + pub flash_loan_type: mango_v4::accounts_ix::FlashLoanType, } #[async_trait::async_trait(?Send)] impl ClientInstruction for FlashLoanEndInstruction { diff --git a/programs/margin-trade/Cargo.toml b/programs/margin-trade/Cargo.toml index f235e953e..6f14e09e3 100644 --- a/programs/margin-trade/Cargo.toml +++ b/programs/margin-trade/Cargo.toml @@ -18,6 +18,6 @@ default = [] test-bpf = [] [dependencies] -anchor-lang = { path = "../../anchor/lang" } -anchor-spl = { path = "../../anchor/spl" } +anchor-lang = { path = "../../3rdparty/anchor/lang" } +anchor-spl = { path = "../../3rdparty/anchor/spl" } solana-program = "~1.14.9" diff --git a/release-to-devnet.sh b/release-to-devnet.sh index 9a1e2e0aa..47b06320b 100755 --- a/release-to-devnet.sh +++ b/release-to-devnet.sh @@ -6,7 +6,7 @@ WALLET_WITH_FUNDS=~/.config/solana/mango-mainnet-1.json PROGRAM_ID=4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg # build program, -cargo run -p anchor-cli -- build +cargo run -p anchor-cli -- build -- --features enable-gpl # patch types, which we want in rust, but anchor client doesn't support ./idl-fixup.sh diff --git a/release-to-mainnet.sh b/release-to-mainnet.sh index 55dfc9f93..a1bdc69d9 100755 --- a/release-to-mainnet.sh +++ b/release-to-mainnet.sh @@ -6,7 +6,7 @@ WALLET_WITH_FUNDS=~/.config/solana/mango-mainnet-1.json PROGRAM_ID=4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg # build program, -cargo run -p anchor-cli -- build +cargo run -p anchor-cli -- build -- --features enable-gpl # patch types, which we want in rust, but anchor client doesn't support ./idl-fixup.sh diff --git a/run-anchor-tests.sh b/run-anchor-tests.sh index 70304b141..c0971d022 100755 --- a/run-anchor-tests.sh +++ b/run-anchor-tests.sh @@ -3,6 +3,6 @@ # WALLET_WITH_FUNDS=~/.config/solana/mango-devnet.json # PROGRAM_ID=4MangoMjqJ2firMokCjjGgoK8d4MXcrgL7XJaL3w6fVg -cargo run -p anchor-cli -- build +cargo run -p anchor-cli -- build -- --features enable-gpl ./idl-fixup.sh -RUST_BACKTRACE=full cargo run -p anchor-cli -- test --skip-build \ No newline at end of file +RUST_BACKTRACE=full cargo run -p anchor-cli -- test --skip-build diff --git a/ts/client/src/mango_v4.ts b/ts/client/src/mango_v4.ts index b85248539..d9e38eba9 100644 --- a/ts/client/src/mango_v4.ts +++ b/ts/client/src/mango_v4.ts @@ -4864,6 +4864,38 @@ export type MangoV4 = { } ], "types": [ + { + "name": "InterestRateParams", + "type": { + "kind": "struct", + "fields": [ + { + "name": "util0", + "type": "f32" + }, + { + "name": "rate0", + "type": "f32" + }, + { + "name": "util1", + "type": "f32" + }, + { + "name": "rate1", + "type": "f32" + }, + { + "name": "maxRate", + "type": "f32" + }, + { + "name": "adjustmentFactor", + "type": "f32" + } + ] + } + }, { "name": "Equity", "type": { @@ -5172,38 +5204,6 @@ export type MangoV4 = { ] } }, - { - "name": "InterestRateParams", - "type": { - "kind": "struct", - "fields": [ - { - "name": "util0", - "type": "f32" - }, - { - "name": "rate0", - "type": "f32" - }, - { - "name": "util1", - "type": "f32" - }, - { - "name": "rate1", - "type": "f32" - }, - { - "name": "maxRate", - "type": "f32" - }, - { - "name": "adjustmentFactor", - "type": "f32" - } - ] - } - }, { "name": "FlashLoanTokenDetail", "type": { @@ -6392,39 +6392,6 @@ export type MangoV4 = { ] } }, - { - "name": "HealthType", - "docs": [ - "There are three types of health:", - "- initial health (\"init\"): users can only open new positions if it's >= 0", - "- maintenance health (\"maint\"): users get liquidated if it's < 0", - "- liquidation end health: once liquidation started (see being_liquidated), it", - "only stops once this is >= 0", - "", - "The ordering is", - "init health <= liquidation end health <= maint health", - "", - "The different health types are realized by using different weights and prices:", - "- init health: init weights with scaling, stable-price adjusted prices", - "- liq end health: init weights without scaling, oracle prices", - "- maint health: maint weights, oracle prices", - "" - ], - "type": { - "kind": "enum", - "variants": [ - { - "name": "Init" - }, - { - "name": "Maint" - }, - { - "name": "LiquidationEnd" - } - ] - } - }, { "name": "FlashLoanType", "type": { @@ -6490,6 +6457,39 @@ export type MangoV4 = { ] } }, + { + "name": "HealthType", + "docs": [ + "There are three types of health:", + "- initial health (\"init\"): users can only open new positions if it's >= 0", + "- maintenance health (\"maint\"): users get liquidated if it's < 0", + "- liquidation end health: once liquidation started (see being_liquidated), it", + "only stops once this is >= 0", + "", + "The ordering is", + "init health <= liquidation end health <= maint health", + "", + "The different health types are realized by using different weights and prices:", + "- init health: init weights with scaling, stable-price adjusted prices", + "- liq end health: init weights without scaling, oracle prices", + "- maint health: maint weights, oracle prices", + "" + ], + "type": { + "kind": "enum", + "variants": [ + { + "name": "Init" + }, + { + "name": "Maint" + }, + { + "name": "LiquidationEnd" + } + ] + } + }, { "name": "LoanOriginationFeeInstruction", "type": { @@ -13210,6 +13210,38 @@ export const IDL: MangoV4 = { } ], "types": [ + { + "name": "InterestRateParams", + "type": { + "kind": "struct", + "fields": [ + { + "name": "util0", + "type": "f32" + }, + { + "name": "rate0", + "type": "f32" + }, + { + "name": "util1", + "type": "f32" + }, + { + "name": "rate1", + "type": "f32" + }, + { + "name": "maxRate", + "type": "f32" + }, + { + "name": "adjustmentFactor", + "type": "f32" + } + ] + } + }, { "name": "Equity", "type": { @@ -13518,38 +13550,6 @@ export const IDL: MangoV4 = { ] } }, - { - "name": "InterestRateParams", - "type": { - "kind": "struct", - "fields": [ - { - "name": "util0", - "type": "f32" - }, - { - "name": "rate0", - "type": "f32" - }, - { - "name": "util1", - "type": "f32" - }, - { - "name": "rate1", - "type": "f32" - }, - { - "name": "maxRate", - "type": "f32" - }, - { - "name": "adjustmentFactor", - "type": "f32" - } - ] - } - }, { "name": "FlashLoanTokenDetail", "type": { @@ -14738,39 +14738,6 @@ export const IDL: MangoV4 = { ] } }, - { - "name": "HealthType", - "docs": [ - "There are three types of health:", - "- initial health (\"init\"): users can only open new positions if it's >= 0", - "- maintenance health (\"maint\"): users get liquidated if it's < 0", - "- liquidation end health: once liquidation started (see being_liquidated), it", - "only stops once this is >= 0", - "", - "The ordering is", - "init health <= liquidation end health <= maint health", - "", - "The different health types are realized by using different weights and prices:", - "- init health: init weights with scaling, stable-price adjusted prices", - "- liq end health: init weights without scaling, oracle prices", - "- maint health: maint weights, oracle prices", - "" - ], - "type": { - "kind": "enum", - "variants": [ - { - "name": "Init" - }, - { - "name": "Maint" - }, - { - "name": "LiquidationEnd" - } - ] - } - }, { "name": "FlashLoanType", "type": { @@ -14836,6 +14803,39 @@ export const IDL: MangoV4 = { ] } }, + { + "name": "HealthType", + "docs": [ + "There are three types of health:", + "- initial health (\"init\"): users can only open new positions if it's >= 0", + "- maintenance health (\"maint\"): users get liquidated if it's < 0", + "- liquidation end health: once liquidation started (see being_liquidated), it", + "only stops once this is >= 0", + "", + "The ordering is", + "init health <= liquidation end health <= maint health", + "", + "The different health types are realized by using different weights and prices:", + "- init health: init weights with scaling, stable-price adjusted prices", + "- liq end health: init weights without scaling, oracle prices", + "- maint health: maint weights, oracle prices", + "" + ], + "type": { + "kind": "enum", + "variants": [ + { + "name": "Init" + }, + { + "name": "Maint" + }, + { + "name": "LiquidationEnd" + } + ] + } + }, { "name": "LoanOriginationFeeInstruction", "type": { diff --git a/update-local-idl.sh b/update-local-idl.sh index 1a517375d..2e65574e2 100755 --- a/update-local-idl.sh +++ b/update-local-idl.sh @@ -3,7 +3,7 @@ set -e pipefail # build program, -cargo run -p anchor-cli -- build +cargo run -p anchor-cli -- build -- --features enable-gpl # patch types, which we want in rust, but anchor client doesn't support ./idl-fixup.sh