diff --git a/Cargo.lock b/Cargo.lock index 0c189b274..d16ae277e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,16 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli", + "gimli 0.27.3", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli 0.28.0", ] [[package]] @@ -41,9 +50,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -56,24 +65,23 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -95,9 +103,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys", @@ -105,9 +113,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -151,9 +159,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -169,7 +177,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -203,7 +211,7 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", "socket2", "waker-fn", @@ -211,9 +219,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -253,13 +261,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -287,16 +295,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line", + "addr2line 0.21.0", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", - "object", + "miniz_oxide", + "object 0.32.0", "rustc-demangle", ] @@ -314,15 +322,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bellperson" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a8623f815c0b1fd89efd9b5f4afbb937f91f51c1ebe3f6dda399c69fa938f3" +checksum = "93eaee4b4753554139ae52ecf0e8b8c128cbc561b32e1bfaa32f70cba8518c1f" dependencies = [ "bincode", "blake2s_simd 1.0.1", @@ -364,9 +372,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ "serde", ] @@ -418,15 +426,15 @@ dependencies = [ [[package]] name = "blake3" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if", - "constant_time_eq 0.2.6", + "constant_time_eq 0.3.0", ] [[package]] @@ -466,16 +474,16 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] [[package]] name = "bls-signatures" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fcead733e20b9afbf3784a3f33cc6d728e0f11a593a35bd6c5c4503db19e06e" +checksum = "edceb821f01a1c93593fbbe47786e01c69c3141baa8e349366f15472b9252bc9" dependencies = [ "bls12_381", "blst", @@ -492,9 +500,9 @@ dependencies = [ [[package]] name = "bls12_381" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62250ece575fa9b22068b3a8d59586f01d426dd7785522efd97632959e71c986" +checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" dependencies = [ "digest 0.9.0", "ff", @@ -519,9 +527,9 @@ dependencies = [ [[package]] name = "blstrs" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ecb6f3a9429706971633edf4b84f922aba9d2e3a7d71bfb450337e64ccb7df0" +checksum = "7a8a8ed6fefbeef4a8c7b460e4110e12c5e22a5b7cf32621aae6ad650c4dcf29" dependencies = [ "blst", "byte-slice-cast", @@ -593,11 +601,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -606,6 +615,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + [[package]] name = "ciborium" version = "0.2.1" @@ -674,23 +694,15 @@ dependencies = [ "inout", ] -[[package]] -name = "cl-sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8573fa3ff8acd6c49e8e113296c54277e82376b96c6ca6307848632cce38e44" -dependencies = [ - "libc", -] - [[package]] name = "cl3" -version = "0.6.5" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f2217b5993b54a819ac8e8569cc429702c8975a88d52c73e530f1f813576a3" +checksum = "215a3aa32ab5d7928c539c4289d1cf144257c3cb05e05a4b7e61d5a6bb6583a5" dependencies = [ - "cl-sys", "libc", + "opencl-sys", + "thiserror", ] [[package]] @@ -703,7 +715,7 @@ dependencies = [ "bitflags 1.3.2", "clap_derive 3.2.25", "clap_lex 0.2.4", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -712,25 +724,24 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.9" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba77a07e4489fb41bd90e8d4201c3eb246b3c2c9ea2ba0bddd6c1d1df87db7d" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", - "clap_derive 4.3.2", + "clap_derive 4.4.0", "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.9" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9b4a88bb4bc35d3d6f65a21b0f0bafe9c894fa00978de242c555ec28bea1c0" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", - "clap_lex 0.5.0", + "clap_lex 0.5.1", "strsim", ] @@ -749,14 +760,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -770,9 +781,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -782,13 +793,13 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", + "windows-sys", ] [[package]] @@ -826,6 +837,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "convert_case" version = "0.4.0" @@ -852,9 +869,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -881,7 +898,7 @@ dependencies = [ "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.27.3", "hashbrown 0.13.2", "log", "regalloc2", @@ -986,7 +1003,7 @@ dependencies = [ "async-std", "cast", "ciborium", - "clap 4.3.9", + "clap 4.4.1", "criterion-plot", "futures", "is-terminal", @@ -1197,7 +1214,7 @@ checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -1238,26 +1255,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "ec-gpu" version = "0.2.0" @@ -1266,9 +1263,9 @@ checksum = "bd63582de2b59ea1aa48d7c1941b5d87618d95484397521b3acdfa0e1e9f5e45" [[package]] name = "ec-gpu-gen" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd09bf9d5313ad60379f70250590bccc10f7a04e2773062ac13255a37022584e" +checksum = "892df2aa20abec5b816e15d5d6383892ca142077708efa3067dd3ac44b75c664" dependencies = [ "bitvec", "crossbeam-channel", @@ -1289,9 +1286,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" @@ -1316,11 +1313,17 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1381,7 +1384,7 @@ checksum = "55a9a55d1dab3b07854648d48e366f684aefe2ac78ae28cec3bf65e3cd53d9a3" dependencies = [ "execute-command-tokens", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -1411,6 +1414,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "fdlimit" version = "0.2.1" @@ -1422,9 +1431,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "bitvec", "rand_core", @@ -1446,7 +1455,7 @@ dependencies = [ [[package]] name = "fil_actor_account" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "fil_actors_runtime", @@ -1482,7 +1491,7 @@ dependencies = [ [[package]] name = "fil_actor_cron" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1497,7 +1506,7 @@ dependencies = [ [[package]] name = "fil_actor_datacap" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "cid 0.10.1", "fil_actors_runtime", @@ -1518,7 +1527,7 @@ dependencies = [ [[package]] name = "fil_actor_eam" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1539,7 +1548,7 @@ dependencies = [ [[package]] name = "fil_actor_ethaccount" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "fil_actors_runtime", "frc42_dispatch", @@ -1555,7 +1564,7 @@ dependencies = [ [[package]] name = "fil_actor_evm" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1579,7 +1588,7 @@ dependencies = [ [[package]] name = "fil_actor_init" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1598,7 +1607,7 @@ dependencies = [ [[package]] name = "fil_actor_market" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1621,7 +1630,7 @@ dependencies = [ [[package]] name = "fil_actor_miner" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "byteorder", @@ -1646,7 +1655,7 @@ dependencies = [ [[package]] name = "fil_actor_multisig" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1657,7 +1666,7 @@ dependencies = [ "fvm_ipld_encoding 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "fvm_ipld_hamt 0.7.0", "fvm_shared 3.4.0", - "indexmap", + "indexmap 1.9.3", "integer-encoding", "num-derive", "num-traits", @@ -1667,7 +1676,7 @@ dependencies = [ [[package]] name = "fil_actor_paych" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1684,12 +1693,12 @@ dependencies = [ [[package]] name = "fil_actor_placeholder" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" [[package]] name = "fil_actor_power" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1699,7 +1708,7 @@ dependencies = [ "fvm_ipld_encoding 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "fvm_ipld_hamt 0.7.0", "fvm_shared 3.4.0", - "indexmap", + "indexmap 1.9.3", "integer-encoding", "lazy_static", "log", @@ -1711,7 +1720,7 @@ dependencies = [ [[package]] name = "fil_actor_reward" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "fil_actors_runtime", "fvm_ipld_blockstore 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1727,7 +1736,7 @@ dependencies = [ [[package]] name = "fil_actor_system" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1743,7 +1752,7 @@ dependencies = [ [[package]] name = "fil_actor_verifreg" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -1765,7 +1774,7 @@ dependencies = [ [[package]] name = "fil_actors_evm_shared" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "fil_actors_runtime", "fvm_ipld_encoding 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1778,7 +1787,7 @@ dependencies = [ [[package]] name = "fil_actors_runtime" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "byteorder", @@ -1820,7 +1829,7 @@ dependencies = [ [[package]] name = "fil_builtin_actors_bundle" version = "12.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "cid 0.10.1", "clap 3.2.25", @@ -1949,22 +1958,6 @@ dependencies = [ "fvm_shared 3.5.0", ] -[[package]] -name = "fil_pasta_curves" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3303ea3c462ab949ab95b49f6e6d255d8d9396ebd4f1626ccb34c7037615aa8f" -dependencies = [ - "blake2b_simd", - "ec-gpu", - "ff", - "group", - "lazy_static", - "rand", - "static_assertions", - "subtle", -] - [[package]] name = "fil_readonly_actor" version = "0.1.0" @@ -2007,9 +2000,8 @@ dependencies = [ [[package]] name = "filecoin-hashers" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d7e656d4f01d7772ef2dd0f59854c8f904370a946053cf37ef420c854d9a35" +version = "10.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "anyhow", "bellperson", @@ -2027,19 +2019,20 @@ dependencies = [ [[package]] name = "filecoin-proofs" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00449c0e89be0922127e7e927e578247825450abdaf0da2fc30b733cb0e535b" +version = "15.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "anyhow", "bellperson", "bincode", "blake2b_simd", "blstrs", + "ff", "filecoin-hashers", "fr32", "generic-array", "hex", + "iowrap", "lazy_static", "log", "memmap2", @@ -2059,9 +2052,8 @@ dependencies = [ [[package]] name = "filecoin-proofs-api" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347a43603e12b147cc3d8285fee27771e1e9702d90f1f8e5018b8dd96b5da467" +version = "15.0.0" +source = "git+https://github.com/filecoin-project/rust-filecoin-proofs-api?branch=synthetic-porep#ea3758cd5390515e3ef9a106a313522b6c1e96b4" dependencies = [ "anyhow", "bellperson", @@ -2077,24 +2069,24 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "windows-sys", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -2127,9 +2119,8 @@ dependencies = [ [[package]] name = "fr32" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f07b8a600b8c699f8ddc5f520231bc2aac03e944c64055eccfd9a959c3fd60" +version = "8.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "anyhow", "blstrs", @@ -2270,7 +2261,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2287,7 +2278,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -2364,7 +2355,7 @@ name = "fvm-bench" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.3.9", + "clap 4.4.1", "env_logger 0.10.0", "fvm", "fvm_integration_tests", @@ -2410,7 +2401,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-std", - "base64 0.21.2", + "base64 0.21.3", "cid 0.10.1", "colored", "criterion", @@ -2773,7 +2764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8704b912372b9640f625fef1b8af24873e27feba66dcbae3f2a49f486a26589d" dependencies = [ "anyhow", - "bitflags 2.3.3", + "bitflags 2.4.0", "blake2b_simd", "cid 0.10.1", "data-encoding", @@ -2797,7 +2788,7 @@ version = "3.5.0" dependencies = [ "anyhow", "arbitrary", - "bitflags 2.3.3", + "bitflags 2.4.0", "blake2b_simd", "bls-signatures", "cid 0.10.1", @@ -2843,7 +2834,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "debugid", "fxhash", "serde", @@ -2878,10 +2869,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + [[package]] name = "glob" version = "0.3.1" @@ -2913,9 +2910,9 @@ dependencies = [ [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand", @@ -2945,6 +2942,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.4.1" @@ -2962,24 +2965,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] [[package]] name = "hex-literal" @@ -3028,6 +3025,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + [[package]] name = "humantime" version = "2.1.0" @@ -3055,6 +3061,16 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "inout" version = "0.1.3" @@ -3090,20 +3106,28 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys", ] +[[package]] +name = "iowrap" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d778bd9a4fa138d91f62017e3ac5ff905d2b829a30d3b1be473cb57d32ad15a" +dependencies = [ + "memchr", +] + [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "hermit-abi 0.3.2", + "rustix 0.38.10", "windows-sys", ] @@ -3136,15 +3160,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "ittapi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e648c437172ce7d3ac35ca11a068755072054826fa455a916b43524fa4a62a7" +checksum = "41e0d0b7b3b53d92a7e8b80ede3400112a6b8b4c98d1f5b8b16bb787c780582c" dependencies = [ "anyhow", "ittapi-sys", @@ -3159,9 +3183,9 @@ checksum = "dc34bcc94d009cbe32b56824c5aef7e4214e7da042b45d8c7b5a16f133db9f89" [[package]] name = "ittapi-sys" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b32a4d23f72548178dde54f3c12c6b6a08598e25575c0d0fa5bd861e0dc1a5" +checksum = "f2f8763c96e54e6d6a0dccc2990d8b5e33e3313aaeae6185921a3f4c1614a77c" dependencies = [ "cc", ] @@ -3307,6 +3331,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + [[package]] name = "lock_api" version = "0.4.10" @@ -3319,9 +3349,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "value-bag", ] @@ -3337,9 +3367,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae" [[package]] name = "memfd" @@ -3347,7 +3377,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix", + "rustix 0.37.23", ] [[package]] @@ -3379,9 +3409,9 @@ dependencies = [ [[package]] name = "merkletree" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d348b5b0d1707be1c8a727b7078daa08e2a3051d63b35715a19c35a324d2aaac" +checksum = "4a0ed8c0ce1e281870da29266398541a0dbab168f5fb5fd36d7ef2bbdbf808a3" dependencies = [ "anyhow", "arrayref", @@ -3410,15 +3440,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3430,9 +3451,9 @@ dependencies = [ [[package]] name = "minstant" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5dcfca9a0725105ac948b84cfeb69c3942814c696326743797215413f854b9" +checksum = "7df94bf4a15ed69e64ea45405e504ef293a3614413e7d8f5529112c5acd4a114" dependencies = [ "ctor", "libc", @@ -3506,9 +3527,9 @@ dependencies = [ [[package]] name = "neptune" -version = "8.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dedb261f1b35ddfd867295eacbc25eb78b4b5b63b08b1c0dc4c1b5ef0e5b2c2" +checksum = "4227e5557caad6d2a910b7770f2479f0c9aeb8ddc1dc537623cb6ffec7f01d31" dependencies = [ "bellperson", "blake2s_simd 0.5.11", @@ -3517,11 +3538,11 @@ dependencies = [ "ec-gpu", "ec-gpu-gen", "ff", - "fil_pasta_curves", "generic-array", "itertools 0.8.2", - "lazy_static", "log", + "pasta_curves", + "serde", "trait-set", ] @@ -3537,9 +3558,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", @@ -3551,9 +3572,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -3564,9 +3585,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", "serde", @@ -3619,20 +3640,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.2", "libc", ] @@ -3644,7 +3665,16 @@ checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", "hashbrown 0.13.2", - "indexmap", + "indexmap 1.9.3", + "memchr", +] + +[[package]] +name = "object" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +dependencies = [ "memchr", ] @@ -3666,11 +3696,20 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "opencl-sys" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e75919008b8ed7ce9620e2b3580c648db40c7f564a368f271b2647145046d8ba" +dependencies = [ + "libc", +] + [[package]] name = "opencl3" -version = "0.6.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931cc2ab3068142384dbdaba142681c11b315cf3b96c7a59e8480d062363387f" +checksum = "c247ee0c98af8a67ab9c836ed2ea663ac19a17d8bae71325b509835e536c18ad" dependencies = [ "cl3", "libc", @@ -3682,20 +3721,11 @@ version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "pairing" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" dependencies = [ "group", ] @@ -3706,11 +3736,52 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "pasta_curves" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" +dependencies = [ + "blake2b_simd", + "ec-gpu", + "ff", + "group", + "hex", + "lazy_static", + "rand", + "serde", + "static_assertions", + "subtle", +] + [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pathdiff" @@ -3726,9 +3797,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3788,9 +3859,9 @@ dependencies = [ [[package]] name = "positioned-io" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b9485cf7f528baf34edd811ec8283a168864912e11d0b7d3e0510738761114" +checksum = "677d0208bedc5252e7054a4f65f24f2ccfe740178fb2284028ac5f06efbdcc55" dependencies = [ "byteorder", "libc", @@ -3805,13 +3876,11 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -3851,9 +3920,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3891,9 +3960,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3965,15 +4034,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -3983,22 +4043,11 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - [[package]] name = "regalloc2" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12513beb38dd35aab3ac5f5b89fd0330159a0dc21d5309d75073011bbc8032b0" +checksum = "5b4dcbd3a2ae7fb94b5813fa0e957c6ab51bf5d0a8ee1b69e0c2d0f1e6eb8485" dependencies = [ "hashbrown 0.13.2", "log", @@ -4009,9 +4058,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", @@ -4020,9 +4081,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "replace_with" @@ -4051,14 +4112,13 @@ dependencies = [ [[package]] name = "rust-gpu-tools" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2838e99bd4c9b3e6a963194440c6c5b66721d3f127625d709236ecaa1a730f" +checksum = "b0ce78d5548a74fad25177825d0c20f4cfbc6eaf796bcee53afe792e39ede4e2" dependencies = [ - "dirs", "fil-rustacuda", "hex", - "lazy_static", + "home", "log", "once_cell", "opencl3", @@ -4113,29 +4173,42 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", "windows-sys", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -4148,21 +4221,21 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -4178,22 +4251,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -4222,9 +4295,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -4233,13 +4306,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -4290,18 +4363,17 @@ dependencies = [ [[package]] name = "sha2-asm" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf27176fb5d15398e3a479c652c20459d9dac830dedd1fa55b42a77dbcdbfcea" +checksum = "f27ba7066011e3fb30d808b51affff34f0a66d3a03a58edd787c6e420e40e44e" dependencies = [ "cc", ] [[package]] name = "sha2raw" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ec45c74ebb91d25e61e14cfc1925e7571723ae14a38fc6c8bd0b2e516db101" +version = "10.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "byteorder", "cpufeatures", @@ -4324,9 +4396,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -4339,9 +4411,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -4388,9 +4460,8 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "storage-proofs-core" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f756ef2dd06efda2eb30bf6806399d493072d8469b0a724f1905dc051fea59c1" +version = "15.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "aes", "anyhow", @@ -4423,16 +4494,17 @@ dependencies = [ [[package]] name = "storage-proofs-porep" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2450a62eb009602a4a4d697a027ab1025657cd76b325a99dfeb8d263d44b1c5c" +version = "15.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "anyhow", "bellperson", "bincode", + "blake2b_simd", "blstrs", "byte-slice-cast", "byteorder", + "chacha20", "crossbeam", "fdlimit", "ff", @@ -4462,9 +4534,8 @@ dependencies = [ [[package]] name = "storage-proofs-post" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e034a55f3c5137120c4cd1abb717cd397c660447c4393c2550be3ee5b070c4" +version = "15.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "anyhow", "bellperson", @@ -4485,9 +4556,8 @@ dependencies = [ [[package]] name = "storage-proofs-update" -version = "14.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433b2832153e2744bfa87176dcb0b587392b57fd1bd770804d366c98822285a" +version = "15.0.0" +source = "git+https://github.com/filecoin-project/rust-fil-proofs?branch=synthetic-porep#fc054cd422f7bb4738425e275e1b73de40cacc27" dependencies = [ "anyhow", "bellperson", @@ -4545,9 +4615,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.22" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -4574,9 +4644,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -4584,30 +4654,29 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.8" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-env" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45107136c2ddf8c4b87453c02294fd0adf41751796e81e8ba3f7fd951977ab57" +checksum = "9547444bfe52cbd79515c6c8087d8ae6ca8d64d2d31a27746320f5cb81d1a15c" dependencies = [ - "once_cell", + "parking_lot", ] [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", + "fastrand 2.0.0", + "redox_syscall", + "rustix 0.38.10", "windows-sys", ] @@ -4628,22 +4697,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] @@ -4726,9 +4795,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -4759,9 +4828,9 @@ checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -4776,9 +4845,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" [[package]] name = "value-bag" @@ -4795,7 +4864,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vm_api" version = "1.0.0" -source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#f46d4dc4cbd631a506ef70a5a198275f1d96339d" +source = "git+https://github.com/filecoin-project/builtin-actors?branch=master#fe72aa8e14bc566d661d47625dcdbdd960bf4525" dependencies = [ "anyhow", "cid 0.10.1", @@ -4859,7 +4928,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4893,7 +4962,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4915,9 +4984,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.29.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" dependencies = [ "leb128", ] @@ -4928,7 +4997,7 @@ version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ea896273ea99b15132414be1da01ab0d8836415083298ecaffbe308eaac87a" dependencies = [ - "indexmap", + "indexmap 1.9.3", "url", ] @@ -4938,18 +5007,28 @@ version = "0.107.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" dependencies = [ - "indexmap", + "indexmap 1.9.3", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.112.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" +dependencies = [ + "indexmap 2.0.0", "semver", ] [[package]] name = "wasmprinter" -version = "0.2.59" +version = "0.2.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc960b30b84abca377768f3c62cff3a1c74db8c0f6759ed581827da0bd3a3fed" +checksum = "34ddf5892036cd4b780d505eff1194a0cbc10ed896097656fdcea3744b5e7c2f" dependencies = [ "anyhow", - "wasmparser 0.107.0", + "wasmparser 0.112.0", ] [[package]] @@ -4963,10 +5042,10 @@ dependencies = [ "bumpalo", "cfg-if", "fxprof-processed-profile", - "indexmap", + "indexmap 1.9.3", "libc", "log", - "object", + "object 0.30.4", "once_cell", "paste", "psm", @@ -5004,9 +5083,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.27.3", "log", - "object", + "object 0.30.4", "target-lexicon", "thiserror", "wasmparser 0.107.0", @@ -5024,8 +5103,8 @@ dependencies = [ "cranelift-codegen", "cranelift-control", "cranelift-native", - "gimli", - "object", + "gimli 0.27.3", + "object 0.30.4", "target-lexicon", "wasmtime-environ", ] @@ -5038,10 +5117,10 @@ checksum = "41f9e58e0ee7d43ff13e75375c726b16bce022db798d3a099a65eeaa7d7a544b" dependencies = [ "anyhow", "cranelift-entity", - "gimli", - "indexmap", + "gimli 0.27.3", + "indexmap 1.9.3", "log", - "object", + "object 0.30.4", "serde", "target-lexicon", "thiserror", @@ -5055,17 +5134,17 @@ version = "10.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f0f2eaeb01bb67266416507829bd8e0bb60278444e4cbd048e280833ebeaa02" dependencies = [ - "addr2line", + "addr2line 0.19.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli", + "gimli 0.27.3", "ittapi", "log", - "object", + "object 0.30.4", "rustc-demangle", - "rustix", + "rustix 0.37.23", "serde", "target-lexicon", "wasmtime-environ", @@ -5103,7 +5182,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap", + "indexmap 1.9.3", "libc", "log", "mach", @@ -5111,7 +5190,7 @@ dependencies = [ "memoffset 0.8.0", "paste", "rand", - "rustix", + "rustix 0.37.23", "sptr", "wasmtime-asm-macros", "wasmtime-environ", @@ -5133,21 +5212,21 @@ dependencies = [ [[package]] name = "wast" -version = "60.0.0" +version = "64.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd06cc744b536e30387e72a48fdd492105b9c938bb4f415c39c616a7a0a697ad" +checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.29.0", + "wasm-encoder 0.32.0", ] [[package]] name = "wat" -version = "1.0.66" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abe520f0ab205366e9ac7d3e6b2fc71de44e32a2b58f2ec871b6b575bdcea3b" +checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" dependencies = [ "wast", ] @@ -5215,9 +5294,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -5230,45 +5309,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "wyz" @@ -5312,23 +5391,23 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.29", ] [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", diff --git a/Cargo.toml b/Cargo.toml index ebb8457bb..4f2a99be0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,3 +34,7 @@ opt-level = "z" strip = true codegen-units = 1 incremental = false + +[patch.crates-io] +filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", branch = "synthetic-porep" } +#actors-v10 = { package = "fil_builtin_actors_bundle", git = "https://github.com/cryptonemo/builtin-actors", branch = "synthetic-porep" } diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml index e7cd2ccd5..e0c40fccb 100644 --- a/fvm/Cargo.toml +++ b/fvm/Cargo.toml @@ -27,7 +27,8 @@ serde_tuple = "0.5" lazy_static = "1.4.0" derive_more = "0.99.17" replace_with = "0.1.7" -filecoin-proofs-api = { version = "14", default-features = false } +#filecoin-proofs-api = { version = "14", default-features = false } +filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", branch = "synthetic-porep", default-features = false } rayon = "1" num_cpus = "1.15.0" log = "0.4.19" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5f489d359..ee6c1e260 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.68.2" +channel = "1.70.0" components = ["clippy", "llvm-tools-preview", "rustfmt"] targets = ["wasm32-unknown-unknown"] diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 03245f610..bba615b14 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -31,9 +31,10 @@ bitflags = { version = "2.3.3", features = ["serde"] } ## non-wasm dependencies; these dependencies and the respective code is ## only activated through non-default features, which the Kernel enables, but ## not the actors. -filecoin-proofs-api = { version = "14", default-features = false, optional = true } +#filecoin-proofs-api = { version = "14", default-features = false, optional = true } +filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", branch = "synthetic-porep", default-features = false, optional = true } libsecp256k1 = { version = "0.7", optional = true } -bls-signatures = { version = "0.13", default-features = false, optional = true } +bls-signatures = { version = "0.14", default-features = false, optional = true } [dev-dependencies] rand = "0.8" diff --git a/shared/src/sector/registered_proof.rs b/shared/src/sector/registered_proof.rs index b92fda1d2..2535c19b5 100644 --- a/shared/src/sector/registered_proof.rs +++ b/shared/src/sector/registered_proof.rs @@ -12,6 +12,7 @@ use crate::clock; use crate::version::NetworkVersion; /// Seal proof type which defines the version and sector size. +#[allow(non_camel_case_types)] #[derive(PartialEq, Eq, Copy, Clone, Debug, Hash)] pub enum RegisteredSealProof { StackedDRG2KiBV1, @@ -25,6 +26,12 @@ pub enum RegisteredSealProof { StackedDRG8MiBV1P1, StackedDRG32GiBV1P1, StackedDRG64GiBV1P1, + + StackedDRG2KiBV1P1_Feat_SyntheticPoRep, + StackedDRG512MiBV1P1_Feat_SyntheticPoRep, + StackedDRG8MiBV1P1_Feat_SyntheticPoRep, + StackedDRG32GiBV1P1_Feat_SyntheticPoRep, + StackedDRG64GiBV1P1_Feat_SyntheticPoRep, // TODO: get rid of this option once we no longer need go compat. // We use it to ensure that we can deserialize bad values here because go checks this value // later. @@ -77,12 +84,22 @@ impl RegisteredSealProof { pub fn proof_size(self) -> Result { use RegisteredSealProof::*; match self { - StackedDRG2KiBV1 | StackedDRG512MiBV1 | StackedDRG8MiBV1 | StackedDRG2KiBV1P1 - | StackedDRG512MiBV1P1 | StackedDRG8MiBV1P1 => Ok(192), - - StackedDRG32GiBV1 | StackedDRG64GiBV1 | StackedDRG32GiBV1P1 | StackedDRG64GiBV1P1 => { - Ok(1920) - } + StackedDRG2KiBV1 + | StackedDRG512MiBV1 + | StackedDRG8MiBV1 + | StackedDRG2KiBV1P1 + | StackedDRG512MiBV1P1 + | StackedDRG8MiBV1P1 + | StackedDRG2KiBV1P1_Feat_SyntheticPoRep + | StackedDRG512MiBV1P1_Feat_SyntheticPoRep + | StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(192), + + StackedDRG32GiBV1 + | StackedDRG64GiBV1 + | StackedDRG32GiBV1P1 + | StackedDRG64GiBV1P1 + | StackedDRG32GiBV1P1_Feat_SyntheticPoRep + | StackedDRG64GiBV1P1_Feat_SyntheticPoRep => Ok(1920), Invalid(i) => Err(format!("unsupported proof type: {}", i)), } } @@ -189,11 +206,21 @@ impl RegisteredSealProof { pub fn sector_size(self) -> Result { use RegisteredSealProof::*; match self { - StackedDRG2KiBV1 | StackedDRG2KiBV1P1 => Ok(SectorSize::_2KiB), - StackedDRG8MiBV1 | StackedDRG8MiBV1P1 => Ok(SectorSize::_8MiB), - StackedDRG512MiBV1 | StackedDRG512MiBV1P1 => Ok(SectorSize::_512MiB), - StackedDRG32GiBV1 | StackedDRG32GiBV1P1 => Ok(SectorSize::_32GiB), - StackedDRG64GiBV1 | StackedDRG64GiBV1P1 => Ok(SectorSize::_64GiB), + StackedDRG2KiBV1 | StackedDRG2KiBV1P1 | StackedDRG2KiBV1P1_Feat_SyntheticPoRep => { + Ok(SectorSize::_2KiB) + } + StackedDRG8MiBV1 | StackedDRG8MiBV1P1 | StackedDRG8MiBV1P1_Feat_SyntheticPoRep => { + Ok(SectorSize::_8MiB) + } + StackedDRG512MiBV1 + | StackedDRG512MiBV1P1 + | StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(SectorSize::_512MiB), + StackedDRG32GiBV1 | StackedDRG32GiBV1P1 | StackedDRG32GiBV1P1_Feat_SyntheticPoRep => { + Ok(SectorSize::_32GiB) + } + StackedDRG64GiBV1 | StackedDRG64GiBV1P1 | StackedDRG64GiBV1P1_Feat_SyntheticPoRep => { + Ok(SectorSize::_64GiB) + } Invalid(i) => Err(format!("unsupported proof type: {}", i)), } } @@ -204,11 +231,17 @@ impl RegisteredSealProof { // Resolve to seal proof and then compute size from that. use RegisteredSealProof::*; match self { - StackedDRG64GiBV1 | StackedDRG64GiBV1P1 => Ok(2300), - StackedDRG32GiBV1 | StackedDRG32GiBV1P1 => Ok(2349), - StackedDRG2KiBV1 | StackedDRG2KiBV1P1 => Ok(2), - StackedDRG8MiBV1 | StackedDRG8MiBV1P1 => Ok(2), - StackedDRG512MiBV1 | StackedDRG512MiBV1P1 => Ok(2), + StackedDRG64GiBV1 | StackedDRG64GiBV1P1 | StackedDRG64GiBV1P1_Feat_SyntheticPoRep => { + Ok(2300) + } + StackedDRG32GiBV1 | StackedDRG32GiBV1P1 | StackedDRG32GiBV1P1_Feat_SyntheticPoRep => { + Ok(2349) + } + StackedDRG2KiBV1 | StackedDRG2KiBV1P1 | StackedDRG2KiBV1P1_Feat_SyntheticPoRep => Ok(2), + StackedDRG8MiBV1 | StackedDRG8MiBV1P1 | StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(2), + StackedDRG512MiBV1 + | StackedDRG512MiBV1P1 + | StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(2), Invalid(i) => Err(format!("unsupported proof type: {}", i)), } } @@ -218,11 +251,21 @@ impl RegisteredSealProof { pub fn registered_winning_post_proof(self) -> Result { use RegisteredPoStProof::*; match self { - Self::StackedDRG64GiBV1 | Self::StackedDRG64GiBV1P1 => Ok(StackedDRGWinning64GiBV1), - Self::StackedDRG32GiBV1 | Self::StackedDRG32GiBV1P1 => Ok(StackedDRGWinning32GiBV1), - Self::StackedDRG2KiBV1 | Self::StackedDRG2KiBV1P1 => Ok(StackedDRGWinning2KiBV1), - Self::StackedDRG8MiBV1 | Self::StackedDRG8MiBV1P1 => Ok(StackedDRGWinning8MiBV1), - Self::StackedDRG512MiBV1 | Self::StackedDRG512MiBV1P1 => Ok(StackedDRGWinning512MiBV1), + Self::StackedDRG64GiBV1 + | Self::StackedDRG64GiBV1P1 + | Self::StackedDRG64GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWinning64GiBV1), + Self::StackedDRG32GiBV1 + | Self::StackedDRG32GiBV1P1 + | Self::StackedDRG32GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWinning32GiBV1), + Self::StackedDRG2KiBV1 + | Self::StackedDRG2KiBV1P1 + | Self::StackedDRG2KiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWinning2KiBV1), + Self::StackedDRG8MiBV1 + | Self::StackedDRG8MiBV1P1 + | Self::StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWinning8MiBV1), + Self::StackedDRG512MiBV1 + | Self::StackedDRG512MiBV1P1 + | Self::StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWinning512MiBV1), Self::Invalid(_) => Err(format!( "Unsupported mapping from {:?} to PoSt-winning RegisteredProof", self @@ -235,11 +278,21 @@ impl RegisteredSealProof { pub fn registered_window_post_proof(self) -> Result { use RegisteredPoStProof::*; match self { - Self::StackedDRG64GiBV1 | Self::StackedDRG64GiBV1P1 => Ok(StackedDRGWindow64GiBV1P1), - Self::StackedDRG32GiBV1 | Self::StackedDRG32GiBV1P1 => Ok(StackedDRGWindow32GiBV1P1), - Self::StackedDRG2KiBV1 | Self::StackedDRG2KiBV1P1 => Ok(StackedDRGWindow2KiBV1P1), - Self::StackedDRG8MiBV1 | Self::StackedDRG8MiBV1P1 => Ok(StackedDRGWindow8MiBV1P1), - Self::StackedDRG512MiBV1 | Self::StackedDRG512MiBV1P1 => Ok(StackedDRGWindow512MiBV1P1), + Self::StackedDRG64GiBV1 + | Self::StackedDRG64GiBV1P1 + | Self::StackedDRG64GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow64GiBV1P1), + Self::StackedDRG32GiBV1 + | Self::StackedDRG32GiBV1P1 + | Self::StackedDRG32GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow32GiBV1P1), + Self::StackedDRG2KiBV1 + | Self::StackedDRG2KiBV1P1 + | Self::StackedDRG2KiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow2KiBV1P1), + Self::StackedDRG8MiBV1 + | Self::StackedDRG8MiBV1P1 + | Self::StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow8MiBV1P1), + Self::StackedDRG512MiBV1 + | Self::StackedDRG512MiBV1P1 + | Self::StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRGWindow512MiBV1P1), Self::Invalid(_) => Err(format!( "Unsupported mapping from {:?} to PoSt-window RegisteredProof", self @@ -251,11 +304,21 @@ impl RegisteredSealProof { pub fn registered_update_proof(self) -> Result { use RegisteredUpdateProof::*; match self { - Self::StackedDRG64GiBV1 | Self::StackedDRG64GiBV1P1 => Ok(StackedDRG64GiBV1), - Self::StackedDRG32GiBV1 | Self::StackedDRG32GiBV1P1 => Ok(StackedDRG32GiBV1), - Self::StackedDRG2KiBV1 | Self::StackedDRG2KiBV1P1 => Ok(StackedDRG2KiBV1), - Self::StackedDRG8MiBV1 | Self::StackedDRG8MiBV1P1 => Ok(StackedDRG8MiBV1), - Self::StackedDRG512MiBV1 | Self::StackedDRG512MiBV1P1 => Ok(StackedDRG512MiBV1), + Self::StackedDRG64GiBV1 + | Self::StackedDRG64GiBV1P1 + | Self::StackedDRG64GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG64GiBV1), + Self::StackedDRG32GiBV1 + | Self::StackedDRG32GiBV1P1 + | Self::StackedDRG32GiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG32GiBV1), + Self::StackedDRG2KiBV1 + | Self::StackedDRG2KiBV1P1 + | Self::StackedDRG2KiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG2KiBV1), + Self::StackedDRG8MiBV1 + | Self::StackedDRG8MiBV1P1 + | Self::StackedDRG8MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG8MiBV1), + Self::StackedDRG512MiBV1 + | Self::StackedDRG512MiBV1P1 + | Self::StackedDRG512MiBV1P1_Feat_SyntheticPoRep => Ok(StackedDRG512MiBV1), Self::Invalid(_) => Err(format!( "Unsupported mapping from {:?} to Update RegisteredProof", self @@ -336,6 +399,12 @@ i64_conversion! { StackedDRG512MiBV1P1 => 7, StackedDRG32GiBV1P1 => 8, StackedDRG64GiBV1P1 => 9, + + StackedDRG2KiBV1P1_Feat_SyntheticPoRep => 10, + StackedDRG8MiBV1P1_Feat_SyntheticPoRep => 11, + StackedDRG512MiBV1P1_Feat_SyntheticPoRep => 12, + StackedDRG32GiBV1P1_Feat_SyntheticPoRep => 13, + StackedDRG64GiBV1P1_Feat_SyntheticPoRep => 14, } i64_conversion! { @@ -381,6 +450,21 @@ impl TryFrom for filecoin_proofs_api::RegisteredSealProof { StackedDRG2KiBV1P1 => Ok(Self::StackedDrg2KiBV1_1), StackedDRG8MiBV1P1 => Ok(Self::StackedDrg8MiBV1_1), StackedDRG512MiBV1P1 => Ok(Self::StackedDrg512MiBV1_1), + StackedDRG64GiBV1P1_Feat_SyntheticPoRep => { + Ok(Self::StackedDrg64GiBV1_1_Feat_SyntheticPoRep) + } + StackedDRG32GiBV1P1_Feat_SyntheticPoRep => { + Ok(Self::StackedDrg32GiBV1_1_Feat_SyntheticPoRep) + } + StackedDRG2KiBV1P1_Feat_SyntheticPoRep => { + Ok(Self::StackedDrg2KiBV1_1_Feat_SyntheticPoRep) + } + StackedDRG8MiBV1P1_Feat_SyntheticPoRep => { + Ok(Self::StackedDrg8MiBV1_1_Feat_SyntheticPoRep) + } + StackedDRG512MiBV1P1_Feat_SyntheticPoRep => { + Ok(Self::StackedDrg512MiBV1_1_Feat_SyntheticPoRep) + } Invalid(i) => Err(format!("unsupported proof type: {}", i)), } } diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml index 961b4a6c0..e8a2d031a 100644 --- a/testing/integration/Cargo.toml +++ b/testing/integration/Cargo.toml @@ -38,8 +38,9 @@ fvm_test_actors = { path = "../test_actors" } fvm_gas_calibration_shared = { path = "../calibration/shared" } blake2b_simd = "1.0.1" serde_json = "1.0" -bls-signatures = { version = "0.13", default-features = false } wat = "1.0.66" +bls-signatures = { version = "0.14", default-features = false } +#wat = "1.0.51" hex = "0.4.3" [features]