diff --git a/Cargo.lock b/Cargo.lock index 2cd3416..d662384 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,28 +15,19 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "cpp_demangle", "fallible-iterator", - "gimli 0.27.3", + "gimli", "memmap2", - "object 0.31.1", + "object", "rustc-demangle", "smallvec", ] -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli 0.28.0", -] - [[package]] name = "adler" version = "1.0.2" @@ -312,12 +303,12 @@ version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.21.0", + "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.32.1", + "object", "rustc-demangle", ] @@ -468,9 +459,9 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94478e373742b9d1de02e13399633348e5b230dfe6364f65e80056c7df7438c5" +checksum = "441d1092e11977985946b6564251df91d80ae36982128e53be52a32548ad8762" dependencies = [ "reqwest", "serde", @@ -592,9 +583,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" dependencies = [ "serde", ] @@ -714,9 +705,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -724,9 +715,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -893,9 +884,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "rand_core", "subtle", @@ -954,15 +945,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-encoding-macro" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" +checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -970,9 +961,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" dependencies = [ "data-encoding", "syn 1.0.109", @@ -990,9 +981,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", ] @@ -1063,12 +1054,32 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "docker-generate" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf673e0848ef09fa4aeeba78e681cf651c0c7d35f76ee38cec8e55bc32fa111" + [[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "downloader" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05213e96f184578b5f70105d4d0a644a168e99e12d7bea0b200c15d67b5c182" +dependencies = [ + "digest 0.10.7", + "futures", + "rand", + "reqwest", + "thiserror", + "tokio", +] + [[package]] name = "dyn-clone" version = "1.0.16" @@ -1121,9 +1132,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elf" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6e7d85896690fe195447717af8eceae0593ac2196fd42fe88c184e904406ce" +checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b" [[package]] name = "encoding_rs" @@ -1154,9 +1165,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.31" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "a3286168faae03a0e583f6fde17c02c8b8bba2dcc2061d0f7817066e5b0af706" dependencies = [ "serde", ] @@ -1179,9 +1190,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" dependencies = [ "indenter", "once_cell", @@ -1189,9 +1200,9 @@ dependencies = [ [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" @@ -1443,20 +1454,14 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" dependencies = [ "fallible-iterator", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" - [[package]] name = "glob" version = "0.3.1" @@ -2063,6 +2068,17 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + [[package]] name = "librocksdb-sys" version = "0.11.0+8.1.1" @@ -2391,24 +2407,15 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "flate2", - "memchr", - "ruzstd", -] - [[package]] name = "object" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ + "flate2", "memchr", + "ruzstd", ] [[package]] @@ -2425,9 +2432,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.58" +version = "0.10.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -2457,9 +2464,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.94" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -2523,7 +2530,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets", ] @@ -2889,15 +2896,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2909,12 +2907,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] @@ -3031,9 +3029,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede27631e6b2a946a43db812063453c9701d5d2544d82f9abec2cc12574ebb8e" +checksum = "923c85a23cb9a9475b8cd4479ad3a06252604a361626e9ae7dc0dc635af22c22" dependencies = [ "anyhow", "elf", @@ -3045,37 +3043,70 @@ dependencies = [ [[package]] name = "risc0-build" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703b79671cd148f6535e1f78b8a74f665c920493eb6546c516c67ab0bc0bbde1" +checksum = "e58d4cc25e243e52d1ccd75d357b0aa55081736bf3052c65a823fdf169586843" dependencies = [ + "anyhow", "cargo_metadata", + "docker-generate", "risc0-binfmt", "risc0-zkp", "risc0-zkvm-platform", "serde", "serde_json", + "tempfile", ] [[package]] name = "risc0-build-kernel" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b88d565a721641f355cb889fee75c12c719dec7b910aa42ecabffa30d99f87" +checksum = "9061315fc75f1e8573e1aaca32b856b01a325f756c8482a63547b796cfbe7940" dependencies = [ "cc", "directories", - "glob", "hex", "sha2 0.10.8", "tempfile", ] +[[package]] +name = "risc0-circuit-recursion" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97547e10e9fdaaab8b64ffb45dc158b31f023b1a68015c6ce9f12fe3e403012a" +dependencies = [ + "anyhow", + "bytemuck", + "downloader", + "log", + "rand", + "rayon", + "risc0-circuit-recursion-sys", + "risc0-core", + "risc0-zkp", + "sha2 0.10.8", + "tracing", + "zip", +] + +[[package]] +name = "risc0-circuit-recursion-sys" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c61bb8d8021f0a96bae24b305ea64169d6f36637bb2717ae24de77abfc30760" +dependencies = [ + "glob", + "risc0-build-kernel", + "risc0-core", +] + [[package]] name = "risc0-circuit-rv32im" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e00222152fdc94cacc9b6682b5c0cbe8138f1ee82e80c24a64d9ad2c6d7415" +checksum = "1a269d01b18cba24ee1a08f68726fc3623e8705ed79d158377d12e9129dcde2e" dependencies = [ "anyhow", "log", @@ -3083,7 +3114,6 @@ dependencies = [ "rayon", "risc0-circuit-rv32im-sys", "risc0-core", - "risc0-sys", "risc0-zkp", "risc0-zkvm-platform", "tracing", @@ -3091,21 +3121,20 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im-sys" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca6ec6b1a7aad859af0009d19946ffdded8e3bd5d9accf893846b6bf996ac08" +checksum = "344208fab2ea159915c4c747aca9037c74e3cc4b10692389aa1f8d712e3b552d" dependencies = [ "glob", "risc0-build-kernel", "risc0-core", - "risc0-sys", ] [[package]] name = "risc0-core" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08605aec93ea22ed83f7f81f42e2d7287a5b0c749d8671f94de9d5994020045c" +checksum = "477e0bb8d2ec0b7955088b521eb596901e652d0faa2ea73bda0b77e05af5c07d" dependencies = [ "bytemuck", "rand_core", @@ -3120,21 +3149,18 @@ dependencies = [ [[package]] name = "risc0-sys" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d308c2ebc79e32c100f57722914b3172d2f0d69321703b684ea0c302e4f3a9" +checksum = "a2a0523c55e53a860f4a8fb3d2ca7c2bf3ce4b8aa3feddb42d08648bdcc458ac" dependencies = [ - "cc", - "glob", "risc0-build-kernel", - "risc0-core", ] [[package]] name = "risc0-zkp" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28166926bb177824939f4e91083198f9f3da8137aeac32361bd34548c0526fa5" +checksum = "d5abb1a0cf847d3f9aed1e563b76c358107e7ba66dbfab28f7144252c990bd82" dependencies = [ "anyhow", "blake2", @@ -3159,11 +3185,11 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec972152bcaa1a2967e412e22a84f6e2984a95c701bcc7943ca8ca10126ee0a2" +checksum = "3cf80df202c038efc2199be34fda8114b38bfc5b2b51c60cbbdf1f425b07b384" dependencies = [ - "addr2line 0.20.0", + "addr2line", "anyhow", "bincode", "bonsai-sdk", @@ -3175,34 +3201,38 @@ dependencies = [ "getrandom", "hex", "lazy-regex", - "libm", "log", "num-derive 0.4.1", "num-traits", "prost", "prost-build", "protobuf-src", - "rand", "rayon", "risc0-binfmt", + "risc0-circuit-recursion", "risc0-circuit-rv32im", "risc0-core", "risc0-zkp", "risc0-zkvm-platform", "rrs-lib", + "semver 1.0.20", "serde", "sha2 0.10.8", "tempfile", - "thiserror", "tracing", "typetag", ] [[package]] name = "risc0-zkvm-platform" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8524b46783b58b00e9b2a4712e837093c975b23cf25bfaf99e1cf69e9011bf6b" +checksum = "2dcd6b66f7a4972001db0acf3f06d99b7851c8d9f0de1f7e0fb4496c66c5cd02" +dependencies = [ + "bytemuck", + "getrandom", + "libm", +] [[package]] name = "rlp" @@ -3242,9 +3272,9 @@ dependencies = [ [[package]] name = "ruint" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724fd11728a3804e9944b14cab63825024c40bf42f8af87c8b5d97c4bbacf426" +checksum = "608a5726529f2f0ef81b8fde9873c4bb829d6b5b5ca6be4d97345ddf0749c825" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", @@ -3376,12 +3406,12 @@ dependencies = [ [[package]] name = "ruzstd" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" dependencies = [ "byteorder", - "thiserror", + "thiserror-core", "twox-hash", ] @@ -3725,7 +3755,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -3742,7 +3772,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -3759,7 +3789,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -3789,7 +3819,7 @@ dependencies = [ [[package]] name = "sov-cli" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -3806,7 +3836,7 @@ dependencies = [ [[package]] name = "sov-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bincode", @@ -3823,7 +3853,7 @@ dependencies = [ [[package]] name = "sov-ledger-rpc" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "futures", @@ -3836,7 +3866,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -3856,7 +3886,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bech32", @@ -3882,7 +3912,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bech32", @@ -3901,7 +3931,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -3917,7 +3947,7 @@ dependencies = [ [[package]] name = "sov-modules-rollup-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -3940,7 +3970,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -3958,7 +3988,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bincode", @@ -3975,7 +4005,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -4029,7 +4059,7 @@ dependencies = [ [[package]] name = "sov-schema-db" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "once_cell", @@ -4042,7 +4072,7 @@ dependencies = [ [[package]] name = "sov-sequencer" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -4058,7 +4088,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -4075,7 +4105,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bcs", @@ -4094,7 +4124,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -4117,7 +4147,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "bytes", "risc0-zkvm", @@ -4271,7 +4301,7 @@ checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", + "redox_syscall", "rustix", "windows-sys", ] @@ -4331,6 +4361,26 @@ 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" @@ -4577,9 +4627,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -4588,9 +4638,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -4628,9 +4678,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80960fd143d4c96275c0e60b08f14b81fbb468e79bc0ef8fbda69fb0afafae43" +checksum = "196976efd4a62737b3a2b662cda76efb448d099b1049613d7a5d72743c611ce0" dependencies = [ "erased-serde", "inventory", @@ -4641,9 +4691,9 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc13d450dc4a695200da3074dacf43d449b968baee95e341920e47f61a3b40f" +checksum = "2eea6765137e2414c44c7b1e07c73965a118a72c46148e1e168b3fc9d3ccf3aa" dependencies = [ "proc-macro2", "quote", @@ -5047,6 +5097,37 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.9+zstd.1.5.5" diff --git a/Cargo.toml b/Cargo.toml index bb17344..fd6bb0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,23 +16,23 @@ publish = false rust-version = "1.73" [workspace.dependencies] -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-accounts = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-bank = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-ledger-rpc = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-sequencer-registry = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-modules-rollup-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-stf-runner = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-db = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-sequencer = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-first-read-last-write-cache = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-cli = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +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" } stf-starter = { path = "./crates/stf" } serde = { version = "1.0.192", features = ["derive", "rc"] } @@ -40,7 +40,7 @@ serde_json = { version = "1.0" } anyhow = "1.0.68" -clap = { version = "4.2.7", features = ["derive"] } +clap = { version = "4.4.10", features = ["derive"] } async-trait = "0.1.71" borsh = { version = "0.10.3", features = ["rc", "bytes"] } tracing = "0.1.40" @@ -48,4 +48,4 @@ tokio = { version = "1", features = ["full"] } tempfile = "3.5" jsonrpsee = { version = "0.20.1", features = ["jsonrpsee-types"] } -risc0-build = "0.18" +risc0-build = "0.19" diff --git a/crates/provers/risc0/guest-celestia/Cargo.lock b/crates/provers/risc0/guest-celestia/Cargo.lock index 4d8ad55..7667524 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.lock +++ b/crates/provers/risc0/guest-celestia/Cargo.lock @@ -673,6 +673,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "dyn-clone" version = "1.0.14" @@ -1619,9 +1625,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede27631e6b2a946a43db812063453c9701d5d2544d82f9abec2cc12574ebb8e" +checksum = "923c85a23cb9a9475b8cd4479ad3a06252604a361626e9ae7dc0dc635af22c22" dependencies = [ "anyhow", "elf", @@ -1631,11 +1637,25 @@ dependencies = [ "serde", ] +[[package]] +name = "risc0-circuit-recursion" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97547e10e9fdaaab8b64ffb45dc158b31f023b1a68015c6ce9f12fe3e403012a" +dependencies = [ + "anyhow", + "bytemuck", + "log", + "risc0-core", + "risc0-zkp", + "tracing", +] + [[package]] name = "risc0-circuit-rv32im" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e00222152fdc94cacc9b6682b5c0cbe8138f1ee82e80c24a64d9ad2c6d7415" +checksum = "1a269d01b18cba24ee1a08f68726fc3623e8705ed79d158377d12e9129dcde2e" dependencies = [ "anyhow", "log", @@ -1647,9 +1667,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08605aec93ea22ed83f7f81f42e2d7287a5b0c749d8671f94de9d5994020045c" +checksum = "477e0bb8d2ec0b7955088b521eb596901e652d0faa2ea73bda0b77e05af5c07d" dependencies = [ "bytemuck", "rand_core", @@ -1657,9 +1677,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28166926bb177824939f4e91083198f9f3da8137aeac32361bd34548c0526fa5" +checksum = "d5abb1a0cf847d3f9aed1e563b76c358107e7ba66dbfab28f7144252c990bd82" dependencies = [ "anyhow", "blake2", @@ -1678,34 +1698,40 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec972152bcaa1a2967e412e22a84f6e2984a95c701bcc7943ca8ca10126ee0a2" +checksum = "3cf80df202c038efc2199be34fda8114b38bfc5b2b51c60cbbdf1f425b07b384" dependencies = [ "anyhow", "bytemuck", "cfg-if", "getrandom", "hex", - "libm", "log", "num-derive 0.4.0", "num-traits", "risc0-binfmt", + "risc0-circuit-recursion", "risc0-circuit-rv32im", "risc0-core", "risc0-zkp", "risc0-zkvm-platform", + "rrs-lib", + "semver 1.0.19", "serde", - "tempfile", "tracing", ] [[package]] name = "risc0-zkvm-platform" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8524b46783b58b00e9b2a4712e837093c975b23cf25bfaf99e1cf69e9011bf6b" +checksum = "2dcd6b66f7a4972001db0acf3f06d99b7851c8d9f0de1f7e0fb4496c66c5cd02" +dependencies = [ + "bytemuck", + "getrandom", + "libm", +] [[package]] name = "rlp" @@ -1717,6 +1743,16 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "rrs-lib" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4382d3af3a4ebdae7f64ba6edd9114fff92c89808004c4943b393377a25d001" +dependencies = [ + "downcast-rs", + "paste", +] + [[package]] name = "ruint" version = "1.10.1" @@ -1969,7 +2005,7 @@ dependencies = [ [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -1982,7 +2018,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -1995,7 +2031,7 @@ dependencies = [ [[package]] name = "sov-celestia-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -2035,7 +2071,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -2051,7 +2087,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bech32", @@ -2072,7 +2108,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bech32", @@ -2091,7 +2127,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -2106,7 +2142,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -2123,7 +2159,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bincode", @@ -2138,7 +2174,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -2155,7 +2191,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -2168,7 +2204,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bcs", @@ -2186,7 +2222,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -2200,7 +2236,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-celestia/Cargo.toml b/crates/provers/risc0/guest-celestia/Cargo.toml index f342a5e..e58b9de 100644 --- a/crates/provers/risc0/guest-celestia/Cargo.toml +++ b/crates/provers/risc0/guest-celestia/Cargo.toml @@ -8,17 +8,17 @@ resolver = "2" [dependencies] anyhow = "1.0.68" -risc0-zkvm = { version = "0.18", default-features = false, features = ["std"] } -risc0-zkvm-platform = "0.18" +risc0-zkvm = { version = "0.19", default-features = false, features = ["std"] } +risc0-zkvm-platform = "0.19" stf-starter = { path = "../../../stf" } -sov-rollup-interface = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-celestia-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +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" } [patch.crates-io] sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2/v0.10.6-risc0" } diff --git a/crates/provers/risc0/guest-mock/Cargo.lock b/crates/provers/risc0/guest-mock/Cargo.lock index a31bebe..7b26760 100644 --- a/crates/provers/risc0/guest-mock/Cargo.lock +++ b/crates/provers/risc0/guest-mock/Cargo.lock @@ -277,6 +277,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "dyn-clone" version = "1.0.16" @@ -728,9 +734,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede27631e6b2a946a43db812063453c9701d5d2544d82f9abec2cc12574ebb8e" +checksum = "923c85a23cb9a9475b8cd4479ad3a06252604a361626e9ae7dc0dc635af22c22" dependencies = [ "anyhow", "elf", @@ -740,11 +746,25 @@ dependencies = [ "serde", ] +[[package]] +name = "risc0-circuit-recursion" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97547e10e9fdaaab8b64ffb45dc158b31f023b1a68015c6ce9f12fe3e403012a" +dependencies = [ + "anyhow", + "bytemuck", + "log", + "risc0-core", + "risc0-zkp", + "tracing", +] + [[package]] name = "risc0-circuit-rv32im" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e00222152fdc94cacc9b6682b5c0cbe8138f1ee82e80c24a64d9ad2c6d7415" +checksum = "1a269d01b18cba24ee1a08f68726fc3623e8705ed79d158377d12e9129dcde2e" dependencies = [ "anyhow", "log", @@ -756,9 +776,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08605aec93ea22ed83f7f81f42e2d7287a5b0c749d8671f94de9d5994020045c" +checksum = "477e0bb8d2ec0b7955088b521eb596901e652d0faa2ea73bda0b77e05af5c07d" dependencies = [ "bytemuck", "rand_core", @@ -766,9 +786,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28166926bb177824939f4e91083198f9f3da8137aeac32361bd34548c0526fa5" +checksum = "d5abb1a0cf847d3f9aed1e563b76c358107e7ba66dbfab28f7144252c990bd82" dependencies = [ "anyhow", "blake2", @@ -787,34 +807,50 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec972152bcaa1a2967e412e22a84f6e2984a95c701bcc7943ca8ca10126ee0a2" +checksum = "3cf80df202c038efc2199be34fda8114b38bfc5b2b51c60cbbdf1f425b07b384" dependencies = [ "anyhow", "bytemuck", "cfg-if", "getrandom", "hex", - "libm", "log", "num-derive 0.4.1", "num-traits", "risc0-binfmt", + "risc0-circuit-recursion", "risc0-circuit-rv32im", "risc0-core", "risc0-zkp", "risc0-zkvm-platform", + "rrs-lib", + "semver", "serde", - "tempfile", "tracing", ] [[package]] name = "risc0-zkvm-platform" -version = "0.18.0" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dcd6b66f7a4972001db0acf3f06d99b7851c8d9f0de1f7e0fb4496c66c5cd02" +dependencies = [ + "bytemuck", + "getrandom", + "libm", +] + +[[package]] +name = "rrs-lib" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8524b46783b58b00e9b2a4712e837093c975b23cf25bfaf99e1cf69e9011bf6b" +checksum = "b4382d3af3a4ebdae7f64ba6edd9114fff92c89808004c4943b393377a25d001" +dependencies = [ + "downcast-rs", + "paste", +] [[package]] name = "rustc_version" @@ -957,7 +993,7 @@ checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" [[package]] name = "sov-accounts" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -970,7 +1006,7 @@ dependencies = [ [[package]] name = "sov-bank" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -983,7 +1019,7 @@ dependencies = [ [[package]] name = "sov-mock-da" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -999,7 +1035,7 @@ dependencies = [ [[package]] name = "sov-modules-api" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bech32", @@ -1020,7 +1056,7 @@ dependencies = [ [[package]] name = "sov-modules-core" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bech32", @@ -1039,7 +1075,7 @@ dependencies = [ [[package]] name = "sov-modules-macros" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -1054,7 +1090,7 @@ dependencies = [ [[package]] name = "sov-modules-stf-blueprint" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -1071,7 +1107,7 @@ dependencies = [ [[package]] name = "sov-risc0-adapter" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bincode", @@ -1086,7 +1122,7 @@ dependencies = [ [[package]] name = "sov-rollup-interface" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "async-trait", @@ -1103,7 +1139,7 @@ dependencies = [ [[package]] name = "sov-sequencer-registry" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -1116,7 +1152,7 @@ dependencies = [ [[package]] name = "sov-state" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "bcs", @@ -1134,7 +1170,7 @@ dependencies = [ [[package]] name = "sov-stf-runner" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "anyhow", "borsh", @@ -1148,7 +1184,7 @@ dependencies = [ [[package]] name = "sov-zk-cycle-utils" version = "0.3.0" -source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=6aaf68e715723bfdb50485232ebd0a0546a979f3#6aaf68e715723bfdb50485232ebd0a0546a979f3" +source = "git+https://github.com/Sovereign-Labs/sovereign-sdk.git?rev=beacf1935fc37dfdf83b709ab5e0f40de577a3a9#beacf1935fc37dfdf83b709ab5e0f40de577a3a9" dependencies = [ "bytes", "risc0-zkvm", diff --git a/crates/provers/risc0/guest-mock/Cargo.toml b/crates/provers/risc0/guest-mock/Cargo.toml index 9547f62..23e8ecb 100644 --- a/crates/provers/risc0/guest-mock/Cargo.toml +++ b/crates/provers/risc0/guest-mock/Cargo.toml @@ -8,18 +8,18 @@ resolver = "2" [dependencies] anyhow = "1.0.68" -risc0-zkvm = { version = "0.18", default-features = false, features = ["std"] } -risc0-zkvm-platform = "0.18" +risc0-zkvm = { version = "0.19", default-features = false, features = ["std"] } +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 = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-mock-da = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-modules-stf-blueprint = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-modules-api = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-risc0-adapter = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } -sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", rev = "6aaf68e715723bfdb50485232ebd0a0546a979f3" } +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" } stf-starter = { path = "../../../stf" } @@ -38,4 +38,4 @@ debug = 1 lto = true [profile.release.build-override] -opt-level = 3 \ No newline at end of file +opt-level = 3 diff --git a/crates/rollup/Makefile b/crates/rollup/Makefile index df25d6d..0188be8 100644 --- a/crates/rollup/Makefile +++ b/crates/rollup/Makefile @@ -96,7 +96,7 @@ import-keys: build-sov-cli test-generate-create-token-tx: build-sov-cli - $(SOV_CLI_REL_PATH) transactions import from-file bank --path ../../test-data/requests/create_token.json + $(SOV_CLI_REL_PATH) transactions import from-file bank --chain-id 0 --path ../../test-data/requests/create_token.json test-create-token: set-rpc-url test-generate-create-token-tx import-keys diff --git a/crates/rollup/src/bin/starter_cli_wallet.rs b/crates/rollup/src/bin/starter_cli_wallet.rs index 4455d12..6e33a8a 100644 --- a/crates/rollup/src/bin/starter_cli_wallet.rs +++ b/crates/rollup/src/bin/starter_cli_wallet.rs @@ -3,10 +3,10 @@ use sov_modules_api::cli::{FileNameArg, JsonStringArg}; use sov_modules_rollup_blueprint::WalletBlueprint; -#[cfg(feature = "mock_da")] -use sov_rollup_starter::mock_rollup::MockRollup as StarterRollup ; #[cfg(feature = "celestia_da")] use sov_rollup_starter::celestia_rollup::CelestiaRollup as StarterRollup; +#[cfg(feature = "mock_da")] +use sov_rollup_starter::mock_rollup::MockRollup as StarterRollup; use stf_starter::runtime::RuntimeSubcommand; #[tokio::main] diff --git a/crates/rollup/tests/bank/mod.rs b/crates/rollup/tests/bank/mod.rs index 3f1a0eb..1db054d 100644 --- a/crates/rollup/tests/bank/mod.rs +++ b/crates/rollup/tests/bank/mod.rs @@ -59,7 +59,17 @@ async fn send_test_create_token_tx(rpc_address: SocketAddr) -> Result<(), anyhow minter_address: user_address, authorized_minters: vec![], }); - let tx = Transaction::::new_signed_tx(&key, msg.try_to_vec().unwrap(), 0); + + let chain_id = 0; + let gas_tip = 0; + let nonce = 0; + let tx = Transaction::::new_signed_tx( + &key, + msg.try_to_vec().unwrap(), + chain_id, + gas_tip, + nonce, + ); let port = rpc_address.port(); let client = SimpleClient::new("localhost", port).await?; diff --git a/crates/stf/src/runtime.rs b/crates/stf/src/runtime.rs index 2cd60d3..7072767 100644 --- a/crates/stf/src/runtime.rs +++ b/crates/stf/src/runtime.rs @@ -9,8 +9,8 @@ pub use sov_accounts::{AccountsRpcImpl, AccountsRpcServer}; #[cfg(feature = "native")] pub use sov_bank::{BankRpcImpl, BankRpcServer}; -use sov_modules_api::runtime::capabilities::{BlobRefOrOwned, BlobSelector}; 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}; diff --git a/sov-rollup-starter.sh b/sov-rollup-starter.sh old mode 100644 new mode 100755