diff --git a/Cargo.lock b/Cargo.lock index 087185e..6e9a8a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "ark-bn254" @@ -540,9 +540,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -646,18 +646,18 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", @@ -1370,9 +1370,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388979d208a049ffdfb22fa33b9c81942215b940910bccfe258caeb25d125cb3" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" dependencies = [ "serde", ] @@ -2848,9 +2848,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3112,9 +3112,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ "base64 0.21.7", "bytes", @@ -3410,7 +3410,7 @@ dependencies = [ [[package]] name = "rockbound" version = "1.0.0" -source = "git+https://github.com/sovereign-Labs/rockbound?tag=v2.0.0#edabd23e12d75058d7ce5d92e38dcc9f66f83c53" +source = "git+https://github.com/sovereign-Labs/rockbound?tag=v2.0.1#110936ac9d9cace77344e557ea384cb7eaa64a2a" dependencies = [ "anyhow", "once_cell", @@ -3448,9 +3448,9 @@ dependencies = [ [[package]] name = "ruint" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b1d9521f889713d1221270fdd63370feca7e5c71a18745343402fa86e4f04f" +checksum = "8f308135fef9fc398342da5472ce7c484529df23743fb7c734e0f3d472971e62" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", @@ -3936,7 +3936,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -3950,10 +3950,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sov-attester-incentives" +version = "0.3.0" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" +dependencies = [ + "anyhow", + "bcs", + "borsh", + "derivative", + "serde", + "serde_json", + "sov-bank", + "sov-chain-state", + "sov-modules-api", + "sov-state", + "thiserror", + "tracing", +] + [[package]] name = "sov-bank" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -3971,7 +3990,7 @@ dependencies = [ [[package]] name = "sov-blob-storage" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -3992,7 +4011,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", @@ -4020,7 +4039,7 @@ dependencies = [ [[package]] name = "sov-chain-state" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -4036,7 +4055,7 @@ dependencies = [ [[package]] name = "sov-cli" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -4055,7 +4074,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -4074,7 +4093,7 @@ dependencies = [ [[package]] name = "sov-ledger-rpc" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -4090,7 +4109,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", @@ -4108,7 +4127,7 @@ dependencies = [ [[package]] name = "sov-mock-zkvm" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -4124,7 +4143,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bech32", @@ -4149,7 +4168,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bech32", @@ -4170,7 +4189,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -4185,7 +4204,7 @@ dependencies = [ [[package]] name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", @@ -4208,7 +4227,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -4228,7 +4247,7 @@ dependencies = [ [[package]] name = "sov-prover-storage-manager" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "rockbound", @@ -4241,7 +4260,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -4265,12 +4284,13 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", "borsh", "bytes", + "derivative", "digest 0.10.7", "futures", "hex", @@ -4323,20 +4343,25 @@ dependencies = [ [[package]] name = "sov-sequencer" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", + "bincode", "borsh", "dashmap", + "derivative", "hex", "jsonrpsee", "mini-moka", + "rockbound", "serde", "serde_json", + "sov-db", "sov-modules-api", "sov-modules-stf-blueprint", "sov-rollup-interface", "sov-state", + "sov-test-utils", "tokio", "tracing", ] @@ -4344,7 +4369,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -4362,7 +4387,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bcs", @@ -4383,7 +4408,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", @@ -4399,8 +4424,50 @@ dependencies = [ "sov-rollup-interface", "thiserror", "tokio", - "toml 0.8.10", + "toml 0.8.11", + "tracing", +] + +[[package]] +name = "sov-test-utils" +version = "0.3.0" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" +dependencies = [ + "anyhow", + "borsh", + "jsonrpsee", + "serde", + "serde_json", + "sov-attester-incentives", + "sov-bank", + "sov-chain-state", + "sov-mock-da", + "sov-mock-zkvm", + "sov-modules-api", + "sov-modules-stf-blueprint", + "sov-rollup-interface", + "sov-sequencer-registry", + "sov-state", + "sov-value-setter", "tracing", + "tracing-subscriber 0.3.18", +] + +[[package]] +name = "sov-value-setter" +version = "0.3.0" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" +dependencies = [ + "anyhow", + "borsh", + "clap", + "jsonrpsee", + "schemars", + "serde", + "serde_json", + "sov-modules-api", + "sov-state", + "thiserror", ] [[package]] @@ -4614,18 +4681,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", @@ -4764,14 +4831,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.7", ] [[package]] @@ -4796,9 +4863,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" dependencies = [ "indexmap", "serde", diff --git a/Cargo.toml b/Cargo.toml index 55ffde7..e95b228 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,25 +16,25 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-accounts = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-bank = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-ledger-rpc = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-sequencer-registry = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-modules-rollup-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-stf-runner = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-db = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-sequencer = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-mock-zkvm = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-first-read-last-write-cache = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-cli = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-mock-da = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-celestia-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-prover-storage-manager = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } +sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-accounts = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-bank = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-ledger-rpc = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-sequencer-registry = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-modules-rollup-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-stf-runner = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-db = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-sequencer = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-mock-zkvm = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-first-read-last-write-cache = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-cli = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-mock-da = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-celestia-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-prover-storage-manager = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } stf-starter = { path = "./crates/stf" } diff --git a/celestia_rollup_config.toml b/celestia_rollup_config.toml index d3f3346..7839cc6 100644 --- a/celestia_rollup_config.toml +++ b/celestia_rollup_config.toml @@ -1,6 +1,6 @@ [da] # The JWT used to authenticate with the celestia light client. Instructions for generating this token can be found in the README -celestia_rpc_auth_token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJwdWJsaWMiLCJyZWFkIiwid3JpdGUiLCJhZG1pbiJdfQ.1d0ZqV4B9qiTI5YtPe6WVyEJrk4dqFr160K1hr8m8oI" +celestia_rpc_auth_token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJBbGxvdyI6WyJwdWJsaWMiLCJyZWFkIiwid3JpdGUiLCJhZG1pbiJdfQ.koUbl4hpFmW98lzIDdr3-snv98s2LTZkxPFM6iVwA-Q" # The address of the *trusted* Celestia light client to interact with celestia_rpc_address = "http://127.0.0.1:26658" # The largest response the rollup will accept from the Celestia node. Defaults to 100 MB diff --git a/crates/provers/risc0/guest-celestia/Cargo.lock b/crates/provers/risc0/guest-celestia/Cargo.lock index f0b226e..d1c3193 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.lock +++ b/crates/provers/risc0/guest-celestia/Cargo.lock @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "ark-bn254" @@ -386,9 +386,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -475,18 +475,18 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", @@ -1560,9 +1560,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1873,9 +1873,9 @@ dependencies = [ [[package]] name = "ruint" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b1d9521f889713d1221270fdd63370feca7e5c71a18745343402fa86e4f04f" +checksum = "8f308135fef9fc398342da5472ce7c484529df23743fb7c734e0f3d472971e62" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", @@ -2123,7 +2123,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -2136,7 +2136,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -2150,7 +2150,7 @@ dependencies = [ [[package]] name = "sov-blob-storage" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -2167,7 +2167,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", @@ -2190,7 +2190,7 @@ dependencies = [ [[package]] name = "sov-chain-state" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -2222,7 +2222,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", @@ -2238,7 +2238,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bech32", @@ -2258,7 +2258,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bech32", @@ -2279,7 +2279,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -2293,7 +2293,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -2312,7 +2312,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -2333,12 +2333,13 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", "borsh", "bytes", + "derivative", "digest 0.10.7", "futures", "hex", @@ -2352,7 +2353,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -2365,7 +2366,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bcs", @@ -2385,7 +2386,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -2553,18 +2554,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", diff --git a/crates/provers/risc0/guest-celestia/Cargo.toml b/crates/provers/risc0/guest-celestia/Cargo.toml index 2526e14..f57e30a 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.toml +++ b/crates/provers/risc0/guest-celestia/Cargo.toml @@ -16,12 +16,12 @@ risc0-zkvm-platform = "0.20" stf-starter = { path = "../../../stf" } -sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-celestia-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } +sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-celestia-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" } diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index 339d35b..ed5d756 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -17,9 +17,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "ark-bn254" @@ -278,9 +278,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", @@ -346,18 +346,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", @@ -928,9 +928,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1306,7 +1306,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -1319,7 +1319,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -1333,7 +1333,7 @@ dependencies = [ [[package]] name = "sov-blob-storage" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -1350,7 +1350,7 @@ dependencies = [ [[package]] name = "sov-chain-state" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -1364,7 +1364,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", @@ -1380,7 +1380,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bech32", @@ -1400,7 +1400,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bech32", @@ -1421,7 +1421,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -1435,7 +1435,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -1454,7 +1454,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bincode", @@ -1475,12 +1475,13 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "async-trait", "borsh", "bytes", + "derivative", "digest", "futures", "hex", @@ -1494,7 +1495,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -1507,7 +1508,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "bcs", @@ -1527,7 +1528,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b#3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" +source = "git+ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git?rev=517e99e558513e24983d8d09ef16a73675ea1a1b#517e99e558513e24983d8d09ef16a73675ea1a1b" dependencies = [ "anyhow", "borsh", @@ -1598,18 +1599,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 86de642..b5a3f66 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -16,12 +16,12 @@ risc0-zkvm-platform = "0.20" serde = { version = "1.0.188", features = ["derive", "rc"] } -sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-mock-da = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } -sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "3f94ceccae8f84eb191deeb97ce65a1af3c9fd1b" } +sov-rollup-interface = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-mock-da = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-modules-stf-blueprint = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-modules-api = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-risc0-adapter = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } +sov-state = { git = "ssh://git@github.com/Sovereign-Labs/sovereign-sdk-wip.git", rev = "517e99e558513e24983d8d09ef16a73675ea1a1b" } stf-starter = { path = "../../../stf" } diff --git a/crates/rollup/src/celestia_rollup.rs b/crates/rollup/src/celestia_rollup.rs index cc64da2..2fddcad 100644 --- a/crates/rollup/src/celestia_rollup.rs +++ b/crates/rollup/src/celestia_rollup.rs @@ -8,6 +8,7 @@ use sov_celestia_adapter::types::Namespace; use sov_celestia_adapter::verifier::{CelestiaSpec, CelestiaVerifier, RollupParams}; use sov_celestia_adapter::{CelestiaConfig, CelestiaService}; use sov_celestia_adapter::verifier::address::CelestiaAddress; +use sov_db::sequencer_db::SequencerDB; use sov_modules_api::default_spec::{DefaultSpec, ZkDefaultSpec}; use sov_modules_api::Spec; use sov_modules_rollup_blueprint::RollupBlueprint; @@ -76,6 +77,7 @@ impl RollupBlueprint for CelestiaRollup { &self, storage: Arc::Storage>>, ledger_db: &sov_db::ledger_db::LedgerDB, + sequencer_db: &SequencerDB, da_service: &Self::DaService, ) -> Result, anyhow::Error> { // TODO set the sequencer address @@ -87,7 +89,7 @@ impl RollupBlueprint for CelestiaRollup { Self::NativeRuntime, Self::NativeSpec, Self::DaService, - >(storage, ledger_db, da_service, sequencer)?; + >(storage, ledger_db, sequencer_db, da_service, sequencer)?; #[cfg(feature = "experimental")] crate::eth::register_ethereum::( diff --git a/crates/rollup/src/mock_rollup.rs b/crates/rollup/src/mock_rollup.rs index 5777906..b60c630 100644 --- a/crates/rollup/src/mock_rollup.rs +++ b/crates/rollup/src/mock_rollup.rs @@ -5,6 +5,7 @@ use std::sync::{Arc, RwLock}; use async_trait::async_trait; use sov_db::ledger_db::LedgerDB; +use sov_db::sequencer_db::SequencerDB; use sov_mock_da::{MockAddress, MockDaConfig, MockDaService, MockDaSpec}; use sov_modules_api::default_spec::{DefaultSpec, ZkDefaultSpec}; use sov_modules_api::Spec; @@ -76,6 +77,7 @@ impl RollupBlueprint for MockRollup { &self, storage: Arc::Storage>>, ledger_db: &LedgerDB, + sequencer_db: &SequencerDB, da_service: &Self::DaService, ) -> Result, anyhow::Error> { // TODO set the sequencer address @@ -86,7 +88,7 @@ impl RollupBlueprint for MockRollup { Self::NativeRuntime, Self::NativeSpec, Self::DaService, - >(storage, ledger_db, da_service, sequencer)?; + >(storage, ledger_db, sequencer_db, da_service, sequencer)?; #[cfg(feature = "experimental")] crate::eth::register_ethereum::( diff --git a/crates/stf/src/genesis_config.rs b/crates/stf/src/genesis_config.rs index 0a5f30a..9661647 100644 --- a/crates/stf/src/genesis_config.rs +++ b/crates/stf/src/genesis_config.rs @@ -49,10 +49,8 @@ pub(crate) fn get_genesis_config( fn validate_config( genesis_config: as RuntimeTrait>::GenesisConfig, ) -> Result< as RuntimeTrait>::GenesisConfig, anyhow::Error> { - let token_address = &sov_bank::get_genesis_token_address::( - &genesis_config.bank.tokens[0].token_name, - genesis_config.bank.tokens[0].salt, - ); + let token_address = &genesis_config.bank.tokens[0].token_address; + let coins_token_addr = &genesis_config .sequencer_registry diff --git a/crates/stf/src/hooks.rs b/crates/stf/src/hooks.rs index ef00946..6402699 100644 --- a/crates/stf/src/hooks.rs +++ b/crates/stf/src/hooks.rs @@ -12,11 +12,13 @@ use sov_modules_api::runtime::capabilities::{ }; use sov_modules_api::transaction::Transaction; use sov_modules_api::{ - AccessoryStateCheckpoint, BlobReaderTrait, Context, Gas, DaSpec, Spec, StateCheckpoint, WorkingSet, + BlobReaderTrait, Context, Gas, DaSpec, Spec, StateCheckpoint, WorkingSet, + StateReaderAndWriter }; use sov_modules_stf_blueprint::SequencerOutcome; use sov_sequencer_registry::SequencerRegistry; use tracing::info; +use sov_modules_api::namespaces::Accessory; impl GasEnforcer for Runtime { /// The transaction type that the gas enforcer knows how to parse @@ -193,8 +195,8 @@ impl FinalizeHook for Runtime { fn finalize_hook( &self, - _root_hash: ::VisibleHash, - _accessory_working_set: &mut AccessoryStateCheckpoint, + _root_hash: S::VisibleHash, + _accessory_working_set: &mut impl StateReaderAndWriter, ) { } } diff --git a/test-data/genesis/celestia/bank.json b/test-data/genesis/celestia/bank.json index 8a1b6f7..1d679c5 100644 --- a/test-data/genesis/celestia/bank.json +++ b/test-data/genesis/celestia/bank.json @@ -1,11 +1,20 @@ { "tokens": [ { - "token_name": "sov-demo-token", + "token_name": "sov-token", + "token_address": "sov1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq0xu3qn", "address_and_balances": [ [ "sov1l6n2cku82yfqld30lanm2nfw43n2auc8clw7r5u5m6s7p8jrm4zqrr8r94", 100000000 + ], + [ + "sov15vspj48hpttzyvxu8kzq5klhvaczcpyxn6z6k0hwpwtzs4a6wkvqwr57gc", + 1000000 + ], + [ + "sov1dnhqk4mdsj2kwv4xymt8a624xuahfx8906j9usdkx7ensfghndkq8p33f7", + 1000000 ] ], "authorized_minters": [ @@ -14,4 +23,4 @@ "salt": 0 } ] -} \ No newline at end of file +} diff --git a/test-data/genesis/celestia/sequencer_registry.json b/test-data/genesis/celestia/sequencer_registry.json index 1a98f36..b90a9fe 100644 --- a/test-data/genesis/celestia/sequencer_registry.json +++ b/test-data/genesis/celestia/sequencer_registry.json @@ -3,7 +3,7 @@ "seq_da_address": "celestia1a68m2l85zn5xh0l07clk4rfvnezhywc53g8x7s", "coins_to_lock": { "amount": 50, - "token_address": "sov1zsnx7n2wjvtkr0ttscfgt06pjca3v2e6stxeu49qwynavmk7a8xqlxkkjp" + "token_address": "sov1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq0xu3qn" }, "is_preferred_sequencer": true } \ No newline at end of file diff --git a/test-data/genesis/mock/bank.json b/test-data/genesis/mock/bank.json index d03fcc1..1d679c5 100644 --- a/test-data/genesis/mock/bank.json +++ b/test-data/genesis/mock/bank.json @@ -1,11 +1,20 @@ { "tokens": [ { - "token_name": "sov-demo-token", + "token_name": "sov-token", + "token_address": "sov1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq0xu3qn", "address_and_balances": [ [ "sov1l6n2cku82yfqld30lanm2nfw43n2auc8clw7r5u5m6s7p8jrm4zqrr8r94", 100000000 + ], + [ + "sov15vspj48hpttzyvxu8kzq5klhvaczcpyxn6z6k0hwpwtzs4a6wkvqwr57gc", + 1000000 + ], + [ + "sov1dnhqk4mdsj2kwv4xymt8a624xuahfx8906j9usdkx7ensfghndkq8p33f7", + 1000000 ] ], "authorized_minters": [ diff --git a/test-data/genesis/mock/sequencer_registry.json b/test-data/genesis/mock/sequencer_registry.json index fe2696a..145d9a4 100644 --- a/test-data/genesis/mock/sequencer_registry.json +++ b/test-data/genesis/mock/sequencer_registry.json @@ -3,7 +3,7 @@ "seq_da_address": "0000000000000000000000000000000000000000000000000000000000000000", "coins_to_lock": { "amount": 50, - "token_address": "sov1zsnx7n2wjvtkr0ttscfgt06pjca3v2e6stxeu49qwynavmk7a8xqlxkkjp" + "token_address": "sov1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq0xu3qn" }, "is_preferred_sequencer": true }