refactor: move staking wrappers to persistent dir

enzymefinance · Oct 5, 2023 · 9851130 · 9851130
1 parent 341d223
commit 9851130
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/...ture/staking-wrappers/IStakingWrapper.sol → ...tent/staking-wrappers/IStakingWrapper.sol b/...ture/staking-wrappers/IStakingWrapper.sol → ...tent/staking-wrappers/IStakingWrapper.sol
diff --git a/...e/staking-wrappers/StakingWrapperBase.sol → ...t/staking-wrappers/StakingWrapperBase.sol b/...e/staking-wrappers/StakingWrapperBase.sol → ...t/staking-wrappers/StakingWrapperBase.sol
@@ -14,7 +14,7 @@ pragma solidity 0.8.19;
 import {ReentrancyGuard} from "openzeppelin-solc-0.8/security/ReentrancyGuard.sol";
 import {ERC20} from "openzeppelin-solc-0.8/token/ERC20/ERC20.sol";
 import {SafeERC20} from "openzeppelin-solc-0.8/token/ERC20/utils/SafeERC20.sol";
-import {AddressArrayLib} from "../../../utils/0.8.19/AddressArrayLib.sol";
+import {AddressArrayLib} from "../../utils/0.8.19/AddressArrayLib.sol";
 import {IStakingWrapper} from "./IStakingWrapper.sol";
 
 /// @title StakingWrapperBase Contract

diff --git a/...taking-wrappers/StakingWrapperLibBase.sol → ...taking-wrappers/StakingWrapperLibBase.sol b/...taking-wrappers/StakingWrapperLibBase.sol → ...taking-wrappers/StakingWrapperLibBase.sol
diff --git a/...AuraBalancerV2LpStakingWrapperFactory.sol → ...AuraBalancerV2LpStakingWrapperFactory.sol b/...AuraBalancerV2LpStakingWrapperFactory.sol → ...AuraBalancerV2LpStakingWrapperFactory.sol
diff --git a/...-lp/AuraBalancerV2LpStakingWrapperLib.sol → ...-lp/AuraBalancerV2LpStakingWrapperLib.sol b/...-lp/AuraBalancerV2LpStakingWrapperLib.sol → ...-lp/AuraBalancerV2LpStakingWrapperLib.sol
@@ -11,7 +11,7 @@
 
 pragma solidity 0.8.19;
 
-import {IAuraStashToken} from "../../../../external-interfaces/IAuraStashToken.sol";
+import {IAuraStashToken} from "../../../external-interfaces/IAuraStashToken.sol";
 import {ConvexCurveLpStakingWrapperLib} from "../convex-curve-lp/ConvexCurveLpStakingWrapperLib.sol";
 
 /// @title AuraBalancerV2LpStakingWrapperLib Contract

diff --git a/...lp/ConvexCurveLpStakingWrapperFactory.sol → ...lp/ConvexCurveLpStakingWrapperFactory.sol b/...lp/ConvexCurveLpStakingWrapperFactory.sol → ...lp/ConvexCurveLpStakingWrapperFactory.sol
@@ -9,9 +9,9 @@
 
 pragma solidity 0.8.19;
 
+import {DispatcherOwnedBeacon} from "../../../utils/0.8.19/dispatcher-owned-beacon/DispatcherOwnedBeacon.sol";
 import {IConvexCurveLpStakingWrapper} from "./IConvexCurveLpStakingWrapper.sol";
 import {IConvexCurveLpStakingWrapperFactory} from "./IConvexCurveLpStakingWrapperFactory.sol";
-import {DispatcherOwnedBeacon} from "../../../../utils/0.8.19/dispatcher-owned-beacon/DispatcherOwnedBeacon.sol";
 
 /// @title ConvexCurveLpStakingWrapperFactory Contract
 /// @author Enzyme Council <security@enzyme.finance>

diff --git a/...rve-lp/ConvexCurveLpStakingWrapperLib.sol → ...rve-lp/ConvexCurveLpStakingWrapperLib.sol b/...rve-lp/ConvexCurveLpStakingWrapperLib.sol → ...rve-lp/ConvexCurveLpStakingWrapperLib.sol
@@ -14,10 +14,10 @@ pragma solidity 0.8.19;
 import {ERC20} from "openzeppelin-solc-0.8/token/ERC20/ERC20.sol";
 import {SafeERC20} from "openzeppelin-solc-0.8/token/ERC20/utils/SafeERC20.sol";
 import {Address} from "openzeppelin-solc-0.8/utils/Address.sol";
-import {IConvexBaseRewardPool} from "../../../../external-interfaces/IConvexBaseRewardPool.sol";
-import {IConvexBooster} from "../../../../external-interfaces/IConvexBooster.sol";
-import {IConvexStashTokenWrapper} from "../../../../external-interfaces/IConvexStashTokenWrapper.sol";
-import {IConvexVirtualBalanceRewardPool} from "../../../../external-interfaces/IConvexVirtualBalanceRewardPool.sol";
+import {IConvexBaseRewardPool} from "../../../external-interfaces/IConvexBaseRewardPool.sol";
+import {IConvexBooster} from "../../../external-interfaces/IConvexBooster.sol";
+import {IConvexStashTokenWrapper} from "../../../external-interfaces/IConvexStashTokenWrapper.sol";
+import {IConvexVirtualBalanceRewardPool} from "../../../external-interfaces/IConvexVirtualBalanceRewardPool.sol";
 import {StakingWrapperBase} from "../StakingWrapperBase.sol";
 import {StakingWrapperLibBase} from "../StakingWrapperLibBase.sol";
 import {IConvexCurveLpStakingWrapper} from "./IConvexCurveLpStakingWrapper.sol";

