diff --git a/circuits/tests/disclose/disclose.test.ts b/circuits/tests/disclose/disclose.test.ts index b6900ecd9..1cf6cb9c4 100644 --- a/circuits/tests/disclose/disclose.test.ts +++ b/circuits/tests/disclose/disclose.test.ts @@ -4,6 +4,8 @@ import { wasm as wasm_tester } from 'circom_tester'; import { formatMrz, packBytes } from '../../../common/src/utils/utils'; import { attributeToPosition, + k_dsc, + n_dsc, PASSPORT_ATTESTATION_ID, } from '../../../common/src/constants/constants'; import { poseidon1, poseidon2, poseidon6 } from 'poseidon-lite'; @@ -42,7 +44,7 @@ describe('Disclose', function () { const scope = '@coboyApp'; // compute the commitment and insert it in the tree - const pubkey_leaf = getLeaf(passportData).toString(); + const pubkey_leaf = getLeaf(passportData.dsc, n_dsc, k_dsc).toString(); const mrz_bytes = packBytes(formatMrz(passportData.mrz)); const commitment = poseidon6([ secret, diff --git a/circuits/tests/ofac/ofac.test.ts b/circuits/tests/ofac/ofac.test.ts index 8a7e168ae..e8e978b9a 100644 --- a/circuits/tests/ofac/ofac.test.ts +++ b/circuits/tests/ofac/ofac.test.ts @@ -11,7 +11,7 @@ import passportNojson from '../../../common/ofacdata/outputs/passportNoSMT.json' import nameDobjson from '../../../common/ofacdata/outputs/nameDobSMT.json'; import namejson from '../../../common/ofacdata/outputs/nameSMT.json'; import { PassportData } from '../../../common/src/utils/types'; -import { PASSPORT_ATTESTATION_ID } from '../../../common/src/constants/constants'; +import { k_dsc, n_dsc, PASSPORT_ATTESTATION_ID } from '../../../common/src/constants/constants'; import crypto from 'crypto'; import { genMockPassportData } from '../../../common/src/utils/genMockPassportData'; @@ -38,7 +38,7 @@ function getPassportInputs(passportData: PassportData) { const bitmap = Array(90).fill('1'); const scope = '@coboyApp'; - const pubkey_leaf = getLeaf(passportData); + const pubkey_leaf = getLeaf(passportData.dsc, n_dsc, k_dsc); const mrz_bytes = packBytes(formatMrz(passportData.mrz)); const commitment = poseidon6([ secret, diff --git a/common/src/utils/generateInputs.ts b/common/src/utils/generateInputs.ts index c52c23268..242371039 100644 --- a/common/src/utils/generateInputs.ts +++ b/common/src/utils/generateInputs.ts @@ -1,4 +1,4 @@ -import { MAX_DATAHASHES_LEN, PUBKEY_TREE_DEPTH, DEVELOPMENT_MODE, DEFAULT_USER_ID_TYPE } from '../constants/constants'; +import { MAX_DATAHASHES_LEN, PUBKEY_TREE_DEPTH, DEVELOPMENT_MODE, DEFAULT_USER_ID_TYPE, n_dsc, k_dsc } from '../constants/constants'; import { assert, shaPad } from './shaPad'; import { PassportData } from './types'; import { @@ -37,10 +37,10 @@ export function generateCircuitInputsRegister( // mocks: PassportData[] = mockPassportDatas mocks?: PassportData[] ) { - const { mrz, dsc, dataGroupHashes, eContent, encryptedDigest } = - passportData; + const { mrz, dsc, dataGroupHashes, eContent, encryptedDigest } = + passportData; - const { signatureAlgorithm, hashFunction, hashLen, x, y, modulus } = parseDSC(dsc); + const { signatureAlgorithm, hashFunction, hashLen, x, y, modulus } = parseDSC(dsc); // const tree = getCSCAModulusMerkleTree(DEVELOPMENT_MODE); @@ -142,7 +142,7 @@ export function generateCircuitInputsDisclose( scope: string, user_identifier: string ) { - const pubkey_leaf = getLeaf(passportData); + const pubkey_leaf = getLeaf(passportData.dsc, n_dsc, k_dsc); const formattedMrz = formatMrz(passportData.mrz); const mrz_bytes = packBytes(formattedMrz);