fix(dependencies): Resolve snarkit2

metacraft-labs · Apr 4, 2024 · 79db054 · 79db054
1 parent b58dd4b
commit 79db054
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/beacon-light-client/circom/package.json b/beacon-light-client/circom/package.json
@@ -25,7 +25,7 @@
     "hardhat": "^2.22.0",
     "js-yaml": "^4.1.0",
     "redis": "^4.6.5",
-    "snarkit2": "https://github.com/fluidex/snarkit2#70142d8bbc5ec79cfa6869205263ff77e8423975",
+    "snarkit2": "git+https://git@github.com/fluidex/snarkit2.git#commit=70142d8bbc5ec79cfa6869205263ff77e8423975",
     "snarkjs": "https://github.com/metacraft-labs/snarkjs.git#commit=091ee9c3744c660b0ecd961f9197a8249a8f7d3b",
     "ts-node": "^10.9.1"
   },

diff --git a/yarn-project.nix b/yarn-project.nix
@@ -52,7 +52,7 @@ let
       rm $out/.gitignore
     '';
     outputHashMode = "recursive";
-    outputHash = "sha512-nyVlGSF/aN/KEbmOdJG7CzdKC74uXcWafuDtJ390xMHA0YUqV7EqVM7IGUY2cS1IHjwLwdseVHWEbAtOmUqD/g==";
+    outputHash = "sha512-GtE3Rw1Cdme22XI4DjyE5NtlcG3Zzi4NJ7+eKmZk+jS3zg1DhImybZ101tn/e3dyUVG/rSsKvAR4sOMPm+psgQ==";
   };
 
   # Create a derivation that builds a module in isolation.
@@ -160,6 +160,11 @@ let
         "blake-hash@npm:2.0.0" \
         ${isolated."blake-hash@npm:2.0.0"} \
         ".yarn/unplugged/blake-hash-npm-2.0.0-c63b9a2c2d/node_modules/blake-hash"
+      echo 'injecting build for bcrypt'
+      yarn nixify inject-build \
+        "bcrypt@npm:5.0.1" \
+        ${isolated."bcrypt@npm:5.0.1"} \
+        ".yarn/unplugged/bcrypt-npm-5.0.1-6815be1cfe/node_modules/bcrypt"
       echo 'injecting build for keccak'
       yarn nixify inject-build \
         "keccak@npm:3.0.1" \
@@ -185,11 +190,6 @@ let
         "utf-8-validate@npm:5.0.7" \
         ${isolated."utf-8-validate@npm:5.0.7"} \
         ".yarn/unplugged/utf-8-validate-npm-5.0.7-88d731f8ad/node_modules/utf-8-validate"
-      echo 'injecting build for bcrypt'
-      yarn nixify inject-build \
-        "bcrypt@npm:5.0.1" \
-        ${isolated."bcrypt@npm:5.0.1"} \
-        ".yarn/unplugged/bcrypt-npm-5.0.1-6815be1cfe/node_modules/bcrypt"
       echo 'injecting build for redis-commander'
       yarn nixify inject-build \
         "redis-commander@npm:0.8.0" \
@@ -260,11 +260,11 @@ isolated."bufferutil@npm:4.0.7" = optionalOverride (args.overrideBufferutilAttrs
 isolated."utf-8-validate@npm:5.0.10" = optionalOverride (args.overrideUtf8ValidateAttrs or null) (mkIsolatedBuild { pname = "utf-8-validate"; version = "5.0.10"; reference = "npm:5.0.10"; });
 isolated."msgpackr-extract@npm:3.0.0" = optionalOverride (args.overrideMsgpackrExtractAttrs or null) (mkIsolatedBuild { pname = "msgpackr-extract"; version = "3.0.0"; reference = "npm:3.0.0"; });
 isolated."blake-hash@npm:2.0.0" = optionalOverride (args.overrideBlakeHashAttrs or null) (mkIsolatedBuild { pname = "blake-hash"; version = "2.0.0"; reference = "npm:2.0.0"; });
+isolated."bcrypt@npm:5.0.1" = optionalOverride (args.overrideBcryptAttrs or null) (mkIsolatedBuild { pname = "bcrypt"; version = "5.0.1"; reference = "npm:5.0.1"; });
 isolated."keccak@npm:3.0.1" = optionalOverride (args.overrideKeccakAttrs or null) (mkIsolatedBuild { pname = "keccak"; version = "3.0.1"; reference = "npm:3.0.1"; });
 isolated."bufferutil@npm:4.0.5" = optionalOverride (args.overrideBufferutilAttrs or null) (mkIsolatedBuild { pname = "bufferutil"; version = "4.0.5"; reference = "npm:4.0.5"; });
 isolated."keccak@npm:3.0.2" = optionalOverride (args.overrideKeccakAttrs or null) (mkIsolatedBuild { pname = "keccak"; version = "3.0.2"; reference = "npm:3.0.2"; });
 isolated."leveldown@npm:6.1.0" = optionalOverride (args.overrideLeveldownAttrs or null) (mkIsolatedBuild { pname = "leveldown"; version = "6.1.0"; reference = "npm:6.1.0"; });
 isolated."utf-8-validate@npm:5.0.7" = optionalOverride (args.overrideUtf8ValidateAttrs or null) (mkIsolatedBuild { pname = "utf-8-validate"; version = "5.0.7"; reference = "npm:5.0.7"; });
-isolated."bcrypt@npm:5.0.1" = optionalOverride (args.overrideBcryptAttrs or null) (mkIsolatedBuild { pname = "bcrypt"; version = "5.0.1"; reference = "npm:5.0.1"; });
 isolated."redis-commander@npm:0.8.0" = optionalOverride (args.overrideRedisCommanderAttrs or null) (mkIsolatedBuild { pname = "redis-commander"; version = "0.8.0"; reference = "npm:0.8.0"; });
 in overriddenProject
diff --git a/yarn.lock b/yarn.lock
@@ -7024,7 +7024,7 @@ __metadata:
     hardhat: "npm:^2.22.0"
     js-yaml: "npm:^4.1.0"
     redis: "npm:^4.6.5"
-    snarkit2: "https://github.com/fluidex/snarkit2#70142d8bbc5ec79cfa6869205263ff77e8423975"
+    snarkit2: "git+https://git@github.com/fluidex/snarkit2.git#commit=70142d8bbc5ec79cfa6869205263ff77e8423975"
     snarkjs: "https://github.com/metacraft-labs/snarkjs.git#commit=091ee9c3744c660b0ecd961f9197a8249a8f7d3b"
     ts-node: "npm:^10.9.1"
     tsx: "npm:^4.7.1"
@@ -14703,9 +14703,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"snarkit2@https://github.com/fluidex/snarkit2#70142d8bbc5ec79cfa6869205263ff77e8423975":
+"snarkit2@git+https://git@github.com/fluidex/snarkit2.git#commit=70142d8bbc5ec79cfa6869205263ff77e8423975":
   version: 0.2.0
-  resolution: "snarkit2@git+ssh://git@github.com/fluidex/snarkit2.git#commit=70142d8bbc5ec79cfa6869205263ff77e8423975"
+  resolution: "snarkit2@https://git@github.com/fluidex/snarkit2.git#commit=70142d8bbc5ec79cfa6869205263ff77e8423975"
   dependencies:
     "@iden3/binfileutils": "npm:^0.0.8"
     chai: "npm:^4.3.4"