Consolidate Instances on ERC4626

.gitmodules

@@ -12,3 +12,6 @@
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/transmissions11/solmate
+[submodule "lib/yield-daddy"]
+	path = lib/yield-daddy
+	url = https://github.com/timeless-fi/yield-daddy

README.md

@@ -39,6 +39,10 @@ practices and style, prettier is a Solidity formatter that checks for formatting
 and style, and cSpell is a spell checker. To run all three, run `yarn lint`.
 If you want to automatically format the code, run `yarn prettier`.
 
+## Yield Sources
+
+The current suggested way of integrating your yield source with hyperdrive is through the [ERC-4626 standard](https://eips.ethereum.org/EIPS/eip-4626) although accomodations can be made if this is not possible. Hyperdrive currently makes use of [Yield Daddy](https://github.com/timeless-fi/yield-daddy) to wrap many existing yield sources into this standard.
+
 # Disclaimer
 
 The language used in this codebase is for coding convenience only, and is not

contracts/src/factory/HyperdriveFactory.sol

@@ -195,6 +195,9 @@ abstract contract HyperdriveFactory {
     }
 
     /// @notice Deploys a copy of hyperdrive with the given params
+    /// @dev Function is declared payable to allow payable overrides
+    ///     for accepting Ether on initialization, but not supported
+    ///     by default within this instance.
     /// @param _config The configuration of the Hyperdrive pool.
     /// @param _extraData The extra data is used by some factories
     /// @param _contribution Base token to call init with
@@ -206,6 +209,9 @@ abstract contract HyperdriveFactory {
         uint256 _contribution,
         uint256 _apr
     ) public payable virtual returns (IHyperdrive) {
+        if (msg.value > 0) {
+            revert IHyperdrive.NonPayableInitialization();
+        }
         // Overwrite the governance and fees field of the config.
         _config.feeCollector = feeCollector;
         _config.governance = address(this);
@@ -230,35 +236,18 @@ abstract contract HyperdriveFactory {
             )
         );
 
-        // We only do ERC20 transfers when we deploy an ERC20 pool
-        if (address(_config.baseToken) != ETH) {
-            // Initialize the Hyperdrive instance.
-            _config.baseToken.transferFrom(
-                msg.sender,
-                address(this),
-                _contribution
-            );
-            if (
-                !_config.baseToken.approve(
-                    address(hyperdrive),
-                    type(uint256).max
-                )
-            ) {
-                revert IHyperdrive.ApprovalFailed();
-            }
-            hyperdrive.initialize(_contribution, _apr, msg.sender, true);
-        } else {
-            // Require the caller sent value
-            if (msg.value != _contribution) {
-                revert IHyperdrive.TransferFailed();
-            }
-            hyperdrive.initialize{ value: _contribution }(
-                _contribution,
-                _apr,
-                msg.sender,
-                true
-            );
+        // Initialize the Hyperdrive instance.
+        _config.baseToken.transferFrom(
+            msg.sender,
+            address(this),
+            _contribution
+        );
+        if (
+            !_config.baseToken.approve(address(hyperdrive), type(uint256).max)
+        ) {
+            revert IHyperdrive.ApprovalFailed();
         }
+        hyperdrive.initialize(_contribution, _apr, msg.sender, true);
 
         // Setup the pausers roles from the default array
         for (uint256 i = 0; i < defaultPausers.length; i++) {