diff --git a/Cargo.lock b/Cargo.lock index bd6df0910..c2c62f2c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,9 +29,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -40,24 +40,67 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayref" @@ -78,36 +121,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-executor" -version = "1.6.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ - "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] [[package]] name = "async-global-executor" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-executor", - "async-io", - "async-lock", + "async-io 2.3.2", + "async-lock 3.3.0", "blocking", - "futures-lite", + "futures-lite 2.3.0", "once_cell", ] @@ -117,27 +171,57 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix 0.37.26", + "polling 2.8.0", + "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.0", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", ] [[package]] @@ -146,15 +230,15 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -168,19 +252,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] @@ -213,27 +297,26 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -264,9 +347,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -294,9 +377,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -344,25 +427,23 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.3.1", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "sha2 0.10.8", "tinyvec", @@ -370,9 +451,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -388,36 +469,36 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] [[package]] name = "cargo_metadata" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", @@ -447,12 +528,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -462,9 +540,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "num-traits", ] @@ -509,9 +587,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -519,9 +597,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstyle", "clap_lex", @@ -529,21 +607,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "coins-bip32" @@ -583,7 +661,7 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bech32", "bs58", "digest 0.10.7", @@ -597,32 +675,39 @@ dependencies = [ "thiserror", ] +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-hex" -version = "1.9.1" +version = "1.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37be52ef5e3b394db27a2341010685ad5103c72ac15ce2e9420a7e8f93f342c" +checksum = "70ff96486ccc291d36a958107caf2c0af8c78c0af7d31ae2f35ce055130de1a6" dependencies = [ "cfg-if", "cpufeatures", "hex", + "proptest", "serde", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" @@ -632,9 +717,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -642,9 +727,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -657,21 +742,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -681,9 +763,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core", @@ -712,12 +794,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" +checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] @@ -766,15 +848,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-encoding-macro" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -782,9 +864,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" dependencies = [ "data-encoding", "syn 1.0.109", @@ -792,9 +874,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -802,9 +884,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -886,9 +968,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest 0.10.7", @@ -912,15 +994,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", @@ -937,20 +1019,20 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] name = "enr" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe81b5c06ecfdbc71dd845216f225f53b62a10cb8a16c946836a3467f701d05b" +checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "hex", "k256", @@ -972,7 +1054,16 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", ] [[package]] @@ -988,6 +1079,18 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "log", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -996,12 +1099,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1076,14 +1179,13 @@ dependencies = [ [[package]] name = "ethers" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad13497f6e0a24292fc7b408e30d22fe9dc262da1f40d7b542c3a44e7fc0476" +checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0" dependencies = [ "ethers-addressbook", "ethers-contract", "ethers-core", - "ethers-etherscan", "ethers-middleware", "ethers-providers", "ethers-signers", @@ -1091,9 +1193,9 @@ dependencies = [ [[package]] name = "ethers-addressbook" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e9e8acd0ed348403cc73a670c24daba3226c40b98dc1a41903766b3ab6240a" +checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759" dependencies = [ "ethers-core", "once_cell", @@ -1103,9 +1205,9 @@ dependencies = [ [[package]] name = "ethers-contract" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79269278125006bb0552349c03593ffa9702112ca88bc7046cc669f148fb47c" +checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa" dependencies = [ "const-hex", "ethers-contract-abigen", @@ -1122,9 +1224,9 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95a43c939b2e4e2f3191c5ad4a1f279780b8a39139c9905b43a7433531e2ab" +checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b" dependencies = [ "Inflector", "const-hex", @@ -1137,16 +1239,16 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.38", - "toml 0.7.8", + "syn 2.0.66", + "toml 0.8.13", "walkdir", ] [[package]] name = "ethers-contract-derive" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9ce44906fc871b3ee8c69a695ca7ec7f70e50cb379c9b9cb5e532269e492f6" +checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f" dependencies = [ "Inflector", "const-hex", @@ -1155,14 +1257,14 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "ethers-core" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a17f0708692024db9956b31d7a20163607d2745953f5ae8125ab368ba280ad" +checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ "arrayvec", "bytes", @@ -1181,39 +1283,23 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.38", + "syn 2.0.66", "tempfile", "thiserror", "tiny-keccak", "unicode-xid", ] -[[package]] -name = "ethers-etherscan" -version = "2.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e53451ea4a8128fbce33966da71132cf9e1040dcfd2a2084fd7733ada7b2045" -dependencies = [ - "ethers-core", - "reqwest", - "semver", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "ethers-middleware" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473f1ccd0c793871bbc248729fa8df7e6d2981d6226e4343e3bbaa9281074d5d" +checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de" dependencies = [ "async-trait", "auto_impl", "ethers-contract", "ethers-core", - "ethers-etherscan", "ethers-providers", "ethers-signers", "futures-channel", @@ -1232,13 +1318,13 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6838fa110e57d572336178b7c79e94ff88ef976306852d8cb87d9e5b1fc7c0b5" +checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2" dependencies = [ "async-trait", "auto_impl", - "base64 0.21.5", + "base64 0.21.7", "bytes", "const-hex", "enr", @@ -1268,9 +1354,9 @@ dependencies = [ [[package]] name = "ethers-signers" -version = "2.0.10" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea44bec930f12292866166f9ddbea6aa76304850e4d8dcd66dc492b43d00ff1" +checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2" dependencies = [ "async-trait", "coins-bip32", @@ -1321,20 +1407,62 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.0", + "pin-project-lite", +] + [[package]] name = "export_macro" version = "1.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -1351,9 +1479,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "ff" @@ -1552,7 +1680,7 @@ name = "fil_actor_miner" version = "12.0.0" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags 2.5.0", "byteorder", "cid 0.10.1", "fil_actor_account", @@ -1576,6 +1704,7 @@ dependencies = [ "rand", "serde", "test-case", + "test-log", ] [[package]] @@ -1759,6 +1888,7 @@ dependencies = [ "rand_chacha", "regex", "serde", + "serde_json", "test-case", "thiserror", "vm_api", @@ -1769,7 +1899,7 @@ name = "fil_actors_runtime" version = "12.0.0" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "blake2b_simd", "byteorder", "castaway", @@ -1892,18 +2022,16 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "frc42_dispatch" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe63cf3ff3e332ef15fd19d95cffcb3fd2af14ccb3cb04abc730271c1362c4f" +version = "6.0.0" dependencies = [ "frc42_hasher", "frc42_macros", @@ -1915,9 +2043,7 @@ dependencies = [ [[package]] name = "frc42_hasher" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a35e7214108f81cefc17b0466be01279f384faf913918a12dbc8528bb758a4" +version = "4.0.0" dependencies = [ "fvm_sdk", "fvm_shared", @@ -1926,9 +2052,7 @@ dependencies = [ [[package]] name = "frc42_macros" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f50cd62b077775194bde67eef8076b31f915b9c099f3a7fd1a760363d65f145" +version = "4.0.0" dependencies = [ "blake2b_simd", "frc42_hasher", @@ -1939,9 +2063,7 @@ dependencies = [ [[package]] name = "frc46_token" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d3e91e8d92fcd274d4e56cbbec093c4c7613cd294b6c8a855dacc4f9dfff9c" +version = "10.0.0" dependencies = [ "cid 0.10.1", "frc42_dispatch", @@ -1966,9 +2088,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1981,9 +2103,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1991,15 +2113,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2008,9 +2130,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -2027,6 +2149,19 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-locks" version = "0.7.1" @@ -2039,32 +2174,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ "gloo-timers", "send_wrapper 0.4.0", @@ -2072,9 +2207,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2090,9 +2225,7 @@ dependencies = [ [[package]] name = "fvm_actor_utils" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1227ae02b9395085d6b4e7e4f5d7ea2fcbfd13197fade8fa8eaba8089b8865d3" +version = "10.0.0" dependencies = [ "anyhow", "cid 0.10.1", @@ -2110,8 +2243,6 @@ dependencies = [ [[package]] name = "fvm_ipld_amt" version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fea333475130094f27ce67809aae3f69eb5247541d835950b7c5da733dbbb34" dependencies = [ "anyhow", "cid 0.10.1", @@ -2126,8 +2257,6 @@ dependencies = [ [[package]] name = "fvm_ipld_bitfield" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da94287cafa663c2e295fe45c4c9dbf5ab7b52f648568f9ae3823deaf9873a89" dependencies = [ "fvm_ipld_encoding", "serde", @@ -2137,9 +2266,7 @@ dependencies = [ [[package]] name = "fvm_ipld_blockstore" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417f52f6915b9f9a68de8462e1cf46f14a2c16420f484b8d2066873de2ffe420" +version = "0.2.1" dependencies = [ "anyhow", "cid 0.10.1", @@ -2164,8 +2291,6 @@ dependencies = [ [[package]] name = "fvm_ipld_encoding" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90608092e31d9a06236268c58f7c36668ab4b2a48afafe3a97e08f094ad7ae50" dependencies = [ "anyhow", "cid 0.10.1", @@ -2180,9 +2305,7 @@ dependencies = [ [[package]] name = "fvm_ipld_hamt" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a53e14c789449cec999ca0e93d909490c921b967adb7a9ec8f12286fb809bd" +version = "0.9.0" dependencies = [ "anyhow", "byteorder", @@ -2218,11 +2341,8 @@ dependencies = [ [[package]] name = "fvm_sdk" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258cfc9a2e5dcb28ffcadd4abed504893996d31238488a07ef7d2a6a6e80e1ec" +version = "4.2.0" dependencies = [ - "byteorder", "cid 0.10.1", "fvm_ipld_encoding", "fvm_shared", @@ -2234,12 +2354,10 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a19ef48bbc1b22742002667b82944237cfdebc38e946c216aa8de1192392ea" +version = "4.2.0" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags 2.5.0", "blake2b_simd", "cid 0.10.1", "data-encoding", @@ -2248,7 +2366,7 @@ dependencies = [ "lazy_static", "multihash 0.18.1", "num-bigint", - "num-derive 0.4.1", + "num-derive 0.4.2", "num-integer", "num-traits", "serde", @@ -2279,9 +2397,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -2290,9 +2408,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gloo-timers" @@ -2319,9 +2437,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2329,7 +2447,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -2344,9 +2462,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashers" @@ -2363,6 +2481,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2374,9 +2498,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2404,9 +2528,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -2415,9 +2539,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -2447,9 +2571,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2462,7 +2586,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -2477,9 +2601,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2542,12 +2666,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.5", ] [[package]] @@ -2561,9 +2685,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -2586,9 +2710,9 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.9", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2597,6 +2721,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -2617,15 +2747,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2636,7 +2766,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "pem", "ring", "serde", @@ -2646,9 +2776,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -2660,9 +2790,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -2687,9 +2817,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libipld-core" @@ -2721,6 +2851,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "libsecp256k1" version = "0.7.1" @@ -2775,24 +2911,33 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -2802,22 +2947,22 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2868,7 +3013,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -2876,11 +3021,21 @@ dependencies = [ "synstructure", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -2892,11 +3047,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", "serde", @@ -2904,14 +3058,20 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", "serde", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -2925,30 +3085,29 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2957,11 +3116,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2970,54 +3128,55 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open-fastrlp" @@ -3044,11 +3203,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec", @@ -3060,11 +3225,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3078,9 +3243,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -3112,15 +3277,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -3129,9 +3294,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -3139,22 +3304,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -3173,29 +3338,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3205,12 +3370,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] @@ -3237,7 +3402,22 @@ dependencies = [ "libc", "log", "pin-project-lite", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.3.9", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -3258,18 +3438,18 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" dependencies = [ - "env_logger", + "env_logger 0.7.1", "log", ] [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] @@ -3296,6 +3476,15 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3322,13 +3511,29 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] +[[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bitflags 2.5.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.3", + "unarray", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -3337,9 +3542,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3381,50 +3586,65 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.3.5" +name = "rand_xorshift" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "bitflags 1.3.2", + "rand_core", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.3", ] [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3443,6 +3663,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tower-service", @@ -3511,9 +3732,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hex" @@ -3532,42 +3753,42 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.26" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys 0.3.8", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.10", - "windows-sys", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -3589,9 +3810,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", "derive_more", @@ -3601,11 +3822,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3645,9 +3866,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] @@ -3666,9 +3887,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] @@ -3684,22 +3905,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] @@ -3716,9 +3937,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3727,20 +3948,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3812,11 +4033,20 @@ dependencies = [ "keccak", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core", @@ -3859,7 +4089,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3877,12 +4107,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -3893,9 +4123,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3915,24 +4145,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.25.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] @@ -3967,15 +4197,21 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" @@ -4017,22 +4253,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.20", - "windows-sys", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -4059,6 +4294,28 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "test-log" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" +dependencies = [ + "env_logger 0.11.3", + "test-log-macros", + "tracing-subscriber", +] + +[[package]] +name = "test-log-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "test_vm" version = "12.0.0" @@ -4093,38 +4350,51 @@ dependencies = [ "multihash 0.18.1", "num-traits", "serde", + "serde_json", "test-case", + "test-log", "vm_api", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -4139,10 +4409,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -4172,31 +4443,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", "libc", "mio", "pin-project-lite", - "socket2 0.5.5", - "windows-sys", + "socket2 0.5.7", + "windows-sys 0.48.0", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4210,36 +4480,47 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.8", ] [[package]] @@ -4267,7 +4548,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", ] [[package]] @@ -4277,6 +4558,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", ] [[package]] @@ -4289,11 +4571,39 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -4319,11 +4629,17 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -4333,9 +4649,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -4364,15 +4680,21 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "0.8.2" @@ -4383,11 +4705,17 @@ dependencies = [ "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" -version = "1.4.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "version_check" @@ -4414,15 +4742,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4445,9 +4773,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4455,24 +4783,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4482,9 +4810,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4492,28 +4820,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4537,11 +4865,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4556,7 +4884,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -4565,13 +4902,29 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4580,47 +4933,104 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -4632,7 +5042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4665,6 +5075,6 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/Cargo.toml b/Cargo.toml index 5ca1cb7e3..a68b54fd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ "runtime", "test_vm", "vm_api", - "integration_tests" + "integration_tests", ] [workspace.package] @@ -54,10 +54,16 @@ fil_actors_runtime = { workspace = true } num-traits = { workspace = true } [dependencies] -clap = { version = "4.3.0", features = ["derive", "std", "help", "usage", "error-context"], default-features = false } +clap = { version = "4.3.0", features = [ + "derive", + "std", + "help", + "usage", + "error-context", +], default-features = false } [features] -default = [] ## translates to mainnet +default = [] ## translates to mainnet mainnet = [] caterpillarnet = [] butterflynet = [] @@ -109,22 +115,27 @@ rlp = { version = "0.5.1", default-features = false } substrate-bn = { version = "0.6.0", default-features = false } # IPLD/Encoding -cid = { version = "0.10.1", default-features = false, features = ["serde-codec", "std"] } -multihash = { version = "0.18.1", default-features = false , features = ["multihash-impl"]} +cid = { version = "0.10.1", default-features = false, features = [ + "serde-codec", + "std", +] } +multihash = { version = "0.18.1", default-features = false, features = [ + "multihash-impl", +] } libipld-core = { version = "0.13.1", features = ["serde-codec"] } integer-encoding = { version = "3.0.3", default-features = false } # helix-onchain -fvm_actor_utils = "9.0.0" -frc42_dispatch = "5.0.0" -frc46_token = "9.0.0" +fvm_actor_utils = "10.0.0" +frc42_dispatch = "6.0.0" +frc46_token = "10.0.0" # FVM -fvm_sdk = "~4.0" -fvm_shared = "~4.0" +fvm_sdk = "~4.2" +fvm_shared = "~4.2" fvm_ipld_encoding = "0.4.0" fvm_ipld_blockstore = "0.2.0" -fvm_ipld_hamt = "0.8.0" +fvm_ipld_hamt = "0.9.0" fvm_ipld_kamt = "0.3.0" fvm_ipld_amt = { version = "0.6.2" } fvm_ipld_bitfield = "0.6.0" @@ -148,7 +159,7 @@ fil_actor_system = { path = "actors/system" } fil_actor_verifreg = { path = "actors/verifreg" } fil_actors_evm_shared = { path = "actors/evm/shared" } fil_actors_runtime = { path = "runtime" } -fil_builtin_actors_state = { path = "state"} +fil_builtin_actors_state = { path = "state" } fil_actors_integration_tests = { version = "1.0.0", path = "integration_tests" } vm_api = { version = "1.0.0", path = "vm_api" } test_vm = { path = "test_vm" } @@ -168,14 +179,14 @@ test_vm = { path = "test_vm" } ## Uncomment when working locally on ref-fvm and this repo simultaneously. ## Assumes the ref-fvm checkout is in a sibling directory with the same name. ## (Valid while FVM modules aren't published to crates.io) -#[patch."https://github.com/filecoin-project/ref-fvm"] -#fvm_shared = { path = "../ref-fvm/shared" } -#fvm_sdk = { path = "../ref-fvm/sdk" } -#fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" } -#fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" } -#fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"} -#fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"} -#fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"} +# [patch."https://github.com/filecoin-project/ref-fvm"] +fvm_shared = { path = "../ref-fvm/shared" } +fvm_sdk = { path = "../ref-fvm/sdk" } +fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" } +fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" } +fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield" } +fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding" } +fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore" } ## Uncomment entries below when working locally on ref-fvm and this repo simultaneously. ## Assumes the ref-fvm checkout is in a sibling directory with the same name. @@ -188,9 +199,9 @@ test_vm = { path = "test_vm" } # fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"} # fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"} # fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"} -#fvm_actor_utils = { path = "../../filecoin/fvm_actor_utils"} -#frc42_dispatch = { path = "../../filecoin/frc42_dispatch"} -#frc46_token = { path = "../../filecoin/frc46_token"} +fvm_actor_utils = { path = "../filecoin/fvm_actor_utils"} +frc42_dispatch = { path = "../filecoin/frc42_dispatch"} +frc46_token = { path = "../filecoin/frc46_token"} [profile.wasm] inherits = "release" diff --git a/actors/miner/Cargo.toml b/actors/miner/Cargo.toml index d41af88c3..baabd2f10 100644 --- a/actors/miner/Cargo.toml +++ b/actors/miner/Cargo.toml @@ -42,6 +42,7 @@ fil_actor_power = { workspace = true } fil_actor_market = { workspace = true } rand = { workspace = true } test-case = { workspace = true } +test-log = "0.2.15" [features] fil-actor = ["fil_actors_runtime/fil-actor"] diff --git a/actors/miner/src/commd.rs b/actors/miner/src/commd.rs index 0626710b6..3cfd5d558 100644 --- a/actors/miner/src/commd.rs +++ b/actors/miner/src/commd.rs @@ -83,15 +83,20 @@ fn zero_commd(seal_proof: RegisteredSealProof) -> Result { seal_proof.update_to_v1(); let i = match seal_proof { RegisteredSealProof::StackedDRG2KiBV1P1 - | RegisteredSealProof::StackedDRG2KiBV1P1_Feat_SyntheticPoRep => 0, + | RegisteredSealProof::StackedDRG2KiBV1P1_Feat_SyntheticPoRep + | RegisteredSealProof::StackedDRG2KiBV1P1_Feat_NiPoRep => 0, RegisteredSealProof::StackedDRG512MiBV1P1 - | RegisteredSealProof::StackedDRG512MiBV1P1_Feat_SyntheticPoRep => 1, + | RegisteredSealProof::StackedDRG512MiBV1P1_Feat_SyntheticPoRep + | RegisteredSealProof::StackedDRG512MiBV1P1_Feat_NiPoRep => 1, RegisteredSealProof::StackedDRG8MiBV1P1 - | RegisteredSealProof::StackedDRG8MiBV1P1_Feat_SyntheticPoRep => 2, + | RegisteredSealProof::StackedDRG8MiBV1P1_Feat_SyntheticPoRep + | RegisteredSealProof::StackedDRG8MiBV1P1_Feat_NiPoRep => 2, RegisteredSealProof::StackedDRG32GiBV1P1 - | RegisteredSealProof::StackedDRG32GiBV1P1_Feat_SyntheticPoRep => 3, + | RegisteredSealProof::StackedDRG32GiBV1P1_Feat_SyntheticPoRep + | RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep => 3, RegisteredSealProof::StackedDRG64GiBV1P1 - | RegisteredSealProof::StackedDRG64GiBV1P1_Feat_SyntheticPoRep => 4, + | RegisteredSealProof::StackedDRG64GiBV1P1_Feat_SyntheticPoRep + | RegisteredSealProof::StackedDRG64GiBV1P1_Feat_NiPoRep => 4, _ => { return Err(actor_error!(illegal_argument, "unknown SealProof")); } diff --git a/actors/miner/src/lib.rs b/actors/miner/src/lib.rs index 80850a44d..521e8caba 100644 --- a/actors/miner/src/lib.rs +++ b/actors/miner/src/lib.rs @@ -18,6 +18,7 @@ use fvm_ipld_encoding::{from_slice, BytesDe, CborStore, RawBytes}; use fvm_shared::address::{Address, Payload, Protocol}; use fvm_shared::bigint::{BigInt, Integer}; use fvm_shared::clock::ChainEpoch; +use fvm_shared::commcid::cid_to_replica_commitment_v1; use fvm_shared::deal::DealID; use fvm_shared::econ::TokenAmount; use fvm_shared::error::*; @@ -138,6 +139,7 @@ pub enum Method { // MovePartitions = 33, ProveCommitSectors3 = 34, ProveReplicaUpdates3 = 35, + ProveCommitSectorsNI = 36, // Method numbers derived from FRC-0042 standards ChangeWorkerAddressExported = frc42_dispatch::method_hash!("ChangeWorkerAddress"), ChangePeerIDExported = frc42_dispatch::method_hash!("ChangePeerID"), @@ -1950,6 +1952,318 @@ impl Actor { Ok(ProveCommitSectors3Return { activation_results: result }) } + fn prove_commit_sectors_ni( + rt: &impl Runtime, + params: ProveCommitSectorsNIParams, + ) -> Result<(), ActorError> { + let policy = rt.policy(); + let miner_id = rt.message().receiver().id().unwrap(); + + if params.sectors.is_empty() { + return Err(actor_error!(illegal_argument, "batch empty")); + } + + if !can_prove_commit_ni_seal_proof(rt.policy(), params.seal_proof_type) { + return Err(actor_error!( + illegal_argument, + "unsupported seal proof type {}", + i64::from(params.seal_proof_type) + )); + } + + if params.sector_proofs.is_empty() == params.aggregate_proof.is_empty() { + return Err(actor_error!( + illegal_argument, + "exactly one of sector proofs or aggregate proof must be non-empty" + )); + } + + if !params.sector_proofs.is_empty() { + // Batched proofs, one per sector + if params.aggregate_proof_type.is_some() { + return Err(actor_error!( + illegal_argument, + "aggregate proof type must be null with batched proofs" + )); + } + if params.sectors.len() != params.sector_proofs.len() { + return Err(actor_error!( + illegal_argument, + "mismatched lengths: {} sectors, {} proofs", + params.sectors.len(), + params.sector_proofs.len() + )); + } + // TODO: skip this for now since the sizes are wrong and it will always fail + // validate_seal_proofs(params.seal_proof_type, ¶ms.sector_proofs)?; + } else { + if params.aggregate_proof_type != Some(RegisteredAggregateProof::SnarkPackV2) { + return Err(actor_error!( + illegal_argument, + "aggregate proof type must be SnarkPackV2" + )); + } + // TODO: sizes will be wrong for this and will fail when an aggregate is submitted + validate_seal_aggregate_proof( + ¶ms.aggregate_proof, + params.sectors.len() as u64, + policy, + )?; + } + + if params.sectors.iter().any(|sector| sector.sealer_id != miner_id) { + return Err(actor_error!( + illegal_argument, + "all sectors must be sealed for the same receiver actor" + )); + } + + let curr_epoch = rt.curr_epoch(); + let challenge_earliest = curr_epoch - rt.policy().max_prove_commit_ni_randomness_lookback; + let unsealed_cid = CompactCommD::empty().get_cid(params.seal_proof_type).unwrap(); + let entropy = serialize(&rt.message().receiver(), "address for get verify info")?; + + for sector in params.sectors.iter() { + if !is_sealed_sector(§or.sealed_cid) { + return Err(actor_error!(illegal_argument, "sealed CID had wrong prefix")); + } + + if sector.seal_rand_epoch >= curr_epoch { + return Err(actor_error!( + illegal_argument, + "seal challenge epoch {} must be before now {}", + sector.seal_rand_epoch, + curr_epoch + )); + } + + if sector.seal_rand_epoch < challenge_earliest { + return Err(actor_error!( + illegal_argument, + "seal challenge epoch {} too old, must be after {}", + sector.seal_rand_epoch, + challenge_earliest + )); + } + } + + let state: State = rt.state()?; + let store = rt.store(); + let info = get_miner_info(rt.store(), &state)?; + let activation_epoch = rt.curr_epoch(); + + if consensus_fault_active(&info, rt.curr_epoch()) { + return Err(actor_error!( + forbidden, + "prove-commit-ni not allowed during active consensus fault" + )); + } + + rt.validate_immediate_caller_is( + info.control_addresses.iter().chain(&[info.worker, info.owner]), + )?; + + let base_sector_power = base_power_for_sector(info.sector_size); + + let rew = request_current_epoch_block_reward(rt)?; + let pwr = request_current_total_power(rt)?; + let circulating_supply = rt.total_fil_circ_supply(); + let pledge_inputs = NetworkPledgeInputs { + network_qap: pwr.quality_adj_power_smoothed, + network_baseline: rew.this_epoch_baseline_power, + circulating_supply, + epoch_reward: rew.this_epoch_reward_smoothed, + }; + + let initial_pledge = initial_pledge_for_power( + &base_sector_power, + &pledge_inputs.network_baseline, + &pledge_inputs.epoch_reward, + &pledge_inputs.network_qap, + &pledge_inputs.circulating_supply, + ); + + let day_reward = expected_reward_for_power( + &pledge_inputs.epoch_reward, + &pledge_inputs.network_qap, + &base_sector_power, + fil_actors_runtime::EPOCHS_IN_DAY, + ); + + let storage_pledge = expected_reward_for_power( + &pledge_inputs.epoch_reward, + &pledge_inputs.network_qap, + &base_sector_power, + INITIAL_PLEDGE_PROJECTION_PERIOD, + ); + + let proof_inputs = params + .sectors + .iter() + .map(|sector| -> Result { + Ok(SectorSealProofInput { + registered_proof: params.seal_proof_type, + sector_number: sector.sector_number, + randomness: Randomness( + rt.get_randomness_from_tickets( + DomainSeparationTag::SealRandomness, + sector.seal_rand_epoch, + &entropy, + )? + .into(), + ), + interactive_randomness: Randomness( + cid_to_replica_commitment_v1(§or.sealed_cid) + .map_err(|e| { + actor_error!( + illegal_argument, + "invalid sealed CID {}: {}", + sector.sealed_cid, + e + ) + })? + .to_vec(), + ), + sealed_cid: sector.sealed_cid, + unsealed_cid, + }) + }) + .collect::, _>>()?; + + let verified_sectors = if !params.sector_proofs.is_empty() { + let sector_verify_info = proof_inputs + .iter() + .zip(params.sector_proofs.into_iter()) + .map(|(proof_inputs, proof)| SealVerifyInfo { + registered_proof: params.seal_proof_type, + sector_id: fvm_shared::sector::SectorID { + miner: miner_id, + number: proof_inputs.sector_number, + }, + randomness: proof_inputs.randomness.clone(), + proof: proof.into(), + sealed_cid: proof_inputs.sealed_cid, + unsealed_cid, + deal_ids: vec![], + interactive_randomness: proof_inputs.interactive_randomness.clone(), + }) + .collect::>(); + + let sector_verifications = rt + .batch_verify_seals(§or_verify_info) + .context_code(ExitCode::USR_ILLEGAL_ARGUMENT, "failed to batch verify")?; + log::info!("sector_verifications: {:?}", sector_verifications); + params + .sectors + .into_iter() + .zip(sector_verifications) + .filter(|(_, verified)| *verified) + .map(|(sector, _)| sector) + .collect::>() + } else { + verify_aggregate_seal( + rt, + // All the proof inputs, even for invalid pre-commits, + // must be provided as witnesses to the aggregate proof. + &proof_inputs, + miner_id, + params.seal_proof_type, + params.aggregate_proof_type.unwrap(), + ¶ms.aggregate_proof, + )?; + + params.sectors + }; + + if verified_sectors.is_empty() { + return Err(actor_error!(illegal_argument, "no valid proofs specified")); + } + + let sectors_to_add = verified_sectors + .iter() + .map(|sector| SectorOnChainInfo { + sector_number: sector.sector_number, + seal_proof: params.seal_proof_type, + sealed_cid: sector.sealed_cid, + deprecated_deal_ids: vec![], + expiration: sector.expiration, + activation: activation_epoch, + deal_weight: DealWeight::zero(), + verified_deal_weight: DealWeight::zero(), + initial_pledge: initial_pledge.clone(), + expected_day_reward: day_reward.clone(), + expected_storage_pledge: storage_pledge.clone(), + power_base_epoch: activation_epoch, + replaced_day_reward: TokenAmount::zero(), + sector_key_cid: None, + flags: SectorOnChainInfoFlags::SIMPLE_QA_POWER, + }) + .collect::>(); + + let total_pledge = BigInt::from(sectors_to_add.len()) * initial_pledge; + let mut needs_cron = false; + + rt.transaction(|state: &mut State, rt| { + let current_balance = rt.current_balance(); + let available_balance = state + .get_unlocked_balance(¤t_balance) + .with_context_code(ExitCode::USR_ILLEGAL_STATE, || { + "failed to calculate unlocked balance" + })?; + if available_balance < total_pledge { + return Err(actor_error!( + insufficient_funds, + "insufficient funds for aggregate initial pledge requirement {}, available: {}", + total_pledge, + available_balance + )); + } + + state + .put_sectors(store, sectors_to_add.clone()) + .with_context_code(ExitCode::USR_ILLEGAL_STATE, || "failed to put new sectors")?; + + state + .assign_sectors_to_deadlines( + policy, + store, + rt.curr_epoch(), + sectors_to_add, + info.window_post_partition_sectors, + info.sector_size, + ) + .with_context_code(ExitCode::USR_ILLEGAL_STATE, || { + "failed to assign new sectors to deadlines" + })?; + + state + .add_initial_pledge(&total_pledge) + .with_context_code(ExitCode::USR_ILLEGAL_STATE, || { + "failed to add initial pledgs" + })?; + + state + .check_balance_invariants(&rt.current_balance()) + .map_err(balance_invariants_broken)?; + + needs_cron = !state.deadline_cron_active; + state.deadline_cron_active = true; + + Ok(()) + })?; + + if needs_cron { + let new_dl_info = state.deadline_info(rt.policy(), curr_epoch); + enroll_cron_event( + rt, + new_dl_info.last(), + CronEventPayload { event_type: CRON_EVENT_PROVING_DEADLINE }, + )?; + } + + Ok(()) + } + /// Checks state of the corresponding sector pre-commitment, then schedules the proof to be verified in bulk /// by the power actor. /// If valid, the power actor will call ConfirmSectorProofsValid at the end of the same epoch as this message. @@ -5744,6 +6058,7 @@ impl ActorCode for Actor { GetMultiaddrsExported => get_multiaddresses, ProveCommitSectors3 => prove_commit_sectors3, ProveReplicaUpdates3 => prove_replica_updates3, + ProveCommitSectorsNI => prove_commit_sectors_ni, } } diff --git a/actors/miner/src/policy.rs b/actors/miner/src/policy.rs index 6f025e42c..fef0542e8 100644 --- a/actors/miner/src/policy.rs +++ b/actors/miner/src/policy.rs @@ -51,6 +51,10 @@ pub fn can_pre_commit_seal_proof(policy: &Policy, proof: RegisteredSealProof) -> policy.valid_pre_commit_proof_type.contains(proof) } +pub fn can_prove_commit_ni_seal_proof(policy: &Policy, proof: RegisteredSealProof) -> bool { + policy.valid_prove_commit_ni_proof_type.contains(proof) +} + /// Checks whether a seal proof type is supported for new miners and sectors. pub fn can_extend_seal_proof_type(_proof: RegisteredSealProof) -> bool { true @@ -158,6 +162,10 @@ pub fn qa_power_for_sector(size: SectorSize, sector: &SectorOnChainInfo) -> Stor qa_power_for_weight(size, duration, §or.deal_weight, §or.verified_deal_weight) } +pub fn base_power_for_sector(size: SectorSize) -> StoragePower { + BigInt::from(size as u64) +} + /// Determine maximum number of deal miner's sector can hold pub fn sector_deals_max(policy: &Policy, size: SectorSize) -> u64 { cmp::max(256, size as u64 / policy.deal_limit_denominator) diff --git a/actors/miner/src/types.rs b/actors/miner/src/types.rs index 5a5aca822..0e744b803 100644 --- a/actors/miner/src/types.rs +++ b/actors/miner/src/types.rs @@ -135,6 +135,35 @@ pub struct ProveCommitSectorParams { pub proof: RawBytes, } +// Note no UnsealedCID because it must be "zero" data. +#[derive(Clone, Debug, Eq, PartialEq, Serialize_tuple, Deserialize_tuple)] +pub struct SectorNIActivationInfo { + pub sealing_number: SectorNumber, + pub sealer_id: ActorID, + pub sealed_cid: Cid, // CommR + pub sector_number: SectorNumber, + pub seal_rand_epoch: ChainEpoch, + pub expiration: ChainEpoch, +} + +#[derive(Clone, Debug, Eq, PartialEq, Serialize_tuple, Deserialize_tuple)] +pub struct ProveCommitSectorsNIParams { + // Information about sealing of each sector. + pub sectors: Vec, + // Proof type for each seal (must be an NI-PoRep variant) + pub seal_proof_type: RegisteredSealProof, + // Proofs for each sector, parallel to activation manifests. + // Exactly one of sector_proofs or aggregate_proof must be non-empty. + pub sector_proofs: Vec, + // Aggregate proof for all sectors. + // Exactly one of sector_proofs or aggregate_proof must be non-empty. + pub aggregate_proof: RawBytes, + // Proof type for aggregation, if aggregated + pub aggregate_proof_type: Option, + // Whether to abort if any sector activation fails. + pub require_activation_success: bool, +} + #[derive(Clone, Debug, Eq, PartialEq, Serialize_tuple, Deserialize_tuple)] pub struct ProveCommitSectors3Params { // Activation manifest for each sector being proven. diff --git a/actors/miner/tests/prove_commit_niporep.rs b/actors/miner/tests/prove_commit_niporep.rs new file mode 100644 index 000000000..1c45d3f0c --- /dev/null +++ b/actors/miner/tests/prove_commit_niporep.rs @@ -0,0 +1,120 @@ +use fil_actors_runtime::cbor::serialize; +use fvm_shared::{ + clock::ChainEpoch, + commcid::cid_to_replica_commitment_v1, + randomness::Randomness, + sector::{AggregateSealVerifyInfo, SealVerifyInfo}, +}; + +use fil_actor_miner::CompactCommD; +use log::info; +use util::*; + +mod util; + +const PERIOD_OFFSET: ChainEpoch = 100; + +#[test_log::test] +fn prove_single_sector_ni() { + let h = ActorHarness::new(PERIOD_OFFSET); + let rt = h.new_runtime(); + rt.balance.replace(BIG_BALANCE.clone()); + let miner = rt.receiver.id().unwrap(); + + let seal_randomness_epoch = PERIOD_OFFSET + 1; + let expiration = seal_randomness_epoch + 1000; + + rt.set_epoch(seal_randomness_epoch); + h.construct_and_verify(&rt); + + rt.set_epoch(seal_randomness_epoch + 400); + + let params = + h.make_prove_commit_ni_params(miner, &[100], seal_randomness_epoch, expiration, false); + + let interactive_randomness = + cid_to_replica_commitment_v1(¶ms.sectors[0].sealed_cid).unwrap(); + let seal_verify_info = SealVerifyInfo { + registered_proof: params.seal_proof_type, + sector_id: fvm_shared::sector::SectorID { miner, number: params.sectors[0].sector_number }, + randomness: Randomness(vec![1; 32]), + proof: params.sector_proofs[0].clone().into(), + sealed_cid: params.sectors[0].sealed_cid, + unsealed_cid: CompactCommD::empty().get_cid(params.seal_proof_type).unwrap(), + deal_ids: Vec::new(), + interactive_randomness: Randomness(interactive_randomness.to_vec()), + }; + + let entropy = serialize(&rt.receiver, "address for get verify info").unwrap(); + + rt.expect_get_randomness_from_tickets( + fil_actors_runtime::runtime::DomainSeparationTag::SealRandomness, + seal_randomness_epoch, + entropy.to_vec(), + [1; 32], + ); + + rt.expect_batch_verify_seals(vec![seal_verify_info], Ok(vec![true])); + rt.expect_validate_caller_addr(h.caller_addrs()); + + // Call prove commit niporep + let res = h.prove_commit_sectors_ni(&rt, params); + info!("prove_commit_ni res: {:?}", res); + + assert!(res.is_ok()); +} + +#[test_log::test] +fn prove_sectors_aggregate_ni() { + let h = ActorHarness::new(PERIOD_OFFSET); + let rt = h.new_runtime(); + rt.balance.replace(BIG_BALANCE.clone()); + let miner = rt.receiver.id().unwrap(); + + let seal_randomness_epoch = PERIOD_OFFSET + 1; + let expiration = seal_randomness_epoch + 1000; + + rt.set_epoch(seal_randomness_epoch); + h.construct_and_verify(&rt); + + rt.set_epoch(seal_randomness_epoch + 400); + + let sector_nums = [100, 101, 102, 103]; + let params = + h.make_prove_commit_ni_params(miner, §or_nums, seal_randomness_epoch, expiration, true); + let randomness = Randomness(TEST_RANDOMNESS_ARRAY_FROM_ONE.to_vec()); + + let entropy = serialize(&rt.receiver, "address for get verify info").unwrap(); + + sector_nums.iter().for_each(|_| { + rt.expect_get_randomness_from_tickets( + fil_actors_runtime::runtime::DomainSeparationTag::SealRandomness, + seal_randomness_epoch, + entropy.to_vec(), + TEST_RANDOMNESS_ARRAY_FROM_ONE, + ) + }); + + let seal_verify_info = params + .sectors + .iter() + .map(|sector| AggregateSealVerifyInfo { + sector_number: sector.sector_number, + randomness: randomness.clone(), + interactive_randomness: Randomness( + cid_to_replica_commitment_v1(§or.sealed_cid).unwrap().to_vec(), + ), + sealed_cid: sector.sealed_cid.clone(), + unsealed_cid: CompactCommD::empty().get_cid(params.seal_proof_type).unwrap(), + }) + .collect::>(); + + rt.expect_aggregate_verify_seals(seal_verify_info, params.aggregate_proof.to_vec(), Ok(())); + rt.expect_validate_caller_addr(h.caller_addrs()); + + // Call prove commit niporep + let res = h.prove_commit_sectors_ni(&rt, params); + info!("prove_commit_ni res: {:?}", res); + + assert!(res.is_ok()); +} diff --git a/actors/miner/tests/util.rs b/actors/miner/tests/util.rs index 28fc9e14b..78919f854 100644 --- a/actors/miner/tests/util.rs +++ b/actors/miner/tests/util.rs @@ -82,7 +82,10 @@ use fil_actor_miner::{ WindowedPoSt, WithdrawBalanceParams, WithdrawBalanceReturn, CRON_EVENT_PROVING_DEADLINE, NO_QUANTIZATION, REWARD_VESTING_SPEC, SECTORS_AMT_BITWIDTH, SECTOR_CONTENT_CHANGED, }; -use fil_actor_miner::{ProveReplicaUpdates3Params, ProveReplicaUpdates3Return}; +use fil_actor_miner::{ + ProveCommitSectorsNIParams, ProveReplicaUpdates3Params, ProveReplicaUpdates3Return, + SectorNIActivationInfo, +}; use fil_actor_power::{ CurrentTotalPowerReturn, EnrollCronEventParams, Method as PowerMethod, UpdateClaimedPowerParams, }; @@ -559,6 +562,54 @@ impl ActorHarness { ProveCommitSectorParams { sector_number: sector_no, proof: vec![0u8; 192].into() } } + pub fn make_prove_commit_ni_params( + &self, + sealer_id: ActorID, + sector_nums: &[SectorNumber], + seal_rand_epoch: ChainEpoch, + expiration: ChainEpoch, + aggregate: bool, + ) -> ProveCommitSectorsNIParams { + fn make_proof(i: u8) -> RawBytes { + RawBytes::new(vec![i, i, i, i]) + } + + let sectors = sector_nums + .iter() + .map(|sector_num| SectorNIActivationInfo { + sealing_number: *sector_num, + sealer_id, + sector_number: *sector_num, + sealed_cid: make_sector_commr(*sector_num), + seal_rand_epoch, + expiration: expiration, + }) + .collect::>(); + + if aggregate { + ProveCommitSectorsNIParams { + sectors, + seal_proof_type: RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep, + sector_proofs: Vec::new(), + aggregate_proof: make_proof(0), + aggregate_proof_type: Some(RegisteredAggregateProof::SnarkPackV2), + require_activation_success: true, + } + } else { + ProveCommitSectorsNIParams { + sectors, + seal_proof_type: RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep, + sector_proofs: sector_nums + .iter() + .map(|sector_num| make_proof(*sector_num as u8)) + .collect(), + aggregate_proof: RawBytes::new(Vec::new()), + aggregate_proof_type: None, + require_activation_success: true, + } + } + } + pub fn pre_commit_sector_batch( &self, rt: &MockRuntime, @@ -832,6 +883,24 @@ impl ActorHarness { Ok(()) } + pub fn prove_commit_sectors_ni( + &self, + rt: &MockRuntime, + params: ProveCommitSectorsNIParams, + ) -> Result<(), ActorError> { + rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, self.worker); + self.expect_query_network_info(rt); + + let result = rt.call::( + Method::ProveCommitSectorsNI as u64, + IpldBlock::serialize_cbor(¶ms).unwrap(), + )?; + expect_empty(result); + rt.verify(); + + Ok(()) + } + pub fn prove_commit_aggregate_sector( &self, rt: &MockRuntime, diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 166f3c602..328c81936 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] fil_builtin_actors_state = { workspace = true } -fil_actors_runtime = { workspace = true, features = [ "test_utils" ] } +fil_actors_runtime = { workspace = true, features = ["test_utils"] } fil_actor_init = { workspace = true } fil_actor_cron = { workspace = true } fil_actor_system = { workspace = true } @@ -45,7 +45,7 @@ fvm_ipld_encoding = { workspace = true } fvm_ipld_hamt = { workspace = true } fvm_shared = { workspace = true } hex = { workspace = true } -hex-literal = { workspace = true } +hex-literal = { workspace = true } indexmap = { workspace = true } integer-encoding = { workspace = true } lazy_static = { workspace = true } @@ -60,6 +60,7 @@ thiserror = { workspace = true } libsecp256k1 = { workspace = true } export_macro = { path = "./macro" } ctor = "0.2.5" +serde_json.workspace = true [dev-dependencies] multihash = { workspace = true } diff --git a/integration_tests/src/tests/mod.rs b/integration_tests/src/tests/mod.rs index aaf21a9a2..ba1637e88 100644 --- a/integration_tests/src/tests/mod.rs +++ b/integration_tests/src/tests/mod.rs @@ -38,5 +38,7 @@ mod withdraw_balance_test; pub use withdraw_balance_test::*; mod prove_commit3_test; pub use prove_commit3_test::*; +mod prove_commit_niporep_test; +pub use prove_commit_niporep_test::*; mod replica_update3_test; pub use replica_update3_test::*; diff --git a/integration_tests/src/tests/prove_commit3_test.rs b/integration_tests/src/tests/prove_commit3_test.rs index ab94e0b89..ca04eb75d 100644 --- a/integration_tests/src/tests/prove_commit3_test.rs +++ b/integration_tests/src/tests/prove_commit3_test.rs @@ -8,6 +8,7 @@ use fvm_shared::deal::DealID; use fvm_shared::econ::TokenAmount; use fvm_shared::piece::{PaddedPieceSize, PieceInfo}; use fvm_shared::sector::{RegisteredSealProof, SectorNumber, StoragePower}; +use log::info; use num_traits::Zero; use fil_actor_market::Method as MarketMethod; @@ -341,6 +342,7 @@ pub fn prove_commit_sectors2_test(v: &dyn VM) { // Checks on sector state. let sectors = manifests.iter().map(|m| sector_info(v, &maddr, m.sector_number)).collect::>(); + info!("sectors: {:#?}", sectors); for sector in §ors { assert_eq!(activation_epoch, sector.activation); assert_eq!(activation_epoch, sector.power_base_epoch); diff --git a/integration_tests/src/tests/prove_commit_niporep_test.rs b/integration_tests/src/tests/prove_commit_niporep_test.rs new file mode 100644 index 000000000..33cbfda52 --- /dev/null +++ b/integration_tests/src/tests/prove_commit_niporep_test.rs @@ -0,0 +1,210 @@ +use fil_actors_runtime::EPOCHS_IN_YEAR; +use fvm_ipld_encoding::ipld_block::IpldBlock; +use fvm_ipld_encoding::RawBytes; +use fvm_shared::bigint::BigInt; +use fvm_shared::econ::TokenAmount; +use fvm_shared::sector::{RegisteredAggregateProof, RegisteredSealProof, SectorNumber}; +use log::info; +use num_traits::Zero; + +use export_macro::vm_test; +use fil_actor_miner::{Method as MinerMethod, SectorOnChainInfoFlags}; +use fil_actor_miner::{ProveCommitSectorsNIParams, SectorNIActivationInfo}; +use fil_actors_runtime::test_utils::make_sealed_cid; +use vm_api::trace::ExpectInvocation; +use vm_api::util::apply_ok; +use vm_api::VM; + +use crate::util::{ + create_accounts, create_miner, override_compute_unsealed_sector_cid, sector_info, +}; + +#[vm_test] +pub fn prove_commit_sectors_niporep_test(v: &dyn VM) { + // Expectations depend on the correct unsealed CID for empty sector. + override_compute_unsealed_sector_cid(v); + let addrs = create_accounts(v, 3, &TokenAmount::from_whole(10_000)); + let seal_proof = RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep; + let (owner, worker, _, _) = (addrs[0], addrs[0], addrs[1], addrs[2]); + let worker_id = worker.id().unwrap(); + let (maddr, _) = create_miner( + v, + &owner, + &worker, + seal_proof.registered_window_post_proof().unwrap(), + &TokenAmount::from_whole(8_000), + ); + let miner_id = maddr.id().unwrap(); + + // Onboard a batch of sectors + let expiration = v.epoch() + 2 * EPOCHS_IN_YEAR; + let seal_rand_epoch = v.epoch() - 1; + let first_sector_number: SectorNumber = 100; + let manifests = vec![ + first_sector_number, + first_sector_number + 1, + first_sector_number + 2, + first_sector_number + 3, + first_sector_number + 4, + ]; + + let sectors_info: Vec = manifests + .iter() + .map(|sector_number| SectorNIActivationInfo { + sealing_number: *sector_number, + sealer_id: miner_id, + sector_number: *sector_number, + sealed_cid: make_sealed_cid(format!("sn: {}", sector_number).as_bytes()), + seal_rand_epoch, + expiration, + }) + .collect(); + + // Prove-commit NI-PoRep + let proofs = vec![RawBytes::new(vec![1, 2, 3, 4]); manifests.len()]; + let params = ProveCommitSectorsNIParams { + sectors: sectors_info.clone(), + seal_proof_type: RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep, + sector_proofs: proofs, + aggregate_proof: RawBytes::default(), + aggregate_proof_type: None, + require_activation_success: true, + }; + + let activation_epoch = v.epoch() + EPOCHS_IN_YEAR / 2; + v.set_epoch(activation_epoch); + + apply_ok( + v, + &worker, + &maddr, + &TokenAmount::zero(), + MinerMethod::ProveCommitSectorsNI as u64, + Some(params.clone()), + ); + + ExpectInvocation { + from: worker_id, + to: maddr, + method: MinerMethod::ProveCommitSectorsNI as u64, + params: Some(IpldBlock::serialize_cbor(¶ms).unwrap()), + subinvocs: None, + events: Vec::new(), + ..Default::default() + } + .matches(v.take_invocations().last().unwrap()); + + // Checks on sector state. + let sectors = manifests + .iter() + .map(|sector_number| sector_info(v, &maddr, *sector_number)) + .collect::>(); + info!("sectors: {:#?}", sectors); + for (on_chain_sector, input_sector) in sectors.iter().zip(sectors_info) { + assert_eq!(input_sector.sector_number, on_chain_sector.sector_number); + assert_eq!(params.seal_proof_type, on_chain_sector.seal_proof); + assert_eq!(input_sector.sealed_cid, on_chain_sector.sealed_cid); + assert!(on_chain_sector.deprecated_deal_ids.is_empty()); + assert_eq!(activation_epoch, on_chain_sector.activation); + assert_eq!(input_sector.expiration, on_chain_sector.expiration); + assert_eq!(BigInt::zero(), on_chain_sector.deal_weight); + assert_eq!(BigInt::zero(), on_chain_sector.verified_deal_weight); + assert_eq!(activation_epoch, on_chain_sector.power_base_epoch); + assert!(on_chain_sector.flags.contains(SectorOnChainInfoFlags::SIMPLE_QA_POWER)); + } +} + +#[vm_test] +pub fn prove_commit_sectors_aggregate_niporep_test(v: &dyn VM) { + // Expectations depend on the correct unsealed CID for empty sector. + override_compute_unsealed_sector_cid(v); + let addrs = create_accounts(v, 3, &TokenAmount::from_whole(10_000)); + let seal_proof = RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep; + let (owner, worker, _, _) = (addrs[0], addrs[0], addrs[1], addrs[2]); + let worker_id = worker.id().unwrap(); + let (maddr, _) = create_miner( + v, + &owner, + &worker, + seal_proof.registered_window_post_proof().unwrap(), + &TokenAmount::from_whole(8_000), + ); + let miner_id = maddr.id().unwrap(); + + // Onboard a batch of sectors + let expiration = v.epoch() + 2 * EPOCHS_IN_YEAR; + let seal_rand_epoch = v.epoch() - 1; + let first_sector_number: SectorNumber = 100; + let manifests = vec![ + first_sector_number, + first_sector_number + 1, + first_sector_number + 2, + first_sector_number + 3, + first_sector_number + 4, + ]; + + let sectors_info: Vec = manifests + .iter() + .map(|sector_number| SectorNIActivationInfo { + sealing_number: *sector_number, + sealer_id: miner_id, + sector_number: *sector_number, + sealed_cid: make_sealed_cid(format!("sn: {}", sector_number).as_bytes()), + seal_rand_epoch, + expiration, + }) + .collect(); + + // Prove-commit NI-PoRep + let aggregate_proof = RawBytes::new(vec![1, 2, 3, 4]); + let params = ProveCommitSectorsNIParams { + sectors: sectors_info.clone(), + seal_proof_type: RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep, + sector_proofs: Vec::new(), + aggregate_proof, + aggregate_proof_type: Some(RegisteredAggregateProof::SnarkPackV2), + require_activation_success: true, + }; + + let activation_epoch = v.epoch() + EPOCHS_IN_YEAR / 2; + v.set_epoch(activation_epoch); + + apply_ok( + v, + &worker, + &maddr, + &TokenAmount::zero(), + MinerMethod::ProveCommitSectorsNI as u64, + Some(params.clone()), + ); + + ExpectInvocation { + from: worker_id, + to: maddr, + method: MinerMethod::ProveCommitSectorsNI as u64, + params: Some(IpldBlock::serialize_cbor(¶ms).unwrap()), + subinvocs: None, + events: Vec::new(), + ..Default::default() + } + .matches(v.take_invocations().last().unwrap()); + + // Checks on sector state. + let sectors = manifests + .iter() + .map(|sector_number| sector_info(v, &maddr, *sector_number)) + .collect::>(); + info!("sectors: {:#?}", sectors); + for (on_chain_sector, input_sector) in sectors.iter().zip(sectors_info) { + assert_eq!(input_sector.sector_number, on_chain_sector.sector_number); + assert_eq!(params.seal_proof_type, on_chain_sector.seal_proof); + assert_eq!(input_sector.sealed_cid, on_chain_sector.sealed_cid); + assert!(on_chain_sector.deprecated_deal_ids.is_empty()); + assert_eq!(activation_epoch, on_chain_sector.activation); + assert_eq!(input_sector.expiration, on_chain_sector.expiration); + assert_eq!(BigInt::zero(), on_chain_sector.deal_weight); + assert_eq!(BigInt::zero(), on_chain_sector.verified_deal_weight); + assert_eq!(activation_epoch, on_chain_sector.power_base_epoch); + assert!(on_chain_sector.flags.contains(SectorOnChainInfoFlags::SIMPLE_QA_POWER)); + } +} diff --git a/runtime/src/runtime/fvm.rs b/runtime/src/runtime/fvm.rs index c87991dfb..52c01b7cb 100644 --- a/runtime/src/runtime/fvm.rs +++ b/runtime/src/runtime/fvm.rs @@ -22,8 +22,8 @@ use fvm_shared::event::ActorEvent; use fvm_shared::piece::PieceInfo; use fvm_shared::randomness::RANDOMNESS_LENGTH; use fvm_shared::sector::{ - AggregateSealVerifyProofAndInfos, RegisteredSealProof, ReplicaUpdateInfo, SealVerifyInfo, - WindowPoStVerifyInfo, + AggregateSealVerifyProofAndInfos, RegisteredSealProof, ReplicaUpdateInfo, + SealVerifyInfo, WindowPoStVerifyInfo, }; use fvm_shared::sys::SendFlags; use fvm_shared::version::NetworkVersion; diff --git a/runtime/src/runtime/policy.rs b/runtime/src/runtime/policy.rs index 3f8004264..d3830cda5 100644 --- a/runtime/src/runtime/policy.rs +++ b/runtime/src/runtime/policy.rs @@ -77,6 +77,10 @@ pub struct Policy { pub max_pre_commit_randomness_lookback: ChainEpoch, + pub prove_commit_ni_sector_batch_max_size: usize, + pub max_prove_commit_ni_randomness_lookback: ChainEpoch, + pub valid_prove_commit_ni_proof_type: ProofSet, + /// Number of epochs between publishing the precommit and when the challenge for interactive PoRep is drawn /// used to ensure it is not predictable by miner. pub pre_commit_challenge_delay: ChainEpoch, @@ -182,6 +186,10 @@ impl Default for Policy { posted_partitions_max: policy_constants::POSTED_PARTITIONS_MAX, max_pre_commit_randomness_lookback: policy_constants::MAX_PRE_COMMIT_RANDOMNESS_LOOKBACK, + valid_prove_commit_ni_proof_type: ProofSet::default_seal_ni_proofs(), + prove_commit_ni_sector_batch_max_size: + policy_constants::PROVE_COMMIT_NI_SECTOR_BATCH_MAX_SIZE, + max_prove_commit_ni_randomness_lookback: policy_constants::MAX_PROVE_COMMIT_NI_LOOKBACK, pre_commit_challenge_delay: policy_constants::PRE_COMMIT_CHALLENGE_DELAY, wpost_challenge_lookback: policy_constants::WPOST_CHALLENGE_LOOKBACK, fault_declaration_cutoff: policy_constants::FAULT_DECLARATION_CUTOFF, @@ -291,6 +299,9 @@ pub mod policy_constants { #[cfg(feature = "short-precommit")] pub const PRE_COMMIT_CHALLENGE_DELAY: ChainEpoch = 10; + pub const PROVE_COMMIT_NI_SECTOR_BATCH_MAX_SIZE: usize = 256; + pub const MAX_PROVE_COMMIT_NI_LOOKBACK: ChainEpoch = 365 * EPOCHS_IN_DAY + CHAIN_FINALITY; + // This lookback exists so that deadline windows can be non-overlapping (which make the programming simpler) // but without making the miner wait for chain stability before being able to start on PoSt computation. // The challenge is available this many epochs before the window is actually open to receiving a PoSt. @@ -365,7 +376,7 @@ pub struct ProofSet(Vec); const REGISTERED_POST_PROOF_VARIANTS: usize = 15; /// The number of total possible types (enum variants) of RegisteredSealProof -const REGISTERED_SEAL_PROOF_VARIANTS: usize = 15; +const REGISTERED_SEAL_PROOF_VARIANTS: usize = 20; impl ProofSet { /// Create a `ProofSet` for enabled `RegisteredPoStProof`s @@ -428,6 +439,36 @@ impl ProofSet { proofs[i64::from(RegisteredSealProof::StackedDRG64GiBV1P1) as usize] = true; proofs[i64::from(RegisteredSealProof::StackedDRG64GiBV1P1_Feat_SyntheticPoRep) as usize] = true; + proofs[i64::from(RegisteredSealProof::StackedDRG64GiBV1P1_Feat_NiPoRep) as usize] = + true; + } + ProofSet(proofs) + } + + pub fn default_seal_ni_proofs() -> Self { + let mut proofs = vec![false; REGISTERED_SEAL_PROOF_VARIANTS]; + #[cfg(feature = "sector-2k")] + { + proofs[i64::from(RegisteredSealProof::StackedDRG2KiBV1P1_Feat_NiPoRep) as usize] = true; + } + #[cfg(feature = "sector-8m")] + { + proofs[i64::from(RegisteredSealProof::StackedDRG8MiBV1P1_Feat_NiPoRep) as usize] = true; + } + #[cfg(feature = "sector-512m")] + { + proofs[i64::from(RegisteredSealProof::StackedDRG512MiBV1P1_Feat_NiPoRep) as usize] = + true; + } + #[cfg(feature = "sector-32g")] + { + proofs[i64::from(RegisteredSealProof::StackedDRG32GiBV1P1_Feat_NiPoRep) as usize] = + true; + } + #[cfg(feature = "sector-64g")] + { + proofs[i64::from(RegisteredSealProof::StackedDRG64GiBV1P1_Feat_NiPoRep) as usize] = + true; } ProofSet(proofs) } diff --git a/runtime/src/test_utils.rs b/runtime/src/test_utils.rs index 4c10379ce..be944fe5d 100644 --- a/runtime/src/test_utils.rs +++ b/runtime/src/test_utils.rs @@ -1460,6 +1460,7 @@ impl Primitives for MockRuntime { } fn batch_verify_seals(&self, batch: &[SealVerifyInfo]) -> anyhow::Result> { + log::info!("batch_verify_seals: {:?}", batch); let exp = self .expectations .borrow_mut() @@ -1470,14 +1471,20 @@ impl Primitives for MockRuntime { for (i, exp_svi) in exp.input.iter().enumerate() { assert_eq!( - exp_svi.sealed_cid, batch[i].sealed_cid, - "sealed CID mismatch at index {}", - i + exp_svi.registered_proof, batch[i].registered_proof, + "registered proof mismatch at index {i}" ); + assert_eq!(exp_svi.sector_id, batch[i].sector_id, "sector id mismatch at index {i}"); + assert_eq!(exp_svi.proof, batch[i].proof, "proof mismatch at index {i}"); + assert_eq!(exp_svi.randomness, batch[i].randomness, "randomness mismatch at index {i}"); + assert_eq!( + exp_svi.interactive_randomness, batch[i].interactive_randomness, + "interactive randomness mismatch at index {i}" + ); + assert_eq!(exp_svi.sealed_cid, batch[i].sealed_cid, "sealed CID mismatch at index {i}"); assert_eq!( exp_svi.unsealed_cid, batch[i].unsealed_cid, - "unsealed CID mismatch at index {}", - i + "unsealed CID mismatch at index {i}" ); } exp.result diff --git a/test_vm/Cargo.toml b/test_vm/Cargo.toml index 258112805..6837531aa 100644 --- a/test_vm/Cargo.toml +++ b/test_vm/Cargo.toml @@ -46,3 +46,6 @@ vm_api = { workspace = true } multihash = { workspace = true } test-case = { workspace = true } fil_actors_integration_tests = { workspace = true } +test-log = "0.2.15" +serde.workspace = true +serde_json.workspace = true diff --git a/test_vm/tests/suite/mod.rs b/test_vm/tests/suite/mod.rs index 292713eca..a2a9e91e2 100644 --- a/test_vm/tests/suite/mod.rs +++ b/test_vm/tests/suite/mod.rs @@ -12,6 +12,7 @@ mod market_miner_withdrawal_test; mod multisig_test; mod power_scenario_tests; mod prove_commit3_test; +mod prove_commit_niporep_test; mod publish_deals_test; mod replica_update3_test; mod replica_update_test; diff --git a/test_vm/tests/suite/prove_commit3_test.rs b/test_vm/tests/suite/prove_commit3_test.rs index 4b943b3c8..cc2e41af3 100644 --- a/test_vm/tests/suite/prove_commit3_test.rs +++ b/test_vm/tests/suite/prove_commit3_test.rs @@ -2,7 +2,7 @@ use fil_actors_integration_tests::tests::prove_commit_sectors2_test; use fil_actors_runtime::test_blockstores::MemoryBlockstore; use test_vm::TestVM; -#[test] +#[test_log::test] fn prove_commit_sectors2() { let store = MemoryBlockstore::new(); let v = TestVM::new_with_singletons(store); diff --git a/test_vm/tests/suite/prove_commit_niporep_test.rs b/test_vm/tests/suite/prove_commit_niporep_test.rs new file mode 100644 index 000000000..2f6604bfb --- /dev/null +++ b/test_vm/tests/suite/prove_commit_niporep_test.rs @@ -0,0 +1,19 @@ +use fil_actors_integration_tests::tests::{ + prove_commit_sectors_aggregate_niporep_test, prove_commit_sectors_niporep_test, +}; +use fil_actors_runtime::test_blockstores::MemoryBlockstore; +use test_vm::TestVM; + +#[test_log::test] +fn prove_commit_sectors_niporep() { + let store = MemoryBlockstore::new(); + let v = TestVM::new_with_singletons(store); + prove_commit_sectors_niporep_test(&v); +} + +#[test_log::test] +fn prove_commit_sectors_aggregate_niporep() { + let store = MemoryBlockstore::new(); + let v = TestVM::new_with_singletons(store); + prove_commit_sectors_aggregate_niporep_test(&v); +}