Merge pull request #179 from blend-capital/constants

Constants
blend-capital · Jan 3, 2024 · a0ec8f1 · a0ec8f1
2 parents 78a4864 + 88a9440
commit a0ec8f1
Show file tree

Hide file tree

Showing 19 changed files with 200 additions and 156 deletions.
diff --git a/backstop/src/backstop/pool.rs b/backstop/src/backstop/pool.rs
@@ -86,7 +86,7 @@ pub fn require_pool_above_threshold(pool_backstop_data: &PoolBackstopData) -> bo
         .saturating_mul(bal_blnd)
         .saturating_mul(bal_usdc)
         .saturating_mul(SCALAR_7); // 10^7 * 10^7
-    saturating_pool_pc / threshold_pc >= 1_0000000
+    saturating_pool_pc / threshold_pc >= SCALAR_7
 }
 
 /// The pool's backstop balances

diff --git a/pool-factory/src/pool_factory.rs b/pool-factory/src/pool_factory.rs
@@ -7,6 +7,8 @@ use soroban_sdk::{
     Symbol, Val, Vec,
 };
 
+const SCALAR_9: u64 = 1_000_000_000;
+
 #[contract]
 pub struct PoolFactoryContract;
 
@@ -69,7 +71,7 @@ impl PoolFactory for PoolFactoryContract {
         let pool_init_meta = storage::get_pool_init_meta(&e);
 
         // verify backstop take rate is within [0,1) with 9 decimals
-        if backstop_take_rate >= 1_000_000_000 {
+        if backstop_take_rate >= SCALAR_9 {
             panic_with_error!(&e, PoolFactoryError::InvalidPoolInitArgs);
         }
 

diff --git a/pool/src/auctions/auction.rs b/pool/src/auctions/auction.rs
@@ -25,12 +25,12 @@ pub enum AuctionType {
 }
 
 impl AuctionType {
-    pub fn from_u32(value: u32) -> Self {
+    pub fn from_u32(e: &Env, value: u32) -> Self {
         match value {
             0 => AuctionType::UserLiquidation,
             1 => AuctionType::BadDebtAuction,
             2 => AuctionType::InterestAuction,
-            _ => panic!("internal error"),
+            _ => panic_with_error!(e, PoolError::BadRequest),
         }
     }
 }
@@ -54,7 +54,7 @@ pub struct AuctionData {
 /// If the auction is unable to be created
 pub fn create(e: &Env, auction_type: u32) -> AuctionData {
     let backstop = storage::get_backstop(e);
-    let auction_data = match AuctionType::from_u32(auction_type) {
+    let auction_data = match AuctionType::from_u32(e, auction_type) {
         AuctionType::UserLiquidation => {
             panic_with_error!(e, PoolError::BadRequest);
         }
@@ -131,7 +131,7 @@ pub fn fill(
 ) {
     let auction_data = storage::get_auction(e, &auction_type, user);
     let (to_fill_auction, remaining_auction) = scale_auction(e, &auction_data, percent_filled);
-    match AuctionType::from_u32(auction_type) {
+    match AuctionType::from_u32(e, auction_type) {
         AuctionType::UserLiquidation => {
             fill_user_liq_auction(e, pool, &to_fill_auction, user, filler_state)
         }

diff --git a/pool/src/auctions/user_liquidation_auction.rs b/pool/src/auctions/user_liquidation_auction.rs
@@ -52,7 +52,7 @@ pub fn create_user_liq_auction_data(
         .fixed_div_floor(position_data.liability_raw, oracle_scalar)
         .unwrap_optimized();
     let est_incentive = (SCALAR_7 - avg_cf.fixed_div_ceil(avg_lf, SCALAR_7).unwrap_optimized())
-        .fixed_div_ceil(2_0000000, SCALAR_7)
+        .fixed_div_ceil(2 * SCALAR_7, SCALAR_7)
         .unwrap_optimized()
         + SCALAR_7;
 
@@ -65,8 +65,8 @@ pub fn create_user_liq_auction_data(
     let mut est_withdrawn_collateral_pct = est_withdrawn_collateral
         .fixed_div_ceil(position_data.collateral_raw, oracle_scalar)
         .unwrap_optimized();
-    if est_withdrawn_collateral_pct > 1_0000000 {
-        est_withdrawn_collateral_pct = 1_0000000;
+    if est_withdrawn_collateral_pct > SCALAR_7 {
+        est_withdrawn_collateral_pct = SCALAR_7;
     }
 
     for (asset, amount) in user_state.positions.collateral.iter() {

diff --git a/pool/src/emissions/manager.rs b/pool/src/emissions/manager.rs
@@ -46,7 +46,7 @@ pub fn set_pool_emissions(e: &Env, res_emission_metadata: Vec<ReserveEmissionMet
         total_share += metadata.share;
     }
 
-    if total_share > 1_0000000 {
+    if total_share > SCALAR_7 as u64 {
         panic_with_error!(e, PoolError::BadRequest);
     }
 

diff --git a/pool/src/lib.rs b/pool/src/lib.rs
@@ -20,7 +20,7 @@ pub use auctions::{AuctionData, AuctionType};
 pub use contract::*;
 pub use emissions::ReserveEmissionMetadata;
 pub use errors::PoolError;
-pub use pool::{Positions, Request};
+pub use pool::{Positions, Request, RequestType};
 pub use storage::{
     AuctionKey, PoolConfig, PoolDataKey, PoolEmissionConfig, ReserveConfig, ReserveData,
     ReserveEmissionsConfig, ReserveEmissionsData, UserEmissionData, UserReserveKey,