get SignatureAlgorithmIndex back in accordance with circuits

This commit is contained in:
0xturboblitz
2024-09-14 13:33:35 +09:00
parent aa01c8e85c
commit 8e2dd94554
2 changed files with 21 additions and 22 deletions

View File

@@ -10,6 +10,7 @@ import { n_dsc, k_dsc, n_dsc_ecdsa, k_dsc_ecdsa, PASSPORT_ATTESTATION_ID } from
import { genMockPassportData } from '../../common/src/utils/genMockPassportData';
import { getCircuitName, parseDSC } from '../../common/src/utils/handleCertificate';
import { SignatureAlgorithm } from '../../common/tests/genMockPassportData.test';
import { getLeaf } from '../../common/src/utils/pubkeyTree';
const sigAlgs = [
{ sigAlg: 'rsa', hashFunction: 'sha1' },
@@ -68,23 +69,21 @@ sigAlgs.forEach(({ sigAlg, hashFunction }) => {
.blinded_dsc_commitment;
console.log('\x1b[34m%s\x1b[0m', 'blinded_dsc_commitment', blinded_dsc_commitment);
// const mrz_bytes = packBytes(inputs.mrz);
// for ecdsa:
// const leaf = getLeaf(passportData).toString();
const mrz_bytes = packBytes(inputs.mrz);
const leaf = getLeaf(passportData).toString();
// const commitment_bytes = poseidon6([
// inputs.secret[0],
// PASSPORT_ATTESTATION_ID,
// computeLeafFromModulusBigInt(BigInt(hexToDecimal(modulus as string))),
// mrz_bytes[0],
// mrz_bytes[1],
// mrz_bytes[2],
// ]);
// const commitment_js = commitment_bytes.toString();
// //console.log('commitment_js', commitment_js)
// //console.log('commitment_circom', commitment_circom)
const commitment_bytes = poseidon6([
inputs.secret[0],
PASSPORT_ATTESTATION_ID,
leaf,
mrz_bytes[0],
mrz_bytes[1],
mrz_bytes[2],
]);
const commitment_js = commitment_bytes.toString();
console.log('commitment_js', commitment_js)
console.log('commitment_circom', commitment_circom)
// TODO: fix with new leaf hasher
// expect(commitment_circom).to.be.equal(commitment_js);
});

View File

@@ -21,12 +21,12 @@ export const DEVELOPMENT_MODE = true
export const DEFAULT_MAJORITY = "18"
export enum SignatureAlgorithmIndex {
rsa_sha1 = 1,
rsa_sha256 = 2,
rsapss_sha256 = 3,
ecdsa_sha256 = 4,
ecdsa_sha1 = 5,
ecdsa_sha384 = 6,
rsa_sha256 = 1,
rsa_sha1 = 3,
rsapss_sha256 = 4,
ecdsa_sha1 = 7,
ecdsa_sha256 = 8,
ecdsa_sha384 = 9,
}
export const attributeToPosition = {