Skip to content

N-06: Early-revert on zero native value for first id in HybridAllocator #28

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

Open
wants to merge 1 commit into
base: v1-audit1
Choose a base branch
from
Open

N-06: Early-revert on zero native value for first id in HybridAllocator #28

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
8 changes: 4 additions & 4 deletions snapshots/HybridAllocatorTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"allocateAndRegister_erc20Token": "187668",
"allocateAndRegister_erc20Token_emptyAmountInput": "188578",
"allocateAndRegister_multipleTokens": "223574",
"allocateAndRegister_nativeToken": "139204",
"allocateAndRegister_nativeToken_emptyAmountInput": "139040",
"allocateAndRegister_multipleTokens": "223592",
"allocateAndRegister_nativeToken": "139222",
"allocateAndRegister_nativeToken_emptyAmountInput": "139058",
"allocateAndRegister_second_erc20Token": "114874",
"allocateAndRegister_second_nativeToken": "104840",
"allocateAndRegister_second_nativeToken": "104858",
"hybrid_execute_single": "174395"
}
4 changes: 4 additions & 0 deletions src/allocators/HybridAllocator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ contract HybridAllocator is IHybridAllocator {
if (AL.splitAllocatorId(idsAndAmounts[0][0]) != ALLOCATOR_ID) {
revert InvalidAllocatorId(AL.splitAllocatorId(idsAndAmounts[0][0]), ALLOCATOR_ID);
}
// If first token is native and no value attached, revert early
if (msg.value == 0) {
revert InvalidValue(0, 1);
}
if (idsAndAmounts[0][1] != 0 && msg.value != idsAndAmounts[0][1]) {
revert InvalidValue(msg.value, idsAndAmounts[0][1]);
}
Expand Down
2 changes: 1 addition & 1 deletion test/HybridAllocator.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ contract HybridAllocatorTest is Test, TestHelper {
uint256[2][] memory idsAndAmounts = new uint256[2][](1);
idsAndAmounts[0][0] = _toId(Scope.Multichain, ResetPeriod.TenMinutes, address(allocator), address(0));
idsAndAmounts[0][1] = 0;
vm.expectRevert(abi.encodeWithSelector(ITheCompact.InvalidBatchDepositStructure.selector));
vm.expectRevert(abi.encodeWithSelector(IHybridAllocator.InvalidValue.selector, 0, 1));
allocator.allocateAndRegister(user, idsAndAmounts, arbiter, defaultExpiration, BATCH_COMPACT_TYPEHASH, '');
}

Expand Down