diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fb59879c1d..caa59aaf68 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -77,7 +77,8 @@ jobs: - name: cargo hack run: make check-features test: - runs-on: ubuntu-latest + runs-on: + group: 8-cores_32GB_Ubuntu Group timeout-minutes: 60 env: SCCACHE_GHA_ENABLED: "true" diff --git a/adapters/celestia/Cargo.toml b/adapters/celestia/Cargo.toml index 6242528d4c..623e8f054e 100644 --- a/adapters/celestia/Cargo.toml +++ b/adapters/celestia/Cargo.toml @@ -21,9 +21,7 @@ base64 = "0.13.1" hex = { version = "0.4.3", features = ["serde"] } hex-literal = "0.3.4" jsonrpsee = { version = "0.16.2", features = ["http-client"], optional = true } -reqwest = { version = "0.11.13", features = ["blocking"], optional = true } serde = { workspace = true } -serde_cbor = "0.11.2" serde_json = { workspace = true } tokio = { workspace = true, optional = true } thiserror = { workspace = true } @@ -40,8 +38,7 @@ wiremock = "0.5" [build-dependencies] prost-build = { version = "0.11" } - [features] default = ["native"] -native = ["dep:tokio", "dep:reqwest", "dep:jsonrpsee"] +native = ["dep:tokio", "dep:jsonrpsee"] verifier = [] diff --git a/adapters/celestia/src/share_commit.rs b/adapters/celestia/src/share_commit.rs index b9b26fe80d..3dafc06532 100644 --- a/adapters/celestia/src/share_commit.rs +++ b/adapters/celestia/src/share_commit.rs @@ -28,7 +28,7 @@ impl std::fmt::Display for CommitmentError { impl std::error::Error for CommitmentError {} -/// Derived from https://github.com/celestiaorg/celestia-app/blob/0c81704939cd743937aac2859f3cb5ae6368f174/x/payment/types/payfordata.go#L170 +/// Derived from pub fn recreate_commitment( square_size: usize, shares: shares::BlobRef, diff --git a/examples/demo-simple-stf/Cargo.toml b/examples/demo-simple-stf/Cargo.toml index 685775d2e8..5f26c4bd04 100644 --- a/examples/demo-simple-stf/Cargo.toml +++ b/examples/demo-simple-stf/Cargo.toml @@ -10,7 +10,6 @@ publish = false [dependencies] anyhow = { workspace = true} serde = { workspace = true } -serde_json = { workspace = true, optional = true } sha2 = { workspace = true } sov-rollup-interface = { path = "../../rollup-interface" } diff --git a/examples/demo-stf/Cargo.toml b/examples/demo-stf/Cargo.toml index f0f6cc4f41..9a8ca0dd8a 100644 --- a/examples/demo-stf/Cargo.toml +++ b/examples/demo-stf/Cargo.toml @@ -19,7 +19,6 @@ anyhow = { workspace = true } borsh = { workspace = true } serde = { workspace = true } serde_json = { workspace = true, optional = true } -sha2 = { workspace = true } clap = { workspace = true, optional = true } toml = { workspace = true, optional = true } jsonrpsee = { workspace = true, features = ["http-client", "server"], optional = true } @@ -27,6 +26,7 @@ tokio = { workspace = true, optional = true } hex = { workspace = true } tracing = { workspace = true } +const-rollup-config = { path = "../const-rollup-config" } sov-rollup-interface = { path = "../../rollup-interface" } sov-election = { path = "../../module-system/module-implementations/examples/sov-election", default-features = false } sov-sequencer-registry = { path = "../../module-system/module-implementations/sov-sequencer-registry", default-features = false } @@ -37,10 +37,7 @@ sov-accounts = { path = "../../module-system/module-implementations/sov-accounts sov-state = { path = "../../module-system/sov-state", default-features = false } sov-modules-api = { path = "../../module-system/sov-modules-api", default-features = false } sov-modules-macros = { path = "../../module-system/sov-modules-macros" } -# Only enable the db on "native" feature -sov-schema-db = { path = "../../full-node/db/sov-schema-db", optional = true } -sov-db = { path = "../../full-node/db/sov-db", optional = true } -const-rollup-config = { path = "../const-rollup-config" } +# Only enable the sequencer on "native" feature sov-sequencer = { path = "../../full-node/sov-sequencer", optional = true } # Only enable the evm on "experimental" feature @@ -57,8 +54,6 @@ experimental =["sov-evm/experimental"] native = [ - "dep:sov-db", - "dep:sov-schema-db", "sov-bank/native", "sov-accounts/native", "sov-election/native", diff --git a/full-node/sov-ethereum/Cargo.toml b/full-node/sov-ethereum/Cargo.toml index bd2936eeaa..bf798ad55a 100644 --- a/full-node/sov-ethereum/Cargo.toml +++ b/full-node/sov-ethereum/Cargo.toml @@ -12,10 +12,7 @@ resolver = "2" [dependencies] -anyhow = { workspace = true } jsonrpsee = { workspace = true, features = ["http-client", "server"] } -serde = { workspace = true, features = ["derive"] } -sov-rollup-interface = { path = "../../rollup-interface" } sov-evm = { path = "../../module-system/module-implementations/sov-evm", default-features = false } demo-stf = { path = "../../examples/demo-stf", features = ["native"] } diff --git a/module-system/module-implementations/examples/sov-election/Cargo.toml b/module-system/module-implementations/examples/sov-election/Cargo.toml index bad80b8326..a7fb953d93 100644 --- a/module-system/module-implementations/examples/sov-election/Cargo.toml +++ b/module-system/module-implementations/examples/sov-election/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sov-election" -description = "A Sovereign SDK module for incentivizing provers" +description = "A Sovereign SDK module for demonstrating election" authors = { workspace = true } edition = { workspace = true } homepage = { workspace = true } @@ -14,16 +14,14 @@ publish = false [dependencies] anyhow = { workspace = true } +borsh = { workspace = true, features = ["rc"] } +jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } +serde = { workspace = true, optional = true } + sov-modules-api = { path = "../../../sov-modules-api", default-features = false } sov-modules-macros = { path = "../../../sov-modules-macros" } sov-state = { path = "../../../sov-state", default-features = false } -sov-rollup-interface = { path = "../../../../rollup-interface" } -serde = { workspace = true, optional = true } -serde_json = { workspace = true, optional = true } -thiserror = { workspace = true } -borsh = { workspace = true, features = ["rc"] } -hex = { workspace = true } -jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } + [dev-dependencies] sov-modules-api = { path = "../../../sov-modules-api" } @@ -31,5 +29,5 @@ tempfile = { workspace = true } [features] default = ["native"] -serde = ["dep:serde", "dep:serde_json"] +serde = ["dep:serde"] native = ["serde", "sov-modules-api/native", "dep:jsonrpsee"] diff --git a/module-system/module-implementations/examples/sov-value-setter/Cargo.toml b/module-system/module-implementations/examples/sov-value-setter/Cargo.toml index 237d37391f..5d05f8d3e9 100644 --- a/module-system/module-implementations/examples/sov-value-setter/Cargo.toml +++ b/module-system/module-implementations/examples/sov-value-setter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sov-value-setter" -description = "A Sovereign SDK module for incentivizing provers" +description = "A Sovereign SDK example module for setting/reading value from state" authors = { workspace = true } edition = { workspace = true } homepage = { workspace = true } @@ -23,12 +23,11 @@ sov-modules-macros = { path = "../../../sov-modules-macros" } sov-state = { path = "../../../sov-state", default-features = false } sov-rollup-interface = { path = "../../../../rollup-interface" } serde = { workspace = true, optional = true } -serde_json = { workspace = true, optional = true } thiserror = { workspace = true } borsh = { workspace = true, features = ["rc"] } jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } [features] default = ["native"] -serde = ["dep:serde", "dep:serde_json"] +serde = ["dep:serde"] native = ["serde", "sov-modules-api/native", "dep:jsonrpsee"] diff --git a/module-system/module-implementations/integration-tests/Cargo.toml b/module-system/module-implementations/integration-tests/Cargo.toml index 4d9c140b7a..d38b36a10d 100644 --- a/module-system/module-implementations/integration-tests/Cargo.toml +++ b/module-system/module-implementations/integration-tests/Cargo.toml @@ -14,12 +14,11 @@ publish = false [dev-dependencies] anyhow = { workspace = true } borsh = { workspace = true, features = ["rc"] } -serde_json = { workspace = true } -serial_test = "*" +tempfile = { workspace = true } sov-modules-api = { path = "../../sov-modules-api" } sov-modules-macros = { path = "../../sov-modules-macros" } sov-state = { path = "../../sov-state" } sov-rollup-interface = { path = "../../../rollup-interface" } sov-schema-db = { path = "../../../full-node/db/sov-schema-db" } -tempfile = { workspace = true } + diff --git a/module-system/module-implementations/module-template/Cargo.toml b/module-system/module-implementations/module-template/Cargo.toml index e581150870..462b1e8861 100644 --- a/module-system/module-implementations/module-template/Cargo.toml +++ b/module-system/module-implementations/module-template/Cargo.toml @@ -19,7 +19,6 @@ sov-modules-macros = { path = "../../sov-modules-macros" } sov-state = { path = "../../sov-state", default-features = false } sov-rollup-interface = { path = "../../../rollup-interface" } serde = { workspace = true, optional = true } -serde_json = { workspace = true, optional = true } thiserror = { workspace = true } borsh = { workspace = true, features = ["rc"] } @@ -30,5 +29,5 @@ tempfile = { workspace = true } [features] default = ["native"] -serde = ["dep:serde", "dep:serde_json"] +serde = ["dep:serde"] native = ["serde", "sov-modules-api/native"] diff --git a/module-system/module-implementations/sov-accounts/Cargo.toml b/module-system/module-implementations/sov-accounts/Cargo.toml index 4ceda7b1b3..f54eae052c 100644 --- a/module-system/module-implementations/sov-accounts/Cargo.toml +++ b/module-system/module-implementations/sov-accounts/Cargo.toml @@ -14,16 +14,13 @@ resolver = "2" [dependencies] anyhow = { workspace = true } borsh = { workspace = true, features = ["rc"] } -hex = { workspace = true } serde = { workspace = true, optional = true } serde_json = { workspace = true, optional = true } -thiserror = { workspace = true } jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } sov-modules-api = { path = "../../sov-modules-api", version = "0.1", default-features = false } sov-modules-macros = { path = "../../sov-modules-macros", version = "0.1" } sov-state = { path = "../../sov-state", version = "0.1", default-features = false } -sov-rollup-interface = { path = "../../../rollup-interface", version = "0.1" } [dev-dependencies] diff --git a/module-system/module-implementations/sov-accounts/src/tests.rs b/module-system/module-implementations/sov-accounts/src/tests.rs index 200c912789..a5f7f459d3 100644 --- a/module-system/module-implementations/sov-accounts/src/tests.rs +++ b/module-system/module-implementations/sov-accounts/src/tests.rs @@ -129,7 +129,7 @@ fn test_update_account_fails() { } #[test] -fn test_get_acc_after_pub_key_update() { +fn test_get_account_after_pub_key_update() { let tmpdir = tempfile::tempdir().unwrap(); let native_working_set = &mut WorkingSet::new(ProverStorage::with_path(tmpdir.path()).unwrap()); let accounts = &mut Accounts::::default(); diff --git a/module-system/module-implementations/sov-bank/Cargo.toml b/module-system/module-implementations/sov-bank/Cargo.toml index f777baf137..9331299e35 100644 --- a/module-system/module-implementations/sov-bank/Cargo.toml +++ b/module-system/module-implementations/sov-bank/Cargo.toml @@ -13,17 +13,17 @@ resolver = "2" [dependencies] anyhow = { workspace = true } +borsh = { workspace = true, features = ["rc"] } +jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } schemars = { workspace = true, optional = true } +serde = { workspace = true, optional = true } +serde_json = { workspace = true, optional = true } + sov-modules-api = { path = "../../sov-modules-api", version = "0.1", default-features = false } sov-modules-macros = { path = "../../sov-modules-macros", version = "0.1" } sov-state = { path = "../../sov-state", version = "0.1", default-features = false } -sov-rollup-interface = { path = "../../../rollup-interface", version = "0.1" } -serde = { workspace = true, optional = true } -serde_json = { workspace = true, optional = true } -thiserror = { workspace = true } -borsh = { workspace = true, features = ["rc"] } -hex = { workspace = true } -jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } + + [dev-dependencies] sov-modules-api = { path = "../../sov-modules-api", version = "0.1" } diff --git a/module-system/module-implementations/sov-evm/Cargo.toml b/module-system/module-implementations/sov-evm/Cargo.toml index 0e4f4bcb8a..67e6a98886 100644 --- a/module-system/module-implementations/sov-evm/Cargo.toml +++ b/module-system/module-implementations/sov-evm/Cargo.toml @@ -17,13 +17,11 @@ revm = "3.3.0" sov-modules-api = { path = "../../sov-modules-api", version = "0.1", default-features = false } sov-modules-macros = { path = "../../sov-modules-macros", version = "0.1" } sov-state = { path = "../../sov-state", version = "0.1", default-features = false } -sov-rollup-interface = { path = "../../../rollup-interface", version = "0.1" } anyhow = { workspace = true } bytes = { workspace = true } serde = { workspace = true, optional = true } serde_json = { workspace = true, optional = true } -thiserror = { workspace = true } borsh = { workspace = true, features = ["rc"] } hex = { workspace = true } jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } diff --git a/module-system/module-implementations/sov-prover-incentives/Cargo.toml b/module-system/module-implementations/sov-prover-incentives/Cargo.toml index 26e3655af1..1688482bca 100644 --- a/module-system/module-implementations/sov-prover-incentives/Cargo.toml +++ b/module-system/module-implementations/sov-prover-incentives/Cargo.toml @@ -24,8 +24,6 @@ sov-modules-macros = { path = "../../sov-modules-macros", version = "0.1" } sov-state = { path = "../../sov-state", version = "0.1", default-features = false } sov-rollup-interface = { path = "../../../rollup-interface", version = "0.1" } serde = { workspace = true } -serde_json = { workspace = true, optional = true } -thiserror = { workspace = true } borsh = { workspace = true, features = ["rc"] } # TODO: Replace with serde-compatible borsh implementation when it becomes availabile # see https://github.com/Sovereign-Labs/sovereign-sdk/issues/215 @@ -34,5 +32,4 @@ bincode = "1.3.3" [features] default = ["native"] -serde = ["dep:serde_json"] -native = ["serde", "sov-modules-api/native"] +native = ["sov-modules-api/native"] diff --git a/module-system/module-implementations/sov-sequencer-registry/Cargo.toml b/module-system/module-implementations/sov-sequencer-registry/Cargo.toml index 9d46df1ddd..027526f53e 100644 --- a/module-system/module-implementations/sov-sequencer-registry/Cargo.toml +++ b/module-system/module-implementations/sov-sequencer-registry/Cargo.toml @@ -25,13 +25,10 @@ sov-modules-macros = { path = "../../sov-modules-macros", version = "0.1" } sov-state = { path = "../../sov-state", version = "0.1", default-features = false } sov-rollup-interface = { path = "../../../rollup-interface", version = "0.1" } serde = { workspace = true, optional = true } -serde_json = { workspace = true, optional = true } -thiserror = { workspace = true } borsh = { workspace = true, features = ["rc"] } -hex = { workspace = true } jsonrpsee = { workspace = true, features = ["macros", "client-core", "server"], optional = true } [features] default = ["native"] -serde = ["dep:serde", "dep:serde_json"] +serde = ["dep:serde"] native = ["serde", "sov-modules-api/native", "sov-state/native", "sov-bank/native", "dep:jsonrpsee"] diff --git a/module-system/sov-modules-api/Cargo.toml b/module-system/sov-modules-api/Cargo.toml index 67188aa0c8..38072836f0 100644 --- a/module-system/sov-modules-api/Cargo.toml +++ b/module-system/sov-modules-api/Cargo.toml @@ -18,7 +18,6 @@ sov-rollup-interface = { path = "../../rollup-interface", version = "0.1" } serde = { workspace = true } borsh = { workspace = true } thiserror = { workspace = true } -jmt = { workspace = true } sha2 = { workspace = true } bech32 = { workspace = true } derive_more = { workspace = true } diff --git a/module-system/sov-modules-macros/Cargo.toml b/module-system/sov-modules-macros/Cargo.toml index 1f604e19ac..b4f0500bec 100644 --- a/module-system/sov-modules-macros/Cargo.toml +++ b/module-system/sov-modules-macros/Cargo.toml @@ -22,7 +22,6 @@ path = "tests/all_tests.rs" [dev-dependencies] serde_json = "1" jsonrpsee = { workspace = true, features = ["macros", "http-client", "server"] } -tempfile = { workspace = true } trybuild = "1.0" sov-modules-api = { path = "../sov-modules-api", version = "0.1", default-features = false } @@ -39,4 +38,3 @@ schemars = { workspace = true } syn = { version = "1.0", features = ["full"] } sov-modules-api = { path = "../sov-modules-api", version = "0.1", default-features = false } -sov-rollup-interface = { path = "../../rollup-interface", version = "0.1" } diff --git a/module-system/sov-state/Cargo.toml b/module-system/sov-state/Cargo.toml index c66779620f..5d2d181af1 100644 --- a/module-system/sov-state/Cargo.toml +++ b/module-system/sov-state/Cargo.toml @@ -22,7 +22,6 @@ sov-first-read-last-write-cache = { path = "../utils/sov-first-read-last-write-c jmt = { workspace = true } hex = { workspace = true } sha2 = { workspace = true } -tracing = { workspace = true } [dev-dependencies] tempfile = { workspace = true } diff --git a/rollup-interface/src/node/services/stf_runner.rs b/rollup-interface/src/node/services/stf_runner.rs index 15d777ce9c..e5b3c82474 100644 --- a/rollup-interface/src/node/services/stf_runner.rs +++ b/rollup-interface/src/node/services/stf_runner.rs @@ -23,7 +23,7 @@ use crate::zk::Zkvm; /// /// and a `impl StateTransitionRunner for MyRunner` which instead uses a state root as its runtime config. /// -/// TODO: Why is it called runner? It only creates. Creator, Factory: https://github.com/Sovereign-Labs/sovereign-sdk/issues/447 +/// TODO: Why is it called runner? It only creates. Creator, Factory: pub trait StateTransitionRunner { /// The parameters of the state transition function which are set at runtime. For example, /// the runtime config might contain path to a data directory. diff --git a/rollup-interface/src/state_machine/crypto/simple_hasher.rs b/rollup-interface/src/state_machine/crypto/simple_hasher.rs index c0c1ed4a3d..a8a14f4deb 100644 --- a/rollup-interface/src/state_machine/crypto/simple_hasher.rs +++ b/rollup-interface/src/state_machine/crypto/simple_hasher.rs @@ -1,6 +1,6 @@ pub use jmt::SimpleHasher; -/// A SimpleHasher implementation which always returns the digest [0;32] +/// A SimpleHasher implementation which always returns the digest `[0;32]` pub struct NoOpHasher; impl SimpleHasher for NoOpHasher { diff --git a/rollup-interface/src/state_machine/da.rs b/rollup-interface/src/state_machine/da.rs index 5c497dddfa..5708fdcde2 100644 --- a/rollup-interface/src/state_machine/da.rs +++ b/rollup-interface/src/state_machine/da.rs @@ -103,7 +103,7 @@ impl CountedBufReader { } /// Getter: returns a reference to an accumulator of the blob data read by the rollup - /// TODO: Refactor https://github.com/Sovereign-Labs/sovereign-sdk/issues/462 + /// TODO: Refactor pub fn acc(&self) -> &Vec { &self.reading_acc }