Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Commit

Permalink
rebase without assembly version
Browse files Browse the repository at this point in the history
  • Loading branch information
@ashWhiteHat
ashWhiteHat committed Feb 8, 2022
1 parent 8e3614e commit 51ef3c4
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ members = [
]

[patch.crates-io]
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
# This fork makes bitvec 0.20.x work with funty 1.1 and funty 1.2. Without
# this fork, bitvec 0.20.x is incompatible with funty 1.2, which we depend on,
# and leads to a compilation error. This can be removed once the upstream PR
Expand Down
2 changes: 1 addition & 1 deletion bus-mapping/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ethers-providers = "0.6"
itertools = "0.10"
lazy_static = "1.4"
log = "0.4.14"
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
serde = {version = "1.0.130", features = ["derive"] }
serde_json = "1.0.66"

Expand Down
4 changes: 2 additions & 2 deletions circuit-benchmarks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ edition = "2021"

[dependencies]
ff = "0.11"
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
ark-std = { version = "0.3", features = ["print-trace"] }
zkevm-circuits = { path = "../zkevm-circuits" }
bus-mapping = { path = "../bus-mapping" }
Expand Down
2 changes: 1 addition & 1 deletion eth-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ethers-core = "0.6"
ethers-providers = "0.6"
hex = "0.4"
lazy_static = "1.4"
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
regex = "1.5.4"
serde = {version = "1.0.130", features = ["derive"] }
serde_json = "1.0.66"
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ url = "2.2.2"
pretty_assertions = "1.0.0"
log = "0.4.14"
env_logger = "0.9"
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }

[dev-dependencies]
pretty_assertions = "1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions keccak256/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ edition = "2018"
dev-graph = [ "halo2_proofs/dev-graph", "plotters" ]

[dependencies]
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
itertools = "0.10.1"
num-bigint = "0.4.2"
num-traits = "0.2.14"
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
plotters = { version = "0.3.0", optional = true }

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions zkevm-circuits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ edition = "2018"

[dependencies]
ff = "0.11"
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
bigint = "4"
num = "0.4"
sha3 = "0.7.2"
Expand Down

0 comments on commit 51ef3c4

Please sign in to comment.