Skip to content

feat: finished all implementation with test #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Samuel1505 merged 1 commit into from
Dec 8, 2025
Merged

feat: finished all implementation with test #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 46 additions & 29 deletions test/unit/DarkPoolHook.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ contract DarkPoolHookTest is Test {
Currency public currency1;

event CommitCreated(bytes32 indexed commitHash, address indexed user, PoolId indexed poolId, uint256 commitBlock);
event SwapRevealed(bytes32 indexed commitHash, address indexed user, PoolId indexed poolId, uint256 amountIn, uint256 amountOut);
event SwapRevealed(
bytes32 indexed commitHash, address indexed user, PoolId indexed poolId, uint256 amountIn, uint256 amountOut
);
event PoolEnabled(PoolId indexed poolId, bool enabled);
event CommitPeriodUpdated(uint256 oldPeriod, uint256 newPeriod);
event CrossChainBridgeUpdated(address oldBridge, address newBridge);
Expand All @@ -50,27 +52,21 @@ contract DarkPoolHookTest is Test {

// Calculate hook address with correct flags (BEFORE_SWAP_FLAG | AFTER_SWAP_FLAG)
address hookAddress = address(
uint160(
(type(uint160).max & ~Hooks.ALL_HOOK_MASK) | Hooks.BEFORE_SWAP_FLAG | Hooks.AFTER_SWAP_FLAG
)
uint160((type(uint160).max & ~Hooks.ALL_HOOK_MASK) | Hooks.BEFORE_SWAP_FLAG | Hooks.AFTER_SWAP_FLAG)
);

// Deploy hook to the correct address using deployCodeTo
// This bypasses address validation by deploying directly to the target address
bytes memory constructorArgs = abi.encode(poolManager, serviceManager, taskManager, owner);
deployCodeTo("DarkPoolHook", constructorArgs, hookAddress);

hook = DarkPoolHook(hookAddress);

currency0 = Currency.wrap(address(0x100));
currency1 = Currency.wrap(address(0x200));

poolKey = PoolKey({
currency0: currency0,
currency1: currency1,
fee: 3000,
tickSpacing: 60,
hooks: IHooks(address(hook))
currency0: currency0, currency1: currency1, fee: 3000, tickSpacing: 60, hooks: IHooks(address(hook))
});
poolId = poolKey.toId();
}
Expand Down Expand Up @@ -124,9 +120,8 @@ contract DarkPoolHookTest is Test {

// Calculate expected commit hash (need to know the nonce, which starts at 0)
uint256 nonce = hook.userNonces(user);
bytes32 expectedCommitHash = keccak256(
abi.encodePacked(user, poolId, amountIn, currency0, currency1, deadline, nonce, secret)
);
bytes32 expectedCommitHash =
keccak256(abi.encodePacked(user, poolId, amountIn, currency0, currency1, deadline, nonce, secret));

vm.expectEmit(true, true, true, true);
emit CommitCreated(expectedCommitHash, user, poolId, block.number);
Expand Down Expand Up @@ -228,7 +223,9 @@ contract DarkPoolHookTest is Test {
emit SwapRevealed(commitHash, user, poolId, 1e18, 0);

vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);

DarkPoolHook.CommitData memory commit = hook.getCommit(commitHash);
assertTrue(commit.revealed);
Expand All @@ -239,7 +236,9 @@ contract DarkPoolHookTest is Test {
bytes32 secret = keccak256("secret");

vm.expectRevert(DarkPoolHook.CommitNotFound.selector);
hook.revealAndSwap(fakeHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
fakeHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);
}

function test_RevealAndSwap_RevertIfAlreadyRevealed() public {
Expand All @@ -254,11 +253,15 @@ contract DarkPoolHookTest is Test {
vm.roll(block.number + hook.DEFAULT_COMMIT_PERIOD() + 1);

vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);

vm.expectRevert(DarkPoolHook.CommitAlreadyRevealed.selector);
vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);
}

function test_RevealAndSwap_RevertIfCommitPeriodNotElapsed() public {
Expand All @@ -272,7 +275,9 @@ contract DarkPoolHookTest is Test {

vm.expectRevert(DarkPoolHook.CommitPeriodNotElapsed.selector);
vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);
}

