feat: fixed USV3 Verification
- We cannot use the regular v3-periphery library because of outdated solc versions. I've copied the v3-updated library which we have used in our previous project
This commit is contained in:
1
foundry/lib/v3-core
Submodule
1
foundry/lib/v3-core
Submodule
Submodule foundry/lib/v3-core added at d8b1c635c2
Submodule foundry/lib/v3-periphery deleted from 80f26c86c5
39
foundry/lib/v3-updated/CallbackValidationV2.sol
Normal file
39
foundry/lib/v3-updated/CallbackValidationV2.sol
Normal file
@@ -0,0 +1,39 @@
|
||||
// Updated v3 lib to solidity >=0.7.6
|
||||
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
pragma solidity >=0.7.6;
|
||||
|
||||
import "./PoolAddressV2.sol";
|
||||
import "@uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol";
|
||||
|
||||
/// @notice Provides validation for callbacks from Uniswap V3 Pools
|
||||
library CallbackValidationV2 {
|
||||
/// @notice Returns the address of a valid Uniswap V3 Pool
|
||||
/// @param factory The contract address of the Uniswap V3 factory
|
||||
/// @param tokenA The contract address of either token0 or token1
|
||||
/// @param tokenB The contract address of the other token
|
||||
/// @param fee The fee collected upon every swap in the pool, denominated in hundredths of a bip
|
||||
/// @return pool The V3 pool contract address
|
||||
function verifyCallback(
|
||||
address factory,
|
||||
address tokenA,
|
||||
address tokenB,
|
||||
uint24 fee
|
||||
) internal view returns (IUniswapV3Pool pool) {
|
||||
return verifyCallback(
|
||||
factory, PoolAddressV2.getPoolKey(tokenA, tokenB, fee)
|
||||
);
|
||||
}
|
||||
|
||||
/// @notice Returns the address of a valid Uniswap V3 Pool
|
||||
/// @param factory The contract address of the Uniswap V3 factory
|
||||
/// @param poolKey The identifying key of the V3 pool
|
||||
/// @return pool The V3 pool contract address
|
||||
function verifyCallback(
|
||||
address factory,
|
||||
PoolAddressV2.PoolKey memory poolKey
|
||||
) internal view returns (IUniswapV3Pool pool) {
|
||||
pool = IUniswapV3Pool(PoolAddressV2.computeAddress(factory, poolKey));
|
||||
require(msg.sender == address(pool), "CV");
|
||||
}
|
||||
}
|
||||
59
foundry/lib/v3-updated/PoolAddressV2.sol
Normal file
59
foundry/lib/v3-updated/PoolAddressV2.sol
Normal file
@@ -0,0 +1,59 @@
|
||||
// Updated v3 lib to solidity >=0.7.6
|
||||
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
pragma solidity >=0.5.0;
|
||||
|
||||
/// @title Provides functions for deriving a pool address from the factory, tokens, and the fee
|
||||
library PoolAddressV2 {
|
||||
bytes32 internal constant POOL_INIT_CODE_HASH =
|
||||
0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54;
|
||||
|
||||
/// @notice The identifying key of the pool
|
||||
struct PoolKey {
|
||||
address token0;
|
||||
address token1;
|
||||
uint24 fee;
|
||||
}
|
||||
|
||||
/// @notice Returns PoolKey: the ordered tokens with the matched fee levels
|
||||
/// @param tokenA The first token of a pool, unsorted
|
||||
/// @param tokenB The second token of a pool, unsorted
|
||||
/// @param fee The fee level of the pool
|
||||
/// @return Poolkey The pool details with ordered token0 and token1 assignments
|
||||
function getPoolKey(address tokenA, address tokenB, uint24 fee)
|
||||
internal
|
||||
pure
|
||||
returns (PoolKey memory)
|
||||
{
|
||||
if (tokenA > tokenB) (tokenA, tokenB) = (tokenB, tokenA);
|
||||
return PoolKey({token0: tokenA, token1: tokenB, fee: fee});
|
||||
}
|
||||
|
||||
/// @notice Deterministically computes the pool address given the factory and PoolKey
|
||||
/// @param factory The Uniswap V3 factory contract address
|
||||
/// @param key The PoolKey
|
||||
/// @return pool The contract address of the V3 pool
|
||||
function computeAddress(address factory, PoolKey memory key)
|
||||
internal
|
||||
pure
|
||||
returns (address pool)
|
||||
{
|
||||
require(key.token0 < key.token1);
|
||||
pool = address(
|
||||
uint160(
|
||||
uint256(
|
||||
keccak256(
|
||||
abi.encodePacked(
|
||||
hex"ff",
|
||||
factory,
|
||||
keccak256(
|
||||
abi.encode(key.token0, key.token1, key.fee)
|
||||
),
|
||||
POOL_INIT_CODE_HASH
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user