Merge pull request #37 from vyper-protocol/feat/otc

Added method to fetch the otc state

Author: thegreat-vanderlinde

Cargo.lock

@@ -14,6 +14,8 @@ borsh = "0.9.3"
 vyper-core = { git = "https://github.com/vyper-protocol/vyper-core", branch = "dev", features = ["no-entrypoint"] }
 redeem-logic-forward = { git = "https://github.com/vyper-protocol/vyper-core", branch = "dev", features = ["no-entrypoint"] }
 rate-switchboard = { git = "https://github.com/vyper-protocol/vyper-core", branch = "dev", features = ["no-entrypoint"] }
+vyper-otc = { git = "https://github.com/vyper-protocol/vyper-otc", branch = "dev", features = ["no-entrypoint"] }
 console = "0.15.1"
 rust_decimal = "1.26"
-rust_decimal_macros = "1.26"
+rust_decimal_macros = "1.26"
+chrono = "0.4.23"

Cargo.toml

@@ -2,6 +2,7 @@ pub mod core_args;
 pub mod config_args;
 pub mod redeem_logic_plugin_args;
 pub mod rate_plugin_args;
+pub mod otc_args;
 use {
     core_args::CoreCommand,
     config_args::ConfigOptions,
@@ -12,7 +13,8 @@ use {
     clap::{
         Parser,
         Subcommand
-    }
+    },
+    otc_args::OtcCommand
 };
 
 
@@ -36,6 +38,8 @@ pub enum Vyper {
     /// Used to access redeem logic forward commands
     RedeemLogicForward(RedeemLogicForwardCommand),
     /// Used to access rate-switchboard plugin
-    RateSwitchboard(RateSwitchboardCommand)
+    RateSwitchboard(RateSwitchboardCommand),
+    /// Used to access the vyper otc commands
+    Otc(OtcCommand)
 }
 

src/args.rs

@@ -0,0 +1,31 @@
+use {
+    clap::{
+        Args,
+        Subcommand
+    },
+    anchor_client:: {
+        solana_sdk::{
+            pubkey::Pubkey
+        }
+    }
+};
+
+
+
+#[derive(Debug, Args)]
+pub struct OtcCommand {
+    #[clap(subcommand)]
+    pub command : OtcSubcommand
+}
+
+#[derive(Debug, Subcommand)]
+pub enum OtcSubcommand {
+    /// Gets the configuration of otc from given public key.
+    Fetch(FetchOtc),
+}
+
+#[derive(Debug, Args)]
+pub struct FetchOtc {
+    /// Public key of otc state.
+    pub state_id: Pubkey
+}

src/args/otc_args.rs

