weETH withdrawal: Instant withdrawal with Fee + Implicit withdrawal fee handling

lib/BucketLimiter.sol

@@ -71,6 +71,11 @@ library BucketLimiter {
         return limit.remaining >= amount;
     }
 
+    function consumable(Limit memory limit) external view returns (uint64) {
+        _refill(limit);
+        return limit.remaining;
+    }
+
     /*
      * Consumes the given amount from the bucket, if there is sufficient capacity, and returns
      * whether the bucket had enough remaining capacity to consume the amount.
@@ -104,18 +109,22 @@ library BucketLimiter {
     }
 
     function _refill(Limit memory limit) internal view {
-        // We allow for overflow here, as the delta is resilient against it.
         uint64 now_ = uint64(block.timestamp);
-        uint64 delta;
+
+        if (now_ == limit.lastRefill) {
+            return;
+        }
+
+        uint256 delta;
         unchecked {
             delta = now_ - limit.lastRefill;
         }
-        uint64 tokens = delta * limit.refillRate;
-        uint64 newRemaining = limit.remaining + tokens;
+        uint256 tokens = delta * uint256(limit.refillRate);
+        uint256 newRemaining = uint256(limit.remaining) + tokens;
         if (newRemaining > limit.capacity) {
             limit.remaining = limit.capacity;
         } else {
-            limit.remaining = newRemaining;
+            limit.remaining = uint64(newRemaining);
         }
         limit.lastRefill = now_;
     }
@@ -157,4 +166,4 @@ library BucketLimiter {
         refill(limit);
         limit.remaining = remaining;
     }
-}
+}

script/deploys/DeployEtherFiRestaker.s.sol

@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+
+import "../../src/Liquifier.sol";
+import "../../src/EtherFiRestaker.sol";
+import "../../src/helpers/AddressProvider.sol";
+import "../../src/UUPSProxy.sol";
+import "@openzeppelin/contracts/utils/Strings.sol";
+
+contract Deploy is Script {
+    using Strings for string;
+
+    UUPSProxy public liquifierProxy;
+
+    Liquifier public liquifierInstance;
+
+    AddressProvider public addressProvider;
+
+    address admin;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        address addressProviderAddress = vm.envAddress("CONTRACT_REGISTRY");
+        addressProvider = AddressProvider(addressProviderAddress);
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        EtherFiRestaker restaker = EtherFiRestaker(payable(new UUPSProxy(payable(new EtherFiRestaker()), "")));
+        restaker.initialize(
+            addressProvider.getContractAddress("LiquidityPool"),
+            addressProvider.getContractAddress("Liquifier")
+        );
+
+        new Liquifier();
+
+        // addressProvider.addContract(address(liquifierInstance), "Liquifier");
+
+        vm.stopBroadcast();
+    }
+}

script/deploys/DeployEtherFiWithdrawalBuffer.s.sol

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+
+import "@openzeppelin/contracts/utils/Strings.sol";
+
+import "../../src/Liquifier.sol";
+import "../../src/EtherFiRestaker.sol";
+import "../../src/helpers/AddressProvider.sol";
+import "../../src/UUPSProxy.sol";
+import "../../src/EtherFiRedemptionManager.sol";
+
+
+contract Deploy is Script {
+    using Strings for string;
+    AddressProvider public addressProvider;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        address addressProviderAddress = vm.envAddress("CONTRACT_REGISTRY");
+        addressProvider = AddressProvider(addressProviderAddress);
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        EtherFiRedemptionManager impl = new EtherFiRedemptionManager(
+            addressProvider.getContractAddress("LiquidityPool"), 
+            addressProvider.getContractAddress("EETH"), 
+            addressProvider.getContractAddress("WeETH"), 
+            0x0c83EAe1FE72c390A02E426572854931EefF93BA, // protocol safe
+            0x1d3Af47C1607A2EF33033693A9989D1d1013BB50 // role registry
+        );
+        UUPSProxy proxy = new UUPSProxy(payable(impl), "");
+
+        EtherFiRedemptionManager instance = EtherFiRedemptionManager(payable(proxy));
+        instance.initialize(10_00, 1_00, 1_00, 5 ether, 0.001 ether);
+
+        vm.stopBroadcast();
+    }
+}

script/deploys/DeployPhaseTwo.s.sol

@@ -81,7 +81,7 @@ contract DeployPhaseTwoScript is Script {
         }
         retrieve_contract_addresses();
 
-        withdrawRequestNftImplementation = new WithdrawRequestNFT();
+        withdrawRequestNftImplementation = new WithdrawRequestNFT(address(0));
         withdrawRequestNftProxy = new UUPSProxy(address(withdrawRequestNftImplementation), "");
         withdrawRequestNftInstance = WithdrawRequestNFT(payable(withdrawRequestNftProxy));
 

script/specialized/weEth_withdrawal_v2.s.sol

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+import "test/TestSetup.sol";
+
+import "src/helpers/AddressProvider.sol";
+
+contract Upgrade is Script {
+
+    AddressProvider public addressProvider;
+    address public addressProviderAddress = 0x8487c5F8550E3C3e7734Fe7DCF77DB2B72E4A848;
+    address public roleRegistry = 0x1d3Af47C1607A2EF33033693A9989D1d1013BB50;
+    address public treasury = 0x0c83EAe1FE72c390A02E426572854931EefF93BA;
+    address public pauser = 0x9AF1298993DC1f397973C62A5D47a284CF76844D;
+
+    WithdrawRequestNFT withdrawRequestNFTInstance;
+    LiquidityPool liquidityPoolInstance;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        AddressProvider addressProvider = AddressProvider(addressProviderAddress);
+
+        withdrawRequestNFTInstance = WithdrawRequestNFT(payable(addressProvider.getContractAddress("WithdrawRequestNFT")));
+        liquidityPoolInstance = LiquidityPool(payable(addressProvider.getContractAddress("LiquidityPool")));
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        // deploy_upgrade();
+        // agg();
+        // handle_remainder();
+
+        vm.stopBroadcast();
+    }
+
+    function deploy_upgrade() internal {
+        UUPSProxy etherFiRedemptionManagerProxy = new UUPSProxy(address(new EtherFiRedemptionManager(
+            addressProvider.getContractAddress("LiquidityPool"), 
+            addressProvider.getContractAddress("EETH"), 
+            addressProvider.getContractAddress("WeETH"), 
+            treasury, 
+            roleRegistry)), "");
+        EtherFiRedemptionManager etherFiRedemptionManagerInstance = EtherFiRedemptionManager(payable(etherFiRedemptionManagerProxy));
+        etherFiRedemptionManagerInstance.initialize(10_00, 1_00, 1_00, 5 ether, 0.001 ether); // 10% fee split to treasury, 1% exit fee, 1% low watermark
+
+        withdrawRequestNFTInstance.upgradeTo(address(new WithdrawRequestNFT(treasury)));
+        withdrawRequestNFTInstance.initializeOnUpgrade(pauser, 50_00); // 50% fee split to treasury
+
+        liquidityPoolInstance.upgradeTo(address(new LiquidityPool()));
+        liquidityPoolInstance.initializeOnUpgradeWithRedemptionManager(address(etherFiRedemptionManagerInstance));
+    }
+
+    function agg() internal {
+        uint256 numToScanPerTx = 1024;
+        uint256 cnt = (withdrawRequestNFTInstance.nextRequestId() / numToScanPerTx) + 1;
+        console.log(cnt);
+        for (uint256 i = 0; i < cnt; i++) {
+            withdrawRequestNFTInstance.aggregateSumEEthShareAmount(numToScanPerTx);
+        }
+    }
+
+    function handle_remainder() internal {
+        withdrawRequestNFTInstance.updateAdmin(msg.sender, true);
+        withdrawRequestNFTInstance.unPauseContract();
+        uint256 remainder = withdrawRequestNFTInstance.getEEthRemainderAmount();
+        console.log(remainder);
+        withdrawRequestNFTInstance.handleRemainder(remainder);
+    }
+}

script/upgrades/WithdrawRequestNFTUpgradeScript.s.sol

@@ -20,7 +20,7 @@ contract WithdrawRequestNFTUpgrade is Script {
         vm.startBroadcast(deployerPrivateKey);
 
         WithdrawRequestNFT oracleInstance = WithdrawRequestNFT(proxyAddress);
-        WithdrawRequestNFT v2Implementation = new WithdrawRequestNFT();
+        WithdrawRequestNFT v2Implementation = new WithdrawRequestNFT(address(0));
 
         oracleInstance.upgradeTo(address(v2Implementation));