chore: remove redundant contracts

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "src/solidity/lib/zkpassport-packages"]
+	path = src/solidity/lib/zkpassport-packages
+	url = git@github.com:zkpassport/zkpassport-packages.git
+	branch = main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "circuits",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "scripts": {
     "lint": "tsc --project src/ts/tsconfig.json --noEmit && nargo fmt --check",
     "test": "TZ=UTC jest circuits.test.ts --runInBand --verbose",
@@ -9,7 +9,7 @@
     "compile:test": "scripts/ci-compile-circuits.sh",
     "package-circuits": "tsx --max-old-space-size=8192 src/ts/scripts/circuit-packager && cp target/packaged/manifest.json src/ts/tests/fixtures/circuit-manifest.json",
     "generate-fixtures": "tsx --max-old-space-size=8192 src/ts/scripts/generate-fixtures.ts",
-    "test-contracts": "(cd src/solidity && ./run-integration-tests.sh)"
+    "test-contracts": "(cd src/solidity && forge test -vv)"
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "^3.730.0",

src/solidity/deployments/addresses-1.json

@@ -0,0 +1,29 @@
+{
+  "sub_verifier_versions": {
+    "0.18.0": {
+      "address": "0x06A13AE9d0BF8AfC1701D82c2EB0c1040B07a467",
+      "admin": "0x2000ab040a899f914D6DfD2457C3dFBB22d4c762",
+      "deployed_at": 1778063015,
+      "proof_verifiers": {
+        "outer_count_10": "0x2b80Be1a98d48a2986dF59c9e7a3DF728165F311",
+        "outer_count_11": "0x1887a01437Ddbee7Dc7cFdA666eEfAd441d671BD",
+        "outer_count_12": "0x1DE356fb7C74Ebdae3B8B33d3cca59C0ABE1D26F",
+        "outer_count_13": "0xcc7cb81b429C5B1239f68b43b2c66474feb1e8f4",
+        "outer_count_4": "0xD320De663FF0318650c6c861302b96911A7d71ce",
+        "outer_count_5": "0x43e314D43b6cB2f389F481875d7d561C57204325",
+        "outer_count_6": "0x05e5eA6f47843e9e4cd8A0C9EaB149f3634b2A54",
+        "outer_count_7": "0xc434f3Fe3cC3f1bf06C81A24948472e3924A9616",
+        "outer_count_8": "0x40F8cC43A0e0FC7E4d7E3f110144B429827D499b",
+        "outer_count_9": "0x18b515ce162e8193099A0e2D1DB9DAE1D7Aaf310"
+      },
+      "root_verifier": "0x1D000001000EFD9a6371f4d90bB8920D5431c0D8"
+    }
+  },
+  "verifier_helper_versions": {
+    "0.18.0": {
+      "address": "0x9894282C73AFaDF1c5c63b6FAc0169039fc42983",
+      "deployed_at": 1778063471,
+      "root_registry": "0x1D0000020038d6E40E1d98e09fA1bb3A7DAA8B70"
+    }
+  }
+}

src/solidity/deployments/addresses-11155111.json

@@ -0,0 +1,29 @@
+{
+  "sub_verifier_versions": {
+    "0.18.0": {
+      "address": "0x33EB4b92C5600575a8c0eB133fbd34E37Cc9d7aB",
+      "admin": "0x2000ab040a899f914D6DfD2457C3dFBB22d4c762",
+      "deployed_at": 1778007576,
+      "proof_verifiers": {
+        "outer_count_10": "0x01b2F7950Ff8280f1581D3f2758e347A5D6f437B",
+        "outer_count_11": "0xCbaA4253aaF0937fB87D0CCa556bb864f4B4eEF8",
+        "outer_count_12": "0x5A87026E6627E4AFF96353538f83532ED840A78a",
+        "outer_count_13": "0x535D7dDB4051C46FaC01CaE97259cf5ad58dd587",
+        "outer_count_4": "0x5aa54cB7467FeAf1892156a65A89Eb6F27232b41",
+        "outer_count_5": "0xf4abF40BD5E51479DC4c6bc11796e3E48135E640",
+        "outer_count_6": "0x3A26aF81581c73A1ab0DED32BD314A62693e53A5",
+        "outer_count_7": "0x4620879f0450b353D0B856E5d66C62c91a7DdE7B",
+        "outer_count_8": "0x6Bc83390E39CE6C5D922A8f4e36Da1010977F8fc",
+        "outer_count_9": "0x2EA9b14B221a63A655215E325cB60F3C4a22C606"
+      },
+      "root_verifier": "0x1D000001000EFD9a6371f4d90bB8920D5431c0D8"
+    }
+  },
+  "verifier_helper_versions": {
+    "0.18.0": {
+      "address": "0xdd33c53248393D104FE0c7d75941e42647BFB414",
+      "deployed_at": 1778007888,
+      "root_registry": "0x1D0000020038d6E40E1d98e09fA1bb3A7DAA8B70"
+    }
+  }
+}

src/solidity/deployments/addresses-8453.json

@@ -0,0 +1,29 @@
+{
+  "sub_verifier_versions": {
+    "0.18.0": {
+      "address": "0x40F8cC43A0e0FC7E4d7E3f110144B429827D499b",
+      "admin": "0x2000ab040a899f914D6DfD2457C3dFBB22d4c762",
+      "deployed_at": 1778063967,
+      "proof_verifiers": {
+        "outer_count_10": "0xD320De663FF0318650c6c861302b96911A7d71ce",
+        "outer_count_11": "0x43e314D43b6cB2f389F481875d7d561C57204325",
+        "outer_count_12": "0x05e5eA6f47843e9e4cd8A0C9EaB149f3634b2A54",
+        "outer_count_13": "0xc434f3Fe3cC3f1bf06C81A24948472e3924A9616",
+        "outer_count_4": "0x14B10de2CF34870a7BB825C6BDE5e48A525E1759",
+        "outer_count_5": "0xD04bE5f1B90FAEF026392f802f1803672D65448e",
+        "outer_count_6": "0xd0539007aAAB04F53A0009468557db493704219d",
+        "outer_count_7": "0xBAa59Fa2a046ACEAcfB76CC4C2faE3A1799cF949",
+        "outer_count_8": "0x40803220faaD6C5EcF9588270205D6602E060d79",
+        "outer_count_9": "0x4b87246b00872779226f3de26C6900d05a886C33"
+      },
+      "root_verifier": "0x1D000001000EFD9a6371f4d90bB8920D5431c0D8"
+    }
+  },
+  "verifier_helper_versions": {
+    "0.18.0": {
+      "address": "0x1887a01437Ddbee7Dc7cFdA666eEfAd441d671BD",
+      "deployed_at": 1778064291,
+      "root_registry": "0x1D0000020038d6E40E1d98e09fA1bb3A7DAA8B70"
+    }
+  }
+}

src/solidity/foundry.toml

@@ -9,6 +9,11 @@ optimizer = true
 optimizer_runs = 200
 # Ensure deterministic init code hash
 bytecode_hash = "none"
+# Map the registry-contracts namespace to the canonical Solidity protocol contracts in
+# zkpassport-packages/registry-contracts
+remappings = [
+  "@zkpassport/registry-contracts/=lib/zkpassport-packages/packages/registry-contracts/src/",
+]
 # File system permissions
 fs_permissions = [{ access = "read-write", path = "./"}]
 
@@ -20,7 +25,6 @@ tab_width = 2
 ignore = [
   "src/ultra-honk-verifiers",
   "src/SampleContract.sol",
-  "src/Constants.sol",
   "test/Constants.t.sol",
 ]