@@ -14,6 +14,7 @@ use {
     ops::rate_plugin_ops::{
         rate_switchboard_ops::handle_rate_switchboard_command
     },
+    ops::otc_ops::handle_otc_command,
     anchor_client::{
         Client,
         Cluster,
@@ -34,6 +35,7 @@ use {
 const VYPER_CORE_ID: &str = "vyPErCcGJKQQBeeQ59gXcWrDyU4vBrq8qQfacwmsAsp";
 const REDEEM_LOGIC_FORWARD: &str = "BrpV1re8MshA8qskKVxcEG8zXG3vf2uLX6myeTKAyhsK";
 const RATE_SWITCHBOARD: &str  = "2hGXiH1oEQwjCXRx8bNdHTi49ScZp7Mj2bxcjxtULKe1";
+const OTC: &str = "8aHSkExY28qCvg4gnTLU7y1Ev6HnpJ1NxuWb9XtEesVt";
 
 fn main() {
 
@@ -102,5 +104,12 @@ fn main() {
              // command handler
              handle_rate_switchboard_command(rate_switchboard_command, &rate_switchboard_program);
         }
+        Vyper::Otc(otc_command) => {
+            // otc program
+            let otc_program_id: Pubkey = Pubkey::new(&bs58::decode(&OTC).into_vec().expect("Invalid otc program id"));
+            let otc_program = client.program(otc_program_id);
+            // command handler
+            handle_otc_command(otc_command, &otc_program);
+        }
     }
 }

src/main.rs

@@ -1,3 +1,4 @@
 pub mod core_ops;
 pub mod redeem_logic_plugin_ops;
-pub mod rate_plugin_ops;
+pub mod rate_plugin_ops;
+pub mod otc_ops;

src/ops.rs

@@ -0,0 +1,65 @@
+use {
+    std::process::exit,
+    crate::args::otc_args,
+    crate::utils::{
+        println_name_value,
+        println_version,
+        println_error,
+        println_date,
+        println_beneficiary_value
+    },
+    otc_args:: {
+        OtcCommand,
+        OtcSubcommand
+    },
+    anchor_client::{
+        Program,
+        ClientError
+    },
+    vyper_otc::state::OtcState,
+    console::style
+};
+
+
+
+pub fn handle_otc_command(otc_command: OtcCommand, program: &Program) {
+    let command = otc_command.command;
+    match command {
+        OtcSubcommand::Fetch(fetch_otc) => {
+            let account:Result<OtcState,ClientError> = program.account(fetch_otc.state_id);
+            let account = match account {
+                Ok(otc_state) => otc_state,
+                Err(err) => {
+                    match err {
+                        ClientError::AccountNotFound => println_error("Could not otc state with given public key"),
+                        ClientError::AnchorError(err) => println!("{} : {}",style("error").red().bold(),err),
+                        ClientError::ProgramError(err) => println!("{} : {}",style("error").red().bold(),err),
+                        ClientError::SolanaClientError(err) => println!("{} : {}",style("error").red().bold(),err),
+                        ClientError::SolanaClientPubsubError(err) => println!("{} : {}",style("error").red().bold(),err),
+                        ClientError::LogParseError(err)=> println_error(&err)
+                    }
+                    exit(1);
+                }
+            };
+            println_date("created", &account.created);
+            println_date("deposit start", &account.deposit_start);
+            println_date("deposit end", &account.deposit_end);
+            println_date("settle start", &account.settle_start);
+            println_name_value("settle executed", &account.settle_executed);
+            println_name_value("junior deposit amount", &account.junior_deposit_amount);
+            println_name_value("senior deposit amount", &account.senior_deposit_amount);
+            println_beneficiary_value("junior side beneficiary", &account.junior_side_beneficiary);
+            println_beneficiary_value("senior side beneficiary", &account.senior_side_beneficiary);
+            println_name_value("vyper tranche config", &account.vyper_tranche_config);
+            println_name_value("vyper core", &account.vyper_core);
+            println_name_value("senior reserve token account", &account.otc_senior_reserve_token_account);
+            println_name_value("junior reserve token account", &account.otc_junior_reserve_token_account);
+            println_name_value("senior tranche token account", &account.otc_senior_tranche_token_account);
+            println_name_value("junior tranche token account", &account.otc_junior_tranche_token_account);
+            println_name_value("otc authority",&account.otc_authority);
+            println_name_value("authority seed", &account.authority_seed);
+            println_name_value("authority bump", &account.authority_bump);
+            println_version("version",&account.version);
+        }
+    }
+}

src/ops/otc_ops.rs

@@ -13,6 +13,7 @@ use anchor_client::solana_sdk::{
 
 use std::process::exit;
 use solana_cli_config::{CONFIG_FILE, Config};
+use chrono::prelude::*;
 
 
 
@@ -108,3 +109,30 @@ pub fn println_switchboard_aggregators(name: &str, aggregators: &[Option<Pubkey>
     println!("]")
 }
 
+pub fn println_date(name: &str, timestamp: &i64) {
+    let naive = NaiveDateTime::from_timestamp_opt(*timestamp, 0).unwrap();
+    let datetime: DateTime<Utc> = DateTime::from_utc(naive, Utc);
+    let newdate = datetime.format("%Y-%m-%d %H:%M").to_string();
+    println!(
+        "{} : {:?} ",
+        style(name).bold(),
+        style(newdate),
+    );
+}
+
+pub fn println_beneficiary_value(name: &str, value: &Option<Pubkey>) {
+    if !value.is_none() {
+        println!(
+            "{} : {:?} ",
+            style(name).bold(),
+            style(value.unwrap()),
+        );
+    } else {
+        println!(
+            "{} : {:?} ",
+            style(name).bold(),
+            style("None"),
+        );
+    }
+}
+