diff --git a/circuits/circuits/disclose/disclose.circom b/circuits/circuits/disclose/disclose.circom index 2ef758e3a..15fe47f80 100644 --- a/circuits/circuits/disclose/disclose.circom +++ b/circuits/circuits/disclose/disclose.circom @@ -5,7 +5,7 @@ include "@zk-email/circuits/utils/bytes.circom"; include "../utils/isOlderThan.circom"; include "../utils/isValid.circom"; include "binary-merkle-root.circom"; -include "validatePassport.circom"; +include "../utils/validatePassport.circom"; template Disclose(nLevels) { signal input secret; diff --git a/circuits/circuits/ofac_nameDob_verifier.circom b/circuits/circuits/ofac/ofac_nameDob_verifier.circom similarity index 96% rename from circuits/circuits/ofac_nameDob_verifier.circom rename to circuits/circuits/ofac/ofac_nameDob_verifier.circom index 146bd15b2..14d031fda 100644 --- a/circuits/circuits/ofac_nameDob_verifier.circom +++ b/circuits/circuits/ofac/ofac_nameDob_verifier.circom @@ -3,8 +3,8 @@ pragma circom 2.1.5; include "circomlib/circuits/poseidon.circom"; include "circomlib/circuits/comparators.circom"; include "binary-merkle-root.circom"; -include "./utils/getCommonLength.circom"; -include "validatePassport.circom"; +include "../utils/getCommonLength.circom"; +include "../utils/validatePassport.circom"; template ProveNameDobNotInOfac(nLevels) { signal input secret; diff --git a/circuits/circuits/ofac_name_verifier.circom b/circuits/circuits/ofac/ofac_name_verifier.circom similarity index 95% rename from circuits/circuits/ofac_name_verifier.circom rename to circuits/circuits/ofac/ofac_name_verifier.circom index 9d80383bd..48aec798c 100644 --- a/circuits/circuits/ofac_name_verifier.circom +++ b/circuits/circuits/ofac/ofac_name_verifier.circom @@ -3,8 +3,8 @@ pragma circom 2.1.5; include "circomlib/circuits/poseidon.circom"; include "circomlib/circuits/comparators.circom"; include "binary-merkle-root.circom"; -include "./utils/getCommonLength.circom"; -include "validatePassport.circom"; +include "../utils/getCommonLength.circom"; +include "../utils/validatePassport.circom"; template ProveNameNotInOfac(nLevels) { signal input secret; diff --git a/circuits/circuits/ofac_passportNo_verifier.circom b/circuits/circuits/ofac/ofac_passportNo_verifier.circom similarity index 97% rename from circuits/circuits/ofac_passportNo_verifier.circom rename to circuits/circuits/ofac/ofac_passportNo_verifier.circom index 907614d09..fc350ffc0 100644 --- a/circuits/circuits/ofac_passportNo_verifier.circom +++ b/circuits/circuits/ofac/ofac_passportNo_verifier.circom @@ -3,8 +3,8 @@ pragma circom 2.1.5; include "circomlib/circuits/poseidon.circom"; include "circomlib/circuits/comparators.circom"; include "binary-merkle-root.circom"; -include "./utils/getCommonLength.circom"; -include "validatePassport.circom"; +include "../utils/getCommonLength.circom"; +include "../utils/validatePassport.circom"; template ProvePassportNotInOfac(nLevels) { signal input secret; diff --git a/circuits/circuits/validatePassport.circom b/circuits/circuits/utils/validatePassport.circom similarity index 94% rename from circuits/circuits/validatePassport.circom rename to circuits/circuits/utils/validatePassport.circom index a82afa29f..6c31cd470 100644 --- a/circuits/circuits/validatePassport.circom +++ b/circuits/circuits/utils/validatePassport.circom @@ -2,8 +2,8 @@ pragma circom 2.1.5; include "circomlib/circuits/poseidon.circom"; include "@zk-email/circuits/utils/bytes.circom"; -include "./utils/isOlderThan.circom"; -include "./utils/isValid.circom"; +include "isOlderThan.circom"; +include "isValid.circom"; include "binary-merkle-root.circom"; template ValidatePassport(nLevels) { diff --git a/common/.gitignore b/common/.gitignore index 40b878db5..281d0e41e 100644 --- a/common/.gitignore +++ b/common/.gitignore @@ -1 +1,2 @@ +inputs node_modules/ \ No newline at end of file diff --git a/common/src/utils/utils.ts b/common/src/utils/utils.ts index f534482bb..96ecd48ae 100644 --- a/common/src/utils/utils.ts +++ b/common/src/utils/utils.ts @@ -356,7 +356,6 @@ export function generateMerkleProof(imt: LeanIMT, _index: number, maxDepth: numb // the tree depth is actually 3. The missing siblings can be set to 0, as they // won't be used to calculate the root in the circuit. const merkleProofIndices: number[] = [] - console.log(depthForThisOne,maxDepth) for (let i = 0; i < maxDepth; i += 1) { merkleProofIndices.push((index >> i) & 1) if (merkleProofSiblings[i] === undefined) { diff --git a/registry/package.json b/registry/package.json index 1d4200d37..f83722382 100644 --- a/registry/package.json +++ b/registry/package.json @@ -3,16 +3,11 @@ "@types/node": "^20.11.20" }, "dependencies": { -<<<<<<< HEAD - "@zk-kit/imt": "https://gitpkg.now.sh/0xturboblitz/zk-kit/packages/imt?b6e7d542", - "ts-node": "^10.9.2" -======= "@zk-kit/imt": "https://gitpkg.now.sh/0xturboblitz/zk-kit/packages/imt?6d417675", "asn1": "^0.2.6", "asn1.js": "^5.4.1", "jsrsasign": "^11.1.0", "node-forge": "^1.3.1", "poseidon-lite": "^0.2.0" ->>>>>>> c505ae06cfd14253d4488d8f969f9dce29f3cde4 } } diff --git a/registry/yarn.lock b/registry/yarn.lock index 67887973f..4fd3594ed 100644 --- a/registry/yarn.lock +++ b/registry/yarn.lock @@ -56,61 +56,6 @@ "@zk-kit/imt@https://gitpkg.now.sh/0xturboblitz/zk-kit/packages/imt?6d417675": version "2.0.0-beta.1" -<<<<<<< HEAD - resolved "https://gitpkg.now.sh/0xturboblitz/zk-kit/packages/imt?b6e7d542" - integrity sha512-3W0k7XESCyyVzNB8hZWGl0vlpSlGa/MFNMD08VwnBFk8Vc1ItgGKketzGodsaUjgQtORDQ1YthfvTuYjLoS8UA== - -acorn-walk@^8.1.1: - version "8.3.3" - resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz" - integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw== - dependencies: - acorn "^8.11.0" - -acorn@^8.11.0, acorn@^8.4.1: - version "8.12.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz" - integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw== - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -ts-node@^10.9.2: - version "10.9.2" - resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz" - integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== - dependencies: - "@cspotcode/source-map-support" "^0.8.0" - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.2" - acorn "^8.4.1" - acorn-walk "^8.1.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - v8-compile-cache-lib "^3.0.1" - yn "3.1.1" -======= resolved "https://gitpkg.now.sh/0xturboblitz/zk-kit/packages/imt?6d417675#38244ea6eef75dc1ad7fff3ff2a22dd5f1a2593a" asn1.js@^5.4.1: @@ -164,7 +109,6 @@ safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== ->>>>>>> c505ae06cfd14253d4488d8f969f9dce29f3cde4 undici-types@~5.26.4: version "5.26.5"