Skip to content

fix: improve leaf index validation #236

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
henriquemarlon wants to merge 1 commit into
base: fix/dockerized-env-tests
Choose a base branch
from
Open

fix: improve leaf index validation #236

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
2 changes: 1 addition & 1 deletion .github/actions/setup-tools/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inputs:
foundry-version:
description: 'Foundry version to install'
required: false
default: 'v1.4.3'
default: 'v1.5.0'
setup-qemu:
description: 'Whether to setup QEMU for riscv support'
required: false
Expand Down
2 changes: 1 addition & 1 deletion cartesi-rollups/contracts/src/Merkle.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ library Merkle {
/// @dev See `MerkleConstants` for leaf size.
function getHashOfLeafAtIndex(bytes calldata data, uint256 leafIndex) internal pure returns (bytes32) {
uint256 start = leafIndex << MerkleConstants.LOG2_LEAF_SIZE;
if (start < data.length) {
if (start < data.length && (start >> MerkleConstants.LOG2_LEAF_SIZE) == leafIndex) {
/// forge-lint: disable-next-line(asm-keccak256)
return keccak256(abi.encode(bytes32(data[start:])));
} else {
Expand Down
5 changes: 1 addition & 4 deletions prt/contracts/src/tournament/libs/Match.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,7 @@ library Match {
return args.toCycle(state.runningLeafPosition);
}

function getDivergence(
State memory state,
Commitment.Arguments memory args
)
function getDivergence(State memory state, Commitment.Arguments memory args)
internal
pure
returns (
Expand Down
2 changes: 1 addition & 1 deletion test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN <<EOF
set -eu
apt-get update && apt-get install -y --no-install-recommends curl ca-certificates git
curl -L https://foundry.paradigm.xyz | bash
~/.foundry/bin/foundryup --install v1.4.3
~/.foundry/bin/foundryup --install v1.5.0
install -Dm755 ~/.foundry/bin/* /usr/local/bin/
EOF
# cargo binstall (to install just)
Expand Down
Loading