Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/allocators/HybridAllocator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
pragma solidity ^0.8.27;

import {SafeTransferLib} from '@solady/utils/SafeTransferLib.sol';
import {BatchCompact, LOCK_TYPEHASH, Lock} from '@uniswap/the-compact/types/EIP712Types.sol';
import {Lock} from '@uniswap/the-compact/types/EIP712Types.sol';

import {IERC20} from '@openzeppelin/contracts/token/ERC20/IERC20.sol';

import {AllocatorLib as AL} from './lib/AllocatorLib.sol';
import {ERC6909} from '@solady/tokens/ERC6909.sol';
import {IAllocator} from '@uniswap/the-compact/interfaces/IAllocator.sol';
import {ITheCompact} from '@uniswap/the-compact/interfaces/ITheCompact.sol';
import {IHybridAllocator} from 'src/interfaces/IHybridAllocator.sol';
Expand All @@ -17,8 +16,6 @@ contract HybridAllocator is IHybridAllocator {
uint96 public immutable ALLOCATOR_ID;
ITheCompact internal immutable _COMPACT;
bytes32 internal immutable _COMPACT_DOMAIN_SEPARATOR;
// bytes4(keccak256('prepareAllocation(address,uint256[2][],address,uint256,bytes32,bytes32,bytes)'));
bytes4 public constant PREPARE_ALLOCATION_SELECTOR = 0x7ef6597a;

mapping(bytes32 => bool) internal claims;

Expand Down
2 changes: 1 addition & 1 deletion src/allocators/OnChainAllocator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {ERC6909} from '@solady/tokens/ERC6909.sol';
import {SafeTransferLib} from '@solady/utils/SafeTransferLib.sol';
import {IAllocator} from '@uniswap/the-compact/interfaces/IAllocator.sol';
import {ITheCompact} from '@uniswap/the-compact/interfaces/ITheCompact.sol';
import {LOCK_TYPEHASH, Lock} from '@uniswap/the-compact/types/EIP712Types.sol';
import {Lock} from '@uniswap/the-compact/types/EIP712Types.sol';

/// @title OnChainAllocator
/// @notice Allocates tokens deposited into the compact.
Expand Down
1 change: 0 additions & 1 deletion src/interfaces/IHybridAllocator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
pragma solidity ^0.8.27;

import {IOnChainAllocation} from '@uniswap/the-compact/interfaces/IOnChainAllocation.sol';
import {Lock} from '@uniswap/the-compact/types/EIP712Types.sol';

interface IHybridAllocator is IOnChainAllocation {
error Unsupported();
Expand Down
1 change: 0 additions & 1 deletion src/interfaces/IHybridERC7683.sol
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.27;

import {Lock} from '@uniswap/the-compact/types/EIP712Types.sol';
import {IOriginSettler} from 'src/interfaces/ERC7683/IOriginSettler.sol';
import {IHybridAllocator} from 'src/interfaces/IHybridAllocator.sol';

Expand Down