RsETH on Linea

.prettierignore

@@ -2,6 +2,7 @@
 *.js
 *.md
 *.yaml
+*.yml
 lib/
 !tasks/deploy/lib/
 target/

codegen/templates/deployers/HyperdriveCoreDeployer.sol.jinja

@@ -2,6 +2,7 @@
 pragma solidity 0.8.22;
 
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveCoreDeployer } from "../../interfaces/IHyperdriveCoreDeployer.sol";
 import { {{ name.capitalized }}Hyperdrive } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Hyperdrive.sol";
 
@@ -15,6 +16,8 @@ contract {{ name.capitalized }}HyperdriveCoreDeployer is IHyperdriveCoreDeployer
     /// @notice Deploys a Hyperdrive instance with the given parameters.
     /// @param __name The name of the Hyperdrive pool.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param _adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     /// @param _target0 The target0 address.
     /// @param _target1 The target1 address.
     /// @param _target2 The target2 address.
@@ -25,6 +28,7 @@ contract {{ name.capitalized }}HyperdriveCoreDeployer is IHyperdriveCoreDeployer
     function deployHyperdrive(
         string memory __name,
         IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController _adminController,
         bytes memory, // unused _extraData,
         address _target0,
         address _target1,
@@ -42,6 +46,7 @@ contract {{ name.capitalized }}HyperdriveCoreDeployer is IHyperdriveCoreDeployer
                 }(
                     __name,
                     _config,
+                    _adminController,
                     _target0,
                     _target1,
                     _target2,

codegen/templates/deployers/HyperdriveDeployerCoordinator.sol.jinja

@@ -3,6 +3,7 @@ pragma solidity 0.8.22;
 
 import { ERC20 } from "openzeppelin/token/ERC20/ERC20.sol";
 import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol";
+import { {{ name.capitalized }}Conversions } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Conversions.sol";
 import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
 import { I{{ name.capitalized }}Hyperdrive } from "../../interfaces/I{{ name.capitalized }}Hyperdrive.sol";
@@ -141,7 +142,7 @@ contract {{ name.capitalized }}HyperdriveDeployerCoordinator is HyperdriveDeploy
     function convertToBase(
         uint256 _shareAmount
     ) public view returns (uint256) {
-        // FIXME
+        return {{ name.capitalized }}Conversions.convertToBase(_shareAmount);
     }
 
     /// @notice Convert an amount of base to an amount of vault shares.
@@ -150,7 +151,7 @@ contract {{ name.capitalized }}HyperdriveDeployerCoordinator is HyperdriveDeploy
     function convertToShares(
         uint256 _baseAmount
     ) public view returns (uint256) {
-        // FIXME
+        return {{ name.capitalized }}Conversions.convertToShares(_baseAmount);
     }
 
 {% if contract.payable %}
@@ -167,23 +168,27 @@ contract {{ name.capitalized }}HyperdriveDeployerCoordinator is HyperdriveDeploy
     }
 {% endif %}
 
+    // FIXME: Update the extra data comment if the extra data isn't empty.
+    //
     /// @notice Checks the pool configuration to ensure that it is valid.
     /// @param _deployConfig The deploy configuration of the Hyperdrive pool.
