Skip to content

fix: off by one slice bug #254

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
merged 5 commits into from
Nov 8, 2023
Merged

fix: off by one slice bug #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f061b4
fix: off by one slice bug
rach-id Nov 2, 2023
0b9a380
fix: add _begin and _end checks
rach-id Nov 2, 2023
e2daa12
chore: add an error instead of reverting
rach-id Nov 2, 2023
39d7c7d
chore: add another check
rach-id Nov 2, 2023
a042ac6
test: add slice tests
rach-id Nov 7, 2023
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
31 changes: 23 additions & 8 deletions src/lib/verifier/DAVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ library DAVerifier {
/// @notice The verifier data length isn't equal to the number of shares in the shares proofs.
UnequalDataLengthAndNumberOfSharesProofs,
/// @notice The number of leaves in the binary merkle proof is not divisible by 4.
InvalidNumberOfLeavesInProof
InvalidNumberOfLeavesInProof,
/// @notice The provided range is invalid.
InvalidRange,
/// @notice The provided range is out of bounds.
OutOfBoundsRange
}

///////////////
Expand Down Expand Up @@ -107,12 +111,13 @@ library DAVerifier {
uint256 cursor = 0;
for (uint256 i = 0; i < _sharesProof.shareProofs.length; i++) {
uint256 sharesUsed = _sharesProof.shareProofs[i].endKey - _sharesProof.shareProofs[i].beginKey;
(bytes[] memory s, ErrorCodes err) = slice(_sharesProof.data, cursor, cursor + sharesUsed);
if (err != ErrorCodes.NoError) {
return (false, err);
}
if (
!NamespaceMerkleTree.verifyMulti(
_sharesProof.rowRoots[i],
_sharesProof.shareProofs[i],
_sharesProof.namespace,
slice(_sharesProof.data, cursor, cursor + sharesUsed)
_sharesProof.rowRoots[i], _sharesProof.shareProofs[i], _sharesProof.namespace, s
)
) {
return (false, ErrorCodes.InvalidSharesToRowsProof);
Expand Down Expand Up @@ -235,11 +240,21 @@ library DAVerifier {
/// @param _begin The beginning of the range (inclusive).
/// @param _end The ending of the range (exclusive).
/// @return _ the sliced data.
function slice(bytes[] memory _data, uint256 _begin, uint256 _end) internal pure returns (bytes[] memory) {
function slice(bytes[] memory _data, uint256 _begin, uint256 _end)
internal
pure
returns (bytes[] memory, ErrorCodes)
{
if (_begin > _end) {
return (_data, ErrorCodes.InvalidRange);
}
if (_begin > _data.length || _end > _data.length) {
return (_data, ErrorCodes.OutOfBoundsRange);
}
bytes[] memory out = new bytes[](_end-_begin);
for (uint256 i = _begin; i < _end; i++) {
out[i] = _data[i];
out[i - _begin] = _data[i];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a test that hits this codepath and would have caught the bug?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a042ac6

}
return out;
return (out, ErrorCodes.NoError);
}
}
40 changes: 40 additions & 0 deletions src/lib/verifier/test/DAVerifier.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,46 @@ contract DAVerifierTest is DSTest {
assertEq(actualSquareSize, expectedSquareSize);
}

function testValidSlice() public {
bytes[] memory data = new bytes[](4);
data[0] = "a";
data[1] = "b";
data[2] = "c";
data[3] = "d";

(bytes[] memory result, DAVerifier.ErrorCodes error) = DAVerifier.slice(data, 1, 3);

assertEq(uint256(error), uint256(DAVerifier.ErrorCodes.NoError));
assertEq(string(result[0]), string(data[1]));
assertEq(string(result[1]), string(data[2]));
}

function testInvalidSliceBeginEnd() public {
bytes[] memory data = new bytes[](4);
data[0] = "a";
data[1] = "b";
data[2] = "c";
data[3] = "d";

(bytes[] memory result, DAVerifier.ErrorCodes error) = DAVerifier.slice(data, 2, 1);

assertEq(uint256(error), uint256(DAVerifier.ErrorCodes.InvalidRange));
}

function testOutOfBoundsSlice() public {
bytes[] memory data = new bytes[](4);
data[0] = "a";
data[1] = "b";
data[2] = "c";
data[3] = "d";

(bytes[] memory result, DAVerifier.ErrorCodes error) = DAVerifier.slice(data, 2, 5);
assertEq(uint256(error), uint256(DAVerifier.ErrorCodes.OutOfBoundsRange));

(result, error) = DAVerifier.slice(data, 6, 8);
assertEq(uint256(error), uint256(DAVerifier.ErrorCodes.OutOfBoundsRange));
}

function computeValidatorSetHash(Validator[] memory _validators) private pure returns (bytes32) {
return keccak256(abi.encode(_validators));
}
Expand Down