diff --git a/Cargo.lock b/Cargo.lock index c75cc4f630..dd6a1b4f8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -173,7 +173,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -189,7 +189,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "syn-solidity", "tiny-keccak", ] @@ -205,7 +205,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "syn-solidity", ] @@ -584,13 +584,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -631,14 +631,14 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" @@ -676,9 +676,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes 1.7.2", @@ -689,7 +689,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -781,7 +781,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.77", + "syn 2.0.79", "which", ] @@ -1011,9 +1011,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.21" +version = "1.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "3bbb537bb4a30b90362caddba8f360c0a56bc13d3a5570028e7197204cb54a17" dependencies = [ "jobserver", "libc", @@ -1113,9 +1113,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -1123,9 +1123,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -1135,14 +1135,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1151,12 +1151,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" -[[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" @@ -1239,9 +1233,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" dependencies = [ "cfg-if", "cpufeatures", @@ -1472,9 +1466,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.46" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" +checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265" dependencies = [ "curl-sys", "libc", @@ -1487,9 +1481,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.75+curl-8.10.0" +version = "0.4.77+curl-8.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" +checksum = "f469e8a5991f277a208224f6c7ad72ecb5f986e36d09ae1f2c1bb9259478a480" dependencies = [ "cc", "libc", @@ -1524,7 +1518,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1572,7 +1566,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1594,7 +1588,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1716,7 +1710,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1796,13 +1790,13 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "downloader" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05213e96f184578b5f70105d4d0a644a168e99e12d7bea0b200c15d67b5c182" +checksum = "9ac1e888d6830712d565b2f3a974be3200be9296bc1b03db8251a4cbf18a4a34" dependencies = [ "futures", "rand 0.8.5", - "reqwest 0.11.27", + "reqwest 0.12.8", "thiserror", "tokio", ] @@ -1858,18 +1852,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "embedded-io" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" - [[package]] name = "encode_unicode" version = "0.3.6" @@ -1927,7 +1909,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2078,7 +2060,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.77", + "syn 2.0.79", "toml", "walkdir", ] @@ -2096,7 +2078,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2122,7 +2104,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.77", + "syn 2.0.79", "tempfile", "thiserror", "tiny-keccak", @@ -2478,7 +2460,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2933,9 +2915,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2988,20 +2970,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.30", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.3" @@ -3015,7 +2983,7 @@ dependencies = [ "rustls 0.23.13", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", "webpki-roots 0.26.6", ] @@ -3038,9 +3006,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes 1.7.2", "futures-channel", @@ -3051,7 +3019,6 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -3325,9 +3292,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa", @@ -3382,9 +3349,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libgit2-sys" @@ -3777,7 +3744,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3806,9 +3773,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "oneshot" @@ -3876,7 +3846,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3911,9 +3881,8 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p3-air" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e909ef66fa5d77ff0fd3cb5af4b33b27fa6fb68d02b9b1e70edbc29383e565" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "p3-field", "p3-matrix", @@ -3921,9 +3890,8 @@ dependencies = [ [[package]] name = "p3-baby-bear" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46965470aac1cddfe52f535424b59d52f2fffef0fdeb9dbed19da39b1d8f048a" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "num-bigint 0.4.6", "p3-field", @@ -3936,9 +3904,8 @@ dependencies = [ [[package]] name = "p3-blake3" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ef32d6ea21dd5cf9fec8a31bf0c64e6ceee8901dbf50966b83a443093c2aba" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "blake3", "p3-symmetric", @@ -3946,9 +3913,8 @@ dependencies = [ [[package]] name = "p3-bn254-fr" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3edfca6be3b3109adf8e3330baec30c3fc5f9f4d63d27aaec1b471ca51ed67" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "ff 0.13.0", "num-bigint 0.4.6", @@ -3961,22 +3927,21 @@ dependencies = [ [[package]] name = "p3-challenger" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6662ea899a5d848b60c699944491d72757873b5e1fd46798e4712f90a03a4e9" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "p3-field", "p3-maybe-rayon", "p3-symmetric", "p3-util", + "serde", "tracing", ] [[package]] name = "p3-commit" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3563918b5cc44ef5280bf9b51753e70dc78802de25e3fb81ed6c94617ccb6e" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "p3-challenger", @@ -3988,9 +3953,8 @@ dependencies = [ [[package]] name = "p3-dft" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510095701819d83c9509fe825bbf1ebfe50426ae75149df5fe1dcfd18261323a" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "p3-field", "p3-matrix", @@ -4001,9 +3965,8 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f1977a0a65789f719aa824119c332c4676b000bdbfe94d312fb6244a70d601" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "num-bigint 0.4.6", @@ -4015,9 +3978,8 @@ dependencies = [ [[package]] name = "p3-fri" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c22ddb958f200d9289cc73ff68847b0167ca0c14557b791dd9e318f98c2d1b28" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "p3-challenger", @@ -4034,9 +3996,8 @@ dependencies = [ [[package]] name = "p3-interpolation" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d032cda212f6b408d7d5b0b9a8270a9455acb93742fe55a0880d82be8e90e500" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "p3-field", "p3-matrix", @@ -4045,9 +4006,8 @@ dependencies = [ [[package]] name = "p3-keccak" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c56abdd5a8a780049d2f8e92cea1df57b55a2ef50a40d1103f2732f7a00e4b1" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "p3-symmetric", "tiny-keccak", @@ -4055,9 +4015,8 @@ dependencies = [ [[package]] name = "p3-keccak-air" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8398f1694ccc38513df0b8cab5f9ef7325423f27cd9e4fa20bdc77d5079cf1b" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "p3-air", "p3-field", @@ -4065,15 +4024,12 @@ dependencies = [ "p3-maybe-rayon", "p3-util", "tracing", - "tracing-forest", - "tracing-subscriber", ] [[package]] name = "p3-matrix" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d548ee0b834f8e2ebc5037073acd101a3b0ca41a2d1d28a15ba0ccd9059495b0" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4086,18 +4042,16 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f5575d3d61bedb3e05681abb0f36b8bb339d65aa395d50756bfa64e9cd3f46" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "rayon", ] [[package]] name = "p3-mds" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6e57ed310d59245f93e24ee805ea7aa16fc9c505551b76a15f5e50f29d177e" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "p3-dft", @@ -4110,9 +4064,8 @@ dependencies = [ [[package]] name = "p3-merkle-tree" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af46b41cba75d483ec8a553cbab1d2d794935ae3403d75394acfa4fb2c977cce" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "p3-commit", @@ -4127,22 +4080,21 @@ dependencies = [ [[package]] name = "p3-poseidon2" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adaba6f14c197203530e233badce0ca1126ba3bf3c9ff766505b497bdad0bee1" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "gcd", "p3-field", "p3-mds", "p3-symmetric", "rand 0.8.5", + "serde", ] [[package]] name = "p3-symmetric" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ecc4282566eb14f48be7707f6745c4dff6be664984d59ec0fb1849cd82b5c2" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4151,9 +4103,8 @@ dependencies = [ [[package]] name = "p3-uni-stark" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af5c038b22b058bf1d49fb1ea3dd6c240a3e46c3278fde5c444e0034f7ffe37" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "itertools 0.12.1", "p3-air", @@ -4164,18 +4115,14 @@ dependencies = [ "p3-matrix", "p3-maybe-rayon", "p3-util", - "postcard", "serde", "tracing", - "tracing-forest", - "tracing-subscriber", ] [[package]] name = "p3-util" -version = "0.1.3-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f3fef0e00d9d7246385e758c4cd39b4efcbbcea31752471491ab502631385e" +version = "0.1.0" +source = "git+https://github.com/Plonky3/Plonky3?branch=sp1-v3#0f8d103e67dbec3e84bac1de6d00bf0f2fb80de0" dependencies = [ "serde", ] @@ -4316,9 +4263,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" dependencies = [ "memchr", "thiserror", @@ -4362,7 +4309,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4400,9 +4347,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plain" @@ -4466,21 +4413,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" - -[[package]] -name = "postcard" -version = "1.0.10" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" -dependencies = [ - "cobs", - "embedded-io 0.4.0", - "embedded-io 0.6.1", - "serde", -] +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -4504,7 +4439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4551,7 +4486,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -4607,7 +4542,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -4640,7 +4575,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.77", + "syn 2.0.79", "tempfile", ] @@ -4654,7 +4589,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4855,9 +4790,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4875,14 +4810,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -4896,13 +4831,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -4913,9 +4848,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -4932,7 +4867,6 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", - "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", @@ -4940,29 +4874,25 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", "system-configuration 0.5.1", "tokio", - "tokio-rustls 0.24.1", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.4", "winreg", ] [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes 1.7.2", @@ -4974,7 +4904,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-rustls 0.27.3", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -4987,7 +4917,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls 0.23.13", - "rustls-pemfile 2.1.3", + "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -4996,7 +4926,7 @@ dependencies = [ "system-configuration 0.6.1", "tokio", "tokio-native-tls", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -5017,7 +4947,7 @@ dependencies = [ "anyhow", "async-trait", "http 1.1.0", - "reqwest 0.12.7", + "reqwest 0.12.8", "serde", "thiserror", "tower-service", @@ -5208,22 +5138,10 @@ dependencies = [ "base64 0.13.1", "log", "ring 0.16.20", - "sct 0.6.1", + "sct", "webpki", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-webpki 0.101.7", - "sct 0.7.1", -] - [[package]] name = "rustls" version = "0.23.13" @@ -5233,45 +5151,25 @@ dependencies = [ "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.8", + "rustls-webpki", "subtle", "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - -[[package]] -name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" - -[[package]] -name = "rustls-webpki" -version = "0.101.7" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -5352,9 +5250,9 @@ dependencies = [ [[package]] name = "scc" -version = "2.1.17" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c947adb109a8afce5fc9c7bf951f87f146e9147b3a6a58413105628fb1d1e66" +checksum = "836f1e0f4963ef5288b539b643b35e043e76a32d0f4e47e67febf69576527f50" dependencies = [ "sdd", ] @@ -5391,7 +5289,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5416,16 +5314,6 @@ dependencies = [ "untrusted 0.7.1", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "sdd" version = "3.0.3" @@ -5461,9 +5349,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -5540,7 +5428,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5578,9 +5466,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -5646,7 +5534,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5671,7 +5559,7 @@ checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5898,7 +5786,7 @@ dependencies = [ "prettytable-rs", "rand 0.8.5", "regex", - "reqwest 0.12.7", + "reqwest 0.12.8", "rustc-demangle", "serde", "serde_json", @@ -6076,7 +5964,7 @@ dependencies = [ "clap", "csv", "p3-baby-bear", - "reqwest 0.12.7", + "reqwest 0.12.8", "serde", "serde_json", "slack-rust-rs", @@ -6381,7 +6269,7 @@ dependencies = [ "p3-fri", "p3-matrix", "prost", - "reqwest 0.12.7", + "reqwest 0.12.8", "reqwest-middleware", "serde", "serde_json", @@ -6595,7 +6483,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6649,9 +6537,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -6667,7 +6555,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6756,9 +6644,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", @@ -6791,22 +6679,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6950,7 +6838,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6963,16 +6851,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" @@ -7006,7 +6884,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -7031,15 +6909,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow 0.6.20", ] [[package]] @@ -7090,7 +6968,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7203,7 +7081,7 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "prost", - "reqwest 0.12.7", + "reqwest 0.12.8", "serde", "serde_json", "thiserror", @@ -7220,9 +7098,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uint" @@ -7280,15 +7158,15 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" @@ -7460,7 +7338,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -7494,7 +7372,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7507,9 +7385,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -7557,12 +7435,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.6" @@ -7823,9 +7695,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -7892,7 +7764,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7912,7 +7784,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2f99c90924..f58355e2cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,29 +75,50 @@ sp1-lib = { path = "crates/zkvm/lib", version = "2.0.0", default-features = fals sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "2.0.0", default-features = false } # p3 -p3-air = "0.1.3-succinct" -p3-field = "0.1.3-succinct" -p3-commit = "0.1.3-succinct" -p3-matrix = "0.1.3-succinct" -p3-baby-bear = { version = "0.1.3-succinct", features = ["nightly-features"] } -p3-util = "0.1.3-succinct" -p3-challenger = "0.1.3-succinct" -p3-dft = "0.1.3-succinct" -p3-fri = "0.1.3-succinct" -p3-goldilocks = "0.1.3-succinct" -p3-keccak = "0.1.3-succinct" -p3-keccak-air = "0.1.3-succinct" -p3-blake3 = "0.1.3-succinct" -p3-mds = "0.1.3-succinct" -p3-merkle-tree = "0.1.3-succinct" -p3-poseidon2 = "0.1.3-succinct" -p3-symmetric = "0.1.3-succinct" -p3-uni-stark = "0.1.3-succinct" -p3-maybe-rayon = "0.1.3-succinct" -p3-bn254-fr = "0.1.3-succinct" +# p3-air = "0.1.3-succinct" +# p3-field = "0.1.3-succinct" +# p3-commit = "0.1.3-succinct" +# p3-matrix = "0.1.3-succinct" +# p3-baby-bear = { version = "0.1.3-succinct", features = ["nightly-features"] } +# p3-util = "0.1.3-succinct" +# p3-challenger = "0.1.3-succinct" +# p3-dft = "0.1.3-succinct" +# p3-fri = "0.1.3-succinct" +# p3-goldilocks = "0.1.3-succinct" +# p3-keccak = "0.1.3-succinct" +# p3-keccak-air = "0.1.3-succinct" +# p3-blake3 = "0.1.3-succinct" +# p3-mds = "0.1.3-succinct" +# p3-merkle-tree = "0.1.3-succinct" +# p3-poseidon2 = "0.1.3-succinct" +# p3-symmetric = "0.1.3-succinct" +# p3-uni-stark = "0.1.3-succinct" +# p3-maybe-rayon = "0.1.3-succinct" +# p3-bn254-fr = "0.1.3-succinct" # For local development. +p3-air = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-field = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-commit = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-matrix = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-baby-bear = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-util = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-challenger = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-dft = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-fri = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-goldilocks = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-keccak = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-keccak-air = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-blake3 = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-mds = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-merkle-tree = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-poseidon2 = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-symmetric = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-uni-stark = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-maybe-rayon = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } +p3-bn254-fr = { git = "https://github.com/Plonky3/Plonky3", branch = "sp1-v3" } + # p3-air = { path = "../Plonky3/air" } # p3-field = { path = "../Plonky3/field" } # p3-commit = { path = "../Plonky3/commit" } diff --git a/crates/recursion/circuit-v2/Cargo.toml b/crates/recursion/circuit-v2/Cargo.toml index 63d9bd3478..f8b378d447 100644 --- a/crates/recursion/circuit-v2/Cargo.toml +++ b/crates/recursion/circuit-v2/Cargo.toml @@ -36,7 +36,7 @@ sp1-primitives = { workspace = true } sp1-recursion-gnark-ffi = { workspace = true } itertools = "0.13.0" -serde = { version = "1.0.204", features = ["derive"] } +serde = { version = "1.0", features = ["derive"] } bincode = "1.3.3" rand = "0.8.5" tracing = "0.1.40" diff --git a/crates/recursion/circuit-v2/src/challenger.rs b/crates/recursion/circuit-v2/src/challenger.rs index 920040f06f..a7784d2299 100644 --- a/crates/recursion/circuit-v2/src/challenger.rs +++ b/crates/recursion/circuit-v2/src/challenger.rs @@ -8,13 +8,12 @@ use sp1_recursion_compiler::{ use sp1_recursion_core_v2::{ air::ChallengerPublicValues, runtime::{HASH_RATE, PERMUTATION_WIDTH}, + stark::config::{OUTER_MULTI_FIELD_CHALLENGER_DIGEST_SIZE, OUTER_MULTI_FIELD_CHALLENGER_RATE}, NUM_BITS, }; // Constants for the Multifield challenger. -pub const SPONGE_SIZE: usize = 3; -pub const DIGEST_SIZE: usize = 1; -pub const RATE: usize = 16; +pub const POSEIDON_2_BB_RATE: usize = 16; // use crate::{DigestVariable, VerifyingKeyVariable}; @@ -256,7 +255,7 @@ impl MultiField32ChallengerVariable { } pub fn duplexing(&mut self, builder: &mut Builder) { - assert!(self.input_buffer.len() <= self.num_f_elms * SPONGE_SIZE); + assert!(self.input_buffer.len() <= self.num_f_elms * OUTER_MULTI_FIELD_CHALLENGER_RATE); for (i, f_chunk) in self.input_buffer.chunks(self.num_f_elms).enumerate() { self.sponge_state[i] = reduce_32(builder, f_chunk); @@ -279,7 +278,7 @@ impl MultiField32ChallengerVariable { self.output_buffer.clear(); self.input_buffer.push(value); - if self.input_buffer.len() == self.num_f_elms * SPONGE_SIZE { + if self.input_buffer.len() == self.num_f_elms * OUTER_MULTI_FIELD_CHALLENGER_RATE { self.duplexing(builder); } } @@ -287,7 +286,7 @@ impl MultiField32ChallengerVariable { pub fn observe_commitment( &mut self, builder: &mut Builder, - value: [Var; DIGEST_SIZE], + value: [Var; OUTER_MULTI_FIELD_CHALLENGER_DIGEST_SIZE], ) { for val in value { let f_vals: Vec> = split_32(builder, val, self.num_f_elms); @@ -353,10 +352,14 @@ impl CanObserveVariable> for MultiField32ChallengerVari } } -impl CanObserveVariable; DIGEST_SIZE]> +impl CanObserveVariable; OUTER_MULTI_FIELD_CHALLENGER_DIGEST_SIZE]> for MultiField32ChallengerVariable { - fn observe(&mut self, builder: &mut Builder, value: [Var; DIGEST_SIZE]) { + fn observe( + &mut self, + builder: &mut Builder, + value: [Var; OUTER_MULTI_FIELD_CHALLENGER_DIGEST_SIZE], + ) { self.observe_commitment(builder, value) } } diff --git a/crates/recursion/circuit-v2/src/hash.rs b/crates/recursion/circuit-v2/src/hash.rs index b7d4c2fff6..91072b3b1e 100644 --- a/crates/recursion/circuit-v2/src/hash.rs +++ b/crates/recursion/circuit-v2/src/hash.rs @@ -11,15 +11,14 @@ use sp1_recursion_compiler::{ circuit::CircuitV2Builder, ir::{Builder, Config, DslIr, Felt, Var}, }; -use sp1_recursion_core_v2::stark::config::outer_perm; +use sp1_recursion_core_v2::stark::config::{outer_perm, OUTER_MULTI_FIELD_CHALLENGER_WIDTH}; use sp1_recursion_core_v2::{stark::config::BabyBearPoseidon2Outer, DIGEST_SIZE}; use sp1_recursion_core_v2::{HASH_RATE, PERMUTATION_WIDTH}; use sp1_stark::baby_bear_poseidon2::BabyBearPoseidon2; use sp1_stark::inner_perm; -use crate::challenger::SPONGE_SIZE; use crate::{ - challenger::{reduce_32, RATE}, + challenger::{reduce_32, POSEIDON_2_BB_RATE}, select_chain, CircuitConfig, }; @@ -168,9 +167,9 @@ impl>> FieldHashe assert!(C::N::bits() == p3_bn254_fr::Bn254Fr::bits()); assert!(C::F::bits() == p3_baby_bear::BabyBear::bits()); let num_f_elms = C::N::bits() / C::F::bits(); - let mut state: [Var; SPONGE_SIZE] = + let mut state: [Var; OUTER_MULTI_FIELD_CHALLENGER_WIDTH] = [builder.eval(C::N::zero()), builder.eval(C::N::zero()), builder.eval(C::N::zero())]; - for block_chunk in &input.iter().chunks(RATE) { + for block_chunk in &input.iter().chunks(POSEIDON_2_BB_RATE) { for (chunk_id, chunk) in (&block_chunk.chunks(num_f_elms)).into_iter().enumerate() { let chunk = chunk.copied().collect::>(); state[chunk_id] = reduce_32(builder, chunk.as_slice()); @@ -185,7 +184,7 @@ impl>> FieldHashe builder: &mut Builder, input: [Self::DigestVariable; 2], ) -> Self::DigestVariable { - let state: [Var; SPONGE_SIZE] = + let state: [Var; OUTER_MULTI_FIELD_CHALLENGER_WIDTH] = [builder.eval(input[0][0]), builder.eval(input[1][0]), builder.eval(C::N::zero())]; builder.push_op(DslIr::CircuitPoseidon2Permute(state)); [state[0]; BN254_DIGEST_SIZE] diff --git a/crates/recursion/circuit-v2/src/machine/compress.rs b/crates/recursion/circuit-v2/src/machine/compress.rs index 372e970aa3..6e5abdd0ef 100644 --- a/crates/recursion/circuit-v2/src/machine/compress.rs +++ b/crates/recursion/circuit-v2/src/machine/compress.rs @@ -14,6 +14,7 @@ use p3_commit::Mmcs; use p3_field::AbstractField; use p3_matrix::dense::RowMajorMatrix; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; use sp1_recursion_compiler::ir::{Builder, Ext, Felt, SymbolicFelt}; use sp1_recursion_core_v2::{ @@ -24,7 +25,8 @@ use sp1_recursion_core_v2::{ use sp1_stark::{ air::{MachineAir, POSEIDON_NUM_WORDS, PV_DIGEST_NUM_WORDS}, baby_bear_poseidon2::BabyBearPoseidon2, - ProofShape, ShardProof, StarkGenericConfig, StarkMachine, StarkVerifyingKey, Word, DIGEST_SIZE, + Dom, ProofShape, ShardProof, StarkGenericConfig, StarkMachine, StarkVerifyingKey, Word, + DIGEST_SIZE, }; use crate::{ @@ -61,6 +63,9 @@ pub struct SP1CompressWitnessVariable< } /// An input layout for the reduce verifier. +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(bound(serialize = "ShardProof: Serialize, Dom: Serialize"))] +#[serde(bound(deserialize = "ShardProof: Deserialize<'de>, Dom: DeserializeOwned"))] pub struct SP1CompressWitnessValues { pub vks_and_proofs: Vec<(StarkVerifyingKey, ShardProof)>, pub is_complete: bool, diff --git a/crates/recursion/circuit-v2/src/machine/core.rs b/crates/recursion/circuit-v2/src/machine/core.rs index b074be6275..4dd813f2b8 100644 --- a/crates/recursion/circuit-v2/src/machine/core.rs +++ b/crates/recursion/circuit-v2/src/machine/core.rs @@ -11,6 +11,7 @@ use p3_commit::Mmcs; use p3_field::AbstractField; use p3_matrix::dense::RowMajorMatrix; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; use sp1_core_machine::{ cpu::MAX_CPU_LOG_DEGREE, riscv::{RiscvAir, MAX_LOG_NUMBER_OF_SHARDS}, @@ -20,7 +21,7 @@ use sp1_recursion_core_v2::air::PV_DIGEST_NUM_WORDS; use sp1_stark::{ air::{PublicValues, POSEIDON_NUM_WORDS}, baby_bear_poseidon2::BabyBearPoseidon2, - ProofShape, StarkMachine, Word, + Dom, ProofShape, StarkMachine, Word, }; use sp1_stark::{ShardProof, StarkGenericConfig, StarkVerifyingKey}; @@ -54,7 +55,9 @@ pub struct SP1RecursionWitnessVariable< pub is_first_shard: Felt, } -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(bound(serialize = "ShardProof: Serialize, Dom: Serialize"))] +#[serde(bound(deserialize = "ShardProof: Deserialize<'de>, Dom: DeserializeOwned"))] pub struct SP1RecursionWitnessValues { pub vk: StarkVerifyingKey, pub shard_proofs: Vec>, diff --git a/crates/recursion/circuit-v2/src/machine/deferred.rs b/crates/recursion/circuit-v2/src/machine/deferred.rs index 3c1c6c3476..0f704dd134 100644 --- a/crates/recursion/circuit-v2/src/machine/deferred.rs +++ b/crates/recursion/circuit-v2/src/machine/deferred.rs @@ -3,6 +3,8 @@ use std::{ borrow::{Borrow, BorrowMut}, }; +use serde::{de::DeserializeOwned, Deserialize, Serialize}; + use p3_air::Air; use p3_baby_bear::BabyBear; use p3_commit::Mmcs; @@ -15,7 +17,7 @@ use sp1_recursion_compiler::ir::{Builder, Ext, Felt}; use sp1_stark::{ air::{MachineAir, POSEIDON_NUM_WORDS}, baby_bear_poseidon2::BabyBearPoseidon2, - ShardProof, StarkMachine, StarkVerifyingKey, Word, + Dom, ShardProof, StarkMachine, StarkVerifyingKey, Word, }; use sp1_recursion_core_v2::{ @@ -46,6 +48,13 @@ pub struct SP1DeferredShape { height: usize, } +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(bound( + serialize = "SC::Challenger: Serialize, ShardProof: Serialize, Dom: Serialize, [SC::Val; DIGEST_SIZE]: Serialize, SC::Digest: Serialize" +))] +#[serde(bound( + deserialize = "SC::Challenger: Deserialize<'de>, ShardProof: Deserialize<'de>, Dom: DeserializeOwned, [SC::Val; DIGEST_SIZE]: Deserialize<'de>, SC::Digest: Deserialize<'de>" +))] pub struct SP1DeferredWitnessValues> { pub vks_and_proofs: Vec<(StarkVerifyingKey, ShardProof)>, pub vk_merkle_data: SP1MerkleProofWitnessValues, diff --git a/crates/recursion/circuit-v2/src/machine/vkey_proof.rs b/crates/recursion/circuit-v2/src/machine/vkey_proof.rs index 49b0f9c59f..7ca18eb97d 100644 --- a/crates/recursion/circuit-v2/src/machine/vkey_proof.rs +++ b/crates/recursion/circuit-v2/src/machine/vkey_proof.rs @@ -5,6 +5,7 @@ use p3_baby_bear::BabyBear; use p3_commit::Mmcs; use p3_field::AbstractField; use p3_matrix::dense::RowMajorMatrix; +use serde::{Deserialize, Serialize}; use sp1_recursion_compiler::ir::{Builder, Felt}; use sp1_recursion_core_v2::DIGEST_SIZE; use sp1_stark::{ @@ -54,6 +55,9 @@ pub struct SP1MerkleProofWitnessVariable< } /// An input layout for the reduce verifier. +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(bound(serialize = "SC::Digest: Serialize"))] +#[serde(bound(deserialize = "SC::Digest: Deserialize<'de>"))] pub struct SP1MerkleProofWitnessValues> { pub vk_merkle_proofs: Vec>, pub values: Vec, diff --git a/crates/recursion/circuit-v2/src/merkle_tree.rs b/crates/recursion/circuit-v2/src/merkle_tree.rs index 57493bf524..b55bdfe2dc 100644 --- a/crates/recursion/circuit-v2/src/merkle_tree.rs +++ b/crates/recursion/circuit-v2/src/merkle_tree.rs @@ -27,7 +27,9 @@ pub struct MerkleTree> { } pub struct VcsError; -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(bound(serialize = "HV::Digest: Serialize"))] +#[serde(bound(deserialize = "HV::Digest: Deserialize<'de>"))] pub struct MerkleProof> { pub index: usize, pub path: Vec, diff --git a/crates/recursion/core/src/stark/config.rs b/crates/recursion/core/src/stark/config.rs index 5d6a5838d1..4bc8743db2 100644 --- a/crates/recursion/core/src/stark/config.rs +++ b/crates/recursion/core/src/stark/config.rs @@ -18,6 +18,10 @@ use super::{poseidon2::bn254_poseidon2_rc3, utils}; pub const DIGEST_SIZE: usize = 1; +pub const OUTER_MULTI_FIELD_CHALLENGER_WIDTH: usize = 3; +pub const OUTER_MULTI_FIELD_CHALLENGER_RATE: usize = 2; +pub const OUTER_MULTI_FIELD_CHALLENGER_DIGEST_SIZE: usize = 1; + /// A configuration for outer recursion. pub type OuterVal = BabyBear; pub type OuterChallenge = BinomialExtensionField; @@ -30,7 +34,13 @@ pub type OuterCompress = TruncatedPermutation; pub type OuterValMmcs = FieldMerkleTreeMmcs; pub type OuterChallengeMmcs = ExtensionMmcs; pub type OuterDft = Radix2DitParallel; -pub type OuterChallenger = MultiField32Challenger; +pub type OuterChallenger = MultiField32Challenger< + OuterVal, + Bn254Fr, + OuterPerm, + OUTER_MULTI_FIELD_CHALLENGER_WIDTH, + OUTER_MULTI_FIELD_CHALLENGER_RATE, +>; pub type OuterPcs = TwoAdicFriPcs; pub type OuterQueryProof = QueryProof; diff --git a/crates/stark/src/config.rs b/crates/stark/src/config.rs index 4ed127bac7..b7da776128 100644 --- a/crates/stark/src/config.rs +++ b/crates/stark/src/config.rs @@ -64,7 +64,9 @@ pub trait StarkGenericConfig: 'static + Send + Sync + Serialize + DeserializeOwn /// The challenger (Fiat-Shamir) implementation used. type Challenger: FieldChallenger> + CanObserve<>::Commitment> - + CanSample; + + CanSample + + Serialize + + DeserializeOwned; /// Get the PCS used by this configuration. fn pcs(&self) -> &Self::Pcs;