Skip to content

Commit b6bf07b

Browse files
authored
aadhaar disclose - wip (#1094)
1 parent f1f65c6 commit b6bf07b

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

app/src/utils/proving/provingMachine.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ const _generateCircuitInputs = async (
153153
const docStore =
154154
doc === 'passport'
155155
? protocolStore.passport
156-
: protocolStore.id_card;
156+
: doc === 'aadhaar'
157+
? protocolStore.aadhaar
158+
: protocolStore.id_card;
157159
switch (tree) {
158160
case 'ofac':
159161
return docStore.ofac_trees;
@@ -167,10 +169,7 @@ const _generateCircuitInputs = async (
167169
}
168170
},
169171
));
170-
circuitTypeWithDocumentExtension = getCircuitTypeWithDocumentExtension(
171-
circuitType,
172-
document,
173-
);
172+
circuitTypeWithDocumentExtension = `disclose`;
174173
break;
175174
default:
176175
throw new Error('Invalid circuit type:' + circuitType);
@@ -1218,7 +1217,10 @@ export const useProvingStore = create<ProvingState>((set, get) => {
12181217

12191218
let circuitName;
12201219
if (circuitType === 'disclose') {
1221-
circuitName = 'disclose';
1220+
circuitName =
1221+
passportData.documentCategory === 'aadhaar'
1222+
? 'disclose_aadhaar'
1223+
: 'disclose';
12221224
} else {
12231225
circuitName = getCircuitNameFromPassportData(
12241226
passportData,
@@ -1231,6 +1233,7 @@ export const useProvingStore = create<ProvingState>((set, get) => {
12311233
passportData as PassportData,
12321234
circuitName,
12331235
);
1236+
12341237
logProofEvent('info', 'Circuit resolution', baseContext, {
12351238
circuit_name: circuitName,
12361239
ws_url: wsRpcUrl,

common/src/utils/aadhaar/mockData.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,10 @@ export function prepareAadhaarDiscloseData(
242242
const inputs = {
243243
attestation_id: '3',
244244
secret,
245-
qrDataHash: BigInt(sharedData.qrHash).toString(),
246-
gender: genderAscii.toString(),
245+
qrDataHash: formatInput(BigInt(sharedData.qrHash)),
246+
gender: formatInput(genderAscii),
247+
// qrDataHash: BigInt(sharedData.qrHash).toString(),
248+
// gender: genderAscii.toString(),
247249
yob: stringToAsciiArray(sharedData.extractedFields.yob),
248250
mob: stringToAsciiArray(sharedData.extractedFields.mob),
249251
dob: stringToAsciiArray(sharedData.extractedFields.dob),
@@ -263,7 +265,7 @@ export function prepareAadhaarDiscloseData(
263265
ofac_name_yob_smt_leaf_key: formatInput(BigInt(ofac_name_yob_smt_leaf_key)),
264266
ofac_name_yob_smt_root: formatInput(BigInt(ofac_name_yob_smt_root)),
265267
ofac_name_yob_smt_siblings: formatInput(ofac_name_yob_smt_siblings),
266-
selector,
268+
selector: formatInput(selector),
267269
minimumAge: formatInput(discloseAttributes.minimumAge ?? 0),
268270
currentYear: formatInput(currentYear),
269271
currentMonth: formatInput(currentMonth),

common/src/utils/circuits/registerInputs.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,17 @@ function getSelectorDg1IdCard(disclosures: SelfAppDisclosureConfig) {
152152

153153
export function generateTEEInputsDiscloseStateless(
154154
secret: string,
155-
passportData: PassportData,
155+
passportData: IDDocument,
156156
selfApp: SelfApp,
157157
getTree: <T extends 'ofac' | 'commitment'>(
158158
doc: DocumentCategory,
159159
tree: T
160160
) => T extends 'ofac' ? OfacTree : any
161161
) {
162+
if (passportData.documentCategory === 'aadhaar') {
163+
const { inputs, circuitName, endpointType, endpoint } = generateTEEInputsAadhaarDisclose(secret, passportData, selfApp, getTree);
164+
return { inputs, circuitName, endpointType, endpoint };
165+
}
162166
const { scope, disclosures, endpoint, userId, userDefinedData, chainID } = selfApp;
163167
const userIdentifierHash = calculateUserIdentifierHash(chainID, userId, userDefinedData);
164168
const scope_hash = hashEndpointWithScope(endpoint, scope);

common/src/utils/proving.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function getPayload(
6868
) {
6969
if (circuitType === 'disclose') {
7070
const type = circuitName === 'vc_and_disclose' ? 'disclose' :
71-
circuitName === 'disclose_aadhaar' ? 'disclose_aadhaar' :
71+
circuitName === 'vc_and_disclose_aadhaar' ? 'disclose_aadhaar' :
7272
'disclose_id';
7373
const payload: TEEPayloadDisclose = {
7474
type,

0 commit comments

Comments
 (0)