From ffd3231924e27f4099fefe380ef48b65885c0aac Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandon@mystenlabs.com>
Date: Thu, 11 Jul 2024 15:01:02 -0500
Subject: [PATCH] chore: update fastcrypto and serde_with

---
 Cargo.lock | 62 +++++++++++++++++++++++++++++++++---------------------
 Cargo.toml | 10 ++++-----
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b3a445d9b4930..c7dc83e9efe56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4382,7 +4382,7 @@ dependencies = [
 [[package]]
 name = "fastcrypto"
 version = "0.1.8"
-source = "git+https://github.com/MystenLabs/fastcrypto?rev=55e7e568842939e01c8545a71d72e2402ad74538#55e7e568842939e01c8545a71d72e2402ad74538"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=729145c130be00908d40804bb0eececa46e84340#729145c130be00908d40804bb0eececa46e84340"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -4422,7 +4422,7 @@ dependencies = [
  "secp256k1",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "sha2 0.10.6",
  "sha3 0.10.6",
  "signature 2.0.0",
@@ -4436,7 +4436,7 @@ dependencies = [
 [[package]]
 name = "fastcrypto-derive"
 version = "0.1.3"
-source = "git+https://github.com/MystenLabs/fastcrypto?rev=55e7e568842939e01c8545a71d72e2402ad74538#55e7e568842939e01c8545a71d72e2402ad74538"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=729145c130be00908d40804bb0eececa46e84340#729145c130be00908d40804bb0eececa46e84340"
 dependencies = [
  "quote 1.0.35",
  "syn 1.0.107",
@@ -4445,7 +4445,7 @@ dependencies = [
 [[package]]
 name = "fastcrypto-tbls"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/fastcrypto?rev=55e7e568842939e01c8545a71d72e2402ad74538#55e7e568842939e01c8545a71d72e2402ad74538"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=729145c130be00908d40804bb0eececa46e84340#729145c130be00908d40804bb0eececa46e84340"
 dependencies = [
  "bcs",
  "digest 0.10.7",
@@ -4463,7 +4463,7 @@ dependencies = [
 [[package]]
 name = "fastcrypto-vdf"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/fastcrypto?rev=55e7e568842939e01c8545a71d72e2402ad74538#55e7e568842939e01c8545a71d72e2402ad74538"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=729145c130be00908d40804bb0eececa46e84340#729145c130be00908d40804bb0eececa46e84340"
 dependencies = [
  "bcs",
  "fastcrypto",
@@ -4475,13 +4475,12 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "serde",
- "serde_with 2.1.0",
 ]
 
 [[package]]
 name = "fastcrypto-zkp"
 version = "0.1.3"
-source = "git+https://github.com/MystenLabs/fastcrypto?rev=55e7e568842939e01c8545a71d72e2402ad74538#55e7e568842939e01c8545a71d72e2402ad74538"
+source = "git+https://github.com/MystenLabs/fastcrypto?rev=729145c130be00908d40804bb0eececa46e84340#729145c130be00908d40804bb0eececa46e84340"
 dependencies = [
  "ark-bls12-381",
  "ark-bn254",
@@ -7905,7 +7904,7 @@ dependencies = [
  "rustversion",
  "serde",
  "serde_test",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "sui-protocol-config",
  "thiserror",
  "tokio",
@@ -11158,7 +11157,7 @@ dependencies = [
  "indexmap 1.9.3",
  "serde",
  "serde_json",
- "serde_with_macros",
+ "serde_with_macros 2.1.0",
  "time",
 ]
 
@@ -11171,9 +11170,12 @@ dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.2.6",
  "serde",
  "serde_derive",
  "serde_json",
+ "serde_with_macros 3.8.1",
  "time",
 ]
 
@@ -11189,6 +11191,18 @@ dependencies = [
  "syn 1.0.107",
 ]
 
+[[package]]
+name = "serde_with_macros"
+version = "3.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+dependencies = [
+ "darling 0.20.3",
+ "proc-macro2 1.0.78",
+ "quote 1.0.35",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "serde_yaml"
 version = "0.8.26"
@@ -12240,7 +12254,7 @@ dependencies = [
  "rocksdb",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "shared-crypto",
  "sui-common",
  "sui-config",
@@ -12274,7 +12288,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "shared-crypto",
  "sui-bridge",
  "sui-config",
@@ -12388,7 +12402,7 @@ dependencies = [
  "rand 0.8.5",
  "reqwest",
  "serde",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "sui-keys",
  "sui-protocol-config",
@@ -12468,7 +12482,7 @@ dependencies = [
  "serde",
  "serde-reflection",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "shared-crypto",
  "signature 1.6.4",
@@ -12814,7 +12828,7 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "serde",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "shared-crypto",
  "sui-config",
@@ -12891,7 +12905,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "serial_test",
  "shared-crypto",
@@ -12977,7 +12991,7 @@ dependencies = [
  "secrecy",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "simulacrum",
  "sui-data-ingestion-core",
  "sui-json",
@@ -13152,7 +13166,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "sui-enum-compat-util",
  "sui-json",
  "sui-macros",
@@ -13606,7 +13620,7 @@ dependencies = [
  "move-vm-config",
  "schemars",
  "serde",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "sui-protocol-config-macros",
  "tracing",
 ]
@@ -13651,7 +13665,7 @@ dependencies = [
  "rustls-pemfile",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "snap",
  "sui-tls",
@@ -13685,7 +13699,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "shared-crypto",
  "shellexpand",
@@ -13730,7 +13744,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "sui-protocol-config",
  "sui-sdk 0.0.0",
@@ -13851,7 +13865,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "shared-crypto",
  "sui-config",
  "sui-json",
@@ -14167,7 +14181,7 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "serde",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "shared-crypto",
  "sui-config",
@@ -14417,7 +14431,7 @@ dependencies = [
  "serde",
  "serde-name",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 3.8.1",
  "serde_yaml 0.8.26",
  "shared-crypto",
  "signature 1.6.4",
diff --git a/Cargo.toml b/Cargo.toml
index b72524382288f..04d4ded8299ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -456,7 +456,7 @@ serde_json = { version = "1.0.95", features = [
 ] }
 serde_repr = "0.1"
 serde_test = "1.0.147"
-serde_with = { version = "2.1.0", features = ["hex"] }
+serde_with = "3.8"
 # serde_yaml = "0.9.21"
 serde_yaml = "0.8.26"
 shell-words = "1.1.0"
@@ -566,10 +566,10 @@ move-abstract-interpreter = { path = "external-crates/move/crates/move-abstract-
 move-abstract-stack = { path = "external-crates/move/crates/move-abstract-stack" }
 move-analyzer = { path = "external-crates/move/crates/move-analyzer" }
 
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "55e7e568842939e01c8545a71d72e2402ad74538" }
-fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "55e7e568842939e01c8545a71d72e2402ad74538" }
-fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "55e7e568842939e01c8545a71d72e2402ad74538", package = "fastcrypto-zkp" }
-fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "55e7e568842939e01c8545a71d72e2402ad74538", features = ["experimental"] }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "729145c130be00908d40804bb0eececa46e84340" }
+fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "729145c130be00908d40804bb0eececa46e84340" }
+fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "729145c130be00908d40804bb0eececa46e84340", package = "fastcrypto-zkp" }
+fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "729145c130be00908d40804bb0eececa46e84340", features = ["experimental"] }
 passkey-types = { version = "0.2.0" }
 passkey-client = { version = "0.2.0" }
 passkey-authenticator = { version = "0.2.0" }