diff --git a/Cargo.lock b/Cargo.lock index 304c1625b..f8824db6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -445,33 +445,16 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc7fce0356b52c2483bb6188cc8bdc11add526bce75d1a44e5e5d889a6ab008" dependencies = [ - "bls12_381", "blst", "blstrs", "ff", "group", - "hkdf", "pairing", "rand_core", - "sha2 0.9.9", "subtle", "thiserror", ] -[[package]] -name = "bls12_381" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" -dependencies = [ - "digest 0.9.0", - "ff", - "group", - "pairing", - "rand_core", - "subtle", -] - [[package]] name = "blst" version = "0.3.11" @@ -1029,16 +1012,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "cs_serde_bytes" version = "0.12.2" @@ -1742,7 +1715,7 @@ version = "0.1.0" dependencies = [ "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1779,7 +1752,7 @@ version = "0.1.0" dependencies = [ "fil_actors_runtime", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1788,7 +1761,7 @@ version = "0.1.0" dependencies = [ "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "serde", "serde_tuple", ] @@ -1799,7 +1772,7 @@ version = "0.1.0" dependencies = [ "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1811,7 +1784,7 @@ dependencies = [ "fvm_gas_calibration_shared", "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "num-derive 0.4.0", "num-traits", "serde", @@ -1823,7 +1796,7 @@ version = "0.1.0" dependencies = [ "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "log", "serde", "serde_tuple", @@ -1834,7 +1807,7 @@ name = "fil_hello_world_actor" version = "0.1.0" dependencies = [ "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1846,7 +1819,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "serde", "serde_tuple", ] @@ -1857,7 +1830,7 @@ version = "0.1.0" dependencies = [ "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "minicov", ] @@ -1866,7 +1839,7 @@ name = "fil_malformed_syscall_actor" version = "0.1.0" dependencies = [ "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1874,7 +1847,7 @@ name = "fil_oom_actor" version = "0.1.0" dependencies = [ "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1884,7 +1857,7 @@ dependencies = [ "cid 0.10.1", "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1894,7 +1867,7 @@ dependencies = [ "cid 0.10.1", "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1902,7 +1875,7 @@ name = "fil_stack_overflow_actor" version = "0.1.0" dependencies = [ "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", ] [[package]] @@ -1912,16 +1885,16 @@ dependencies = [ "fil_actors_runtime", "fvm_ipld_encoding", "fvm_sdk 3.3.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "minicov", "multihash 0.18.1", ] [[package]] name = "filecoin-hashers" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb5ea33790e200a7d77b929e848fba8c3ee0d206dba6dc41e15286e433f62aa" +checksum = "36c8a930b79c5f4b30220d99c87193f9dafe753beeea451dc46688a53fb4f4b6" dependencies = [ "anyhow", "bellperson", @@ -1939,9 +1912,9 @@ dependencies = [ [[package]] name = "filecoin-proofs" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3840a583825e720be353549dca7e2cbd247bf2876adc9a79a8a1752eb95ab96" +checksum = "7bc4556330a546dc0453b78a96a0bf4fa1042468c868056d4da6df09e11578e1" dependencies = [ "anyhow", "bellperson", @@ -1973,9 +1946,9 @@ dependencies = [ [[package]] name = "filecoin-proofs-api" -version = "16.0.0" +version = "18.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61bdd3ba08899866a2b2c7f0fbe1fcb55cc6ad3c2f0b20026ef63263ac8ac50" +checksum = "ee014160be200ac673975849fd19a97d62385561875e117974384a9861a78e3c" dependencies = [ "anyhow", "bellperson", @@ -2041,9 +2014,9 @@ dependencies = [ [[package]] name = "fr32" -version = "9.0.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308ab8ad1457d722a3d247549c759ca0ce4a58796c633c956f6186f6923ea371" +checksum = "4e9452a7bb775a310ecaa6f25b2433b6b1708fc4764c355672895749619447c6" dependencies = [ "anyhow", "blstrs", @@ -2236,7 +2209,7 @@ dependencies = [ [[package]] name = "fvm" -version = "3.9.0" +version = "3.10.0" dependencies = [ "anyhow", "arbitrary", @@ -2251,7 +2224,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_encoding", "fvm_ipld_hamt 0.8.0", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "lazy_static", "log", "minstant", @@ -2283,7 +2256,7 @@ dependencies = [ "fvm", "fvm_integration_tests", "fvm_ipld_encoding", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "hex", ] @@ -2336,7 +2309,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "itertools 0.11.0", "ittapi-rs", "lazy_static", @@ -2358,7 +2331,7 @@ dependencies = [ name = "fvm_gas_calibration_shared" version = "0.1.0" dependencies = [ - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "num-derive 0.4.0", "num-traits", "serde", @@ -2380,7 +2353,7 @@ dependencies = [ "fvm_ipld_blockstore", "fvm_ipld_car", "fvm_ipld_encoding", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "fvm_test_actors", "hex", "lazy_static", @@ -2532,7 +2505,7 @@ version = "3.3.0" dependencies = [ "cid 0.10.1", "fvm_ipld_encoding", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "lazy_static", "log", "num-traits", @@ -2581,7 +2554,7 @@ dependencies = [ [[package]] name = "fvm_shared" -version = "3.6.0" +version = "3.10.0" dependencies = [ "anyhow", "arbitrary", @@ -2593,7 +2566,7 @@ dependencies = [ "data-encoding-macro", "filecoin-proofs-api", "fvm_ipld_encoding", - "fvm_shared 3.6.0", + "fvm_shared 3.10.0", "lazy_static", "libsecp256k1", "multihash 0.18.1", @@ -2761,33 +2734,13 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" -[[package]] -name = "hkdf" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b" -dependencies = [ - "digest 0.9.0", - "hmac 0.11.0", -] - [[package]] name = "hmac" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac", "digest 0.9.0", ] @@ -2799,7 +2752,7 @@ checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", "generic-array", - "hmac 0.8.1", + "hmac", ] [[package]] @@ -4125,9 +4078,9 @@ dependencies = [ [[package]] name = "sha2raw" -version = "11.0.0" +version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b502b7bf556833b39551a1379b1ea715ce293016da621f18c3583fb13249a2ec" +checksum = "c4fb0d53488062a1046306498d36c54dbfe122869858e2ad325fd72bcb09f31d" dependencies = [ "byteorder", "cpufeatures", @@ -4224,9 +4177,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "storage-proofs-core" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "807382fd21c163e7666587a9f9142881c1caa00db33e14784dd31f7eb9982bee" +checksum = "e0406d7746764226f576e731e56b8fa3a6f4be1c44349208de96a2c89ffd9efa" dependencies = [ "aes", "anyhow", @@ -4259,9 +4212,9 @@ dependencies = [ [[package]] name = "storage-proofs-porep" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c9539ca32203ac4c7e888f967b6343defd29c935614d2defa4912a10148ff8" +checksum = "6fae1fe05e2ddfa0edaac80906482c520825c5258f9f0d7fada953bd33d29d9f" dependencies = [ "anyhow", "bellperson", @@ -4277,6 +4230,7 @@ dependencies = [ "filecoin-hashers", "fr32", "generic-array", + "glob", "hex", "lazy_static", "libc", @@ -4300,20 +4254,17 @@ dependencies = [ [[package]] name = "storage-proofs-post" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1780ccdd466460d78ac70290e289c4e7a20721272ffc9ac19736e9f34fcafbc" +checksum = "f730bb7fe8f4e6a8f5e9ffef64fbc2e2a2c5bfd842d68c20f27c93c7dc9344dd" dependencies = [ "anyhow", "bellperson", - "blake2b_simd", "blstrs", "byteorder", "ff", "filecoin-hashers", - "fr32", "generic-array", - "hex", "log", "rayon", "serde", @@ -4323,9 +4274,9 @@ dependencies = [ [[package]] name = "storage-proofs-update" -version = "16.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a9c5760889cffd415961e6c1637c300aa40732e753646e8d4885baa4f48d72" +checksum = "992332381b33d7a4e00af874121fdd52982390d6902a51767b4087fceb439321" dependencies = [ "anyhow", "bellperson", @@ -4360,9 +4311,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "supraseal-c2" diff --git a/fvm/CHANGELOG.md b/fvm/CHANGELOG.md index ac10e6a50..944553dc6 100644 --- a/fvm/CHANGELOG.md +++ b/fvm/CHANGELOG.md @@ -4,6 +4,11 @@ Changes to the reference FVM implementation. ## [Unreleased] +## 3.10.0 [2024-06-12] + +- Update `filecoin-proofs-api` to v18 +- fix: remove the pairing feature from fvm_shared [#2009](https://github.com/filecoin-project/ref-fvm/pull/2009) + ## 3.9.0 [2024-01-31] - BREAKING: Change `ExecutionEvent::InvokeActor` from only including the actor's code CID to including the actor's ID and state-object (including the code CID, current balance, current state root, delegated address, and nonce). The new API matches the API in FVMv4. diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml index 5a0f1f99e..6e13dd4ca 100644 --- a/fvm/Cargo.toml +++ b/fvm/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fvm" description = "Filecoin Virtual Machine reference implementation" -version = "3.9.0" +version = "3.10.0" license = "MIT OR Apache-2.0" authors = ["Protocol Labs", "Filecoin Core Devs"] edition = "2021" @@ -17,7 +17,7 @@ thiserror = "1.0.40" num-traits = "0.2" cid = { workspace = true, features = ["serde-codec"] } multihash = { workspace = true, features = ["sha2", "sha3", "ripemd"] } -fvm_shared = { version = "3.6.0", path = "../shared", features = ["crypto"] } +fvm_shared = { version = "3.10.0", path = "../shared", features = ["crypto"] } fvm_ipld_hamt = { version = "0.8.0" } fvm_ipld_amt = { version = "0.6.1" } fvm_ipld_blockstore = { version = "0.2.0" } @@ -27,7 +27,7 @@ serde_tuple = "0.5" lazy_static = "1.4.0" derive_more = "0.99.17" replace_with = "0.1.7" -filecoin-proofs-api = { version = "16", default-features = false } +filecoin-proofs-api = { version = "18", default-features = false } rayon = "1" num_cpus = "1.15.0" log = "0.4.19" diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md index 779e56a33..becbaf506 100644 --- a/shared/CHANGELOG.md +++ b/shared/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +## 3.10.0 [2024-06-12] + +- Update `filecoin-proofs-api` to v18 +- fix: remove the pairing feature from fvm_shared [#2009](https://github.com/filecoin-project/ref-fvm/pull/2009) + ## 3.6.0 (2023-09-06) - BREAKING: Upgrade the proofs API to v16. diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 96ca83ddf..2c8198595 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "fvm_shared" description = "Filecoin Virtual Machine shared types and functions" -version = "3.6.0" +version = "3.10.0" edition = "2021" license = "MIT OR Apache-2.0" authors = ["ChainSafe Systems ", "Protocol Labs", "Filecoin Core Devs"] @@ -31,7 +31,7 @@ bitflags = { version = "2.3.3", features = ["serde"] } ## non-wasm dependencies; these dependencies and the respective code is ## only activated through non-default features, which the Kernel enables, but ## not the actors. -filecoin-proofs-api = { version = "16", default-features = false, optional = true } +filecoin-proofs-api = { version = "18", default-features = false, optional = true } libsecp256k1 = { version = "0.7", optional = true } bls-signatures = { version = "0.15", default-features = false, optional = true } @@ -50,6 +50,5 @@ crypto = ["libsecp256k1", "blst", "proofs"] proofs = ["filecoin-proofs-api"] secp256k1 = ["libsecp256k1"] blst = ["bls-signatures/blst"] -pairing = ["bls-signatures/pairing"] testing = [] arb = ["arbitrary", "dep:quickcheck", "num-bigint/quickcheck"] diff --git a/testing/conformance/Cargo.toml b/testing/conformance/Cargo.toml index 3d533fb7c..38230767f 100644 --- a/testing/conformance/Cargo.toml +++ b/testing/conformance/Cargo.toml @@ -39,7 +39,7 @@ tar = { version = "0.4.38", default-features = false } zstd = { version = "0.12.3", default-features = false } [dependencies.fvm] -version = "3.9.0" +version = "3.10.0" path = "../../fvm" default-features = false features = ["testing"] diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml index c269fc52e..02df89b85 100644 --- a/testing/integration/Cargo.toml +++ b/testing/integration/Cargo.toml @@ -8,8 +8,8 @@ authors = ["Protocol Labs", "Filecoin Core Devs", "Polyphene"] repository = "https://github.com/filecoin-project/ref-fvm" [dependencies] -fvm = { version = "3.9.0", path = "../../fvm", default-features = false, features = ["testing"] } -fvm_shared = { version = "3.6.0", path = "../../shared", features = ["testing"] } +fvm = { version = "3.10.0", path = "../../fvm", default-features = false, features = ["testing"] } +fvm_shared = { version = "3.10.0", path = "../../shared", features = ["testing"] } fvm_ipld_car = { version = "0.7.1" } fvm_ipld_blockstore = { version = "0.2.0" } fvm_ipld_encoding = { version = "0.4.0" }