Skip to content

Commit

Permalink
Merge branch 'main' into posm-decode-calldata
Browse files Browse the repository at this point in the history
  • Loading branch information
hensha256 authored Jul 31, 2024
2 parents 41c3055 + f37734c commit 2dc8d0f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/V4Router.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import {IV4Router} from "./interfaces/IV4Router.sol";
import {BaseActionsRouter} from "./base/BaseActionsRouter.sol";
import {DeltaResolver} from "./base/DeltaResolver.sol";
import {Actions} from "./libraries/Actions.sol";
import {SafeCast} from "./libraries/SafeCast.sol";
import {SafeCastTemp} from "./libraries/SafeCast.sol";

/// @title UniswapV4Router
/// @notice Abstract contract that contains all internal logic needed for routing through Uniswap V4 pools
/// @dev the entry point to executing actions in this contract is calling `BaseActionsRouter._executeActions`
/// An inheriting contract should call _executeActions at the point that they wish actions to be executed
abstract contract V4Router is IV4Router, BaseActionsRouter, DeltaResolver {
using SafeCast for *;
using SafeCastTemp for *;
using PathKeyLib for PathKey;
using CalldataDecoder for bytes;
using TransientStateLibrary for IPoolManager;
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/SafeCast.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {CustomRevert} from "@uniswap/v4-core/src/libraries/CustomRevert.sol";

/// @title Safe casting methods
/// @notice Contains methods for safely casting between types
library SafeCast {
/// TODO after audits move this function to core's SafeCast.sol!
library SafeCastTemp {
using CustomRevert for bytes4;

error SafeCastOverflow();
Expand Down

0 comments on commit 2dc8d0f

Please sign in to comment.