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

factor generateCircuitInputs, convert jmrtd sig alg names to standard names

Browse Source
This commit is contained in:
0xturboblitz
2024-02-22 20:10:04 -07:00
parent 609768906a
commit 095c4c2fb1
10 changed files with 189 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
circuits/circuits/proof_of_passport.circom
View File

@@ -22,7 +22,7 @@ template ProofOfPassport(n, k, max_datahashes_bytes, nLevels, pubkeySize) {
signal input reveal_bitmap[88];
signal input address;
// Converting pub_key (modulus) into 11 chunks of 192 bits, assuming original n, k are 64 and 32.
// Converting pubkey (modulus) into 11 chunks of 192 bits, assuming original n, k are 64 and 32.
// This is because Poseidon circuit only supports an array of 16 elements.
var k3_chunked_size = 11; // Since ceil(32 / 3) in integer division is 11
signal pubkey_hash_input[k3_chunked_size];

81
circuits/test/passport.test.ts
View File

@@ -1,14 +1,10 @@
import { describe } from 'mocha'
import chai, { assert, expect } from 'chai'
import chaiAsPromised from 'chai-as-promised'
import { hash, toUnsignedByte, arraysAreEqual, bytesToBigDecimal, formatMrz, splitToWords, formatSigAlg } from '../../common/src/utils/utils'
import { groth16 } from 'snarkjs'
import { buildPubkeyTree } from '../../common/src/utils/pubkeyTree'
import { MAX_DATAHASHES_LEN, attributeToPosition, SignatureAlgorithm } from '../../common/src/constants/constants'
import { poseidon12 } from "poseidon-lite"
import { IMT } from '@zk-kit/imt'
import { attributeToPosition } from '../../common/src/constants/constants'
import { genSampleData } from '../../common/src/utils/passportData'
import { bigIntToChunkedBytes, sha256Pad } from '@zk-email/helpers'
import { generateCircuitInputs } from '../../common/src/utils/generateInputs'
import path from 'path'
import fs from 'fs'
import { PassportData } from '../../common/src/utils/types'
@@ -22,14 +18,14 @@ describe('Circuit tests', function () {
this.timeout(0)
let inputs: any;
let tree: IMT;
let pubkeys: any[];
let passportData: PassportData;
this.beforeAll(async () => {
pubkeys = JSON.parse(fs.readFileSync("../common/pubkeys/publicKeysParsed.json") as unknown as string)
passportData = genSampleData();
pubkeys = JSON.parse(fs.readFileSync("../common/pubkeys/publicKeysParsed.json") as unknown as string)
// for testing purposes
pubkeys = pubkeys.slice(0, 100);
pubkeys.push({
@@ -39,78 +35,21 @@ describe('Circuit tests', function () {
exponent: passportData.pubKey.exponent
})
tree = buildPubkeyTree(pubkeys);
const formattedMrz = formatMrz(passportData.mrz);
const concatenatedDataHashesHashDigest = hash(passportData.dataGroupHashes);
console.log('concatenatedDataHashesHashDigest', concatenatedDataHashesHashDigest);
assert(
arraysAreEqual(passportData.eContent.slice(72, 72 + 32), concatenatedDataHashesHashDigest),
'concatenatedDataHashesHashDigest is at the right place in passportData.eContent'
)
const reveal_bitmap = Array(88).fill('1');
const address = "0x70997970c51812dc3a010c7d01b50e0d17dc79c8";
const sigAlgFormatted = formatSigAlg(passportData.signatureAlgorithm, passportData.pubKey.exponent)
const pubkeyChunked = bigIntToChunkedBytes(BigInt(passportData.pubKey.modulus as string), 192, 11);
const leaf = poseidon12([SignatureAlgorithm[sigAlgFormatted], ...pubkeyChunked])
// console.log('leaf', leaf)
const index = tree.indexOf(leaf)
// console.log('index', index)
const proof = tree.createProof(index)
// console.log("proof", proof)
// console.log("verifyProof", tree.verifyProof(proof))
const [messagePadded, messagePaddedLen] = sha256Pad(
new Uint8Array(passportData.dataGroupHashes),
MAX_DATAHASHES_LEN
inputs = generateCircuitInputs(
passportData,
pubkeys,
reveal_bitmap,
address
);
inputs = {
mrz: formattedMrz.map(byte => String(byte)),
reveal_bitmap: reveal_bitmap.map(byte => String(byte)),
dataHashes: Array.from(messagePadded).map((x) => x.toString()),
datahashes_padded_length: messagePaddedLen.toString(),
eContentBytes: passportData.eContent.map(toUnsignedByte).map(byte => String(byte)),
signature: splitToWords(
BigInt(bytesToBigDecimal(passportData.encryptedDigest)),
BigInt(64),
BigInt(32)
),
signatureAlgorithm: SignatureAlgorithm[sigAlgFormatted],
pubkey: splitToWords(
BigInt(passportData.pubKey.modulus as string),
BigInt(64),
BigInt(32)
),
pathIndices: proof.pathIndices,
siblings: proof.siblings.flat(),
root: tree.root,
address: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8",
}
console.log('inputs', inputs)
})
describe('Proof', function() {
it('should prove and verify with valid inputs', async function () {
// testing with wasm_tester
const circuit = await wasm_tester(
path.join(__dirname, "../circuits/proof_of_passport.circom"),
{ include: ["node_modules"] },
);
const w = await circuit.calculateWitness(inputs);
console.log("witness calculated");
await circuit.checkConstraints(w);
console.log("finished checking constraints");
// proving
const { proof: zk_proof, publicSignals } = await groth16.fullProve(
inputs,
"build/proof_of_passport_js/proof_of_passport.wasm",

56
circuits/test/tree.test.ts
View File

@@ -7,6 +7,7 @@ import { IMT } from "@zk-kit/imt"
import { poseidon12, poseidon2, poseidon8 } from "poseidon-lite"
import { genSampleData } from '../../common/src/utils/passportData'
import { bigIntToChunkedBytes, formatSigAlg } from '../../common/src/utils/utils'
import { buildPubkeyTree } from '../../common/src/utils/pubkeyTree'
chai.use(chaiAsPromised)
@@ -35,7 +36,6 @@ describe('Merkle tree tests', function () {
const passportData = genSampleData();
this.beforeAll(async () => {
// log niche exponents
// for(let i = 0; i < pubkeys.length; i++) {
// if (pubkeys[i].exponent && pubkeys[i].exponent !== '65537') {
@@ -50,6 +50,8 @@ describe('Merkle tree tests', function () {
// }
// }
console.log('passportData.pubKey', passportData.pubKey)
if (DEV) {
pubkeys = pubkeys.slice(0, 100);
@@ -61,58 +63,10 @@ describe('Merkle tree tests', function () {
})
}
tree = new IMT(poseidon2, depth, zeroValue)
for(let i = 0; i < pubkeys.length; i++) {
const pubkey = pubkeys[i]
const sigAlgFormatted = formatSigAlg(pubkey.signatureAlgorithm, pubkey.exponent)
let leaf: bigint | undefined;
if (i % 3000 === 0 && i !== 0) {
console.log('Processing pubkey number', i, "over", pubkeys.length);
}
if (
sigAlgFormatted === "sha256WithRSAEncryption_65537"
|| sigAlgFormatted === "sha256WithRSAEncryption_3"
|| sigAlgFormatted === "sha1WithRSAEncryption_65537"
|| sigAlgFormatted === "rsassaPss_65537"
|| sigAlgFormatted === "rsassaPss_3"
|| sigAlgFormatted === "sha512WithRSAEncryption_65537"
) {
// Converting pubkey.modulus into 11 chunks of 192 bits, assuming it is originally 2048 bits.
// This is because Poseidon circuit only supports an array of 16 elements, and field size is 254.
const pubkeyChunked = bigIntToChunkedBytes(BigInt(pubkey.modulus), 192, 11);
// console.log('pubkeyChunked', pubkeyChunked.length, pubkeyChunked)
try {
// leaf is poseidon(signatureAlgorithm, ...pubkey)
leaf = poseidon12([SignatureAlgorithm[sigAlgFormatted], ...pubkeyChunked])
} catch(err) {
console.log('err', err, i, sigAlgFormatted, pubkey)
}
} else if (
sigAlgFormatted === "ecdsa_with_SHA1"
|| sigAlgFormatted === "ecdsa_with_SHA384"
|| sigAlgFormatted === "ecdsa_with_SHA256"
|| sigAlgFormatted === "ecdsa_with_SHA512"
) {
try {
leaf = poseidon8([SignatureAlgorithm[sigAlgFormatted], pubkey.pub, pubkey.prime, pubkey.a, pubkey.b, pubkey.generator, pubkey.order, pubkey.cofactor])
} catch(err) {
console.log('err', err, i, sigAlgFormatted, pubkey)
}
} else {
console.log('no leaf for this weird signature:', i, sigAlgFormatted)
continue
}
tree.insert(leaf)
}
tree = buildPubkeyTree(pubkeys)
})
describe('Tree only', function() {
describe.skip('Tree only', function() {
it('should prove and verify with valid inputs', async function () {
const sigAlgFormatted = formatSigAlg(passportData.signatureAlgorithm, passportData.pubKey.exponent)
const pubkeyChunked = bigIntToChunkedBytes(BigInt(passportData.pubKey.modulus as string), 192, 11);