diff --git a/Cargo.lock b/Cargo.lock
index 8eebfc680..9bf3f7dbe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,7 +11,7 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
 [[package]]
 name = "abstract-domain-derive"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -812,7 +812,7 @@ checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 [[package]]
 name = "aptos-abstract-gas-usage"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-gas-algebra",
@@ -836,7 +836,7 @@ dependencies = [
 [[package]]
 name = "aptos-accumulator"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-crypto",
@@ -846,11 +846,11 @@ dependencies = [
 [[package]]
 name = "aptos-aggregator"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-logger",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "claims",
  "move-binary-format",
  "move-core-types",
@@ -860,7 +860,7 @@ dependencies = [
 [[package]]
 name = "aptos-api"
 version = "0.2.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-api-types",
@@ -878,7 +878,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "fail",
  "futures",
@@ -902,7 +902,7 @@ dependencies = [
 [[package]]
 name = "aptos-api-types"
 version = "0.0.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-config",
@@ -915,7 +915,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "hex",
  "indoc",
@@ -932,7 +932,7 @@ dependencies = [
 [[package]]
 name = "aptos-bcs-utils"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "hex",
@@ -941,7 +941,7 @@ dependencies = [
 [[package]]
 name = "aptos-bitvec"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "serde",
  "serde_bytes",
@@ -950,7 +950,7 @@ dependencies = [
 [[package]]
 name = "aptos-block-executor"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-aggregator",
@@ -963,7 +963,7 @@ dependencies = [
  "aptos-vm-logging",
  "aptos-vm-types",
  "arc-swap",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "claims",
  "concurrent-queue",
@@ -985,13 +985,13 @@ dependencies = [
 [[package]]
 name = "aptos-block-partitioner"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-crypto",
  "aptos-logger",
  "aptos-metrics-core",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "dashmap 5.5.3",
  "itertools 0.12.1",
@@ -1006,7 +1006,7 @@ dependencies = [
 [[package]]
 name = "aptos-bounded-executor"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "futures",
  "rustversion",
@@ -1016,7 +1016,7 @@ dependencies = [
 [[package]]
 name = "aptos-build-info"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "shadow-rs",
 ]
@@ -1024,13 +1024,13 @@ dependencies = [
 [[package]]
 name = "aptos-cached-packages"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-framework",
  "aptos-package-builder",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "move-core-types",
  "once_cell",
 ]
@@ -1038,7 +1038,7 @@ dependencies = [
 [[package]]
 name = "aptos-channels"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-infallible",
@@ -1049,7 +1049,7 @@ dependencies = [
 [[package]]
 name = "aptos-compression"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
@@ -1061,7 +1061,7 @@ dependencies = [
 [[package]]
 name = "aptos-config"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-crypto",
@@ -1072,7 +1072,7 @@ dependencies = [
  "aptos-temppath",
  "aptos-types",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "cfg-if",
  "get_if_addrs",
@@ -1092,7 +1092,7 @@ dependencies = [
 [[package]]
 name = "aptos-consensus-types"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-bitvec",
@@ -1103,7 +1103,7 @@ dependencies = [
  "aptos-logger",
  "aptos-short-hex-str",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "fail",
  "futures",
  "itertools 0.12.1",
@@ -1119,7 +1119,7 @@ dependencies = [
 [[package]]
 name = "aptos-crypto"
 version = "0.0.3"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aes-gcm",
  "anyhow",
@@ -1130,7 +1130,7 @@ dependencies = [
  "ark-groth16",
  "ark-std 0.4.0",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "blst",
  "bulletproofs",
  "bytes 1.8.0",
@@ -1172,7 +1172,7 @@ dependencies = [
 [[package]]
 name = "aptos-crypto-derive"
 version = "0.0.3"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1182,7 +1182,7 @@ dependencies = [
 [[package]]
 name = "aptos-db"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-accumulator",
@@ -1207,7 +1207,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "claims",
  "dashmap 5.5.3",
@@ -1230,7 +1230,7 @@ dependencies = [
 [[package]]
 name = "aptos-db-indexer"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-config",
@@ -1241,7 +1241,7 @@ dependencies = [
  "aptos-schemadb",
  "aptos-storage-interface",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "dashmap 5.5.3",
  "move-core-types",
@@ -1250,13 +1250,13 @@ dependencies = [
 [[package]]
 name = "aptos-db-indexer-schemas"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-schemadb",
  "aptos-storage-interface",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "serde",
 ]
@@ -1264,12 +1264,12 @@ dependencies = [
 [[package]]
 name = "aptos-dkg"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-crypto",
  "aptos-crypto-derive",
- "bcs 0.1.4",
+ "bcs",
  "blst",
  "blstrs",
  "criterion",
@@ -1295,7 +1295,7 @@ dependencies = [
 [[package]]
 name = "aptos-drop-helper"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-infallible",
  "aptos-metrics-core",
@@ -1306,7 +1306,7 @@ dependencies = [
 [[package]]
 name = "aptos-event-notifications"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-channels",
@@ -1322,7 +1322,7 @@ dependencies = [
 [[package]]
 name = "aptos-executor"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-consensus-types",
@@ -1340,7 +1340,7 @@ dependencies = [
  "aptos-types",
  "aptos-vm",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "dashmap 5.5.3",
  "fail",
@@ -1354,7 +1354,7 @@ dependencies = [
 [[package]]
 name = "aptos-executor-service"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-block-partitioner",
  "aptos-config",
@@ -1368,7 +1368,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "crossbeam-channel",
  "ctrlc",
@@ -1384,7 +1384,7 @@ dependencies = [
 [[package]]
 name = "aptos-executor-test-helpers"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-cached-packages",
@@ -1406,7 +1406,7 @@ dependencies = [
 [[package]]
 name = "aptos-executor-types"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-crypto",
@@ -1415,7 +1415,7 @@ dependencies = [
  "aptos-secure-net",
  "aptos-storage-interface",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "criterion",
  "itertools 0.12.1",
  "once_cell",
@@ -1426,7 +1426,7 @@ dependencies = [
 [[package]]
 name = "aptos-experimental-runtimes"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-runtimes",
  "core_affinity",
@@ -1439,7 +1439,7 @@ dependencies = [
 [[package]]
 name = "aptos-faucet-core"
 version = "2.0.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-config",
@@ -1473,7 +1473,7 @@ dependencies = [
 [[package]]
 name = "aptos-faucet-metrics-server"
 version = "2.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-logger",
@@ -1487,7 +1487,7 @@ dependencies = [
 [[package]]
 name = "aptos-framework"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-aggregator",
@@ -1505,7 +1505,7 @@ dependencies = [
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
- "bcs 0.1.4",
+ "bcs",
  "better_any",
  "blake2-rfc",
  "bulletproofs",
@@ -1555,7 +1555,7 @@ dependencies = [
 [[package]]
 name = "aptos-gas-algebra"
 version = "0.0.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "either",
  "move-core-types",
@@ -1564,7 +1564,7 @@ dependencies = [
 [[package]]
 name = "aptos-gas-meter"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-gas-algebra",
  "aptos-gas-schedule",
@@ -1579,7 +1579,7 @@ dependencies = [
 [[package]]
 name = "aptos-gas-profiling"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-gas-algebra",
@@ -1599,7 +1599,7 @@ dependencies = [
 [[package]]
 name = "aptos-gas-schedule"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-gas-algebra",
  "aptos-global-constants",
@@ -1612,17 +1612,17 @@ dependencies = [
 [[package]]
 name = "aptos-global-constants"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 
 [[package]]
 name = "aptos-id-generator"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 
 [[package]]
 name = "aptos-indexer"
 version = "0.0.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-api",
@@ -1636,7 +1636,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bigdecimal",
  "chrono",
  "diesel",
@@ -1654,7 +1654,7 @@ dependencies = [
 [[package]]
 name = "aptos-indexer-grpc-fullnode"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-api",
@@ -1665,12 +1665,12 @@ dependencies = [
  "aptos-logger",
  "aptos-mempool",
  "aptos-metrics-core",
- "aptos-moving-average 0.1.0 (git+https://github.com/movementlabsxyz/aptos-indexer-processors)",
- "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)",
+ "aptos-moving-average",
+ "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs)",
  "aptos-runtimes",
  "aptos-storage-interface",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "chrono",
  "futures",
@@ -1692,7 +1692,7 @@ dependencies = [
 [[package]]
 name = "aptos-indexer-grpc-table-info"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-api",
@@ -1723,11 +1723,11 @@ dependencies = [
 [[package]]
 name = "aptos-indexer-grpc-utils"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-metrics-core",
- "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)",
+ "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs)",
  "async-trait",
  "backoff",
  "base64 0.13.1",
@@ -1755,12 +1755,12 @@ dependencies = [
 [[package]]
 name = "aptos-infallible"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 
 [[package]]
 name = "aptos-jellyfish-merkle"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-crypto",
@@ -1772,7 +1772,7 @@ dependencies = [
  "aptos-storage-interface",
  "aptos-types",
  "arr_macro",
- "bcs 0.1.4",
+ "bcs",
  "byteorder",
  "itertools 0.12.1",
  "num-derive",
@@ -1788,7 +1788,7 @@ dependencies = [
 [[package]]
 name = "aptos-keygen"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-crypto",
  "aptos-types",
@@ -1798,7 +1798,7 @@ dependencies = [
 [[package]]
 name = "aptos-language-e2e-tests"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-abstract-gas-usage",
@@ -1819,7 +1819,7 @@ dependencies = [
  "aptos-vm-genesis",
  "aptos-vm-logging",
  "aptos-vm-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "goldenfile",
  "move-binary-format",
@@ -1842,7 +1842,7 @@ dependencies = [
 [[package]]
 name = "aptos-ledger"
 version = "0.2.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-crypto",
  "aptos-types",
@@ -1855,7 +1855,7 @@ dependencies = [
 [[package]]
 name = "aptos-log-derive"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1865,7 +1865,7 @@ dependencies = [
 [[package]]
 name = "aptos-logger"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-infallible",
  "aptos-log-derive",
@@ -1889,7 +1889,7 @@ dependencies = [
 [[package]]
 name = "aptos-memory-usage-tracker"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-gas-algebra",
  "aptos-gas-meter",
@@ -1902,7 +1902,7 @@ dependencies = [
 [[package]]
 name = "aptos-mempool"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-bounded-executor",
@@ -1924,7 +1924,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-types",
  "aptos-vm-validator",
- "bcs 0.1.4",
+ "bcs",
  "fail",
  "futures",
  "itertools 0.12.1",
@@ -1942,7 +1942,7 @@ dependencies = [
 [[package]]
 name = "aptos-mempool-notifications"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-types",
  "async-trait",
@@ -1955,7 +1955,7 @@ dependencies = [
 [[package]]
 name = "aptos-memsocket"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-infallible",
  "bytes 1.8.0",
@@ -1966,7 +1966,7 @@ dependencies = [
 [[package]]
 name = "aptos-metrics-core"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "prometheus",
@@ -1975,7 +1975,7 @@ dependencies = [
 [[package]]
 name = "aptos-move-stdlib"
 version = "0.1.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-gas-schedule",
  "aptos-native-interface",
@@ -1990,15 +1990,7 @@ dependencies = [
 [[package]]
 name = "aptos-moving-average"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=7658338eb9224abd9698c1e02dbc6ca526c268ce#7658338eb9224abd9698c1e02dbc6ca526c268ce"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "aptos-moving-average"
-version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors#a43b90b98bc5e8d79d37cc6058ed2cfa741c0997"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
 dependencies = [
  "chrono",
 ]
@@ -2006,7 +1998,7 @@ dependencies = [
 [[package]]
 name = "aptos-mvhashmap"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-aggregator",
@@ -2027,12 +2019,12 @@ dependencies = [
 [[package]]
 name = "aptos-native-interface"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-gas-algebra",
  "aptos-gas-schedule",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "move-binary-format",
  "move-core-types",
@@ -2044,7 +2036,7 @@ dependencies = [
 [[package]]
 name = "aptos-netcore"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-memsocket",
  "aptos-proxy",
@@ -2061,7 +2053,7 @@ dependencies = [
 [[package]]
 name = "aptos-network"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-bitvec",
@@ -2081,7 +2073,7 @@ dependencies = [
  "aptos-types",
  "arc-swap",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "futures",
  "futures-util",
@@ -2106,7 +2098,7 @@ dependencies = [
 [[package]]
 name = "aptos-node-identity"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-types",
@@ -2117,7 +2109,7 @@ dependencies = [
 [[package]]
 name = "aptos-node-resource-metrics"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-build-info",
  "aptos-infallible",
@@ -2133,7 +2125,7 @@ dependencies = [
 [[package]]
 name = "aptos-num-variants"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2143,7 +2135,7 @@ dependencies = [
 [[package]]
 name = "aptos-openapi"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "async-trait",
  "percent-encoding",
@@ -2156,7 +2148,7 @@ dependencies = [
 [[package]]
 name = "aptos-package-builder"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-framework",
@@ -2169,11 +2161,11 @@ dependencies = [
 [[package]]
 name = "aptos-peer-monitoring-service-types"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-config",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "serde",
  "thiserror",
 ]
@@ -2194,7 +2186,7 @@ dependencies = [
 [[package]]
 name = "aptos-proptest-helpers"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "crossbeam",
  "proptest",
@@ -2204,7 +2196,7 @@ dependencies = [
 [[package]]
 name = "aptos-protos"
 version = "1.3.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "futures-core",
  "pbjson",
@@ -2216,7 +2208,7 @@ dependencies = [
 [[package]]
 name = "aptos-protos"
 version = "1.3.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?rev=338f9a1bcc06f62ce4a4994f1642b9a61b631ee0#338f9a1bcc06f62ce4a4994f1642b9a61b631ee0"
 dependencies = [
  "futures-core",
  "pbjson",
@@ -2228,7 +2220,7 @@ dependencies = [
 [[package]]
 name = "aptos-proxy"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "ipnet",
 ]
@@ -2236,7 +2228,7 @@ dependencies = [
 [[package]]
 name = "aptos-push-metrics"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
@@ -2247,7 +2239,7 @@ dependencies = [
 [[package]]
 name = "aptos-resource-viewer"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-types",
@@ -2261,7 +2253,7 @@ dependencies = [
 [[package]]
 name = "aptos-rest-client"
 version = "0.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-api-types",
@@ -2269,7 +2261,7 @@ dependencies = [
  "aptos-infallible",
  "aptos-logger",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "hex",
  "move-core-types",
@@ -2284,7 +2276,7 @@ dependencies = [
 [[package]]
 name = "aptos-rocksdb-options"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-config",
  "rocksdb",
@@ -2293,7 +2285,7 @@ dependencies = [
 [[package]]
 name = "aptos-runtimes"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "rayon",
  "tokio",
@@ -2302,7 +2294,7 @@ dependencies = [
 [[package]]
 name = "aptos-schemadb"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-infallible",
@@ -2319,7 +2311,7 @@ dependencies = [
 [[package]]
 name = "aptos-scratchpad"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-crypto",
  "aptos-drop-helper",
@@ -2338,7 +2330,7 @@ dependencies = [
 [[package]]
 name = "aptos-sdk"
 version = "0.0.3"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-cached-packages",
@@ -2348,7 +2340,7 @@ dependencies = [
  "aptos-rest-client",
  "aptos-types",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "ed25519-dalek-bip32",
  "hex",
  "move-core-types",
@@ -2360,11 +2352,11 @@ dependencies = [
 [[package]]
 name = "aptos-sdk-builder"
 version = "0.2.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "heck 0.4.1",
  "move-core-types",
@@ -2378,12 +2370,12 @@ dependencies = [
 [[package]]
 name = "aptos-secure-net"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-logger",
  "aptos-metrics-core",
- "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)",
- "bcs 0.1.4",
+ "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs)",
+ "bcs",
  "crossbeam-channel",
  "once_cell",
  "serde",
@@ -2396,7 +2388,7 @@ dependencies = [
 [[package]]
 name = "aptos-secure-storage"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-crypto",
  "aptos-infallible",
@@ -2405,7 +2397,7 @@ dependencies = [
  "aptos-time-service",
  "aptos-vault-client",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "chrono",
  "enum_dispatch",
  "rand 0.7.3",
@@ -2417,7 +2409,7 @@ dependencies = [
 [[package]]
 name = "aptos-short-hex-str"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "mirai-annotations",
  "serde",
@@ -2428,7 +2420,7 @@ dependencies = [
 [[package]]
 name = "aptos-speculative-state-helper"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-infallible",
@@ -2439,7 +2431,7 @@ dependencies = [
 [[package]]
 name = "aptos-storage-interface"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-crypto",
@@ -2450,7 +2442,7 @@ dependencies = [
  "aptos-secure-net",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "crossbeam-channel",
  "dashmap 5.5.3",
  "move-core-types",
@@ -2487,7 +2479,7 @@ dependencies = [
 [[package]]
 name = "aptos-table-natives"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-gas-schedule",
  "aptos-native-interface",
@@ -2505,7 +2497,7 @@ dependencies = [
 [[package]]
 name = "aptos-temppath"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "hex",
  "rand 0.7.3",
@@ -2514,7 +2506,7 @@ dependencies = [
 [[package]]
 name = "aptos-time-service"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-infallible",
  "enum_dispatch",
@@ -2527,7 +2519,7 @@ dependencies = [
 [[package]]
 name = "aptos-types"
 version = "0.0.3"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-bitvec",
@@ -2542,7 +2534,7 @@ dependencies = [
  "ark-serialize 0.4.2",
  "arr_macro",
  "base64 0.13.1",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "fixed",
  "fxhash",
@@ -2584,12 +2576,12 @@ dependencies = [
 [[package]]
 name = "aptos-utils"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 
 [[package]]
 name = "aptos-vault-client"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-crypto",
  "base64 0.13.1",
@@ -2605,7 +2597,7 @@ dependencies = [
 [[package]]
 name = "aptos-vm"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-aggregator",
@@ -2632,7 +2624,7 @@ dependencies = [
  "aptos-vm-types",
  "ark-bn254",
  "ark-groth16",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "claims",
  "crossbeam-channel",
@@ -2655,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "aptos-vm-genesis"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-cached-packages",
  "aptos-crypto",
@@ -2663,7 +2655,7 @@ dependencies = [
  "aptos-gas-schedule",
  "aptos-types",
  "aptos-vm",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "move-core-types",
  "move-vm-runtime",
@@ -2676,7 +2668,7 @@ dependencies = [
 [[package]]
 name = "aptos-vm-logging"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "aptos-crypto",
  "aptos-logger",
@@ -2691,14 +2683,14 @@ dependencies = [
 [[package]]
 name = "aptos-vm-types"
 version = "0.0.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-aggregator",
  "aptos-gas-algebra",
  "aptos-gas-schedule",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "claims",
  "either",
@@ -2713,7 +2705,7 @@ dependencies = [
 [[package]]
 name = "aptos-vm-validator"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "aptos-logger",
@@ -3750,15 +3742,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"
@@ -4190,7 +4173,7 @@ dependencies = [
  "aptos-logger",
  "aptos-sdk",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "bridge-config",
  "bridge-grpc",
  "bridge-service",
@@ -4227,7 +4210,7 @@ dependencies = [
  "aptos-types",
  "async-stream",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "bridge-config",
  "bridge-grpc",
  "bridge-indexer-db",
@@ -7363,7 +7346,7 @@ dependencies = [
  "aptos-framework",
  "aptos-sdk",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "chrono",
  "futures",
  "godfig",
@@ -8865,7 +8848,7 @@ dependencies = [
  "aptos-language-e2e-tests",
  "aptos-logger",
  "aptos-mempool",
- "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)",
+ "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs)",
  "aptos-sdk",
  "aptos-storage-interface",
  "aptos-temppath",
@@ -8876,7 +8859,7 @@ dependencies = [
  "aptos-vm-types",
  "aptos-vm-validator",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "borsh 0.10.4",
  "bytes 1.8.0",
  "chrono",
@@ -9234,10 +9217,10 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e"
 [[package]]
 name = "move-abigen"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "heck 0.4.1",
  "log",
  "move-binary-format",
@@ -9251,7 +9234,7 @@ dependencies = [
 [[package]]
 name = "move-binary-format"
 version = "0.0.3"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "backtrace",
@@ -9266,15 +9249,15 @@ dependencies = [
 [[package]]
 name = "move-borrow-graph"
 version = "0.0.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 
 [[package]]
 name = "move-bytecode-source-map"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "move-binary-format",
  "move-command-line-common",
  "move-core-types",
@@ -9286,7 +9269,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-spec"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "once_cell",
  "quote",
@@ -9296,7 +9279,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-utils"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "move-binary-format",
@@ -9308,7 +9291,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-verifier"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "fail",
  "move-binary-format",
@@ -9322,7 +9305,7 @@ dependencies = [
 [[package]]
 name = "move-bytecode-viewer"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "clap 4.5.21",
@@ -9337,7 +9320,7 @@ dependencies = [
 [[package]]
 name = "move-cli"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "clap 4.5.21",
@@ -9367,7 +9350,7 @@ dependencies = [
 [[package]]
 name = "move-command-line-common"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "difference",
@@ -9384,10 +9367,10 @@ dependencies = [
 [[package]]
 name = "move-compiler"
 version = "0.0.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "codespan-reporting",
  "hex",
@@ -9410,11 +9393,11 @@ dependencies = [
 [[package]]
 name = "move-compiler-v2"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "abstract-domain-derive",
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "codespan-reporting",
  "ethnum",
@@ -9441,11 +9424,11 @@ dependencies = [
 [[package]]
 name = "move-core-types"
 version = "0.0.4"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "arbitrary",
- "bcs 0.1.4",
+ "bcs",
  "bytes 1.8.0",
  "ethnum",
  "hashbrown 0.14.5",
@@ -9466,10 +9449,10 @@ dependencies = [
 [[package]]
 name = "move-coverage"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "codespan",
  "colored",
@@ -9485,7 +9468,7 @@ dependencies = [
 [[package]]
 name = "move-disassembler"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "clap 4.5.21",
@@ -9502,7 +9485,7 @@ dependencies = [
 [[package]]
 name = "move-docgen"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "clap 4.5.21",
@@ -9521,7 +9504,7 @@ dependencies = [
 [[package]]
 name = "move-errmapgen"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "move-command-line-common",
@@ -9533,10 +9516,10 @@ dependencies = [
 [[package]]
 name = "move-ir-compiler"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "move-binary-format",
  "move-bytecode-source-map",
@@ -9549,7 +9532,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "codespan-reporting",
@@ -9567,7 +9550,7 @@ dependencies = [
 [[package]]
 name = "move-ir-to-bytecode-syntax"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "hex",
@@ -9580,7 +9563,7 @@ dependencies = [
 [[package]]
 name = "move-ir-types"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "hex",
  "move-command-line-common",
@@ -9593,7 +9576,7 @@ dependencies = [
 [[package]]
 name = "move-model"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "codespan",
@@ -9619,7 +9602,7 @@ dependencies = [
 [[package]]
 name = "move-package"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "clap 4.5.21",
@@ -9653,7 +9636,7 @@ dependencies = [
 [[package]]
 name = "move-prover"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "atty",
@@ -9680,7 +9663,7 @@ dependencies = [
 [[package]]
 name = "move-prover-boogie-backend"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -9709,7 +9692,7 @@ dependencies = [
 [[package]]
 name = "move-prover-bytecode-pipeline"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "abstract-domain-derive",
  "anyhow",
@@ -9726,7 +9709,7 @@ dependencies = [
 [[package]]
 name = "move-resource-viewer"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "hex",
@@ -9741,7 +9724,7 @@ name = "move-rocks"
 version = "0.0.2"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "mempool-util",
  "movement-types",
  "rand 0.7.3",
@@ -9753,7 +9736,7 @@ dependencies = [
 [[package]]
 name = "move-stackless-bytecode"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "abstract-domain-derive",
  "codespan-reporting",
@@ -9772,7 +9755,7 @@ dependencies = [
 [[package]]
 name = "move-stdlib"
 version = "0.1.1"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "hex",
@@ -9795,7 +9778,7 @@ dependencies = [
 [[package]]
 name = "move-symbol-pool"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "once_cell",
  "serde",
@@ -9804,7 +9787,7 @@ dependencies = [
 [[package]]
 name = "move-table-extension"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "better_any",
  "bytes 1.8.0",
@@ -9819,7 +9802,7 @@ dependencies = [
 [[package]]
 name = "move-unit-test"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "better_any",
@@ -9847,7 +9830,7 @@ dependencies = [
 [[package]]
 name = "move-vm-runtime"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "better_any",
  "bytes 1.8.0",
@@ -9871,7 +9854,7 @@ dependencies = [
 [[package]]
 name = "move-vm-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
  "anyhow",
  "bytes 1.8.0",
@@ -9886,9 +9869,9 @@ dependencies = [
 [[package]]
 name = "move-vm-types"
 version = "0.1.0"
-source = "git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41#9dfc8e7a3d622597dfd81cc4ba480a5377f87a41"
+source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#ba1febcd38b986af006a8cb430c1a30a2b8c668c"
 dependencies = [
- "bcs 0.1.4",
+ "bcs",
  "derivative",
  "itertools 0.12.1",
  "move-binary-format",
@@ -9915,7 +9898,7 @@ version = "0.0.2"
 dependencies = [
  "anyhow",
  "async-stream",
- "bcs 0.1.4",
+ "bcs",
  "celestia-rpc",
  "celestia-types",
  "chrono",
@@ -9952,7 +9935,7 @@ dependencies = [
  "anyhow",
  "aptos-types",
  "async-stream",
- "bcs 0.1.4",
+ "bcs",
  "dot-movement",
  "ecdsa 0.16.9",
  "hex",
@@ -10064,7 +10047,7 @@ dependencies = [
  "aptos-account-whitelist",
  "aptos-types",
  "async-stream",
- "bcs 0.1.4",
+ "bcs",
  "celestia-rpc",
  "celestia-types",
  "dot-movement",
@@ -10095,11 +10078,11 @@ name = "movement-client"
 version = "0.0.2"
 dependencies = [
  "anyhow",
- "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=9dfc8e7a3d622597dfd81cc4ba480a5377f87a41)",
+ "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs)",
  "aptos-sdk",
  "aptos-types",
  "async-trait",
- "bcs 0.1.4",
+ "bcs",
  "buildtime-helpers",
  "chrono",
  "commander",
@@ -10202,7 +10185,7 @@ name = "movement-full-node"
 version = "0.0.2"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "console-subscriber",
  "dot-movement",
@@ -10312,7 +10295,7 @@ version = "0.0.2"
 dependencies = [
  "anyhow",
  "aptos-types",
- "bcs 0.1.4",
+ "bcs",
  "blake3",
  "rand 0.7.3",
  "serde",
@@ -10326,7 +10309,7 @@ name = "movement-util"
 version = "0.0.2"
 dependencies = [
  "anyhow",
- "bcs 0.1.4",
+ "bcs",
  "clap 4.5.21",
  "console-subscriber",
  "dot-movement",
@@ -11801,16 +11784,16 @@ dependencies = [
 [[package]]
 name = "processor"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=7658338eb9224abd9698c1e02dbc6ca526c268ce#7658338eb9224abd9698c1e02dbc6ca526c268ce"
+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=7658338eb9224abd9698c1e02dbc6ca526c268ce)",
+ "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",
@@ -13255,7 +13238,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",
@@ -13443,7 +13426,7 @@ dependencies = [
 [[package]]
 name = "server-framework"
 version = "1.0.0"
-source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?rev=7658338eb9224abd9698c1e02dbc6ca526c268ce#7658338eb9224abd9698c1e02dbc6ca526c268ce"
+source = "git+https://github.com/movementlabsxyz/aptos-indexer-processors?branch=mikhail/upstream-bcs#b3a045490d025eb986364f85875375790e7610fa"
 dependencies = [
  "anyhow",
  "aptos-system-utils",
diff --git a/Cargo.toml b/Cargo.toml
index 7deeb1d00..a5939e201 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,46 +126,46 @@ serde_yaml = "0.9.34"
 ## Aptos dependencies
 ### We use a forked version so that we can override dependency versions. This is required
 ### to be avoid dependency conflicts with other Sovereign Labs crates.
-aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41", features = [
+aptos-api = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", branch = "mikhail/upstream-bcs" }
+aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs", features = [
     "cloneable-private-keys",
 ] }
-aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
-aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "9dfc8e7a3d622597dfd81cc4ba480a5377f87a41" }
+aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", branch = "mikhail/upstream-bcs" }
+aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
+aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", branch = "mikhail/upstream-bcs" }
 
 # Indexer
-processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "7658338eb9224abd9698c1e02dbc6ca526c268ce" }
-server-framework = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", rev = "7658338eb9224abd9698c1e02dbc6ca526c268ce" }
+processor = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", branch = "mikhail/upstream-bcs" }
+server-framework = { git = "https://github.com/movementlabsxyz/aptos-indexer-processors", branch = "mikhail/upstream-bcs" }
 
-bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
+bcs = "0.1.6"
 ethereum-types = "0.14.1"
 ethers = "=2.0.10"
 ethers-core = { version = "=2.0.10", default-features = false }
@@ -321,8 +321,8 @@ regex = "1.10.6"
 globset = "0.4.15"
 glob = "0.3.1"
 hyper = "1.4"
-hyper-util = { version = "0.1.4"}
-tower = { version = "0.5"}
+hyper-util = { version = "0.1.4" }
+tower = { version = "0.5" }
 http-body-util = "0.1"
 
 # trying to pin diesel
diff --git a/protocol-units/da/movement/celestia/light-node-verifier/src/permissioned_signers/mod.rs b/protocol-units/da/movement/celestia/light-node-verifier/src/permissioned_signers/mod.rs
index 7cd21376f..e9ddd728e 100644
--- a/protocol-units/da/movement/celestia/light-node-verifier/src/permissioned_signers/mod.rs
+++ b/protocol-units/da/movement/celestia/light-node-verifier/src/permissioned_signers/mod.rs
@@ -69,7 +69,11 @@ where
 	AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C> + VerifyPrimitive<C>,
 	FieldBytesSize<C>: ModulusSize,
 {
-	async fn verify(&self, blob: CelestiaBlob, height: u64) -> Result<Verified<IntermediateBlobRepresentation>, Error> {
+	async fn verify(
+		&self,
+		blob: CelestiaBlob,
+		height: u64,
+	) -> Result<Verified<IntermediateBlobRepresentation>, Error> {
 		let verified_blob = self.celestia.verify(blob, height).await?;
 		self.known_signers.verify(verified_blob.into_inner(), height).await
 	}
diff --git a/protocol-units/da/movement/celestia/util/src/ir_blob.rs b/protocol-units/da/movement/celestia/util/src/ir_blob.rs
index a853d0f9e..3d2f2130a 100644
--- a/protocol-units/da/movement/celestia/util/src/ir_blob.rs
+++ b/protocol-units/da/movement/celestia/util/src/ir_blob.rs
@@ -212,13 +212,9 @@ pub mod celestia {
 
 		// todo: it would be nice to have this be self describing over the compression and serialization format
 		fn try_from(blob: CelestiaBlob) -> Result<Self, Self::Error> {
-			// decompress blob.data with zstd
-			let decompressed =
-				zstd::decode_all(blob.data.as_slice()).context("failed to decompress blob")?;
-
-			// deserialize the decompressed data with bcs
-			let blob =
-				bcs::from_bytes(decompressed.as_slice()).context("failed to deserialize blob")?;
+			// decompress the blob and deserialize the data with bcs
+			let decoder = zstd::Decoder::new(blob.data.as_slice())?;
+			let blob = bcs::from_reader(decoder).context("failed to deserialize blob")?;
 
 			Ok(blob)
 		}