diff --git a/Cargo.lock b/Cargo.lock index 00b5502..a5ed3f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,11 +104,11 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.23" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1752d7d62e2665da650a36d84abbf239f812534475d51f072a49a533513b7cdd" +checksum = "3312b2a48f29abe7c3ea7c7fbc1f8cc6ea09b85d74b6232e940df35f2f3826fd" dependencies = [ - "num_enum 0.7.2", + "num_enum 0.7.3", "strum", ] @@ -172,7 +172,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow 0.6.15", + "winnow 0.6.18", ] [[package]] @@ -344,9 +344,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a43b18702501396fa9bcdeecd533bc85fac75150d308fc0f6800a01e6234a003" +checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -355,9 +355,9 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83524c1f6162fcb5b0decf775498a125066c86dda6066ed609531b0e912f85a" +checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", @@ -512,7 +512,7 @@ dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.2.6", + "indexmap 2.3.0", "proc-macro-error", "proc-macro2", "quote", @@ -545,7 +545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" dependencies = [ "serde", - "winnow 0.6.15", + "winnow 0.6.18", ] [[package]] @@ -624,7 +624,7 @@ dependencies = [ "alloy-transport", "futures", "http 1.1.0", - "rustls 0.23.11", + "rustls 0.23.12", "serde_json", "tokio", "tokio-tungstenite", @@ -658,9 +658,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -673,33 +673,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -1053,7 +1053,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.72", "which", @@ -1165,9 +1165,9 @@ dependencies = [ [[package]] name = "blst" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62dc83a094a71d43eeadd254b1ec2d24cb6a0bb6cadce00df51f0db594711a32" +checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" dependencies = [ "cc", "glob", @@ -1199,9 +1199,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" [[package]] name = "byteorder" @@ -1211,9 +1211,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ "serde", ] @@ -1266,9 +1266,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549" dependencies = [ "jobserver", "libc", @@ -1325,9 +1325,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" dependencies = [ "clap_builder", "clap_derive", @@ -1335,9 +1335,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" dependencies = [ "anstream", "anstyle", @@ -1347,9 +1347,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", @@ -1359,9 +1359,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cobs" @@ -1423,9 +1423,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "console" @@ -1598,11 +1598,14 @@ dependencies = [ [[package]] name = "curve25519-dalek-ng" version = "4.1.1" -source = "git+https://github.com/sp1-patches/curve25519-dalek-ng?branch=patch-v4.1.1#f5607edd61ad8e9d80c9be933cd119f4008044d9" +source = "git+https://github.com/sp1-patches/curve25519-dalek-ng?branch=patch-v4.1.1#8dd77b20f3e78965a0cc57070a04465b9d52c49e" dependencies = [ + "anyhow", "byteorder", + "cfg-if", "digest 0.9.0", "rand_core", + "sp1-lib", "subtle-ng", "zeroize", ] @@ -1778,9 +1781,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "ecdsa" @@ -1809,7 +1812,7 @@ dependencies = [ [[package]] name = "ed25519-consensus" version = "2.1.0" -source = "git+https://github.com/sp1-patches/ed25519-consensus?branch=patch-v2.1.0#4fba9b0acc9fcf7a87d00da84c340d5988e3d7cb" +source = "git+https://github.com/sp1-patches/ed25519-consensus?branch=patch-v2.1.0#2b2c4b43344bc4daf5b1326f367f2d9d661eeabb" dependencies = [ "curve25519-dalek-ng", "hex", @@ -2072,7 +2075,7 @@ dependencies = [ "ethabi", "generic-array 0.14.7", "k256", - "num_enum 0.7.2", + "num_enum 0.7.3", "once_cell", "open-fastrlp", "rand", @@ -2535,7 +2538,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -2554,7 +2557,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.2.6", + "indexmap 2.3.0", "slab", "tokio", "tokio-util", @@ -2798,7 +2801,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2837,9 +2840,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -3207,9 +3210,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3280,9 +3283,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -3319,9 +3322,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -3403,9 +3406,9 @@ dependencies = [ [[package]] name = "keccak-asm" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a3633291834c4fbebf8673acbc1b04ec9d151418ff9b8e26dcd79129928758" +checksum = "422fbc7ff2f2f5bdffeb07718e5a5324dca72b0c9293d50df4026652385e3314" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -3506,9 +3509,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown 0.14.5", ] @@ -3563,13 +3566,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3736,11 +3740,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive 0.7.2", + "num_enum_derive 0.7.3", ] [[package]] @@ -3757,9 +3761,9 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -3784,9 +3788,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.1" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -4420,9 +4424,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" @@ -4569,16 +4576,17 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", - "rustls 0.23.11", + "rustc-hash 2.0.0", + "rustls 0.23.12", + "socket2", "thiserror", "tokio", "tracing", @@ -4586,15 +4594,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", "ring 0.17.8", - "rustc-hash", - "rustls 0.23.11", + "rustc-hash 2.0.0", + "rustls 0.23.12", "slab", "thiserror", "tinyvec", @@ -4610,6 +4618,7 @@ dependencies = [ "libc", "once_cell", "socket2", + "tracing", "windows-sys 0.52.0", ] @@ -4724,9 +4733,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -4838,8 +4847,8 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.11", - "rustls-pemfile 2.1.2", + "rustls 0.23.12", + "rustls-pemfile 2.1.3", "rustls-pki-types", "serde", "serde_json", @@ -4999,6 +5008,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -5050,9 +5065,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring 0.17.8", @@ -5085,9 +5100,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -5095,9 +5110,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -5188,9 +5203,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.4" +version = "2.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4465c22496331e20eb047ff46e7366455bc01c0c02015c4a376de0b2cd3a1af" +checksum = "06ff467073ddaff34c3a39e5b454f25dd982484a26fff50254ca793c56a1b714" dependencies = [ "sdd", ] @@ -5234,9 +5249,9 @@ dependencies = [ [[package]] name = "sdd" -version = "1.7.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85f05a494052771fc5bd0619742363b5e24e5ad72ab3111ec2e27925b8edc5f3" +checksum = "177258b64c0faaa9ffd3c65cd3262c2bc7e2588dbbd9c1641d0346145c1bbda8" [[package]] name = "sec1" @@ -5316,9 +5331,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150" dependencies = [ "serde_derive", ] @@ -5344,9 +5359,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.205" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1" dependencies = [ "proc-macro2", "quote", @@ -5355,11 +5370,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -5387,9 +5403,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -5416,7 +5432,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_derive", "serde_json", @@ -5506,9 +5522,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b57fd861253bff08bb1919e995f90ba8f4889de2726091c8876f3a4e823b40" +checksum = "57d79b758b7cb2085612b11a235055e485605a5103faccdd633f35bd7aee69dd" dependencies = [ "cc", "cfg-if", @@ -5603,9 +5619,9 @@ dependencies = [ [[package]] name = "sp1-core" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0fb585eb8a6d9fbec006278e4ba8aa1af9dbae655944a8635eaee0424cafd2" +checksum = "62e81b0fa73362b0b2cffa420999f80f72f7f30d41c2412d207625b5253cdf89" dependencies = [ "anyhow", "arrayref", @@ -5652,6 +5668,7 @@ dependencies = [ "snowbridge-amcl", "sp1-derive", "sp1-primitives", + "static_assertions", "strum", "strum_macros", "tempfile", @@ -5665,9 +5682,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0ac64c524b9f79073622218698103585a46209d343ef1cba6f8dac73e35bb8" +checksum = "ab57c1fb4429a70191bc8b70c57e35ee876a8e4eff4719b4956fd325a48b6bbe" dependencies = [ "proc-macro2", "quote", @@ -5789,9 +5806,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c4a9c8d029e57349b2b124595b2dc7a70d3dd8431d0e63348a2a271a894b8e" +checksum = "839009d6aab5876710e2bc35170d1f328bc70f38992f0037b938623dadfcc61f" dependencies = [ "anyhow", "bincode", @@ -5801,9 +5818,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8d5ca92c185781e3b91d333217f1204a8ab0e9e8327641245c5fb685b168a" +checksum = "2996170e381b301bc3debcb1cbb93614e26b912a87eca511992087be645b7e6b" dependencies = [ "itertools 0.13.0", "lazy_static", @@ -5815,9 +5832,9 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf125b5df27e81706b79de5a4ee3ef587a4a504ab799a1b1b774b537d1a1820" +checksum = "544aeed08f56e7c84442dcd1a4038e31b2918b36c0738f11bc125353640aa5b1" dependencies = [ "anyhow", "bincode", @@ -5832,6 +5849,7 @@ dependencies = [ "p3-challenger", "p3-commit", "p3-field", + "p3-matrix", "rayon", "serde", "serde_json", @@ -5852,9 +5870,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53af2e0dc0c9455896db5c014266391b515fe17f33141acb1ba194585bae4973" +checksum = "b12d638aa351786256c31c5979f10ee6118eeb4df1935cfa67ae2da6b1b3eeb9" dependencies = [ "bincode", "itertools 0.13.0", @@ -5876,9 +5894,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85ad294534013954b975e0516eedd13722406291ddaaa064feee48441920251" +checksum = "818c9ba6b49ef9740665486fcc3871248068bf3cb8045f2a7f3aff3c8ba5dfdb" dependencies = [ "backtrace", "itertools 0.13.0", @@ -5902,9 +5920,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ead6647708c6d931b0069b3823f36e57232dc627dddc21c82775e3e78cdd395" +checksum = "5aa8990611d0afc957f79c3c7f8f16403fed32cc9cac1006284ac443eafa5341" dependencies = [ "arrayref", "backtrace", @@ -5938,9 +5956,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42289ce113de57cb1f2b163688021ce7bdbe2c6cdbc96d5e2b1c85b1108c4199" +checksum = "8e2b271ae555360b5db81bd97f32b023d996064c99dc840b5f7376f231ee30de" dependencies = [ "proc-macro2", "quote", @@ -5949,9 +5967,9 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b9c84925c075eac095deac8f2ab48258be35a662339e386d76ac5b21c60bdc" +checksum = "4e631ce29e7b49b363cb60717f514e652390602423f063bd0ff0c11e8d23a500" dependencies = [ "anyhow", "bincode", @@ -5975,9 +5993,9 @@ dependencies = [ [[package]] name = "sp1-recursion-program" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d460db3d03dd185e4d338c4c6d1b3fd174063f561219f98abc26532eecdc6ad2" +checksum = "3ae721d563ad3faf11f0503b64b349dba5222113a7b49c5c0aebfdcd7bc00a4b" dependencies = [ "itertools 0.13.0", "p3-air", @@ -6005,9 +6023,9 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d491b27caebd3f331dcb3ce1186bb37970a1e78440ecd34fd3ab74b108af23a" +checksum = "b5e3d66fd2b5874bb5b7bce7be8a84c9d496ea5546b3b85a754ac6a9ab9927d5" dependencies = [ "alloy-sol-types", "anyhow", @@ -6049,9 +6067,9 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "1.0.1" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0708c2369deb682e57bfe33bb5a405188d825511b31e22af5722e1ace79c1840" +checksum = "1b0d9d1829e7c86862f00d40106111b63ef38ac73e107c40c8d1e88b8f2328a5" dependencies = [ "bincode", "cfg-if", @@ -6245,14 +6263,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6474,28 +6493,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -6528,7 +6546,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pki-types", "tokio", ] @@ -6553,7 +6571,7 @@ checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" dependencies = [ "futures-util", "log", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -6576,21 +6594,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.16", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -6601,7 +6619,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "toml_datetime", "winnow 0.5.40", ] @@ -6612,22 +6630,22 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.16" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.3.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.15", + "winnow 0.6.18", ] [[package]] @@ -6762,7 +6780,7 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pki-types", "sha1", "thiserror", @@ -6933,9 +6951,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wait-timeout" @@ -7115,11 +7133,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7165,6 +7183,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -7297,9 +7324,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -7358,6 +7385,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] diff --git a/Cargo.toml b/Cargo.toml index 725d78d..652efdf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +16,8 @@ authors = ["srdtrk "] [workspace.dependencies] # Used by the programs -sp1-zkvm = "1.0.1" -sp1-helper = "1.0.1" +sp1-zkvm = "1.1.0" +sp1-helper = "1.1.0" sp1-ics07-tendermint-solidity = { path = "./packages/solidity/" } sp1-ics07-tendermint-update-client = { path = "./programs/update-client/" } @@ -40,7 +40,7 @@ serde_cbor = "0.11.2" serde_json = { version = "1.0", default-features = false, features = ["alloc"] } # Used by the operator -sp1-sdk = "1.0.1" +sp1-sdk = "1.1.0" sp1-ics07-tendermint-utils = { path = "./packages/utils/" } diff --git a/bun.lockb b/bun.lockb index 72bc1d7..e0f6a84 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/contracts/fixtures/memberships_fixture.json b/contracts/fixtures/memberships_fixture.json index 4016216..35ecf69 100644 --- a/contracts/fixtures/memberships_fixture.json +++ b/contracts/fixtures/memberships_fixture.json @@ -1,9 +1,9 @@ { - "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d90000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", - "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066a03c102bab132312afa95add5dec8f90e2fdc48085e7494ca6d39ee9431ff434e22775e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d3", - "updateClientVkey": "0x00d8ae8feed5fd1f82dbf7862b219cd74c516e5d09ee5ec9024b439e95f5a3e2", - "membershipVkey": "0x001ae64fb3c0ac2e5a62e4941b26edf05798f0dc3417ae105e4bd1c443de6188", - "ucAndMembershipVkey": "0x008ddefe335385fdfe8e6eefcebe2f9519cb27e95afd392537657bb4525883f9", - "proofHeight": "00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d90", - "membershipProof": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000007c0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000066a03c102bab132312afa95add5dec8f90e2fdc48085e7494ca6d39ee9431ff434e22775e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d3001ae64fb3c0ac2e5a62e4941b26edf05798f0dc3417ae105e4bd1c443de618800000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000202bab132312afa95add5dec8f90e2fdc48085e7494ca6d39ee9431ff434e2277500000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e74537461746500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000364fedc1fcc07811b854cbebd70a778c6cb49649c3272a078f8f232a29b0470d134d28d670a0abdf1051fbebab954294ee6844dce87e2ca2f22da6e1c4dfd3003f99d843dce1d007ef3e06b43faf857392ee147d57ac29d7a3ea1f8c808becd6bf29e1e69ad1252c82e35bbc3d0e27b1054140a7acdfd5a8767d04e3c6861f34d284304f1980286ce6d2ce4a1845d528e04f096beb4f063665c13bfb5470adc74b2ac346bf31012ef4a3ac183786449b39dc4fae7f7120da7078a100a88eb2c9bf37d6791b21d4a8ca48f4e793863d3b8d3a011683d4cb2dec6febe645139627e4aa32426640dbb2cb851d7da339bbb1bcb0dd0252aaa2c4da8441a283c48b0e7b2e60914a0142a43fcf9ed3408c49540039a0cf50d18d9543029654eb454516873cfb143fa14769b4cc3c6369e561b50c20fdb9f1870aa1f3b15dd0d8e794044bbcfc6a5f50d0533e61f243bcc7b492de91b219cc233f67754b434250516c8390d95e686670391e491acddcc4e611b11ec6b32b8ef8d3efb7f6ee983f8a0ef150e06ac3e1b1350bbcc6f8d3e3b2b83e572fc839449268c54b9523b0b7b7880185206a4ab7806b4e3c795fc00d42b62d73d244c294dc557d1cc54a113c93ac6888133c41411302b2ec6c6dff6a09217d2c5644542d76272e2f942f428b8ec6561e8ae66ed9402af4197a5b794da79e8d6236457d63bf99245f55b885154d4caf4739714b3e12c2f484039ca1af1ba45452512486ae82758c6280cda54510cc8dc327ba8fcbe043caba365df3bf67292fa481c3edb5d686a6af55f610570156ebeb663bd7c420f17104104a8d19898a10152b09391be54d2e3bbfe376fbe889529deee25b7a22fff51d27d0b6dcffad97cb6eb3ff50949b7f61797d3550097db4bc8097a8a8a095267777cd10c708963a3f7ac8f7ba960ae1ba3d6913843e189d9adeba36db1234e5b331d47228818a6ed07086a3a624a1110aaa3c400ec0806030cb14b495921701ed981bab9a6ca62fa45747b8910e13dbd083da9e5540e9d0bb39b21b9121fa8d061ce81d874e7707977878183ac482b4476f7382fa373df22a67556e7bb264090d48814f7fb8480df0a68074aca027d340bc2c852f393cc13ed67a9e9a521ab429a8d1f60e84815d69fa57fd6f490e4b6fd87b149057bc82e119a5ba13b2ce0ff8a5c227464b239351be3626cded845f46d6c78c80d7cbf90376c2a485400000000000000000000000000000000000000000000000000000000" -} + "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000253370000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", + "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066b4386ddd61735333d38ba62f9c8edb7d41b399ce6a0a0ed10d1aeaec708afec8d40472a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb", + "updateClientVkey": "0x00947f9c0e1dafc9f0f6c8a12db07a3684fc71ce93f83c1c68b79892a41a929e", + "membershipVkey": "0x0058653c716864c2c5d965df21d0a9da5368d6894523bae1300938c2e0b195b6", + "ucAndMembershipVkey": "0x00edbd4a801ca684ce39d7a8ecd8ed8fb2891f6d753c1c468dbc14d3e6e7f60e", + "proofHeight": "00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000253370", + "membershipProof": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000007c0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000066b4386ddd61735333d38ba62f9c8edb7d41b399ce6a0a0ed10d1aeaec708afec8d40472a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb0058653c716864c2c5d965df21d0a9da5368d6894523bae1300938c2e0b195b60000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000020dd61735333d38ba62f9c8edb7d41b399ce6a0a0ed10d1aeaec708afec8d4047200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e74537461746500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000364c430ff7f116514b4e8fb097810b1fc3c1f9758cda689d7ffac2e28234cb434c5615de5172cd45aad451e78abcbf7fc2bf8e7c51d2b7d0906d3566dbd901ac22ec5a130f70934bcc4748a3e00768e33a087046bb6ee33b2f1c6e056e98d6b765d5f4a9fe32ead0c8a5ca1405d3329df4af08f2385db225de0a3505a5f6b0330658c5a70b20584b17eb7436c0cd22e9755c2b38f367d6d4c154db1d9d206abd8223a70299802add99cc70571b373b722a2b71b8df0f9a261c746fb0244fefa4098fe6140252afea45f0242cf0b5a1c5c75953a54b81ead427910fc1fa5006e574626a0684d2594df1f68685c2052792ea3f7532b3b310a237ec5c74e101fc1b1c8ec0693ee2720e7c29bddec9b36f6ecc4d48a71ad49f91517ef5381489cbb4ce90473729826e2b217333eb3f2ce8f6cfdc6040075988a2ee3dbd120ec53dd911b9efe37970932f078a01d3b635bec154bf2c630bfe681a8920a5c3bd815c3dbd399538136233882528b933db2f3c14317ea2a94debe9fce306ada10476279c737f110cb2b08b0791adceb4864a2899caaac9cdcae6d173fb648f2a4d45fbb52a51dbcd79719508cfc65b06006e6de51ff7a18794a8932dd9aea32008f69eb9f466e1686850761b0b8d80e96e624e2c6a5ec7432f3a6f15581f8193a9545259819d721688b17f9e2e3446b2c0e000f63d4a4d0ca00d017c5d77fc8d2aeab80027807c928580943d52a1206214193b442a5b4665833263bf6fec72c2630efd904409913aab523f7904d584fdb3b9ba22c042fb3a4d739ed70b8077597a6481f054743e0b5202f9ce895e08487dbd510cb9647766a85a2b019fc594afe45db29eeb1220628f817523a639818bf92185ddf77be9a771d72a91d3c2a0683488fcb9142e0f4c8f60e67ff7de421763576bea46f20cea601b9f9f2ecc620f5d507bea378df39153c256458756ec97e90ab99c8409a0053029df7846f527df083401bc0a15d25a46f2d361d35455d339f680c34bcd962e4984fb85a88d4c470897935ea14a4948978125a931695e439574dba9707b75224396d5806bfa8bb320281f5b3593485a32001f40bb89a64a66b8d4b3e71b4eaf1010cdc2f64599e1b2718e2ab3c6782f02b2d9f296728e54ba5e2a131a36063e51d478396273ada7041dc33d0cf01fa82220b8c7634761313a7363ce21eeadce8e9951d639d3f08aa765988efb4a998fa7b00000000000000000000000000000000000000000000000000000000" +} \ No newline at end of file diff --git a/contracts/fixtures/uc_and_memberships_fixture.json b/contracts/fixtures/uc_and_memberships_fixture.json index 2c445cf..25df4d6 100644 --- a/contracts/fixtures/uc_and_memberships_fixture.json +++ b/contracts/fixtures/uc_and_memberships_fixture.json @@ -1,9 +1,9 @@ { - "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d90000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", - "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066a03c102bab132312afa95add5dec8f90e2fdc48085e7494ca6d39ee9431ff434e22775e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d3", - "updateClientVkey": "0x00d8ae8feed5fd1f82dbf7862b219cd74c516e5d09ee5ec9024b439e95f5a3e2", - "membershipVkey": "0x001ae64fb3c0ac2e5a62e4941b26edf05798f0dc3417ae105e4bd1c443de6188", - "ucAndMembershipVkey": "0x008ddefe335385fdfe8e6eefcebe2f9519cb27e95afd392537657bb4525883f9", - "proofHeight": "00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d9a", - "membershipProof": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000009a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020008ddefe335385fdfe8e6eefcebe2f9519cb27e95afd392537657bb4525883f9000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000005400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000066a03c102bab132312afa95add5dec8f90e2fdc48085e7494ca6d39ee9431ff434e22775e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d30000000000000000000000000000000000000000000000000000000066a03c8ace271cd333ff2f0cd166fe30bcd67431aca0d94c5c8ed0079a30761311bbd3a2e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d3000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d9000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d9a00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066a78ab500000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e74537461746500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000364fedc1fcc1a4b3d8e0dbccc49b477072c7c8158316eec15529b381baf333c53e5708df89e003118c1c0ebae3bdb4947749018628f6a3388bfbb2cad59c85b4fca020e264617abb3cff089ad1f0b5e881f7c6ff19672022bbcac1de7c7a784fdde3d5f759327abb7e89154625253e5b308d2addfb2abb95cb243dec4780abba2dbcac07e7a2f682f08bd5ee3cfcf7ca249f7f748fbd6e31e31163e1b44145a8b7f887ce5cb110f09c6e8dd82e6c28eda8c64afd08ac944a9fd30e27b2127cd3f0e3995bce43010c09319ae02deaa82ed45fb6bbbd03b382a73bafecd436113890c8c2268420d15e1c05b3ee05be5d24fb891bf9129f49177c5a38eacfa9c3770fd3035d8d510592dea5229c68510ac0ef595f9c24eac274671732c490a87a05b3a28fccc6322954f3a48d7ebf11a859d2d8e67a6f5f66e4c5e19e903170299adffa820d5e222e035f2f7273355bc341ab14d3c63f310b70cba5030e098cd494117072c93bc08ee53615704fd42c025cb3a34ca545a577b2679387e54066d5f1ffba41d576c223baac0f4f43a0d8cf45af70a30b50ede8f951ac662077ff73936d940d1ad50232b5b2de6f7523aad2203e9eedc5c0cf207c74481fda2ebd7c2e1c3eabef36f1bd12598235ace606b15da53f94c24c40b51baaf3767b7dbe8e7fb583e4e33da1543c8185ebdc566229eb8d30f403c47ce81e98ee7e4ab2b7964cfb6a60d4d4d1cce047ca11c49e5b8cb40577a14d91c7fe838bd35a2e8fa6f8cd84020e5037d123afd9557937529665cf75c47b3f7d56f9227df29be8f332ed1c37ef387a72b22c6df0b6f827f3783d9b5e541858db82150910c8a690146c320234bebc304f9020bef12fc2e4c2b06f6a21965e2fb50aef3794e6e4c6b298e195d71f7c2498914de80e87d7f411987011cc07f00061d9b40f82878506705506c7968f00efe811e7b16a1a34cdae472c9d84665f4b57bb025d848eebdd1aec859f86fa70a12c116807e938312c91f93456783b45b282b6a7f7b00cd1b78561dd8fbd9fd25a8981e750869e6731010ac042b925258d00899648795241e6831a1d01a3dde70a97d03e3052d67e437c1e3ad2fbbc8b3b040a9ae25a6ecacaccde41ea29bf3da1d2c2c4382aaff91ea37e2b9138833cd1c23a5790581079295c3636706dc4614c19e1b26ca404e9dfca7cd48ddd8026f66eae7429846a8209cea42bfea7ce0a1375000000000000000000000000000000000000000000000000000000000" + "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000253370000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", + "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066b4386ddd61735333d38ba62f9c8edb7d41b399ce6a0a0ed10d1aeaec708afec8d40472a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb", + "updateClientVkey": "0x00947f9c0e1dafc9f0f6c8a12db07a3684fc71ce93f83c1c68b79892a41a929e", + "membershipVkey": "0x0058653c716864c2c5d965df21d0a9da5368d6894523bae1300938c2e0b195b6", + "ucAndMembershipVkey": "0x00edbd4a801ca684ce39d7a8ecd8ed8fb2891f6d753c1c468dbc14d3e6e7f60e", + "proofHeight": "0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000025337a", + "membershipProof": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000009a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000edbd4a801ca684ce39d7a8ecd8ed8fb2891f6d753c1c468dbc14d3e6e7f60e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000005400000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000066b4386ddd61735333d38ba62f9c8edb7d41b399ce6a0a0ed10d1aeaec708afec8d40472a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb0000000000000000000000000000000000000000000000000000000066b438e572e20e3f7c806f0b63f0ad2b0b4bc471e73911b1be2b9436ec1dfdc7aa322365a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002533700000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000025337a00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066b4540200000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e74537461746500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000364c430ff7f16486832f519355f1b78c42649cc68f8af839a34a027f805c601ee8aa590c1552002ab1bbb9443119996d172c06225bde016fe4c9b4ed2371f443c95330d50922c23d77bb8139c471efe565203e711a3a9aaa976f428c9aed1b9db914d1a79220bfab49c629297ef4d70e171e6fb41bb273d8a54b550ca26fa42b2086c60df4c18d14c5ce3696fc29469661512c59ee0a9a6d164316277b8bcd14e05e9897bab25e5e1bb67beb2cb407c943d3c3995bc9278a7c6fd0b5700307f30f419922e82067a2e03937e495bfb0ed27b85545bb61ca2887cb0e75845dafda530bf9b4ca0160ef587650c99f744dc6ab953dd447ac0148165c10b8061a702f29c78ba08c80d30ad82fe668e7e2136854910f23b9329c5ef4afa0d90a636c4a586ecb96d43094282ba95a1da1de874f5c9d7241f85032f35ad8afe5a183343179a4062fa0305a0cb6f8df2c99f525be1cffafbd549d0996283676c73d6d6c0f8f9532da359257b1abd5273d193a2674a4e98766aeeb397dab3d33edfc6679669daca04d9b51ec9357de02eee7586461205b741543c7bc05e425924cc9c99db5636aae3ceb0004f8a0fce20bec3649e57dc707caa5c3abfa45e634bcb4766a72b2be6c8ce1b1df4ed2b63b4ff79ddcd8c501a316792189c79060d0aeb8a60aefe922186a2472c7e2eff6e45d39c0aae0c2bb030c4291417f9c5dba2077374fe7e32664f27951eb2f6810a65ab66016ee9496e6adebe1e269dc949a61f5563fdc0ca144510bb13fc5a4b42666d19d758e3bcdbb44426c841600512bedd6dfafcbc28bcfc04be2a0d85e7051997d86f422d6f4f98d7c8f07f4aab6efdae0f8a54e2479b8418c803ddeda031d36b3b89af65168b0ed5898e746ebca4265029cb317320fa02441f0e63f24e8fe4ab970eaadb21e031ceb06de732cbe134378cce0e0293bc0a36ce14b81b97ac86d98152980e1b063458757b6f89ec3f0a38413942388bc98a25d81c64ec03bf9477eb3a82a712747389e7a35feb255912cac6e3b094c67883ce58028a93080f9ea400c544021f6b35b0c54440230a400670e8860b9d7b43ca573022be46174c69756f5fed94ad57b9f1282bb3ff4ef752e981688ad5ae9ebdded01c26da545c82a55661e43501f3c6f0885a3da1e08b4a9b7ee5b946e14a0eb0832a894acb93671f8ed5ccaf62682f4279ce0eff75f1831e154616e632758a29de00000000000000000000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/contracts/fixtures/update_client_fixture.json b/contracts/fixtures/update_client_fixture.json index 1a9e034..c892fc1 100644 --- a/contracts/fixtures/update_client_fixture.json +++ b/contracts/fixtures/update_client_fixture.json @@ -1,10 +1,10 @@ { - "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d90000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", - "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066a03c102bab132312afa95add5dec8f90e2fdc48085e7494ca6d39ee9431ff434e22775e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d3", - "updateClientVkey": "0x00d8ae8feed5fd1f82dbf7862b219cd74c516e5d09ee5ec9024b439e95f5a3e2", - "membershipVkey": "0x001ae64fb3c0ac2e5a62e4941b26edf05798f0dc3417ae105e4bd1c443de6188", - "ucAndMembershipVkey": "0x008ddefe335385fdfe8e6eefcebe2f9519cb27e95afd392537657bb4525883f9", - "targetConsensusState": "0000000000000000000000000000000000000000000000000000000066a03c8ace271cd333ff2f0cd166fe30bcd67431aca0d94c5c8ed0079a30761311bbd3a2e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d3", - "targetHeight": 2330010, - "updateMsg": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000d8ae8feed5fd1f82dbf7862b219cd74c516e5d09ee5ec9024b439e95f5a3e2000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000066a03c102bab132312afa95add5dec8f90e2fdc48085e7494ca6d39ee9431ff434e22775e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d30000000000000000000000000000000000000000000000000000000066a03c8ace271cd333ff2f0cd166fe30bcd67431aca0d94c5c8ed0079a30761311bbd3a2e0373a8b805881ecdbb47fce30b66956aa13e9a573107ba9ac495b9cef3365d3000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d9000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000238d9a00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066a7791a00000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000364fedc1fcc21d4cb89fedbd13cf9acd5731f20c369f38718bdf8b94180c1adabe6378dfc7a27e2e9173d73b69982cf970f53b7b62f79ed4803dbb0a5f6869f266b327771ea1040398aba67924a2d59d9815032337af9fa1dc5f61005711c47981d474e9a57222f80f1c524aec826bd7bf6cb9a497ac72b24b05d788d61b0ed60903431bc011df07d8bbfb5d7265a421b32ac8955b37f1b311634898275b1ac0a19157b38cf0790e285feb4b1dc6aedd83e91a1210b52cb807b250730af2e077e84fa8a520924ae52b1b63b9527ea839fb62064243efc3969ba5910aa55aeae4c20b68fc68b00d2bcb435d7b86eab0ff604bbab690e60e73242ae3ee469db8cecbcb2133b5f22fc1e3b9b750cf0f7ed71d320f77d88b40d614bedc80a1ae14798061fa46b9f02f8bb9f87d69ac6ff1eba0a2ca8e759db8933abeba5859e820a4181e6e4f31a1492f750537950ed0c0c74649f1f4f868ab12e27d599f61bfbff79e713f6eae6286199280e99b98cfdbc05405d604edd916594ed8cdd4caf21fe69d209be1b260a6a346d505db38ea6e5d8bc4e70eb67e1858a3b3d5253b1b6ca12fa740540ca0f75667111ce6f736e1439ecb8e87a7c6112f83a5a99db68a29b67a2a09c463729099c79ca85d0f4c9fdfc8c5140d3f4efe9c4e3dc4a3defca6d7d39ec0074a42a04aaf4901cdc995c61fae737faabd9a9f85beb7144af46a212bd2949fe9b8d1669dda969058aa06b06784ac20da6ae828dfa6eaa62ed82b9216afb3f116a9f289a8d1a6eee991d612278fe280867669552a6c8c1263b08d137ed704df2e6b221180dd18758f8afe62aa7e4c363f6e8437095b71e0f7e0912f29b842979a54e19b3139696a8325418d27b0ed48b0a6022e5cfaec4d9a115477fa2f883de9d120514b8b22a1d60bb46ba8ca82743da563ada8f86358dbf325771f4540d4c2bab2b3072a1eedeba01be74e9133bc5ad64d473c1b241a4deba79f08e1a85f804db08130bcc930e0908ed1405aefaf41d8cc43d57a0d5a98b91003e8af394f51e2803f5ca2b2f7966907d710fa27f22d3ded83b7fa707267c5519e8a60b4ff8db5e20206ffc5e270b4e9f7a52d034fe632455426c48570e2a8bbf31fe897edb99d723e2368051b80b32829be5582e3346b8258779b66152e5a33ff73fda80108c0300f971037c828d59736b2b3372a9d9d1479896eb349c532499f8bc60d1100d2000000000000000000000000000000000000000000000000000000000" + "trustedClientState": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000253370000000000000000000000000000000000000000000000000000000000012750000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", + "trustedConsensusState": "0000000000000000000000000000000000000000000000000000000066b4386ddd61735333d38ba62f9c8edb7d41b399ce6a0a0ed10d1aeaec708afec8d40472a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb", + "updateClientVkey": "0x00947f9c0e1dafc9f0f6c8a12db07a3684fc71ce93f83c1c68b79892a41a929e", + "membershipVkey": "0x0058653c716864c2c5d965df21d0a9da5368d6894523bae1300938c2e0b195b6", + "ucAndMembershipVkey": "0x00edbd4a801ca684ce39d7a8ecd8ed8fb2891f6d753c1c468dbc14d3e6e7f60e", + "targetConsensusState": "0000000000000000000000000000000000000000000000000000000066b438e572e20e3f7c806f0b63f0ad2b0b4bc471e73911b1be2b9436ec1dfdc7aa322365a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb", + "targetHeight": 2438010, + "updateMsg": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002000947f9c0e1dafc9f0f6c8a12db07a3684fc71ce93f83c1c68b79892a41a929e000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000066b4386ddd61735333d38ba62f9c8edb7d41b399ce6a0a0ed10d1aeaec708afec8d40472a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb0000000000000000000000000000000000000000000000000000000066b438e572e20e3f7c806f0b63f0ad2b0b4bc471e73911b1be2b9436ec1dfdc7aa322365a1d4cdbc90487e9cf127cf745c0ce4e8f72e4babc77eb53db3729b8d848125cb0000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002533700000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000025337a00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001275000000000000000000000000000000000000000000000000000000000066b4526b00000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000364c430ff7f04000424b6082f1cfae2675cbda470f025f97da67e67bfe139f0eb6c627ca7c30ac8fe93efec913d5514a77e69e1318fc58f9380f5964e2aab74b5669ffbc1051de5aaba97e3a545d2ba985fbc9b206e7ff727b301a5935d4eac0e3e40ba6aa22b95d39ec0162f3b94c9d2ae524066916905895f4d9353472419b9e4b59d9ff3062ed7f36d573202636b5c7ecc4345e6d0b86f5dfd09cec5d0286b8c3cffd18b167a58ad238da31e07996f98bdca177094209ceeb2ddc39e06c853954f85742b0fad51544dd34e1e880458af7955f73fbf487d1a03e6c54f6648e887c153381f0357537c82a43e596ec933e09f7fa77bfbe15e54077911ca3fe739a5f1a648d720819c84a5c5779e17d4a7325580b7226e4943d0c6fdce7bfa72c5bbe8b65837132d30ae930f62804fc10fe898bab45fbe9a8113d6f86b6820931dad076318f92f8800a496f405a2f52a7bcfb2ece8d9fbaa8e9d64acd440d998333362f82a8f012ccc6978ca992caa557fcda5f97859136ad77f30ff856a9c36f99e4c7e906917ca80b273e93588fa28f60e05722c02a9e28ef024f72b1b000211bb802d93240faf5f6c987795271db72367e843c1392b063a680007bdfddacb2ffceef056c12995fc0cefc8813dd41b26ccfac4a68b4746c4da8fa272760783ada081720e9220aba3b4e01a6a6797cc0e063343ffbfd0633fe9ce2e35963cd87ffaeed2bc300c7f51f6e98f195a83659fdc6fe321eca296c81f24599b52c0b69311bc736aa0217df4bf4c7e82c22af9b8b13800187a559e304c178414b9116982ed1d8bb9c0253c64651d6e4f99d4fe43f04dc3938b3bfb43584f4bddc7a04555adf9429c7d1ecee61cf43f57d214681944a3b779ba5f04fecd6245469284b000ff7b3a604910288b31b536fa74e91b0e83945287dd0472d407607a8aa2446ca5b33e51632c0811991ddb45572fc81ba550bbc719adf6f718e6bff9992d23bc09cded1c3dee2f63973193e44d893bd50e237b1cfe9cdd94dd14980e4d1302d280429494be091a98aaef1d5006a1ecb5469a41ff6d92e391938f472a6a82c813c6a675afded60f6016c31fc9466d4d6dc033e532b9e7503ed9009b613a63421740226b9efa9e2f79d22afa146d525fd96a552be96e4ab297bb4609d4b6cc9a61608088da890b2af32b7cd66283e5dd18ebf234807fbce301fd17e4d154b35bcca5809779b79f00000000000000000000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/contracts/script/SP1ICS07Tendermint.s.sol b/contracts/script/SP1ICS07Tendermint.s.sol index 449891d..9a199d1 100644 --- a/contracts/script/SP1ICS07Tendermint.s.sol +++ b/contracts/script/SP1ICS07Tendermint.s.sol @@ -4,7 +4,7 @@ pragma solidity >=0.8.25; import { Script } from "forge-std/Script.sol"; import { stdJson } from "forge-std/StdJson.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; -import { SP1Verifier } from "@sp1-contracts/v1.0.1/SP1Verifier.sol"; +import { SP1Verifier } from "@sp1-contracts/v1.1.0/SP1Verifier.sol"; import { IICS07TendermintMsgs } from "../src/msgs/IICS07TendermintMsgs.sol"; struct SP1ICS07TendermintGenesisJson { diff --git a/contracts/test/SP1ICS07TendermintTest.sol b/contracts/test/SP1ICS07TendermintTest.sol index b0708d9..a01bdac 100644 --- a/contracts/test/SP1ICS07TendermintTest.sol +++ b/contracts/test/SP1ICS07TendermintTest.sol @@ -10,7 +10,7 @@ import { IUpdateClientMsgs } from "../src/msgs/IUpdateClientMsgs.sol"; import { IMembershipMsgs } from "../src/msgs/IMembershipMsgs.sol"; import { IUpdateClientAndMembershipMsgs } from "../src/msgs/IUcAndMembershipMsgs.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; -import { SP1Verifier } from "@sp1-contracts/v1.0.1/SP1Verifier.sol"; +import { SP1Verifier } from "@sp1-contracts/v1.1.0/SP1Verifier.sol"; import { SP1MockVerifier } from "@sp1-contracts/SP1MockVerifier.sol"; import { ILightClientMsgs } from "solidity-ibc/msgs/ILightClientMsgs.sol"; diff --git a/justfile b/justfile index f19f476..3c69455 100644 --- a/justfile +++ b/justfile @@ -49,15 +49,13 @@ genesis: # If prover is set to network, this command requires the `SP1_PRIVATE_KEY` environment variable to be set. fixtures prover: @echo "Generating fixtures for the Celestia Mocha testnet" - @echo "Building the program..." - just build-programs @echo "Building the operator..." just build-operator @echo "Generating fixtures... This may take a while (up to 20 minutes)" parallel --progress --shebang --ungroup -j 4 ::: \ - "RUST_LOG=info SP1_PROVER={{prover}} TENDERMINT_RPC_URL='https://rpc.celestia-mocha.com/' ./target/release/operator fixtures update-client --trusted-block 2330000 --target-block 2330010 -o 'contracts/fixtures/update_client_fixture.json'" \ - "sleep 15 && RUST_LOG=info SP1_PROVER={{prover}} TENDERMINT_RPC_URL='https://rpc.celestia-mocha.com/' ./target/release/operator fixtures update-client-and-membership --key-paths clients/07-tendermint-0/clientState,clients/07-tendermint-001/clientState --trusted-block 2330000 --target-block 2330010 -o 'contracts/fixtures/uc_and_memberships_fixture.json'" \ - "sleep 30 && RUST_LOG=info SP1_PROVER={{prover}} TENDERMINT_RPC_URL='https://rpc.celestia-mocha.com/' ./target/release/operator fixtures membership --key-paths clients/07-tendermint-0/clientState,clients/07-tendermint-001/clientState --trusted-block 2330000 -o 'contracts/fixtures/memberships_fixture.json'" + "RUST_LOG=info SP1_PROVER={{prover}} TENDERMINT_RPC_URL='https://rpc.celestia-mocha.com/' ./target/release/operator fixtures update-client --trusted-block 2438000 --target-block 2438010 -o 'contracts/fixtures/update_client_fixture.json'" \ + "sleep 15 && RUST_LOG=info SP1_PROVER={{prover}} TENDERMINT_RPC_URL='https://rpc.celestia-mocha.com/' ./target/release/operator fixtures update-client-and-membership --key-paths clients/07-tendermint-0/clientState,clients/07-tendermint-001/clientState --trusted-block 2438000 --target-block 2438010 -o 'contracts/fixtures/uc_and_memberships_fixture.json'" \ + "sleep 30 && RUST_LOG=info SP1_PROVER={{prover}} TENDERMINT_RPC_URL='https://rpc.celestia-mocha.com/' ./target/release/operator fixtures membership --key-paths clients/07-tendermint-0/clientState,clients/07-tendermint-001/clientState --trusted-block 2438000 -o 'contracts/fixtures/memberships_fixture.json'" @echo "Fixtures generated at 'contracts/fixtures'" # Generate the `SP1ICS07Tendermint.json` file containing the ABI of the SP1ICS07Tendermint contract diff --git a/package.json b/package.json index fa42a63..a9c68b4 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dependencies": { "@openzeppelin/contracts": "^5.0.1", "forge-std": "github:foundry-rs/forge-std#v1.9.1", - "sp1-contracts": "github:succinctlabs/sp1-contracts#v1.0.1", + "sp1-contracts": "github:succinctlabs/sp1-contracts#v1.1.0", "solidity-ibc": "github.com:srdtrk/solidity-ibc-eureka#afdaf02d5af2799b61da7524b7abe53581aab1c9" }, "devDependencies": {