Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
addressable (2.8.8)
public_suffix (>= 2.0.2, < 8.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.4.0)
aws-partitions (1.1184.0)
aws-sdk-core (3.237.0)
aws-partitions (1.1188.0)
aws-sdk-core (3.239.2)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
bigdecimal
jmespath (~> 1, >= 1.6.1)
logger
aws-sdk-kms (1.117.0)
aws-sdk-core (~> 3, >= 3.234.0)
aws-sdk-kms (1.118.0)
aws-sdk-core (~> 3, >= 3.239.1)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.203.1)
aws-sdk-s3 (1.205.0)
aws-sdk-core (~> 3, >= 3.234.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
Expand Down Expand Up @@ -87,7 +87,7 @@ GEM
commander (4.6.0)
highline (~> 2.0.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
connection_pool (2.5.5)
declarative (0.0.20)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
Expand Down
2 changes: 1 addition & 1 deletion circuits/circuits/utils/aadhaar/extractQrData.circom
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma circom 2.1.9;

include "anon-aadhaar-circuits/src/helpers/constants.circom";
include "@selfxyz/aa-circuits/src/helpers/constants.circom";
include "circomlib/circuits/comparators.circom";
include "circomlib/circuits/bitify.circom";
include "circomlib/circuits/poseidon.circom";
Expand Down
4 changes: 2 additions & 2 deletions circuits/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@
"test-rsa-pss": "yarn test-base 'tests/utils/rsapss.test.ts' --exit"
},
"dependencies": {
"@anon-aadhaar/core": "npm:@selfxyz/anon-aadhaar-core@^0.0.1",
"@anon-aadhaar/core": "npm:@selfxyz/[email protected]",
"@noble/curves": "^1.4.2",
"@openpassport/zk-email-circuits": "^6.1.2",
"@openpassport/zk-kit-imt": "^0.0.4",
"@openpassport/zk-kit-lean-imt": "^0.0.4",
"@openpassport/zk-kit-smt": "^0.0.1",
"@selfxyz/aa-circuits": "^0.0.1",
"@selfxyz/common": "workspace:^",
"@zk-email/circuits": "^6.3.2",
"@zk-email/helpers": "^6.1.1",
Expand All @@ -52,7 +53,6 @@
"@zk-email/zk-regex-circom": "^1.2.1",
"@zk-kit/binary-merkle-root.circom": "2.0.0",
"@zk-kit/circuits": "^1.0.0-beta",
"anon-aadhaar-circuits": "https://gitpkg.vercel.app/selfxyz/anon-aadhaar/packages/circuits?main",
"asn1": "^0.2.6",
"asn1.js": "^5.4.1",
"asn1js": "^3.0.5",
Expand Down
4 changes: 2 additions & 2 deletions circuits/tests/disclose/vc_and_disclose_aadhaar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import nameAndYobAadhaarjson from '../consts/ofac/nameAndYobAadhaarSMT.json' wit
import fs from 'fs';

const __dirname = path.dirname(fileURLToPath(import.meta.url));
// const privateKeyPath = path.join(__dirname, '../../../node_modules/anon-aadhaar-circuits/assets/testPrivateKey.pem');
// const privateKeyPath = path.join(__dirname, '../../../node_modules/@selfxyz/aa-circuits/assets/testPrivateKey.pem');
const privateKeyPem = fs.readFileSync(
path.join(__dirname, '../../node_modules/anon-aadhaar-circuits/assets/testPrivateKey.pem'),
path.join(__dirname, '../../node_modules/@selfxyz/aa-circuits/assets/testPrivateKey.pem'),
'utf8'
);

Expand Down
4 changes: 2 additions & 2 deletions circuits/tests/other_circuits/qrdata_extractor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import fs from 'fs';
const __dirname = path.dirname(fileURLToPath(import.meta.url));

const privateKeyPem = fs.readFileSync(
path.join(__dirname, '../../node_modules/anon-aadhaar-circuits/assets/testPrivateKey.pem'),
path.join(__dirname, '../../node_modules/@selfxyz/aa-circuits/assets/testPrivateKey.pem'),
'utf8'
);

Expand All @@ -29,7 +29,7 @@ describe('Aadhaar QR Data Extractor1', function () {
logOutput: true,
include: [
'node_modules',
'node_modules/anon-aadhaar-circuits/src/helpers/constants.circom',
'node_modules/@selfxyz/aa-circuits/src/helpers/constants.circom',
'node_modules/circomlib/circuits',
],
}
Expand Down
4 changes: 2 additions & 2 deletions circuits/tests/register/register_aadhaar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import { pubkeys } from './pubkeys.js';
const __dirname = path.dirname(new URL(import.meta.url).pathname);

const privateKeyPem = fs.readFileSync(
path.join(__dirname, '../../node_modules/anon-aadhaar-circuits/assets/testPrivateKey.pem'),
path.join(__dirname, '../../node_modules/@selfxyz/aa-circuits/assets/testPrivateKey.pem'),
'utf8'
);
const publicKeyPem = fs.readFileSync(
path.join(__dirname, '../../node_modules/anon-aadhaar-circuits/assets/testPublicKey.pem'),
path.join(__dirname, '../../node_modules/@selfxyz/aa-circuits/assets/testPublicKey.pem'),
'utf8'
);

Expand Down
2 changes: 1 addition & 1 deletion common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@
"types": "tsc -p tsconfig.json"
},
"dependencies": {
"@anon-aadhaar/core": "npm:@selfxyz/anon-aadhaar-core@^0.0.1",
"@anon-aadhaar/core": "npm:@selfxyz/[email protected]",
"@noble/hashes": "^1.5.0",
"@openpassport/zk-kit-imt": "^0.0.5",
"@openpassport/zk-kit-lean-imt": "^0.0.6",
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/v2/discloseAadhaar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { formatInput } from "@selfxyz/common/utils/circuits/generateInputs";
import fs from "fs";

const privateKeyPem = fs.readFileSync(
path.join(__dirname, "../../../circuits/node_modules/anon-aadhaar-circuits/assets/testPrivateKey.pem"),
path.join(__dirname, "../../../circuits/node_modules/@selfxyz/aa-circuits/assets/testPrivateKey.pem"),
"utf8",
);

Expand Down
2 changes: 1 addition & 1 deletion contracts/test/v2/registerAadhaar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { generateRegisterAadhaarProof } from "../utils/generateProof";
import fs from "fs";

const privateKeyPem = fs.readFileSync(
path.join(__dirname, "../../../circuits/node_modules/anon-aadhaar-circuits/assets/testPrivateKey.pem"),
path.join(__dirname, "../../../circuits/node_modules/@selfxyz/aa-circuits/assets/testPrivateKey.pem"),
"utf8",
);
const pubkeyPem = fs.readFileSync(
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ __metadata:
languageName: node
linkType: hard

"@anon-aadhaar/core@npm:@selfxyz/anon-aadhaar-core@^0.0.1":
"@anon-aadhaar/core@npm:@selfxyz/[email protected]":
version: 0.0.1
resolution: "@selfxyz/anon-aadhaar-core@npm:0.0.1"
dependencies:
Expand Down Expand Up @@ -7554,16 +7554,27 @@ __metadata:
languageName: node
linkType: hard

"@selfxyz/aa-circuits@npm:^0.0.1":
version: 0.0.1
resolution: "@selfxyz/aa-circuits@npm:0.0.1"
dependencies:
"@anon-aadhaar/core": "npm:^2.4.3"
"@zk-email/circuits": "npm:^6.1.1"
checksum: 10c0/16dc3a9e7b1f772b1d849dd0c3c71f3bc17282d5bbb874082b19ff9bbeba65908a76e7986e9e161daf3b68dc4891c89ca4cdd5d13f64dd26c7b808309469a0e9
languageName: node
linkType: hard

"@selfxyz/circuits@workspace:circuits":
version: 0.0.0-use.local
resolution: "@selfxyz/circuits@workspace:circuits"
dependencies:
"@anon-aadhaar/core": "npm:@selfxyz/anon-aadhaar-core@^0.0.1"
"@anon-aadhaar/core": "npm:@selfxyz/[email protected]"
"@noble/curves": "npm:^1.4.2"
"@openpassport/zk-email-circuits": "npm:^6.1.2"
"@openpassport/zk-kit-imt": "npm:^0.0.4"
"@openpassport/zk-kit-lean-imt": "npm:^0.0.4"
"@openpassport/zk-kit-smt": "npm:^0.0.1"
"@selfxyz/aa-circuits": "npm:^0.0.1"
"@selfxyz/common": "workspace:^"
"@types/chai": "npm:4.3.11"
"@types/chai-as-promised": "npm:^7.1.6"
Expand All @@ -7579,7 +7590,6 @@ __metadata:
"@zk-email/zk-regex-circom": "npm:^1.2.1"
"@zk-kit/binary-merkle-root.circom": "npm:2.0.0"
"@zk-kit/circuits": "npm:^1.0.0-beta"
anon-aadhaar-circuits: "https://gitpkg.vercel.app/selfxyz/anon-aadhaar/packages/circuits?main"
asn1: "npm:^0.2.6"
asn1.js: "npm:^5.4.1"
asn1js: "npm:^3.0.5"
Expand Down Expand Up @@ -7613,7 +7623,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@selfxyz/common@workspace:common"
dependencies:
"@anon-aadhaar/core": "npm:@selfxyz/anon-aadhaar-core@^0.0.1"
"@anon-aadhaar/core": "npm:@selfxyz/[email protected]"
"@noble/hashes": "npm:^1.5.0"
"@openpassport/zk-kit-imt": "npm:^0.0.5"
"@openpassport/zk-kit-lean-imt": "npm:^0.0.6"
Expand Down Expand Up @@ -14505,16 +14515,6 @@ __metadata:
languageName: node
linkType: hard

"anon-aadhaar-circuits@https://gitpkg.vercel.app/selfxyz/anon-aadhaar/packages/circuits?main":
version: 2.4.3
resolution: "anon-aadhaar-circuits@https://gitpkg.vercel.app/selfxyz/anon-aadhaar/packages/circuits?main"
dependencies:
"@anon-aadhaar/core": "npm:^2.4.3"
"@zk-email/circuits": "npm:^6.1.1"
checksum: 10c0/93138d1c251988402482f1719ed37764b962250a51deb67bf5b855b91a6f89df2776ffe6135e8accc7a0d57dd13e7c210fc02fc6562af249ea4305f24d7d55f4
languageName: node
linkType: hard

"anser@npm:^1.4.9":
version: 1.4.10
resolution: "anser@npm:1.4.10"
Expand Down
Loading