Refactor: move Version to solidity-utils. (#2525)

balancer · Jun 21, 2023 · 872342e · 872342e
1 parent 1cfefcf
commit 872342e
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 8 deletions.
diff --git a/pkg/interfaces/CHANGELOG.md b/pkg/interfaces/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Refactored `IL2GaugeCheckpointer`.
   - Removed `isSupportedGaugeType` from interface.
 - Bumped minimum compiler version from `0.7.0` to `0.7.1` in `BalancerErrors`.
+- `IVersion` moved from `pool-utils` to `solidity-utils`.
 
 ## 0.4.0 (2023-03-15)
 

diff --git a/pkg/interfaces/contracts/liquidity-mining/IChildChainGauge.sol b/pkg/interfaces/contracts/liquidity-mining/IChildChainGauge.sol
@@ -14,7 +14,7 @@
 
 pragma solidity >=0.7.0 <0.9.0;
 
-import "../pool-utils/IVersion.sol";
+import "../solidity-utils/helpers/IVersion.sol";
 import "./ILiquidityGaugeFactory.sol";
 
 // For compatibility, we're keeping the same function names as in the original Curve code, including the mixed-case

diff --git a/...erfaces/contracts/pool-utils/IVersion.sol → ...racts/solidity-utils/helpers/IVersion.sol b/...erfaces/contracts/pool-utils/IVersion.sol → ...racts/solidity-utils/helpers/IVersion.sol
diff --git a/pkg/liquidity-mining/contracts/gauges/ChildChainGaugeFactory.sol b/pkg/liquidity-mining/contracts/gauges/ChildChainGaugeFactory.sol
@@ -16,7 +16,7 @@ pragma solidity ^0.7.0;
 pragma experimental ABIEncoderV2;
 
 import "@balancer-labs/v2-interfaces/contracts/liquidity-mining/IChildChainGauge.sol";
-import "@balancer-labs/v2-pool-utils/contracts/Version.sol";
+import "@balancer-labs/v2-solidity-utils/contracts/helpers/Version.sol";
 
 import "./BaseGaugeFactory.sol";
 

diff --git a/pkg/liquidity-mining/contracts/gauges/ethereum/SingleRecipientGauge.sol b/pkg/liquidity-mining/contracts/gauges/ethereum/SingleRecipientGauge.sol
@@ -15,7 +15,7 @@
 pragma solidity ^0.7.0;
 
 import "@balancer-labs/v2-interfaces/contracts/liquidity-mining/IFeeDistributor.sol";
-import "@balancer-labs/v2-pool-utils/contracts/Version.sol";
+import "@balancer-labs/v2-solidity-utils/contracts/helpers/Version.sol";
 import "@balancer-labs/v2-solidity-utils/contracts/openzeppelin/SafeERC20.sol";
 
 import "../StakelessGauge.sol";

diff --git a/pkg/pool-stable/contracts/ComposableStablePool.sol b/pkg/pool-stable/contracts/ComposableStablePool.sol
@@ -19,7 +19,7 @@ import "@balancer-labs/v2-interfaces/contracts/pool-stable/StablePoolUserData.so
 import "@balancer-labs/v2-interfaces/contracts/solidity-utils/helpers/BalancerErrors.sol";
 import "@balancer-labs/v2-interfaces/contracts/standalone-utils/IProtocolFeePercentagesProvider.sol";
 import "@balancer-labs/v2-interfaces/contracts/pool-utils/IRateProvider.sol";
-import "@balancer-labs/v2-interfaces/contracts/pool-utils/IVersion.sol";
+import "@balancer-labs/v2-interfaces/contracts/solidity-utils/helpers/IVersion.sol";
 
 import "@balancer-labs/v2-solidity-utils/contracts/math/FixedPoint.sol";
 import "@balancer-labs/v2-solidity-utils/contracts/math/Math.sol";

diff --git a/pkg/pool-stable/contracts/ComposableStablePoolFactory.sol b/pkg/pool-stable/contracts/ComposableStablePoolFactory.sol
@@ -16,7 +16,7 @@ pragma solidity ^0.7.0;
 pragma experimental ABIEncoderV2;
 
 import "@balancer-labs/v2-interfaces/contracts/pool-utils/IPoolVersion.sol";
-import "@balancer-labs/v2-interfaces/contracts/pool-utils/IVersion.sol";
+import "@balancer-labs/v2-interfaces/contracts/solidity-utils/helpers/IVersion.sol";
 import "@balancer-labs/v2-interfaces/contracts/vault/IVault.sol";
 
 import "@balancer-labs/v2-pool-utils/contracts/factories/BasePoolFactory.sol";

diff --git a/pkg/pool-utils/CHANGELOG.md b/pkg/pool-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Breaking changes
+
+- Removed `Version` contract. It is now part of `v2-solidity-utils` since it will be used more generally.
+
 ## 4.1.1 (2023-06-05)
 
 ### Bugfix

diff --git a/pkg/pool-weighted/contracts/managed/ManagedPool.sol b/pkg/pool-weighted/contracts/managed/ManagedPool.sol
@@ -15,7 +15,7 @@
 pragma solidity ^0.7.0;
 pragma experimental ABIEncoderV2;
 
-import "@balancer-labs/v2-interfaces/contracts/pool-utils/IVersion.sol";
+import "@balancer-labs/v2-interfaces/contracts/solidity-utils/helpers/IVersion.sol";
 import "@balancer-labs/v2-interfaces/contracts/pool-utils/IRecoveryModeHelper.sol";
 import "@balancer-labs/v2-interfaces/contracts/pool-weighted/IExternalWeightedMath.sol";
 import "@balancer-labs/v2-interfaces/contracts/pool-weighted/WeightedPoolUserData.sol";

diff --git a/pkg/pool-weighted/contracts/managed/ManagedPoolFactory.sol b/pkg/pool-weighted/contracts/managed/ManagedPoolFactory.sol
@@ -21,7 +21,7 @@ import "@balancer-labs/v2-interfaces/contracts/pool-weighted/IExternalWeightedMa
 import "@balancer-labs/v2-interfaces/contracts/standalone-utils/IProtocolFeePercentagesProvider.sol";
 
 import "@balancer-labs/v2-pool-utils/contracts/factories/BasePoolFactory.sol";
-import "@balancer-labs/v2-pool-utils/contracts/Version.sol";
+import "@balancer-labs/v2-solidity-utils/contracts/helpers/Version.sol";
 
 import "./ManagedPool.sol";
 

diff --git a/pkg/solidity-utils/CHANGELOG.md b/pkg/solidity-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Misc
+
+- Added `Version` contract.
+
 ## 4.0.0 (2023-03-23)
 
 ### Breaking Changes

diff --git a/pkg/pool-utils/contracts/Version.sol → ...idity-utils/contracts/helpers/Version.sol b/pkg/pool-utils/contracts/Version.sol → ...idity-utils/contracts/helpers/Version.sol
@@ -14,7 +14,7 @@
 
 pragma solidity ^0.7.0;
 
-import "@balancer-labs/v2-interfaces/contracts/pool-utils/IVersion.sol";
+import "@balancer-labs/v2-interfaces/contracts/solidity-utils/helpers/IVersion.sol";
 
 /**
  * @notice Retrieves a contract's version set at creation time from storage.

diff --git a/pkg/pool-utils/test/Version.test.ts → pkg/solidity-utils/test/Version.test.ts b/pkg/pool-utils/test/Version.test.ts → pkg/solidity-utils/test/Version.test.ts