diff --git a/Cargo.lock b/Cargo.lock index 7d8bb3c0c..ee6194be9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -948,7 +948,7 @@ dependencies = [ "borsh", "hex", "hex-literal 0.4.1", - "jsonrpsee 0.16.2", + "jsonrpsee", "nmt-rs", "postcard", "proptest", @@ -1506,7 +1506,7 @@ dependencies = [ "anyhow", "borsh", "demo-nft-module", - "jsonrpsee 0.18.2", + "jsonrpsee", "serde", "sov-data-generators", "sov-modules-api", @@ -1535,7 +1535,7 @@ dependencies = [ "clap", "const-rollup-config", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "rand 0.8.5", "serde", "serde_json", @@ -2881,22 +2881,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "log", - "rustls 0.20.8", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", - "webpki-roots 0.22.6", -] - [[package]] name = "hyper-rustls" version = "0.24.1" @@ -2907,10 +2891,10 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.6", + "rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -3240,8 +3224,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jmt" -version = "0.6.0" -source = "git+https://github.com/penumbra-zone/jmt#46b4b0042f66506536097d689ac2201e3e430afd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e49c5d2c13e15f77f22cee3df3dc822b46051b217112035d72687cb57a9cbde" dependencies = [ "anyhow", "borsh", @@ -3277,17 +3262,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpsee" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" -dependencies = [ - "jsonrpsee-core 0.16.2", - "jsonrpsee-http-client 0.16.2", - "jsonrpsee-types 0.16.2", -] - [[package]] name = "jsonrpsee" version = "0.18.2" @@ -3295,11 +3269,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1822d18e4384a5e79d94dc9e4d1239cfa9fad24e55b44d2efeff5b394c9fece4" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core 0.18.2", - "jsonrpsee-http-client 0.18.2", + "jsonrpsee-core", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", "jsonrpsee-server", - "jsonrpsee-types 0.18.2", + "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "tracing", @@ -3315,37 +3289,18 @@ dependencies = [ "futures-util", "gloo-net", "http", - "jsonrpsee-core 0.18.2", + "jsonrpsee-core", "pin-project", "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tracing", "webpki-roots 0.23.1", ] -[[package]] -name = "jsonrpsee-core" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" -dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper", - "jsonrpsee-types 0.16.2", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "jsonrpsee-core" version = "0.18.2" @@ -3360,7 +3315,7 @@ dependencies = [ "futures-util", "globset", "hyper", - "jsonrpsee-types 0.18.2", + "jsonrpsee-types", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -3374,25 +3329,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "jsonrpsee-http-client" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" -dependencies = [ - "async-trait", - "hyper", - "hyper-rustls 0.23.2", - "jsonrpsee-core 0.16.2", - "jsonrpsee-types 0.16.2", - "rustc-hash", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "jsonrpsee-http-client" version = "0.18.2" @@ -3401,9 +3337,9 @@ checksum = "1705c65069729e3dccff6fd91ee431d5d31cabcf00ce68a62a2c6435ac713af9" dependencies = [ "async-trait", "hyper", - "hyper-rustls 0.24.1", - "jsonrpsee-core 0.18.2", - "jsonrpsee-types 0.18.2", + "hyper-rustls", + "jsonrpsee-core", + "jsonrpsee-types", "serde", "serde_json", "thiserror", @@ -3433,8 +3369,8 @@ checksum = "4f06661d1a6b6e5b85469dc9c29acfbb9b3bb613797a6fd10a3ebb8a70754057" dependencies = [ "futures-util", "hyper", - "jsonrpsee-core 0.18.2", - "jsonrpsee-types 0.18.2", + "jsonrpsee-core", + "jsonrpsee-types", "serde", "serde_json", "soketto", @@ -3445,20 +3381,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-types" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" -dependencies = [ - "anyhow", - "beef", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "jsonrpsee-types" version = "0.18.2" @@ -3480,8 +3402,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34e6ea7c6d862e60f8baebd946c037b70c6808a4e4e31e792a4029184e3ce13a" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core 0.18.2", - "jsonrpsee-types 0.18.2", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] @@ -3492,8 +3414,8 @@ checksum = "a64b2589680ba1ad7863f279cd2d5083c1dc0a7c0ea959d22924553050f8ab9f" dependencies = [ "http", "jsonrpsee-client-transport", - "jsonrpsee-core 0.18.2", - "jsonrpsee-types 0.18.2", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] @@ -5014,7 +4936,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.24.1", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -5024,14 +4946,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.6", + "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", @@ -5442,7 +5364,7 @@ dependencies = [ "http", "http-body", "hyper", - "jsonrpsee 0.18.2", + "jsonrpsee", "jsonwebtoken", "pin-project", "rand 0.8.5", @@ -5480,7 +5402,7 @@ name = "reth-rpc-api" version = "0.1.0-alpha.4" source = "git+https://github.com/paradigmxyz/reth?rev=4ab924c5d361bbfdcdad9f997d16d67b4a1730b7#4ab924c5d361bbfdcdad9f997d16d67b4a1730b7" dependencies = [ - "jsonrpsee 0.18.2", + "jsonrpsee", "reth-primitives", "reth-rpc-types", "serde_json", @@ -5492,8 +5414,8 @@ version = "0.1.0-alpha.4" source = "git+https://github.com/paradigmxyz/reth?rev=4ab924c5d361bbfdcdad9f997d16d67b4a1730b7#4ab924c5d361bbfdcdad9f997d16d67b4a1730b7" dependencies = [ "async-trait", - "jsonrpsee-core 0.18.2", - "jsonrpsee-types 0.18.2", + "jsonrpsee-core", + "jsonrpsee-types", "reth-beacon-consensus", "reth-interfaces", "reth-payload-builder", @@ -5512,7 +5434,7 @@ name = "reth-rpc-types" version = "0.1.0-alpha.4" source = "git+https://github.com/paradigmxyz/reth?rev=4ab924c5d361bbfdcdad9f997d16d67b4a1730b7#4ab924c5d361bbfdcdad9f997d16d67b4a1730b7" dependencies = [ - "jsonrpsee-types 0.18.2", + "jsonrpsee-types", "reth-primitives", "reth-rlp", "serde", @@ -5969,18 +5891,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.21.6" @@ -6599,7 +6509,7 @@ dependencies = [ "arbitrary", "borsh", "clap", - "jsonrpsee 0.18.2", + "jsonrpsee", "schemars", "serde", "serde_json", @@ -6636,7 +6546,7 @@ dependencies = [ "borsh", "clap", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "schemars", "serde", "serde_json", @@ -6656,7 +6566,7 @@ dependencies = [ "borsh", "clap", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "schemars", "serde", "serde_json", @@ -6676,7 +6586,7 @@ version = "0.1.0" dependencies = [ "anyhow", "borsh", - "jsonrpsee 0.18.2", + "jsonrpsee", "serde", "serde_json", "sov-bank", @@ -6700,7 +6610,7 @@ dependencies = [ "demo-stf", "directories", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "serde", "serde_json", "sov-accounts", @@ -6764,7 +6674,7 @@ dependencies = [ "futures", "hex", "jmt", - "jsonrpsee 0.18.2", + "jsonrpsee", "prettytable-rs", "prometheus 0.11.0", "proptest", @@ -6801,7 +6711,7 @@ dependencies = [ "const-rollup-config", "demo-stf", "ethers", - "jsonrpsee 0.18.2", + "jsonrpsee", "reth-primitives", "reth-rpc", "serde_json", @@ -6827,7 +6737,7 @@ dependencies = [ "ethers-middleware", "ethers-signers", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "primitive-types", "reth-primitives", "reth-revm", @@ -6882,7 +6792,7 @@ dependencies = [ "derive_more", "ed25519-dalek", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "rand 0.7.3", "risc0-zkvm", "risc0-zkvm-platform", @@ -6905,7 +6815,7 @@ dependencies = [ "anyhow", "borsh", "clap", - "jsonrpsee 0.18.2", + "jsonrpsee", "proc-macro2 1.0.66", "quote 1.0.33", "schemars", @@ -6999,7 +6909,7 @@ dependencies = [ "async-trait", "borsh", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "serde", "sov-rollup-interface", "tokio", @@ -7013,7 +6923,7 @@ dependencies = [ "anyhow", "borsh", "clap", - "jsonrpsee 0.18.2", + "jsonrpsee", "risc0-zkvm", "risc0-zkvm-platform", "schemars", @@ -7060,7 +6970,7 @@ dependencies = [ "celestia", "futures", "hex", - "jsonrpsee 0.18.2", + "jsonrpsee", "rand 0.8.5", "serde", "serde_json", @@ -7087,7 +6997,7 @@ dependencies = [ "anyhow", "borsh", "clap", - "jsonrpsee 0.18.2", + "jsonrpsee", "schemars", "serde", "serde_json", @@ -7105,7 +7015,7 @@ dependencies = [ "anyhow", "borsh", "clap", - "jsonrpsee 0.18.2", + "jsonrpsee", "schemars", "serde", "serde_json", @@ -7556,24 +7466,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls", "tokio", ] @@ -7597,9 +7496,9 @@ checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" dependencies = [ "futures-util", "log", - "rustls 0.21.6", + "rustls", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tungstenite", "webpki-roots 0.23.1", ] @@ -7806,7 +7705,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.21.6", + "rustls", "sha1", "thiserror", "url", @@ -8126,15 +8025,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - [[package]] name = "webpki-roots" version = "0.23.1" diff --git a/Cargo.toml b/Cargo.toml index 6f78e1b70..ddc5246c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,13 +9,14 @@ members = [ "examples/demo-simple-stf", "examples/demo-rollup", "examples/demo-nft-module", + "full-node/db/sov-db", "full-node/sov-sequencer", - "utils/zk-cycle-macros", - "utils/zk-cycle-utils", "full-node/sov-ethereum", - "full-node/sov-stf-runner", + + "utils/zk-cycle-macros", + "utils/zk-cycle-utils", "module-system/sov-cli", "module-system/sov-modules-stf-template", @@ -27,7 +28,7 @@ members = [ "module-system/utils/sov-data-generators", "module-system/module-implementations/sov-accounts", "module-system/module-implementations/sov-bank", - "module-system/module-implementations/sov-chain-state", + "module-system/module-implementations/sov-chain-state", "module-system/module-implementations/sov-blob-storage", "module-system/module-implementations/sov-evm", "module-system/module-implementations/sov-prover-incentives", @@ -53,9 +54,8 @@ repository = "https://github.com/sovereign-labs/sovereign-sdk" rust-version = "1.66" [workspace.dependencies] -# Dependencies maintained by sovereign -# TODO: replace by release number once available on crates.io: tracking issue https://github.com/Sovereign-Labs/sovereign-sdk/issues/632 -jmt = { git = "https://github.com/penumbra-zone/jmt", commit = "46b4b00" } +# Dependencies maintained by Sovereign +jmt = { version = "0.7.0" } # External dependencies async-trait = "0.1.71" @@ -76,7 +76,7 @@ proptest-derive = "0.3.0" rand = "0.8" rayon = "1.5.2" rocksdb = { version = "0.21.0", features = ["lz4"] } -serde = { version = "1.0.188", features = ["derive", "rc"]} +serde = { version = "1.0.188", features = ["derive", "rc"] } serde_json = { version = "1.0" } sha2 = "0.10.6" digest = "0.10.6" @@ -87,7 +87,7 @@ bech32 = "0.9.1" derive_more = "0.99.11" clap = { version = "4.2.7", features = ["derive"] } toml = "0.7.3" -jsonrpsee = {version = "0.18.2", features = ["jsonrpsee-types"] } +jsonrpsee = { version = "0.18.2", features = ["jsonrpsee-types"] } schemars = { version = "0.8.12", features = ["derive"] } tempfile = "3.5" tokio = { version = "1", features = ["full"] } @@ -101,10 +101,10 @@ ethers-providers = "=2.0.8" ethers-signers = { version = "=2.0.8", default-features = false } ethers-middleware = "=2.0.8" -reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7"} -reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7"} -reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7"} -reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7"} +reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7" } +reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7" } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7" } +reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "4ab924c5d361bbfdcdad9f997d16d67b4a1730b7" } revm = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" } revm-primitives = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" } diff --git a/adapters/celestia/Cargo.toml b/adapters/celestia/Cargo.toml index 859fb2094..1c8e5be04 100644 --- a/adapters/celestia/Cargo.toml +++ b/adapters/celestia/Cargo.toml @@ -23,7 +23,7 @@ sha2 = { workspace = true } base64 = "0.21.2" hex = { version = "0.4.3", features = ["serde"] } hex-literal = "0.4.1" -jsonrpsee = { version = "0.16.2", features = ["http-client"], optional = true } +jsonrpsee = { workspace = true, features = ["http-client"], optional = true } serde = { workspace = true } serde_json = { workspace = true, optional = true } tokio = { workspace = true, optional = true } diff --git a/adapters/celestia/src/da_service.rs b/adapters/celestia/src/da_service.rs index 9577a3499..e319d2646 100644 --- a/adapters/celestia/src/da_service.rs +++ b/adapters/celestia/src/da_service.rs @@ -127,7 +127,7 @@ impl CelestiaService { jsonrpsee::http_client::HttpClientBuilder::default() .set_headers(headers) - .max_request_body_size(config.max_celestia_response_body_size) // 100 MB + .max_request_size(config.max_celestia_response_body_size) .request_timeout(std::time::Duration::from_secs( config.celestia_rpc_timeout_seconds, )) diff --git a/examples/demo-prover/Cargo.lock b/examples/demo-prover/Cargo.lock index 645b820ae..30644adf4 100644 --- a/examples/demo-prover/Cargo.lock +++ b/examples/demo-prover/Cargo.lock @@ -141,6 +141,15 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener", +] + [[package]] name = "async-trait" version = "0.1.71" @@ -191,6 +200,16 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bcs" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd3ffe8b19a604421a5d461d4a70346223e535903fbc3067138bddbebddcf77" +dependencies = [ + "serde", + "thiserror", +] + [[package]] name = "bech32" version = "0.9.1" @@ -469,7 +488,7 @@ dependencies = [ "borsh", "hex", "hex-literal", - "jsonrpsee 0.16.2", + "jsonrpsee 0.18.2", "nmt-rs", "prost", "prost-build", @@ -767,7 +786,7 @@ dependencies = [ "sov-accounts", "sov-bank", "sov-blob-storage", - "sov-election", + "sov-cli", "sov-modules-api", "sov-modules-stf-template", "sov-rollup-interface", @@ -1049,6 +1068,12 @@ dependencies = [ "libc", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "eyre" version = "0.6.8" @@ -1230,6 +1255,16 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +dependencies = [ + "gloo-timers", + "send_wrapper", +] + [[package]] name = "futures-util" version = "0.3.28" @@ -1305,6 +1340,51 @@ dependencies = [ "regex", ] +[[package]] +name = "gloo-net" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9902a044653b26b99f7e3693a42f171312d9be8b26b5697bd1e43ad1f8a35e10" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "gloo-utils" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" +dependencies = [ + "js-sys", + "serde", + "serde_json", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "h2" version = "0.3.20" @@ -1458,7 +1538,7 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls 0.23.4", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -1635,8 +1715,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jmt" -version = "0.6.0" -source = "git+https://github.com/penumbra-zone/jmt#46b4b0042f66506536097d689ac2201e3e430afd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e49c5d2c13e15f77f22cee3df3dc822b46051b217112035d72687cb57a9cbde" dependencies = [ "anyhow", "borsh", @@ -1690,14 +1771,39 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1822d18e4384a5e79d94dc9e4d1239cfa9fad24e55b44d2efeff5b394c9fece4" dependencies = [ + "jsonrpsee-client-transport", "jsonrpsee-core 0.18.2", "jsonrpsee-http-client 0.18.2", "jsonrpsee-proc-macros", "jsonrpsee-server 0.18.2", "jsonrpsee-types 0.18.2", + "jsonrpsee-wasm-client", + "jsonrpsee-ws-client", "tracing", ] +[[package]] +name = "jsonrpsee-client-transport" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11aa5766d5c430b89cb26a99b88f3245eb91534be8126102cea9e45ee3891b22" +dependencies = [ + "futures-channel", + "futures-util", + "gloo-net", + "http", + "jsonrpsee-core 0.18.2", + "pin-project", + "rustls-native-certs", + "soketto", + "thiserror", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "tracing", + "webpki-roots 0.23.1", +] + [[package]] name = "jsonrpsee-core" version = "0.16.2" @@ -1731,8 +1837,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64c6832a55f662b5a6ecc844db24b8b9c387453f923de863062c60ce33d62b81" dependencies = [ "anyhow", + "async-lock", "async-trait", "beef", + "futures-timer", "futures-util", "globset", "hyper", @@ -1745,7 +1853,9 @@ dependencies = [ "soketto", "thiserror", "tokio", + "tokio-stream", "tracing", + "wasm-bindgen-futures", ] [[package]] @@ -1869,6 +1979,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-wasm-client" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e6ea7c6d862e60f8baebd946c037b70c6808a4e4e31e792a4029184e3ce13a" +dependencies = [ + "jsonrpsee-client-transport", + "jsonrpsee-core 0.18.2", + "jsonrpsee-types 0.18.2", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64b2589680ba1ad7863f279cd2d5083c1dc0a7c0ea959d22924553050f8ab9f" +dependencies = [ + "http", + "jsonrpsee-client-transport", + "jsonrpsee-core 0.18.2", + "jsonrpsee-types 0.18.2", +] + [[package]] name = "keccak" version = "0.1.4" @@ -3147,7 +3280,7 @@ checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.2", "sct", ] @@ -3172,6 +3305,16 @@ dependencies = [ "base64 0.21.2", ] +[[package]] +name = "rustls-webpki" +version = "0.100.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustls-webpki" version = "0.101.2" @@ -3275,11 +3418,17 @@ dependencies = [ "serde", ] +[[package]] +name = "send_wrapper" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" + [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -3305,9 +3454,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -3569,6 +3718,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "sov-cli" +version = "0.1.0" +dependencies = [ + "anyhow", + "borsh", + "directories", + "hex", + "jsonrpsee 0.18.2", + "serde", + "serde_json", + "sov-accounts", + "sov-bank", + "sov-modules-api", + "tokio", +] + [[package]] name = "sov-db" version = "0.1.0" @@ -3582,6 +3748,7 @@ dependencies = [ "serde", "sov-rollup-interface", "sov-schema-db", + "tokio", ] [[package]] @@ -3639,38 +3806,18 @@ dependencies = [ "risc0-adapter", "serde", "serde_json", - "sov-bank", "sov-db", - "sov-election", "sov-modules-api", "sov-modules-stf-template", "sov-rollup-interface", "sov-sequencer", "sov-state", "sov-stf-runner", - "sov-value-setter", "tokio", "tracing", "tracing-subscriber", ] -[[package]] -name = "sov-election" -version = "0.1.0" -dependencies = [ - "anyhow", - "borsh", - "clap", - "hex", - "jsonrpsee 0.18.2", - "schemars", - "serde", - "serde_json", - "sov-modules-api", - "sov-rollup-interface", - "sov-state", -] - [[package]] name = "sov-first-read-last-write-cache" version = "0.1.0" @@ -3697,6 +3844,7 @@ dependencies = [ "sha2 0.10.7", "sov-modules-macros", "sov-rollup-interface", + "sov-sequencer", "sov-state", "thiserror", ] @@ -3739,7 +3887,6 @@ dependencies = [ "bincode", "borsh", "bytes", - "crossbeam-channel", "digest 0.10.7", "hex", "serde", @@ -3768,7 +3915,6 @@ dependencies = [ "hex", "jsonrpsee 0.18.2", "serde", - "sov-modules-api", "sov-rollup-interface", "tracing", ] @@ -3795,6 +3941,7 @@ name = "sov-state" version = "0.1.0" dependencies = [ "anyhow", + "bcs", "borsh", "hex", "jmt", @@ -4555,6 +4702,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.2", +] + [[package]] name = "which" version = "4.4.0" diff --git a/examples/demo-prover/methods/guest/Cargo.lock b/examples/demo-prover/methods/guest/Cargo.lock index 855d6f4f7..ff8c2de06 100644 --- a/examples/demo-prover/methods/guest/Cargo.lock +++ b/examples/demo-prover/methods/guest/Cargo.lock @@ -104,6 +104,16 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bcs" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd3ffe8b19a604421a5d461d4a70346223e535903fbc3067138bddbebddcf77" +dependencies = [ + "serde", + "thiserror", +] + [[package]] name = "bech32" version = "0.9.1" @@ -430,7 +440,6 @@ dependencies = [ "sov-accounts", "sov-bank", "sov-blob-storage", - "sov-election", "sov-modules-api", "sov-modules-stf-template", "sov-rollup-interface", @@ -1047,8 +1056,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jmt" -version = "0.6.0" -source = "git+https://github.com/penumbra-zone/jmt#46b4b0042f66506536097d689ac2201e3e430afd" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e49c5d2c13e15f77f22cee3df3dc822b46051b217112035d72687cb57a9cbde" dependencies = [ "anyhow", "borsh", @@ -1818,9 +1828,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -1836,9 +1846,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -2042,18 +2052,6 @@ dependencies = [ "zip", ] -[[package]] -name = "sov-election" -version = "0.1.0" -dependencies = [ - "anyhow", - "borsh", - "hex", - "sov-modules-api", - "sov-rollup-interface", - "sov-state", -] - [[package]] name = "sov-first-read-last-write-cache" version = "0.1.0" @@ -2148,6 +2146,7 @@ name = "sov-state" version = "0.1.0" dependencies = [ "anyhow", + "bcs", "borsh", "hex", "jmt",