diff --git a/Cargo.lock b/Cargo.lock index 151b51a..7ad2c8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -172,7 +172,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow 0.6.13", + "winnow 0.6.15", ] [[package]] @@ -361,7 +361,7 @@ checksum = "d83524c1f6162fcb5b0decf775498a125066c86dda6066ed609531b0e912f85a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -499,7 +499,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -516,7 +516,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", "syn-solidity", "tiny-keccak", ] @@ -534,7 +534,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.71", + "syn 2.0.72", "syn-solidity", ] @@ -545,7 +545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" dependencies = [ "serde", - "winnow 0.6.13", + "winnow 0.6.15", ] [[package]] @@ -837,9 +837,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -866,7 +866,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -877,7 +877,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -905,7 +905,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -916,9 +916,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", "axum-core", @@ -940,7 +940,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 0.1.2", "tokio", "tower", "tower-layer", @@ -1055,7 +1055,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.71", + "syn 2.0.72", "which", ] @@ -1197,6 +1197,12 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" + [[package]] name = "byteorder" version = "1.5.0" @@ -1260,9 +1266,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", @@ -1348,7 +1354,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -1357,6 +1363,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + [[package]] name = "coins-bip32" version = "0.8.7" @@ -1580,7 +1592,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -1616,7 +1628,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -1627,7 +1639,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -1690,7 +1702,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -1743,7 +1755,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -1834,10 +1846,15 @@ dependencies = [ "rand_core", "sec1", "subtle", - "tap", "zeroize", ] +[[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + [[package]] name = "encode_unicode" version = "0.3.6" @@ -2019,7 +2036,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.71", + "syn 2.0.72", "toml", "walkdir", ] @@ -2037,7 +2054,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -2063,7 +2080,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.71", + "syn 2.0.72", "tempfile", "thiserror", "tiny-keccak", @@ -2348,7 +2365,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -2587,6 +2604,7 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", + "serde", ] [[package]] @@ -3241,9 +3259,9 @@ dependencies = [ [[package]] name = "interprocess" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67bafc2f5dbdad79a6d925649758d5472647b416028099f0b829d1b67fdd47d3" +checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13" dependencies = [ "doctest-file", "futures-core", @@ -3428,9 +3446,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", "windows-targets 0.52.6", @@ -3587,6 +3605,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3737,7 +3764,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -3770,6 +3797,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "oneshot" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" + [[package]] name = "opaque-debug" version = "0.3.1" @@ -3803,9 +3836,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -3824,7 +3857,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -3835,9 +3868,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -3859,8 +3892,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p3-air" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e909ef66fa5d77ff0fd3cb5af4b33b27fa6fb68d02b9b1e70edbc29383e565" dependencies = [ "p3-field", "p3-matrix", @@ -3868,8 +3902,9 @@ dependencies = [ [[package]] name = "p3-baby-bear" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46965470aac1cddfe52f535424b59d52f2fffef0fdeb9dbed19da39b1d8f048a" dependencies = [ "num-bigint 0.4.6", "p3-field", @@ -3882,8 +3917,9 @@ dependencies = [ [[package]] name = "p3-blake3" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36ef32d6ea21dd5cf9fec8a31bf0c64e6ceee8901dbf50966b83a443093c2aba" dependencies = [ "blake3", "p3-symmetric", @@ -3891,8 +3927,9 @@ dependencies = [ [[package]] name = "p3-bn254-fr" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3edfca6be3b3109adf8e3330baec30c3fc5f9f4d63d27aaec1b471ca51ed67" dependencies = [ "ff 0.13.0", "num-bigint 0.4.6", @@ -3905,8 +3942,9 @@ dependencies = [ [[package]] name = "p3-challenger" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6662ea899a5d848b60c699944491d72757873b5e1fd46798e4712f90a03a4e9" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -3917,8 +3955,9 @@ dependencies = [ [[package]] name = "p3-commit" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3563918b5cc44ef5280bf9b51753e70dc78802de25e3fb81ed6c94617ccb6e" dependencies = [ "itertools 0.12.1", "p3-challenger", @@ -3930,8 +3969,9 @@ dependencies = [ [[package]] name = "p3-dft" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510095701819d83c9509fe825bbf1ebfe50426ae75149df5fe1dcfd18261323a" dependencies = [ "p3-field", "p3-matrix", @@ -3942,8 +3982,9 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f1977a0a65789f719aa824119c332c4676b000bdbfe94d312fb6244a70d601" dependencies = [ "itertools 0.12.1", "num-bigint 0.4.6", @@ -3955,8 +3996,9 @@ dependencies = [ [[package]] name = "p3-fri" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c22ddb958f200d9289cc73ff68847b0167ca0c14557b791dd9e318f98c2d1b28" dependencies = [ "itertools 0.12.1", "p3-challenger", @@ -3973,8 +4015,9 @@ dependencies = [ [[package]] name = "p3-interpolation" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d032cda212f6b408d7d5b0b9a8270a9455acb93742fe55a0880d82be8e90e500" dependencies = [ "p3-field", "p3-matrix", @@ -3983,8 +4026,9 @@ dependencies = [ [[package]] name = "p3-keccak" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c56abdd5a8a780049d2f8e92cea1df57b55a2ef50a40d1103f2732f7a00e4b1" dependencies = [ "p3-symmetric", "tiny-keccak", @@ -3992,8 +4036,9 @@ dependencies = [ [[package]] name = "p3-keccak-air" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8398f1694ccc38513df0b8cab5f9ef7325423f27cd9e4fa20bdc77d5079cf1b" dependencies = [ "p3-air", "p3-field", @@ -4001,12 +4046,15 @@ dependencies = [ "p3-maybe-rayon", "p3-util", "tracing", + "tracing-forest", + "tracing-subscriber", ] [[package]] name = "p3-matrix" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d548ee0b834f8e2ebc5037073acd101a3b0ca41a2d1d28a15ba0ccd9059495b0" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4019,16 +4067,18 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f5575d3d61bedb3e05681abb0f36b8bb339d65aa395d50756bfa64e9cd3f46" dependencies = [ "rayon", ] [[package]] name = "p3-mds" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6e57ed310d59245f93e24ee805ea7aa16fc9c505551b76a15f5e50f29d177e" dependencies = [ "itertools 0.12.1", "p3-dft", @@ -4041,8 +4091,9 @@ dependencies = [ [[package]] name = "p3-merkle-tree" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af46b41cba75d483ec8a553cbab1d2d794935ae3403d75394acfa4fb2c977cce" dependencies = [ "itertools 0.12.1", "p3-commit", @@ -4057,8 +4108,9 @@ dependencies = [ [[package]] name = "p3-poseidon2" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adaba6f14c197203530e233badce0ca1126ba3bf3c9ff766505b497bdad0bee1" dependencies = [ "gcd", "p3-field", @@ -4069,8 +4121,9 @@ dependencies = [ [[package]] name = "p3-symmetric" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ecc4282566eb14f48be7707f6745c4dff6be664984d59ec0fb1849cd82b5c2" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4079,8 +4132,9 @@ dependencies = [ [[package]] name = "p3-uni-stark" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1af5c038b22b058bf1d49fb1ea3dd6c240a3e46c3278fde5c444e0034f7ffe37" dependencies = [ "itertools 0.12.1", "p3-air", @@ -4091,14 +4145,18 @@ dependencies = [ "p3-matrix", "p3-maybe-rayon", "p3-util", + "postcard", "serde", "tracing", + "tracing-forest", + "tracing-subscriber", ] [[package]] name = "p3-util" -version = "0.1.0" -source = "git+https://github.com/Plonky3/Plonky3.git?rev=3b5265f9d5af36534a46caebf0617595cfb42c5a#3b5265f9d5af36534a46caebf0617595cfb42c5a" +version = "0.1.3-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79f3fef0e00d9d7246385e758c4cd39b4efcbbcea31752471491ab502631385e" dependencies = [ "serde", ] @@ -4218,9 +4276,9 @@ dependencies = [ [[package]] name = "peg" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a625d12ad770914cbf7eff6f9314c3ef803bfe364a1b20bc36ddf56673e71e5" +checksum = "295283b02df346d1ef66052a757869b2876ac29a6bb0ac3f5f7cd44aebe40e8f" dependencies = [ "peg-macros", "peg-runtime", @@ -4228,9 +4286,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f241d42067ed3ab6a4fece1db720838e1418f36d868585a27931f95d6bc03582" +checksum = "bdad6a1d9cf116a059582ce415d5f5566aabcd4008646779dab7fdc2a9a9d426" dependencies = [ "peg-runtime", "proc-macro2", @@ -4306,7 +4364,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -4339,9 +4397,20 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "postcard" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +dependencies = [ + "cobs", + "embedded-io", + "serde", +] [[package]] name = "powerfmt" @@ -4362,7 +4431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -4471,7 +4540,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -4483,6 +4552,15 @@ dependencies = [ "prost", ] +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -4525,14 +4603,13 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", "socket2", - "tracing", "windows-sys 0.52.0", ] @@ -4870,9 +4947,10 @@ dependencies = [ ] [[package]] -name = "rrs-lib" +name = "rrs-succinct" version = "0.1.0" -source = "git+https://github.com/GregAC/rrs.git#b23afc16b4e6a1fb5c4a73eb1e337e9400816507" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3372685893a9f67d18e98e792d690017287fd17379a83d798d958e517d380fa9" dependencies = [ "downcast-rs", "num_enum 0.5.11", @@ -4979,7 +5057,7 @@ dependencies = [ "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.5", + "rustls-webpki 0.102.6", "subtle", "zeroize", ] @@ -5033,9 +5111,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -5156,9 +5234,9 @@ dependencies = [ [[package]] name = "sdd" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb0dde0ccd15e337a3cf738a9a38115c6d8e74795d074e73973dad3d229a897" +checksum = "85f05a494052771fc5bd0619742363b5e24e5ad72ab3111ec2e27925b8edc5f3" [[package]] name = "sec1" @@ -5272,7 +5350,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -5304,7 +5382,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -5355,7 +5433,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -5380,7 +5458,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -5525,20 +5603,23 @@ dependencies = [ [[package]] name = "sp1-core" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0fb585eb8a6d9fbec006278e4ba8aa1af9dbae655944a8635eaee0424cafd2" dependencies = [ "anyhow", "arrayref", "bincode", "blake3", + "bytemuck", "cfg-if", "curve25519-dalek", "elf", "elliptic-curve", "generic-array 1.1.0", + "hashbrown 0.14.5", "hex", - "itertools 0.12.1", + "itertools 0.13.0", "k256", "log", "nohash-hasher", @@ -5562,8 +5643,9 @@ dependencies = [ "p3-symmetric", "p3-uni-stark", "p3-util", + "rand", "rayon-scan", - "rrs-lib", + "rrs-succinct", "serde", "serde_with", "size", @@ -5583,8 +5665,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e0ac64c524b9f79073622218698103585a46209d343ef1cba6f8dac73e35bb8" dependencies = [ "proc-macro2", "quote", @@ -5704,28 +5787,24 @@ dependencies = [ ] [[package]] -name = "sp1-precompiles" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +name = "sp1-lib" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c4a9c8d029e57349b2b124595b2dc7a70d3dd8431d0e63348a2a271a894b8e" dependencies = [ "anyhow", "bincode", "cfg-if", - "getrandom", - "hex", - "k256", - "num", - "rand", "serde", - "snowbridge-amcl", ] [[package]] name = "sp1-primitives" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8d5ca92c185781e3b91d333217f1204a8ab0e9e8327641245c5fb685b168a" dependencies = [ - "itertools 0.12.1", + "itertools 0.13.0", "lazy_static", "p3-baby-bear", "p3-field", @@ -5735,31 +5814,27 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf125b5df27e81706b79de5a4ee3ef587a4a504ab799a1b1b774b537d1a1820" dependencies = [ "anyhow", - "backtrace", "bincode", "clap", "dirs", - "futures", "hex", - "indicatif", - "itertools 0.12.1", + "itertools 0.13.0", "num-bigint 0.4.6", + "oneshot", "p3-baby-bear", "p3-bn254-fr", "p3-challenger", "p3-commit", "p3-field", "rayon", - "reqwest 0.12.5", "serde", "serde_json", "serial_test", - "sha2 0.10.8", - "size", "sp1-core", "sp1-primitives", "sp1-recursion-circuit", @@ -5770,18 +5845,18 @@ dependencies = [ "subtle-encoding", "tempfile", "thiserror", - "tokio", "tracing", "tracing-subscriber", ] [[package]] name = "sp1-recursion-circuit" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53af2e0dc0c9455896db5c014266391b515fe17f33141acb1ba194585bae4973" dependencies = [ "bincode", - "itertools 0.12.1", + "itertools 0.13.0", "p3-air", "p3-baby-bear", "p3-bn254-fr", @@ -5800,11 +5875,12 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a85ad294534013954b975e0516eedd13722406291ddaaa064feee48441920251" dependencies = [ "backtrace", - "itertools 0.12.1", + "itertools 0.13.0", "p3-air", "p3-baby-bear", "p3-bn254-fr", @@ -5817,6 +5893,7 @@ dependencies = [ "p3-util", "serde", "sp1-core", + "sp1-primitives", "sp1-recursion-core", "sp1-recursion-derive", "tracing", @@ -5824,14 +5901,16 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ead6647708c6d931b0069b3823f36e57232dc627dddc21c82775e3e78cdd395" dependencies = [ "arrayref", "backtrace", "ff 0.13.0", "hashbrown 0.14.5", - "itertools 0.12.1", + "itertools 0.13.0", + "num_cpus", "p3-air", "p3-baby-bear", "p3-bn254-fr", @@ -5845,6 +5924,7 @@ dependencies = [ "p3-merkle-tree", "p3-poseidon2", "p3-symmetric", + "p3-util", "serde", "serde_with", "sp1-core", @@ -5857,8 +5937,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42289ce113de57cb1f2b163688021ce7bdbe2c6cdbc96d5e2b1c85b1108c4199" dependencies = [ "proc-macro2", "quote", @@ -5867,29 +5948,37 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76b9c84925c075eac095deac8f2ab48258be35a662339e386d76ac5b21c60bdc" dependencies = [ + "anyhow", + "bincode", "bindgen", "cc", "cfg-if", + "hex", "log", "num-bigint 0.4.6", "p3-baby-bear", "p3-field", + "p3-symmetric", "rand", "serde", "serde_json", + "sha2 0.10.8", + "sp1-core", "sp1-recursion-compiler", "tempfile", ] [[package]] name = "sp1-recursion-program" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d460db3d03dd185e4d338c4c6d1b3fd174063f561219f98abc26532eecdc6ad2" dependencies = [ - "itertools 0.12.1", + "itertools 0.13.0", "p3-air", "p3-baby-bear", "p3-challenger", @@ -5906,15 +5995,18 @@ dependencies = [ "rand", "serde", "sp1-core", + "sp1-primitives", "sp1-recursion-compiler", "sp1-recursion-core", + "stacker", "tracing", ] [[package]] name = "sp1-sdk" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d491b27caebd3f331dcb3ce1186bb37970a1e78440ecd34fd3ab74b108af23a" dependencies = [ "alloy-sol-types", "anyhow", @@ -5925,12 +6017,15 @@ dependencies = [ "dirs", "ethers", "futures", + "hashbrown 0.14.5", "hex", "indicatif", "log", "num-bigint 0.4.6", + "p3-baby-bear", "p3-commit", "p3-field", + "p3-fri", "p3-matrix", "prost", "reqwest 0.12.5", @@ -5942,28 +6037,31 @@ dependencies = [ "sp1-prover", "strum", "strum_macros", + "sysinfo", "tempfile", + "thiserror", "tokio", "tracing", - "twirp", + "twirp-rs", "vergen", ] [[package]] name = "sp1-zkvm" -version = "0.1.0" -source = "git+https://github.com/succinctlabs/sp1.git?tag=v1.0.5-testnet#19ef89a4b8a509b7d765c46ff6e0a1c9a8fcbfb4" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0708c2369deb682e57bfe33bb5a405188d825511b31e22af5722e1ace79c1840" dependencies = [ "bincode", "cfg-if", "getrandom", - "k256", + "lazy_static", "libm", "once_cell", "rand", "serde", "sha2 0.10.8", - "sp1-precompiles", + "sp1-lib", ] [[package]] @@ -5988,6 +6086,19 @@ dependencies = [ "der", ] +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -6019,7 +6130,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -6056,9 +6167,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.71" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -6074,7 +6185,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -6089,6 +6200,21 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +[[package]] +name = "sysinfo" +version = "0.30.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -6266,7 +6392,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -6372,7 +6498,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -6500,7 +6626,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.15", ] [[package]] @@ -6551,7 +6677,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -6643,9 +6769,10 @@ dependencies = [ ] [[package]] -name = "twirp" +name = "twirp-rs" version = "0.3.0" -source = "git+https://github.com/github/twirp-rs.git?rev=c85f31f9c54957374e7dcb3534fc52cff0aa2dc5#c85f31f9c54957374e7dcb3534fc52cff0aa2dc5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa3161d8eee0abcad4e762f4215381a430cc1281870d575b0f1e4fbfc74b8ce" dependencies = [ "async-trait", "axum", @@ -6864,7 +6991,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -6898,7 +7025,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7000,6 +7127,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -7159,9 +7296,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" dependencies = [ "memchr", ] @@ -7231,7 +7368,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] @@ -7251,13 +7388,14 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.71", + "syn 2.0.72", ] [[package]] name = "zkhash" version = "0.2.0" -source = "git+https://github.com/HorizenLabs/poseidon2#bb476b9ca38198cf5092487283c8b8c5d4317c4e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4352d1081da6922701401cdd4cbf29a2723feb4cfabb5771f6fee8e9276da1c7" dependencies = [ "ark-ff 0.4.2", "ark-std 0.4.0", diff --git a/Cargo.toml b/Cargo.toml index 62ef4f6..66ecef0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,8 +16,8 @@ authors = ["srdtrk "] [workspace.dependencies] # Used by the programs -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.5-testnet" } -sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.5-testnet" } +sp1-zkvm = "1.0.1" +sp1-helper = "1.0.1" 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 = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.5-testnet", features = ["plonk"] } +sp1-sdk = "1.0.1" sp1-ics07-tendermint-utils = { path = "./packages/utils/" } diff --git a/bun.lockb b/bun.lockb index 8748f3c..1b9df9f 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 419078b..7f1c337 100644 --- a/contracts/fixtures/memberships_fixture.json +++ b/contracts/fixtures/memberships_fixture.json @@ -3,10 +3,10 @@ "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f800000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "commitmentRoot": "c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1", - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", "publicValues": "0x0000000000000000000000000000000000000000000000000000000000000020c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "proof": "0x059dc6140e1633afdd916832043c08bd313166a9dc86b9f72e2a7501ef063bf50e607f8b114ee7548dc849c4c2532ff7c7f9f5391dc50a34067095a73431b2a72ff36838f087ff277dc5d82a62b677cdf7408bca2e8fda4c19be5f035717c0dc218435ece82292f98fc4e7fe835ef7c3c9a5ccb8c3fb7922d1439d5f22e0a17c1bb3dec0d13ec9b42566be76ec8cd3f17d61f91798a43e692067cd8fef7facfa2bd4eb7b8ac0f9b60cddad52144770d3ca63272d980730f9813ac0273df04bfc10ea4880955d997509565aec859ac29e4ae27d2a01be850ad6efcc0b028b8775057d609bb9f0353c3200e8edecaf2b41e370026aff73c74e9fd452f2c0c8ad092e7a9666c0e5fa13861d081833385e1f0889fab507c9898b61d5d744eaf6d5ef1f456db613f7eed98546856c4c7e1b798e7d1ffee4b3e16056b0939f6b8da3d42daccc0016d16dbf83cb74ed15b9f3cc110fe16990058f5f9e40e4c1cdf4ed8c1ff44a065ec83dfce5674aa9537c455d6d2798558fc5e776b6c703922644f5550e981eca973963c7ccb175d23a8321328969b7e2ae53ef35cd128af6dc03e762165ca436295fa57959ac6085db1b3cb8f0fb3e821b0e56c3d3906d7f40c8c4cc0abe9024988c98733def1734305a2e56929d3dd5a7dfb4886ade8c86c8fedb31102b2cd7b5f982577dbb9ec07bbe9a70c61514b4af7a36e79e3aff267b512302021861d7cd5ba61fc21ace6c1eb472786e7cca5abcae0365a0143979e8392d240e4ae4d254c98137d52e2b994aa9220dce748da70fb551f6f631d617324be53a1c4c3b7797e9d6d1e8c94b30d291f77f91a3886f291e99d3ac97abfbcae8d95416491bfce5531947c5d917b172f3005f9730619e3b60f87b93716659c61219f617433868d0c60563477118f484e9cc3b74b508382c45d122d067c97c90c3a9c80b80044fa1bef6dd95689b87ffcd525e822f3f4331b316354ba20949df9b31b42edd7a619a21c6155e2c919e88b68d885060aafec5c102df0a94f2074dea4992107fd7eb6fdcbe19bd60a9900013160fbc4339ec560c1aeb9ad93be725c269f20b041d1f4b3fec16291740b0259f38ab723506e0d042468fb045f9ba354db8a11282441e5563fc160490021dd4c8a8a2c27e74fa4b816c763689c19a61fce3041ae23bcbea69fee812e9427945f4942176dd1af5f026ac55d5f64461adaab082", + "proof": "0xfedc1fcc0d7ce7cded093ee9ea239b40a14d94d862c98581a515584f993201fddd76b61003c363fcdccd6bd357cab083e3e967f7d37acf1383608ffbe5296e0b3c1cd41006b44efd613ced41440446f2acff6063b1508656848e15f509485bc383809c4826351b46edaf232b4b44a04eb29b0551c012a37efde7989f5d496ee9fb3d43410b17ecd1e1f81163fefcbba1afe0705ba3fa3f0fbfcda32a1423abdb608041a52f8afb70b2056ea04efe5d0e47c51ae03dff3c02790cf199c843298525f73bfc1519b1efdd55b1c4527fc95c2005ee517099ad4e4f75446ff224b31bd05483ba0fcb63ef34d1a8130a73af17d358c76381a06f44e06c36232d00f719b78f9aa00fd74d520a84cd2a2e865ebb98cd0c7d6719c3f1c3a04181f0f4b64e127c74390147594b132eb6cec4953da49baa5caa59e809f55d840cb450a7df53e5397c0726c0585e8f23c9ba98fb42670260fd6b8727c6e82cf3d1d718399eec621f8f970461de49dd59f99f2953aecd0be123f0b8ad087b68ba7aa7253a2f13f1c61a5b0fddd966840c6d7327e6428a9464aec9c4b0ddaf1ea7d207d8ae2cf0308bf0e920b2e4c0d381cadcddf10a83a73d1b712cb36d2056c7e26fec17d1046dd5f6fc19a4282115b13046cb032f9400e0ebf6ea935ec02dde17f8c1b83f04bf20d55f0e1c268a7aec8efccd3437351dfaa4e949257f90874c6ea20c6b869b0cb4860512bd2f331d1ca86b7f43855e565d55cad6a19553c7462f585aff8feeaf7a34041188c73c10bd6f54581a34c7568a1fc0ad23986c093ffc2cd551429f3d034a110a586174300baf80f4cbb5f99179d059520e31db66667a27f0ae32f1ddb7acbe1d3b88813d31f33e4dba96b9f2e4b95194825f54d9e5dbb5d0f7a0c751b8b20e0665fdbbe0def677bef9aab811ce863c7072aa5a0b974b72448cd1eebe0cd13a2ec7085201dc1b5b91567e1250e7ca10dc5f6534c0b5e485f5fcb2a2fdb97a6c26fa6f3bfd0cd0f2597402c306e3cc893eded6576efdc30474d738664ecf042124925db8bb6445832f77fb3e7bf3f0dc9f68c810300c9127957513bbe0efef3609ada795538a83288d4880deabf69dfcbd0ecdb709f552c18dc29b631d15f0e81095be7244df9aa4ea6dc303c394bf3c700ecb7e289aa4a7488f98b76dc8332b225bd0d3ba2da065e98a237a8505ce8c07f3bc45c6656e3f674ddbfffa4370b6", "kvPairs": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/contracts/fixtures/mock_memberships_fixture.json b/contracts/fixtures/mock_memberships_fixture.json index a465d5b..e842ba4 100644 --- a/contracts/fixtures/mock_memberships_fixture.json +++ b/contracts/fixtures/mock_memberships_fixture.json @@ -3,10 +3,10 @@ "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f800000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "commitmentRoot": "c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1", - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", "publicValues": "0x0000000000000000000000000000000000000000000000000000000000000020c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "proof": "0x", + "proof": "0x00000000", "kvPairs": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/contracts/fixtures/mock_uc_and_memberships_fixture.json b/contracts/fixtures/mock_uc_and_memberships_fixture.json index c969f4c..fa8e34e 100644 --- a/contracts/fixtures/mock_uc_and_memberships_fixture.json +++ b/contracts/fixtures/mock_uc_and_memberships_fixture.json @@ -3,10 +3,10 @@ "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetConsensusState": "00000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetHeight": 2230274, - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", - "publicValues": "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000006698c3c000000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "proof": "0x", + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", + "publicValues": "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000669f3f6000000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "proof": "0x00000000", "kvPairs": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/contracts/fixtures/mock_update_client_fixture.json b/contracts/fixtures/mock_update_client_fixture.json index ae5e385..033c1f5 100644 --- a/contracts/fixtures/mock_update_client_fixture.json +++ b/contracts/fixtures/mock_update_client_fixture.json @@ -3,9 +3,9 @@ "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetConsensusState": "00000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetHeight": 2230274, - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", - "publicValues": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000006698c3c000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", - "proof": "0x" + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", + "publicValues": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000669f3f6000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", + "proof": "0x00000000" } \ No newline at end of file diff --git a/contracts/fixtures/mock_verify_membership_fixture.json b/contracts/fixtures/mock_verify_membership_fixture.json index 2c5e156..1a310fb 100644 --- a/contracts/fixtures/mock_verify_membership_fixture.json +++ b/contracts/fixtures/mock_verify_membership_fixture.json @@ -3,10 +3,10 @@ "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f800000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "commitmentRoot": "c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1", - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", "publicValues": "0x0000000000000000000000000000000000000000000000000000000000000020c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000", - "proof": "0x", + "proof": "0x00000000", "kvPairs": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000" } \ 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 b255a83..b99f8fe 100644 --- a/contracts/fixtures/uc_and_memberships_fixture.json +++ b/contracts/fixtures/uc_and_memberships_fixture.json @@ -3,10 +3,10 @@ "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetConsensusState": "00000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetHeight": 2230274, - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", - "publicValues": "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000006698c58e00000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "proof": "0x0911aa200e8feeb9c1661f0ba81ec11f86ddb83f5adf702b11617b518fbf054d04e1d3bbfd8b08bcd9aaa9b4d8bd85946c5525fb2cc116c5054231c714eb28e2083e3bfd0c0d08e7a419e078f6e44c6b3f7ee86981352e72005dc054ccea5676206b58b5eb306523abdc78ef8fc2d4fa080630d84f35fc8fdb1bd9dc8e26475e1216aca919661daf24689d978220aa2dde5d64943fd0aa78670c6e9ba8c59c682702abb456d26273df59b74c8cc3ecd74314d4a9598710c24bc456b68d5366c72b104fdc32238daf7a3a62da1bb47ef27d3a7fdb174c5dc5c8a13153ba8becb7111e6b9fa9a80d15616954531759eee1822782496878f416e79baf8293a5453a0537bb76dd33bd12c7c246ed57da0dd1ec48c52e0aaec3a951e4bafe0d513a4f05260223f45ad7355e49c3e131cf97ef427f44223e96678384794c288a91983602a1f30ad8aca26c032d60b3afa40340aac619df84c25464b106c365fa8398b923db00531a651bdab61a87746558e83b97366d7a8acab4577dca13b61a83d9fa03821c2effb8238db6a32c43f46db504cc1767f18ce2ae0c50ffcc44820755490666bb44381f37d6600b781d00f705acd3d6fc12792a0ce2b97ce1bc0a70d92904b1f08c988b622de377e574d6ceb4427d2e1454362bc92915f83fa5925521832f18df10285838945ecd5e83b6225f7e4a35fd2af980fd6ca5820c95c39c770a14eee93f6825439947359b356703fecb782c3ffa0a83b1edbcd734380584d65002e67e09ee9ef781929b6953449c6dcf40c65a30903ddbe1e99ed5946bdb675d06a07b35bd2fdee8d2a9be7d0c35501523144e5e3e35f1d3dcfe31fe27292f9f1c905b3f293324374bd2213a70670dd56a91138e93ac5b15d02b13d8b11a51ee2e88c847b00723e6db171caee02389f7ad132c391b3e74d3923912865e4a4f85269ec13a6f66b6bd43869f66bbc9d5ca142385f0c3fcf53e30856bd97440fe09055b3a0f1381c01c63c97535b73335fd04ff5f9c21001f5a674ae2cec65043aa1787c3912d17ad901f15aa22dbfaba234a831a6e0ff2a8a81f1367f892f3426f22e4608d240e3fd6c075f021c9781d37363776529a71f4f96531d85157905dcd1300ee175c8d2d02e6b3df2bc5e14485a64b58c3f870500a5113b20d674b29141715ad14183791ac8c87392309878edb6cb61c3cfc3dd32e6c45aa583b05fcdf", + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", + "publicValues": "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000669f466100000000000000000000000000000000000000000000000000000000000000076d6f6368612d34000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "proof": "0xfedc1fcc1963d6881003af8ad7da5a5c51216eb6ab2928997466902a824882315d496572115fdd3d44708bfbace1dace20df9c480b6e758b6de01c375540b49fe24c9c901d723428965ffb51c99b7bac768de5ce1678d248a6caa0842ecfe237f624dc9f0c39aecb7ba2c3229898d886520f29c43f65fa2de1b3dbdd11270fdb965605e12566898340accd1540d5a2ea2b56727e76ac65cd8ee2c0a48cbf5f1b70de83d01da4b41e0fb3fb0313bcb8cc4299975a2c3927aed5213ad0c7c9c9fb3094b4e82b47b408c91cea4b961843fbd6ddb8087b13ea23596f494e52df1567019c1e9517525491dd59b0458ab18cb0c37380d13a46664591601a10b9515b69b1f96a5008bbec8540c9283d1999f8e711dcb3adfa4acccc2a1e2d4a251dba1300fdb5bc0622fc8d21fca128cfad2eb09d63665184a95a176e2eee57551c5e3da2ae6e410d3a0edaa37a1a56d3c196015d5be3d304e0d226967ba86d68ff4d647028823204f1678319eb824a87bbc335e0d74d750473777ef95b84b25b9e8193aa7c8f4502ceeb792c025c91f475f63f516ca67b98d1ef53aea2d3a217ca36e3e94b0e2400357123040b8c963d68c73e1ec20fe9dc7e2834a17bdcfeb7b5add7671c8db4159c94d5b82184a8b4f15aa35febde7adb532d606f735e9ed7eecd5e5473ae4622af36b1feb880ee565ffbfe6cc1306421ed488e62dbff64cc127c22b03189232f2c1d6203b708bf086339102a4ed6a3d056247bf923c359872a29c9389b26362b534a83ec2fb7e605032c0be1cd9ad5d47fb387587396d8fa51429b9c4907d60902717685f997f63bb6ba31f2c1388d49eaafea21122c8a4ca6d8a632bf732420ad943ef89783d5dad57382412befc57ce1d602b2c387a7816a873bfefd68292e0eb9b8899daa5cda6d964afea484330f54fe71107929dde8194a141b44939f2dd6434e68fa34ef9236a2ac7802eed9a92fb0d2082422db5dcc1152eb2b859e2c9bf3c0bbd5f8f08137059079f749aa03888780ad8baf8089c358bcd155d8361605d25dd6e747016083232994029568451d40f8225a72d0d23c2b34ae1b0f9009986dc27bb8dedeb6aa3cfc95662fb16d9998c11ca16e0b8b16229dc4ac09342b2187f2b919ffd3f16ebc77187361adf07fb116a322d7f977efc54eafb55f2c0f086c324d4a37784b8b5629a5aa4e3048ecd5e79f7ecbac480e17381cbb73d9", "kvPairs": "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000025636c69656e74732f30372d74656e6465726d696e742d3030312f636c69656e7453746174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/contracts/fixtures/update_client_fixture.json b/contracts/fixtures/update_client_fixture.json index d256292..e7d97f8 100644 --- a/contracts/fixtures/update_client_fixture.json +++ b/contracts/fixtures/update_client_fixture.json @@ -3,9 +3,9 @@ "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetConsensusState": "00000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "targetHeight": 2230274, - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", - "publicValues": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000006698c57f00000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", - "proof": "0x2d9b6321677045b1568cdce23c407d30b7aafe591565681a4a438014b28171d6224a6adaea0a9b8e444d12ac1f16000db140dc164c10c3b197009999b194da3e0860a1ff57b8ef3c7f34db3dcc50b57dc6a417a6e803bcc66096c0c260954f61299e854ab976af60a240d1de402ab22f7d0df9d6bd4905db42bbdcef589d9b5e076f6715241c1628359a9c8ece6cddd98f2e9e9b6fd144bf9dc0e4e274ca86292422dcf3e98558801dd6e953a78f89103b44200b484cd10efeab51f191d63c0f0d901d4b8941fc2037cb37f31e8d878cbee045dceb80c494536dd39db11175b30182a8eaa4f0e3a063b9b2c0ddd2f199e8cd3a6f8cf037eb59256844815c800c04781181b7e62908ed2b7da498eeb6bee765a146d21a1dcc3d5dfeedddbb722e22c3ea76a57a5d0563254d3ecfe86f0e39a29a22f384c626ec5f0c8aeb017cf514d44a7f8ff2763d2c7e2b0410740f408e194d098dea06febeecd97e9a17ec3a0235cf975c2690c9671799d995e5256b07d0f60d77a455e666b574d2c9dabf1e0be2c05f6c79ef6527a9cc3c9a9b1740055ba2f9b47094ba11585c38f79350272c39f2cbc22d07d9ab5bb125c67046430b5c1db33fe1c751e5e1633d1a306e5d2cc1ebc98aa9e4307a3cefe0af06fba25866780b29fe24ed05fdce1ff7be9c5d0023dc200892464179573fb53869feaf07752799a7c8d1e59b86050fea0ff5ef1a069ed1afcf2d18d000ae6c62f8b132717e0a8d5ab06cad7bc644bfaa79e6681c8c024472199cf03d45f71fc35f7eb7eb4f9ecce7748ebf04274a25405579150256d808ffa8507a47d4ebffbfb7a04957aa63d1fff756accab5145716aee5360616d2130426683b2a9767c59b3a95b530dcb31c173157a92e328d0ac3ba7eee1bdb4cc259f7b2f6129c2e8b9d0c00e47e23d575229bac669c29d3850f93cec617bb2d3f8582ddb8da64386acf0d215a9a6c59b3f888a1de3ba537216972e8b20edd5f1915fa0555898e7ffb88a81941e216248a2c5d4e1cd98d2660a640d8b5295e553a4b05b8ff49fab3011b971a23589ab51d2f20e50c9483ea2014eef918186f9e73c37876c92a7d1511536d9662c5351bcf0641ffdcf97d6c94d2564148061ec51b92e7b2d716002b9fe8d061a1ba47bb8c02b0fc474398005d89e4422409f326cbbba1a56c691bb37ca3c5fda451e4037ae23dc41f1316e8f7a9449b39" + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", + "publicValues": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce000000000000000000000000000000000000000000000000000000000668df1ea6a10b1857c778e02df342a0471476f44bc80e94e6e53e73e33b4e2bf94261150b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000022080200000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000669f463300000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", + "proof": "0xfedc1fcc26f9ba98aeda0dbf461c86874ecccc4d6a0493fc49d63146d1e49aa7774afc7e07cd680d9065f777d984b3a6198c66dac19ca22ea634c628b3a4a47c4a5d59810e48cdbffe763166f8ed75c506c48846ce219d26d63b9d1fcb6675bbf45c57e82dc31186f5d43a3a0650ce2007e0ec367811d4458bd46999ba90b768bde8e9c101c84e33755fa3fb78ed73563625f6d141459644e12487db7904ccf5e362846813b8fc78257cde01968b445502216197cce827bacb290afc803fe448ad8e8c501e71906c3c297d2f0e3a048c6087a2b740f791df57880af86b605fca96d1e8de0e6bd9a1a1096499bf474dc6c7969d19d118d5fab848cbe463d24a3e9fb9ea31300150ac8d925e303f61c34c4b43a9fe4160b017d82fb7661771f735074b336d1174adfc65f69f780472f19b48a498964498809152050b22955f5dc5d241a2a22821a19c153ae12bd99314bad632e21826b2bb848ae11feb8a983585a4be23e41a98ad59be638607c9134f829013a2c041be5dc1f3a6967f58309017e6bc088a003217b50da4357cfa292e260294176a38e2e62e73b7bad226570acc09e8db301ce4565f4a4b466449f879a1823aac05fb281777cfb4c7f0fc746fed3be9d9bb041814da2c1daf82d5bdc51d44896cc5c813e04aa672227f68bbd1677998dc601aad06eabb68bcec3ab7308e9266e062da889e933f8c067e45504ae633e5c77d05de1744e1a8db11a3bbe618bd6e942d70ccf428afea90c00bb955642296d3f11e5d81fa4961400360e7b13f0b85d01516b4374058130b53ceda498970297a9607e9f267e7d5ed319167441793ea791f62738c63448eec909b491aa06d00350d10da8c7033336d8752b7defe01315ed6aa8c19f85ea560176a5db6dd688280b70bc4cc2ff9482531db31e0ebdfaaf42855a918e5d9cc57eab1ace50492553c8e0678a47bff2650b5e0091f45d0b04cc78a5ccbcb90544973930b151251d74b1c079f5356a1f73eb16b2fa03df586a01ffc822365ad197787f227a7a294e6181a2449c6d8c943e82225f813a23e537e1b03dfe8e21d7015e35a12c62cc616a6670dd84077c6674129adac93b3fe6a65313151a3da7813138a023abb6347dba020113021f52e4021176fa2d7a79cfe95fa06804b37bfdde526067f861d7ab6aba72403f51e331e65478b149dac0c46e59c2c46d2b95ebfe18a4262db18cdd1232a" } \ No newline at end of file diff --git a/contracts/fixtures/verify_membership_fixture.json b/contracts/fixtures/verify_membership_fixture.json index 5965573..213a123 100644 --- a/contracts/fixtures/verify_membership_fixture.json +++ b/contracts/fixtures/verify_membership_fixture.json @@ -3,10 +3,10 @@ "trustedClientState": "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000002207f800000000000000000000000000000000000000000000000000000000001baf8000000000000000000000000000000000000000000000000000000000001baf80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076d6f6368612d3400000000000000000000000000000000000000000000000000", "trustedConsensusState": "00000000000000000000000000000000000000000000000000000000668df173c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1b655d16f9452ed96e4d7cf8143e927a1e0d9ff1e1d315f134f2ad6b798b35ce0", "commitmentRoot": "c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1", - "updateClientVkey": "0x00e85222aaad662bbf58fcff9ee11a6d26f95b9f051c1b4f25b783e99f690fe7", - "membershipVkey": "0x003c970b2e30a0a86d9d8917d019df0e23a9109ff07809a518361cf1f1abd179", - "ucAndMembershipVkey": "0x00b6506a0a593c7dc38856e85e68819306c26087ee8a2ad7cd7d829161e763cd", + "updateClientVkey": "0x00dccbd5282da6b04c730721f21b40fee41302d148eb16d1aede6632224a1874", + "membershipVkey": "0x0083f60b9a6e2c5eecbeec4d63514073ea981defcaa39e4a06339152067fa699", + "ucAndMembershipVkey": "0x0071a54676e22f1e088807fe801e79f2d419a1f48242e764b244a1683bf6a02a", "publicValues": "0x0000000000000000000000000000000000000000000000000000000000000020c7656d84561185b88f82507efaa6d578b46ebe5010c0d37de05109254d2f9ff1000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000", - "proof": "0x099464da45f54cc41e1d1c2818d1ae8492105c2d706ba4a03a185948b2ecc4c013af416100f3307e6ee26c4148adea6b19c088cab179dd263f13e0dfff992fe70d27e9592c70725ec6c586d28e744c1f04c85a08b306877c878b298764f3994a2a2ade8c4057d65a3bf28e064306e02b7a46e24baf32dc316fc170eb117ee6771c08112678ab0a40dadc9c973bac243f8791eb1e624145fe90df7cafc0e72e6518b1fecc48871c87235556ed2737ed5e7fef6abfd2bd720789fd78f28bc3aa280c4a575bb241bfa8f780ee74bf1a29a084499f4c8418a783784421957a085e1917ef9c2a5c44705c2d3f0e567539c0bf14f82721ee9e70ec5bfd6df028dac31b0ba6b14f9cfb8208d6b0ec99818c15f918d0adec4d5b61561611c81002c2d5e914605e7c2cce85d94cff58f0011808445bb2fa4c5d9852b6733eb51e3620c2c82dbce7393ff3fc1a3df9bd8ced91ad8fbb0db537b2cb00e5666533a70d6afd372c98c10a92bfd8cb603470bf8b8695294dd719be1f66031e05c0c0d2b05592f61847cbd8b4663f556f42bbb4b73702be10a45d6198ae460e3337eef634d29bd61571a63075338281cc3bcafab2593d71a1ec1047ae17dbf7a40f00213169dce31512fbc1270c3552f86da6f6d8ef8ce367f6b8ac204b5f54baa62505f893a3e92e0c959574959df14aca661ffdbdc7f4d4308ff9c2bce6abb384814239f4d6760fe37fcf75bd897e234db97f97155946d105c9efcf6ebee8409b16e9b566919d2c05e0ad306b1ed7bc16af72ff7dc8a0498d2781209062d3252897b3846701662bc56f4fd6347df1e0005a4d03c296b47bf5dc2607d53cdd289cf9e8c33f99ec1dc0e33bd418f13d6676d8818fd25061cd64ee8c820b5c88c8f6e4146d3149f518076c9ef4a3bf500740f425cf4ebd508781bffd6091aaa3fc7be524604fdfd71d539e381389424b603237dbedb500ff6777bfffe189a95549629d8da54adda401b84c757b01dd5a7fb0d715d5ffde7c4e297bd45f6acab34529a6b74f95d57e223a1d53ecb2ae31045d09d1e84be2226ed0127f6af53a831f983336944b07302c04b34b0fb27aa4506d7cece53449186d352216c7813fcb0423438120248c9b27d5ec0fd9fac23d898102b558fe7ad01dc9f68d8aa401c4e6464ef55f0ada701f26f863ba22973545ee372156976c8537f7a5047eae2a5c71b16ed1a264b6bc", + "proof": "0xfedc1fcc012076e0e823a04de955b09b46c5a03a3a5ab78ee5c0a4c0a9dd35c3831f906d2a37fe76bf91af09a0aeb70ead54d09101b4f18f822160f9cedc9d83c1cfb3972f106ad0abe244207f2abeeaf36002d80a3a67846c50288b24c16326c2c9832105e8686fbd16d9f5ed8060aec56e2919076388dff52489da92c1c783e454c91f0a5163dbaf84969a121b3517214cebea83cd667dac6dae3955c060912e67982520280e538f7466560647b66103c51111696d1718469b6460c0ebcdd110263ee600b7b4e5f77af47d90b277166a5306cbf9279632e556d9386d249f6c9048384b11ca64f343ca9f0ddbdd4033bbb007a92975ceb87308d24d002d701f5d469046096391fa708b1185b0cadbf9437998c5ff32838ac554d0537956b760bf85e25326ed7a4f806b3b9fddd8d6ccc2cfde21ffc6edcc8e4f7fd0e01146468be8367e2753da5cb8bb000b339225d483d2e19223f6ea22c0619a057b8f5f3ec52c37f81c75d9b502357a0813a8539e204f1e65d11e8a2ed0c2f0b20f5793f12aacc9b90ab053757cd69deea1b1c5ba13eca40c93e027c2f5e7386e16f94948069785f819a3439c3d00d22d59c21facdbb9c2ca402cc886a467ded9447b03fc4b4007ab13b4ffb5077b2bdc08c3bbc2d5dcc58a39507a2d28b9873ddf5891bd8adf6e0f1e79b2bc8267e4a6781453437150912c547da164679f4a3d86feb24fe951ab57009fe412a3acb07d707a7f46f99b417fec48998a31938ba5ceecb5e548fe3a4f199a99d590a1c174c804975c3e19f837b424f7f20e268b7b87b1fa11bbf3f36006024f91efe7d1d871c22350ca1883d01741c8bd436e829259063d78c3a8d72824c1919054f1706c58f706213c0ec82d72f2a5c12c67c090d1750d0c57cf81631cd1f3f089f1d5a9a0a92da7e11832d60d57bc738a4bb815db4bd351374624421f3d572fdda05aaf4bfd2853ed0f92fc29635cd82c2b384f9ebb64fa787eb5f417f31ebd99dd32fbdd95efb02cfd2b1260af2cfb19e49cbcda8d45f6b2bc87a7032aa37123e4e463131959f7802a30d2c7f48ba24b216796e9c6e03b9a51e05e00ed66ccc323a6c5552b1734ae0aa0604594a3d607e4432f486be08f010cc3831e09d97a1f60ea417e5275349651e8c9f017ba06adedcd2719ceadc7513e3cc225d5f9a95b58476826bb10345fc02126a2850318757a6921dcf79ef8c212c44f", "kvPairs": "000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000023636c69656e74732f30372d74656e6465726d696e742d302f636c69656e745374617465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b70a2b2f6962632e6c69676874636c69656e74732e74656e6465726d696e742e76312e436c69656e7453746174651287010a1174686574612d746573746e65742d3030311204080110031a040880840722040880c60a2a02082832003a0510b7e3c60842190a090801180120012a0100120c0a02000110211804200c300142190a090801180120012a0100120c0a02000110201801200130014a07757067726164654a107570677261646564494243537461746550015801000000000000000000" } \ No newline at end of file diff --git a/contracts/script/SP1ICS07Tendermint.s.sol b/contracts/script/SP1ICS07Tendermint.s.sol index 5b8c6a3..253c799 100644 --- a/contracts/script/SP1ICS07Tendermint.s.sol +++ b/contracts/script/SP1ICS07Tendermint.s.sol @@ -5,7 +5,7 @@ import "forge-std/console.sol"; 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/SP1Verifier.sol"; +import { SP1Verifier } from "@sp1-contracts/v1.0.0-rc1/SP1Verifier.sol"; import { ICS07Tendermint } from "../src/ics07-tendermint/ICS07Tendermint.sol"; struct SP1ICS07TendermintGenesisJson { diff --git a/contracts/src/SP1ICS07Tendermint.sol b/contracts/src/SP1ICS07Tendermint.sol index 3740d22..d52ca8a 100644 --- a/contracts/src/SP1ICS07Tendermint.sol +++ b/contracts/src/SP1ICS07Tendermint.sol @@ -169,7 +169,7 @@ contract SP1ICS07Tendermint is ISP1ICS07Tendermint { validateUpdateClientPublicValues(output.update_client_output); - verifier.verifyProof(updateClientProgramVkey, publicValues, proof); + verifier.verifyProof(updateClientAndMembershipProgramVkey, publicValues, proof); UpdateClientProgram.UpdateResult updateResult = checkUpdateResult(output.update_client_output); if (updateResult == UpdateClientProgram.UpdateResult.Update) { diff --git a/contracts/test/MembershipTest.sol b/contracts/test/MembershipTest.sol index 8a2b6ea..d184dba 100644 --- a/contracts/test/MembershipTest.sol +++ b/contracts/test/MembershipTest.sol @@ -8,8 +8,6 @@ import { stdError } from "forge-std/StdError.sol"; import { ICS07Tendermint } from "../src/ics07-tendermint/ICS07Tendermint.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; import { SP1ICS07TendermintTest } from "./SP1ICS07TendermintTest.sol"; -import { SP1Verifier } from "@sp1-contracts/SP1Verifier.sol"; -import { SP1MockVerifier } from "@sp1-contracts/SP1MockVerifier.sol"; import { MembershipProgram } from "../src/ics07-tendermint/MembershipProgram.sol"; struct SP1ICS07MembershipFixtureJson { diff --git a/contracts/test/MultiMembership.t.sol b/contracts/test/MultiMembership.t.sol index 67cc04c..c681968 100644 --- a/contracts/test/MultiMembership.t.sol +++ b/contracts/test/MultiMembership.t.sol @@ -7,8 +7,6 @@ import { stdJson } from "forge-std/StdJson.sol"; import { stdError } from "forge-std/StdError.sol"; import { ICS07Tendermint } from "../src/ics07-tendermint/ICS07Tendermint.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; -import { SP1Verifier } from "@sp1-contracts/SP1Verifier.sol"; -import { SP1MockVerifier } from "@sp1-contracts/SP1MockVerifier.sol"; import { MembershipTest } from "./MembershipTest.sol"; // set constant string @@ -70,7 +68,7 @@ contract SP1ICS07MultiMembershipTest is MembershipTest { kvPairHashes[1] = keccak256(abi.encode(mockKvPairs()[1])); mockIcs07Tendermint.batchVerifyMembership( - mockFixture.proof, + bytes(""), mockFixture.publicValues, mockFixture.proofHeight, mockFixture.trustedConsensusState, diff --git a/contracts/test/SP1ICS07TendermintTest.sol b/contracts/test/SP1ICS07TendermintTest.sol index 4b9427c..27ecbad 100644 --- a/contracts/test/SP1ICS07TendermintTest.sol +++ b/contracts/test/SP1ICS07TendermintTest.sol @@ -7,7 +7,7 @@ import { stdJson } from "forge-std/StdJson.sol"; import { stdError } from "forge-std/StdError.sol"; import { ICS07Tendermint } from "../src/ics07-tendermint/ICS07Tendermint.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; -import { SP1Verifier } from "@sp1-contracts/SP1Verifier.sol"; +import { SP1Verifier } from "@sp1-contracts/v1.0.0-rc1/SP1Verifier.sol"; import { SP1MockVerifier } from "@sp1-contracts/SP1MockVerifier.sol"; struct SP1ICS07GenesisFixtureJson { @@ -21,6 +21,8 @@ struct SP1ICS07GenesisFixtureJson { abstract contract SP1ICS07TendermintTest is Test { using stdJson for string; + SP1Verifier public verifier; + SP1ICS07Tendermint public ics07Tendermint; SP1ICS07Tendermint public mockIcs07Tendermint; @@ -35,7 +37,7 @@ abstract contract SP1ICS07TendermintTest is Test { bytes32 trustedConsensusHash = keccak256(abi.encode(trustedConsensusState)); - SP1Verifier verifier = new SP1Verifier(); + verifier = new SP1Verifier(); ics07Tendermint = new SP1ICS07Tendermint( genesisFixture.updateClientVkey, genesisFixture.membershipVkey, diff --git a/contracts/test/UcAndMembership.t.sol b/contracts/test/UcAndMembership.t.sol index 311176b..ea96a46 100644 --- a/contracts/test/UcAndMembership.t.sol +++ b/contracts/test/UcAndMembership.t.sol @@ -11,8 +11,6 @@ import { UpdateClientAndMembershipProgram } from "../src/ics07-tendermint/UcAndM import { MembershipProgram } from "../src/ics07-tendermint/MembershipProgram.sol"; import { SP1ICS07TendermintTest } from "./SP1ICS07TendermintTest.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; -import { SP1Verifier } from "@sp1-contracts/SP1Verifier.sol"; -import { SP1MockVerifier } from "@sp1-contracts/SP1MockVerifier.sol"; struct SP1ICS07UcAndMemberhsipFixtureJson { bytes trustedClientState; diff --git a/contracts/test/UpdateClient.t.sol b/contracts/test/UpdateClient.t.sol index daf049e..f7b7f9f 100644 --- a/contracts/test/UpdateClient.t.sol +++ b/contracts/test/UpdateClient.t.sol @@ -9,8 +9,6 @@ import { ICS07Tendermint } from "../src/ics07-tendermint/ICS07Tendermint.sol"; import { UpdateClientProgram } from "../src/ics07-tendermint/UpdateClientProgram.sol"; import { SP1ICS07TendermintTest } from "./SP1ICS07TendermintTest.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; -import { SP1Verifier } from "@sp1-contracts/SP1Verifier.sol"; -import { SP1MockVerifier } from "@sp1-contracts/SP1MockVerifier.sol"; struct SP1ICS07UpdateClientFixtureJson { bytes trustedClientState; diff --git a/contracts/test/VerifyMembership.t.sol b/contracts/test/VerifyMembership.t.sol index c3e54c1..621b36c 100644 --- a/contracts/test/VerifyMembership.t.sol +++ b/contracts/test/VerifyMembership.t.sol @@ -9,8 +9,6 @@ import { ICS07Tendermint } from "../src/ics07-tendermint/ICS07Tendermint.sol"; import { SP1ICS07Tendermint } from "../src/SP1ICS07Tendermint.sol"; import { MembershipTest } from "./MembershipTest.sol"; import { MembershipProgram } from "../src/ics07-tendermint/MembershipProgram.sol"; -import { SP1Verifier } from "@sp1-contracts/SP1Verifier.sol"; -import { SP1MockVerifier } from "@sp1-contracts/SP1MockVerifier.sol"; // set constant string string constant verifyMembershipPath = "clients/07-tendermint-0/clientState"; @@ -51,7 +49,7 @@ contract SP1ICS07VerifyMembershipTest is MembershipTest { kvPairHashes[0] = kvPairHash; mockIcs07Tendermint.batchVerifyMembership( - mockFixture.proof, + bytes(""), mockFixture.publicValues, mockFixture.proofHeight, mockFixture.trustedConsensusState, diff --git a/elf/membership-riscv32im-succinct-zkvm-elf b/elf/membership-riscv32im-succinct-zkvm-elf index 322cba7..583aebd 100755 Binary files a/elf/membership-riscv32im-succinct-zkvm-elf and b/elf/membership-riscv32im-succinct-zkvm-elf differ diff --git a/elf/uc-and-membership-riscv32im-succinct-zkvm-elf b/elf/uc-and-membership-riscv32im-succinct-zkvm-elf index 6495ba8..d501c11 100755 Binary files a/elf/uc-and-membership-riscv32im-succinct-zkvm-elf and b/elf/uc-and-membership-riscv32im-succinct-zkvm-elf differ diff --git a/elf/update-client-riscv32im-succinct-zkvm-elf b/elf/update-client-riscv32im-succinct-zkvm-elf index 13fa17f..41b9afe 100755 Binary files a/elf/update-client-riscv32im-succinct-zkvm-elf and b/elf/update-client-riscv32im-succinct-zkvm-elf differ diff --git a/operator/src/prover.rs b/operator/src/prover.rs index 82de357..d656018 100644 --- a/operator/src/prover.rs +++ b/operator/src/prover.rs @@ -9,7 +9,7 @@ use ibc_proto::Protobuf; use sp1_ics07_tendermint_solidity::sp1_ics07_tendermint::{ ConsensusState as SolConsensusState, Env, }; -use sp1_sdk::{ProverClient, SP1PlonkBn254Proof, SP1ProvingKey, SP1Stdin, SP1VerifyingKey}; +use sp1_sdk::{ProverClient, SP1ProofWithPublicValues, SP1ProvingKey, SP1Stdin, SP1VerifyingKey}; /// A prover for for [`SP1Program`] programs. #[allow(clippy::module_name_repetitions)] @@ -58,7 +58,7 @@ impl SP1ICS07TendermintProver { trusted_consensus_state: &SolConsensusState, proposed_header: &Header, contract_env: &Env, - ) -> SP1PlonkBn254Proof { + ) -> SP1ProofWithPublicValues { // Encode the inputs into our program. // NOTE: We are using SolConsensusState because I'm failing to serialize the // ConsensusState struct properly. It always seems modified when deserialized. @@ -77,12 +77,14 @@ impl SP1ICS07TendermintProver { // Generate the proof. Depending on SP1_PROVER env variable, this may be a mock, local or network proof. let proof = self .prover_client - .prove_plonk(&self.pkey, stdin) + .prove(&self.pkey, stdin) + .plonk() + .run() .expect("proving failed"); // Verify proof. self.prover_client - .verify_plonk(&proof, &self.vkey) + .verify(&proof, &self.vkey) .expect("Verification failed"); // Return the proof. @@ -100,7 +102,7 @@ impl SP1ICS07TendermintProver { &self, commitment_root: &[u8], kv_proofs: Vec<(String, MerkleProof, Vec)>, - ) -> SP1PlonkBn254Proof { + ) -> SP1ProofWithPublicValues { assert!(!kv_proofs.is_empty(), "No key-value pairs to prove"); let len = u8::try_from(kv_proofs.len()).expect("too many key-value pairs"); @@ -117,12 +119,14 @@ impl SP1ICS07TendermintProver { // network proof. let proof = self .prover_client - .prove_plonk(&self.pkey, stdin) + .prove(&self.pkey, stdin) + .plonk() + .run() .expect("proving failed"); // Verify proof. self.prover_client - .verify_plonk(&proof, &self.vkey) + .verify(&proof, &self.vkey) .expect("Verification failed"); // Return the proof. @@ -145,7 +149,7 @@ impl SP1ICS07TendermintProver { proposed_header: &Header, contract_env: &Env, kv_proofs: Vec<(String, MerkleProof, Vec)>, - ) -> SP1PlonkBn254Proof { + ) -> SP1ProofWithPublicValues { assert!(!kv_proofs.is_empty(), "No key-value pairs to prove"); let len = u8::try_from(kv_proofs.len()).expect("too many key-value pairs"); // Encode the inputs into our program. @@ -172,12 +176,14 @@ impl SP1ICS07TendermintProver { // Generate the proof. Depending on SP1_PROVER env variable, this may be a mock, local or network proof. let proof = self .prover_client - .prove_plonk(&self.pkey, stdin) + .prove(&self.pkey, stdin) + .plonk() + .run() .expect("proving failed"); // Verify proof. self.prover_client - .verify_plonk(&proof, &self.vkey) + .verify(&proof, &self.vkey) .expect("Verification failed"); // Return the proof. diff --git a/operator/src/runners/fixtures/membership.rs b/operator/src/runners/fixtures/membership.rs index 756b218..e290548 100644 --- a/operator/src/runners/fixtures/membership.rs +++ b/operator/src/runners/fixtures/membership.rs @@ -113,8 +113,8 @@ pub async fn run(args: MembershipCmd) -> anyhow::Result<()> { update_client_vkey: UpdateClientProgram::get_vkey().bytes32(), membership_vkey: verify_mem_prover.vkey.bytes32(), uc_and_membership_vkey: UpdateClientAndMembershipProgram::get_vkey().bytes32(), - public_values: proof_data.public_values.bytes(), - proof: proof_data.bytes(), + public_values: proof_data.public_values.raw(), + proof: format!("0x{}", hex::encode(proof_data.bytes())), kv_pairs: hex::encode(output.kv_pairs.abi_encode()), }; diff --git a/operator/src/runners/fixtures/uc_and_mem.rs b/operator/src/runners/fixtures/uc_and_mem.rs index c61cc1a..0dea1f0 100644 --- a/operator/src/runners/fixtures/uc_and_mem.rs +++ b/operator/src/runners/fixtures/uc_and_mem.rs @@ -129,8 +129,8 @@ pub async fn run(args: UpdateClientAndMembershipCmd) -> anyhow::Result<()> { update_client_vkey: UpdateClientProgram::get_vkey().bytes32(), membership_vkey: MembershipProgram::get_vkey().bytes32(), uc_and_membership_vkey: uc_mem_prover.vkey.bytes32(), - public_values: proof_data.public_values.bytes(), - proof: proof_data.bytes(), + public_values: proof_data.public_values.raw(), + proof: format!("0x{}", hex::encode(proof_data.bytes())), kv_pairs: hex::encode(output.kv_pairs.abi_encode()), }; diff --git a/operator/src/runners/fixtures/update_client.rs b/operator/src/runners/fixtures/update_client.rs index 048166f..ab92166 100644 --- a/operator/src/runners/fixtures/update_client.rs +++ b/operator/src/runners/fixtures/update_client.rs @@ -94,8 +94,8 @@ pub async fn run(args: UpdateClientCmd) -> anyhow::Result<()> { update_client_vkey: uc_prover.vkey.bytes32(), membership_vkey: MembershipProgram::get_vkey().bytes32(), uc_and_membership_vkey: UpdateClientAndMembershipProgram::get_vkey().bytes32(), - public_values: proof_data.public_values.bytes(), - proof: proof_data.bytes(), + public_values: proof_data.public_values.raw(), + proof: format!("0x{}", hex::encode(proof_data.bytes())), }; // Save the proof data to the file path. diff --git a/operator/src/runners/operator.rs b/operator/src/runners/operator.rs index f5d841f..7aa25bd 100644 --- a/operator/src/runners/operator.rs +++ b/operator/src/runners/operator.rs @@ -77,12 +77,9 @@ pub async fn run(args: Args) -> anyhow::Result<()> { let proof_data = prover.generate_proof(&trusted_consensus_state, &proposed_header, &contract_env); - // Construct the on-chain call and relay the proof to the contract. - let proof_as_bytes = hex::decode(&proof_data.proof.encoded_proof).unwrap(); - contract .updateClient( - proof_as_bytes.into(), + proof_data.bytes().into(), proof_data.public_values.to_vec().into(), ) .send() diff --git a/package.json b/package.json index 15baabf..2431a2b 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.5-testnet" + "sp1-contracts": "github:succinctlabs/sp1-contracts#v1.0.0-rc" }, "devDependencies": { "solhint": "^3.6.2"