Skip to content

MP-3302. Oak no. 11. #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 28, 2023
Merged

MP-3302. Oak no. 11. #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
582ec4f
Validate slopes for ir model.
piobab Aug 25, 2023
0ade351
Update doc in ir model to be consistent with impl.
piobab Aug 25, 2023
cfa1c14
Update schema.
piobab Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions contracts/red-bank/tests/tests/test_admin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ fn init_asset() {
optimal_utilization_rate: Decimal::one(),
base: Decimal::percent(5),
slope_1: Decimal::zero(),
slope_2: Decimal::zero(),
slope_2: Decimal::one(),
};

let params = InitOrUpdateAssetParams {
Expand Down Expand Up @@ -269,6 +269,33 @@ fn init_asset() {
);
}

// init asset where slope_1 >= slope_2
{
let invalid_asset_params = InitOrUpdateAssetParams {
interest_rate_model: Some(InterestRateModel {
slope_1: Decimal::percent(10),
slope_2: Decimal::percent(10),
..ir_model
}),
..params
};
let msg = ExecuteMsg::InitAsset {
denom: "someasset".to_string(),
params: invalid_asset_params,
};
let info = mock_info("owner", &[]);
let error_res = execute(deps.as_mut(), env.clone(), info, msg).unwrap_err();
assert_eq!(
error_res,
ValidationError::InvalidParam {
param_name: "slope_1".to_string(),
invalid_value: "0.1".to_string(),
predicate: "< 0.1".to_string()
}
.into()
);
}

// owner is authorized
{
let msg = ExecuteMsg::InitAsset {
Expand Down Expand Up @@ -322,7 +349,7 @@ fn update_asset() {
optimal_utilization_rate: Decimal::one(),
base: Decimal::percent(5),
slope_1: Decimal::zero(),
slope_2: Decimal::zero(),
slope_2: Decimal::one(),
};

let params = InitOrUpdateAssetParams {
Expand Down Expand Up @@ -459,7 +486,7 @@ fn update_asset_with_new_interest_rate_model_params() {
optimal_utilization_rate: Decimal::one(),
base: Decimal::percent(5),
slope_1: Decimal::zero(),
slope_2: Decimal::zero(),
slope_2: Decimal::one(),
};

let params = InitOrUpdateAssetParams {
Expand Down
13 changes: 11 additions & 2 deletions packages/types/src/red_bank/interest_rate_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,24 @@ pub struct InterestRateModel {
pub optimal_utilization_rate: Decimal,
/// Base rate
pub base: Decimal,
/// Slope parameter for interest rate model function when utilization_rate < optimal_utilization_rate
/// Slope parameter for interest rate model function when utilization_rate <= optimal_utilization_rate
pub slope_1: Decimal,
/// Slope parameter for interest rate model function when utilization_rate >= optimal_utilization_rate
/// Slope parameter for interest rate model function when utilization_rate > optimal_utilization_rate
pub slope_2: Decimal,
}

impl InterestRateModel {
pub fn validate(&self) -> Result<(), ValidationError> {
decimal_param_le_one(self.optimal_utilization_rate, "optimal_utilization_rate")?;

if self.slope_1 >= self.slope_2 {
return Err(ValidationError::InvalidParam {
param_name: "slope_1".to_string(),
invalid_value: self.slope_1.to_string(),
predicate: format!("< {}", self.slope_2),
});
}

Ok(())
}

Expand Down
12 changes: 6 additions & 6 deletions schemas/mars-red-bank/mars-red-bank.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,15 +454,15 @@
]
},
"slope_1": {
"description": "Slope parameter for interest rate model function when utilization_rate < optimal_utilization_rate",
"description": "Slope parameter for interest rate model function when utilization_rate <= optimal_utilization_rate",
"allOf": [
{
"$ref": "#/definitions/Decimal"
}
]
},
"slope_2": {
"description": "Slope parameter for interest rate model function when utilization_rate >= optimal_utilization_rate",
"description": "Slope parameter for interest rate model function when utilization_rate > optimal_utilization_rate",
"allOf": [
{
"$ref": "#/definitions/Decimal"
Expand Down Expand Up @@ -1146,15 +1146,15 @@
]
},
"slope_1": {
"description": "Slope parameter for interest rate model function when utilization_rate < optimal_utilization_rate",
"description": "Slope parameter for interest rate model function when utilization_rate <= optimal_utilization_rate",
"allOf": [
{
"$ref": "#/definitions/Decimal"
}
]
},
"slope_2": {
"description": "Slope parameter for interest rate model function when utilization_rate >= optimal_utilization_rate",
"description": "Slope parameter for interest rate model function when utilization_rate > optimal_utilization_rate",
"allOf": [
{
"$ref": "#/definitions/Decimal"
Expand Down Expand Up @@ -1208,15 +1208,15 @@
]
},
"slope_1": {
"description": "Slope parameter for interest rate model function when utilization_rate < optimal_utilization_rate",
"description": "Slope parameter for interest rate model function when utilization_rate <= optimal_utilization_rate",
"allOf": [
{
"$ref": "#/definitions/Decimal"
}
]
},
"slope_2": {
"description": "Slope parameter for interest rate model function when utilization_rate >= optimal_utilization_rate",
"description": "Slope parameter for interest rate model function when utilization_rate > optimal_utilization_rate",
"allOf": [
{
"$ref": "#/definitions/Decimal"
Expand Down