From 543cc2c631cfe70fc2176497fc8c5ecce128644b Mon Sep 17 00:00:00 2001
From: Henrique Santos <henriquemarloncs@gmail.com>
Date: Mon, 8 Dec 2025 15:20:17 -0300
Subject: [PATCH 1/2] fix(docker): improve dockerized environment setup

---
 test/Dockerfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/Dockerfile b/test/Dockerfile
index ecaac8f8..1d6c8c0a 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -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 stable
+~/.foundry/bin/foundryup --install v1.4.0
 install -Dm755 ~/.foundry/bin/* /usr/local/bin/
 EOF
 # cargo binstall (to install just)
@@ -34,6 +34,11 @@ RUN \
   xxd jq sqlite3; \
   rm -rf /var/cache/apt;
 
+# install pnpm
+RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash -
+ENV PNPM_HOME="/root/.local/share/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
 # install foundry
 COPY --from=tools /usr/local/bin/forge   /usr/local/bin/
 COPY --from=tools /usr/local/bin/cast    /usr/local/bin/
@@ -81,7 +86,9 @@ RUN \
   --mount=type=cache,target=cartesi-rollups/contracts/cache,sharing=locked \
   --mount=type=cache,target=prt/contracts/out,sharing=locked \
   --mount=type=cache,target=prt/contracts/cache,sharing=locked \
-  just -f test/programs/justfile build-programs
+  just -f test/programs/justfile build-programs && \
+  just -f test/programs/justfile build-honeypot-snapshot && \
+  just -f cartesi-rollups/contracts/justfile build-devnet
 
 # copy everything else
 COPY \
@@ -105,5 +112,4 @@ RUN \
   just build-rust-workspace; \
   cp target/debug/cartesi-rollups-prt-node .
 
-# because of `--mount`, we need to do this.
 RUN mkdir -p target/debug && mv cartesi-rollups-prt-node target/debug/

From 05b80e8006e77c7ed360bfb9dc4de45c22038d6b Mon Sep 17 00:00:00 2001
From: Henrique Santos <henriquemarloncs@gmail.com>
Date: Mon, 8 Dec 2025 21:55:50 -0300
Subject: [PATCH 2/2] fix: improve leaf index validation

---
 cartesi-rollups/contracts/src/Merkle.sol | 2 +-
 test/Dockerfile                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cartesi-rollups/contracts/src/Merkle.sol b/cartesi-rollups/contracts/src/Merkle.sol
index af161b0c..23462035 100644
--- a/cartesi-rollups/contracts/src/Merkle.sol
+++ b/cartesi-rollups/contracts/src/Merkle.sol
@@ -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 {
diff --git a/test/Dockerfile b/test/Dockerfile
index 1d6c8c0a..b7c63059 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -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.0
+~/.foundry/bin/foundryup --install v1.5.0
 install -Dm755 ~/.foundry/bin/* /usr/local/bin/
 EOF
 # cargo binstall (to install just)