diff --git a/...curve-lp/IConvexCurveLpStakingWrapper.sol → ...curve-lp/IConvexCurveLpStakingWrapper.sol b/...curve-lp/IConvexCurveLpStakingWrapper.sol → ...curve-lp/IConvexCurveLpStakingWrapper.sol
diff --git a/...p/IConvexCurveLpStakingWrapperFactory.sol → ...p/IConvexCurveLpStakingWrapperFactory.sol b/...p/IConvexCurveLpStakingWrapperFactory.sol → ...p/IConvexCurveLpStakingWrapperFactory.sol
@@ -9,7 +9,7 @@
 
 pragma solidity >=0.6.0 <0.9.0;
 
-import {IDispatcherOwnedBeacon} from "../../../../utils/0.8.19/dispatcher-owned-beacon/IDispatcherOwnedBeacon.sol";
+import {IDispatcherOwnedBeacon} from "../../../utils/0.8.19/dispatcher-owned-beacon/IDispatcherOwnedBeacon.sol";
 
 /// @title IConvexCurveLpStakingWrapperFactory Interface
 /// @author Enzyme Council <security@enzyme.finance>

diff --git a/...e/extensions/integration-manager/integrations/adapters/AuraBalancerV2LpStakingAdapter.sol b/...e/extensions/integration-manager/integrations/adapters/AuraBalancerV2LpStakingAdapter.sol
@@ -3,7 +3,7 @@ pragma solidity 0.6.12;
 pragma experimental ABIEncoderV2;
 
 import {IConvexCurveLpStakingWrapperFactory} from
-    "../../../../infrastructure/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol";
+    "../../../../../persistent/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol";
 import {IIntegrationManager} from "../../IIntegrationManager.sol";
 import {StakingWrapperActionsMixin} from "../utils/0.6.12/actions/StakingWrapperActionsMixin.sol";
 import {BalancerV2LiquidityAdapterBase} from "../utils/0.6.12/bases/BalancerV2LiquidityAdapterBase.sol";

diff --git a/...ease/extensions/integration-manager/integrations/adapters/ConvexCurveLpStakingAdapter.sol b/...ease/extensions/integration-manager/integrations/adapters/ConvexCurveLpStakingAdapter.sol
@@ -2,9 +2,9 @@
 pragma solidity 0.6.12;
 
 import {ERC20} from "openzeppelin-solc-0.6/token/ERC20/ERC20.sol";
-import {CurvePriceFeed} from "../../../../infrastructure/price-feeds/derivatives/feeds/CurvePriceFeed.sol";
 import {IConvexCurveLpStakingWrapperFactory} from
-    "../../../../infrastructure/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol";
+    "../../../../../persistent/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol";
+import {CurvePriceFeed} from "../../../../infrastructure/price-feeds/derivatives/feeds/CurvePriceFeed.sol";
 import {IIntegrationManager} from "../../IIntegrationManager.sol";
 import {StakingWrapperActionsMixin} from "../utils/0.6.12/actions/StakingWrapperActionsMixin.sol";
 import {CurveLiquidityAdapterBase} from "../utils/0.6.12/bases/CurveLiquidityAdapterBase.sol";

diff --git a/...ions/integration-manager/integrations/utils/0.6.12/actions/StakingWrapperActionsMixin.sol b/...ions/integration-manager/integrations/utils/0.6.12/actions/StakingWrapperActionsMixin.sol
@@ -11,8 +11,8 @@
 
 pragma solidity 0.6.12;
 
+import {IStakingWrapper} from "../../../../../../../persistent/staking-wrappers/IStakingWrapper.sol";
 import {AssetHelpers} from "../../../../../../../utils/0.6.12/AssetHelpers.sol";
-import {IStakingWrapper} from "../../../../../../infrastructure/staking-wrappers/IStakingWrapper.sol";
 
 /// @title StakingWrapperActionsMixin Contract
 /// @author Enzyme Council <security@enzyme.finance>

diff --git a/...ase/infrastructure/price-feeds/derivatives/feeds/ConvexCurveLpStakingWrapperPriceFeed.sol b/...ase/infrastructure/price-feeds/derivatives/feeds/ConvexCurveLpStakingWrapperPriceFeed.sol
@@ -12,7 +12,7 @@
 pragma solidity 0.6.12;
 
 import {IConvexCurveLpStakingWrapperFactory} from
-    "../../../staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol";
+    "../../../../../persistent/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol";
 import {IDerivativePriceFeed} from "../IDerivativePriceFeed.sol";
 
 /// @title ConvexCurveLpStakingWrapperPriceFeed Contract