diff --git a/Cargo.lock b/Cargo.lock index bdd40533b..f0792c703 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arrayref" @@ -193,7 +193,7 @@ checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.25", ] [[package]] @@ -638,7 +638,21 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.16.3", + "serde", + "serde_bytes", + "unsigned-varint", +] + +[[package]] +name = "cid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +dependencies = [ + "core2", + "multibase", + "multihash 0.18.1", "serde", "serde_bytes", "unsigned-varint", @@ -1760,8 +1774,8 @@ dependencies = [ "fil_actors_runtime", "frc42_dispatch", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "num-derive", "num-traits", @@ -1776,14 +1790,14 @@ checksum = "4a3138c84b845e64c6ad0c50ef299f954d979bd265c8b74509a22b9d1b8107e0" dependencies = [ "anyhow", "async-std", - "cid", + "cid 0.8.6", "clap", "futures", - "fvm_ipld_blockstore", + "fvm_ipld_blockstore 0.1.1", "fvm_ipld_car", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.3.3", "serde", - "serde_ipld_dagcbor", + "serde_ipld_dagcbor 0.2.2", "serde_json", ] @@ -1792,8 +1806,8 @@ name = "fil_actor_cron" version = "11.0.0" dependencies = [ "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "log", "num-derive", @@ -1805,13 +1819,13 @@ dependencies = [ name = "fil_actor_datacap" version = "11.0.0" dependencies = [ - "cid", + "cid 0.8.6", "fil_actors_runtime", "frc42_dispatch", "frc46_token", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "lazy_static", @@ -1826,16 +1840,16 @@ name = "fil_actor_eam" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "fil_actor_evm", "fil_actors_evm_shared", "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "hex-literal", "log", - "multihash", + "multihash 0.16.3", "num-derive", "num-traits", "rlp", @@ -1850,7 +1864,7 @@ dependencies = [ "fil_actors_runtime", "frc42_dispatch", "fvm_actor_utils", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "hex-literal", "num-derive", @@ -1863,21 +1877,21 @@ name = "fil_actor_evm" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "ethers 1.0.2", "etk-asm", "fil_actors_evm_shared", "fil_actors_runtime", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_kamt", "fvm_shared", "hex", "hex-literal", "lazy_static", "log", - "multihash", + "multihash 0.16.3", "num-derive", "num-traits", "once_cell", @@ -1893,11 +1907,11 @@ name = "fil_actor_init" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "fil_actors_runtime", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "log", @@ -1911,7 +1925,7 @@ name = "fil_actor_market" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "fil_actor_power", "fil_actor_reward", "fil_actor_verifreg", @@ -1920,8 +1934,8 @@ dependencies = [ "frc46_token", "fvm_ipld_amt", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "integer-encoding", @@ -1929,7 +1943,7 @@ dependencies = [ "lazy_static", "libipld-core 0.13.1", "log", - "multihash", + "multihash 0.16.3", "num-derive", "num-traits", "regex", @@ -1942,7 +1956,7 @@ version = "11.0.0" dependencies = [ "anyhow", "byteorder", - "cid", + "cid 0.8.6", "fil_actor_account", "fil_actor_market", "fil_actor_power", @@ -1951,14 +1965,14 @@ dependencies = [ "frc42_dispatch", "fvm_ipld_amt", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "itertools", "lazy_static", "log", - "multihash", + "multihash 0.16.3", "num-derive", "num-traits", "rand", @@ -1971,12 +1985,12 @@ name = "fil_actor_multisig" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "fil_actors_runtime", "frc42_dispatch", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "indexmap", @@ -1992,13 +2006,13 @@ name = "fil_actor_paych" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "derive_builder", "fil_actors_runtime", "frc42_dispatch", "fvm_ipld_amt", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "lazy_static", "num-derive", @@ -2015,12 +2029,12 @@ name = "fil_actor_power" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "fil_actor_reward", "fil_actors_runtime", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "indexmap", @@ -2037,8 +2051,8 @@ name = "fil_actor_reward" version = "11.0.0" dependencies = [ "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "lazy_static", "log", @@ -2053,10 +2067,10 @@ name = "fil_actor_system" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "fil_actors_runtime", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "num-derive", "num-traits", @@ -2068,13 +2082,13 @@ name = "fil_actor_verifreg" version = "11.0.0" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "fil_actors_runtime", "frc42_dispatch", "frc46_token", "fvm_actor_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "lazy_static", @@ -2089,7 +2103,7 @@ name = "fil_actors_evm_shared" version = "11.0.0" dependencies = [ "fil_actors_runtime", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "hex", "serde", @@ -2104,12 +2118,12 @@ dependencies = [ "blake2b_simd", "byteorder", "castaway", - "cid", + "cid 0.8.6", "derive_builder", "fvm_ipld_amt", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_sdk", "fvm_shared", @@ -2118,7 +2132,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "multihash", + "multihash 0.16.3", "num", "num-derive", "num-traits", @@ -2137,7 +2151,7 @@ dependencies = [ name = "fil_builtin_actors_bundle" version = "11.0.0" dependencies = [ - "cid", + "cid 0.8.6", "clap", "fil_actor_account", "fil_actor_bundler", @@ -2166,7 +2180,7 @@ version = "11.0.0" dependencies = [ "anyhow", "bimap", - "cid", + "cid 0.8.6", "fil_actor_account", "fil_actor_cron", "fil_actor_datacap", @@ -2181,8 +2195,8 @@ dependencies = [ "fil_actor_verifreg", "fil_actors_runtime", "frc46_token", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "num-derive", "num-traits", @@ -2246,7 +2260,7 @@ checksum = "c6fda233581861602b8c1c0922a44d79977cb0f56cfe1c3b71eafb589d1da749" dependencies = [ "frc42_hasher", "frc42_macros", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.3.3", "fvm_sdk", "fvm_shared", "thiserror", @@ -2283,12 +2297,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03b2e4912228bdb9b6d24e7cea4d2d671ec04a8e55f0edc88540b8ceaeea83a" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "frc42_dispatch", "fvm_actor_utils", "fvm_ipld_amt", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_sdk", "fvm_shared", @@ -2433,10 +2447,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b57882eb67bc56aa67087c584767596c41e54bdd16151a65058177256e860572" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "frc42_dispatch", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_sdk", "fvm_shared", "num-traits", @@ -2452,9 +2466,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e84f16d6927ce342ef86bd20fcc2d5bd498ed33ae6d7a22fea7a1b453488ec88" dependencies = [ "anyhow", - "cid", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "cid 0.8.6", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "itertools", "once_cell", "serde", @@ -2464,10 +2478,9 @@ dependencies = [ [[package]] name = "fvm_ipld_bitfield" version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1950291f40d2d1047eb0a4568f7ef6d5b4973452dcef012dffb1957fe483ff7" +source = "git+https://github.com/filecoin-project/ref-fvm?branch=next#9c16cf5ce37579a83e27843bccfae19af6d16598" dependencies = [ - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.4.0", "serde", "thiserror", "unsigned-varint", @@ -2480,8 +2493,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688239a96199577f6705a3f9689abfd795f867f91f5847bc7e236017cc672df7" dependencies = [ "anyhow", - "cid", - "multihash", + "cid 0.8.6", + "multihash 0.16.3", +] + +[[package]] +name = "fvm_ipld_blockstore" +version = "0.2.0" +source = "git+https://github.com/filecoin-project/ref-fvm?branch=next#9c16cf5ce37579a83e27843bccfae19af6d16598" +dependencies = [ + "anyhow", + "cid 0.10.1", + "multihash 0.18.1", ] [[package]] @@ -2490,10 +2513,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c60423568393a284de6d7c342cd664690611f27d223eb78629fa568ddd4e7951" dependencies = [ - "cid", + "cid 0.8.6", "futures", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "integer-encoding", "serde", "thiserror", @@ -2506,11 +2529,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0816a2a6df4853de08a723d261110d56a121aa313bc570fe9d248f0a4bc5288" dependencies = [ "anyhow", - "cid", - "fvm_ipld_blockstore", - "multihash", + "cid 0.8.6", + "fvm_ipld_blockstore 0.1.1", + "multihash 0.16.3", + "serde", + "serde_ipld_dagcbor 0.2.2", + "serde_repr", + "serde_tuple", + "thiserror", +] + +[[package]] +name = "fvm_ipld_encoding" +version = "0.4.0" +source = "git+https://github.com/filecoin-project/ref-fvm?branch=next#9c16cf5ce37579a83e27843bccfae19af6d16598" +dependencies = [ + "anyhow", + "cid 0.10.1", + "fvm_ipld_blockstore 0.2.0", + "multihash 0.18.1", "serde", - "serde_ipld_dagcbor", + "serde_ipld_dagcbor 0.4.0", "serde_repr", "serde_tuple", "thiserror", @@ -2524,12 +2563,12 @@ checksum = "0c942494dde990aeac314311bde34c787be99cab7d0836397a75556cbaa2c3e7" dependencies = [ "anyhow", "byteorder", - "cid", + "cid 0.8.6", "forest_hash_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "libipld-core 0.14.0", - "multihash", + "multihash 0.16.3", "once_cell", "serde", "sha2 0.10.6", @@ -2544,11 +2583,11 @@ checksum = "5ab54acc8b19c5029ceefb3a1aa5708e1513a6ef7b17cdfeb6674c042b70d163" dependencies = [ "anyhow", "byteorder", - "cid", + "cid 0.8.6", "forest_hash_utils", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", - "multihash", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", + "multihash 0.16.3", "once_cell", "serde", "sha2 0.10.6", @@ -2561,8 +2600,8 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db8ac1214ca6c31bcbb4e2e7461cd17af18e0496b9053547d465f15c8d8429a7" dependencies = [ - "cid", - "fvm_ipld_encoding", + "cid 0.8.6", + "fvm_ipld_encoding 0.3.3", "fvm_shared", "lazy_static", "log", @@ -2579,12 +2618,12 @@ dependencies = [ "anyhow", "bitflags", "blake2b_simd", - "cid", + "cid 0.8.6", "data-encoding", "data-encoding-macro", - "fvm_ipld_encoding", + "fvm_ipld_encoding 0.3.3", "lazy_static", - "multihash", + "multihash 0.16.3", "num-bigint", "num-derive", "num-integer", @@ -3048,10 +3087,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbdd758764f9680a818af33c31db733eb7c45224715d8816b9dcf0548c75f7c5" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "core2", "multibase", - "multihash", + "multihash 0.16.3", "serde", "thiserror", ] @@ -3063,10 +3102,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d44790246ec6b7314cba745992c23d479d018073e66d49ae40ae1b64e5dd8eb5" dependencies = [ "anyhow", - "cid", + "cid 0.8.6", "core2", "multibase", - "multihash", + "multihash 0.16.3", "serde", "thiserror", ] @@ -3194,6 +3233,20 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +dependencies = [ + "blake2b_simd", + "core2", + "multihash-derive", + "serde", + "serde-big-array", + "unsigned-varint", +] + [[package]] name = "multihash-derive" version = "0.8.1" @@ -3669,9 +3722,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -3704,9 +3757,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -4103,9 +4156,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -4150,13 +4203,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.25", ] [[package]] @@ -4166,7 +4219,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1e23de7a4a18dff77ab9531f279a882500b8cf3549fde044d4e10481b411f1e" dependencies = [ "cbor4ii", - "cid", + "cid 0.8.6", + "scopeguard", + "serde", +] + +[[package]] +name = "serde_ipld_dagcbor" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace39c1b7526be78c755a4c698313f699cf44e62408c0029bf9ab9450fe836da" +dependencies = [ + "cbor4ii", + "cid 0.10.1", "scopeguard", "serde", ] @@ -4190,7 +4255,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.25", ] [[package]] @@ -4417,9 +4482,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.4" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -4482,7 +4547,7 @@ dependencies = [ "anyhow", "bimap", "blake2b_simd", - "cid", + "cid 0.8.6", "ethers 0.17.0", "fil_actor_account", "fil_actor_cron", @@ -4505,8 +4570,8 @@ dependencies = [ "frc46_token", "fvm_actor_utils", "fvm_ipld_bitfield", - "fvm_ipld_blockstore", - "fvm_ipld_encoding", + "fvm_ipld_blockstore 0.1.1", + "fvm_ipld_encoding 0.3.3", "fvm_ipld_hamt", "fvm_shared", "hex", @@ -4516,7 +4581,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "multihash", + "multihash 0.16.3", "num-derive", "num-traits", "rand", @@ -4550,7 +4615,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.4", + "syn 2.0.25", ] [[package]] @@ -5084,3 +5149,23 @@ name = "zeroize" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" + +[[patch.unused]] +name = "fvm_ipld_amt" +version = "0.6.0" +source = "git+https://github.com/filecoin-project/ref-fvm?branch=next#9c16cf5ce37579a83e27843bccfae19af6d16598" + +[[patch.unused]] +name = "fvm_ipld_hamt" +version = "0.7.0" +source = "git+https://github.com/filecoin-project/ref-fvm?branch=next#9c16cf5ce37579a83e27843bccfae19af6d16598" + +[[patch.unused]] +name = "fvm_sdk" +version = "3.3.0" +source = "git+https://github.com/filecoin-project/ref-fvm?branch=next#9c16cf5ce37579a83e27843bccfae19af6d16598" + +[[patch.unused]] +name = "fvm_shared" +version = "3.4.0" +source = "git+https://github.com/filecoin-project/ref-fvm?branch=next#9c16cf5ce37579a83e27843bccfae19af6d16598" diff --git a/Cargo.toml b/Cargo.toml index 16ed18321..9f11d5325 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,13 +59,13 @@ members = [ ] [patch.crates-io] -#fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } -#fvm_sdk = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } -#fvm_ipld_hamt = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } -#fvm_ipld_amt = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } -#fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } -#fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } -#fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" } +fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm", branch = "next" } +fvm_sdk = { git = "https://github.com/filecoin-project/ref-fvm", branch = "next" } +fvm_ipld_hamt = { git = "https://github.com/filecoin-project/ref-fvm", branch = "next" } +fvm_ipld_amt = { git = "https://github.com/filecoin-project/ref-fvm", branch = "next" } +fvm_ipld_bitfield = { git = "https://github.com/filecoin-project/ref-fvm", branch = "next" } +fvm_ipld_encoding = { git = "https://github.com/filecoin-project/ref-fvm", branch = "next" } +fvm_ipld_blockstore = { git = "https://github.com/filecoin-project/ref-fvm", branch = "next" } #fvm_actor_utils = { git = "https://github.com/helix-onchain/filecoin", branch = "main" } #frc42_dispatch = { git = "https://github.com/helix-onchain/filecoin", branch = "main" } #frc46_token = { git = "https://github.com/helix-onchain/filecoin", branch = "main" } diff --git a/actors/account/Cargo.toml b/actors/account/Cargo.toml index 5e3b2b4bd..a92479eaf 100644 --- a/actors/account/Cargo.toml +++ b/actors/account/Cargo.toml @@ -22,7 +22,7 @@ num-traits = "0.2.14" num-derive = "0.3.3" fvm_ipld_blockstore = "0.1.1" fvm_ipld_encoding = "0.3.3" -anyhow = "1.0.65" +anyhow = "1.0.71" [dev-dependencies] fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] } diff --git a/actors/miner/Cargo.toml b/actors/miner/Cargo.toml index 2d77b8d62..ca501bd2d 100644 --- a/actors/miner/Cargo.toml +++ b/actors/miner/Cargo.toml @@ -27,7 +27,7 @@ num-derive = "0.3.3" lazy_static = "1.4.0" log = "0.4.14" byteorder = "1.4.3" -anyhow = "1.0.65" +anyhow = "1.0.71" itertools = "0.10.3" fvm_ipld_blockstore = "0.1.1" fvm_ipld_encoding = "0.3.3" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index cd2854b57..5f489d359 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.64.0" +channel = "1.68.2" components = ["clippy", "llvm-tools-preview", "rustfmt"] targets = ["wasm32-unknown-unknown"]