Skip to content

chore: add validity period check on zkpassport #17054

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
just-mitch merged 7 commits into from
Sep 16, 2025
Merged

chore: add validity period check on zkpassport #17054

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dbd8731
chore: update zkpassport version
saleel Sep 15, 2025
3db2a27
update address in StakingAssetHandlerScript
saleel Sep 15, 2025
e988845
fix type
saleel Sep 15, 2025
c1bb557
fmt
saleel Sep 15, 2025
ae9bcab
enforce empty custom data
saleel Sep 16, 2025
5df7736
Merge branch 'v2' into saleel/zkpassport-update-v2
saleel Sep 16, 2025
e9d57fb
Set validity period
saleel Sep 16, 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
22 changes: 14 additions & 8 deletions l1-contracts/src/mock/StakingAssetHandler.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ interface IStakingAssetHandler {
error InvalidAge();
error InvalidCountry();
error InvalidCurrentDate();
error InvalidValidityPeriod();
error ExtraDiscloseDataNonZero();
error SybilDetected(bytes32 _nullifier);
error AttesterDoesNotExist(address _attester);
error NoNullifier();
Expand Down Expand Up @@ -129,12 +131,12 @@ contract StakingAssetHandler is IStakingAssetHandler, Ownable {

address public withdrawer;

// ZKPassport constraints
string public validDomain;
string public validScope;

// ZKPassport - Age constraints
uint256 public minAge = 18;
uint256 public maxAge = 0;
uint256 public validValidityPeriodInSeconds = 7 days;
uint256 public validMinAge = 18;
uint256 public validMaxAge = 0;

// ZKPassport - Excluded counties
bytes32 internal pkr = keccak256(bytes("PRK"));
Expand Down Expand Up @@ -316,19 +318,23 @@ contract StakingAssetHandler is IStakingAssetHandler, Ownable {

if (!skipBindCheck) {
bytes memory data = zkPassportVerifier.getBindProofInputs(_params.committedInputs, _params.committedInputCounts);
// Use the getBoundData function to get the formatted data
// which includes the user's address, chainId and any custom data
(address boundAddress, uint256 chainId,) = zkPassportVerifier.getBoundData(data);

(address boundAddress, uint256 chainId, string memory customData) = zkPassportVerifier.getBoundData(data);
// Make sure the bound user address is the same as the _attester
require(boundAddress == _attester, InvalidBoundAddress(boundAddress, _attester));
// Make sure the chainId is the same as the current chainId
require(chainId == block.chainid, InvalidChainId(chainId, block.chainid));
// Make sure the custom data is empty
require(bytes(customData).length == 0, ExtraDiscloseDataNonZero());

// Validity period check
require(validValidityPeriodInSeconds == _params.validityPeriodInSeconds, InvalidValidityPeriod());

// Age check
(uint256 currentDate, uint8 minAge, uint8 maxAge) =
zkPassportVerifier.getAgeProofInputs(_params.committedInputs, _params.committedInputCounts);
require(block.timestamp >= currentDate, InvalidCurrentDate());
require(minAge == minAge && maxAge == maxAge, InvalidAge());
require(validMinAge == minAge && validMaxAge == maxAge, InvalidAge());

// Country exclusion check
string[] memory exclusionCountryList = zkPassportVerifier.getCountryProofInputs(
Expand Down
Loading