Great Pool Migration (prep)

pkg/pool-linear/contracts/LinearPool.sol

@@ -21,7 +21,7 @@ import "@balancer-labs/v2-interfaces/contracts/pool-utils/IRateProvider.sol";
 import "@balancer-labs/v2-interfaces/contracts/pool-linear/ILinearPool.sol";
 import "@balancer-labs/v2-interfaces/contracts/vault/IGeneralPool.sol";
 
-import "@balancer-labs/v2-pool-utils/contracts/BasePool.sol";
+import "@balancer-labs/v2-pool-utils/contracts/LegacyBasePool.sol";
 import "@balancer-labs/v2-pool-utils/contracts/rates/PriceRateCache.sol";
 
 import "@balancer-labs/v2-solidity-utils/contracts/helpers/ERC20Helpers.sol";
@@ -38,8 +38,8 @@ import "./LinearMath.sol";
  * The Pool will register three tokens in the Vault however: the two assets and the BPT itself,
  * so that BPT can be exchanged (effectively joining and exiting) via swaps.
  *
- * Despite inheriting from BasePool, much of the basic behavior changes. This Pool does not support regular joins and
- * exits, as the initial BPT supply is 'preminted' during initialization. No further BPT can be minted, and BPT can
+ * Despite inheriting from LegacyBasePool, much of the basic behavior changes. This Pool does not support regular joins
+ * and exits, as the initial BPT supply is 'preminted' during initialization. No further BPT can be minted, and BPT can
  * only be burned if governance enables Recovery Mode and LPs use it to exit proportionally.
  *
  * Unlike most other Pools, this one does not attempt to create revenue by charging fees: value is derived by holding
@@ -51,7 +51,7 @@ import "./LinearMath.sol";
  * The net revenue via fees is expected to be zero: all collected fees are used to pay for this 'rebalancing'.
  * Accordingly, this Pool does not pay any protocol fees.
  */
