redeploy with renamed ByteHasher function

pauldev20 · Nov 16, 2024 · 3e95f19 · 3e95f19
1 parent bbe76ef
commit 3e95f19
Show file tree

Hide file tree

Showing 10 changed files with 449 additions and 26 deletions.
diff --git a/packages/foundry/broadcast/Deploy.s.sol/480/run-1731794559.json b/packages/foundry/broadcast/Deploy.s.sol/480/run-1731794559.json
diff --git a/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json b/packages/foundry/broadcast/Deploy.s.sol/480/run-latest.json
diff --git a/packages/foundry/contracts/ByteHasher.sol b/packages/foundry/contracts/ByteHasher.sol
@@ -6,7 +6,7 @@ library ByteHasher {
     /// @param value The bytestring to hash
     /// @return The hash of the specified value
     /// @dev `>> 8` makes sure that the result is included in our field
-    function hashToField(bytes memory value) internal pure returns (uint256) {
+    function hashToFieldSixtyNine(bytes memory value) internal pure returns (uint256) {
         return uint256(keccak256(abi.encodePacked(value))) >> 8;
     }
 }
diff --git a/packages/foundry/contracts/HumanOracle.sol b/packages/foundry/contracts/HumanOracle.sol
@@ -119,7 +119,7 @@ contract HumanOracle {
 	constructor(address _worldIdAddr, uint256 _groupId, string memory _appId, string memory _action) {
 		worldId = IWorldID(_worldIdAddr);
 		groupId = _groupId;
-		externalNullifierHash = abi.encodePacked(abi.encodePacked(_appId).hashToField(), _action).hashToField();
+		externalNullifierHash = abi.encodePacked(abi.encodePacked(_appId).hashToFieldSixtyNine(), _action).hashToFieldSixtyNine();
 	}
 
 	// ====================
@@ -137,7 +137,7 @@ contract HumanOracle {
 		worldId.verifyProof(
 			merkleRoot,
 			groupId,
-			abi.encodePacked(userAddr).hashToField(),
+			abi.encodePacked(userAddr).hashToFieldSixtyNine(),
 			nullifierHash,
 			externalNullifierHash,
 			proof

diff --git a/packages/foundry/contracts/HumanOracleWithVault.sol b/packages/foundry/contracts/HumanOracleWithVault.sol
@@ -123,7 +123,7 @@ contract HumanOracleWithVault is Permit2Vault {
 		worldId = IWorldID(_worldIdAddr);
 		worldToken = IERC20(_worldTokenAddr);
 		groupId = _groupId;
-		externalNullifierHash = abi.encodePacked(abi.encodePacked(_appId).hashToField(), _action).hashToField();
+		externalNullifierHash = abi.encodePacked(abi.encodePacked(_appId).hashToFieldSixtyNine(), _action).hashToFieldSixtyNine();
 	}
 
 	// ====================
@@ -147,7 +147,7 @@ contract HumanOracleWithVault is Permit2Vault {
 		worldId.verifyProof(
 			merkleRoot,
 			groupId,
-			abi.encodePacked(userAddr).hashToField(),
+			abi.encodePacked(userAddr).hashToFieldSixtyNine(),
 			nullifierHash,
 			externalNullifierHash,
 			proof