Revert "Update filecoin-cxx deps, mainly multihash"

This reverts commit a1db616.

components/filecoin/rs/BUILD.gn

@@ -19,12 +19,12 @@ rust_static_library("rust_lib") {
   deps = [
     "//brave/third_party/rust/blake2b_simd/v1:lib",
     "//brave/third_party/rust/bls_signatures/v0_12:lib",
-    "//brave/third_party/rust/cid/v0_10:lib",
+    "//brave/third_party/rust/cid/v0_8:lib",
     "//brave/third_party/rust/forest_bigint/v0_1:lib",
-    "//brave/third_party/rust/fvm_ipld_encoding/v0_4:lib",
+    "//brave/third_party/rust/fvm_ipld_encoding/v0_3:lib",
     "//brave/third_party/rust/fvm_shared/v3:lib",
     "//brave/third_party/rust/libsecp256k1/v0_7:lib",
-    "//brave/third_party/rust/multihash/v0_18:lib",
+    "//brave/third_party/rust/multihash/v0_16:lib",
     "//brave/third_party/rust/thiserror/v1:lib",
     "//third_party/rust/base64/v0_13:lib",
     "//third_party/rust/serde/v1:lib",

components/filecoin/rs/Cargo.toml

@@ -9,16 +9,16 @@ license = "MPL-2.0"
 base64 = "0.13.0"
 bls-signatures = { version = "0.12", default-features = false, features = ["pairing"] }
 cxx = "1"
-fvm_shared = { version = "3.10.0" }
+fvm_shared = { version = "3.3.0" }
 libsecp256k1 = "0.7"
 num_bigint_chainsafe = { package = "forest_bigint", version = "0.1.2"}
 serde = { version = "^1.0.117", features = ["derive"] }
 serde_json = "^1.0.59"
 thiserror = "^1.0.30"
 blake2b_simd = "1"
-cid = { version = "0.10", default-features = false }
-multihash = { version = "0.18.0", default-features = false, features = [ "multihash-impl", "blake2b"] }
-fvm_ipld_encoding = "0.4"
+cid = { version = "0.8.5", default-features = false }
+multihash = { version="0.16.3", default-features = false, features = [ "multihash-impl", "blake2b"] }
+fvm_ipld_encoding = "0.3"
 
 [lib]
 name = "filecoin_cxx"

third_party/rust/bitflags/v1/BUILD.gn

@@ -3,6 +3,34 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at https://mozilla.org/MPL/2.0/.
 
-group("lib") {
-  public_deps = [ "//third_party/rust/bitflags/v1:lib" ]
+# @generated from third_party/rust/chromium_crates_io/BUILD.gn.hbs by
+# tools/crates/gnrt.
+# Do not edit!
+
+import("//build/rust/cargo_crate.gni")
+
+cargo_crate("lib") {
+  crate_name = "bitflags"
+  epoch = "1"
+  crate_type = "rlib"
+  crate_root = "//brave/third_party/rust/chromium_crates_io/vendor/bitflags-1.3.2/src/lib.rs"
+  sources = [
+    "//brave/third_party/rust/chromium_crates_io/vendor/bitflags-1.3.2/src/example_generated.rs",
+    "//brave/third_party/rust/chromium_crates_io/vendor/bitflags-1.3.2/src/lib.rs",
+  ]
+  inputs = []
+
+  build_native_rust_unit_tests = false
+  edition = "2018"
+  cargo_pkg_version = "1.3.2"
+  cargo_pkg_authors = "The Rust Project Developers"
+  cargo_pkg_name = "bitflags"
+  cargo_pkg_description =
+      "A macro to generate structures which behave like bitflags."
+  library_configs -= [ "//build/config/compiler:chromium_code" ]
+  library_configs += [ "//build/config/compiler:no_chromium_code" ]
+  executable_configs -= [ "//build/config/compiler:chromium_code" ]
+  executable_configs += [ "//build/config/compiler:no_chromium_code" ]
+  proc_macro_configs -= [ "//build/config/compiler:chromium_code" ]
+  proc_macro_configs += [ "//build/config/compiler:no_chromium_code" ]
 }

third_party/rust/bitflags/v1/README.chromium

@@ -6,4 +6,5 @@ Version: 1.3.2
 Security Critical: yes
 Shipped: yes
 License: Apache 2.0
-License File:
+License File: //brave/third_party/rust/chromium_crates_io/vendor/bitflags-1.3.2/LICENSE-APACHE
+Revision: ed185cfb1c447c1b4bd6ac021c9ec3bb02c9e2f2

third_party/rust/chromium_crates_io/Cargo.toml

@@ -91,14 +91,6 @@ package = "anyhow"
 path = "../../../../third_party/rust/chromium_crates_io/vendor/base64-0.13.1"
 package = "base64"
 
-[patch.crates-io.bitflags_v1]
-path = "../../../../third_party/rust/chromium_crates_io/vendor/bitflags-1.3.2"
-package = "bitflags"
-
-[patch.crates-io.bitflags_v2]
-path = "../../../../third_party/rust/chromium_crates_io/vendor/bitflags-2.6.0"
-package = "bitflags"
-
 [patch.crates-io.cfg-if_v1]
 path = "../../../../third_party/rust/chromium_crates_io/vendor/cfg-if-1.0.0"
 package = "cfg-if"

third_party/rust/chromium_crates_io/gnrt_config.toml

@@ -276,7 +276,7 @@ extra_build_script_src_roots = [ "entities.rs" ]
 build_script_outputs = [ "generated.rs", "named_entities.rs", ]
 
 [crate.multihash]
-extra_kv = { rustenv = [ "CARGO_MANIFEST_DIR=\" + rebase_path(\"//brave/third_party/rust/chromium_crates_io/vendor/multihash-0.18.1\") + \"" ]}
+extra_kv = { rustenv = [ "CARGO_MANIFEST_DIR=\" + rebase_path(\"//brave/third_party/rust/chromium_crates_io/vendor/multihash-0.16.3\") + \"" ]}
 
 [crate.num-bigint]
 extra_input_roots = [ "../README.md" ]

third_party/rust/chromium_crates_io/vendor/bitflags-1.3.2/.cargo_vcs_info.json

@@ -0,0 +1,5 @@
+{
+  "git": {
+    "sha1": "ed185cfb1c447c1b4bd6ac021c9ec3bb02c9e2f2"
+  }
+}