Skip to content

Findings 20: change input to nodeHash in getRegisteredNode() #33

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
hazim-j merged 2 commits into from
Aug 3, 2025
Merged

Findings 20: change input to nodeHash in getRegisteredNode() #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad70057
Findings 20: change input to nodeHash in getRegisteredNode()
hazim-j Aug 3, 2025
55ffbd5
dry
hazim-j Aug 3, 2025
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 snapshots/Keystore32NodeUCMT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"1. registerNode": "76946",
"1. registerNode": "76859",
"2. validate (with proof)": "12407",
"3. validate (without proof)": "5284",
"4. handleUpdates (with proof)": "64278",
Expand Down
4 changes: 2 additions & 2 deletions src/core/Keystore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ contract Keystore is IKeystore {
_nodeCache[rootHash][nodeHash][msg.sender] = node;
}

function getRegisteredNode(bytes32 refHash, address account, bytes calldata node)
function getRegisteredNode(bytes32 refHash, address account, bytes32 nodeHash)
external
view
returns (bytes memory)
{
return _nodeCache[_getCurrentRootHash(refHash, account)][keccak256(node)][account];
return _nodeCache[_getCurrentRootHash(refHash, account)][nodeHash][account];
}

function getRootHash(bytes32 refHash, address account) external view returns (bytes32 rootHash) {
Expand Down
2 changes: 1 addition & 1 deletion src/interface/IKeystore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface IKeystore {
function validate(ValidateAction calldata action) external view returns (uint256 validationData);

function registerNode(bytes32 refHash, bytes32[] calldata proof, bytes calldata node) external;
function getRegisteredNode(bytes32 refHash, address account, bytes calldata node)
function getRegisteredNode(bytes32 refHash, address account, bytes32 nodeHash)
external
view
returns (bytes memory);
Expand Down
37 changes: 21 additions & 16 deletions test/core/Keystore.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ contract KeystoreTest is Test {
vm.assume(node.length >= 20 && bytes20(node) != 0);

(bytes32 refHash, bytes memory proof) = _generateUCMT(nodes, index, node);
assertEq(keystore.getRegisteredNode(refHash, address(this), node).length, 0);
bytes32 nodeHash = keccak256(node);
assertEq(keystore.getRegisteredNode(refHash, address(this), nodeHash).length, 0);
_registerNode(refHash, proof, node);
assertGe(keystore.getRegisteredNode(refHash, address(this), node).length, 20);
assertGe(keystore.getRegisteredNode(refHash, address(this), nodeHash).length, 20);
}

function testFuzz_registerNodeWithMultipleRootHashUpdates(
Expand All @@ -71,26 +72,27 @@ contract KeystoreTest is Test {
assertEq(init.node, next.node);

// Registers a proof when rootHash == refHash
assertEq(keystore.getRegisteredNode(init.root, address(this), init.node).length, 0);
bytes32 initNodeHash = keccak256(init.node);
assertEq(keystore.getRegisteredNode(init.root, address(this), initNodeHash).length, 0);
_registerNode(init.root, init.proof, init.node);
assertGe(keystore.getRegisteredNode(init.root, address(this), init.node).length, 20);
assertGe(keystore.getRegisteredNode(init.root, address(this), initNodeHash).length, 20);

// Update rootHash to nextHash
keystore.handleUpdates(_getUpdateActions(init.root, next.root, 0, "", abi.encode(keccak256(init.node)), data));
assertEq(keystore.getRegisteredNode(init.root, address(this), init.node).length, 0);
keystore.handleUpdates(_getUpdateActions(init.root, next.root, 0, "", bytes.concat(initNodeHash), data));
assertEq(keystore.getRegisteredNode(init.root, address(this), initNodeHash).length, 0);

// Registers a proof when rootHash == nextHash
_registerNode(init.root, next.proof, next.node);
assertGe(keystore.getRegisteredNode(init.root, address(this), init.node).length, 20);
assertGe(keystore.getRegisteredNode(init.root, address(this), initNodeHash).length, 20);

// Update rootHash to finalHash
// Note: if finalHash is zero, then we are essentially going back to the
// refHash where the node is already cached. This is expected.
keystore.handleUpdates(_getUpdateActions(init.root, finalHash, 1, "", abi.encode(keccak256(next.node)), data));
keystore.handleUpdates(_getUpdateActions(init.root, finalHash, 1, "", bytes.concat(keccak256(next.node)), data));
if (finalHash == 0) {
assertGe(keystore.getRegisteredNode(init.root, address(this), init.node).length, 20);
assertGe(keystore.getRegisteredNode(init.root, address(this), initNodeHash).length, 20);
} else {
assertEq(keystore.getRegisteredNode(init.root, address(this), init.node).length, 0);
assertEq(keystore.getRegisteredNode(init.root, address(this), initNodeHash).length, 0);
}
}

Expand All @@ -100,20 +102,22 @@ contract KeystoreTest is Test {
vm.assume(node.length < 20);

(bytes32 root, bytes memory proof) = _generateUCMT(nodes, index, node);
assertEq(keystore.getRegisteredNode(root, address(this), node).length, 0);
bytes32 nodeHash = keccak256(node);
assertEq(keystore.getRegisteredNode(root, address(this), nodeHash).length, 0);
vm.expectRevert(IKeystore.InvalidNode.selector);
_registerNode(root, proof, node);
assertEq(keystore.getRegisteredNode(root, address(this), node).length, 0);
assertEq(keystore.getRegisteredNode(root, address(this), nodeHash).length, 0);
}

function testFuzz_registerNodeWithInvalidVerifier(bytes32[] calldata nodes, uint256 index) public {
bytes memory node = abi.encode(address(0));

(bytes32 root, bytes memory proof) = _generateUCMT(nodes, index, node);
assertEq(keystore.getRegisteredNode(root, address(this), node).length, 0);
bytes32 nodeHash = keccak256(node);
assertEq(keystore.getRegisteredNode(root, address(this), nodeHash).length, 0);
vm.expectRevert(IKeystore.InvalidVerifier.selector);
_registerNode(root, proof, node);
assertEq(keystore.getRegisteredNode(root, address(this), node).length, 0);
assertEq(keystore.getRegisteredNode(root, address(this), nodeHash).length, 0);
}

function testFuzz_registerNodeWithInvalidProof(
Expand All @@ -125,10 +129,11 @@ contract KeystoreTest is Test {
vm.assume(node.length >= 20 && bytes20(node) != 0);

(bytes32 root,) = _generateUCMT(nodes, index, node);
assertEq(keystore.getRegisteredNode(root, address(this), node).length, 0);
bytes32 nodeHash = keccak256(node);
assertEq(keystore.getRegisteredNode(root, address(this), nodeHash).length, 0);
vm.expectRevert(IKeystore.InvalidProof.selector);
_registerNode(root, abi.encode(badProof), node);
assertEq(keystore.getRegisteredNode(root, address(this), node).length, 0);
assertEq(keystore.getRegisteredNode(root, address(this), nodeHash).length, 0);
}

function testFuzz_validate(
Expand Down