ghostchain/ghost-dao-contracts
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hashing for tree leaves added

Browse Source 
Signed-off-by: Uncle Stretch <uncle.stretch@ghostchain.io>
This commit is contained in:
Uncle Stretch 2026-07-30 22:11:29 +03:00
parent a6bca9e27f
commit 253a6314e0
Signed by: str3tch
GPG Key ID: 84F3190747EE79AA
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/types/Weaver.sol
View File

@ -52,7 +52,10 @@ abstract contract Weaver is IWeaver {
bytes32 left = bytes32(_treeNodes[session][j].upperLookup(atBlock)); bytes32 left = bytes32(_treeNodes[session][j].upperLookup(atBlock));
bytes32 right = bytes32(_treeNodes[session][j | 1].upperLookup(atBlock)); bytes32 right = bytes32(_treeNodes[session][j | 1].upperLookup(atBlock));
currentLevel[i] = Hashes.efficientKeccak256(left, right); bytes32 leftHash = Hashes.efficientKeccak256(left);
bytes32 rightHash = Hashes.efficientKeccak256(right);
currentLevel[i] = Hashes.efficientKeccak256(leftHash, rightHash);
unchecked { ++i; } unchecked { ++i; }
} }
@ -89,7 +92,8 @@ abstract contract Weaver is IWeaver {
uint256 i; uint256 i;
for (; i < currentLevelCount;) { for (; i < currentLevelCount;) {
currentLevel[i] = bytes32(_treeNodes[session][i].upperLookup(atBlock)); bytes32 leaf = bytes32(_treeNodes[session][i].upperLookup(atBlock));
currentLevel[i] = Hashes.efficientKeccak256(leaf);
unchecked { ++i; } unchecked { ++i; }
} }
@ -144,6 +148,6 @@ abstract contract Weaver is IWeaver {
} }
function _computeArgumentsHash(uint256 i, uint256 a, bytes32 r) internal pure returns (bytes32) { function _computeArgumentsHash(uint256 i, uint256 a, bytes32 r) internal pure returns (bytes32) {
return Hashes.efficientKeccak256(bytes32(i), Hashes.efficientKeccak256(bytes32(a), r)); return Hashes.efficientKeccak256(Hashes.efficientKeccak256(bytes32(a), r), bytes32(i));
} }
} }

2
test/gatekeeper/GatekeeperWeaver.t.sol
View File

@ -76,6 +76,8 @@ contract GatekeeperVerification is Gatekeeper {
unchecked { ++i; } unchecked { ++i; }
} }
computedHash = Hashes.efficientKeccak256(computedHash);
i = 0; i = 0;
for (; i < proof.length; ) { for (; i < proof.length; ) {
if (slotIndex % 2 == 0) { if (slotIndex % 2 == 0) {