Ensure swaps don't use withdrawal queue liquidity (#23)

* Ensure swaps don't use WETH reserved for the withdrawal queue * Fund the withdrawal queue when WETH is swapped into the ARM * More refactoring of MultiLP deposit and swap not longer add to the withdrawal queue. Its only need on claim * Refactor withdrawal queue storage to optimize swap gas usage * Generated latest contract diagrams * Removed _postClaimHook as it's no longer needed * Added more Natspec * Add more Natspec * Changed the _postWithdrawHook to _postRequestRedeemHook * Generated latest contract diagrams * Minor change to constructor param
OriginProtocol · Sep 25, 2024 · ad1445d · ad1445d
1 parent 4c58acd
commit ad1445d
Show file tree

Hide file tree

Showing 13 changed files with 272 additions and 244 deletions.
diff --git a/docs/LidoFixedPriceMultiLpARMHierarchy.svg b/docs/LidoFixedPriceMultiLpARMHierarchy.svg
diff --git a/docs/LidoFixedPriceMultiLpARMSquashed.svg b/docs/LidoFixedPriceMultiLpARMSquashed.svg
diff --git a/docs/OEthARMHierarchy.svg b/docs/OEthARMHierarchy.svg
diff --git a/docs/OEthARMSquashed.svg b/docs/OEthARMSquashed.svg
diff --git a/src/contracts/AbstractARM.sol b/src/contracts/AbstractARM.sol
@@ -154,4 +154,14 @@ abstract contract AbstractARM is OwnableOperable {
     function _inDeadline(uint256 deadline) internal view {
         require(deadline >= block.timestamp, "ARM: Deadline expired");
     }
+
+    /// @dev Hook to transfer assets out of the ARM contract
+    function _transferAsset(address asset, address to, uint256 amount) internal virtual {
+        IERC20(asset).transfer(to, amount);
+    }
+
+    /// @dev Hook to transfer assets into the ARM contract
+    function _transferAssetFrom(address asset, address from, address to, uint256 amount) internal virtual {
+        IERC20(asset).transferFrom(from, to, amount);
+    }
 }