From 77d7650df98687080e1c0623758710b7ab42b143 Mon Sep 17 00:00:00 2001
From: Vladas Zakrevskis <146100@gmail.com>
Date: Thu, 26 Sep 2024 19:41:30 +0300
Subject: [PATCH] fix: penalty remainder (#111)

---
 contract/src/jar/model/common.rs |   6 ++++--
 contract/src/tests.rs            |   6 +++---
 res/sweat_jar.wasm               | Bin 619352 -> 619370 bytes
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/contract/src/jar/model/common.rs b/contract/src/jar/model/common.rs
index bbe455f1..82b1f453 100644
--- a/contract/src/jar/model/common.rs
+++ b/contract/src/jar/model/common.rs
@@ -60,11 +60,13 @@ impl JarLastVersion {
             "Applying penalty is not supported for score based jars"
         );
 
-        let current_interest = self.get_interest(&[], product, now).0;
+        let (interest, remainder) = self.get_interest(&[], product, now);
+
+        self.claim_remainder = remainder;
 
         self.cache = Some(JarCache {
             updated_at: now,
-            interest: current_interest,
+            interest,
         });
         self.is_penalty_applied = is_applied;
     }
diff --git a/contract/src/tests.rs b/contract/src/tests.rs
index 32efe19b..913e3353 100644
--- a/contract/src/tests.rs
+++ b/contract/src/tests.rs
@@ -290,7 +290,7 @@ fn get_total_interest_for_premium_with_multiple_penalties_applied() {
     context.set_block_timestamp_in_ms(3_700_000);
 
     let interest = context.contract().get_total_interest(alice.clone()).amount.total.0;
-    assert_eq!(interest, 1_613_140_537_798_072_042);
+    assert_eq!(interest, 1_613_140_537_798_072_044);
 }
 
 #[test]
@@ -344,10 +344,10 @@ fn apply_penalty_in_batch() {
     context.set_block_timestamp_in_days(365);
 
     let interest = context.contract().get_total_interest(alice.clone()).amount.total.0;
-    assert_eq!(interest, 1_498_630_000);
+    assert_eq!(interest, 1_498_630_100);
 
     let interest = context.contract().get_total_interest(bob.clone()).amount.total.0;
-    assert_eq!(interest, 749_315_000);
+    assert_eq!(interest, 749_315_050);
 
     let alice_jars = context.contract().get_jars_for_account(alice);
     let bob_jars = context.contract().get_jars_for_account(bob);
diff --git a/res/sweat_jar.wasm b/res/sweat_jar.wasm
index 7e1772336993a8e5cf03e519b4a0d58838294ab4..c76b1d4da3f39bb9335d0e51d1e32380073160dd 100755
GIT binary patch
delta 273
zcmccdO!d_>)eXgbjCY$$_}WYO7=f4xh?#+yWqS!9tA;w;c19+~dgkeiOj!+_9XYZz
znHdyW6<9Qx1r*sp6oVqW0)rEyIWvO-g95WTvjmW0vSP>tQtal;910AM0$B>I5NS4Z
z=74r)GgcsG17h~=%w`-%D;R^OpIpb`oaoKKz`zN_4&nkpvltkn(fGMQz6ub-<ZFR!
z2_$|ikS&kI?*OuSk@$zF=dS1IXJncFcRj~<#<|nKZs4$HoHE^TBZoQTtnHZ_Io=-x
E00Vk7HUIzs

delta 258
zcmaF$O!dYy)eXgbjHjDR_}WYO7=f4xh?#+yWqS!9tA;wuQbs1m>4A?}M5b>sWtB73
zWM)ugRbX%w$WmZ&<j4YY&6yb#7!+8|nK^(IlNCcIkYYAxmQY}DVg$;yi<+?lF&hxG
zZx=P=I9kCNF#YyA4(CKq1_lOBAa)QJ0GhzS5Q)am2J%&a7$#p0WJ@6Nn}KY3Bz_x^
t&5Oi8IK6&7M?WLebp8z--x+65XWz(S%{Xbg^F|JH#u?kIH*&l`2mrJXGFAWp