Use bollard crate directly (#10546)

This PR changes us from using my Bollard fork that uses an older
serde_with version to using the main Bollard crate.

Recently I landed a PR to serde_with that changed the minimum required
serde version from 1.0.157 to 1.0.152. Bollard uses serde_with, so now
the transitive dependency on serde through serde_with from Bollard is no
longer 1.0.157 but 1.0.152, which we can use happily without breaking
the the analyze formats code (see this issue for more details: ).

Cargo.toml

@@ -446,10 +446,7 @@ bitvec = "1.0.1"
 blake2 = "0.10.4"
 blake2-rfc = "0.2.18"
 blst = "0.3.7"
-# We use a version of bollard where it relies on a lower version of serde_with.
-# Otherwise it imposes that we use serde 1.0.157, which we can't due to this issue:
-# https://github.com/aptos-labs/aptos-core/issues/10424
-bollard = { git = "https://github.com/banool/bollard.git", rev = "0bf0b43f736040bb3d4aacb20125fd2b4021733d" }
+bollard = "0.15"
 bulletproofs = { version = "4.0.0" }
 byteorder = "1.4.3"
 bytes = { version = "1.4.0", features = ["serde"] }
@@ -596,9 +593,9 @@ sha2 = "0.9.3"
 sha2_0_10_6 = { package = "sha2", version = "0.10.6" }
 sha3 = "0.9.1"
 siphasher = "0.3.10"
-# For more information about why we are pinned to 1.0.149, see this issue:
+# For more information about why we are pinned to 1.0.152, see this issue:
 # https://github.com/aptos-labs/aptos-core/issues/10424
-serde = { version = "=1.0.149", features = ["derive", "rc"] }
+serde = { version = "=1.0.152", features = ["derive", "rc"] }
 serde_bytes = "0.11.6"
 serde_json = { version = "1.0.81", features = ["preserve_order", "arbitrary_precision"] } # Note: arbitrary_precision is required to parse u256 in JSON
 serde_repr = "0.1"