Skip to content

Commit 29a023f

Browse files
authored
feat: Support Rust 1.88 by removing usage of Duration::from_mins (#2736)
1 parent c9e0002 commit 29a023f

12 files changed

Lines changed: 356 additions & 400 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repository = "https://github.com/succinctlabs/sp1"
66
keywords = ["sp1", "succinct", "zero-knowledge", "zkvm"]
77
categories = ["cryptography"]
88
include = ["SP1_CIRCUIT_VERSION"]
9-
rust-version = "1.91"
9+
rust-version = "1.88"
1010

1111
[workspace]
1212
members = [
@@ -152,23 +152,23 @@ sp1-gpu-tracing = { version = "6.1.0", path = "sp1-gpu/crates/tracing" }
152152
sp1-gpu-utils = { version = "6.1.0", path = "sp1-gpu/crates/utils" }
153153
sp1-gpu-zerocheck = { version = "6.1.0", path = "sp1-gpu/crates/zerocheck" }
154154

155-
p3-air = "0.3.2-succinct"
156-
p3-baby-bear = "0.3.2-succinct"
157-
p3-bn254-fr = "0.3.2-succinct"
158-
p3-challenger = "0.3.2-succinct"
159-
p3-commit = "0.3.2-succinct"
160-
p3-dft = "0.3.2-succinct"
161-
p3-field = "0.3.2-succinct"
162-
p3-fri = "0.3.2-succinct"
163-
p3-keccak-air = "0.3.2-succinct"
164-
p3-koala-bear = "0.3.2-succinct"
165-
p3-matrix = "0.3.2-succinct"
166-
p3-maybe-rayon = { version = "0.3.2-succinct", features = ["parallel"] }
167-
p3-merkle-tree = "0.3.2-succinct"
168-
p3-poseidon2 = "0.3.2-succinct"
169-
p3-symmetric = "0.3.2-succinct"
170-
p3-uni-stark = "0.3.2-succinct"
171-
p3-util = "0.3.2-succinct"
155+
p3-air = "0.3.3-succinct"
156+
p3-baby-bear = "0.3.3-succinct"
157+
p3-bn254-fr = "0.3.3-succinct"
158+
p3-challenger = "0.3.3-succinct"
159+
p3-commit = "0.3.3-succinct"
160+
p3-dft = "0.3.3-succinct"
161+
p3-field = "0.3.3-succinct"
162+
p3-fri = "0.3.3-succinct"
163+
p3-keccak-air = "0.3.3-succinct"
164+
p3-koala-bear = "0.3.3-succinct"
165+
p3-matrix = "0.3.3-succinct"
166+
p3-maybe-rayon = { version = "0.3.3-succinct", features = ["parallel"] }
167+
p3-merkle-tree = "0.3.3-succinct"
168+
p3-poseidon2 = "0.3.3-succinct"
169+
p3-symmetric = "0.3.3-succinct"
170+
p3-uni-stark = "0.3.3-succinct"
171+
p3-util = "0.3.3-succinct"
172172

173173
slop-air = { version = "6.1.0", path = "./slop/crates/air" }
174174
slop-algebra = { version = "6.1.0", path = "./slop/crates/algebra" }

crates/sdk/src/network/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl NetworkClient {
114114
) -> Self {
115115
let client = reqwest::Client::builder()
116116
.pool_max_idle_per_host(0)
117-
.pool_idle_timeout(Duration::from_mins(4))
117+
.pool_idle_timeout(Duration::from_secs(240))
118118
.build()
119119
.unwrap();
120120
Self { signer, http: client.into(), rpc_url: rpc_url.into(), network_mode }

crates/sdk/src/network/grpc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ use tonic::transport::{ClientTlsConfig, Endpoint, Error};
66
/// Sets reasonable settings to handle timeouts and keep-alive.
77
pub fn configure_endpoint(addr: &str) -> Result<Endpoint, Error> {
88
let mut endpoint = Endpoint::new(addr.to_string())?
9-
.timeout(Duration::from_mins(1))
9+
.timeout(Duration::from_secs(60))
1010
.connect_timeout(Duration::from_secs(15))
1111
.keep_alive_while_idle(true)
1212
.http2_keep_alive_interval(Duration::from_secs(15))
1313
.keep_alive_timeout(Duration::from_secs(15))
14-
.tcp_keepalive(Some(Duration::from_mins(1)))
14+
.tcp_keepalive(Some(Duration::from_secs(60)))
1515
.tcp_nodelay(true);
1616

1717
// Configure TLS if using HTTPS.

crates/sdk/src/network/retry.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::time::Duration;
44
use tonic::Code;
55

66
/// Default timeout for retry operations.
7-
pub const DEFAULT_RETRY_TIMEOUT: Duration = Duration::from_mins(2);
7+
pub const DEFAULT_RETRY_TIMEOUT: Duration = Duration::from_secs(120);
88

99
/// Trait for implementing retryable RPC operations.
1010
#[async_trait::async_trait]
@@ -41,7 +41,7 @@ where
4141
{
4242
let backoff = ExponentialBackoff {
4343
initial_interval: Duration::from_secs(1),
44-
max_interval: Duration::from_mins(2),
44+
max_interval: Duration::from_secs(120),
4545
max_elapsed_time: timeout,
4646
..Default::default()
4747
};

0 commit comments

Comments
 (0)