Skip to content

Commit d202f0d

Browse files
authored
feat(verifier)remove middleware from verifier; remove sig-provider-extension (#1268)
1 parent 8d96f8c commit d202f0d

File tree

28 files changed

+81
-1024
lines changed

28 files changed

+81
-1024
lines changed

smart-contract-verifier/Cargo.lock

Lines changed: 43 additions & 393 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

smart-contract-verifier/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
[workspace]
22
resolver = "2"
33
members = [
4-
"sig-provider-extension",
54
"smart-contract-verifier",
65
"smart-contract-verifier-proto",
76
"smart-contract-verifier-server",
87
"vyper-cbor-auxdata",
98
]
109

1110
[workspace.dependencies]
12-
sig-provider-extension = { path = "sig-provider-extension" }
1311
smart-contract-verifier = { path = "smart-contract-verifier" }
1412
smart-contract-verifier-proto = { path = "smart-contract-verifier-proto" }
1513
smart-contract-verifier-server = { path = "smart-contract-verifier-server" }
@@ -61,7 +59,6 @@ serde = { version = "1" }
6159
serde_json = { version = "1" }
6260
serde_with = { version = "3" }
6361
sha2 = { version = "0.10" }
64-
sig-provider-proto = { git = "https://github.com/blockscout/blockscout-rs", rev = "b1bdb48" }
6562
solidity-metadata = { version = "1.1.0" }
6663
sourcify = { git = "https://github.com/blockscout/blockscout-rs", rev = "c4261d0" }
6764
sscanf = { version = "0.3" }

smart-contract-verifier/sig-provider-extension/Cargo.toml

Lines changed: 0 additions & 15 deletions
This file was deleted.

smart-contract-verifier/sig-provider-extension/src/lib.rs

Lines changed: 0 additions & 96 deletions
This file was deleted.

smart-contract-verifier/smart-contract-verifier-server/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
sig-provider-extension = { workspace = true, optional = true }
109
smart-contract-verifier = { workspace = true }
1110
smart-contract-verifier-proto = { workspace = true }
1211

smart-contract-verifier/smart-contract-verifier-server/src/run.rs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,19 @@ pub async fn run(settings: Settings) -> Result<(), anyhow::Error> {
8484

8585
let solidity_verifier = match settings.solidity.enabled {
8686
true => Some(Arc::new(
87-
SolidityVerifierService::new(
88-
settings.solidity,
89-
compilers_lock.clone(),
90-
settings.extensions.solidity,
91-
)
92-
.await?,
87+
SolidityVerifierService::new(settings.solidity, compilers_lock.clone()).await?,
9388
)),
9489
false => None,
9590
};
9691
let vyper_verifier = match settings.vyper.enabled {
9792
true => Some(Arc::new(
98-
VyperVerifierService::new(
99-
settings.vyper,
100-
compilers_lock.clone(),
101-
settings.extensions.vyper,
102-
)
103-
.await?,
93+
VyperVerifierService::new(settings.vyper, compilers_lock.clone()).await?,
10494
)),
10595
false => None,
10696
};
10797
let sourcify_verifier = match settings.sourcify.enabled {
10898
true => Some(Arc::new(
109-
SourcifyVerifierService::new(settings.sourcify, settings.extensions.sourcify).await?,
99+
SourcifyVerifierService::new(settings.sourcify).await?,
110100
)),
111101
false => None,
112102
};

smart-contract-verifier/smart-contract-verifier-server/src/services/solidity_verifier.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
VerifySolidityMultiPartRequest, VerifySolidityStandardJsonRequest,
88
},
99
services::common,
10-
settings::{Extensions, SoliditySettings},
10+
settings::SoliditySettings,
1111
types,
1212
types::{
1313
LookupMethodsRequestWrapper, LookupMethodsResponseWrapper, StandardJsonParseError,
@@ -35,8 +35,6 @@ impl SolidityVerifierService {
3535
pub async fn new(
3636
settings: SoliditySettings,
3737
compilers_threads_semaphore: Arc<Semaphore>,
38-
/* Otherwise, results in compilation warning if all extensions are disabled */
39-
#[allow(unused_variables)] extensions: Extensions,
4038
) -> anyhow::Result<Self> {
4139
let solc_validator = Arc::new(SolcValidator::default());
4240
let fetcher = common::initialize_fetcher(
@@ -54,16 +52,7 @@ impl SolidityVerifierService {
5452
);
5553
compilers.load_from_dir(&settings.compilers_dir).await;
5654

57-
/* Otherwise, results in compilation warning if all extensions are disabled */
58-
#[allow(unused_mut)]
59-
let mut client = SolidityClient::new(compilers);
60-
61-
#[cfg(feature = "sig-provider-extension")]
62-
if let Some(sig_provider) = extensions.sig_provider {
63-
// TODO(#221): create only one instance of middleware/connection
64-
client = client
65-
.with_middleware(sig_provider_extension::SigProvider::new(sig_provider).await?);
66-
}
55+
let client = SolidityClient::new(compilers);
6756

6857
Ok(Self {
6958
client: Arc::new(client),

smart-contract-verifier/smart-contract-verifier-server/src/services/sourcify_verifier.rs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::{
44
sourcify_verifier_server::SourcifyVerifier, VerifyFromEtherscanSourcifyRequest,
55
VerifyResponse, VerifySourcifyRequest,
66
},
7-
settings::{Extensions, SourcifySettings},
7+
settings::SourcifySettings,
88
types::{
99
VerifyFromEtherscanSourcifyRequestWrapper, VerifyResponseWrapper,
1010
VerifySourcifyRequestWrapper,
@@ -19,13 +19,8 @@ pub struct SourcifyVerifierService {
1919
}
2020

2121
impl SourcifyVerifierService {
22-
pub async fn new(
23-
settings: SourcifySettings, /* Otherwise, results in compilation warning if all extensions are disabled */
24-
#[allow(unused_variables)] extensions: Extensions,
25-
) -> anyhow::Result<Self> {
26-
/* Otherwise, results in compilation warning if all extensions are disabled */
27-
#[allow(unused_mut)]
28-
let mut client = {
22+
pub async fn new(settings: SourcifySettings) -> anyhow::Result<Self> {
23+
let client = {
2924
SourcifyApiClient::new(
3025
settings.api_url,
3126
settings.request_timeout,
@@ -34,13 +29,6 @@ impl SourcifyVerifierService {
3429
.expect("failed to build sourcify client")
3530
};
3631

37-
#[cfg(feature = "sig-provider-extension")]
38-
if let Some(sig_provider) = extensions.sig_provider {
39-
// TODO(#221): create only one instance of middleware/connection
40-
client = client
41-
.with_middleware(sig_provider_extension::SigProvider::new(sig_provider).await?);
42-
}
43-
4432
Ok(Self {
4533
client: Arc::new(client),
4634
})

smart-contract-verifier/smart-contract-verifier-server/src/services/vyper_verifier.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
VerifyVyperStandardJsonRequest,
77
},
88
services::common,
9-
settings::{Extensions, VyperSettings},
9+
settings::VyperSettings,
1010
types::{
1111
StandardJsonParseError, VerifyResponseWrapper, VerifyVyperMultiPartRequestWrapper,
1212
VerifyVyperStandardJsonRequestWrapper,
@@ -26,8 +26,6 @@ impl VyperVerifierService {
2626
pub async fn new(
2727
settings: VyperSettings,
2828
compilers_threads_semaphore: Arc<Semaphore>,
29-
/* Otherwise, results in compilation warning if all extensions are disabled */
30-
#[allow(unused_variables)] extensions: Extensions,
3129
) -> anyhow::Result<Self> {
3230
let fetcher = common::initialize_fetcher(
3331
settings.fetcher,
@@ -40,16 +38,7 @@ impl VyperVerifierService {
4038
let compilers = Compilers::new(fetcher, VyperCompiler::new(), compilers_threads_semaphore);
4139
compilers.load_from_dir(&settings.compilers_dir).await;
4240

43-
/* Otherwise, results in compilation warning if all extensions are disabled */
44-
#[allow(unused_mut)]
45-
let mut client = VyperClient::new(compilers);
46-
47-
#[cfg(feature = "sig-provider-extension")]
48-
if let Some(sig_provider) = extensions.sig_provider {
49-
// TODO(#221): create only one instance of middleware/connection
50-
client = client
51-
.with_middleware(sig_provider_extension::SigProvider::new(sig_provider).await?);
52-
}
41+
let client = VyperClient::new(compilers);
5342

5443
Ok(Self {
5544
client: Arc::new(client),

smart-contract-verifier/smart-contract-verifier-server/src/settings.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ pub struct Settings {
2929
pub jaeger: JaegerSettings,
3030
pub tracing: TracingSettings,
3131
pub compilers: CompilersSettings,
32-
pub extensions: ExtensionsSettings,
3332
}
3433

3534
#[serde_as]
@@ -168,21 +167,6 @@ impl Default for CompilersSettings {
168167
}
169168
}
170169

171-
#[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
172-
#[serde(default, deny_unknown_fields)]
173-
pub struct ExtensionsSettings {
174-
pub solidity: Extensions,
175-
pub sourcify: Extensions,
176-
pub vyper: Extensions,
177-
}
178-
179-
#[derive(Default, Deserialize, Clone, PartialEq, Eq, Debug)]
180-
#[serde(default, deny_unknown_fields)]
181-
pub struct Extensions {
182-
#[cfg(feature = "sig-provider-extension")]
183-
pub sig_provider: Option<sig_provider_extension::Config>,
184-
}
185-
186170
impl ConfigSettings for Settings {
187171
const SERVICE_NAME: &'static str = "SMART_CONTRACT_VERIFIER";
188172

0 commit comments

Comments
 (0)