diff --git a/contracts/release/infrastructure/staking-wrappers/IStakingWrapper.sol b/contracts/persistent/staking-wrappers/IStakingWrapper.sol similarity index 100% rename from contracts/release/infrastructure/staking-wrappers/IStakingWrapper.sol rename to contracts/persistent/staking-wrappers/IStakingWrapper.sol diff --git a/contracts/release/infrastructure/staking-wrappers/StakingWrapperBase.sol b/contracts/persistent/staking-wrappers/StakingWrapperBase.sol similarity index 99% rename from contracts/release/infrastructure/staking-wrappers/StakingWrapperBase.sol rename to contracts/persistent/staking-wrappers/StakingWrapperBase.sol index 73c6071d0..cfe736a0e 100644 --- a/contracts/release/infrastructure/staking-wrappers/StakingWrapperBase.sol +++ b/contracts/persistent/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/contracts/release/infrastructure/staking-wrappers/StakingWrapperLibBase.sol b/contracts/persistent/staking-wrappers/StakingWrapperLibBase.sol similarity index 100% rename from contracts/release/infrastructure/staking-wrappers/StakingWrapperLibBase.sol rename to contracts/persistent/staking-wrappers/StakingWrapperLibBase.sol diff --git a/contracts/release/infrastructure/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperFactory.sol b/contracts/persistent/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperFactory.sol similarity index 100% rename from contracts/release/infrastructure/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperFactory.sol rename to contracts/persistent/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperFactory.sol diff --git a/contracts/release/infrastructure/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperLib.sol b/contracts/persistent/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperLib.sol similarity index 94% rename from contracts/release/infrastructure/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperLib.sol rename to contracts/persistent/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperLib.sol index 04c19e294..37d20a96a 100644 --- a/contracts/release/infrastructure/staking-wrappers/aura-balancer-v2-lp/AuraBalancerV2LpStakingWrapperLib.sol +++ b/contracts/persistent/staking-wrappers/aura-balancer-v2-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/contracts/release/infrastructure/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperFactory.sol b/contracts/persistent/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperFactory.sol similarity index 96% rename from contracts/release/infrastructure/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperFactory.sol rename to contracts/persistent/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperFactory.sol index f2cd9264f..7fd8819b9 100644 --- a/contracts/release/infrastructure/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperFactory.sol +++ b/contracts/persistent/staking-wrappers/convex-curve-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 diff --git a/contracts/release/infrastructure/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperLib.sol b/contracts/persistent/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperLib.sol similarity index 94% rename from contracts/release/infrastructure/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperLib.sol rename to contracts/persistent/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperLib.sol index e08fb12f1..b446bde4a 100644 --- a/contracts/release/infrastructure/staking-wrappers/convex-curve-lp/ConvexCurveLpStakingWrapperLib.sol +++ b/contracts/persistent/staking-wrappers/convex-curve-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/contracts/release/infrastructure/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapper.sol b/contracts/persistent/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapper.sol similarity index 100% rename from contracts/release/infrastructure/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapper.sol rename to contracts/persistent/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapper.sol diff --git a/contracts/release/infrastructure/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol b/contracts/persistent/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol similarity index 88% rename from contracts/release/infrastructure/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol rename to contracts/persistent/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol index cc635269c..dd7f65120 100644 --- a/contracts/release/infrastructure/staking-wrappers/convex-curve-lp/IConvexCurveLpStakingWrapperFactory.sol +++ b/contracts/persistent/staking-wrappers/convex-curve-lp/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 diff --git a/contracts/release/extensions/integration-manager/integrations/adapters/AuraBalancerV2LpStakingAdapter.sol b/contracts/release/extensions/integration-manager/integrations/adapters/AuraBalancerV2LpStakingAdapter.sol index 840be3ec5..fcfae9e4c 100644 --- a/contracts/release/extensions/integration-manager/integrations/adapters/AuraBalancerV2LpStakingAdapter.sol +++ b/contracts/release/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/contracts/release/extensions/integration-manager/integrations/adapters/ConvexCurveLpStakingAdapter.sol b/contracts/release/extensions/integration-manager/integrations/adapters/ConvexCurveLpStakingAdapter.sol index 2eece6be9..768306bae 100644 --- a/contracts/release/extensions/integration-manager/integrations/adapters/ConvexCurveLpStakingAdapter.sol +++ b/contracts/release/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/contracts/release/extensions/integration-manager/integrations/utils/0.6.12/actions/StakingWrapperActionsMixin.sol b/contracts/release/extensions/integration-manager/integrations/utils/0.6.12/actions/StakingWrapperActionsMixin.sol index e3c317e59..4de39377f 100644 --- a/contracts/release/extensions/integration-manager/integrations/utils/0.6.12/actions/StakingWrapperActionsMixin.sol +++ b/contracts/release/extensions/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 diff --git a/contracts/release/infrastructure/price-feeds/derivatives/feeds/ConvexCurveLpStakingWrapperPriceFeed.sol b/contracts/release/infrastructure/price-feeds/derivatives/feeds/ConvexCurveLpStakingWrapperPriceFeed.sol index 062e18dd1..5daf71ad2 100644 --- a/contracts/release/infrastructure/price-feeds/derivatives/feeds/ConvexCurveLpStakingWrapperPriceFeed.sol +++ b/contracts/release/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