Skip to content

Commit

Permalink
chore(verifier): extract dependencies into workspace (#1232)
Browse files Browse the repository at this point in the history
* chore(verifier): extract all dependency definitions into workspace Cargo.toml

* refactor(verifier): sort dependencies inside Cargo.toml files
  • Loading branch information
rimrakhimov authored Feb 6, 2025
1 parent b1bdb48 commit 21543d2
Show file tree
Hide file tree
Showing 6 changed files with 191 additions and 199 deletions.
97 changes: 14 additions & 83 deletions smart-contract-verifier/Cargo.lock

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

67 changes: 65 additions & 2 deletions smart-contract-verifier/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,76 @@
[workspace]
resolver = "2"
members = [
"sig-provider-extension",
"smart-contract-verifier",
"smart-contract-verifier-proto",
"smart-contract-verifier-server",
"sig-provider-extension",
]

[workspace.dependencies]
sig-provider-extension = { path = "sig-provider-extension" }
smart-contract-verifier = { path = "smart-contract-verifier" }
smart-contract-verifier-proto = { path = "smart-contract-verifier-proto" }
smart-contract-verifier-server = { path = "smart-contract-verifier-server" }

actix-prost = { git = "https://github.com/blockscout/actix-prost", rev = "9cc47aa1" }
actix-prost-build = { git = "https://github.com/blockscout/actix-prost", rev = "9cc47aa1" }
actix-prost-macros = { git = "https://github.com/blockscout/actix-prost", rev = "9cc47aa1" }
actix-web = { version = "4" }
alloy-dyn-abi = { version = "0.6.4" }
alloy-json-abi = { version = "0.6.4" }
amplify = { version = "4.6.0" }
anyhow = { version = "1.0" }
async-trait = { version = "0.1" }
blockscout-display-bytes = "1.1.0"
blockscout-service-launcher = "0.12.0"
verification-common = { git = "https://github.com/blockscout/blockscout-rs/", rev = "bd6352d" }
bytes = { version = "1.2" }
chrono = { version = "0.4" }
config = { version = "0.13" }
const_format = { version = "0.2" }
cron = { version = "0.11" }
era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", rev = "9969de1" }
ethabi = { version = "18.0" }
ethers-core = { version = "2.0.10" }
ethers-solc = { version = "2.0.6" }
foundry-compilers = { version = "=0.3.9" }
futures = { version = "0.3" }
hex = { version = "0.4" }
http = { version = "0.2" }
lazy_static = { version = "1" }
mismatch = { version = "1.0" }
mockall = { version = "0.11" }
nonempty = { version = "0.10.0" }
parking_lot = { version = "0.12" }
pretty_assertions = { version = "1.2" }
primitive-types = { version = "0.12" }
prometheus = { version = "0.13" }
prost = { version = "0.11" }
prost-build = { version = "0.11" }
quick-xml = { version = "0.24" }
rand = { version = "0.8" }
reqwest = { version = "0.11" }
reqwest-middleware = { version = "0.1" }
reqwest-retry = { version = "0.1" }
rstest = { version = "0.19" }
rust-s3 = { version = "0.32.0" }
semver = { version = "1.0" }
serde = { version = "1" }
serde_json = { version = "1" }
serde_with = { version = "3" }
sha2 = { version = "0.10" }
sig-provider-proto = { git = "https://github.com/blockscout/blockscout-rs", rev = "b1bdb48" }
solidity-metadata = { version = "1.1.0" }
sourcify = { git = "https://github.com/blockscout/blockscout-rs", rev = "c4261d0" }
sscanf = { version = "0.3" }
stdext = { version = "0.3.2" }
tempfile = { version = "3.3" }
thiserror = { version = "1.0" }
tokio = { version = "1" }
tonic = { version = "0.8" }
tonic-build = { version = "0.8" }
tracing = { version = "0.1" }
url = { version = "2.4" }
uuid = { version = "1.6.1" }
verification-common = { git = "https://github.com/blockscout/blockscout-rs/", rev = "bd6352d" }
wiremock = { version = "0.5" }
18 changes: 9 additions & 9 deletions smart-contract-verifier/sig-provider-extension/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ version = "0.1.0"
edition = "2021"

[dependencies]
async-trait = "0.1"
sig-provider-proto = { git = "https://github.com/blockscout/blockscout-rs" }
smart-contract-verifier = { path = "../smart-contract-verifier" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_with = "2"
tonic = "0.8"
tokio = "1"
http = "0.2"
async-trait = { workspace = true }
http = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
serde_with = { workspace = true }
sig-provider-proto = { workspace = true }
smart-contract-verifier = { workspace = true }
tokio = { workspace = true }
tonic = { workspace = true }
44 changes: 22 additions & 22 deletions smart-contract-verifier/smart-contract-verifier-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
actix-prost = { git = "https://github.com/blockscout/actix-prost", rev = "9cc47aa1" }
actix-prost-macros = { git = "https://github.com/blockscout/actix-prost", rev = "9cc47aa1" }
actix-web = "4"
async-trait = "0.1"
prost = "0.11"
serde = { version = "1", features = ["derive"] }
serde_with = { version = "2.0", features = ["hex", "base64"] }
tonic = "0.8"
actix-prost = { workspace = true }
actix-prost-macros = { workspace = true }
actix-web = { workspace = true }
async-trait = { workspace = true }
prost = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_with = { workspace = true, features = ["hex", "base64"] }
tonic = { workspace = true }

anyhow = { version = "1.0.76", optional = true }
reqwest = { version = "0.11", optional = true }
reqwest-middleware = { version = "0.2", optional = true }
reqwest-retry = { version = "0.3", optional = true }
thiserror = { version = "1", optional = true }
url = { version = "2.5.0", optional = true }
mockall = { version = "0.12.1", optional = true }
tokio = { version = "1", optional = true }
anyhow = { workspace = true, optional = true }
mockall = { workspace = true, optional = true }
reqwest = { workspace = true, optional = true }
reqwest-middleware = { workspace = true, optional = true }
reqwest-retry = { workspace = true, optional = true }
thiserror = { workspace = true, optional = true }
tokio = { workspace = true, optional = true }
url = { workspace = true, optional = true }

[build-dependencies]
actix-prost-build = { git = "https://github.com/blockscout/actix-prost", rev = "9cc47aa1" }
tonic-build = "0.8"
prost-build = "0.11"
actix-prost-build = { workspace = true }
prost-build = { workspace = true }
tonic-build = { workspace = true }

[dev-dependencies]
smart-contract-verifier-proto = { path = ".", features = ["http-client", "mock"] }
tokio = { version = "1", features = ["rt"] }
smart-contract-verifier-proto = { workspace = true, features = ["http-client", "mock"] }
tokio = { workspace = true, features = ["rt"] }

[features]
http-client = [
Expand All @@ -45,4 +45,4 @@ http-client = [
mock = [
"dep:mockall",
"dep:tokio",
]
]
Loading

0 comments on commit 21543d2

Please sign in to comment.