Mint/burn first handle Resubscribe and then finish Hub update

contracts/DiamondInit.sol

@@ -21,9 +21,9 @@ contract DiamondInit {
         uint256 mintFee;
         uint256 burnBuyerFee;
         uint256 burnOwnerFee;
-        uint256 transferFee;
-        uint256 interestFee;
-        uint256 yieldFee;
+        // uint256 transferFee;
+        // uint256 interestFee;
+        // uint256 yieldFee;
         address diamond;
         IVaultRegistry vaultRegistry;
         IMigrationRegistry migrationRegistry;
@@ -48,9 +48,9 @@ contract DiamondInit {
         s.mintFee = _args.mintFee;
         s.burnBuyerFee = _args.burnBuyerFee;
         s.burnOwnerFee = _args.burnOwnerFee;
-        s.transferFee = _args.transferFee;
-        s.interestFee = _args.interestFee;
-        s.yieldFee = _args.yieldFee;
+        // s.transferFee = _args.transferFee;
+        // s.interestFee = _args.interestFee;
+        // s.yieldFee = _args.yieldFee;
 
         s.MAX_REFUND_RATIO = 1e6;
         s.PRECISION = 1e18;

contracts/facets/FeesFacet.sol

@@ -37,26 +37,26 @@ contract FeesFacet is IFeesFacet, Modifiers {
         emit SetBurnOwnerFee(rate);
     }
 
-    /// @inheritdoc IFeesFacet
-    function setTransferFee(uint256 rate) external override onlyFeesController {
-        require(rate != s.transferFee && rate < s.MAX_FEE, "out of range");
-        s.transferFee = rate;
-        emit SetTransferFee(rate);
-    }
+    // /// @inheritdoc IFeesFacet
+    // function setTransferFee(uint256 rate) external override onlyFeesController {
+    //     require(rate != s.transferFee && rate < s.MAX_FEE, "out of range");
+    //     s.transferFee = rate;
+    //     emit SetTransferFee(rate);
+    // }
 
-    /// @inheritdoc IFeesFacet
-    function setInterestFee(uint256 rate) external override onlyFeesController {
-        require(rate != s.interestFee && rate < s.MAX_FEE, "out of range");
-        s.interestFee = rate;
-        emit SetInterestFee(rate);
-    }
+    // /// @inheritdoc IFeesFacet
+    // function setInterestFee(uint256 rate) external override onlyFeesController {
+    //     require(rate != s.interestFee && rate < s.MAX_FEE, "out of range");
+    //     s.interestFee = rate;
+    //     emit SetInterestFee(rate);
+    // }
 
-    /// @inheritdoc IFeesFacet
-    function setYieldFee(uint256 rate) external override onlyFeesController {
-        require(rate != s.yieldFee && rate < s.MAX_FEE, "out of range");
-        s.yieldFee = rate;
-        emit SetYieldFee(rate);
-    }
+    // /// @inheritdoc IFeesFacet
+    // function setYieldFee(uint256 rate) external override onlyFeesController {
+    //     require(rate != s.yieldFee && rate < s.MAX_FEE, "out of range");
+    //     s.yieldFee = rate;
+    //     emit SetYieldFee(rate);
+    // }
 
     /// @inheritdoc IFeesFacet
     function mintFee() external view override returns (uint256) {
@@ -73,18 +73,18 @@ contract FeesFacet is IFeesFacet, Modifiers {
         return s.burnOwnerFee;
     }
 
-    /// @inheritdoc IFeesFacet
-    function transferFee() external view override returns (uint256) {
-        return s.transferFee;
-    }
+    // /// @inheritdoc IFeesFacet
+    // function transferFee() external view override returns (uint256) {
+    //     return s.transferFee;
+    // }
 
-    /// @inheritdoc IFeesFacet
-    function interestFee() external view override returns (uint256) {
-        return s.interestFee;
-    }
+    // /// @inheritdoc IFeesFacet
+    // function interestFee() external view override returns (uint256) {
+    //     return s.interestFee;
+    // }
 
-    /// @inheritdoc IFeesFacet
-    function yieldFee() external view override returns (uint256) {
-        return s.yieldFee;
-    }
+    // /// @inheritdoc IFeesFacet
+    // function yieldFee() external view override returns (uint256) {
+    //     return s.yieldFee;
+    // }
 }

contracts/interfaces/IFeesFacet.sol

@@ -40,17 +40,17 @@ interface IFeesFacet {
     /// @param rate New fee rate
     function setBurnOwnerFee(uint256 rate) external;
 
-    /// @notice Set Transfer fee for meTokens protocol
-    /// @param rate New fee rate
-    function setTransferFee(uint256 rate) external;
+    // /// @notice Set Transfer fee for meTokens protocol
+    // /// @param rate New fee rate
+    // function setTransferFee(uint256 rate) external;
 
-    /// @notice Set Interest fee for meTokens protocol
-    /// @param rate New fee rate
-    function setInterestFee(uint256 rate) external;
+    // /// @notice Set Interest fee for meTokens protocol
+    // /// @param rate New fee rate
+    // function setInterestFee(uint256 rate) external;
 
-    /// @notice Set Yield fee for meTokens protocol
-    /// @param rate New fee rate
-    function setYieldFee(uint256 rate) external;
+    // /// @notice Set Yield fee for meTokens protocol
+    // /// @param rate New fee rate
+    // function setYieldFee(uint256 rate) external;
 
     /// @notice Get Mint fee
     /// @return uint256 mintFee
@@ -64,15 +64,15 @@ interface IFeesFacet {
     /// @return uint256 burnOwnerFee
     function burnOwnerFee() external view returns (uint256);
 
-    /// @notice Get Transfer fee
-    /// @return uint256 transferFee
-    function transferFee() external view returns (uint256);
+    // /// @notice Get Transfer fee
+    // /// @return uint256 transferFee
+    // function transferFee() external view returns (uint256);
 
-    /// @notice Get Interest fee
-    /// @return uint256 interestFee
-    function interestFee() external view returns (uint256);
+    // /// @notice Get Interest fee
+    // /// @return uint256 interestFee
+    // function interestFee() external view returns (uint256);
 
-    /// @notice Get Yield fee
-    /// @return uint256 yieldFee
-    function yieldFee() external view returns (uint256);
+    // /// @notice Get Yield fee
+    // /// @return uint256 yieldFee
+    // function yieldFee() external view returns (uint256);
 }

contracts/libs/LibAppStorage.sol

@@ -14,9 +14,9 @@ struct AppStorage {
     uint256 mintFee;
     uint256 burnBuyerFee;
     uint256 burnOwnerFee;
-    uint256 transferFee;
-    uint256 interestFee;
-    uint256 yieldFee;
+    // uint256 transferFee;
+    // uint256 interestFee;
+    // uint256 yieldFee;
     // Constants
     uint256 MAX_REFUND_RATIO;
     uint256 PRECISION;

contracts/libs/LibFoundry.sol

@@ -110,17 +110,18 @@ library LibFoundry {
         LibMeToken.updateBalancePooled(true, meToken, amounts[2]);
 
         // Handling changes
-        if (hubInfo.updating && block.timestamp > hubInfo.endTime) {
-            LibHub.finishUpdate(meTokenInfo.hubId);
-        } else if (meTokenInfo.targetHubId != 0) {
+        if (meTokenInfo.targetHubId != 0) {
             if (block.timestamp > meTokenInfo.endTime) {
-                //hubInfo = s.hubs[meTokenInfo.targetHubId];
-                LibMeToken.finishResubscribe(meToken);
+                hubInfo = s.hubs[meTokenInfo.targetHubId];
+                meTokenInfo = LibMeToken.finishResubscribe(meToken);
             } else if (block.timestamp > meTokenInfo.startTime) {
                 // Handle migration actions if needed
                 IMigration(meTokenInfo.migration).poke(meToken);
             }
         }
+        if (hubInfo.updating && block.timestamp > hubInfo.endTime) {
+            LibHub.finishUpdate(meTokenInfo.hubId);
+        }
 
         return (asset, sender, amounts[0]);
     }
@@ -136,7 +137,6 @@ library LibFoundry {
     ) internal {
         (
             address asset,
-            address sender,
             uint256[2] memory amounts // 0-meTokensMinted 1-assetsDepositedAfterFees
         ) = _handleMintWithPermit(
                 meToken,
@@ -153,7 +153,7 @@ library LibFoundry {
         emit Mint(
             meToken,
             asset,
-            sender,
+            LibMeta.msgSender(),
             recipient,
             assetsDeposited,
             amounts[0]
@@ -202,18 +202,18 @@ library LibFoundry {
         HubInfo memory hubInfo = s.hubs[meTokenInfo.hubId];
 
         // Handling changes
-        if (hubInfo.updating && block.timestamp > hubInfo.endTime) {
-            LibHub.finishUpdate(meTokenInfo.hubId);
-        } else if (meTokenInfo.targetHubId != 0) {
+        if (meTokenInfo.targetHubId != 0) {
             if (block.timestamp > meTokenInfo.endTime) {
                 hubInfo = s.hubs[meTokenInfo.targetHubId];
                 meTokenInfo = LibMeToken.finishResubscribe(meToken);
             } else if (block.timestamp > meTokenInfo.startTime) {
                 // Handle migration actions if needed
                 IMigration(meTokenInfo.migration).poke(meToken);
-                meTokenInfo = s.meTokens[meToken];
             }
         }
+        if (hubInfo.updating && block.timestamp > hubInfo.endTime) {
+            LibHub.finishUpdate(meTokenInfo.hubId);
+        }
         // Calculate how many tokens are returned
         uint256 rawAssetsReturned = calculateRawAssetsReturned(
             meToken,
@@ -324,34 +324,33 @@ library LibFoundry {
             meTokenInfo.balancePooled
         );
 
-        // Logic for if we're updating curveInfo
-        if (hubInfo.reconfigure) {
-            // Must mean we're updating curveInfo
-            uint256 targetAssetsReturned = LibCurve.viewTargetAssetsReturned(
+        if (meTokenInfo.targetHubId != 0) {
+            // Calculate return assuming meToken is resubscribing
+            uint256 targetAssetsReturned = LibCurve.viewAssetsReturned(
                 meTokensBurned,
-                meTokenInfo.hubId,
+                meTokenInfo.targetHubId,
                 totalSupply,
                 meTokenInfo.balancePooled
             );
             rawAssetsReturned = LibWeightedAverage.calculate(
                 rawAssetsReturned,
                 targetAssetsReturned,
-                hubInfo.startTime,
-                hubInfo.endTime
+                meTokenInfo.startTime,
+                meTokenInfo.endTime
             );
-        } else if (meTokenInfo.targetHubId != 0) {
-            // Calculate return assuming meToken is resubscribing
-            uint256 targetAssetsReturned = LibCurve.viewAssetsReturned(
+        } else if (hubInfo.reconfigure) {
+            // Must mean we're updating curveInfo
+            uint256 targetAssetsReturned = LibCurve.viewTargetAssetsReturned(
                 meTokensBurned,
-                meTokenInfo.targetHubId,
+                meTokenInfo.hubId,
                 totalSupply,
                 meTokenInfo.balancePooled
             );
             rawAssetsReturned = LibWeightedAverage.calculate(
                 rawAssetsReturned,
                 targetAssetsReturned,
-                meTokenInfo.startTime,
-                meTokenInfo.endTime
+                hubInfo.startTime,
+                hubInfo.endTime
             );
         }
     }
@@ -385,26 +384,26 @@ library LibFoundry {
                     (rawAssetsReturned * hubInfo.refundRatio) /
                     s.MAX_REFUND_RATIO;
             } else {
-                if (hubInfo.targetRefundRatio > 0) {
-                    // Hub is updating
+                if (meTokenInfo.targetHubId != 0) {
+                    // meToken is resubscribing
                     actualAssetsReturned =
                         (rawAssetsReturned *
                             LibWeightedAverage.calculate(
                                 hubInfo.refundRatio,
-                                hubInfo.targetRefundRatio,
-                                hubInfo.startTime,
-                                hubInfo.endTime
+                                s.hubs[meTokenInfo.targetHubId].refundRatio,
+                                meTokenInfo.startTime,
+                                meTokenInfo.endTime
                             )) /
                         s.MAX_REFUND_RATIO;
                 } else {
-                    // meToken is resubscribing
+                    // Hub is updating
                     actualAssetsReturned =
                         (rawAssetsReturned *
                             LibWeightedAverage.calculate(
                                 hubInfo.refundRatio,
-                                s.hubs[meTokenInfo.targetHubId].refundRatio,
-                                meTokenInfo.startTime,
-                                meTokenInfo.endTime
+                                hubInfo.targetRefundRatio,
+                                hubInfo.startTime,
+                                hubInfo.endTime
                             )) /
                         s.MAX_REFUND_RATIO;
                 }
@@ -419,14 +418,7 @@ library LibFoundry {
         uint8 vSig,
         bytes32 rSig,
         bytes32 sSig
-    )
-        private
-        returns (
-            address asset,
-            address sender,
-            uint256[2] memory amounts
-        )
-    {
+    ) private returns (address asset, uint256[2] memory amounts) {
         AppStorage storage s = LibAppStorage.diamondStorage();
         // 0-meTokensMinted 1-fee 2-assetsDepositedAfterFees
 
@@ -450,7 +442,7 @@ library LibFoundry {
             rSig,
             sSig
         );
-        return (asset, sender, amounts);
+        return (asset, amounts);
     }
 
     function _handlingChangesWithPermit(
@@ -488,16 +480,20 @@ library LibFoundry {
             sSig
         );
         LibMeToken.updateBalancePooled(true, meToken, assetsDepositedAfterFees);
-        if (hubInfo.updating && block.timestamp > hubInfo.endTime) {
-            LibHub.finishUpdate(meTokenInfo.hubId);
-        } else if (meTokenInfo.targetHubId != 0) {
+
+        // Handling changes
+        if (meTokenInfo.targetHubId != 0) {
             if (block.timestamp > meTokenInfo.endTime) {
-                LibMeToken.finishResubscribe(meToken);
+                hubInfo = s.hubs[meTokenInfo.targetHubId];
+                meTokenInfo = LibMeToken.finishResubscribe(meToken);
             } else if (block.timestamp > meTokenInfo.startTime) {
                 // Handle migration actions if needed
                 IMigration(meTokenInfo.migration).poke(meToken);
             }
         }
+        if (hubInfo.updating && block.timestamp > hubInfo.endTime) {
+            LibHub.finishUpdate(meTokenInfo.hubId);
+        }
     }
 
     function _vaultWithdrawal(

contracts/libs/LibHub.sol

@@ -10,9 +10,6 @@ struct HubInfo {
     uint256 endCooldown;
     uint256 refundRatio;
     uint256 targetRefundRatio;
-    uint256 warmup;
-    uint256 duration;
-    uint256 cooldown;
     address owner;
     address vault;
     address asset;

contracts/mocks/DiamondInitMock.sol

@@ -15,8 +15,8 @@ contract DiamondInitMock {
 
     AppStorage internal s; // solhint-disable-line
 
-    function init(uint256 interestFee) external {
+    function init(uint256 mintFee) external {
         require(msg.sender == _owner, "!owner");
-        s.interestFee = interestFee;
+        s.mintFee = mintFee;
     }
 }