+    /// @param _extraData The empty extra data.
     function _checkPoolConfig(
-        IHyperdrive.PoolDeployConfig memory _deployConfig
+        IHyperdrive.PoolDeployConfig memory _deployConfig,
+        bytes memory _extraData
     ) internal view override {
         // Perform the default checks.
-        super._checkPoolConfig(_deployConfig);
+        super._checkPoolConfig(_deployConfig, _extraData);
 
         // ****************************************************************
         // FIXME: Implement this for new instances.
         // Ensure that the vault shares token address is properly configured.
-        if (address(_deployConfig.vaultSharesToken) != address(VAULT_SHARES_TOKEN) {
+        if (address(_deployConfig.vaultSharesToken) != address(0)) {
             revert IHyperdriveDeployerCoordinator.InvalidVaultSharesToken();
         }
 
         // Ensure that the base token address is properly configured.
-        if (address(_deployConfig.baseToken) == address(0)) {
+        if (address(_deployConfig.baseToken) != address(0)) {
             revert IHyperdriveDeployerCoordinator.InvalidBaseToken();
         }
         // *****************************************************************

codegen/templates/deployers/Target0Deployer.sol.jinja

@@ -4,6 +4,7 @@ pragma solidity 0.8.22;
 import { {{ name.capitalized }}Target0 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target0.sol";
 import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";
 
 /// @author DELV
@@ -15,10 +16,13 @@ import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDep
 contract {{ name.capitalized }}Target0Deployer is IHyperdriveTargetDeployer {
     /// @notice Deploys a target0 instance with the given parameters.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param _adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     /// @param _salt The create2 salt used in the deployment.
     /// @return The address of the newly deployed {{ name.capitalized }}Target0 instance.
     function deployTarget(
         IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController _adminController,
         bytes memory, // unused _extraData
         bytes32 _salt
     ) external returns (address) {
@@ -28,7 +32,7 @@ contract {{ name.capitalized }}Target0Deployer is IHyperdriveTargetDeployer {
                 // front-running of deployments.
                 new {{ name.capitalized }}Target0{
                     salt: keccak256(abi.encode(msg.sender, _salt))
-                }(_config)
+                }(_config, _adminController)
             );
     }
 }

codegen/templates/deployers/Target1Deployer.sol.jinja

@@ -4,6 +4,7 @@ pragma solidity 0.8.22;
 import { {{ name.capitalized }}Target1 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target1.sol";
 import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";
 
 /// @author DELV
@@ -15,10 +16,13 @@ import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDep
 contract {{ name.capitalized }}Target1Deployer is IHyperdriveTargetDeployer {
     /// @notice Deploys a target1 instance with the given parameters.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param _adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     /// @param _salt The create2 salt used in the deployment.
     /// @return The address of the newly deployed {{ name.capitalized }}Target1 instance.
     function deployTarget(
         IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController _adminController,
         bytes memory, // unused _extraData
         bytes32 _salt
     ) external returns (address) {
@@ -28,7 +32,7 @@ contract {{ name.capitalized }}Target1Deployer is IHyperdriveTargetDeployer {
                 // front-running of deployments.
                 new {{ name.capitalized }}Target1{
                     salt: keccak256(abi.encode(msg.sender, _salt))
-                }(_config)
+                }(_config, _adminController)
             );
     }
 }

codegen/templates/deployers/Target2Deployer.sol.jinja

@@ -4,6 +4,7 @@ pragma solidity 0.8.22;
 import { {{ name.capitalized }}Target2 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target2.sol";
 import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";
 
 /// @author DELV
@@ -15,10 +16,13 @@ import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDep
 contract {{ name.capitalized }}Target2Deployer is IHyperdriveTargetDeployer {
     /// @notice Deploys a target2 instance with the given parameters.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param _adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     /// @param _salt The create2 salt used in the deployment.
     /// @return The address of the newly deployed {{ name.capitalized }}Target2 instance.
     function deployTarget(
         IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController _adminController,
         bytes memory, // unused  _extraData
         bytes32 _salt
     ) external returns (address) {
@@ -28,7 +32,7 @@ contract {{ name.capitalized }}Target2Deployer is IHyperdriveTargetDeployer {
                 // front-running of deployments.
                 new {{ name.capitalized }}Target2{
                     salt: keccak256(abi.encode(msg.sender, _salt))
-                }(_config)
+                }(_config, _adminController)
             );
     }
 }

codegen/templates/deployers/Target3Deployer.sol.jinja

@@ -4,6 +4,7 @@ pragma solidity 0.8.22;
 import { {{ name.capitalized }}Target3 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target3.sol";
 import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";
 
 /// @author DELV
@@ -15,10 +16,13 @@ import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDep
 contract {{ name.capitalized }}Target3Deployer is IHyperdriveTargetDeployer {
     /// @notice Deploys a target3 instance with the given parameters.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param _adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     /// @param _salt The create2 salt used in the deployment.
     /// @return The address of the newly deployed {{ name.capitalized }}Target3 instance.
     function deployTarget(
         IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController _adminController,
         bytes memory, // unused  _extraData
         bytes32 _salt
     ) external returns (address) {
@@ -28,7 +32,7 @@ contract {{ name.capitalized }}Target3Deployer is IHyperdriveTargetDeployer {
                 // front-running of deployments.
                 new {{ name.capitalized }}Target3{
                     salt: keccak256(abi.encode(msg.sender, _salt))
-                }(_config)
+                }(_config, _adminController)
             );
     }
 }

codegen/templates/deployers/Target4Deployer.sol.jinja

@@ -4,6 +4,7 @@ pragma solidity 0.8.22;
 import { {{ name.capitalized }}Target4 } from "../../instances/{{ name.lowercase }}/{{ name.capitalized }}Target4.sol";
 import { I{{ name.capitalized }} } from "../../interfaces/I{{ name.capitalized }}.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol";
 
 /// @author DELV
@@ -15,10 +16,13 @@ import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDep
 contract {{ name.capitalized }}Target4Deployer is IHyperdriveTargetDeployer {
     /// @notice Deploys a target4 instance with the given parameters.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param _adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     /// @param _salt The create2 salt used in the deployment.
     /// @return The address of the newly deployed {{ name.capitalized }}Target4 instance.
     function deployTarget(
         IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController _adminController,
         bytes memory, // unused  _extraData
         bytes32 _salt
     ) external returns (address) {
@@ -28,7 +32,7 @@ contract {{ name.capitalized }}Target4Deployer is IHyperdriveTargetDeployer {
                 // front-running of deployments.
                 new {{ name.capitalized }}Target4{
                     salt: keccak256(abi.encode(msg.sender, _salt))
-                }(_config)
+                }(_config, _adminController)
             );
     }
 }

codegen/templates/instances/Hyperdrive.sol.jinja

@@ -6,6 +6,7 @@ import { SafeERC20 } from "openzeppelin/token/ERC20/utils/SafeERC20.sol";
 import { Hyperdrive } from "../../external/Hyperdrive.sol";
 import { IERC20 } from "../../interfaces/IERC20.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 
 ///      ______  __                           _________      _____
@@ -60,6 +61,8 @@ contract {{ name.capitalized }}Hyperdrive is Hyperdrive, {{ name.capitalized }}B
     /// @notice Instantiates Hyperdrive with a {{ name.capitalized }} vault as the yield source.
     /// @param __name The pool's name.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param __adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     /// @param _target0 The target0 address.
     /// @param _target1 The target1 address.
     /// @param _target2 The target2 address.
@@ -68,6 +71,7 @@ contract {{ name.capitalized }}Hyperdrive is Hyperdrive, {{ name.capitalized }}B
     constructor(
         string memory __name,
         IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController __adminController,
         address _target0,
         address _target1,
         address _target2,
@@ -77,6 +81,7 @@ contract {{ name.capitalized }}Hyperdrive is Hyperdrive, {{ name.capitalized }}B
         Hyperdrive(
             __name,
             _config,
+            __adminController,
             _target0,
             _target1,
             _target2,

codegen/templates/instances/Target0.sol.jinja

@@ -3,6 +3,7 @@ pragma solidity 0.8.22;
 
 import { HyperdriveTarget0 } from "../../external/HyperdriveTarget0.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { {{ name.uppercase }}_HYPERDRIVE_KIND } from "../../libraries/Constants.sol";
 import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 
@@ -17,9 +18,12 @@ import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 contract {{ name.capitalized }}Target0 is HyperdriveTarget0, {{ name.capitalized }}Base {
     /// @notice Initializes the target0 contract.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param __adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     constructor(
-        IHyperdrive.PoolConfig memory _config
-    ) HyperdriveTarget0(_config) {}
+        IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController __adminController
+    ) HyperdriveTarget0(_config, __adminController) {}
 
     /// @notice Returns the instance's kind.
     /// @return The instance's kind.

codegen/templates/instances/Target1.sol.jinja

@@ -3,6 +3,7 @@ pragma solidity 0.8.22;
 
 import { HyperdriveTarget1 } from "../../external/HyperdriveTarget1.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 
 /// @author DELV
@@ -16,7 +17,10 @@ import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 contract {{ name.capitalized }}Target1 is HyperdriveTarget1, {{ name.capitalized }}Base {
     /// @notice Initializes the target1 contract.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param __adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     constructor(
-        IHyperdrive.PoolConfig memory _config
-    ) HyperdriveTarget1(_config) {}
+        IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController __adminController
+    ) HyperdriveTarget1(_config, __adminController) {}
 }

codegen/templates/instances/Target2.sol.jinja

@@ -3,6 +3,7 @@ pragma solidity 0.8.22;
 
 import { HyperdriveTarget2 } from "../../external/HyperdriveTarget2.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 
 /// @author DELV
@@ -16,7 +17,10 @@ import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 contract {{ name.capitalized }}Target2 is HyperdriveTarget2, {{ name.capitalized }}Base {
     /// @notice Initializes the target2 contract.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param __adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     constructor(
-        IHyperdrive.PoolConfig memory _config
-    ) HyperdriveTarget2(_config) {}
+        IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController __adminController
+    ) HyperdriveTarget2(_config, __adminController) {}
 }