-abstract contract LinearPool is ILinearPool, IGeneralPool, IRateProvider, BasePool {
+abstract contract LinearPool is ILinearPool, IGeneralPool, IRateProvider, LegacyBasePool {
     using WordCodec for bytes32;
     using FixedPoint for uint256;
     using PriceRateCache for bytes32;
@@ -86,8 +86,8 @@ abstract contract LinearPool is ILinearPool, IGeneralPool, IRateProvider, BasePo
     uint256 private immutable _scalingFactorMainToken;
     uint256 private immutable _scalingFactorWrappedToken;
 
-    // The lower and upper targets are in BasePool's misc data field, which has 192 bits available (as it shares the
-    // same storage slot as the swap fee percentage and recovery mode flag, which together take up 64 bits).
+    // The lower and upper targets are in LegacyBasePool's misc data field, which has 192 bits available (as it shares
+    // the same storage slot as the swap fee percentage and recovery mode flag, which together take up 64 bits).
     // We use 64 of these 192 for the targets (32 for each).
     //
     // The targets are already scaled by the main token's scaling factor (which makes the token behave as if it had 18
@@ -124,7 +124,7 @@ abstract contract LinearPool is ILinearPool, IGeneralPool, IRateProvider, BasePo
         uint256 bufferPeriodDuration,
         address owner
     )
-        BasePool(
+        LegacyBasePool(
             vault,
             IVault.PoolSpecialization.GENERAL,
             name,

pkg/pool-stable/contracts/ComposableStablePool.sol

@@ -82,7 +82,7 @@ contract ComposableStablePool is
     }
 
     constructor(NewPoolParams memory params)
-        BasePool(
+        LegacyBasePool(
             params.vault,
             IVault.PoolSpecialization.GENERAL,
             params.name,
@@ -1136,7 +1136,7 @@ contract ComposableStablePool is
         override(
             // Our inheritance pattern creates a small diamond that requires explicitly listing the parents here.
             // Each parent calls the `super` version, so linearization ensures all implementations are called.
-            BasePool,
+            LegacyBasePool,
             ComposableStablePoolProtocolFees,
             StablePoolAmplification,
             ComposableStablePoolRates

pkg/pool-stable/contracts/ComposableStablePoolProtocolFees.sol

@@ -317,7 +317,7 @@ abstract contract ComposableStablePoolProtocolFees is
         override(
             // Our inheritance pattern creates a small diamond that requires explicitly listing the parents here.
             // Each parent calls the `super` version, so linearization ensures all implementations are called.
-            BasePool,
+            LegacyBasePool,
             BasePoolAuthorization,
             ComposableStablePoolRates
         )

pkg/pool-stable/contracts/ComposableStablePoolStorage.sol

@@ -18,11 +18,11 @@ import "@balancer-labs/v2-interfaces/contracts/solidity-utils/helpers/BalancerEr
 import "@balancer-labs/v2-interfaces/contracts/solidity-utils/openzeppelin/IERC20.sol";
 import "@balancer-labs/v2-interfaces/contracts/pool-utils/IRateProvider.sol";
 
-import "@balancer-labs/v2-pool-utils/contracts/BasePool.sol";
+import "@balancer-labs/v2-pool-utils/contracts/LegacyBasePool.sol";
 
 import "./StableMath.sol";
 
-abstract contract ComposableStablePoolStorage is BasePool {
+abstract contract ComposableStablePoolStorage is LegacyBasePool {
     using FixedPoint for uint256;
     using WordCodec for bytes32;
 

pkg/pool-stable/contracts/test/MockComposableStablePoolProtocolFees.sol

@@ -46,14 +46,14 @@ contract MockComposableStablePoolProtocolFees is ComposableStablePoolProtocolFee
             protocolFeeProvider,
             ProviderFeeIDs({ swap: ProtocolFeeType.SWAP, yield: ProtocolFeeType.YIELD, aum: ProtocolFeeType.AUM })
         )
-        BasePool(
+        LegacyBasePool(
             vault,
             IVault.PoolSpecialization.GENERAL,
             "MockStablePoolStorage",
             "MOCK_BPT",
             _insertSorted(tokens, IERC20(this)),
             new address[](tokens.length + 1),
-            1e12, // BasePool._MIN_SWAP_FEE_PERCENTAGE
+            1e12, // LegacyBasePool._MIN_SWAP_FEE_PERCENTAGE
             0,
             0,
             address(0)

pkg/pool-stable/contracts/test/MockComposableStablePoolRates.sol

@@ -31,14 +31,14 @@ contract MockComposableStablePoolRates is ComposableStablePoolRates {
         ComposableStablePoolStorage(
             StorageParams(_insertSorted(tokens, IERC20(this)), tokenRateProviders, exemptFromYieldProtocolFeeFlags)
         )
-        BasePool(
+        LegacyBasePool(
             vault,
             IVault.PoolSpecialization.GENERAL,
             "MockStablePoolStorage",
             "MOCK_BPT",
             _insertSorted(tokens, IERC20(this)),
             new address[](tokens.length + 1),
-            1e12, // BasePool._MIN_SWAP_FEE_PERCENTAGE
+            1e12, // LegacyBasePool._MIN_SWAP_FEE_PERCENTAGE
             0,
             0,
             owner

pkg/pool-stable/contracts/test/MockComposableStablePoolStorage.sol

@@ -33,14 +33,14 @@ contract MockComposableStablePoolStorage is ComposableStablePoolStorage {
                 exemptFromYieldProtocolFeeFlags: exemptFromYieldProtocolFeeFlags
             })
         )
-        BasePool(
+        LegacyBasePool(
             vault,
             IVault.PoolSpecialization.GENERAL,
             "MockComposableStablePoolStorage",
             "MOCK_BPT",
             _insertSorted(tokens, IERC20(this)),
             new address[](tokens.length + 1),
-            1e12, // BasePool._MIN_SWAP_FEE_PERCENTAGE
+            1e12, // LegacyBasePool._MIN_SWAP_FEE_PERCENTAGE
             0,
             0,
             address(0)

pkg/pool-utils/contracts/BaseGeneralPool.sol

@@ -17,16 +17,16 @@ pragma experimental ABIEncoderV2;
 
 import "@balancer-labs/v2-interfaces/contracts/vault/IGeneralPool.sol";
 
-import "./BasePool.sol";
+import "./LegacyBasePool.sol";
 
 /**
- * @dev Extension of `BasePool`, adding a handler for `IGeneralPool.onSwap`.
+ * @dev Extension of `LegacyBasePool`, adding a handler for `IGeneralPool.onSwap`.
  *
- * Derived contracts must call `BasePool`'s constructor, and implement `_onSwapGivenIn` and `_onSwapGivenOut` along with
- * `BasePool`'s virtual functions. Inheriting from this contract lets derived contracts choose the General
- * specialization setting.
+ * Derived contracts must call `LegacyBasePool`'s constructor, and implement `_onSwapGivenIn` and `_onSwapGivenOut`
+ * along with `LegacyBasePool`'s virtual functions. Inheriting from this contract lets derived contracts choose the
+ * General specialization setting.
  */
-abstract contract BaseGeneralPool is IGeneralPool, BasePool {
+abstract contract BaseGeneralPool is IGeneralPool, LegacyBasePool {
     // Swap Hooks
 
     function onSwap(

pkg/pool-utils/contracts/BaseMinimalSwapInfoPool.sol

@@ -17,16 +17,16 @@ pragma experimental ABIEncoderV2;
 
 import "@balancer-labs/v2-interfaces/contracts/vault/IMinimalSwapInfoPool.sol";
 
-import "./BasePool.sol";
+import "./LegacyBasePool.sol";
 
 /**
- * @dev Extension of `BasePool`, adding a handler for `IMinimalSwapInfoPool.onSwap`.
+ * @dev Extension of `LegacyBasePool`, adding a handler for `IMinimalSwapInfoPool.onSwap`.
  *
- * Derived contracts must call `BasePool`'s constructor, and implement `_onSwapGivenIn` and `_onSwapGivenOut` along with
- * `BasePool`'s virtual functions. Inheriting from this contract lets derived contracts choose the Two Token or Minimal
- * Swap Info specialization settings.
+ * Derived contracts must call `LegacyBasePool`'s constructor, and implement `_onSwapGivenIn` and `_onSwapGivenOut`
+ * along with `LegacyBasePool`'s virtual functions. Inheriting from this contract lets derived contracts choose the
+ * Two Token or Minimal Swap Info specialization settings.
  */
-abstract contract BaseMinimalSwapInfoPool is IMinimalSwapInfoPool, BasePool {
+abstract contract BaseMinimalSwapInfoPool is IMinimalSwapInfoPool, LegacyBasePool {
     // Swap Hooks
 
     function onSwap(