Просмотр исходного кода

halo2: Update Cargo lock/toml.

parazyd 5 лет назад
Родитель
Сommit
585b2aa83a
2 измененных файлов с 22 добавлено и 10 удалено
  1. 5 5
      examples/halo2/Cargo.lock
  2. 17 5
      examples/halo2/Cargo.toml

+ 5 - 5
examples/halo2/Cargo.lock

@@ -187,7 +187,7 @@ dependencies = [
 [[package]]
 [[package]]
 name = "halo2_ecc"
 name = "halo2_ecc"
 version = "0.0.0"
 version = "0.0.0"
-source = "git+https://github.com/parazyd/orchard.git?rev=5c8ac8b3630e07559252fe3eff98ca80772249d9#5c8ac8b3630e07559252fe3eff98ca80772249d9"
+source = "git+https://github.com/parazyd/orchard.git?rev=0c00de95405dc8f559ebbb2b9c37f490ecbf966b#0c00de95405dc8f559ebbb2b9c37f490ecbf966b"
 dependencies = [
 dependencies = [
  "arrayvec 0.7.1",
  "arrayvec 0.7.1",
  "bigint",
  "bigint",
@@ -221,7 +221,7 @@ dependencies = [
 [[package]]
 [[package]]
 name = "halo2_poseidon"
 name = "halo2_poseidon"
 version = "0.0.0"
 version = "0.0.0"
-source = "git+https://github.com/parazyd/orchard.git?rev=5c8ac8b3630e07559252fe3eff98ca80772249d9#5c8ac8b3630e07559252fe3eff98ca80772249d9"
+source = "git+https://github.com/parazyd/orchard.git?rev=0c00de95405dc8f559ebbb2b9c37f490ecbf966b#0c00de95405dc8f559ebbb2b9c37f490ecbf966b"
 dependencies = [
 dependencies = [
  "bitvec",
  "bitvec",
  "halo2",
  "halo2",
@@ -232,7 +232,7 @@ dependencies = [
 [[package]]
 [[package]]
 name = "halo2_utilities"
 name = "halo2_utilities"
 version = "0.0.0"
 version = "0.0.0"
-source = "git+https://github.com/parazyd/orchard.git?rev=5c8ac8b3630e07559252fe3eff98ca80772249d9#5c8ac8b3630e07559252fe3eff98ca80772249d9"
+source = "git+https://github.com/parazyd/orchard.git?rev=0c00de95405dc8f559ebbb2b9c37f490ecbf966b#0c00de95405dc8f559ebbb2b9c37f490ecbf966b"
 dependencies = [
 dependencies = [
  "ff",
  "ff",
  "halo2",
  "halo2",
@@ -256,9 +256,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 
 [[package]]
 [[package]]
 name = "libc"
 name = "libc"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5"
 
 
 [[package]]
 [[package]]
 name = "memoffset"
 name = "memoffset"

+ 17 - 5
examples/halo2/Cargo.toml

@@ -16,12 +16,24 @@ arrayvec = "0.7.0"
 lazy_static = "1"
 lazy_static = "1"
 bigint = "4"
 bigint = "4"
 subtle = "2.3"
 subtle = "2.3"
-halo2 = { git="https://github.com/zcash/halo2.git", rev = "27c4187673a9c6ade13fbdbd4f20955530c22d7f" }
-halo2_utilities = { git ="https://github.com/parazyd/orchard.git", rev = "5c8ac8b3630e07559252fe3eff98ca80772249d9" }
-halo2_ecc = { git ="https://github.com/parazyd/orchard.git", rev = "5c8ac8b3630e07559252fe3eff98ca80772249d9" }
-# orchard = { git ="https://github.com/parazyd/orchard.git", rev = "dfb5e3a92acae39af9eda7aa5f7b8c46b469c094" }
+halo2 = "0.0"
+
+[patch.crates-io]
+halo2 = { git = "https://github.com/zcash/halo2.git", rev = "27c4187673a9c6ade13fbdbd4f20955530c22d7f" }
 
 
 [dependencies.halo2_poseidon]
 [dependencies.halo2_poseidon]
 git = "https://github.com/parazyd/orchard.git"
 git = "https://github.com/parazyd/orchard.git"
-rev = "5c8ac8b3630e07559252fe3eff98ca80772249d9"
+rev = "0c00de95405dc8f559ebbb2b9c37f490ecbf966b"
 features = ["halo2"]
 features = ["halo2"]
+
+[dependencies.halo2_utilities]
+git = "https://github.com/parazyd/orchard.git"
+rev = "0c00de95405dc8f559ebbb2b9c37f490ecbf966b"
+
+[dependencies.halo2_ecc]
+git = "https://github.com/parazyd/orchard.git"
+rev = "0c00de95405dc8f559ebbb2b9c37f490ecbf966b"
+
+# [dependencies.orchard]
+# git = "https://github.com/parazyd/orchard.git"
+# rev = "0c00de95405dc8f559ebbb2b9c37f490ecbf966b"