From 157cc657bbf79f1f6d2d8988401fef18bd025e55 Mon Sep 17 00:00:00 2001 From: Purushotam Date: Wed, 15 Apr 2026 20:49:43 +0545 Subject: [PATCH 1/2] chore: update strata-common to rc16 and moho --- Cargo.lock | 62 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 36 +++++++++++++++---------------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54a2c0da..1a554b0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -529,7 +529,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -540,7 +540,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1392,7 +1392,7 @@ dependencies = [ "bitflags 2.11.0", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.12.1", "log", "prettyplease", "proc-macro2", @@ -2654,7 +2654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3461,7 +3461,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.3", + "socket2 0.5.10", "tokio", "tower-service", "tracing", @@ -4323,7 +4323,7 @@ dependencies = [ [[package]] name = "moho-recursive-proof" version = "0.1.0" -source = "git+https://github.com/alpenlabs/moho?rev=19c4099ffea81d754086bcb8ba324ad360148cfe#19c4099ffea81d754086bcb8ba324ad360148cfe" +source = "git+https://github.com/alpenlabs/moho?rev=b399fdbf3b5108f4b0d0559dc1e74b9e53858744#b399fdbf3b5108f4b0d0559dc1e74b9e53858744" dependencies = [ "k256", "moho-types", @@ -4341,7 +4341,7 @@ dependencies = [ [[package]] name = "moho-runtime-impl" version = "0.1.0" -source = "git+https://github.com/alpenlabs/moho?rev=19c4099ffea81d754086bcb8ba324ad360148cfe#19c4099ffea81d754086bcb8ba324ad360148cfe" +source = "git+https://github.com/alpenlabs/moho?rev=b399fdbf3b5108f4b0d0559dc1e74b9e53858744#b399fdbf3b5108f4b0d0559dc1e74b9e53858744" dependencies = [ "moho-runtime-interface", "moho-types", @@ -4352,7 +4352,7 @@ dependencies = [ [[package]] name = "moho-runtime-interface" version = "0.1.0" -source = "git+https://github.com/alpenlabs/moho?rev=19c4099ffea81d754086bcb8ba324ad360148cfe#19c4099ffea81d754086bcb8ba324ad360148cfe" +source = "git+https://github.com/alpenlabs/moho?rev=b399fdbf3b5108f4b0d0559dc1e74b9e53858744#b399fdbf3b5108f4b0d0559dc1e74b9e53858744" dependencies = [ "moho-types", "ssz", @@ -4362,7 +4362,7 @@ dependencies = [ [[package]] name = "moho-types" version = "0.1.0" -source = "git+https://github.com/alpenlabs/moho?rev=19c4099ffea81d754086bcb8ba324ad360148cfe#19c4099ffea81d754086bcb8ba324ad360148cfe" +source = "git+https://github.com/alpenlabs/moho?rev=b399fdbf3b5108f4b0d0559dc1e74b9e53858744#b399fdbf3b5108f4b0d0559dc1e74b9e53858744" dependencies = [ "hex", "sha2", @@ -4450,7 +4450,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -4616,7 +4616,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.117", @@ -5359,7 +5359,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.2", "rustls 0.23.37", - "socket2 0.6.3", + "socket2 0.5.10", "thiserror 2.0.18", "tokio", "tracing", @@ -5396,7 +5396,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.3", + "socket2 0.5.10", "tracing", "windows-sys 0.60.2", ] @@ -5827,7 +5827,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6498,7 +6498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7583,7 +7583,7 @@ dependencies = [ [[package]] name = "strata-btc-types" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "arbitrary", "bitcoin", @@ -7642,7 +7642,7 @@ dependencies = [ [[package]] name = "strata-codec" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "strata-codec-derive", "thiserror 2.0.18", @@ -7651,7 +7651,7 @@ dependencies = [ [[package]] name = "strata-codec-derive" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "quote", "syn 2.0.117", @@ -7660,7 +7660,7 @@ dependencies = [ [[package]] name = "strata-codec-utils" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "borsh", "ssz", @@ -7671,7 +7671,7 @@ dependencies = [ [[package]] name = "strata-crypto" version = "0.3.0-alpha.1" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "arbitrary", "bitcoin", @@ -7692,7 +7692,7 @@ dependencies = [ [[package]] name = "strata-identifiers" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "arbitrary", "borsh", @@ -7714,7 +7714,7 @@ dependencies = [ [[package]] name = "strata-l1-envelope-fmt" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "bitcoin", "thiserror 2.0.18", @@ -7723,7 +7723,7 @@ dependencies = [ [[package]] name = "strata-l1-txfmt" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "arbitrary", "bitcoin", @@ -7735,7 +7735,7 @@ dependencies = [ [[package]] name = "strata-merkle" version = "0.2.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "borsh", "digest 0.10.7", @@ -7755,7 +7755,7 @@ dependencies = [ [[package]] name = "strata-msg-fmt" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "thiserror 2.0.18", ] @@ -7763,7 +7763,7 @@ dependencies = [ [[package]] name = "strata-predicate" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "arbitrary", "borsh", @@ -7785,7 +7785,7 @@ dependencies = [ [[package]] name = "strata-service" version = "0.3.0-alpha.1" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "anyhow", "futures", @@ -7801,7 +7801,7 @@ dependencies = [ [[package]] name = "strata-ssz-tests" version = "0.1.0" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "proptest", "ssz", @@ -7811,7 +7811,7 @@ dependencies = [ [[package]] name = "strata-tasks" version = "0.3.0-alpha.1" -source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc15#9e46374e50aa4a5b059e53b81395d9733a958434" +source = "git+https://github.com/alpenlabs/strata-common?tag=v0.1.0-alpha-rc16#a0c346696ffbf2bc95b7fa37174e09d41462efa3" dependencies = [ "anyhow", "futures-util", @@ -8049,7 +8049,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -8972,7 +8972,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c2748f03..281f967f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,28 +87,28 @@ strata-test-utils-btc = { path = "crates/test-utils/btc" } strata-test-utils-btcio = { path = "crates/test-utils/btcio" } strata-test-utils-checkpoint = { path = "crates/test-utils/checkpoint" } -# Dependencies from alpenlabs/moho (28ef75c = strata-common rc15) -moho-recursive-proof = { git = "https://github.com/alpenlabs/moho", rev = "19c4099ffea81d754086bcb8ba324ad360148cfe" } -moho-runtime-impl = { git = "https://github.com/alpenlabs/moho", rev = "19c4099ffea81d754086bcb8ba324ad360148cfe" } -moho-runtime-interface = { git = "https://github.com/alpenlabs/moho", rev = "19c4099ffea81d754086bcb8ba324ad360148cfe" } -moho-types = { git = "https://github.com/alpenlabs/moho", rev = "19c4099ffea81d754086bcb8ba324ad360148cfe" } +# Dependencies from alpenlabs/moho (moho's b399fdb depends on strata-common rc16) +moho-recursive-proof = { git = "https://github.com/alpenlabs/moho", rev = "b399fdbf3b5108f4b0d0559dc1e74b9e53858744" } +moho-runtime-impl = { git = "https://github.com/alpenlabs/moho", rev = "b399fdbf3b5108f4b0d0559dc1e74b9e53858744" } +moho-runtime-interface = { git = "https://github.com/alpenlabs/moho", rev = "b399fdbf3b5108f4b0d0559dc1e74b9e53858744" } +moho-types = { git = "https://github.com/alpenlabs/moho", rev = "b399fdbf3b5108f4b0d0559dc1e74b9e53858744" } # Dependencies from alpenlabs/strata-common -strata-btc-types = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } +strata-btc-types = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } strata-codec = { git = "https://github.com/alpenlabs/strata-common", features = [ "derive", -], tag = "v0.1.0-alpha-rc15" } -strata-codec-utils = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-crypto = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-identifiers = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-l1-envelope-fmt = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-l1-txfmt = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-merkle = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-msg-fmt = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-predicate = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-service = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-ssz-tests = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } -strata-tasks = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc15" } +], tag = "v0.1.0-alpha-rc16" } +strata-codec-utils = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-crypto = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-identifiers = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-l1-envelope-fmt = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-l1-txfmt = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-merkle = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-msg-fmt = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-predicate = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-service = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-ssz-tests = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } +strata-tasks = { git = "https://github.com/alpenlabs/strata-common", tag = "v0.1.0-alpha-rc16" } # dependencies from alpenlabs/ssz-gen ssz = { git = "https://github.com/alpenlabs/ssz-gen", tag = "v0.15.0" } From dfa7940dc32d95d7c3556c39ba5ba832c7d1ce8b Mon Sep 17 00:00:00 2001 From: Purushotam Date: Wed, 15 Apr 2026 21:37:54 +0545 Subject: [PATCH 2/2] chore: update rustls-webpki and whitelisted 0098/99 --- .cargo/audit.toml | 6 +++++- Cargo.lock | 14 +++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.cargo/audit.toml b/.cargo/audit.toml index 82233167..b6dfe649 100644 --- a/.cargo/audit.toml +++ b/.cargo/audit.toml @@ -17,10 +17,14 @@ ignore = [ "RUSTSEC-2026-0048", # RUSTSEC-2026-0049 (rustls-webpki 0.101.7) — CRL matching logic error - # rustls-webpki 0.103.9 was bumped to 0.103.10 via cargo update. + # RUSTSEC-2026-0098 (rustls-webpki 0.101.7) — Name constraints for URI names incorrectly accepted + # RUSTSEC-2026-0099 (rustls-webpki 0.101.7) — Name constraints accepted for wildcard certificates + # rustls-webpki 0.103.10 was bumped to 0.103.12 via cargo update. # The 0.101.7 instance is pulled in via bitreq -> bitcoind-async-client (strata-bridge git dep). # Upgrade blocked until the strata-bridge dependency updates its rustls/webpki stack. "RUSTSEC-2026-0049", + "RUSTSEC-2026-0098", + "RUSTSEC-2026-0099", # RUSTSEC-2026-0002 (lru 0.12.5) — IterMut unsound (Stacked Borrows violation) # Pulled in via sp1-prover -> sp1-sdk. diff --git a/Cargo.lock b/Cargo.lock index 1a554b0b..76c8d178 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2654,7 +2654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5827,7 +5827,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5853,7 +5853,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.10", + "rustls-webpki 0.103.12", "subtle", "zeroize", ] @@ -5903,7 +5903,7 @@ dependencies = [ "rustls 0.23.37", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.10", + "rustls-webpki 0.103.12", "security-framework", "security-framework-sys", "webpki-root-certs 0.26.11", @@ -5928,9 +5928,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.10" +version = "0.103.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" dependencies = [ "aws-lc-rs", "ring", @@ -8049,7 +8049,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]]