diff --git a/Cargo.lock b/Cargo.lock index d662384..5baee92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,9 +36,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", @@ -57,20 +57,19 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc0fac0fc16baf1f63f78b47c3d24718f3619b0714076f6a02957d808d52cbef" +checksum = "8d58d9f5da7b40e9bfff0b7e7816700be4019db97d4b6359fe7f94a9e22e42ac" dependencies = [ "arrayvec", "bytes", - "smol_str", ] [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -88,37 +87,37 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "ark-ff" @@ -261,13 +260,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -388,7 +387,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -543,7 +542,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -583,9 +582,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" dependencies = [ "serde", ] @@ -598,7 +597,7 @@ checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver 1.0.21", "serde", "serde_json", "thiserror", @@ -694,9 +693,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -705,9 +704,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642" dependencies = [ "clap_builder", "clap_derive", @@ -715,9 +714,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -734,7 +733,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -761,9 +760,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" @@ -793,9 +792,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -803,9 +802,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -827,9 +826,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -845,9 +844,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -856,22 +855,20 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -927,7 +924,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -981,9 +978,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -1051,7 +1048,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1154,7 +1151,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -1165,21 +1162,21 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3286168faae03a0e583f6fde17c02c8b8bba2dcc2061d0f7817066e5b0af706" +checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1190,9 +1187,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "eyre" -version = "0.6.9" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ "indenter", "once_cell", @@ -1252,9 +1249,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "fixed-hash" @@ -1317,9 +1314,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1332,9 +1329,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1347,9 +1344,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1357,15 +1354,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1374,32 +1371,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -1413,9 +1410,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1441,9 +1438,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1454,9 +1451,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", "stable_deref_trait", @@ -1516,9 +1513,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -1526,19 +1523,13 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.13.2" @@ -1550,9 +1541,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1577,18 +1568,18 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1597,9 +1588,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1620,9 +1611,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1635,7 +1626,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -1690,9 +1681,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1724,16 +1715,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -1741,7 +1722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -1768,9 +1749,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0508c56cfe9bfd5dfeb0c22ab9a6abfda2f27bdca422132e494266351ed8d83c" +checksum = "c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7" [[package]] name = "ipnet" @@ -1798,9 +1779,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jmt" @@ -1834,9 +1815,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -2048,18 +2029,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2108,9 +2089,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -2159,9 +2140,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -2172,15 +2153,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "mime" version = "0.3.17" @@ -2204,13 +2176,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2374,7 +2346,7 @@ checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -2409,9 +2381,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "flate2", "memchr", @@ -2420,9 +2392,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -2432,9 +2404,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.61" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -2453,7 +2425,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -2464,9 +2436,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.97" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -2488,9 +2460,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec", "bitvec", @@ -2502,11 +2474,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -2532,7 +2504,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2549,15 +2521,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" dependencies = [ "memchr", "thiserror", @@ -2571,7 +2543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap", ] [[package]] @@ -2591,7 +2563,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -2618,15 +2590,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "platforms" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "powerfmt" @@ -2642,12 +2614,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -2680,6 +2652,15 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2706,9 +2687,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -2729,9 +2710,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", @@ -2741,7 +2722,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "rusty-fork", "tempfile", "unarray", @@ -2749,9 +2730,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -2759,9 +2740,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck", @@ -2774,29 +2755,29 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.38", + "syn 2.0.48", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "prost-types" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ "prost", ] @@ -2818,9 +2799,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2954,12 +2935,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -2968,9 +2943,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "base64 0.21.5", "bytes", @@ -3006,16 +2981,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom", "libc", "spin", "untrusted", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3215,7 +3190,7 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "rrs-lib", - "semver 1.0.20", + "semver 1.0.21", "serde", "sha2 0.10.8", "tempfile", @@ -3333,27 +3308,27 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.21", ] [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -3375,9 +3350,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.5", ] @@ -3406,28 +3381,28 @@ dependencies = [ [[package]] name = "ruzstd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ "byteorder", - "thiserror-core", + "derive_more", "twox-hash", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -3510,9 +3485,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] @@ -3534,31 +3509,31 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -3574,9 +3549,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -3585,20 +3560,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -3688,9 +3663,12 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] [[package]] name = "slab" @@ -3703,28 +3681,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "smol_str" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.4.10" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" @@ -3733,7 +3692,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3755,7 +3714,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -3772,7 +3731,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -3786,10 +3745,31 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sov-blob-storage" +version = "0.3.0" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" +dependencies = [ + "anyhow", + "bincode", + "borsh", + "clap", + "hex", + "jsonrpsee", + "schemars", + "serde", + "serde_json", + "sov-chain-state", + "sov-modules-api", + "sov-sequencer-registry", + "sov-state", + "tracing", +] + [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -3816,10 +3796,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "sov-chain-state" +version = "0.3.0" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" +dependencies = [ + "anyhow", + "borsh", + "jsonrpsee", + "serde", + "serde_json", + "sov-modules-api", + "sov-state", +] + [[package]] name = "sov-cli" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -3836,7 +3830,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bincode", @@ -3853,7 +3847,7 @@ dependencies = [ [[package]] name = "sov-ledger-rpc" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "futures", @@ -3866,7 +3860,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -3886,7 +3880,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bech32", @@ -3904,6 +3898,7 @@ dependencies = [ "sha2 0.10.8", "sov-modules-core", "sov-modules-macros", + "sov-prover-storage-manager", "sov-rollup-interface", "sov-state", "thiserror", @@ -3912,7 +3907,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bech32", @@ -3931,7 +3926,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -3947,7 +3942,7 @@ dependencies = [ [[package]] name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -3970,7 +3965,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -3978,6 +3973,8 @@ dependencies = [ "jmt", "jsonrpsee", "serde", + "sov-blob-storage", + "sov-chain-state", "sov-modules-api", "sov-rollup-interface", "sov-state", @@ -3985,10 +3982,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "sov-prover-storage-manager" +version = "0.3.0" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" +dependencies = [ + "anyhow", + "sov-db", + "sov-rollup-interface", + "sov-schema-db", + "sov-state", + "tracing", +] + [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bincode", @@ -4005,7 +4015,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -4043,6 +4053,7 @@ dependencies = [ "sov-modules-api", "sov-modules-rollup-blueprint", "sov-modules-stf-blueprint", + "sov-prover-storage-manager", "sov-risc0-adapter", "sov-rollup-interface", "sov-sequencer", @@ -4059,7 +4070,7 @@ dependencies = [ [[package]] name = "sov-schema-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "once_cell", @@ -4072,7 +4083,7 @@ dependencies = [ [[package]] name = "sov-sequencer" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -4088,7 +4099,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -4105,7 +4116,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bcs", @@ -4124,7 +4135,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -4140,14 +4151,14 @@ dependencies = [ "sov-rollup-interface", "thiserror", "tokio", - "toml 0.8.6", + "toml 0.8.8", "tracing", ] [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "bytes", "risc0-zkvm", @@ -4162,9 +4173,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -4213,9 +4224,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subtle-encoding" @@ -4245,9 +4256,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -4295,15 +4306,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -4354,42 +4365,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] -[[package]] -name = "thiserror-core" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" -dependencies = [ - "thiserror-core-impl", -] - -[[package]] -name = "thiserror-core-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -4404,9 +4395,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "powerfmt", @@ -4423,9 +4414,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -4447,9 +4438,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -4459,20 +4450,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -4533,14 +4524,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.0", ] [[package]] @@ -4558,7 +4549,18 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -4612,7 +4614,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -4656,9 +4658,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twox-hash" @@ -4678,9 +4680,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196976efd4a62737b3a2b662cda76efb448d099b1049613d7a5d72743c611ce0" +checksum = "c43148481c7b66502c48f35b8eef38b6ccdc7a9f04bd4cc294226d901ccc9bc7" dependencies = [ "erased-serde", "inventory", @@ -4691,13 +4693,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eea6765137e2414c44c7b1e07c73965a118a72c46148e1e168b3fc9d3ccf3aa" +checksum = "291db8a81af4840c10d636e047cac67664e343be44e24dfdbd1492df9a5d3390" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] @@ -4726,9 +4728,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -4765,9 +4767,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -4824,9 +4826,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4834,24 +4836,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -4861,9 +4863,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4871,28 +4873,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-bindgen-test" -version = "0.3.38" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d" +checksum = "2cf9242c0d27999b831eae4767b2a146feb0b27d332d553e605864acd2afd403" dependencies = [ "console_error_panic_hook", "js-sys", @@ -4904,20 +4906,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.38" +version = "0.3.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735" +checksum = "794645f5408c9a039fd09f4d113cdfb2e7eba5ff1956b07bcf701cf4b394fe89" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -4925,9 +4927,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "which" @@ -4969,7 +4971,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -4978,13 +4989,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -4993,47 +5019,89 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.18" +version = "0.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" dependencies = [ "memchr", ] @@ -5045,7 +5113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5059,29 +5127,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.23" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e50cbb27c30666a6108abd6bc7577556265b44f243e2be89a8bc4e07a528c107" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.23" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25f293fe55f0a48e7010d65552bb63704f6ceb55a1a385da10d41d8f78e4a3d" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -5094,7 +5162,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fd6bb0e..84774a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,23 +16,25 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-prover-storage-manager = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } + stf-starter = { path = "./crates/stf" } serde = { version = "1.0.192", features = ["derive", "rc"] } diff --git a/README.md b/README.md index 7dd9f97..63414aa 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ $ make test-create-token #### 5. Wait for the transaction to be submitted. ```sh,test-ci -$ make wait-five-seconds +$ make wait-ten-seconds ``` diff --git a/celestia_rollup_config.toml b/celestia_rollup_config.toml index 0a51022..ba52b82 100644 --- a/celestia_rollup_config.toml +++ b/celestia_rollup_config.toml @@ -15,9 +15,12 @@ path = "../../rollup-starter-data" # We define the rollup's genesis to occur at block number `start_height`. The rollup will ignore # any blocks before this height [runner] -start_height = 0 +start_height = 3 [runner.rpc_config] # the host and port to bind the rpc server for bind_host = "127.0.0.1" bind_port = 12345 + +[prover_service] +aggregated_proof_block_jump = 1 \ No newline at end of file diff --git a/constants.json b/constants.json index 74de974..ced7f92 100644 --- a/constants.json +++ b/constants.json @@ -1,30 +1,32 @@ { "comment": "Sovereign SDK constants", "gas": { - "Bank": { - "create_token": [ - 4, - 4 - ], - "transfer": [ - 5, - 5 - ], - "burn": [ - 2, - 2 - ], - "mint": [ - 2, - 2 - ], - "freeze": [ - 1, - 1 - ] - } + "Bank": { + "create_token": [ + 4, + 4 + ], + "transfer": [ + 5, + 5 + ], + "burn": [ + 2, + 2 + ], + "mint": [ + 2, + 2 + ], + "freeze": [ + 1, + 1 + ] + } }, "constants": { - "DEFERRED_SLOTS_COUNT": 2 + "DEFERRED_SLOTS_COUNT": 2, + "GAS_TOKEN_ADDRESS": "sov1p9xxgsh78u3nxsl0zhfq4eazy0y4c8m5psjv3k3vrv45859jgazq3x72sg" } -} \ No newline at end of file +} + \ No newline at end of file diff --git a/crates/provers/risc0/guest-celestia/Cargo.lock b/crates/provers/risc0/guest-celestia/Cargo.lock index 7667524..c773087 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.lock +++ b/crates/provers/risc0/guest-celestia/Cargo.lock @@ -224,9 +224,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bcs" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd3ffe8b19a604421a5d461d4a70346223e535903fbc3067138bddbebddcf77" +checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a" dependencies = [ "serde", "thiserror", @@ -2005,7 +2005,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -2018,7 +2018,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -2028,10 +2028,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sov-blob-storage" +version = "0.3.0" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" +dependencies = [ + "anyhow", + "bincode", + "borsh", + "hex", + "sov-chain-state", + "sov-modules-api", + "sov-sequencer-registry", + "sov-state", + "tracing", +] + [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -2052,6 +2068,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "sov-chain-state" +version = "0.3.0" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" +dependencies = [ + "anyhow", + "borsh", + "serde", + "sov-modules-api", + "sov-state", +] + [[package]] name = "sov-demo-prover-guest-celestia" version = "0.3.0" @@ -2071,7 +2099,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -2087,7 +2115,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bech32", @@ -2108,7 +2136,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bech32", @@ -2127,7 +2155,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -2142,13 +2170,15 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", "hex", "jmt", "serde", + "sov-blob-storage", + "sov-chain-state", "sov-modules-api", "sov-rollup-interface", "sov-state", @@ -2159,7 +2189,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bincode", @@ -2174,7 +2204,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -2191,7 +2221,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -2204,7 +2234,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bcs", @@ -2222,7 +2252,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -2236,7 +2266,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-celestia/Cargo.toml b/crates/provers/risc0/guest-celestia/Cargo.toml index e58b9de..f93f6d9 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.toml +++ b/crates/provers/risc0/guest-celestia/Cargo.toml @@ -13,12 +13,12 @@ risc0-zkvm-platform = "0.19" stf-starter = { path = "../../../stf" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2/v0.10.6-risc0" } diff --git a/crates/provers/risc0/guest-celestia/src/bin/rollup.rs b/crates/provers/risc0/guest-celestia/src/bin/rollup.rs index 68997e7..f402194 100644 --- a/crates/provers/risc0/guest-celestia/src/bin/rollup.rs +++ b/crates/provers/risc0/guest-celestia/src/bin/rollup.rs @@ -20,16 +20,15 @@ risc0_zkvm::guest::entry!(main); pub fn main() { let guest = Risc0Guest::new(); let storage = ZkStorage::new(); - let app: StfBlueprint, BasicKernel<_>> = + let stf: StfBlueprint, BasicKernel<_, _>> = StfBlueprint::new(); let stf_verifier = StfVerifier::new( - app, + stf, CelestiaVerifier { rollup_namespace: ROLLUP_NAMESPACE, }, ); - stf_verifier .run_block(guest, storage) .expect("Prover must be honest"); diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index 7b26760..bbca7a6 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -993,7 +993,7 @@ checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -1006,7 +1006,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -1016,10 +1016,38 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sov-blob-storage" +version = "0.3.0" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" +dependencies = [ + "anyhow", + "bincode", + "borsh", + "hex", + "sov-chain-state", + "sov-modules-api", + "sov-sequencer-registry", + "sov-state", + "tracing", +] + +[[package]] +name = "sov-chain-state" +version = "0.3.0" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" +dependencies = [ + "anyhow", + "borsh", + "serde", + "sov-modules-api", + "sov-state", +] + [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -1035,7 +1063,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bech32", @@ -1056,7 +1084,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bech32", @@ -1075,7 +1103,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -1090,13 +1118,15 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", "hex", "jmt", "serde", + "sov-blob-storage", + "sov-chain-state", "sov-modules-api", "sov-rollup-interface", "sov-state", @@ -1107,7 +1137,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bincode", @@ -1122,7 +1152,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "async-trait", @@ -1139,7 +1169,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -1152,7 +1182,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "bcs", @@ -1170,7 +1200,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "anyhow", "borsh", @@ -1184,7 +1214,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=de526a6bafeccb982a7e19a5abe7ca8997f58240#de526a6bafeccb982a7e19a5abe7ca8997f58240" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 23e8ecb..250bbce 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -14,12 +14,12 @@ risc0-zkvm-platform = "0.19" serde = { version = "1.0.188", features = ["derive", "rc"] } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "beacf1935fc37dfdf83b709ab5e0f40de577a3a9" } +sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } +sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "de526a6bafeccb982a7e19a5abe7ca8997f58240" } stf-starter = { path = "../../../stf" } diff --git a/crates/provers/risc0/guest-mock/src/bin/mock_da.rs b/crates/provers/risc0/guest-mock/src/bin/mock_da.rs index 7c6df00..53387cd 100644 --- a/crates/provers/risc0/guest-mock/src/bin/mock_da.rs +++ b/crates/provers/risc0/guest-mock/src/bin/mock_da.rs @@ -2,11 +2,11 @@ //! This binary implements the verification logic for the rollup. This is the code that runs inside //! of the zkvm in order to generate proofs for the rollup. +use sov_mock_da::MockDaVerifier; use sov_modules_api::default_context::ZkDefaultContext; use sov_modules_stf_blueprint::kernels::basic::BasicKernel; use sov_modules_stf_blueprint::StfBlueprint; use sov_risc0_adapter::guest::Risc0Guest; -use sov_mock_da::MockDaVerifier; use sov_state::ZkStorage; use stf_starter::runtime::Runtime; use stf_starter::StfVerifier; @@ -16,10 +16,13 @@ risc0_zkvm::guest::entry!(main); pub fn main() { let guest = Risc0Guest::new(); let storage = ZkStorage::new(); - let app: StfBlueprint, BasicKernel<_>> = - StfBlueprint::new(); + #[cfg(feature = "bench")] + let start_cycles = env::get_cycle_count(); + + let stf: StfBlueprint, BasicKernel<_, _>> = + StfBlueprint::new(); - let stf_verifier = StfVerifier::new(app, MockDaVerifier {}); + let stf_verifier = StfVerifier::new(stf, MockDaVerifier {}); stf_verifier .run_block(guest, storage) diff --git a/crates/rollup/Cargo.toml b/crates/rollup/Cargo.toml index 0fff71f..1193de0 100644 --- a/crates/rollup/Cargo.toml +++ b/crates/rollup/Cargo.toml @@ -13,6 +13,7 @@ publish = false [dependencies] sov-modules-api = { workspace = true, features = ["native"] } sov-state = { workspace = true } +sov-prover-storage-manager = { workspace = true } sov-accounts = { workspace = true, features = ["native"] } sov-bank = { workspace = true, features = ["native"] } sov-ledger-rpc = { workspace = true, features = ["server"] } diff --git a/crates/rollup/Makefile b/crates/rollup/Makefile index 0188be8..44acc72 100644 --- a/crates/rollup/Makefile +++ b/crates/rollup/Makefile @@ -85,8 +85,8 @@ else cargo build --bin starter-cli-wallet endif -wait-five-seconds: - sleep 3 +wait-ten-seconds: + sleep 10 set-rpc-url: build-sov-cli $(SOV_CLI_REL_PATH) rpc set-url http://127.0.0.1:12345 diff --git a/crates/rollup/src/bin/node.rs b/crates/rollup/src/bin/node.rs index f72d82c..4b42b61 100644 --- a/crates/rollup/src/bin/node.rs +++ b/crates/rollup/src/bin/node.rs @@ -7,6 +7,8 @@ use sov_celestia_adapter::CelestiaConfig; #[cfg(feature = "mock_da")] use sov_mock_da::MockDaConfig; use sov_modules_rollup_blueprint::{Rollup, RollupBlueprint}; +use sov_modules_stf_blueprint::kernels::basic::BasicKernelGenesisConfig; +use sov_modules_stf_blueprint::kernels::basic::BasicKernelGenesisPaths; #[cfg(feature = "celestia_da")] use sov_rollup_starter::celestia_rollup::CelestiaRollup; #[cfg(feature = "mock_da")] @@ -24,12 +26,19 @@ use tracing_subscriber::{fmt, EnvFilter}; const DEFAULT_CONFIG_PATH: &str = "../../rollup_config.toml"; #[cfg(feature = "mock_da")] const DEFAULT_GENESIS_PATH: &str = "../../test-data/genesis/mock/"; +#[cfg(feature = "mock_da")] +const DEFAULT_KERNEL_GENESIS_PATH: &str = "../../test-data/genesis/mock/chain_state.json"; + + // config and genesis for local docker celestia #[cfg(feature = "celestia_da")] const DEFAULT_CONFIG_PATH: &str = "../../celestia_rollup_config.toml"; #[cfg(feature = "celestia_da")] const DEFAULT_GENESIS_PATH: &str = "../../test-data/genesis/celestia/"; +#[cfg(feature = "celestia_da")] +const DEFAULT_KERNEL_GENESIS_PATH: &str = "../../test-data/genesis/celestia/chain_state.json"; + #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] @@ -41,6 +50,9 @@ struct Args { /// The path to the genesis config. #[arg(long, default_value = DEFAULT_GENESIS_PATH)] genesis_paths: String, + /// The path to the kernel genesis config. + #[arg(long, default_value = DEFAULT_KERNEL_GENESIS_PATH)] + kernel_genesis_paths: String, } #[tokio::main] @@ -56,9 +68,13 @@ async fn main() -> Result<(), anyhow::Error> { let rollup_config_path = args.rollup_config_path.as_str(); let genesis_paths = args.genesis_paths.as_str(); + let kernel_genesis_paths = args.kernel_genesis_paths.as_str(); let rollup = new_rollup( &GenesisPaths::from_dir(genesis_paths), + &BasicKernelGenesisPaths { + chain_state: kernel_genesis_paths.into(), + }, rollup_config_path, RollupProverConfig::Execute, ) @@ -68,7 +84,8 @@ async fn main() -> Result<(), anyhow::Error> { #[cfg(feature = "mock_da")] async fn new_rollup( - genesis_paths: &GenesisPaths, + rt_genesis_paths: &GenesisPaths, + kernel_genesis_paths: &BasicKernelGenesisPaths, rollup_config_path: &str, prover_config: RollupProverConfig, ) -> Result, anyhow::Error> { @@ -78,14 +95,28 @@ async fn new_rollup( from_toml_path(rollup_config_path).context("Failed to read rollup configuration")?; let mock_rollup = MockRollup {}; + + let kernel_genesis = BasicKernelGenesisConfig { + chain_state: serde_json::from_str( + &std::fs::read_to_string(&kernel_genesis_paths.chain_state) + .context("Failed to read chain state")?, + )?, + }; + mock_rollup - .create_new_rollup(genesis_paths, rollup_config, prover_config) + .create_new_rollup( + rt_genesis_paths, + kernel_genesis, + rollup_config, + prover_config, + ) .await } #[cfg(feature = "celestia_da")] async fn new_rollup( - genesis_paths: &GenesisPaths, + rt_genesis_paths: &GenesisPaths, + kernel_genesis_paths: &BasicKernelGenesisPaths, rollup_config_path: &str, prover_config: RollupProverConfig, ) -> Result, anyhow::Error> { @@ -97,8 +128,20 @@ async fn new_rollup( let rollup_config: RollupConfig = from_toml_path(rollup_config_path).context("Failed to read rollup configuration")?; - let celestia_rollup = CelestiaRollup {}; - celestia_rollup - .create_new_rollup(genesis_paths, rollup_config, prover_config) + let kernel_genesis = BasicKernelGenesisConfig { + chain_state: serde_json::from_str( + &std::fs::read_to_string(&kernel_genesis_paths.chain_state) + .context("Failed to read chain state")?, + )?, + }; + + let mock_rollup = CelestiaRollup {}; + mock_rollup + .create_new_rollup( + rt_genesis_paths, + kernel_genesis, + rollup_config, + prover_config, + ) .await } diff --git a/crates/rollup/src/celestia_rollup.rs b/crates/rollup/src/celestia_rollup.rs index d070927..3e63ffb 100644 --- a/crates/rollup/src/celestia_rollup.rs +++ b/crates/rollup/src/celestia_rollup.rs @@ -2,19 +2,19 @@ //! StarterRollup provides a minimal self-contained rollup implementation use async_trait::async_trait; -use sov_db::ledger_db::LedgerDB; - use sov_celestia_adapter::types::Namespace; use sov_celestia_adapter::verifier::{CelestiaSpec, CelestiaVerifier, RollupParams}; use sov_celestia_adapter::{CelestiaConfig, CelestiaService}; use sov_modules_api::default_context::{DefaultContext, ZkDefaultContext}; +use sov_modules_api::Address; use sov_modules_api::Spec; +use sov_modules_rollup_blueprint::RollupBlueprint; use sov_modules_stf_blueprint::kernels::basic::BasicKernel; use sov_modules_stf_blueprint::StfBlueprint; +use sov_prover_storage_manager::ProverStorageManager; use sov_risc0_adapter::host::Risc0Host; use sov_rollup_interface::zk::ZkvmHost; use sov_state::config::Config as StorageConfig; -use sov_state::storage_manager::ProverStorageManager; use sov_state::Storage; use sov_state::{DefaultStorageSpec, ZkStorage}; use sov_stf_runner::ParallelProverService; @@ -22,16 +22,19 @@ use sov_stf_runner::RollupConfig; use sov_stf_runner::RollupProverConfig; use stf_starter::Runtime; -/// The namespace for the rollup on Celestia. Must be kept in sync with the "rollup/src/lib.rs" +/// The namespace for the rollup on Celestia. const ROLLUP_NAMESPACE: Namespace = Namespace::const_v0(*b"sov-celest"); +/// The rollup stores the zk proofs in the namespace b"sov-test-p" on Celestia. +const ROLLUP_PROOF_NAMESPACE: Namespace = Namespace::const_v0(*b"sov-test-p"); + /// Rollup with [`CelestiaDaService`]. pub struct CelestiaRollup {} /// This is the place, where all the rollup components come together and /// they can be easily swapped with alternative implementations as needed. #[async_trait] -impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { +impl RollupBlueprint for CelestiaRollup { type DaService = CelestiaService; type DaSpec = CelestiaSpec; type DaConfig = CelestiaConfig; @@ -40,13 +43,13 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { type ZkContext = ZkDefaultContext; type NativeContext = DefaultContext; - type StorageManager = ProverStorageManager; + type StorageManager = ProverStorageManager; type ZkRuntime = Runtime; type NativeRuntime = Runtime; - type NativeKernel = BasicKernel; - type ZkKernel = BasicKernel; + type NativeKernel = BasicKernel; + type ZkKernel = BasicKernel; type ProverService = ParallelProverService< <::Storage as Storage>::Root, @@ -65,15 +68,18 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { fn create_rpc_methods( &self, storage: &::Storage, - ledger_db: &LedgerDB, + ledger_db: &sov_db::ledger_db::LedgerDB, da_service: &Self::DaService, ) -> Result, anyhow::Error> { + // TODO set the sequencer address + let sequencer = Address::new([0; 32]); + #[allow(unused_mut)] let mut rpc_methods = sov_modules_rollup_blueprint::register_rpc::< Self::NativeRuntime, Self::NativeContext, Self::DaService, - >(storage, ledger_db, da_service)?; + >(storage, ledger_db, da_service, sequencer)?; #[cfg(feature = "experimental")] crate::eth::register_ethereum::( @@ -92,25 +98,17 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { CelestiaService::new( rollup_config.da.clone(), RollupParams { - namespace: ROLLUP_NAMESPACE, + rollup_batch_namespace: ROLLUP_NAMESPACE, + rollup_proof_namespace: ROLLUP_PROOF_NAMESPACE, }, ) .await } - fn create_storage_manager( - &self, - rollup_config: &sov_stf_runner::RollupConfig, - ) -> Result { - let storage_config = StorageConfig { - path: rollup_config.storage.path.clone(), - }; - ProverStorageManager::new(storage_config) - } - async fn create_prover_service( &self, prover_config: RollupProverConfig, + rollup_config: &RollupConfig, _da_service: &Self::DaService, ) -> Self::ProverService { let vm = Risc0Host::new(risc0_starter::ROLLUP_ELF); @@ -127,8 +125,18 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for CelestiaRollup { da_verifier, prover_config, zk_storage, + rollup_config.prover_service, ) } -} + fn create_storage_manager( + &self, + rollup_config: &sov_stf_runner::RollupConfig, + ) -> Result { + let storage_config = StorageConfig { + path: rollup_config.storage.path.clone(), + }; + ProverStorageManager::new(storage_config) + } +} impl sov_modules_rollup_blueprint::WalletBlueprint for CelestiaRollup {} diff --git a/crates/rollup/src/mock_rollup.rs b/crates/rollup/src/mock_rollup.rs index 57b4716..d493cd6 100644 --- a/crates/rollup/src/mock_rollup.rs +++ b/crates/rollup/src/mock_rollup.rs @@ -5,9 +5,12 @@ use async_trait::async_trait; use sov_db::ledger_db::LedgerDB; use sov_mock_da::{MockDaConfig, MockDaService, MockDaSpec}; use sov_modules_api::default_context::{DefaultContext, ZkDefaultContext}; +use sov_modules_api::Address; use sov_modules_api::Spec; +use sov_modules_rollup_blueprint::RollupBlueprint; use sov_modules_stf_blueprint::kernels::basic::BasicKernel; use sov_modules_stf_blueprint::StfBlueprint; +use sov_prover_storage_manager::ProverStorageManager; use sov_risc0_adapter::host::Risc0Host; use sov_rollup_interface::zk::ZkvmHost; use sov_state::config::Config as StorageConfig; @@ -17,17 +20,16 @@ use sov_stf_runner::ParallelProverService; use sov_stf_runner::RollupConfig; use sov_stf_runner::RollupProverConfig; use stf_starter::Runtime; -/// Rollup with [`MockDaService`]. +/// Rollup with [`MockDaService`]. pub struct MockRollup {} /// This is the place, where all the rollup components come together and /// they can be easily swapped with alternative implementations as needed. #[async_trait] -impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { +impl RollupBlueprint for MockRollup { /// This component defines the Data Availability layer. type DaService = MockDaService; - /// DaSpec & DaConfig are derived from DaService. type DaSpec = MockDaSpec; type DaConfig = MockDaConfig; @@ -40,15 +42,16 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { type NativeContext = DefaultContext; /// Manager for the native storage lifecycle. - type StorageManager = sov_state::storage_manager::ProverStorageManager; + type StorageManager = ProverStorageManager; /// Runtime for the Zero Knowledge environment. type ZkRuntime = Runtime; /// Runtime for the Native environment. type NativeRuntime = Runtime; + /// Kernels. - type NativeKernel = BasicKernel; - type ZkKernel = BasicKernel; + type NativeKernel = BasicKernel; + type ZkKernel = BasicKernel; /// Prover service. type ProverService = ParallelProverService< @@ -71,15 +74,26 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { storage: &::Storage, ledger_db: &LedgerDB, da_service: &Self::DaService, - ) -> anyhow::Result> { - sov_modules_rollup_blueprint::register_rpc::< + ) -> Result, anyhow::Error> { + // TODO set the sequencer address + let sequencer = Address::new([0; 32]); + + #[allow(unused_mut)] + let mut rpc_methods = sov_modules_rollup_blueprint::register_rpc::< Self::NativeRuntime, Self::NativeContext, Self::DaService, - >(storage, ledger_db, da_service) - } + >(storage, ledger_db, da_service, sequencer)?; + + #[cfg(feature = "experimental")] + crate::eth::register_ethereum::( + da_service.clone(), + storage.clone(), + &mut rpc_methods, + )?; - // Below, we provide the methods for setting up dependencies for the Rollup. + Ok(rpc_methods) + } async fn create_da_service( &self, @@ -88,20 +102,10 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { MockDaService::new(rollup_config.da.sender_address) } - fn create_storage_manager( - &self, - rollup_config: &RollupConfig, - ) -> anyhow::Result { - let storage_config = StorageConfig { - path: rollup_config.storage.path.clone(), - }; - sov_state::storage_manager::ProverStorageManager::new(storage_config) - } - async fn create_prover_service( &self, - prover_config: RollupProverConfig, + rollup_config: &RollupConfig, _da_service: &Self::DaService, ) -> Self::ProverService { let vm = Risc0Host::new(risc0_starter::MOCK_DA_ELF); @@ -115,8 +119,19 @@ impl sov_modules_rollup_blueprint::RollupBlueprint for MockRollup { da_verifier, prover_config, zk_storage, + rollup_config.prover_service, ) } + + fn create_storage_manager( + &self, + rollup_config: &RollupConfig, + ) -> anyhow::Result { + let storage_config = StorageConfig { + path: rollup_config.storage.path.clone(), + }; + ProverStorageManager::new(storage_config) + } } impl sov_modules_rollup_blueprint::WalletBlueprint for MockRollup {} diff --git a/crates/rollup/tests/bank/mod.rs b/crates/rollup/tests/bank/mod.rs index 1db054d..e125474 100644 --- a/crates/rollup/tests/bank/mod.rs +++ b/crates/rollup/tests/bank/mod.rs @@ -9,6 +9,7 @@ use sov_modules_api::default_context::DefaultContext; use sov_modules_api::default_signature::private_key::DefaultPrivateKey; use sov_modules_api::transaction::Transaction; use sov_modules_api::{PrivateKey, Spec}; +use sov_modules_stf_blueprint::kernels::basic::BasicKernelGenesisPaths; use sov_sequencer::utils::SimpleClient; use sov_stf_runner::RollupProverConfig; use stf_starter::genesis_config::GenesisPaths; @@ -25,6 +26,9 @@ async fn bank_tx_tests() -> Result<(), anyhow::Error> { start_rollup( port_tx, GenesisPaths::from_dir("../../test-data/genesis/mock/"), + BasicKernelGenesisPaths { + chain_state: "../../test-data/genesis/mock/chain_state.json".into(), + }, RollupProverConfig::Execute, ) .await; @@ -59,15 +63,16 @@ async fn send_test_create_token_tx(rpc_address: SocketAddr) -> Result<(), anyhow minter_address: user_address, authorized_minters: vec![], }); - let chain_id = 0; let gas_tip = 0; + let gas_limit = 0; let nonce = 0; let tx = Transaction::::new_signed_tx( &key, msg.try_to_vec().unwrap(), chain_id, gas_tip, + gas_limit, nonce, ); diff --git a/crates/rollup/tests/test_helpers.rs b/crates/rollup/tests/test_helpers.rs index edc8269..49c9fc6 100644 --- a/crates/rollup/tests/test_helpers.rs +++ b/crates/rollup/tests/test_helpers.rs @@ -2,7 +2,10 @@ use std::net::SocketAddr; use sov_mock_da::{MockAddress, MockDaConfig}; use sov_modules_rollup_blueprint::RollupBlueprint; +use sov_modules_stf_blueprint::kernels::basic::BasicKernelGenesisConfig; +use sov_modules_stf_blueprint::kernels::basic::BasicKernelGenesisPaths; use sov_rollup_starter::mock_rollup::MockRollup; +use sov_stf_runner::ProverServiceConfig; use sov_stf_runner::RollupProverConfig; use sov_stf_runner::{RollupConfig, RpcConfig, RunnerConfig, StorageConfig}; use stf_starter::genesis_config::GenesisPaths; @@ -10,7 +13,8 @@ use tokio::sync::oneshot; pub async fn start_rollup( rpc_reporting_channel: oneshot::Sender, - genesis_paths: GenesisPaths, + rt_genesis_paths: GenesisPaths, + kernel_genesis_paths: BasicKernelGenesisPaths, rollup_prover_config: RollupProverConfig, ) { let temp_dir = tempfile::tempdir().unwrap(); @@ -21,7 +25,7 @@ pub async fn start_rollup( path: temp_path.to_path_buf(), }, runner: RunnerConfig { - start_height: 0, + start_height: 1, rpc_config: RpcConfig { bind_host: "127.0.0.1".into(), bind_port: 0, @@ -30,15 +34,30 @@ pub async fn start_rollup( da: MockDaConfig { sender_address: MockAddress::from([0; 32]), }, + prover_service: ProverServiceConfig { + aggregated_proof_block_jump: 1, + }, }; let mock_rollup = MockRollup {}; + let kernel_genesis = BasicKernelGenesisConfig { + chain_state: serde_json::from_str( + &std::fs::read_to_string(&kernel_genesis_paths.chain_state) + .expect("Failed to read chain_state genesis config"), + ) + .expect("Failed to parse chain_state genesis config"), + }; + let rollup = mock_rollup - .create_new_rollup(&genesis_paths, rollup_config, rollup_prover_config) + .create_new_rollup( + &rt_genesis_paths, + kernel_genesis, + rollup_config, + rollup_prover_config, + ) .await .unwrap(); - rollup .run_and_report_rpc_port(Some(rpc_reporting_channel)) .await diff --git a/crates/stf/src/hooks.rs b/crates/stf/src/hooks.rs index bed28fd..5b1e024 100644 --- a/crates/stf/src/hooks.rs +++ b/crates/stf/src/hooks.rs @@ -4,36 +4,48 @@ //! - At the beginning and end of each batch ("blob") //! - At the beginning and end of each slot (DA layer block) +use super::runtime::Runtime; +use sov_accounts::AccountsTxHook; +use sov_bank::BankTxHook; use sov_modules_api::hooks::{ApplyBlobHooks, FinalizeHook, SlotHooks, TxHooks}; use sov_modules_api::transaction::Transaction; use sov_modules_api::{AccessoryWorkingSet, BlobReaderTrait, Context, DaSpec, Spec, WorkingSet}; -use sov_modules_stf_blueprint::SequencerOutcome; +use sov_modules_stf_blueprint::{RuntimeTxHook, SequencerOutcome}; use sov_sequencer_registry::SequencerRegistry; use sov_state::Storage; use tracing::info; -use super::runtime::Runtime; - impl TxHooks for Runtime { type Context = C; + type PreArg = RuntimeTxHook; + type PreResult = C; fn pre_dispatch_tx_hook( &self, tx: &Transaction, working_set: &mut WorkingSet, - ) -> anyhow::Result<::Address> { - // Before executing a transaction, retrieve the sender's address from the accounts module - // and check the nonce - self.accounts.pre_dispatch_tx_hook(tx, working_set) + arg: &RuntimeTxHook, + ) -> anyhow::Result { + let RuntimeTxHook { height, sequencer } = arg; + let AccountsTxHook { sender, sequencer } = + self.accounts + .pre_dispatch_tx_hook(tx, working_set, sequencer)?; + + let hook = BankTxHook { sender, sequencer }; + self.bank.pre_dispatch_tx_hook(tx, working_set, &hook)?; + + Ok(C::new(hook.sender, hook.sequencer, *height)) } fn post_dispatch_tx_hook( &self, tx: &Transaction, + ctx: &C, working_set: &mut WorkingSet, ) -> anyhow::Result<()> { - // After executing each transaction, update the nonce - self.accounts.post_dispatch_tx_hook(tx, working_set) + self.accounts.post_dispatch_tx_hook(tx, ctx, working_set)?; + self.bank.post_dispatch_tx_hook(tx, ctx, working_set)?; + Ok(()) } } diff --git a/crates/stf/src/runtime.rs b/crates/stf/src/runtime.rs index 7072767..e2fb197 100644 --- a/crates/stf/src/runtime.rs +++ b/crates/stf/src/runtime.rs @@ -10,7 +10,6 @@ pub use sov_accounts::{AccountsRpcImpl, AccountsRpcServer}; #[cfg(feature = "native")] pub use sov_bank::{BankRpcImpl, BankRpcServer}; use sov_modules_api::macros::DefaultRuntime; -use sov_modules_api::runtime::capabilities::{BlobRefOrOwned, BlobSelector}; #[cfg(feature = "native")] use sov_modules_api::Spec; use sov_modules_api::{Context, DaSpec, DispatchCall, Genesis, MessageCodec}; @@ -89,19 +88,3 @@ where crate::genesis_config::get_genesis_config(genesis_paths) } } - -// Select which blobs will be executed in this slot. In this implementation simply execute all -// available blobs in the order they appeared on the DA layer -impl BlobSelector for Runtime { - type Context = C; - fn get_blobs_for_this_slot<'a, I>( - &self, - current_blobs: I, - _working_set: &mut sov_modules_api::WorkingSet, - ) -> anyhow::Result>> - where - I: IntoIterator, - { - Ok(current_blobs.into_iter().map(BlobRefOrOwned::Ref).collect()) - } -} diff --git a/docker/rollup_config_0.toml b/docker/rollup_config_0.toml index 33d79a2..513cabb 100644 --- a/docker/rollup_config_0.toml +++ b/docker/rollup_config_0.toml @@ -13,3 +13,6 @@ start_height = 1 [runner.rpc_config] bind_host = "127.0.0.1" bind_port = 12340 + +[prover_service] +aggregated_proof_block_jump = 1 \ No newline at end of file diff --git a/rollup_config.toml b/rollup_config.toml index 98b089c..c57857c 100644 --- a/rollup_config.toml +++ b/rollup_config.toml @@ -8,9 +8,12 @@ path = "../../rollup-starter-data" # We define the rollup's genesis to occur at block number `start_height`. The rollup will ignore # any blocks before this height [runner] -start_height = 0 +start_height = 1 [runner.rpc_config] # the host and port to bind the rpc server for bind_host = "127.0.0.1" -bind_port = 12345 \ No newline at end of file +bind_port = 12345 + +[prover_service] +aggregated_proof_block_jump = 1 \ No newline at end of file diff --git a/sov-rollup-starter.sh b/sov-rollup-starter.sh index 741b573..4c603c0 100755 --- a/sov-rollup-starter.sh +++ b/sov-rollup-starter.sh @@ -21,8 +21,8 @@ if [ $? -ne 0 ]; then echo "Expected exit code 0, got $?" exit 1 fi -echo 'Running: '\''make wait-five-seconds'\''' -make wait-five-seconds +echo 'Running: '\''make wait-ten-seconds'\''' +make wait-ten-seconds if [ $? -ne 0 ]; then echo "Expected exit code 0, got $?" exit 1 diff --git a/test-data/genesis/celestia/chain_state.json b/test-data/genesis/celestia/chain_state.json new file mode 100644 index 0000000..d439a68 --- /dev/null +++ b/test-data/genesis/celestia/chain_state.json @@ -0,0 +1,7 @@ +{ + "initial_slot_height": 0, + "current_time": { + "secs": 0, + "nanos": 0 + } +} diff --git a/test-data/genesis/mock/chain_state.json b/test-data/genesis/mock/chain_state.json new file mode 100644 index 0000000..d439a68 --- /dev/null +++ b/test-data/genesis/mock/chain_state.json @@ -0,0 +1,7 @@ +{ + "initial_slot_height": 0, + "current_time": { + "secs": 0, + "nanos": 0 + } +}