From 0f716267067cc8b52e69c81fcb9143684efa4e1d Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Fri, 22 Nov 2024 16:25:18 +0000
Subject: [PATCH] chore: update the fvm to update to the latest CID/Multihash
 versions (#507)

---
 rust/Cargo.lock | 238 ++++++++++++++++++++----------------------------
 rust/Cargo.toml |  18 ++--
 2 files changed, 106 insertions(+), 150 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 7ce10688..651ab369 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -444,16 +444,16 @@ dependencies = [
 
 [[package]]
 name = "cid"
-version = "0.10.1"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3"
+checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a"
 dependencies = [
  "core2",
  "multibase",
  "multihash",
  "serde",
  "serde_bytes",
- "unsigned-varint 0.7.2",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -1204,14 +1204,14 @@ dependencies = [
  "fil_logger",
  "filecoin-proofs-api",
  "filepath",
- "fvm 2.9.1",
- "fvm 3.11.1",
- "fvm 4.4.4",
+ "fvm 2.10.0",
+ "fvm 3.12.0",
+ "fvm 4.5.2",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
- "fvm_shared 2.9.1",
- "fvm_shared 3.11.1",
- "fvm_shared 4.4.4",
+ "fvm_shared 2.10.0",
+ "fvm_shared 3.12.0",
+ "fvm_shared 4.5.2",
  "group",
  "lazy_static",
  "libc",
@@ -1398,9 +1398,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "fvm"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82f0b0c075f77e73dda95d539b61be95f3c78c1edc53dd29991af2c57607440"
+checksum = "da9b8344ca0d1c64f157fa282a34fb15fdf25d716c638ca30857d83531d8f227"
 dependencies = [
  "anyhow",
  "blake2b_simd",
@@ -1415,10 +1415,11 @@ dependencies = [
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
  "fvm_ipld_hamt",
- "fvm_shared 2.9.1",
+ "fvm_shared 2.10.0",
  "lazy_static",
  "log",
- "multihash",
+ "multihash-codetable",
+ "multihash-derive",
  "num-derive",
  "num-traits",
  "num_cpus",
@@ -1435,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "fvm"
-version = "3.11.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d29adcf90fc273d333a1a7360e05ad29cffc3de9111fa2089b4b99f9b017812"
+checksum = "ef92214500bb590e6ee44309e5471e77ad74ab00494d811261d99689fb7e580c"
 dependencies = [
  "anyhow",
  "blake2b_simd",
@@ -1450,11 +1451,12 @@ dependencies = [
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
  "fvm_ipld_hamt",
- "fvm_shared 3.11.1",
+ "fvm_shared 3.12.0",
  "lazy_static",
  "log",
  "minstant",
- "multihash",
+ "multihash-codetable",
+ "multihash-derive",
  "num-traits",
  "num_cpus",
  "once_cell",
@@ -1471,9 +1473,9 @@ dependencies = [
 
 [[package]]
 name = "fvm"
-version = "4.4.4"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e2bc545e9b8a6c4e08ec78c712469c542b3e9310ae3091c1b60ddb48e20862b"
+checksum = "d2e154a4226aa9a7aa97939a8599388a2531030d08e02c600a6665fe7a49ff70"
 dependencies = [
  "ambassador",
  "anyhow",
@@ -1485,11 +1487,12 @@ dependencies = [
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
  "fvm_ipld_hamt",
- "fvm_shared 4.4.4",
+ "fvm_shared 4.5.2",
  "lazy_static",
  "log",
  "minstant",
- "multihash",
+ "multihash-codetable",
+ "multihash-derive",
  "num-traits",
  "rand",
  "rayon",
@@ -1526,15 +1529,16 @@ dependencies = [
 
 [[package]]
 name = "fvm_ipld_amt"
-version = "0.6.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fea333475130094f27ce67809aae3f69eb5247541d835950b7c5da733dbbb34"
+checksum = "fb970d9749947c9d6bf51b690a0d51143fd352f0201562b7764b66a361cef544"
 dependencies = [
  "anyhow",
  "cid",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
- "itertools 0.11.0",
+ "itertools 0.13.0",
+ "multihash-codetable",
  "once_cell",
  "serde",
  "thiserror",
@@ -1542,25 +1546,25 @@ dependencies = [
 
 [[package]]
 name = "fvm_ipld_blockstore"
-version = "0.2.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d064b957420f5ecc137a153baaa6c32e2eb19b674135317200b6f2537eabdbfd"
+checksum = "97b8b31e022f71b73440054f7e5171231a1ebc745adf075014d5aa8ea78ea283"
 dependencies = [
  "anyhow",
  "cid",
- "multihash",
+ "multihash-codetable",
 ]
 
 [[package]]
 name = "fvm_ipld_encoding"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90608092e31d9a06236268c58f7c36668ab4b2a48afafe3a97e08f094ad7ae50"
+checksum = "723294d1574e0126a9e16069ef6581a2ee3c06eb7d6edc33eb2a976057747bfb"
 dependencies = [
  "anyhow",
  "cid",
  "fvm_ipld_blockstore",
- "multihash",
+ "multihash-codetable",
  "serde",
  "serde_ipld_dagcbor",
  "serde_repr",
@@ -1570,9 +1574,9 @@ dependencies = [
 
 [[package]]
 name = "fvm_ipld_hamt"
-version = "0.9.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c900736087ff87cc51f669eee2f8e000c80717472242eb3f712aaa059ac3b3"
+checksum = "8512ddaa098c324e0c6b0d8cccacdcbc08834509db11f52d5f5cd7f1f10a39f8"
 dependencies = [
  "anyhow",
  "byteorder",
@@ -1580,8 +1584,8 @@ dependencies = [
  "forest_hash_utils",
  "fvm_ipld_blockstore",
  "fvm_ipld_encoding",
- "libipld-core",
- "multihash",
+ "ipld-core",
+ "multihash-codetable",
  "once_cell",
  "serde",
  "sha2 0.10.8",
@@ -1590,9 +1594,9 @@ dependencies = [
 
 [[package]]
 name = "fvm_shared"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9e88c5aeb5affbbc94b554300537f9cb6947885c8d697a22183e0300c84448c"
+checksum = "12e94f3c0e8540508c4cd9b22ef160a5ba666c91d15b6e30d6e18aa60a1c390a"
 dependencies = [
  "anyhow",
  "blake2b_simd",
@@ -1617,14 +1621,14 @@ dependencies = [
  "serde_repr",
  "serde_tuple",
  "thiserror",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
 name = "fvm_shared"
-version = "3.11.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3213755aca42f97e5da5aa0695194a4a5a4d7b422d542180e7c542faee0d7a90"
+checksum = "d1e43362b1c03f06e7090d5fb1e4f39db4c311bbf0f6185a0458418a35e8b0be"
 dependencies = [
  "anyhow",
  "bitflags 2.6.0",
@@ -1645,14 +1649,14 @@ dependencies = [
  "serde",
  "serde_tuple",
  "thiserror",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
 name = "fvm_shared"
-version = "4.4.4"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7838d3fc1eeeb47c7a8e32bdc3b37e6d806ac261cb96e38f15b503df671648"
+checksum = "8eb924e9fa1be96ae49c1de2c7dd24ed9fd83e4b4c653425a6889243bdd63282"
 dependencies = [
  "anyhow",
  "bitflags 2.6.0",
@@ -1665,7 +1669,6 @@ dependencies = [
  "fvm_ipld_encoding",
  "lazy_static",
  "libsecp256k1",
- "multihash",
  "num-bigint",
  "num-derive",
  "num-integer",
@@ -1673,7 +1676,7 @@ dependencies = [
  "serde",
  "serde_tuple",
  "thiserror",
- "unsigned-varint 0.8.0",
+ "unsigned-varint",
 ]
 
 [[package]]
@@ -2062,6 +2065,17 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "ipld-core"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ede82a79e134f179f4b29b5fdb1eb92bd1b38c4dfea394c539051150a21b9b"
+dependencies = [
+ "cid",
+ "serde",
+ "serde_bytes",
+]
+
 [[package]]
 name = "itertools"
 version = "0.8.2"
@@ -2082,18 +2096,18 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
@@ -2162,21 +2176,6 @@ version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
-[[package]]
-name = "libipld-core"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5acd707e8d8b092e967b2af978ed84709eaded82b75effe6cb6f6cc797ef8158"
-dependencies = [
- "anyhow",
- "cid",
- "core2",
- "multibase",
- "multihash",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "libm"
 version = "0.2.11"
@@ -2372,34 +2371,52 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.18.1"
+version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815"
+checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2"
+dependencies = [
+ "core2",
+ "serde",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash-codetable"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67996849749d25f1da9f238e8ace2ece8f9d6bdf3f9750aaf2ae7de3a5cad8ea"
 dependencies = [
  "blake2b_simd",
  "core2",
  "digest 0.10.7",
  "multihash-derive",
  "ripemd",
- "serde",
- "serde-big-array",
  "sha2 0.10.8",
  "sha3",
- "unsigned-varint 0.7.2",
 ]
 
 [[package]]
 name = "multihash-derive"
-version = "0.8.1"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f1b7edab35d920890b88643a765fc9bd295cf0201f4154dda231bef9b8404eb"
+dependencies = [
+ "core2",
+ "multihash",
+ "multihash-derive-impl",
+]
+
+[[package]]
+name = "multihash-derive-impl"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
+checksum = "e3dc7141bd06405929948754f0628d247f5ca1865be745099205e5086da957cb"
 dependencies = [
- "proc-macro-crate 1.1.3",
- "proc-macro-error",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
- "synstructure 0.12.6",
+ "syn 2.0.87",
+ "synstructure",
 ]
 
 [[package]]
@@ -2696,16 +2713,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
-dependencies = [
- "thiserror",
- "toml",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.2.0"
@@ -2715,30 +2722,6 @@ dependencies = [
  "toml_edit",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.89"
@@ -3021,15 +3004,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-big-array"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd31f59f6fe2b0c055371bb2f16d7f0aa7d8881676c04a55b1596d1a17cd10a4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_bytes"
 version = "0.11.15"
@@ -3052,12 +3026,12 @@ dependencies = [
 
 [[package]]
 name = "serde_ipld_dagcbor"
-version = "0.4.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e880e0b1f9c7a8db874642c1217f7e19b29e325f24ab9f0fcb11818adec7f01"
+checksum = "ded35fbe4ab8fdec1f1d14b4daff2206b1eada4d6e708cb451d464d2d965f493"
 dependencies = [
  "cbor4ii",
- "cid",
+ "ipld-core",
  "scopeguard",
  "serde",
 ]
@@ -3244,7 +3218,7 @@ version = "36.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43cf89a0cc9131279235baf8599b0e073fbcb096419204de0cc5d1a48ae73f74"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate",
  "proc-macro2",
  "quote",
  "rand",
@@ -3430,18 +3404,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "unicode-xid",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.13.1"
@@ -3605,12 +3567,6 @@ dependencies = [
  "extension-traits",
 ]
 
-[[package]]
-name = "unsigned-varint"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
-
 [[package]]
 name = "unsigned-varint"
 version = "0.8.0"
@@ -4222,7 +4178,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "synstructure 0.13.1",
+ "synstructure",
 ]
 
 [[package]]
@@ -4264,7 +4220,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.87",
- "synstructure 0.13.1",
+ "synstructure",
 ]
 
 [[package]]
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 841f411c..d1bdd655 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -33,16 +33,16 @@ rayon = "1.2.1"
 anyhow = "1.0.23"
 serde_json = "1.0.46"
 rust-gpu-tools = { version = "0.7", optional = true, default-features = false }
-fvm4 = { package = "fvm", version = "~4.4.4", default-features = false, features = ["verify-signature", "nv25-dev"] }
-fvm4_shared = { package = "fvm_shared", version = "~4.4.4" }
-fvm3 = { package = "fvm", version = "~3.11.1", default-features = false }
-fvm3_shared = { package = "fvm_shared", version = "~3.11.1" }
-fvm2 = { package = "fvm", version = "~2.9.1", default-features = false }
-fvm2_shared = { package = "fvm_shared", version = "~2.9.1" }
-fvm_ipld_encoding = "0.4.0"
-fvm_ipld_blockstore = "0.2.1"
+fvm4 = { package = "fvm", version = "~4.5.2", default-features = false, features = ["verify-signature", "nv25-dev"] }
+fvm4_shared = { package = "fvm_shared", version = "~4.5.1" }
+fvm3 = { package = "fvm", version = "~3.12.0", default-features = false }
+fvm3_shared = { package = "fvm_shared", version = "~3.12.0" }
+fvm2 = { package = "fvm", version = "~2.10.0", default-features = false }
+fvm2_shared = { package = "fvm_shared", version = "~2.10.0" }
+fvm_ipld_encoding = "0.5.0"
+fvm_ipld_blockstore = "0.3.0"
 num-traits = "0.2.14"
-cid = { version = "0.10.1", features = ["serde-codec"], default-features = false }
+cid = { version = "0.11.1", features = ["serde"], default-features = false }
 lazy_static = "1.4.0"
 serde = "1.0.117"
 serde_tuple = "0.5"