From d2722ceda35d50becaa57e4ad2bbcca3c6f416c5 Mon Sep 17 00:00:00 2001 From: bkolad Date: Tue, 28 Nov 2023 17:34:58 +0100 Subject: [PATCH] Update dependencies --- Cargo.lock | 91 +++++++----------- Cargo.toml | 34 +++---- .../provers/risc0/guest-celestia/Cargo.lock | 94 +++++++++---------- .../provers/risc0/guest-celestia/Cargo.toml | 12 +-- crates/provers/risc0/guest-mock/Cargo.lock | 62 +++++++----- crates/provers/risc0/guest-mock/Cargo.toml | 12 +-- crates/rollup/src/celestia_rollup.rs | 8 +- crates/rollup/src/mock_rollup.rs | 8 +- 8 files changed, 160 insertions(+), 161 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02420f8..2cd3416 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -629,7 +629,7 @@ version = "0.1.0" source = "git+https://github.com/eigerco/celestia-node-rs.git?rev=66b7c6c#66b7c6cd58213c0cbf79207ba549cef82764ddca" dependencies = [ "anyhow", - "prost 0.12.1", + "prost", "prost-build", "prost-types", "serde", @@ -1668,15 +1668,15 @@ dependencies = [ [[package]] name = "ics23" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442d4bab37956e76f739c864f246c825d87c0bb7f9afa65660c57833c91bf6d4" +checksum = "661e2d6f79952a65bc92b1c81f639ebd37228dae6ff412a5aba7d474bdc4b957" dependencies = [ "anyhow", "bytes", "hex", "informalsystems-pbjson", - "prost 0.11.9", + "prost", "ripemd", "serde", "sha2 0.10.8", @@ -1799,9 +1799,8 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jmt" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f1cb339f7d5288603665c0ccbef7ad33a782ced36e18b6b207f175479eb3b7" +version = "0.9.0" +source = "git+https://github.com/penumbra-zone/jmt.git?rev=1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6#1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" dependencies = [ "anyhow", "borsh", @@ -2741,16 +2740,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.1" @@ -2758,7 +2747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", - "prost-derive 0.12.1", + "prost-derive", ] [[package]] @@ -2775,7 +2764,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.12.1", + "prost", "prost-types", "regex", "syn 2.0.38", @@ -2783,19 +2772,6 @@ dependencies = [ "which", ] -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.12.1" @@ -2815,7 +2791,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ - "prost 0.12.1", + "prost", ] [[package]] @@ -3203,7 +3179,7 @@ dependencies = [ "log", "num-derive 0.4.1", "num-traits", - "prost 0.12.1", + "prost", "prost-build", "protobuf-src", "rand", @@ -3749,7 +3725,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -3766,7 +3742,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -3783,7 +3759,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -3798,7 +3774,7 @@ dependencies = [ "jsonrpsee", "nmt-rs", "pin-project", - "prost 0.12.1", + "prost", "serde", "serde_json", "sha2 0.10.8", @@ -3813,7 +3789,7 @@ dependencies = [ [[package]] name = "sov-cli" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -3830,7 +3806,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bincode", @@ -3847,7 +3823,7 @@ dependencies = [ [[package]] name = "sov-ledger-rpc" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "futures", @@ -3860,7 +3836,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -3880,7 +3856,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bech32", @@ -3906,7 +3882,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bech32", @@ -3925,7 +3901,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -3941,7 +3917,7 @@ dependencies = [ [[package]] name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -3964,7 +3940,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -3982,7 +3958,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bincode", @@ -3999,7 +3975,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -4053,7 +4029,7 @@ dependencies = [ [[package]] name = "sov-schema-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "once_cell", @@ -4066,7 +4042,7 @@ dependencies = [ [[package]] name = "sov-sequencer" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -4082,7 +4058,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -4099,7 +4075,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bcs", @@ -4118,7 +4094,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -4126,6 +4102,7 @@ dependencies = [ "futures", "hex", "jsonrpsee", + "num_cpus", "rayon", "serde", "serde_json", @@ -4140,7 +4117,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "bytes", "risc0-zkvm", @@ -4313,7 +4290,7 @@ dependencies = [ "instant", "num-traits", "once_cell", - "prost 0.12.1", + "prost", "prost-types", "serde", "serde_bytes", @@ -4337,7 +4314,7 @@ dependencies = [ "flex-error", "num-derive 0.3.3", "num-traits", - "prost 0.12.1", + "prost", "prost-types", "serde", "serde_bytes", diff --git a/Cargo.toml b/Cargo.toml index 941afa9..bb17344 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,23 +16,23 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } stf-starter = { path = "./crates/stf" } serde = { version = "1.0.192", features = ["derive", "rc"] } diff --git a/crates/provers/risc0/guest-celestia/Cargo.lock b/crates/provers/risc0/guest-celestia/Cargo.lock index 421c610..4d8ad55 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.lock +++ b/crates/provers/risc0/guest-celestia/Cargo.lock @@ -421,7 +421,7 @@ version = "0.1.0" source = "git+https://github.com/eigerco/celestia-node-rs.git?rev=66b7c6c#66b7c6cd58213c0cbf79207ba549cef82764ddca" dependencies = [ "anyhow", - "prost 0.12.1", + "prost", "prost-build", "prost-types", "serde", @@ -944,6 +944,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + [[package]] name = "hex" version = "0.4.3" @@ -964,15 +970,15 @@ dependencies = [ [[package]] name = "ics23" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442d4bab37956e76f739c864f246c825d87c0bb7f9afa65660c57833c91bf6d4" +checksum = "661e2d6f79952a65bc92b1c81f639ebd37228dae6ff412a5aba7d474bdc4b957" dependencies = [ "anyhow", "bytes", "hex", "informalsystems-pbjson", - "prost 0.11.9", + "prost", "ripemd", "serde", "sha2 0.10.8", @@ -1063,9 +1069,8 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jmt" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f1cb339f7d5288603665c0ccbef7ad33a782ced36e18b6b207f175479eb3b7" +version = "0.9.0" +source = "git+https://github.com/penumbra-zone/jmt.git?rev=1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6#1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" dependencies = [ "anyhow", "borsh", @@ -1249,6 +1254,16 @@ dependencies = [ "libm", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -1441,16 +1456,6 @@ dependencies = [ "unarray", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - [[package]] name = "prost" version = "0.12.1" @@ -1458,7 +1463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", - "prost-derive 0.12.1", + "prost-derive", ] [[package]] @@ -1475,7 +1480,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.12.1", + "prost", "prost-types", "regex", "syn 2.0.38", @@ -1483,19 +1488,6 @@ dependencies = [ "which", ] -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "prost-derive" version = "0.12.1" @@ -1515,7 +1507,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ - "prost 0.12.1", + "prost", ] [[package]] @@ -1977,7 +1969,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -1990,7 +1982,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -2003,7 +1995,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -2014,7 +2006,7 @@ dependencies = [ "celestia-types", "hex", "nmt-rs", - "prost 0.12.1", + "prost", "serde", "sha2 0.10.8", "sov-rollup-interface", @@ -2043,7 +2035,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=84ed498393577fd1272338599639eb57340c5b89#84ed498393577fd1272338599639eb57340c5b89" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -2053,12 +2045,13 @@ dependencies = [ "serde", "sha2 0.10.8", "sov-rollup-interface", + "tracing", ] [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bech32", @@ -2079,7 +2072,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bech32", @@ -2098,7 +2091,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -2113,7 +2106,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -2130,7 +2123,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bincode", @@ -2145,7 +2138,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -2162,7 +2155,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -2175,7 +2168,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bcs", @@ -2193,11 +2186,12 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", "hex", + "num_cpus", "serde", "serde_json", "sov-rollup-interface", @@ -2206,7 +2200,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "bytes", "risc0-zkvm", @@ -2336,7 +2330,7 @@ dependencies = [ "instant", "num-traits", "once_cell", - "prost 0.12.1", + "prost", "prost-types", "serde", "serde_bytes", @@ -2360,7 +2354,7 @@ dependencies = [ "flex-error", "num-derive 0.3.3", "num-traits", - "prost 0.12.1", + "prost", "prost-types", "serde", "serde_bytes", diff --git a/crates/provers/risc0/guest-celestia/Cargo.toml b/crates/provers/risc0/guest-celestia/Cargo.toml index 5367199..f342a5e 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.toml +++ b/crates/provers/risc0/guest-celestia/Cargo.toml @@ -13,12 +13,12 @@ risc0-zkvm-platform = "0.18" stf-starter = { path = "../../../stf" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2/v0.10.6-risc0" } diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index 2c91985..a31bebe 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -392,6 +392,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + [[package]] name = "hex" version = "0.4.3" @@ -403,9 +409,9 @@ dependencies = [ [[package]] name = "ics23" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442d4bab37956e76f739c864f246c825d87c0bb7f9afa65660c57833c91bf6d4" +checksum = "661e2d6f79952a65bc92b1c81f639ebd37228dae6ff412a5aba7d474bdc4b957" dependencies = [ "anyhow", "bytes", @@ -445,9 +451,8 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jmt" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f1cb339f7d5288603665c0ccbef7ad33a782ced36e18b6b207f175479eb3b7" +version = "0.9.0" +source = "git+https://github.com/penumbra-zone/jmt.git?rev=1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6#1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" dependencies = [ "anyhow", "borsh", @@ -542,6 +547,16 @@ dependencies = [ "libm", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -612,9 +627,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -622,15 +637,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -942,7 +957,7 @@ checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -955,7 +970,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -968,7 +983,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -984,7 +999,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bech32", @@ -1005,7 +1020,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bech32", @@ -1024,7 +1039,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -1039,7 +1054,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -1056,7 +1071,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bincode", @@ -1071,7 +1086,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "async-trait", @@ -1088,7 +1103,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", @@ -1101,7 +1116,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "bcs", @@ -1119,11 +1134,12 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "anyhow", "borsh", "hex", + "num_cpus", "serde", "serde_json", "sov-rollup-interface", @@ -1132,7 +1148,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=1f87cc01c788cbfd75d45f354cfb49c675a9bfae#1f87cc01c788cbfd75d45f354cfb49c675a9bfae" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 2b98d02..9547f62 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -14,12 +14,12 @@ risc0-zkvm-platform = "0.18" serde = { version = "1.0.188", features = ["derive", "rc"] } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "1f87cc01c788cbfd75d45f354cfb49c675a9bfae" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } stf-starter = { path = "../../../stf" } diff --git a/crates/rollup/src/celestia_rollup.rs b/crates/rollup/src/celestia_rollup.rs index f20401d..d070927 100644 --- a/crates/rollup/src/celestia_rollup.rs +++ b/crates/rollup/src/celestia_rollup.rs @@ -121,7 +121,13 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { rollup_namespace: ROLLUP_NAMESPACE, }; - ParallelProverService::new(vm, zk_stf, da_verifier, prover_config, zk_storage) + ParallelProverService::new_with_default_workers( + vm, + zk_stf, + da_verifier, + prover_config, + zk_storage, + ) } } diff --git a/crates/rollup/src/mock_rollup.rs b/crates/rollup/src/mock_rollup.rs index a2b56cc..57b4716 100644 --- a/crates/rollup/src/mock_rollup.rs +++ b/crates/rollup/src/mock_rollup.rs @@ -109,7 +109,13 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { let zk_storage = ZkStorage::new(); let da_verifier = Default::default(); - ParallelProverService::new(vm, zk_stf, da_verifier, prover_config, zk_storage) + ParallelProverService::new_with_default_workers( + vm, + zk_stf, + da_verifier, + prover_config, + zk_storage, + ) } }