@reserve-protocol/dtf-rebalance-lib 0.0.14 → 0.0.16

package/dist/open-auction.js

@@ -186,18 +186,24 @@ const getOpenAuction = (rebalance, _supply, _initialFolio = [], _targetBasket =
     if (portionBeingEjected.gte(1e-4)) {
         round = AuctionRound.EJECT;
         rebalanceTarget = progression.add(portionBeingEjected.mul(1.2)); // set rebalanceTarget to 20% more than needed to ensure ejection completes
-        if (rebalanceTarget.gt(numbers_1.ONE)) {
-            rebalanceTarget = numbers_1.ONE;
+        if (rebalanceTarget.gte(numbers_1.ONE)) {
+            rebalanceTarget = initialProgression.add(numbers_1.ONE.sub(initialProgression).mul(finalStageAt));
         }
     }
     else if (relativeProgression.lt(finalStageAt.sub(0.02))) {
         // wiggle room to prevent having to re-run an auction at the same stage after price movement
         round = AuctionRound.PROGRESS;
         rebalanceTarget = initialProgression.add(numbers_1.ONE.sub(initialProgression).mul(finalStageAt));
-        if (rebalanceTarget.gte(numbers_1.ONE)) {
+        if (rebalanceTarget.gt(numbers_1.ONE)) {
             throw new Error('something has gone very wrong');
         }
     }
+    if (rebalanceTarget.lt(progression)) {
+        rebalanceTarget = numbers_1.ONE;
+    }
+    else if (rebalanceTarget.eq(numbers_1.ONE)) {
+        round = AuctionRound.FINAL;
+    }
     if (logging) {
         console.log('rebalanceTarget', rebalanceTarget.toString());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reserve-protocol/dtf-rebalance-lib",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Rebalancing library for DTFs in typescript",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/open-auction.ts

@@ -281,21 +281,27 @@ export const getOpenAuction = (
   // make it an eject auction if there is 1 bps or more of value to eject
   if (portionBeingEjected.gte(1e-4)) {
     round = AuctionRound.EJECT
-    
+
     rebalanceTarget = progression.add(portionBeingEjected.mul(1.2)) // set rebalanceTarget to 20% more than needed to ensure ejection completes
-    if (rebalanceTarget.gt(ONE)) {
-      rebalanceTarget = ONE
-    }
-  } else if (relativeProgression.lt(finalStageAt.sub(0.02))) {
-    // wiggle room to prevent having to re-run an auction at the same stage after price movement
-    round = AuctionRound.PROGRESS
-    
-    rebalanceTarget = initialProgression.add(ONE.sub(initialProgression).mul(finalStageAt))
     if (rebalanceTarget.gte(ONE)) {
-      throw new Error('something has gone very wrong')
-    }
+      rebalanceTarget = initialProgression.add(ONE.sub(initialProgression).mul(finalStageAt))
+    } 
+  } else if (relativeProgression.lt(finalStageAt.sub(0.02))) {
+      // wiggle room to prevent having to re-run an auction at the same stage after price movement
+      round = AuctionRound.PROGRESS
+      
+      rebalanceTarget = initialProgression.add(ONE.sub(initialProgression).mul(finalStageAt))
+      if (rebalanceTarget.gt(ONE)) {
+        throw new Error('something has gone very wrong')
+      }
   }
   
+  if (rebalanceTarget.lt(progression)) {
+      rebalanceTarget = ONE
+  } else if (rebalanceTarget.eq(ONE)) {
+    round = AuctionRound.FINAL
+  }
+
   if (logging) {
     console.log('rebalanceTarget', rebalanceTarget.toString())
   }