fix gwx burned math and unlock test

waves-exchange · Aug 31, 2023 · efc2e47 · efc2e47
1 parent 141c8d2
commit efc2e47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/ride/boosting.ride b/ride/boosting.ride
@@ -703,10 +703,8 @@ func unlock(txIdStr: String) = {
     txIdOption
   )
 
-  let gWxAmountStart = fraction(userAmount, lockDuration, maxLockDuration)
-
   let gwxBurned = min([
-    fraction(t * blocksInPeriod, gWxAmountStart, maxLockDuration),
+    fraction(wxWithdrawable, lockDuration, maxLockDuration),
     gwxAmount
   ])
   let gwxRemaining = ensurePositive(gwxAmount - gwxBurned, "gwxRemaining")

diff --git a/test/components/boosting/contract/boosting.mjs b/test/components/boosting/contract/boosting.mjs
@@ -54,11 +54,11 @@ class Boosting {
   }
 
   calcGwxAmountBurned({
-    gwxAmountStart, gwxAmountPrev, passedPeriods,
+    wxWithdrawable, lockDuration, gwxAmountPrev,
   }) {
     const gwxBurned = Math.min(
       Math.floor(
-        (passedPeriods * this.blocksInPeriod * gwxAmountStart) / this.maxLockDuration,
+        (wxWithdrawable * lockDuration) / this.maxLockDuration,
       ),
       gwxAmountPrev,
     );

diff --git a/test/components/boosting/unlock.mjs b/test/components/boosting/unlock.mjs
@@ -85,13 +85,11 @@ describe('boosting: unlock.mjs', /** @this {MochaSuiteModified} */() => {
       lockDuration,
       passedPeriods,
     });
-    const gwxAmountStart = boosting.calcGwxAmountStart({
-      wxAmount: lockWxAmount,
-      duration: lockDuration,
-    });
     const gwxAmountPrev = lockParamsPrev.gwxAmount;
     const gwxBurned = boosting.calcGwxAmountBurned({
-      gwxAmountStart, gwxAmountPrev, passedPeriods,
+      wxWithdrawable,
+      lockDuration,
+      gwxAmountPrev,
     });
 
     expect(lockParams.wxClaimed).to.equal(wxWithdrawable, 'wxClaimed');