Events & Linked Positions

common/src/accumulator.rs

@@ -5,15 +5,19 @@ use crate::asset::{AssetClass, FungibleAssetAmount};
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[near(serializers = [borsh, json])]
 pub struct Accumulator<T: AssetClass> {
-    pub(crate) total: FungibleAssetAmount<T>,
-    pub(crate) next_snapshot_index: u32,
+    total: FungibleAssetAmount<T>,
+    next_snapshot_index: u32,
+    #[borsh(skip)]
+    #[serde(default, skip_serializing_if = "FungibleAssetAmount::is_zero")]
+    pub pending_estimate: FungibleAssetAmount<T>,
 }
 
 impl<T: AssetClass> Accumulator<T> {
     pub fn new(next_snapshot_index: u32) -> Self {
         Self {
             total: 0.into(),
             next_snapshot_index,
+            pending_estimate: 0.into(),
         }
     }
 
@@ -25,6 +29,11 @@ impl<T: AssetClass> Accumulator<T> {
         self.total
     }
 
+    pub fn clear(&mut self, next_snapshot_index: u32) {
+        self.total = 0.into();
+        self.next_snapshot_index = next_snapshot_index;
+    }
+
     pub fn remove(&mut self, amount: FungibleAssetAmount<T>) -> Option<FungibleAssetAmount<T>> {
         self.total.split(amount)
     }

common/src/asset.rs

@@ -102,12 +102,12 @@ mod sealed {
 }
 pub trait AssetClass: sealed::Sealed + Copy + Clone {}
 
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Default, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[near(serializers = [borsh, json])]
 pub struct CollateralAsset;
 impl sealed::Sealed for CollateralAsset {}
 impl AssetClass for CollateralAsset {}
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Default, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[near(serializers = [borsh, json])]
 pub struct BorrowAsset;
 impl sealed::Sealed for BorrowAsset {}