diff --git a/Cargo.lock b/Cargo.lock index a7638b74d..3be97958e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7017,6 +7017,7 @@ dependencies = [ "schemars", "serde", "serde_json", + "sov-accounts", "sov-modules-api", "sov-state", "tempfile", @@ -7054,6 +7055,7 @@ dependencies = [ "schemars", "serde", "serde_json", + "sov-bank", "sov-modules-api", "sov-rollup-interface", "sov-state", @@ -7108,6 +7110,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.7", + "sov-celestia-adapter", "sov-rollup-interface", "sov-zk-cycle-macros", "tendermint", diff --git a/adapters/celestia/Cargo.toml b/adapters/celestia/Cargo.toml index ae2fb4e32..455311280 100644 --- a/adapters/celestia/Cargo.toml +++ b/adapters/celestia/Cargo.toml @@ -44,6 +44,7 @@ nmt-rs = { git = "https://github.com/Sovereign-Labs/nmt-rs.git", rev = "dd375884 [dev-dependencies] postcard = { version = "1", features = ["use-std"] } proptest = { version = "1.2" } +sov-celestia-adapter = { path = ".", features = ["native"] } wiremock = "0.5" diff --git a/examples/demo-prover/methods/guest-celestia/Cargo.lock b/examples/demo-prover/methods/guest-celestia/Cargo.lock index 414c154a8..e377f11e3 100644 --- a/examples/demo-prover/methods/guest-celestia/Cargo.lock +++ b/examples/demo-prover/methods/guest-celestia/Cargo.lock @@ -210,8 +210,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" -source = "git+https://github.com/rust-lang/cc-rs?rev=e5bbdfa#e5bbdfa1fa468c028cb38fee6c35a3cf2e5a2736" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -1842,3 +1846,8 @@ dependencies = [ "quote", "syn 2.0.37", ] + +[[patch.unused]] +name = "cc" +version = "1.0.79" +source = "git+https://github.com/rust-lang/cc-rs?rev=e5bbdfa#e5bbdfa1fa468c028cb38fee6c35a3cf2e5a2736" diff --git a/examples/demo-prover/methods/guest-mock/Cargo.lock b/examples/demo-prover/methods/guest-mock/Cargo.lock index 5e881876d..7ad1f92f1 100644 --- a/examples/demo-prover/methods/guest-mock/Cargo.lock +++ b/examples/demo-prover/methods/guest-mock/Cargo.lock @@ -174,8 +174,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" -source = "git+https://github.com/rust-lang/cc-rs?rev=e5bbdfa#e5bbdfa1fa468c028cb38fee6c35a3cf2e5a2736" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -1260,3 +1264,8 @@ name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[patch.unused]] +name = "cc" +version = "1.0.79" +source = "git+https://github.com/rust-lang/cc-rs?rev=e5bbdfa#e5bbdfa1fa468c028cb38fee6c35a3cf2e5a2736" diff --git a/full-node/sov-sequencer/Cargo.toml b/full-node/sov-sequencer/Cargo.toml index e810ba416..30ac53a30 100644 --- a/full-node/sov-sequencer/Cargo.toml +++ b/full-node/sov-sequencer/Cargo.toml @@ -24,5 +24,5 @@ sov-rollup-interface = { path = "../../rollup-interface", version = "0.2" } [dev-dependencies] async-trait = { workspace = true } -sov-rollup-interface = { path = "../../rollup-interface", features = ["mocks"] } +sov-rollup-interface = { path = "../../rollup-interface", features = ["mocks", "native"] } tokio = { workspace = true } diff --git a/full-node/sov-stf-runner/Cargo.toml b/full-node/sov-stf-runner/Cargo.toml index dc4be096b..375d52cd1 100644 --- a/full-node/sov-stf-runner/Cargo.toml +++ b/full-node/sov-stf-runner/Cargo.toml @@ -28,7 +28,6 @@ sov-state = { path = "../../module-system/sov-state", version = "0.2" } sov-modules-api = { path = "../../module-system/sov-modules-api", version = "0.2" } [dev-dependencies] -sov-celestia-adapter = { path = "../../adapters/celestia", version = "0.2" } tempfile = { workspace = true } rand = { workspace = true } @@ -37,6 +36,7 @@ sov-bank = { path = "../../module-system/module-implementations/sov-bank", featu sov-modules-stf-template = { path = "../../module-system/sov-modules-stf-template", features = ["native"] } sov-value-setter = { path = "../../module-system/module-implementations/examples/sov-value-setter", features = ["native"] } sov-accounts = { path = "../../module-system/module-implementations/sov-accounts", features = ["native"] } +sov-celestia-adapter = { path = "../../adapters/celestia", features = ["native"] } [features] default = [] diff --git a/module-system/module-implementations/sov-accounts/Cargo.toml b/module-system/module-implementations/sov-accounts/Cargo.toml index 1953e02a0..35ab123d6 100644 --- a/module-system/module-implementations/sov-accounts/Cargo.toml +++ b/module-system/module-implementations/sov-accounts/Cargo.toml @@ -27,6 +27,7 @@ sov-state = { path = "../../sov-state", version = "0.2" } [dev-dependencies] +sov-accounts = { path = ".", features = ["native"] } tempfile = { workspace = true } [features] diff --git a/module-system/module-implementations/sov-bank/Cargo.toml b/module-system/module-implementations/sov-bank/Cargo.toml index 3e8c272c4..03906f897 100644 --- a/module-system/module-implementations/sov-bank/Cargo.toml +++ b/module-system/module-implementations/sov-bank/Cargo.toml @@ -27,6 +27,7 @@ sov-rollup-interface = { path = "../../../rollup-interface", version = "0.2" } [dev-dependencies] +sov-bank = { path = ".", features = ["native"] } tempfile = { workspace = true } [features] diff --git a/rollup-interface/src/state_machine/stf.rs b/rollup-interface/src/state_machine/stf.rs index 1162cdf15..3ab0b5508 100644 --- a/rollup-interface/src/state_machine/stf.rs +++ b/rollup-interface/src/state_machine/stf.rs @@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize}; use crate::da::DaSpec; use crate::zk::{ValidityCondition, Zkvm}; -#[cfg(any(test, feature = "fuzzing"))] +#[cfg(any(all(test, feature = "sha2"), feature = "fuzzing"))] pub mod fuzzing; /// The configuration of a full node of the rollup which creates zk proofs. diff --git a/rollup-interface/src/state_machine/stf/fuzzing.rs b/rollup-interface/src/state_machine/stf/fuzzing.rs index c9b26f19f..96199f6b2 100644 --- a/rollup-interface/src/state_machine/stf/fuzzing.rs +++ b/rollup-interface/src/state_machine/stf/fuzzing.rs @@ -16,7 +16,7 @@ pub trait FuzzHasher { /// The default hasher to use for fuzzing fn default_fuzz_hasher() -> Box { - Box::new(::sha2::Sha256::new()) + Box::new(sha2::Sha256::new()) } impl + Clone> FuzzHasher for T {