github/self
1
1
Fork 0
mirror of https://github.com/selfxyz/self.git synced 2026-04-27 03:01:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

add error code in the return value (#171)

Browse Source
This commit is contained in:
nicoshark
2025-02-19 15:21:16 -08:00
committed by GitHub
parent 5534b7a91a
commit 43d968e8d6
2 changed files with 94 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
contracts/contracts/sdk/VerifyAll.sol
View File

@@ -40,14 +40,39 @@ contract VerifyAll is Ownable {
view
returns (
IIdentityVerificationHubV1.ReadableRevealedData memory,
bool
bool,
string memory
)
{
IIdentityVerificationHubV1.VcAndDiscloseVerificationResult memory result;
try _hub.verifyVcAndDisclose(proof) returns (IIdentityVerificationHubV1.VcAndDiscloseVerificationResult memory _result) {
result = _result;
} catch {
} catch (bytes memory lowLevelData) {
string memory errorCode;
if (lowLevelData.length >= 4) {
bytes4 errorSelector;
assembly {
errorSelector := mload(add(lowLevelData, 32))
}
if (errorSelector == bytes4(keccak256("LENGTH_MISMATCH()"))) {
errorCode = "LENGTH_MISMATCH";
} else if (errorSelector == bytes4(keccak256("NO_VERIFIER_SET()"))) {
errorCode = "NO_VERIFIER_SET";
} else if (errorSelector == bytes4(keccak256("CURRENT_DATE_NOT_IN_VALID_RANGE()"))) {
errorCode = "CURRENT_DATE_NOT_IN_VALID_RANGE";
} else if (errorSelector == bytes4(keccak256("INVALID_OLDER_THAN()"))) {
errorCode = "INVALID_OLDER_THAN";
} else if (errorSelector == bytes4(keccak256("INVALID_OFAC()"))) {
errorCode = "INVALID_OFAC";
} else if (errorSelector == bytes4(keccak256("INVALID_OFAC_ROOT()"))) {
errorCode = "INVALID_OFAC_ROOT";
} else if (errorSelector == bytes4(keccak256("INVALID_FORBIDDEN_COUNTRIES()"))) {
errorCode = "INVALID_FORBIDDEN_COUNTRIES";
} else if (errorSelector == bytes4(keccak256("INVALID_VC_AND_DISCLOSE_PROOF()"))) {
errorCode = "INVALID_VC_AND_DISCLOSE_PROOF";
}
}
IIdentityVerificationHubV1.ReadableRevealedData memory emptyData = IIdentityVerificationHubV1.ReadableRevealedData({
issuingState: "",
name: new string[](0),
@@ -61,7 +86,7 @@ contract VerifyAll is Ownable {
nameAndDobOfac: 1,
nameAndYobOfac: 1
});
return (emptyData, false);
return (emptyData, false, errorCode);
}
if (targetRootTimestamp != 0) {
@@ -79,14 +104,14 @@ contract VerifyAll is Ownable {
nameAndDobOfac: 1,
nameAndYobOfac: 1
});
return (emptyData, false);
return (emptyData, false, "INVALID_TIMESTAMP");
}
}
uint256[3] memory revealedDataPacked = result.revealedDataPacked;
IIdentityVerificationHubV1.ReadableRevealedData memory readableData = _hub.getReadableRevealedData(revealedDataPacked, types);
return (readableData, true);
return (readableData, true, "");
}
/// @notice Updates the hub contract address

64
contracts/test/integration/verifyAll.test.ts
View File

@@ -228,4 +228,68 @@ describe("VerifyAll", () => {
});
});
describe("VerifyAll (Custom Error Handling)", () => {
it("should return error code 'INVALID_VC_AND_DISCLOSE_PROOF' when vcAndDisclose proof is invalid", async () => {
const { registry, owner } = deployedActors;
await registry.connect(owner).devAddIdentityCommitment(
ATTESTATION_ID.E_PASSPORT,
nullifier,
commitment
);
vcAndDiscloseProof.a[0] = generateRandomFieldElement();
const vcAndDiscloseHubProof = {
olderThanEnabled: true,
olderThan: "20",
forbiddenCountriesEnabled: true,
forbiddenCountriesListPacked: forbiddenCountriesListPacked,
ofacEnabled: [true, true, true],
vcAndDiscloseProof: vcAndDiscloseProof
};
const types = ["0", "1", "2"];
const [readableData, success, errorCode] = await verifyAll.verifyAll(
0,
vcAndDiscloseHubProof,
types
);
expect(success).to.be.false;
expect(errorCode).to.equal("INVALID_VC_AND_DISCLOSE_PROOF");
expect(readableData.name).to.be.empty;
});
it("should return error code 'CURRENT_DATE_NOT_IN_VALID_RANGE' when current date is out of range", async () => {
const { registry, owner } = deployedActors;
await registry.connect(owner).devAddIdentityCommitment(
ATTESTATION_ID.E_PASSPORT,
nullifier,
commitment
);
vcAndDiscloseProof.pubSignals[CIRCUIT_CONSTANTS.VC_AND_DISCLOSE_CURRENT_DATE_INDEX] = 0;
const vcAndDiscloseHubProof = {
olderThanEnabled: true,
olderThan: "20",
forbiddenCountriesEnabled: true,
forbiddenCountriesListPacked: forbiddenCountriesListPacked,
ofacEnabled: [true, true, true],
vcAndDiscloseProof: vcAndDiscloseProof
};
const types = ["0", "1", "2"];
const [readableData, success, errorCode] = await verifyAll.verifyAll(
0,
vcAndDiscloseHubProof,
types
);
expect(success).to.be.false;
expect(errorCode).to.equal("CURRENT_DATE_NOT_IN_VALID_RANGE");
expect(readableData.name).to.be.empty;
});
});
});