codegen/templates/instances/Target3.sol.jinja

@@ -3,6 +3,7 @@ pragma solidity 0.8.22;
 
 import { HyperdriveTarget3 } from "../../external/HyperdriveTarget3.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 
 /// @author DELV
@@ -16,7 +17,10 @@ import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 contract {{ name.capitalized }}Target3 is HyperdriveTarget3, {{ name.capitalized }}Base {
     /// @notice Initializes the target3 contract.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param __adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     constructor(
-        IHyperdrive.PoolConfig memory _config
-    ) HyperdriveTarget3(_config) {}
+        IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController __adminController
+    ) HyperdriveTarget3(_config, __adminController) {}
 }

codegen/templates/instances/Target4.sol.jinja

@@ -3,6 +3,7 @@ pragma solidity 0.8.22;
 
 import { HyperdriveTarget4 } from "../../external/HyperdriveTarget4.sol";
 import { IHyperdrive } from "../../interfaces/IHyperdrive.sol";
+import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol";
 import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 
 /// @author DELV
@@ -16,7 +17,10 @@ import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol";
 contract {{ name.capitalized }}Target4 is HyperdriveTarget4, {{ name.capitalized }}Base {
     /// @notice Initializes the target4 contract.
     /// @param _config The configuration of the Hyperdrive pool.
+    /// @param __adminController The admin controller that will specify the
+    ///        admin parameters for this instance.
     constructor(
-        IHyperdrive.PoolConfig memory _config
-    ) HyperdriveTarget4(_config) {}
+        IHyperdrive.PoolConfig memory _config,
+        IHyperdriveAdminController __adminController
+    ) HyperdriveTarget4(_config, __adminController) {}
 }