Legion 02

[Dargon789]

Summary by Sourcery

Add Merkle tree–based signature support to IthacaAccount and update wrapped signature format and tests accordingly.

Enhancements:

• Introduce Merkle tree signature verification path in IthacaAccount using MerkleProofLib and a new merkle flag in the wrapped signature format.
• Bump the IthacaAccount EIP-712 version string to 0.5.11.

Tests:

• Add fuzz-style tests for Merkle-based signatures, including valid proofs, invalid digests, tampered proofs, and wrong roots.
• Update existing signature construction helpers and test call sites to include the new merkle flag byte in wrapped signatures.

[sourcery-ai]

Reviewer's Guide

Adds Merkle tree–based signature support to IthacaAccount and updates tests and helpers to handle the extended wrapped-signature format with a merkle flag, including a new fuzz test to validate Merkle-based signatures and refactors around EIP712 domain usage.

Sequence diagram for unwrapAndValidateSignature with Merkle support

sequenceDiagram
    actor Caller
    participant IthacaAccount
    participant MerkleProofLib
    participant ECDSA
    participant EfficientHashLib
    participant LibBytes

    Caller->>IthacaAccount: unwrapAndValidateSignature(digest, signature)
    alt signature.length == 65
        IthacaAccount->>ECDSA: recoverCalldata(digest, signature)
        ECDSA-->>IthacaAccount: signer
        IthacaAccount-->>Caller: isValid, keyHash(0)
    else wrapped signature
        IthacaAccount->>LibBytes: loadCalldata(signature, n)
        LibBytes-->>IthacaAccount: keyHash
        IthacaAccount->>LibBytes: truncatedCalldata(signature, n)
        LibBytes-->>IthacaAccount: innerSignature
        IthacaAccount->>LibBytes: loadCalldata(innerSignature, n+1)
        LibBytes-->>IthacaAccount: prehashFlag
        alt prehashFlag != 0
            IthacaAccount->>EfficientHashLib: sha2(digest)
            EfficientHashLib-->>IthacaAccount: digestSha2
        end
        IthacaAccount->>LibBytes: loadCalldata(innerSignature, n+2)
        LibBytes-->>IthacaAccount: merkleFlag
        alt merkleFlag != 0
            IthacaAccount->>IthacaAccount: _verifyMerkleSig(digest, innerSignature)
            activate IthacaAccount
            IthacaAccount->>MerkleProofLib: verifyCalldata(proof, root, digest)
            MerkleProofLib-->>IthacaAccount: proofIsValid
            alt proofIsValid
                IthacaAccount->>IthacaAccount: unwrapAndValidateSignature(root, rootSig)
                IthacaAccount-->>IthacaAccount: isValidRoot, keyHash
                IthacaAccount-->>Caller: isValidRoot, keyHash
            else proof invalid
                IthacaAccount-->>Caller: false, keyHash(0)
            end
            deactivate IthacaAccount
        else non Merkle wrapped signature
            IthacaAccount->>IthacaAccount: getKey(keyHash)
            IthacaAccount-->>Caller: isValid, keyHash
        end
    end

Loading

Class diagram for IthacaAccount Merkle signature support

classDiagram
    class IthacaAccount {
        <<contract>>
        +unwrapAndValidateSignature(digest bytes32, signature bytes) bool, bytes32
        -_verifyMerkleSig(digest bytes32, signature bytes) bool, bytes32
        +getKey(keyHash bytes32) Key
        +eip712Domain() string, string
    }

    class MerkleProofLib {
        <<library>>
        +verifyCalldata(proof bytes32[], root bytes32, leaf bytes32) bool
    }

    class ECDSA {
        <<library>>
        +recoverCalldata(hash bytes32, signature bytes) address
    }

    class EfficientHashLib {
        <<library>>
        +sha2(input bytes32) bytes32
    }

    class LibBytes {
        <<library>>
        +loadCalldata(data bytes, index uint256) uint256
        +truncatedCalldata(data bytes, newLength uint256) bytes
    }

    class Key {
        <<struct>>
        +addr address
        +weight uint256
        +validAfter uint48
        +validUntil uint48
    }

    IthacaAccount ..|> EIP712
    IthacaAccount ..|> GuardedExecutor
    IthacaAccount ..|> IIthacaAccount

    IthacaAccount ..> MerkleProofLib : uses
    IthacaAccount ..> ECDSA : uses
    IthacaAccount ..> EfficientHashLib : uses
    IthacaAccount ..> LibBytes : uses
    IthacaAccount o--> Key : returns

