Skip to content

Commit

Permalink
Pin Rust version to 1.79 (#177)
Browse files Browse the repository at this point in the history
## What ❔

Created a `rust-toolchain` file pinning it to the stable version when
1.79 was released.
Reverted the change to `stream.rs` brought about by 1.80 in
#176
Bumps the version to `0.1.0-rc.8`

## Why ❔

Because the `zksync-era` build [doesn't
work](https://github.com/matter-labs/zksync-era/actions/runs/10249428261/job/28352782628?pr=2583)
with `size_of` without qualification like `core::mem::` or `std::mem::`.

`zksync-era` is pinned at `nightly-2024-05-07` at the moment. I tried to
update it to the last nightly where it was still Rust 1.80, which was
`nightly-2024-06-08` but it cannot compile `boojum`, nor does it compile
with a later nightly I tried where it's already Rust 1.82.
  • Loading branch information
aakoshh authored Aug 5, 2024
1 parent dd41158 commit d74da18
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 25 deletions.
24 changes: 12 additions & 12 deletions node/Cargo.lock

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

24 changes: 12 additions & 12 deletions node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ homepage = "https://matter-labs.io/"
repository = "https://github.com/matter-labs/era-consensus"
license = "MIT OR Apache-2.0"
keywords = ["blockchain", "zksync"]
version = "0.1.0-rc.6"
version = "0.1.0-rc.8"

[workspace.dependencies]
# Crates from this repo.
zksync_consensus_bft = { version = "=0.1.0-rc.6", path = "actors/bft" }
zksync_consensus_crypto = { version = "=0.1.0-rc.6", path = "libs/crypto" }
zksync_consensus_executor = { version = "=0.1.0-rc.6", path = "actors/executor" }
zksync_consensus_network = { version = "=0.1.0-rc.6", path = "actors/network" }
zksync_consensus_roles = { version = "=0.1.0-rc.6", path = "libs/roles" }
zksync_consensus_storage = { version = "=0.1.0-rc.6", path = "libs/storage" }
zksync_consensus_tools = { version = "=0.1.0-rc.6", path = "tools" }
zksync_consensus_utils = { version = "=0.1.0-rc.6", path = "libs/utils" }
zksync_consensus_bft = { version = "=0.1.0-rc.8", path = "actors/bft" }
zksync_consensus_crypto = { version = "=0.1.0-rc.8", path = "libs/crypto" }
zksync_consensus_executor = { version = "=0.1.0-rc.8", path = "actors/executor" }
zksync_consensus_network = { version = "=0.1.0-rc.8", path = "actors/network" }
zksync_consensus_roles = { version = "=0.1.0-rc.8", path = "libs/roles" }
zksync_consensus_storage = { version = "=0.1.0-rc.8", path = "libs/storage" }
zksync_consensus_tools = { version = "=0.1.0-rc.8", path = "tools" }
zksync_consensus_utils = { version = "=0.1.0-rc.8", path = "libs/utils" }

# Crates from this repo that might become independent in the future.
zksync_concurrency = { version = "=0.1.0-rc.6", path = "libs/concurrency" }
zksync_protobuf = { version = "=0.1.0-rc.6", path = "libs/protobuf" }
zksync_protobuf_build = { version = "=0.1.0-rc.6", path = "libs/protobuf_build" }
zksync_concurrency = { version = "=0.1.0-rc.8", path = "libs/concurrency" }
zksync_protobuf = { version = "=0.1.0-rc.8", path = "libs/protobuf" }
zksync_protobuf_build = { version = "=0.1.0-rc.8", path = "libs/protobuf_build" }

# Crates from Matter Labs.
pairing = { package = "pairing_ce", version = "=0.28.6" }
Expand Down
2 changes: 1 addition & 1 deletion node/actors/network/src/noise/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const MAX_PAYLOAD_LEN: usize = MAX_TRANSPORT_MSG_LEN - AUTHDATA_LEN;
/// <frame len:u16> ++ <frame data:[u8;len]>.
///
/// Length of the frame len field.
const LENGTH_FIELD_LEN: usize = size_of::<u16>();
const LENGTH_FIELD_LEN: usize = std::mem::size_of::<u16>();

/// Max size of the whole frame (length field + data).
const MAX_FRAME_LEN: usize = MAX_TRANSPORT_MSG_LEN + LENGTH_FIELD_LEN;
Expand Down
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
stable-2024-06-13

0 comments on commit d74da18

Please sign in to comment.