diff --git a/smart-contract-verifier/Cargo.lock b/smart-contract-verifier/Cargo.lock index 597916528..9082dd573 100644 --- a/smart-contract-verifier/Cargo.lock +++ b/smart-contract-verifier/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix-codec" @@ -646,12 +646,6 @@ dependencies = [ "libc", ] -[[package]] -name = "anstyle" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - [[package]] name = "anyhow" version = "1.0.86" @@ -2884,23 +2878,8 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive 0.11.4", - "predicates 2.1.5", - "predicates-tree", -] - -[[package]] -name = "mockall" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive 0.12.1", - "predicates 3.1.2", + "mockall_derive", + "predicates", "predicates-tree", ] @@ -2916,18 +2895,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "mockall_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "multimap" version = "0.8.3" @@ -3566,16 +3533,6 @@ dependencies = [ "regex", ] -[[package]] -name = "predicates" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" -dependencies = [ - "anstyle", - "predicates-core", -] - [[package]] name = "predicates-core" version = "1.0.8" @@ -4248,18 +4205,6 @@ dependencies = [ "serde", ] -[[package]] -name = "rstest" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c9dc66cc29792b663ffb5269be669f1613664e69ad56441fdb895c2347b930" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros 0.14.0", - "rustc_version 0.4.0", -] - [[package]] name = "rstest" version = "0.19.0" @@ -4268,23 +4213,10 @@ checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" dependencies = [ "futures", "futures-timer", - "rstest_macros 0.19.0", + "rstest_macros", "rustc_version 0.4.0", ] -[[package]] -name = "rstest_macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5015e68a0685a95ade3eee617ff7101ab6a3fc689203101ca16ebc16f2b89c66" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.109", -] - [[package]] name = "rstest_macros" version = "0.19.0" @@ -4817,7 +4749,7 @@ dependencies = [ "http", "serde", "serde_json", - "serde_with 2.3.3", + "serde_with 3.9.0", "sig-provider-proto", "smart-contract-verifier", "tokio", @@ -4827,7 +4759,7 @@ dependencies = [ [[package]] name = "sig-provider-proto" version = "0.1.0" -source = "git+https://github.com/blockscout/blockscout-rs#ee5a2358e10e0002f044c1fbe2560095d4b1a93b" +source = "git+https://github.com/blockscout/blockscout-rs?rev=b1bdb48#b1bdb485c0d13b347e315dffb3d3dfdeb188aaa3" dependencies = [ "actix-prost 0.1.0 (git+https://github.com/blockscout/actix-prost)", "actix-prost-build 0.1.0 (git+https://github.com/blockscout/actix-prost)", @@ -4904,7 +4836,7 @@ dependencies = [ "hex", "lazy_static", "mismatch", - "mockall 0.11.4", + "mockall", "nonempty", "parking_lot 0.12.3", "pretty_assertions", @@ -4915,12 +4847,12 @@ dependencies = [ "reqwest", "reqwest-middleware 0.1.6", "reqwest-retry 0.1.5", - "rstest 0.15.0", + "rstest", "rust-s3", "semver 1.0.23", "serde", "serde_json", - "serde_with 2.3.3", + "serde_with 3.9.0", "sha2", "smart-contract-verifier-proto", "solidity-metadata", @@ -4945,14 +4877,14 @@ dependencies = [ "actix-web", "anyhow", "async-trait", - "mockall 0.12.1", + "mockall", "prost 0.11.9", "prost-build", "reqwest", - "reqwest-middleware 0.2.5", - "reqwest-retry 0.3.0", + "reqwest-middleware 0.1.6", + "reqwest-retry 0.1.5", "serde", - "serde_with 2.3.3", + "serde_with 3.9.0", "smart-contract-verifier-proto", "thiserror", "tokio", @@ -4966,7 +4898,6 @@ name = "smart-contract-verifier-server" version = "0.1.0" dependencies = [ "actix-web", - "actix-web-prom", "amplify", "anyhow", "async-trait", @@ -4985,7 +4916,7 @@ dependencies = [ "pretty_assertions", "prometheus", "reqwest", - "rstest 0.19.0", + "rstest", "rust-s3", "serde", "serde_json", diff --git a/smart-contract-verifier/Cargo.toml b/smart-contract-verifier/Cargo.toml index 190a9b88b..4b1439b36 100644 --- a/smart-contract-verifier/Cargo.toml +++ b/smart-contract-verifier/Cargo.toml @@ -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" } \ No newline at end of file +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" } diff --git a/smart-contract-verifier/sig-provider-extension/Cargo.toml b/smart-contract-verifier/sig-provider-extension/Cargo.toml index 18c0ca8c1..298172af8 100644 --- a/smart-contract-verifier/sig-provider-extension/Cargo.toml +++ b/smart-contract-verifier/sig-provider-extension/Cargo.toml @@ -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 } diff --git a/smart-contract-verifier/smart-contract-verifier-proto/Cargo.toml b/smart-contract-verifier/smart-contract-verifier-proto/Cargo.toml index 5a5818118..b3e426374 100644 --- a/smart-contract-verifier/smart-contract-verifier-proto/Cargo.toml +++ b/smart-contract-verifier/smart-contract-verifier-proto/Cargo.toml @@ -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 = [ @@ -45,4 +45,4 @@ http-client = [ mock = [ "dep:mockall", "dep:tokio", -] \ No newline at end of file +] diff --git a/smart-contract-verifier/smart-contract-verifier-server/Cargo.toml b/smart-contract-verifier/smart-contract-verifier-server/Cargo.toml index ca69ca5be..43ab3b057 100644 --- a/smart-contract-verifier/smart-contract-verifier-server/Cargo.toml +++ b/smart-contract-verifier/smart-contract-verifier-server/Cargo.toml @@ -6,45 +6,44 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -smart-contract-verifier = { path = "../smart-contract-verifier" } -smart-contract-verifier-proto = { path = "../smart-contract-verifier-proto" } -sig-provider-extension = { path = "../sig-provider-extension", optional = true } +sig-provider-extension = { workspace = true, optional = true } +smart-contract-verifier = { workspace = true } +smart-contract-verifier-proto = { workspace = true } -actix-web = "4" -actix-web-prom = "0.6" -amplify = { version = "4.6.0", features = ["derive"] } -anyhow = "1.0" -async-trait = "0.1" +actix-web = { workspace = true } +amplify = { workspace = true, features = ["derive"] } +anyhow = { workspace = true } +async-trait = { workspace = true } blockscout-display-bytes = { workspace = true } blockscout-service-launcher = { workspace = true } -bytes = "1.3" -config = "0.13" -cron = "0.11" -ethers-solc = "2.0.10" -ethers-core = "2.0.10" -foundry-compilers = "=0.3.9" -futures = "0.3" -hex = "0.4.3" -lazy_static = "1" -prometheus = "0.13" -rust-s3 = "0.32.0" -serde = "1.0" -serde_json = "1.0" -serde_with = "3.8.1" -thiserror = "1.0" -tokio = { version = "1", features = ["rt-multi-thread"] } -tonic = "0.8" -tracing = "0.1" -url = "2.3" -uuid = { version = "1.6.1", features = ["v4"] } +bytes = { workspace = true } +config = { workspace = true } +cron = { workspace = true } +ethers-core = { workspace = true } +ethers-solc = { workspace = true } +foundry-compilers = { workspace = true } +futures = { workspace = true } +hex = { workspace = true } +lazy_static = { workspace = true } +prometheus = { workspace = true } +rust-s3 = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +serde_with = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread"] } +tonic = { workspace = true } +tracing = { workspace = true } +url = { workspace = true } +uuid = { workspace = true, features = ["v4"] } verification-common = { workspace = true } [dev-dependencies] -ethers-solc = { version = "2.0.10", features = ["svm-solc"] } blockscout-service-launcher = { workspace = true , features = ["test-server"]} -ethabi = "18.0" -pretty_assertions = "1.3" -reqwest = "0.11.13" -rstest = "0.19.0" -stdext = "0.3.2" -tempfile = "3.10.1" \ No newline at end of file +ethabi = { workspace = true } +ethers-solc = { workspace = true, features = ["svm-solc"] } +pretty_assertions = { workspace = true } +reqwest = { workspace = true } +rstest = { workspace = true } +stdext = { workspace = true } +tempfile = { workspace = true } diff --git a/smart-contract-verifier/smart-contract-verifier/Cargo.toml b/smart-contract-verifier/smart-contract-verifier/Cargo.toml index d6e43d41b..51f7ea6b5 100644 --- a/smart-contract-verifier/smart-contract-verifier/Cargo.toml +++ b/smart-contract-verifier/smart-contract-verifier/Cargo.toml @@ -7,56 +7,55 @@ repository = "https://github.com/blockscout/blockscout-rs" keywords = ["ethereum", "web3", "solidity"] [dependencies] -smart-contract-verifier-proto = { path = "../smart-contract-verifier-proto" } - -alloy-dyn-abi = "0.6.4" -alloy-json-abi = "0.6.4" -anyhow = "1.0" -async-trait = "0.1" +alloy-dyn-abi = { workspace = true } +alloy-json-abi = { workspace = true } +anyhow = { workspace = true } +async-trait = { workspace = true } blockscout-display-bytes = { workspace = true } -bytes = "1.2" -chrono = "0.4" -cron = "0.11" -ethabi = "18.0" -ethers-core = "2.0.10" -ethers-solc = { version = "2.0.6", features = ["async"] } -foundry-compilers = { version = "=0.3.9", features = ["async"] } -futures = "0.3" -hex = "0.4" -lazy_static = "1" -mismatch = "1.0" -nonempty = "0.10.0" -parking_lot = "0.12" -primitive-types = "0.12" -prometheus = "0.13" -reqwest = { version = "0.11", features = ["json"] } -reqwest-middleware = "0.1" -reqwest-retry = "0.1" -rust-s3 = "0.32.0" -semver = "1.0" -serde = { version = "1", features = ["derive"] } -serde_json = "1" -serde_with = "2" -sha2 = "0.10" -solidity-metadata = "1.1.0" -sourcify = { git = "https://github.com/blockscout/blockscout-rs", rev = "c4261d0" } -sscanf = "0.3" -tempfile = "3.3" -thiserror = "1.0" -tokio = { version = "1", features = ["macros"] } -tracing = "0.1" -url = { version = "2.4", features = ["serde"] } +bytes = { workspace = true } +chrono = { workspace = true } +cron = { workspace = true } +ethabi = { workspace = true } +ethers-core = { workspace = true } +ethers-solc = { workspace = true, features = ["async"] } +foundry-compilers = { workspace = true, features = ["async"] } +futures = { workspace = true } +hex = { workspace = true } +lazy_static = { workspace = true } +mismatch = { workspace = true } +nonempty = { workspace = true } +parking_lot = { workspace = true } +primitive-types = { workspace = true } +prometheus = { workspace = true } +reqwest = { workspace = true, features = ["json"] } +reqwest-middleware = { workspace = true } +reqwest-retry = { workspace = true } +rust-s3 = { workspace = true } +semver = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +serde_with = { workspace = true } +sha2 = { workspace = true } +smart-contract-verifier-proto = { workspace = true } +solidity-metadata = { workspace = true } +sourcify = { workspace = true } +sscanf = { workspace = true } +tempfile = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["macros"] } +tracing = { workspace = true } +url = { workspace = true, features = ["serde"] } verification-common = { workspace = true } -era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", rev = "9969de1" } +era-compiler-common = { workspace = true } [dev-dependencies] -const_format = "0.2" -mockall = "0.11" -pretty_assertions = "1.2" -quick-xml = { version = "0.24", features = ["serialize"] } -rand = "0.8" -rstest = "0.15" -tempfile = "3.3" -tokio = { version = "*", features = ["sync", "parking_lot"] } -wiremock = "0.5" +const_format = { workspace = true } +mockall = { workspace = true } +pretty_assertions = { workspace = true } +quick-xml = { workspace = true, features = ["serialize"] } +rand = { workspace = true } +rstest = { workspace = true } +tempfile = { workspace = true } +tokio = { workspace = true, features = ["sync", "parking_lot"] } +wiremock = { workspace = true }