Loading

File-Level Changes

Change	Details	Files
Introduce Merkle tree signature verification path in IthacaAccount and extend wrapped-signature encoding to include a merkle flag.	Import MerkleProofLib and add internal _verifyMerkleSig that decodes proof/root/rootSig from calldata using inline assembly and verifies the leaf digest against the root with MerkleProofLib.verifyCalldata, then validates the root signature via unwrapAndValidateSignature Change unwrapAndValidateSignature encoding from abi.encodePacked(bytes(innerSignature), bytes32(keyHash), bool(prehash)) to abi.encode(bytes(innerSignature), bytes32(keyHash), bool(prehash), bool(merkle)), adjust footer parsing (length and offsets), and route to _verifyMerkleSig when the merkle flag is set Bump EIP712 version string from 0.5.10 to 0.5.11	src/IthacaAccount.sol
Add comprehensive Merkle-signature fuzz test and adapt existing tests/helpers to the new wrapped-signature layout with an explicit merkle flag byte.	Import Merkle from murky and add testMerkleSignature fuzz test that builds a random Merkle tree of digests, constructs a Merkle-based wrapped signature, and asserts correctness for valid leaves, non-member digests, tampered proofs, and tampered roots Simplify eip712Domain usage in Account tests to ignore unused name/version fields after version bump Update helper signature constructors (_p256Sig, _secp256k1Sig, _multiSig) and various test signatures (Account, Orchestrator, SimulateExecute, gas-estimation helpers) to append an extra uint8(0) merkle flag to match the new unwrapAndValidateSignature format	test/Account.t.sol test/Base.t.sol test/Orchestrator.t.sol test/SimulateExecute.t.sol

Possibly linked issues

• Fix tests account #30: The PR implements IthacaAccount Merkle-backed wrapped signature verification, merkle flag handling, and test updates exactly as described.
• Fix tests account #30: PR introduces MerkleProofLib-based wrapped signature verification, new Merkle flag handling, tests, and version bump exactly as the issue specifies.

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[snyk-io]

✅ Snyk checks have passed. No issues have been found so far.

Status	Scan Engine	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

[gemini-code-assist]

Summary of Changes

Hello, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly extends the IthacaAccount contract's signature verification capabilities by integrating Merkle tree-based signatures. This enhancement provides a flexible and secure way to verify a digest against a set of pre-approved digests, potentially optimizing gas usage for certain authorization patterns. The changes involve updating the core signature validation logic and introducing a dedicated function for Merkle proof verification, supported by a new version bump and thorough testing.

Highlights

• Merkle Signature Verification: Introduced the capability to verify Merkle tree-based signatures within the IthacaAccount contract, enabling a new method for authorization.
• Signature Encoding Update: Modified the signature encoding scheme to include a new boolean flag indicating whether a signature is a Merkle signature, allowing the unwrapAndValidateSignature function to handle both traditional and Merkle-based signatures.
• Comprehensive Testing: Added extensive test cases for Merkle signature verification, covering valid proofs, invalid digests, tampered proofs, and incorrect roots to ensure robustness.

Changelog

• src/IthacaAccount.sol
  • Imported MerkleProofLib for Merkle tree operations.
  • Added a new internal function _verifyMerkleSig to handle Merkle proof and root signature verification.
  • Modified the unwrapAndValidateSignature function to parse a new merkle flag from the signature and conditionally call _verifyMerkleSig.
  • Updated the contract version from "0.5.10" to "0.5.11".
• test/Account.t.sol
  • Imported the Merkle library for Merkle tree generation in tests.
  • Added a new test function testMerkleSignature to validate the Merkle signature verification logic under various conditions.
  • Adjusted the destructuring of eip712Domain in a test helper function.
• test/Base.t.sol
  • Modified the signature encoding in _p256Sig, _sig, _multiSig, _estimateGasForEOAKey, and _estimateGasForSecp256r1Key to include a new merkle flag set to false.
  • Updated the abi.encodePacked calls to append an additional uint8(0) for the new merkle flag.
• test/Orchestrator.t.sol
  • Modified the signature encoding in an _estimateGas helper function to include a new merkle flag set to false.
  • Updated the abi.encodePacked call to append an additional uint8(0) for the new merkle flag.
• test/SimulateExecute.t.sol
  • Modified the signature encoding in a test helper function to include a new merkle flag set to false.
  • Updated the abi.encodePacked call to append an additional uint8(0) for the new merkle flag.

