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

Commit

Permalink
fix/update dependencies versions (#1722)
Browse files Browse the repository at this point in the history
### Description

Had following built error on my Mac (MacOS 12.6.7, M1 Pro)
```
error[E0658]: use of unstable library feature 'stdsimd'
   --> /Users/kimi/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ahash-0.8.7/src/operations.rs:124:24
    |
124 |     let res = unsafe { vaesmcq_u8(vaeseq_u8(transmute!(value), transmute!(0u128))) };
    |                        ^^^^^^^^^^
    |
    = note: see issue #48556 <rust-lang/rust#48556> for more information
    = help: add `#![feature(stdsimd)]` to the crate attributes to enable

...
```

Had following error if only to downgrade `ahash` to `0.8.6`. 

```
error[E0432]: unresolved import `revm_precompile`
 --> bus-mapping/src/precompile.rs:7:5
  |
7 | use revm_precompile::{Precompile, PrecompileError, Precompiles};
  |     ^^^^^^^^^^^^^^^ use of undeclared crate or module `revm_precompile`
  |
```

Fixed by upgrade `revm_precompile` to `2.2.0`.

After upgrade `revm_precompile` to `2.2.0`, CI complained library
`libclang.so` missing. That's bcs `revm_precompile` `2.2.0` having
`c-kzg` feature which needs `libclang`. So in this fix, we also disable
default feature of `revm-precompile` (`default-features=false`).
### Issue Link

N/A

### Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] This change requires a documentation update

### Contents

Pinning a fixed version is a better practice so this PR is not only
update the versions mentioned above but also using `=` to pin the
version.

---------

Co-authored-by: adria0.eth <[email protected]>
  • Loading branch information
KimiWu123 and adria0 authored Jan 12, 2024
1 parent c56dca8 commit e80c5af
Show file tree
Hide file tree
Showing 8 changed files with 834 additions and 731 deletions.
1,535 changes: 819 additions & 716 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions bus-mapping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ eth-types = { path = "../eth-types" }
gadgets = { path = "../gadgets" }
mock = { path = "../mock", optional = true }

ethers-core = "2.0.7"
ethers-providers = "2.0.7"
ethers-core = "=2.0.10"
ethers-providers = "=2.0.10"
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
itertools = "0.10"
lazy_static = "1.4"
Expand All @@ -20,8 +20,7 @@ serde = {version = "1.0.130", features = ["derive"] }
serde_json = "1.0.66"
strum = "0.24"
strum_macros = "0.24"

revm-precompile = "2.0.2"
revm-precompile = {version = "=2.2.0", default-features=false}

[dev-dependencies]
hex = "0.4.3"
Expand Down
4 changes: 2 additions & 2 deletions eth-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = ["The appliedzkp team"]
license = "MIT OR Apache-2.0"

[dependencies]
ethers-core = "2.0.7"
ethers-signers = "2.0.7"
ethers-core = "=2.0.10"
ethers-signers = "=2.0.10"
hex = "0.4"
lazy_static = "1.4"
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ mock_prover = []

[build-dependencies]
env = "0.0.0"
ethers = "2.0.7"
ethers-contract-abigen = "2.0.8"
ethers = "=2.0.10"
ethers-contract-abigen = "=2.0.10"
glob = "0.3.1"
log = "0.4.14"
serde = "1.0.130"
Expand Down
1 change: 1 addition & 0 deletions light-client-poc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ rand_chacha = "0.3.1"
rand = "0.8.5"
ark-std = "0.4.0"
env_logger = "0.9"
ahash = "=0.8.6"

[dev-dependencies]
ctor = "0.1.22"
Expand Down
4 changes: 2 additions & 2 deletions mock/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ eth-types = { path = "../eth-types" }
external-tracer = { path = "../external-tracer" }
lazy_static = "1.4"
itertools = "0.10.3"
ethers-signers = "2.0.7"
ethers-core = "2.0.7"
ethers-signers = "=2.0.10"
ethers-core = "=2.0.10"
rand_chacha = "0.3"
rand = "0.8"
4 changes: 2 additions & 2 deletions testool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ bus-mapping = { path = "../bus-mapping" }
clap = { version = "3.1", features = ["derive"] }
env_logger = "0.9"
eth-types = { path="../eth-types" }
ethers-core = "2.0.7"
ethers-signers = "2.0.7"
ethers-core = "=2.0.10"
ethers-signers = "=2.0.10"
external-tracer = { path="../external-tracer" }
glob = "0.3"
handlebars = "4.3"
Expand Down
6 changes: 3 additions & 3 deletions zkevm-circuits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ array-init = "2.0.0"
bus-mapping = { path = "../bus-mapping" }
eth-types = { path = "../eth-types" }
gadgets = { path = "../gadgets" }
ethers-core = "2.0.7"
ethers-signers = { version = "2.0.7", optional = true }
ethers-core = "=2.0.10"
ethers-signers = { version = "=2.0.10", optional = true }
mock = { path = "../mock", optional = true }
strum = "0.24"
strum_macros = "0.24"
Expand Down Expand Up @@ -44,7 +44,7 @@ hex = {version = "0.4.3", features = ["serde"]}
[dev-dependencies]
bus-mapping = { path = "../bus-mapping", features = ["test"] }
ctor = "0.1.22"
ethers-signers = "2.0.7"
ethers-signers = "=2.0.10"
itertools = "0.10.1"
mock = { path = "../mock" }
pretty_assertions = "1.0.0"
Expand Down

0 comments on commit e80c5af

Please sign in to comment.