diff --git a/packages/contracts/contracts/libraries/UniswapPricingLibraryV2.sol b/packages/contracts/contracts/libraries/UniswapPricingLibraryV2.sol index 2d31c5b9..b8e8a061 100644 --- a/packages/contracts/contracts/libraries/UniswapPricingLibraryV2.sol +++ b/packages/contracts/contracts/libraries/UniswapPricingLibraryV2.sol @@ -5,15 +5,10 @@ pragma solidity >=0.8.0 <0.9.0; import {IUniswapPricingLibrary} from "../interfaces/IUniswapPricingLibrary.sol"; -import "@openzeppelin/contracts/utils/math/Math.sol"; - -import "@openzeppelin/contracts-upgradeable/utils/structs/EnumerableSetUpgradeable.sol"; - -// Libraries -import { MathUpgradeable } from "@openzeppelin/contracts-upgradeable/utils/math/MathUpgradeable.sol"; -import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol"; -import "@openzeppelin/contracts-upgradeable/utils/cryptography/MerkleProofUpgradeable.sol"; + +// Libraries + import "../interfaces/uniswap/IUniswapV3Pool.sol"; @@ -22,7 +17,7 @@ import "../libraries/uniswap/FixedPoint96.sol"; import "../libraries/uniswap/FullMath.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; + import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; diff --git a/packages/contracts/lib/forge-std b/packages/contracts/lib/forge-std index 2f6762e4..73a504d2 160000 --- a/packages/contracts/lib/forge-std +++ b/packages/contracts/lib/forge-std @@ -1 +1 @@ -Subproject commit 2f6762e4f73f3d835457c220b5f62dfeeb6f6341 +Subproject commit 73a504d2cf6f37b7ce285b479f4c681f76e95f1b