From 2ad2a9fa4e2d09c3088efea520a88f14f24ce3a6 Mon Sep 17 00:00:00 2001 From: Alex Towle Date: Wed, 9 Oct 2024 06:43:02 -1000 Subject: [PATCH] Addressed review feedback from @jrhea --- codegen/templates/instances/Target4.sol.jinja | 2 +- .../stk-well/StkWellTarget0Deployer.sol | 1 - .../stk-well/StkWellTarget1Deployer.sol | 1 - .../stk-well/StkWellTarget2Deployer.sol | 1 - .../stk-well/StkWellTarget3Deployer.sol | 1 - .../stk-well/StkWellTarget4Deployer.sol | 1 - contracts/src/instances/corn/CornTarget4.sol | 2 +- .../instances/rseth-linea/RsETHLineaTarget4.sol | 2 +- .../staking-usds/StakingUSDSTarget4.sol | 2 +- .../src/instances/stk-well/StkWellTarget4.sol | 2 +- contracts/src/interfaces/IStkWell.sol | 16 ---------------- test/utils/InstanceTest.sol | 3 --- 12 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 contracts/src/interfaces/IStkWell.sol diff --git a/codegen/templates/instances/Target4.sol.jinja b/codegen/templates/instances/Target4.sol.jinja index 9fd711824..3ba779535 100644 --- a/codegen/templates/instances/Target4.sol.jinja +++ b/codegen/templates/instances/Target4.sol.jinja @@ -8,7 +8,7 @@ import { {{ name.capitalized }}Base } from "./{{ name.capitalized }}Base.sol"; /// @author DELV /// @title {{ name.capitalized }}Target4 -/// @notice {{ name.capitalized }}Hyperdrive's target3 logic contract. This contract contains +/// @notice {{ name.capitalized }}Hyperdrive's target4 logic contract. This contract contains /// several stateful functions that couldn't fit into the Hyperdrive /// contract. /// @custom:disclaimer The language used in this code is for coding convenience diff --git a/contracts/src/deployers/stk-well/StkWellTarget0Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget0Deployer.sol index 7c97594c0..74b75bb79 100644 --- a/contracts/src/deployers/stk-well/StkWellTarget0Deployer.sol +++ b/contracts/src/deployers/stk-well/StkWellTarget0Deployer.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.22; import { StkWellTarget0 } from "../../instances/stk-well/StkWellTarget0.sol"; -import { IStkWell } from "../../interfaces/IStkWell.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol"; import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol"; diff --git a/contracts/src/deployers/stk-well/StkWellTarget1Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget1Deployer.sol index 8243c84f5..c73a625e3 100644 --- a/contracts/src/deployers/stk-well/StkWellTarget1Deployer.sol +++ b/contracts/src/deployers/stk-well/StkWellTarget1Deployer.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.22; import { StkWellTarget1 } from "../../instances/stk-well/StkWellTarget1.sol"; -import { IStkWell } from "../../interfaces/IStkWell.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol"; import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol"; diff --git a/contracts/src/deployers/stk-well/StkWellTarget2Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget2Deployer.sol index a1a462498..a09b57b8b 100644 --- a/contracts/src/deployers/stk-well/StkWellTarget2Deployer.sol +++ b/contracts/src/deployers/stk-well/StkWellTarget2Deployer.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.22; import { StkWellTarget2 } from "../../instances/stk-well/StkWellTarget2.sol"; -import { IStkWell } from "../../interfaces/IStkWell.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol"; import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol"; diff --git a/contracts/src/deployers/stk-well/StkWellTarget3Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget3Deployer.sol index e2fd34811..faab8f400 100644 --- a/contracts/src/deployers/stk-well/StkWellTarget3Deployer.sol +++ b/contracts/src/deployers/stk-well/StkWellTarget3Deployer.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.22; import { StkWellTarget3 } from "../../instances/stk-well/StkWellTarget3.sol"; -import { IStkWell } from "../../interfaces/IStkWell.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol"; import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol"; diff --git a/contracts/src/deployers/stk-well/StkWellTarget4Deployer.sol b/contracts/src/deployers/stk-well/StkWellTarget4Deployer.sol index 0d259e351..51af05b2f 100644 --- a/contracts/src/deployers/stk-well/StkWellTarget4Deployer.sol +++ b/contracts/src/deployers/stk-well/StkWellTarget4Deployer.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.22; import { StkWellTarget4 } from "../../instances/stk-well/StkWellTarget4.sol"; -import { IStkWell } from "../../interfaces/IStkWell.sol"; import { IHyperdrive } from "../../interfaces/IHyperdrive.sol"; import { IHyperdriveAdminController } from "../../interfaces/IHyperdriveAdminController.sol"; import { IHyperdriveTargetDeployer } from "../../interfaces/IHyperdriveTargetDeployer.sol"; diff --git a/contracts/src/instances/corn/CornTarget4.sol b/contracts/src/instances/corn/CornTarget4.sol index 90b92477d..0d234171f 100644 --- a/contracts/src/instances/corn/CornTarget4.sol +++ b/contracts/src/instances/corn/CornTarget4.sol @@ -9,7 +9,7 @@ import { CornBase } from "./CornBase.sol"; /// @author DELV /// @title CornTarget4 -/// @notice CornHyperdrive's target3 logic contract. This contract contains +/// @notice CornHyperdrive's target4 logic contract. This contract contains /// several stateful functions that couldn't fit into the Hyperdrive /// contract. /// @custom:disclaimer The language used in this code is for coding convenience diff --git a/contracts/src/instances/rseth-linea/RsETHLineaTarget4.sol b/contracts/src/instances/rseth-linea/RsETHLineaTarget4.sol index b8aa93157..61e727871 100644 --- a/contracts/src/instances/rseth-linea/RsETHLineaTarget4.sol +++ b/contracts/src/instances/rseth-linea/RsETHLineaTarget4.sol @@ -9,7 +9,7 @@ import { RsETHLineaBase } from "./RsETHLineaBase.sol"; /// @author DELV /// @title RsETHLineaTarget4 -/// @notice RsETHLineaHyperdrive's target3 logic contract. This contract contains +/// @notice RsETHLineaHyperdrive's target4 logic contract. This contract contains /// several stateful functions that couldn't fit into the Hyperdrive /// contract. /// @custom:disclaimer The language used in this code is for coding convenience diff --git a/contracts/src/instances/staking-usds/StakingUSDSTarget4.sol b/contracts/src/instances/staking-usds/StakingUSDSTarget4.sol index 021d19af5..b24a183e7 100644 --- a/contracts/src/instances/staking-usds/StakingUSDSTarget4.sol +++ b/contracts/src/instances/staking-usds/StakingUSDSTarget4.sol @@ -9,7 +9,7 @@ import { StakingUSDSBase } from "./StakingUSDSBase.sol"; /// @author DELV /// @title StakingUSDSTarget4 -/// @notice StakingUSDSHyperdrive's target3 logic contract. This contract contains +/// @notice StakingUSDSHyperdrive's target4 logic contract. This contract contains /// several stateful functions that couldn't fit into the Hyperdrive /// contract. /// @custom:disclaimer The language used in this code is for coding convenience diff --git a/contracts/src/instances/stk-well/StkWellTarget4.sol b/contracts/src/instances/stk-well/StkWellTarget4.sol index 65d2210a2..b446fd439 100644 --- a/contracts/src/instances/stk-well/StkWellTarget4.sol +++ b/contracts/src/instances/stk-well/StkWellTarget4.sol @@ -8,7 +8,7 @@ import { StkWellBase } from "./StkWellBase.sol"; /// @author DELV /// @title StkWellTarget4 -/// @notice StkWellHyperdrive's target3 logic contract. This contract contains +/// @notice StkWellHyperdrive's target4 logic contract. This contract contains /// several stateful functions that couldn't fit into the Hyperdrive /// contract. /// @custom:disclaimer The language used in this code is for coding convenience diff --git a/contracts/src/interfaces/IStkWell.sol b/contracts/src/interfaces/IStkWell.sol deleted file mode 100644 index 451813afc..000000000 --- a/contracts/src/interfaces/IStkWell.sol +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -pragma solidity 0.8.22; - -import { IERC4626 } from "./IERC4626.sol"; - -// **************************************************************************** -// FIXME: Fill out the interface as needed. ERC4626 extended as an example. - -/// @author DELV -/// @title IStkWell -/// @notice The interface file for StkWell -/// @custom:disclaimer The language used in this code is for coding convenience -/// only, and is not intended to, and does not, have any -/// particular legal or regulatory significance. -abstract contract IStkWell is IERC4626 {} -// **************************************************************************** diff --git a/test/utils/InstanceTest.sol b/test/utils/InstanceTest.sol index 7e441f4ad..4735aa1cd 100644 --- a/test/utils/InstanceTest.sol +++ b/test/utils/InstanceTest.sol @@ -1,9 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.20; -// FIXME -import { console2 as console } from "forge-std/console2.sol"; - import { ERC20ForwarderFactory } from "../../contracts/src/token/ERC20ForwarderFactory.sol"; import { HyperdriveFactory } from "../../contracts/src/factory/HyperdriveFactory.sol"; import { IERC20 } from "../../contracts/src/interfaces/IERC20.sol";