Skip to content

Commit

Permalink
Merge #1414
Browse files Browse the repository at this point in the history
1414: Revert block tool r=Deniallugo a=perekopskiy



Co-authored-by: perekopskiy <[email protected]>
  • Loading branch information
bors-matterlabs-dev[bot] and perekopskiy authored Apr 13, 2021
2 parents e31ac7f + 1e54d0f commit 3eb9584
Show file tree
Hide file tree
Showing 18 changed files with 1,439 additions and 17 deletions.
55 changes: 41 additions & 14 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ members = [
"core/bin/server",
"core/bin/prover",
"core/bin/parse_pub_data",
"core/bin/block_revert",

# Server micro-services
"core/bin/zksync_api",
Expand Down
1 change: 1 addition & 0 deletions changelog/core.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ All notable changes to the core components will be documented in this file.
ETHDirectClient.
- (`api_server`): Support for accounts that don't have to pay fees (e.g. network service accounts) was added.
- Added `BlockMetadata` structure and corresponding table to track block data that is not related to protocol.
- (`block_revert`): CLI that calls `revertBlocks` smart contract function and updates the database respectively.

### Fixed

Expand Down
25 changes: 25 additions & 0 deletions core/bin/block_revert/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[package]
name = "block_revert"
version = "1.0.0"
edition = "2018"
authors = ["The Matter Labs Team <[email protected]>"]
homepage = "https://zksync.io/"
repository = "https://github.com/matter-labs/zksync"
license = "Apache-2.0"
keywords = ["blockchain", "zksync"]
categories = ["cryptography"]
publish = false # We don't want to publish our binaries.

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
zksync_types = { path = "../../lib/types", version = "1.0" }
zksync_storage = { path = "../../lib/storage", version = "1.0" }
zksync_eth_client = { path = "../../lib/eth_client", version = "1.0" }
zksync_config = { path = "../../lib/config", version = "1.0" }

tokio = { version = "0.2", features = ["full"] }
ethabi = "12.0.0"
anyhow = "1.0"
web3 = "0.13.0"
structopt = "0.3.20"
Loading

0 comments on commit 3eb9584

Please sign in to comment.