Skip to content

Commit

Permalink
chore: update derive_more to stable version (#2961)
Browse files Browse the repository at this point in the history
## What ❔

Updates `derive_more` to a stable version.

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

We're currently on beta and this is a requisite for supporting
[foundry-zksync](https://github.com/matter-labs/foundry-zksync).

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [x] Tests for the changes have been added / updated.
- [x] Documentation comments have been added / updated.
- [x] Code has been formatted via `zk fmt` and `zk lint`.
  • Loading branch information
nbaztec committed Sep 27, 2024
1 parent 650d42f commit 7ad0425
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ codegen = "0.2.0"
criterion = "0.4.0"
ctrlc = "3.1"
dashmap = "5.5.3"
derive_more = "=1.0.0-beta.6"
derive_more = "1.0.0"
envy = "0.4"
ethabi = "18.0.0"
flate2 = "1.0.28"
Expand Down
4 changes: 2 additions & 2 deletions core/lib/types/src/snapshots.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@ where
pub struct SnapshotRecoveryStatus {
pub l1_batch_number: L1BatchNumber,
pub l1_batch_root_hash: H256,
#[debug("{} (raw: {})", utils::display_timestamp(**l1_batch_timestamp), l1_batch_timestamp)]
#[debug("{} (raw: {})", utils::display_timestamp(*l1_batch_timestamp), l1_batch_timestamp)]
pub l1_batch_timestamp: u64,
pub l2_block_number: L2BlockNumber,
pub l2_block_hash: H256,
#[debug("{} (raw: {})", utils::display_timestamp(**l2_block_timestamp), l2_block_timestamp)]
#[debug("{} (raw: {})", utils::display_timestamp(*l2_block_timestamp), l2_block_timestamp)]
pub l2_block_timestamp: u64,
pub protocol_version: ProtocolVersionId,
#[debug(
Expand Down
8 changes: 4 additions & 4 deletions prover/Cargo.lock

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

10 changes: 5 additions & 5 deletions zk_toolbox/Cargo.lock

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

0 comments on commit 7ad0425

Please sign in to comment.