Skip to content

Fix: market deserialization error for interest and fees fields. #288

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 4 commits into from
Nov 12, 2025
Merged

Fix: market deserialization error for interest and fees fields. #288

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7bea008
Fix: market deserialization error for interest and fees fileds.
vitaliybezz Nov 10, 2025
1f38e43
Add test
vitaliybezz Nov 10, 2025
3712b00
Add test
vitaliybezz Nov 10, 2025
a21a45a
Add alias for interest instead of default
vitaliybezz Nov 11, 2025
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
19 changes: 19 additions & 0 deletions common/src/accumulator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ pub struct Accumulator<T: AssetClass> {
pub pending_estimate: FungibleAssetAmount<T>,
}

impl<T: AssetClass> Default for Accumulator<T> {
fn default() -> Self {
Self {
total: 0.into(),
fraction_as_u128_dividend: U128(0),
next_snapshot_index: 0,
pending_estimate: 0.into(),
}
}
}

impl<T: AssetClass> Accumulator<T> {
pub fn new(next_snapshot_index: u32) -> Self {
Self {
Expand Down Expand Up @@ -84,6 +95,14 @@ impl<T: AssetClass> AccumulationRecord<T> {
mod tests {
use super::*;

#[test]
fn default_accumulator() {
let a = Accumulator::<crate::asset::BorrowAsset>::default();

assert_eq!(a.get_total(), 0.into());
assert_eq!(a.get_next_snapshot_index(), 0);
}

#[test]
fn fraction() {
let mut a = Accumulator::<crate::asset::BorrowAsset>::new(1);
Expand Down
4 changes: 4 additions & 0 deletions common/src/borrow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,17 @@ pub enum LiquidationReason {
pub struct BorrowPosition {
pub started_at_block_timestamp_ms: Option<U64>,
pub collateral_asset_deposit: CollateralAssetAmount,
#[serde(default)]
borrow_asset_principal: BorrowAssetAmount,
#[serde(default)]
pub interest: Accumulator<BorrowAsset>,
#[serde(default)]
pub fees: BorrowAssetAmount,
#[serde(default)]
borrow_asset_in_flight: BorrowAssetAmount,
#[serde(default)]
collateral_asset_in_flight: CollateralAssetAmount,
#[serde(default)]
pub liquidation_lock: CollateralAssetAmount,
}

Expand Down
Loading