Activity

• Dargon789 created this pull request.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[sourcery-ai]

Hey - I've found 1 issue, and left some high level feedback:

• The wrapped signature format is now innerSig || keyHash || prehashFlag || merkleFlag but this is still described as abi.encode(bytes(innerSignature), bytes32(keyHash), bool(prehash), bool(merkle)) in the comment; consider updating the docstring (and/or introducing a small helper/struct) so the documented encoding exactly matches the unwrapAndValidateSignature implementation and the test helpers.
• The unwrapAndValidateSignature parsing logic now relies on several magic constants (0x22, n + 1, n + 2) combined with LibBytes.truncatedCalldata; consider refactoring this into a small helper with named constants or interim variables for the flag positions to make the layout easier to reason about and less error-prone to extend.
• The inline assembly in _verifyMerkleSig that decodes (bytes32[] proof, bytes32 root, bytes rootSig) from calldata is non-trivial; adding minimal internal documentation (e.g., which slot corresponds to which ABI head/tail and why the offsets are added to signature.offset) would make future maintenance and audits of this critical path safer.

Prompt for AI Agents

Please address the comments from this code review:

## Overall Comments
- The wrapped signature format is now `innerSig || keyHash || prehashFlag || merkleFlag` but this is still described as `abi.encode(bytes(innerSignature), bytes32(keyHash), bool(prehash), bool(merkle))` in the comment; consider updating the docstring (and/or introducing a small helper/struct) so the documented encoding exactly matches the `unwrapAndValidateSignature` implementation and the test helpers.
- The `unwrapAndValidateSignature` parsing logic now relies on several magic constants (`0x22`, `n + 1`, `n + 2`) combined with `LibBytes.truncatedCalldata`; consider refactoring this into a small helper with named constants or interim variables for the flag positions to make the layout easier to reason about and less error-prone to extend.
- The inline assembly in `_verifyMerkleSig` that decodes `(bytes32[] proof, bytes32 root, bytes rootSig)` from calldata is non-trivial; adding minimal internal documentation (e.g., which slot corresponds to which ABI head/tail and why the offsets are added to `signature.offset`) would make future maintenance and audits of this critical path safer.

## Individual Comments

### Comment 1
<location path="src/IthacaAccount.sol" line_range="525-528" />
<code_context>
     /// @dev Returns if the signature is valid, along with its `keyHash`.
     /// The `signature` is a wrapped signature, given by
-    /// `abi.encodePacked(bytes(innerSignature), bytes32(keyHash), bool(prehash))`.
+    /// `abi.encode(bytes(innerSignature), bytes32(keyHash), bool(prehash), bool(merkle))`.
     function unwrapAndValidateSignature(bytes32 digest, bytes calldata signature)
         public
</code_context>
<issue_to_address>
**issue (bug_risk):** Wrapped signature decoding still assumes a packed layout, which conflicts with the documented `abi.encode` format.

The docstring now specifies `abi.encode(bytes(innerSignature), bytes32(keyHash), bool(prehash), bool(merkle))`, but the decoder still treats the data as tightly packed: it derives `keyHash` from `length - 0x22` and reads two 1‑byte flags at `n + 1`/`n + 2`. Under `abi.encode`, `keyHash`, `prehash`, and `merkle` would each live in separate 32‑byte ABI slots, so this decoding will read the wrong values if callers follow the new format. Please either keep `abi.encodePacked` and update the docs, or change the decoding logic to consume the proper ABI‑encoded words for all three fields.
</issue_to_address>

Fix all in Cursor

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}

[gemini-code-assist]

Code Review

This pull request introduces Merkle tree-based signature support, which is a significant enhancement. The overall implementation is well-structured, and the addition of fuzz-style tests for the new signature scheme is commendable. However, I've identified a critical issue in the signature unwrapping logic that affects both the existing and new code paths. This bug needs to be addressed to ensure the correctness of signature validations.

[Dargon789]

@Mergifyio refresh

[mergify]

refresh

✅ Pull request refreshed

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
legion	Ready	Preview, Comment	Apr 7, 2026 3:40pm

[Dargon789]

@Mergifyio refresh

[mergify]

refresh

✅ Pull request refreshed

[Dargon789]

@Mergifyio refresh

[mergify]

refresh

✅ Pull request refreshed

[Dargon789]

@Mergifyio refresh

[mergify]

refresh

✅ Pull request refreshed