From 39db1ab68e6777bacb1a8d780a8b42d34d11ce30 Mon Sep 17 00:00:00 2001 From: Mikhail Zabaluev Date: Tue, 21 Jan 2025 15:29:37 +0200 Subject: [PATCH] Zstd bomb fix (#937) --- .github/workflows/checks-all.yml | 3 +- Cargo.lock | 410 +++++++++--------- Cargo.toml | 73 ++-- .../src/permissioned_signers/mod.rs | 6 +- .../celestia/light-node/src/v1/passthrough.rs | 5 +- .../da/movement/celestia/util/src/ir_blob.rs | 115 ++++- 6 files changed, 346 insertions(+), 266 deletions(-) diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml index 6b9f05297..f2316f191 100755 --- a/.github/workflows/checks-all.yml +++ b/.github/workflows/checks-all.yml @@ -69,7 +69,8 @@ jobs: -p memseq \ -p move-rocks \ -p movement-types \ - -p movement-config + -p movement-config \ + -p movement-celestia-da-util \ EOF movement-full-node-local: diff --git a/Cargo.lock b/Cargo.lock index 3e64726d8..ace07cee5 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "aptos-logger", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-api-types", @@ -878,7 +878,7 @@ dependencies = [ "aptos-types", "aptos-vm", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-config", @@ -915,7 +915,7 @@ dependencies = [ "aptos-types", "aptos-vm", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-aggregator", @@ -963,7 +963,7 @@ dependencies = [ "aptos-vm-logging", "aptos-vm-types", "arc-swap", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "aptos-crypto", "aptos-logger", "aptos-metrics-core", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-framework", "aptos-package-builder", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-crypto", @@ -1072,7 +1072,7 @@ dependencies = [ "aptos-temppath", "aptos-types", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-bitvec", @@ -1103,7 +1103,7 @@ dependencies = [ "aptos-logger", "aptos-short-hex-str", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-accumulator", @@ -1207,7 +1207,7 @@ dependencies = [ "aptos-types", "arc-swap", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-config", @@ -1241,7 +1241,7 @@ dependencies = [ "aptos-schemadb", "aptos-storage-interface", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-schemadb", "aptos-storage-interface", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "byteorder", "serde", ] @@ -1264,12 +1264,12 @@ dependencies = [ [[package]] name = "aptos-dkg" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-crypto", "aptos-crypto-derive", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-consensus-types", @@ -1340,7 +1340,7 @@ dependencies = [ "aptos-types", "aptos-vm", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "aptos-block-partitioner", "aptos-config", @@ -1368,7 +1368,7 @@ dependencies = [ "aptos-storage-interface", "aptos-types", "aptos-vm", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-crypto", @@ -1415,7 +1415,7 @@ dependencies = [ "aptos-secure-net", "aptos-storage-interface", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" [[package]] name = "aptos-id-generator" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" [[package]] name = "aptos-indexer" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-api", @@ -1636,7 +1636,7 @@ dependencies = [ "aptos-storage-interface", "aptos-types", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e)", + "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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-metrics-core", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e)", + "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" [[package]] name = "aptos-jellyfish-merkle" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-crypto", @@ -1772,7 +1772,7 @@ dependencies = [ "aptos-storage-interface", "aptos-types", "arr_macro", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-bounded-executor", @@ -1924,7 +1924,7 @@ dependencies = [ "aptos-time-service", "aptos-types", "aptos-vm-validator", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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#00132c0d205a7a49f54f10842bcdbaabc503dca0" dependencies = [ "chrono", ] @@ -2006,7 +1998,7 @@ dependencies = [ [[package]] name = "aptos-mvhashmap" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "aptos-gas-algebra", "aptos-gas-schedule", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-bitvec", @@ -2081,7 +2073,7 @@ dependencies = [ "aptos-types", "arc-swap", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "aptos-config", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "serde", "thiserror 1.0.69", ] @@ -2194,7 +2186,7 @@ dependencies = [ [[package]] name = "aptos-proptest-helpers" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-api-types", @@ -2269,7 +2261,7 @@ dependencies = [ "aptos-infallible", "aptos-logger", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-cached-packages", @@ -2348,7 +2340,7 @@ dependencies = [ "aptos-rest-client", "aptos-types", "base64 0.13.1", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "aptos-logger", "aptos-metrics-core", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e)", - "bcs 0.1.4", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs)", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-crypto", @@ -2450,7 +2442,7 @@ dependencies = [ "aptos-secure-net", "aptos-types", "aptos-vm", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" [[package]] name = "aptos-vault-client" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-aggregator", @@ -2632,7 +2624,7 @@ dependencies = [ "aptos-vm-types", "ark-bn254", "ark-groth16", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "aptos-cached-packages", "aptos-crypto", @@ -2663,7 +2655,7 @@ dependencies = [ "aptos-gas-schedule", "aptos-types", "aptos-vm", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" 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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-aggregator", "aptos-gas-algebra", "aptos-gas-schedule", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "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=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "aptos-logger", @@ -3787,8 +3779,9 @@ dependencies = [ [[package]] name = "bcs" -version = "0.1.4" -source = "git+https://github.com/aptos-labs/bcs.git?rev=d31fab9d81748e2594be5cd5cdf845786a30562d#d31fab9d81748e2594be5cd5cdf845786a30562d" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a" dependencies = [ "serde", "thiserror 1.0.69", @@ -3797,8 +3790,7 @@ dependencies = [ [[package]] name = "bcs" version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a" +source = "git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c#bc16d2d39cabafaabd76173dd1b04b2aa170cf0c" dependencies = [ "serde", "thiserror 1.0.69", @@ -4230,7 +4222,7 @@ dependencies = [ "aptos-logger", "aptos-sdk", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bridge-config", "bridge-grpc", "bridge-service", @@ -4270,7 +4262,7 @@ dependencies = [ "aptos-types", "async-stream", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bridge-config", "bridge-grpc", "bridge-indexer-db", @@ -7565,7 +7557,7 @@ dependencies = [ "aptos-framework", "aptos-sdk", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "chrono", "futures", "godfig", @@ -9092,7 +9084,7 @@ dependencies = [ "aptos-language-e2e-tests", "aptos-logger", "aptos-mempool", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e)", + "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs)", "aptos-sdk", "aptos-storage-interface", "aptos-temppath", @@ -9103,7 +9095,7 @@ dependencies = [ "aptos-vm-types", "aptos-vm-validator", "async-trait", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "borsh 0.10.4", "bytes 1.8.0", "chrono", @@ -9461,10 +9453,10 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "heck 0.4.1", "log", "move-binary-format", @@ -9478,7 +9470,7 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "backtrace", @@ -9493,15 +9485,15 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "move-binary-format", "move-command-line-common", "move-core-types", @@ -9513,7 +9505,7 @@ dependencies = [ [[package]] name = "move-bytecode-spec" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "once_cell", "quote", @@ -9523,7 +9515,7 @@ dependencies = [ [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "move-binary-format", @@ -9535,7 +9527,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "fail", "move-binary-format", @@ -9549,7 +9541,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "clap 4.5.21", @@ -9564,7 +9556,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "clap 4.5.21", @@ -9594,7 +9586,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "difference", @@ -9611,10 +9603,10 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "codespan-reporting", "hex", @@ -9637,11 +9629,11 @@ dependencies = [ [[package]] name = "move-compiler-v2" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "abstract-domain-derive", "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "codespan-reporting", "ethnum", @@ -9668,11 +9660,11 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "arbitrary", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bytes 1.8.0", "ethnum", "hashbrown 0.14.5", @@ -9693,10 +9685,10 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "codespan", "colored", @@ -9712,7 +9704,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "clap 4.5.21", @@ -9729,7 +9721,7 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "clap 4.5.21", @@ -9748,7 +9740,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "move-command-line-common", @@ -9760,10 +9752,10 @@ dependencies = [ [[package]] name = "move-ir-compiler" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "move-binary-format", "move-bytecode-source-map", @@ -9776,7 +9768,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "codespan-reporting", @@ -9794,7 +9786,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "hex", @@ -9807,7 +9799,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "hex", "move-command-line-common", @@ -9820,7 +9812,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "codespan", @@ -9846,7 +9838,7 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "clap 4.5.21", @@ -9880,7 +9872,7 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "atty", @@ -9907,7 +9899,7 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "async-trait", @@ -9936,7 +9928,7 @@ dependencies = [ [[package]] name = "move-prover-bytecode-pipeline" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "abstract-domain-derive", "anyhow", @@ -9953,7 +9945,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "hex", @@ -9968,7 +9960,7 @@ name = "move-rocks" version = "0.0.2" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "mempool-util", "movement-types", "rand 0.7.3", @@ -9980,7 +9972,7 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "abstract-domain-derive", "codespan-reporting", @@ -9999,7 +9991,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "hex", @@ -10022,7 +10014,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "once_cell", "serde", @@ -10031,7 +10023,7 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "better_any", "bytes 1.8.0", @@ -10046,7 +10038,7 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "better_any", @@ -10074,7 +10066,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "better_any", "bytes 1.8.0", @@ -10098,7 +10090,7 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ "anyhow", "bytes 1.8.0", @@ -10113,9 +10105,9 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e#8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" +source = "git+https://github.com/movementlabsxyz/aptos-core?branch=mikhail/upstream-bcs#3b1b1c43d6d324e9da2fe33d0df391b817d8fa08" dependencies = [ - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "derivative", "itertools 0.12.1", "move-binary-format", @@ -10142,7 +10134,7 @@ version = "0.0.2" dependencies = [ "anyhow", "async-stream", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "celestia-rpc", "celestia-types", "chrono", @@ -10179,7 +10171,7 @@ dependencies = [ "anyhow", "aptos-types", "async-stream", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "dot-movement", "ecdsa 0.16.9", "hex", @@ -10291,7 +10283,7 @@ dependencies = [ "aptos-account-whitelist", "aptos-types", "async-stream", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "celestia-rpc", "celestia-types", "dot-movement", @@ -10322,11 +10314,11 @@ name = "movement-client" version = "0.0.2" dependencies = [ "anyhow", - "aptos-protos 1.3.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e)", + "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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "buildtime-helpers", "chrono", "commander", @@ -10429,7 +10421,7 @@ name = "movement-full-node" version = "0.0.2" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "console-subscriber", "dot-movement", @@ -10577,7 +10569,7 @@ version = "0.0.2" dependencies = [ "anyhow", "aptos-types", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "blake3", "rand 0.7.3", "serde", @@ -10591,7 +10583,7 @@ name = "movement-util" version = "0.0.2" dependencies = [ "anyhow", - "bcs 0.1.4", + "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", "console-subscriber", "dot-movement", @@ -12066,16 +12058,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#00132c0d205a7a49f54f10842bcdbaabc503dca0" 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 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "bigdecimal", "bitflags 2.6.0", "canonical_json", @@ -13633,7 +13625,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 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "bincode", "heck 0.3.3", "include_dir", @@ -13831,7 +13823,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#00132c0d205a7a49f54f10842bcdbaabc503dca0" dependencies = [ "anyhow", "aptos-system-utils", diff --git a/Cargo.toml b/Cargo.toml index 4a806b24b..093d51cb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -141,46 +141,47 @@ borsh = { version = "0.10" } # todo: internalize jmt and bump ### 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 = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-api-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-bitvec = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-block-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e", features = [ - "cloneable-private-keys", +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 = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-executor-test-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-executor-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-faucet-core = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-framework = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-language-e2e-tests = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-mempool = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-proptest-helpers = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-sdk = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-state-view = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-temppath = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-vm-genesis = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-vm-logging = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-vm-validator = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-logger = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-vm-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-indexer = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-indexer-grpc-fullnode = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-indexer-grpc-table-info = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } -aptos-protos = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "8b8eb8fd0a3fa78086522bda7886ecd86fc6d24e" } +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/movementlabsxyz/bcs.git", rev = "bc16d2d39cabafaabd76173dd1b04b2aa170cf0c" } -bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" } ethereum-types = "0.14.1" ethers = "=2.0.10" ethers-core = { version = "=2.0.10", default-features = false } 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: FromEncodedPoint + ToEncodedPoint + VerifyPrimitive, FieldBytesSize: ModulusSize, { - async fn verify(&self, blob: CelestiaBlob, height: u64) -> Result, Error> { + async fn verify( + &self, + blob: CelestiaBlob, + height: u64, + ) -> Result, 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/light-node/src/v1/passthrough.rs b/protocol-units/da/movement/celestia/light-node/src/v1/passthrough.rs index c534df63a..b74178baf 100644 --- a/protocol-units/da/movement/celestia/light-node/src/v1/passthrough.rs +++ b/protocol-units/da/movement/celestia/light-node/src/v1/passthrough.rs @@ -120,10 +120,11 @@ where let timestamp = chrono::Utc::now().timestamp_micros() as u64; // sign the blob data and the timestamp - let data = InnerSignedBlobV1Data::new(data, timestamp).try_to_sign(&self.signing_key)?; + let data = InnerSignedBlobV1Data::try_new(data, timestamp)?; + let signed_data = data.try_to_sign(&self.signing_key)?; // create the celestia blob - CelestiaIntermediateBlobRepresentation(data.into(), self.celestia_namespace.clone()) + CelestiaIntermediateBlobRepresentation(signed_data.into(), self.celestia_namespace.clone()) .try_into() } 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..49f42550e 100644 --- a/protocol-units/da/movement/celestia/util/src/ir_blob.rs +++ b/protocol-units/da/movement/celestia/util/src/ir_blob.rs @@ -1,5 +1,7 @@ +use anyhow::bail; use ecdsa::{ elliptic_curve::{ + generic_array::typenum::Unsigned, generic_array::ArrayLength, ops::Invert, point::PointCompression, @@ -13,6 +15,9 @@ use ecdsa::{ }; use serde::{Deserialize, Serialize}; +/// Maximum allowed length of a blob data field. +pub const MAX_BLOB_LEN: usize = 64 * 1_024 * 1_024; + #[derive(Debug, Clone, Serialize, Deserialize)] pub struct InnerSignedBlobV1Data { pub blob: Vec, @@ -40,8 +45,11 @@ impl From> for Id { } impl InnerSignedBlobV1Data { - pub fn new(blob: Vec, timestamp: u64) -> Self { - Self { blob, timestamp } + pub fn try_new(blob: Vec, timestamp: u64) -> Result { + if blob.len() > MAX_BLOB_LEN { + bail!("blob length {} is above the limit", blob.len()); + } + Ok(Self { blob, timestamp }) } /// Computes the id of InnerSignedBlobV1Data @@ -112,6 +120,9 @@ impl InnerSignedBlobV1 { hasher.update(self.id.as_slice()); let verifying_key = VerifyingKey::::from_sec1_bytes(self.signer.as_slice())?; + if self.signature.len() != SignatureSize::::to_usize() { + return Err(anyhow::anyhow!("invalid signature length")); + } let signature = ecdsa::Signature::from_bytes(self.signature.as_slice().into())?; match verifying_key.verify_digest(hasher, &signature) { @@ -188,7 +199,7 @@ pub mod test { #[test] fn test_cannot_change_id_and_verify() -> Result<(), anyhow::Error> { - let blob = InnerSignedBlobV1Data::new(vec![1, 2, 3], 123); + let blob = InnerSignedBlobV1Data::try_new(vec![1, 2, 3], 123).unwrap(); let signing_key = SigningKey::::random(&mut rand::thread_rng()); let signed_blob = blob.try_to_sign(&signing_key)?; @@ -199,11 +210,27 @@ pub mod test { Ok(()) } + + #[test] + fn poc_verify_does_not_panic_on_wrong_signature_len() -> Result<(), anyhow::Error> { + let s = InnerSignedBlobV1 { + data: InnerSignedBlobV1Data::try_new(vec![1, 2, 3], 123).unwrap(), + signature: vec![], + signer: vec![ + 2, 130, 130, 130, 130, 130, 130, 130, 82, 130, 130, 130, 130, 255, 255, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + ], + id: Id(vec![1, 2, 3, 4]), + }; + + s.try_verify::().unwrap_err(); + + Ok(()) + } } pub mod celestia { - - use super::IntermediateBlobRepresentation; + use super::{IntermediateBlobRepresentation, MAX_BLOB_LEN}; use anyhow::Context; use celestia_types::{consts::appconsts::AppVersion, nmt::Namespace, Blob as CelestiaBlob}; @@ -212,13 +239,12 @@ 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 { - // 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 mut decoder = zstd::Decoder::with_buffer(blob.data.as_slice())?; + let blob = bcs::de::Builder::new() + .max_sequence_length(MAX_BLOB_LEN) + .deserialize_reader(&mut decoder) + .context("failed to deserialize blob")?; Ok(blob) } @@ -237,12 +263,14 @@ pub mod celestia { // Extract the inner blob and namespace let CelestiaIntermediateBlobRepresentation(ir_blob, namespace) = ir_blob; - // Serialize the inner blob with bcs - let serialized_blob = bcs::to_bytes(&ir_blob).context("failed to serialize blob")?; + let mut encoder = + zstd::Encoder::new(vec![], 0).context("failed to initialize zstd encoder")?; - // Compress the serialized data with zstd - let compressed_blob = zstd::encode_all(serialized_blob.as_slice(), 0) - .context("failed to compress blob")?; + // Serialize the inner blob with bcs and compress with zstd + bcs::serialize_into(&mut encoder, &ir_blob).context("failed to serialize blob")?; + + let compressed_blob = + encoder.finish().context("failed to finish compression of blob")?; // Construct the final CelestiaBlob by assigning the compressed data // and associating it with the provided namespace @@ -250,4 +278,57 @@ pub mod celestia { .map_err(|e| anyhow::anyhow!(e))?) } } + + #[cfg(test)] + mod tests { + use super::*; + use crate::ir_blob::{InnerSignedBlobV1, InnerSignedBlobV1Data}; + + #[test] + fn zstd_bomb() -> anyhow::Result<()> { + // MAGIC + header with max window size + let mut bomb = vec![0x28, 0xb5, 0x2f, 0xfd, 0x0, 0x7f]; + let n_blocks = 0x530000; + for _ in 0..n_blocks { + // RLE block encoding 0xff byte repeated 0x8000 times + bomb.extend([0x02, 0x00, 0x10, 0xff]); + } + // Block to finish the data + bomb.extend(&[0x01, 0x00, 0x00]); + // Check that we fit in celestia limits + assert!(bomb.len() < 0x1_500_000); + + let blob = + CelestiaBlob::new(Namespace::new_v0(b"movement").unwrap(), bomb, AppVersion::V2)?; + >::try_into(blob).unwrap_err(); + Ok(()) + } + + fn dummy_ir_blob(len: usize) -> CelestiaIntermediateBlobRepresentation { + let blob_data = InnerSignedBlobV1Data { blob: vec![0; len], timestamp: 1733879282 }; + // It's no fun to compute -- not Kraftwerk + let test_blob = InnerSignedBlobV1 { + data: blob_data, + signature: vec![0xfa; 64], + signer: vec![0xaf; 32], + id: vec![0xad; 32].into(), + }; + CelestiaIntermediateBlobRepresentation( + test_blob.into(), + Namespace::new_v0(b"movement").unwrap(), + ) + } + + #[test] + #[ignore = "allocates, compresses, and decompresses 2 GiB of data"] + fn blob_size_limit_imposed_by_bcs() -> anyhow::Result<()> { + CelestiaBlob::try_from(dummy_ir_blob(bcs::MAX_SEQUENCE_LENGTH + 1)) + .expect_err("should be rejected"); + + let celestia_blob: CelestiaBlob = dummy_ir_blob(bcs::MAX_SEQUENCE_LENGTH).try_into()?; + let blob_ir: IntermediateBlobRepresentation = celestia_blob.try_into()?; + assert_eq!(blob_ir.blob().len(), bcs::MAX_SEQUENCE_LENGTH); + Ok(()) + } + } }