From ffba9627a1439793039667b1e789afecf06c7797 Mon Sep 17 00:00:00 2001
From: Mikhail Zabaluev <mikhail.zabaluev@movementlabs.xyz>
Date: Thu, 5 Dec 2024 15:31:42 -0800
Subject: [PATCH 1/3] deps: Update to bcs from crates.io

All changes in the aptos-core fork have been
merged upstream.
---
 Cargo.lock              | 203 ++++++++++++++++++----------------------
 Cargo.toml              |   4 +-
 crates/aptos/Cargo.toml |   4 +-
 3 files changed, 97 insertions(+), 114 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d31410fd93dd..c816539fa56ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -289,7 +289,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-system-utils 0.1.0",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "http",
  "hyper",
  "sha256",
@@ -303,7 +303,7 @@ version = "0.1.0"
 dependencies = [
  "aptos-logger",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "move-binary-format",
  "move-core-types",
@@ -339,7 +339,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "fail",
  "futures",
@@ -391,7 +391,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-logging",
  "aptos-vm-validator",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "goldenfile",
  "hyper",
@@ -442,7 +442,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "hex",
  "indoc",
@@ -479,7 +479,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "clap 4.5.13",
  "csv",
@@ -518,7 +518,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-temppath",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "hyper",
  "once_cell",
@@ -541,7 +541,7 @@ dependencies = [
 name = "aptos-bitvec"
 version = "0.1.0"
 dependencies = [
- "bcs 0.1.4",
+ "bcs",
  "proptest",
  "proptest-derive",
  "serde",
@@ -564,7 +564,7 @@ dependencies = [
  "aptos-vm-logging",
  "aptos-vm-types",
  "arc-swap",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "claims",
  "concurrent-queue",
@@ -596,7 +596,7 @@ dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "criterion",
  "dashmap",
@@ -633,7 +633,7 @@ dependencies = [
  "aptos-framework",
  "aptos-package-builder",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "move-core-types",
  "once_cell",
  "proptest",
@@ -690,7 +690,7 @@ dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "lz4",
  "once_cell",
  "rand 0.7.3",
@@ -711,7 +711,7 @@ dependencies = [
  "aptos-temppath",
  "aptos-types",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "cfg-if",
  "get_if_addrs",
@@ -773,7 +773,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-validator",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "bytes",
  "chrono",
@@ -842,7 +842,7 @@ dependencies = [
  "aptos-logger",
  "aptos-short-hex-str",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "fail",
  "futures",
  "itertools 0.12.1",
@@ -883,7 +883,7 @@ dependencies = [
  "ark-serialize",
  "ark-std",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "bitvec 1.0.1",
  "blake2",
  "blake2-rfc",
@@ -962,7 +962,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "dashmap",
  "futures",
@@ -1031,7 +1031,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "claims",
  "clap 4.5.13",
@@ -1070,7 +1070,7 @@ dependencies = [
  "aptos-schemadb",
  "aptos-storage-interface",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "dashmap",
  "move-core-types",
@@ -1086,7 +1086,7 @@ dependencies = [
  "aptos-schemadb",
  "aptos-storage-interface",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "proptest",
  "proptest-derive",
@@ -1111,7 +1111,7 @@ dependencies = [
  "aptos-temppath",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "itertools 0.12.1",
  "tokio",
@@ -1140,7 +1140,7 @@ dependencies = [
  "aptos-crypto",
  "aptos-crypto-derive",
  "aptos-runtimes",
- "bcs 0.1.4",
+ "bcs",
  "blst",
  "blstrs",
  "criterion",
@@ -1187,7 +1187,7 @@ dependencies = [
  "aptos-types",
  "aptos-validator-transaction-pool",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "fail",
  "futures",
@@ -1237,7 +1237,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-genesis",
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "futures",
  "move-binary-format",
@@ -1289,7 +1289,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-genesis",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "dashmap",
  "fail",
@@ -1331,7 +1331,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "chrono",
  "clap 4.5.13",
  "derivative",
@@ -1365,7 +1365,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "crossbeam-channel",
  "ctrlc",
@@ -1410,7 +1410,7 @@ dependencies = [
  "aptos-secure-net",
  "aptos-storage-interface",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "criterion",
  "itertools 0.12.1",
  "once_cell",
@@ -1659,7 +1659,7 @@ dependencies = [
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "bcs 0.1.4",
+ "bcs",
  "better_any",
  "blake2-rfc",
  "bulletproofs",
@@ -1770,7 +1770,7 @@ dependencies = [
  "aptos-gas-schedule",
  "aptos-package-builder",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "move-core-types",
  "move-model",
@@ -1795,7 +1795,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-genesis",
- "bcs 0.1.4",
+ "bcs",
  "rand 0.7.3",
  "serde",
  "serde_yaml 0.8.26",
@@ -1838,7 +1838,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bigdecimal",
  "chrono",
  "diesel",
@@ -1862,7 +1862,7 @@ dependencies = [
  "aptos-indexer-grpc-server-framework",
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
- "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)",
+ "aptos-moving-average",
  "aptos-protos 1.3.0",
  "async-trait",
  "clap 4.5.13",
@@ -1889,7 +1889,7 @@ dependencies = [
  "aptos-indexer-grpc-server-framework",
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
- "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)",
+ "aptos-moving-average",
  "aptos-protos 1.3.0",
  "aptos-transaction-filter",
  "async-trait",
@@ -1917,7 +1917,7 @@ dependencies = [
  "aptos-indexer-grpc-server-framework",
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
- "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)",
+ "aptos-moving-average",
  "async-trait",
  "clap 4.5.13",
  "futures",
@@ -1951,7 +1951,7 @@ dependencies = [
  "aptos-mempool",
  "aptos-mempool-notifications",
  "aptos-metrics-core",
- "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)",
+ "aptos-moving-average",
  "aptos-proptest-helpers",
  "aptos-protos 1.3.0",
  "aptos-runtimes",
@@ -1962,7 +1962,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-validator",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "chrono",
  "futures",
@@ -2154,7 +2154,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "itertools 0.12.1",
  "num-derive",
@@ -2282,7 +2282,7 @@ dependencies = [
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "bcs 0.1.4",
+ "bcs",
  "blstrs",
  "derivation-path",
  "ed25519-dalek 1.0.1",
@@ -2306,7 +2306,7 @@ dependencies = [
  "aptos-types",
  "ark-bls12-381",
  "ark-serialize",
- "bcs 0.1.4",
+ "bcs",
  "hex",
  "reqwest",
  "serde_json",
@@ -2329,7 +2329,7 @@ dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-serialize",
- "bcs 0.1.4",
+ "bcs",
  "dashmap",
  "hex",
  "hyper",
@@ -2369,7 +2369,7 @@ dependencies = [
  "aptos-vm-genesis",
  "aptos-vm-logging",
  "aptos-vm-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "claims",
  "goldenfile",
@@ -2474,7 +2474,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-types",
  "aptos-vm-validator",
- "bcs 0.1.4",
+ "bcs",
  "enum_dispatch",
  "fail",
  "futures",
@@ -2540,7 +2540,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-logging",
  "aptos-vm-types",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "itertools 0.12.1",
  "regex",
@@ -2601,15 +2601,7 @@ dependencies = [
 [[package]]
 name = "aptos-moving-average"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "aptos-moving-average"
-version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors#da0ccef0f0e0e1be4b39073edb3277dfd6cb7dc1"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
 dependencies = [
  "chrono",
 ]
@@ -2645,7 +2637,7 @@ dependencies = [
  "aptos-gas-algebra",
  "aptos-gas-schedule",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "move-binary-format",
  "move-core-types",
@@ -2694,7 +2686,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "futures",
  "futures-util",
@@ -2752,7 +2744,7 @@ dependencies = [
  "aptos-network-discovery",
  "aptos-time-service",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "futures",
  "maplit",
  "rand 0.7.3",
@@ -2794,7 +2786,7 @@ dependencies = [
  "aptos-temppath",
  "aptos-time-service",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "futures",
  "once_cell",
  "rand 0.7.3",
@@ -2859,7 +2851,7 @@ dependencies = [
  "aptos-types",
  "aptos-validator-transaction-pool",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "either",
  "fail",
@@ -2993,7 +2985,7 @@ dependencies = [
  "aptos-peer-monitoring-service-types",
  "aptos-time-service",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "enum_dispatch",
  "futures",
  "maplit",
@@ -3024,7 +3016,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-time-service",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "claims",
  "futures",
@@ -3043,7 +3035,7 @@ version = "0.1.0"
 dependencies = [
  "aptos-config",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "serde",
  "thiserror",
 ]
@@ -3152,7 +3144,7 @@ dependencies = [
  "aptos-rest-client",
  "aptos-temppath",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "futures",
  "git2 0.16.1",
@@ -3217,7 +3209,7 @@ dependencies = [
  "aptos-infallible",
  "aptos-logger",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "clap 4.5.13",
  "hex",
@@ -3262,7 +3254,7 @@ dependencies = [
  "aptos-sdk",
  "aptos-types",
  "aptos-warp-webserver",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "futures",
  "hex",
@@ -3382,7 +3374,7 @@ dependencies = [
  "aptos-rest-client",
  "aptos-types",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "ed25519-dalek-bip32",
  "hex",
  "move-core-types",
@@ -3403,7 +3395,7 @@ dependencies = [
  "aptos-cached-packages",
  "aptos-framework",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "heck 0.4.1",
  "move-core-types",
@@ -3424,7 +3416,7 @@ dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-protos 1.3.0",
- "bcs 0.1.4",
+ "bcs",
  "crossbeam-channel",
  "once_cell",
  "serde",
@@ -3446,7 +3438,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-vault-client",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "chrono",
  "enum_dispatch",
  "rand 0.7.3",
@@ -3516,7 +3508,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-genesis",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "futures",
  "mockall",
@@ -3544,7 +3536,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "assert_unordered",
- "bcs 0.1.4",
+ "bcs",
  "crossbeam-channel",
  "dashmap",
  "move-core-types",
@@ -3602,7 +3594,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-types",
  "arc-swap",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "claims",
  "dashmap",
@@ -3626,7 +3618,7 @@ dependencies = [
  "aptos-crypto",
  "aptos-time-service",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "num-traits",
  "proptest",
@@ -3743,7 +3735,7 @@ dependencies = [
  "aptos-rest-client",
  "aptos-types",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "chrono",
  "claims",
  "clap 4.5.13",
@@ -3797,7 +3789,7 @@ dependencies = [
  "aptos-types",
  "assert_approx_eq",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "csv",
  "futures",
  "hex",
@@ -3937,7 +3929,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-genesis",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "codespan-reporting",
  "datatest-stable",
@@ -3977,7 +3969,7 @@ dependencies = [
  "arr_macro",
  "async-trait",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "ciborium",
  "claims",
@@ -4046,7 +4038,7 @@ dependencies = [
  "aptos-types",
  "async-recursion",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "lru 0.7.8",
  "move-core-types",
  "tokio",
@@ -4112,7 +4104,7 @@ dependencies = [
  "aptos-vm-types",
  "ark-bn254",
  "ark-groth16",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "claims",
  "crossbeam-channel",
@@ -4146,7 +4138,7 @@ dependencies = [
  "aptos-proptest-helpers",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "move-core-types",
  "move-vm-runtime",
@@ -4185,7 +4177,7 @@ dependencies = [
  "aptos-table-natives",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "glob",
  "move-binary-format",
@@ -4209,7 +4201,7 @@ dependencies = [
  "aptos-language-e2e-tests",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "claims",
  "either",
@@ -4252,7 +4244,7 @@ dependencies = [
  "aptos-api-types",
  "aptos-config",
  "aptos-logger",
- "bcs 0.1.4",
+ "bcs",
  "hyper",
  "serde",
  "serde_json",
@@ -5043,15 +5035,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "bcs"
-version = "0.1.4"
-source = "git+https://github.com/aptos-labs/bcs.git?rev=d31fab9d81748e2594be5cd5cdf845786a30562d#d31fab9d81748e2594be5cd5cdf845786a30562d"
-dependencies = [
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "bcs"
 version = "0.1.6"
@@ -7110,7 +7093,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-types",
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "ethabi",
  "hex",
@@ -7992,7 +7975,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "arbitrary",
- "bcs 0.1.4",
+ "bcs",
  "libfuzzer-sys",
  "move-binary-format",
  "move-bytecode-verifier",
@@ -10091,7 +10074,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "aptos-framework",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "move-binary-format",
 ]
@@ -10107,7 +10090,7 @@ name = "move-abigen"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "codespan-reporting",
  "datatest-stable",
  "heck 0.4.1",
@@ -10173,7 +10156,7 @@ name = "move-bytecode-source-map"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "move-binary-format",
  "move-command-line-common",
  "move-core-types",
@@ -10283,7 +10266,7 @@ name = "move-compiler"
 version = "0.0.1"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "codespan-reporting",
  "datatest-stable",
@@ -10319,7 +10302,7 @@ version = "0.1.0"
 dependencies = [
  "abstract-domain-derive",
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "codespan-reporting",
  "datatest-stable",
@@ -10368,7 +10351,7 @@ version = "0.0.4"
 dependencies = [
  "anyhow",
  "arbitrary",
- "bcs 0.1.4",
+ "bcs",
  "bytes",
  "ethnum",
  "hashbrown 0.14.3",
@@ -10393,7 +10376,7 @@ name = "move-coverage"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "codespan",
  "colored",
@@ -10479,7 +10462,7 @@ dependencies = [
 name = "move-explain"
 version = "0.1.0"
 dependencies = [
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "move-command-line-common",
  "move-core-types",
@@ -10490,7 +10473,7 @@ name = "move-ir-compiler"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.13",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -10987,7 +10970,7 @@ dependencies = [
 name = "move-vm-types"
 version = "0.1.0"
 dependencies = [
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "derivative",
  "itertools 0.12.1",
@@ -11042,7 +11025,7 @@ dependencies = [
  "aptos-vm-types",
  "async-trait",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "bollard",
  "chrono",
  "clap 4.5.13",
@@ -12686,16 +12669,16 @@ dependencies = [
 [[package]]
 name = "processor"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
 dependencies = [
  "ahash 0.8.11",
  "allocative",
  "allocative_derive",
  "anyhow",
- "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997)",
+ "aptos-moving-average",
  "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bigdecimal",
  "bitflags 2.6.0",
  "canonical_json",
@@ -14052,7 +14035,7 @@ name = "serde-generate"
 version = "0.20.6"
 source = "git+https://github.com/aptos-labs/serde-reflection?rev=73b6bbf748334b71ff6d7d09d06a29e3062ca075#73b6bbf748334b71ff6d7d09d06a29e3062ca075"
 dependencies = [
- "bcs 0.1.6",
+ "bcs",
  "bincode",
  "heck 0.3.3",
  "include_dir",
@@ -14267,7 +14250,7 @@ dependencies = [
 [[package]]
 name = "server-framework"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=a43b90b98bc5e8d79d37cc6058ed2cfa741c0997#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
 dependencies = [
  "anyhow",
  "aptos-system-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)",
@@ -14635,7 +14618,7 @@ dependencies = [
  "aptos-vault-client",
  "aptos-vm",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "diesel",
  "digest 0.9.0",
  "futures",
diff --git a/Cargo.toml b/Cargo.toml
index f373a124baa3a..aa876f268b99f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -467,7 +467,7 @@ ark-groth16 = "0.4.0"
 ark-serialize = "0.4.0"
 ark-std = { version = "0.4.0", features = ["getrandom"] }
 
-aptos-moving-average = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors" }
+aptos-moving-average = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", branch = "mikhail/upstream-bcs" }
 
 assert_approx_eq = "1.1.0"
 assert_unordered = "0.3.5"
@@ -481,7 +481,7 @@ base64 = "0.13.0"
 base64-url = "2.0.1"
 backoff = { version = "0.4.0", features = ["tokio"] }
 backtrace = "0.3.58"
-bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
+bcs = "0.1.6"
 better_any = "0.1.1"
 bellman = { version = "0.13.1", default-features = false }
 bigdecimal = { version = "0.4.0", features = ["serde"] }
diff --git a/crates/aptos/Cargo.toml b/crates/aptos/Cargo.toml
index c4bc8df7d7fec..8b769bfb0603c 100644
--- a/crates/aptos/Cargo.toml
+++ b/crates/aptos/Cargo.toml
@@ -81,7 +81,7 @@ pathsearch = { workspace = true }
 poem = { workspace = true }
 # We set default-features to false so we don't onboard the libpq dep. See more here:
 # https://github.com/aptos-labs/aptos-core/pull/12568
-processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "a43b90b98bc5e8d79d37cc6058ed2cfa741c0997", default-features = false }
+processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", branch = "mikhail/upstream-bcs", default-features = false }
 rand = { workspace = true }
 reqwest = { workspace = true }
 self_update = { git = "https://github.com/banool/self_update.git", rev = "8306158ad0fd5b9d4766a3c6bf967e7ef0ea5c4b", features = [
@@ -91,7 +91,7 @@ self_update = { git = "https://github.com/banool/self_update.git", rev = "830615
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-server-framework = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "a43b90b98bc5e8d79d37cc6058ed2cfa741c0997" }
+server-framework = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", branch = "mikhail/upstream-bcs" }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }

From 3b1b1c43d6d324e9da2fe33d0df391b817d8fa08 Mon Sep 17 00:00:00 2001
From: Mikhail Zabaluev <mikhail.zabaluev@movementlabs.xyz>
Date: Thu, 12 Dec 2024 14:40:03 -0800
Subject: [PATCH 2/3] deps: switch to movement fork of bcs

It's not needed for anything in this crate,
but we'll harmonize dependencies for Movement.
---
 Cargo.lock | 193 ++++++++++++++++++++++++++++-------------------------
 Cargo.toml |   2 +-
 2 files changed, 102 insertions(+), 93 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c816539fa56ee..7f0c203cb84ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -289,7 +289,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-system-utils 0.1.0",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "http",
  "hyper",
  "sha256",
@@ -303,7 +303,7 @@ version = "0.1.0"
 dependencies = [
  "aptos-logger",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "claims",
  "move-binary-format",
  "move-core-types",
@@ -339,7 +339,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "fail",
  "futures",
@@ -391,7 +391,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-logging",
  "aptos-vm-validator",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "goldenfile",
  "hyper",
@@ -442,7 +442,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "hex",
  "indoc",
@@ -479,7 +479,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "clap 4.5.13",
  "csv",
@@ -518,7 +518,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-temppath",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "hyper",
  "once_cell",
@@ -541,7 +541,7 @@ dependencies = [
 name = "aptos-bitvec"
 version = "0.1.0"
 dependencies = [
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "proptest",
  "proptest-derive",
  "serde",
@@ -564,7 +564,7 @@ dependencies = [
  "aptos-vm-logging",
  "aptos-vm-types",
  "arc-swap",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "claims",
  "concurrent-queue",
@@ -596,7 +596,7 @@ dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "criterion",
  "dashmap",
@@ -633,7 +633,7 @@ dependencies = [
  "aptos-framework",
  "aptos-package-builder",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "move-core-types",
  "once_cell",
  "proptest",
@@ -690,7 +690,7 @@ dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "lz4",
  "once_cell",
  "rand 0.7.3",
@@ -711,7 +711,7 @@ dependencies = [
  "aptos-temppath",
  "aptos-types",
  "arr_macro",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "byteorder",
  "cfg-if",
  "get_if_addrs",
@@ -773,7 +773,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-validator",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "byteorder",
  "bytes",
  "chrono",
@@ -842,7 +842,7 @@ dependencies = [
  "aptos-logger",
  "aptos-short-hex-str",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "fail",
  "futures",
  "itertools 0.12.1",
@@ -883,7 +883,7 @@ dependencies = [
  "ark-serialize",
  "ark-std",
  "base64 0.13.1",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bitvec 1.0.1",
  "blake2",
  "blake2-rfc",
@@ -962,7 +962,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "claims",
  "dashmap",
  "futures",
@@ -1031,7 +1031,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "arr_macro",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "byteorder",
  "claims",
  "clap 4.5.13",
@@ -1070,7 +1070,7 @@ dependencies = [
  "aptos-schemadb",
  "aptos-storage-interface",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "dashmap",
  "move-core-types",
@@ -1086,7 +1086,7 @@ dependencies = [
  "aptos-schemadb",
  "aptos-storage-interface",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "byteorder",
  "proptest",
  "proptest-derive",
@@ -1111,7 +1111,7 @@ dependencies = [
  "aptos-temppath",
  "aptos-types",
  "aptos-vm",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "itertools 0.12.1",
  "tokio",
@@ -1140,7 +1140,7 @@ dependencies = [
  "aptos-crypto",
  "aptos-crypto-derive",
  "aptos-runtimes",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "blst",
  "blstrs",
  "criterion",
@@ -1187,7 +1187,7 @@ dependencies = [
  "aptos-types",
  "aptos-validator-transaction-pool",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "fail",
  "futures",
@@ -1237,7 +1237,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-genesis",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "claims",
  "futures",
  "move-binary-format",
@@ -1289,7 +1289,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-genesis",
  "arr_macro",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "dashmap",
  "fail",
@@ -1331,7 +1331,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "chrono",
  "clap 4.5.13",
  "derivative",
@@ -1365,7 +1365,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "aptos-vm",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "crossbeam-channel",
  "ctrlc",
@@ -1410,7 +1410,7 @@ dependencies = [
  "aptos-secure-net",
  "aptos-storage-interface",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "criterion",
  "itertools 0.12.1",
  "once_cell",
@@ -1659,7 +1659,7 @@ dependencies = [
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "better_any",
  "blake2-rfc",
  "bulletproofs",
@@ -1770,7 +1770,7 @@ dependencies = [
  "aptos-gas-schedule",
  "aptos-package-builder",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "move-core-types",
  "move-model",
@@ -1795,7 +1795,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-genesis",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "rand 0.7.3",
  "serde",
  "serde_yaml 0.8.26",
@@ -1838,7 +1838,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bigdecimal",
  "chrono",
  "diesel",
@@ -1962,7 +1962,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-validator",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "chrono",
  "futures",
@@ -2154,7 +2154,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "arr_macro",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "byteorder",
  "itertools 0.12.1",
  "num-derive",
@@ -2282,7 +2282,7 @@ dependencies = [
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "blstrs",
  "derivation-path",
  "ed25519-dalek 1.0.1",
@@ -2306,7 +2306,7 @@ dependencies = [
  "aptos-types",
  "ark-bls12-381",
  "ark-serialize",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "hex",
  "reqwest",
  "serde_json",
@@ -2329,7 +2329,7 @@ dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-serialize",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "dashmap",
  "hex",
  "hyper",
@@ -2369,7 +2369,7 @@ dependencies = [
  "aptos-vm-genesis",
  "aptos-vm-logging",
  "aptos-vm-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "claims",
  "goldenfile",
@@ -2474,7 +2474,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-types",
  "aptos-vm-validator",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "enum_dispatch",
  "fail",
  "futures",
@@ -2540,7 +2540,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-logging",
  "aptos-vm-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "itertools 0.12.1",
  "regex",
@@ -2601,7 +2601,7 @@ dependencies = [
 [[package]]
 name = "aptos-moving-average"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#00132c0d205a7a49f54f10842bcdbaabc503dca0"
 dependencies = [
  "chrono",
 ]
@@ -2637,7 +2637,7 @@ dependencies = [
  "aptos-gas-algebra",
  "aptos-gas-schedule",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "move-binary-format",
  "move-core-types",
@@ -2686,7 +2686,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "futures",
  "futures-util",
@@ -2744,7 +2744,7 @@ dependencies = [
  "aptos-network-discovery",
  "aptos-time-service",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "futures",
  "maplit",
  "rand 0.7.3",
@@ -2786,7 +2786,7 @@ dependencies = [
  "aptos-temppath",
  "aptos-time-service",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "futures",
  "once_cell",
  "rand 0.7.3",
@@ -2851,7 +2851,7 @@ dependencies = [
  "aptos-types",
  "aptos-validator-transaction-pool",
  "aptos-vm",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "either",
  "fail",
@@ -2985,7 +2985,7 @@ dependencies = [
  "aptos-peer-monitoring-service-types",
  "aptos-time-service",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "enum_dispatch",
  "futures",
  "maplit",
@@ -3016,7 +3016,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-time-service",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "claims",
  "futures",
@@ -3035,7 +3035,7 @@ version = "0.1.0"
 dependencies = [
  "aptos-config",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "serde",
  "thiserror",
 ]
@@ -3144,7 +3144,7 @@ dependencies = [
  "aptos-rest-client",
  "aptos-temppath",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "futures",
  "git2 0.16.1",
@@ -3209,7 +3209,7 @@ dependencies = [
  "aptos-infallible",
  "aptos-logger",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "clap 4.5.13",
  "hex",
@@ -3254,7 +3254,7 @@ dependencies = [
  "aptos-sdk",
  "aptos-types",
  "aptos-warp-webserver",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "futures",
  "hex",
@@ -3374,7 +3374,7 @@ dependencies = [
  "aptos-rest-client",
  "aptos-types",
  "base64 0.13.1",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "ed25519-dalek-bip32",
  "hex",
  "move-core-types",
@@ -3395,7 +3395,7 @@ dependencies = [
  "aptos-cached-packages",
  "aptos-framework",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "heck 0.4.1",
  "move-core-types",
@@ -3416,7 +3416,7 @@ dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-protos 1.3.0",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "crossbeam-channel",
  "once_cell",
  "serde",
@@ -3438,7 +3438,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-vault-client",
  "base64 0.13.1",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "chrono",
  "enum_dispatch",
  "rand 0.7.3",
@@ -3508,7 +3508,7 @@ dependencies = [
  "aptos-vm",
  "aptos-vm-genesis",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "claims",
  "futures",
  "mockall",
@@ -3536,7 +3536,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "assert_unordered",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "crossbeam-channel",
  "dashmap",
  "move-core-types",
@@ -3594,7 +3594,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-types",
  "arc-swap",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "claims",
  "dashmap",
@@ -3618,7 +3618,7 @@ dependencies = [
  "aptos-crypto",
  "aptos-time-service",
  "aptos-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "claims",
  "num-traits",
  "proptest",
@@ -3735,7 +3735,7 @@ dependencies = [
  "aptos-rest-client",
  "aptos-types",
  "base64 0.13.1",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "chrono",
  "claims",
  "clap 4.5.13",
@@ -3789,7 +3789,7 @@ dependencies = [
  "aptos-types",
  "assert_approx_eq",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "csv",
  "futures",
  "hex",
@@ -3929,7 +3929,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-genesis",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "codespan-reporting",
  "datatest-stable",
@@ -3969,7 +3969,7 @@ dependencies = [
  "arr_macro",
  "async-trait",
  "base64 0.13.1",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "ciborium",
  "claims",
@@ -4038,7 +4038,7 @@ dependencies = [
  "aptos-types",
  "async-recursion",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "lru 0.7.8",
  "move-core-types",
  "tokio",
@@ -4104,7 +4104,7 @@ dependencies = [
  "aptos-vm-types",
  "ark-bn254",
  "ark-groth16",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "claims",
  "crossbeam-channel",
@@ -4138,7 +4138,7 @@ dependencies = [
  "aptos-proptest-helpers",
  "aptos-types",
  "aptos-vm",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "move-core-types",
  "move-vm-runtime",
@@ -4177,7 +4177,7 @@ dependencies = [
  "aptos-table-natives",
  "aptos-types",
  "aptos-vm",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "glob",
  "move-binary-format",
@@ -4201,7 +4201,7 @@ dependencies = [
  "aptos-language-e2e-tests",
  "aptos-types",
  "aptos-vm",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "claims",
  "either",
@@ -4244,7 +4244,7 @@ dependencies = [
  "aptos-api-types",
  "aptos-config",
  "aptos-logger",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "hyper",
  "serde",
  "serde_json",
@@ -5045,6 +5045,15 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "bcs"
+version = "0.1.6"
+source = "git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c#bc16d2d39cabafaabd76173dd1b04b2aa170cf0c"
+dependencies = [
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "bellpepper"
 version = "0.4.1"
@@ -6848,7 +6857,7 @@ dependencies = [
  "chrono",
  "diesel_derives",
  "itoa",
- "num-bigint 0.4.4",
+ "num-bigint 0.2.6",
  "num-integer",
  "num-traits",
  "pq-sys",
@@ -7093,7 +7102,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "aptos-vm-types",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "claims",
  "ethabi",
  "hex",
@@ -7682,7 +7691,7 @@ checksum = "e29e5681dc8556fb9df1409e95eae050e12e8776394313da3546dcb8cf390c73"
 dependencies = [
  "az",
  "bytemuck",
- "half 2.2.1",
+ "half 1.8.2",
  "typenum",
 ]
 
@@ -7975,7 +7984,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "arbitrary",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "libfuzzer-sys",
  "move-binary-format",
  "move-bytecode-verifier",
@@ -8748,7 +8757,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -10074,7 +10083,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "aptos-framework",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "move-binary-format",
 ]
@@ -10090,7 +10099,7 @@ name = "move-abigen"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "codespan-reporting",
  "datatest-stable",
  "heck 0.4.1",
@@ -10156,7 +10165,7 @@ name = "move-bytecode-source-map"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "move-binary-format",
  "move-command-line-common",
  "move-core-types",
@@ -10266,7 +10275,7 @@ name = "move-compiler"
 version = "0.0.1"
 dependencies = [
  "anyhow",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "codespan-reporting",
  "datatest-stable",
@@ -10302,7 +10311,7 @@ version = "0.1.0"
 dependencies = [
  "abstract-domain-derive",
  "anyhow",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "codespan-reporting",
  "datatest-stable",
@@ -10351,7 +10360,7 @@ version = "0.0.4"
 dependencies = [
  "anyhow",
  "arbitrary",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bytes",
  "ethnum",
  "hashbrown 0.14.3",
@@ -10376,7 +10385,7 @@ name = "move-coverage"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "codespan",
  "colored",
@@ -10462,7 +10471,7 @@ dependencies = [
 name = "move-explain"
 version = "0.1.0"
 dependencies = [
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "move-command-line-common",
  "move-core-types",
@@ -10473,7 +10482,7 @@ name = "move-ir-compiler"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "clap 4.5.13",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -10970,7 +10979,7 @@ dependencies = [
 name = "move-vm-types"
 version = "0.1.0"
 dependencies = [
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "claims",
  "derivative",
  "itertools 0.12.1",
@@ -11025,7 +11034,7 @@ dependencies = [
  "aptos-vm-types",
  "async-trait",
  "base64 0.13.1",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bollard",
  "chrono",
  "clap 4.5.13",
@@ -12669,7 +12678,7 @@ dependencies = [
 [[package]]
 name = "processor"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#00132c0d205a7a49f54f10842bcdbaabc503dca0"
 dependencies = [
  "ahash 0.8.11",
  "allocative",
@@ -12678,7 +12687,7 @@ dependencies = [
  "aptos-moving-average",
  "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)",
  "async-trait",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "bigdecimal",
  "bitflags 2.6.0",
  "canonical_json",
@@ -14035,7 +14044,7 @@ name = "serde-generate"
 version = "0.20.6"
 source = "git+https://github.com/aptos-labs/serde-reflection?rev=73b6bbf748334b71ff6d7d09d06a29e3062ca075#73b6bbf748334b71ff6d7d09d06a29e3062ca075"
 dependencies = [
- "bcs",
+ "bcs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode",
  "heck 0.3.3",
  "include_dir",
@@ -14250,7 +14259,7 @@ dependencies = [
 [[package]]
 name = "server-framework"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#00132c0d205a7a49f54f10842bcdbaabc503dca0"
 dependencies = [
  "anyhow",
  "aptos-system-utils 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)",
@@ -14618,7 +14627,7 @@ dependencies = [
  "aptos-vault-client",
  "aptos-vm",
  "base64 0.13.1",
- "bcs",
+ "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
  "diesel",
  "digest 0.9.0",
  "futures",
@@ -16211,7 +16220,7 @@ dependencies = [
  "errno",
  "js-sys",
  "libc",
- "rustix 0.38.28",
+ "rustix 0.37.27",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
  "winapi 0.3.9",
diff --git a/Cargo.toml b/Cargo.toml
index aa876f268b99f..01c5077678845 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -481,7 +481,7 @@ base64 = "0.13.0"
 base64-url = "2.0.1"
 backoff = { version = "0.4.0", features = ["tokio"] }
 backtrace = "0.3.58"
-bcs = "0.1.6"
+bcs = { git = "https://github.com/movementlabsxyz/bcs.git", rev = "bc16d2d39cabafaabd76173dd1b04b2aa170cf0c" }
 better_any = "0.1.1"
 bellman = { version = "0.13.1", default-features = false }
 bigdecimal = { version = "0.4.0", features = ["serde"] }

From c3d1e969fedf5259f8d19cdf35410e4d060979e1 Mon Sep 17 00:00:00 2001
From: Mikhail Zabaluev <mikhail.zabaluev@movementlabs.xyz>
Date: Tue, 21 Jan 2025 18:31:38 +0200
Subject: [PATCH 3/3] deps: bump aptos-indexer-processor to main

Merged the bcs update there.
---
 Cargo.lock | 18 +++++++++++++-----
 Cargo.toml |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7f0c203cb84ad..63750d5057317 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1862,7 +1862,7 @@ dependencies = [
  "aptos-indexer-grpc-server-framework",
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
- "aptos-moving-average",
+ "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc)",
  "aptos-protos 1.3.0",
  "async-trait",
  "clap 4.5.13",
@@ -1889,7 +1889,7 @@ dependencies = [
  "aptos-indexer-grpc-server-framework",
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
- "aptos-moving-average",
+ "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc)",
  "aptos-protos 1.3.0",
  "aptos-transaction-filter",
  "async-trait",
@@ -1917,7 +1917,7 @@ dependencies = [
  "aptos-indexer-grpc-server-framework",
  "aptos-indexer-grpc-utils",
  "aptos-metrics-core",
- "aptos-moving-average",
+ "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc)",
  "async-trait",
  "clap 4.5.13",
  "futures",
@@ -1951,7 +1951,7 @@ dependencies = [
  "aptos-mempool",
  "aptos-mempool-notifications",
  "aptos-metrics-core",
- "aptos-moving-average",
+ "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc)",
  "aptos-proptest-helpers",
  "aptos-protos 1.3.0",
  "aptos-runtimes",
@@ -2606,6 +2606,14 @@ dependencies = [
  "chrono",
 ]
 
+[[package]]
+name = "aptos-moving-average"
+version = "0.1.0"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=77a36245400250e7d8a854360194288d078681bc#77a36245400250e7d8a854360194288d078681bc"
+dependencies = [
+ "chrono",
+]
+
 [[package]]
 name = "aptos-mvhashmap"
 version = "0.1.0"
@@ -12684,7 +12692,7 @@ dependencies = [
  "allocative",
  "allocative_derive",
  "anyhow",
- "aptos-moving-average",
+ "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs)",
  "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0)",
  "async-trait",
  "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)",
diff --git a/Cargo.toml b/Cargo.toml
index 01c5077678845..ed3e0f38fc0bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -467,7 +467,7 @@ ark-groth16 = "0.4.0"
 ark-serialize = "0.4.0"
 ark-std = { version = "0.4.0", features = ["getrandom"] }
 
-aptos-moving-average = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", branch = "mikhail/upstream-bcs" }
+aptos-moving-average = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "77a36245400250e7d8a854360194288d078681bc" }
 
 assert_approx_eq = "1.1.0"
 assert_unordered = "0.3.5"