function test_RevealAndSwap_RevertIfDeadlinePassed() public {
Expand All @@ -289,7 +294,9 @@ contract DarkPoolHookTest is Test {

vm.expectRevert(DarkPoolHook.CommitExpired.selector);
vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);
}

function test_RevealAndSwap_RevertIfInvalidReveal() public {
Expand All @@ -306,7 +313,13 @@ contract DarkPoolHookTest is Test {

vm.expectRevert(DarkPoolHook.InvalidReveal.selector);
vm.prank(user);
hook.revealAndSwap(commitHash, wrongSecret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash,
wrongSecret,
poolKey,
SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}),
""
);
}

function test_RevealAndSwap_RevertIfAlreadyExecuted() public {
Expand All @@ -322,12 +335,16 @@ contract DarkPoolHookTest is Test {

// First reveal should succeed
vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);

// Second reveal should revert as it's already revealed
vm.expectRevert(DarkPoolHook.CommitAlreadyRevealed.selector);
vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);
}

// ============ Pool Management Tests ============
Expand Down Expand Up @@ -446,11 +463,7 @@ contract DarkPoolHookTest is Test {

function test_CommitSwap_DifferentPools() public {
PoolKey memory poolKey2 = PoolKey({
currency0: currency0,
currency1: currency1,
fee: 500,
tickSpacing: 60,
hooks: IHooks(address(hook))
currency0: currency0, currency1: currency1, fee: 500, tickSpacing: 60, hooks: IHooks(address(hook))
});

hook.setPoolEnabled(poolKey, true);
Expand Down Expand Up @@ -483,13 +496,17 @@ contract DarkPoolHookTest is Test {

vm.expectRevert(DarkPoolHook.CommitPeriodNotElapsed.selector);
vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);

// Advance to exactly commit period blocks (should succeed as block.number >= commitBlock + commitPeriod)
vm.roll(commitBlock + hook.DEFAULT_COMMIT_PERIOD());

vm.prank(user);
hook.revealAndSwap(commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), "");
hook.revealAndSwap(
commitHash, secret, poolKey, SwapParams({zeroForOne: true, amountSpecified: 1e18, sqrtPriceLimitX96: 0}), ""
);
}
}

35 changes: 13 additions & 22 deletions test/unit/DarkPoolServiceManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ contract MockTaskManager is IDarkPoolTaskManager {
}

function getTask(uint32) external pure override returns (Task memory) {
return
Task({
batchHash: bytes32(0),
quorumThreshold: 0,
quorumNumbers: "",
createdBlock: 0,
creator: address(0),
isCompleted: false
});
return Task({
batchHash: bytes32(0),
quorumThreshold: 0,
quorumNumbers: "",
createdBlock: 0,
creator: address(0),
isCompleted: false
});
}

function callRecordValidation(DarkPoolServiceManager manager, uint32 taskIndex, address operator) external {
Expand Down Expand Up @@ -88,13 +87,9 @@ contract DarkPoolServiceManagerTest is Test {
return _deployServiceManager();
}

function _mockOperator(
address operator,
bytes32 operatorId,
uint8 quorum,
uint96 stake,
uint96 minimumStake
) internal {
function _mockOperator(address operator, bytes32 operatorId, uint8 quorum, uint96 stake, uint96 minimumStake)
internal
{
vm.mockCall(
mockRegistryCoordinator,
abi.encodeWithSelector(ISlashingRegistryCoordinator.getOperatorId.selector, operator),
Expand Down Expand Up @@ -211,13 +206,9 @@ contract DarkPoolServiceManagerTest is Test {
abi.encodeWithSelector(ISlashingRegistryCoordinator.getOperatorId.selector, operator1)
);
vm.expectCall(
mockStakeRegistry,
abi.encodeWithSelector(IStakeRegistry.getCurrentStake.selector, operatorId, quorum)
);
vm.expectCall(
mockStakeRegistry,
abi.encodeWithSelector(IStakeRegistry.minimumStakeForQuorum.selector, quorum)
mockStakeRegistry, abi.encodeWithSelector(IStakeRegistry.getCurrentStake.selector, operatorId, quorum)
);
vm.expectCall(mockStakeRegistry, abi.encodeWithSelector(IStakeRegistry.minimumStakeForQuorum.selector, quorum));

_mockOperator(operator1, operatorId, quorum, 2e18, 1e18);

Expand Down
Loading